Fix revision and platform when objectType not set

ht2 · ht2 · commit 72498a8e1713 · 2017-08-18T15:18:37.000Z
diff --git a/dist/helpers/agentSchema.d.ts b/dist/helpers/agentSchema.d.ts
@@ -1,5 +1,5 @@
 import { Rule } from 'rulr';
-declare var _default: {
+declare const _default: {
     objectType: Rule;
     name: Rule;
     mbox: Rule;
diff --git a/dist/helpers/getUsedIfis.d.ts b/dist/helpers/getUsedIfis.d.ts
@@ -1,2 +1,2 @@
-declare var _default: (data: any) => string[];
+declare const _default: (data: any) => string[];
 export default _default;
diff --git a/dist/helpers/objectTypeFactory.d.ts b/dist/helpers/objectTypeFactory.d.ts
@@ -2,5 +2,5 @@ import { Rule } from 'rulr';
 export declare type Types = {
     [key: string]: Rule;
 };
-declare var _default: (types: () => Types, defaultType: string) => Rule;
+declare const _default: (types: () => Types, defaultType: string) => Rule;
 export default _default;
diff --git a/dist/helpers/restrictToValue.d.ts b/dist/helpers/restrictToValue.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: (value: any) => Rule;
+declare const _default: (value: any) => Rule;
 export default _default;
diff --git a/dist/helpers/statementRules.d.ts b/dist/helpers/statementRules.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/helpers/statementRules.js b/dist/helpers/statementRules.js
@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
 var ContextPropWarning_1 = require("../warnings/ContextPropWarning");
 var VoidWarning_1 = require("../warnings/VoidWarning");
+var lodash_1 = require("lodash");
 exports.default = rulr_1.composeRules([
     function (data, path) {
-        var objectIsActivity = (data.object != null &&
-            data.object.constructor === Object &&
-            data.object.objectType === 'Activity');
-        var hasInvalidProps = (data.context != null &&
-            data.context.constructor === Object && (data.context.platform !== undefined ||
-            data.context.revision !== undefined));
+        var objectIsActivity = (lodash_1.isObject(data.object) &&
+            (data.object.objectType === 'Activity' || data.object.objectType === undefined));
+        var hasInvalidProps = (lodash_1.isObject(data.context) &&
+            (data.context.platform !== undefined || data.context.revision !== undefined));
         var invalidContext = !objectIsActivity && hasInvalidProps;
         return invalidContext ? [new ContextPropWarning_1.default(data, path)] : [];
     },
diff --git a/dist/helpers/statementSchema.d.ts b/dist/helpers/statementSchema.d.ts
@@ -1,5 +1,5 @@
 import { Rule } from 'rulr';
-declare var _default: {
+declare const _default: {
     actor: Rule;
     verb: Rule;
     object: Rule;
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -1,3 +1,3 @@
 import { Warning } from 'rulr';
-declare var _default: (data: any) => Warning[];
+declare const _default: (data: any) => Warning[];
 export default _default;
diff --git a/dist/regexValues/duration.d.ts b/dist/regexValues/duration.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/regexValues/imt.d.ts b/dist/regexValues/imt.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/regexValues/interactionType.d.ts b/dist/regexValues/interactionType.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/regexValues/iri.d.ts b/dist/regexValues/iri.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/regexValues/language.d.ts b/dist/regexValues/language.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/regexValues/mailto.d.ts b/dist/regexValues/mailto.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/regexValues/sha1.d.ts b/dist/regexValues/sha1.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/regexValues/timestamp.d.ts b/dist/regexValues/timestamp.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/regexValues/uuid.d.ts b/dist/regexValues/uuid.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/regexValues/version.d.ts b/dist/regexValues/version.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/account.d.ts b/dist/schemaRules/account.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/activity.d.ts b/dist/schemaRules/activity.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/actor.d.ts b/dist/schemaRules/actor.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/agent.d.ts b/dist/schemaRules/agent.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/attachment.d.ts b/dist/schemaRules/attachment.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/authority.d.ts b/dist/schemaRules/authority.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/context.d.ts b/dist/schemaRules/context.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/definition.d.ts b/dist/schemaRules/definition.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/group.d.ts b/dist/schemaRules/group.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/interactionComponent.d.ts b/dist/schemaRules/interactionComponent.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/object.d.ts b/dist/schemaRules/object.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/result.d.ts b/dist/schemaRules/result.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/statement.d.ts b/dist/schemaRules/statement.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/statementRef.d.ts b/dist/schemaRules/statementRef.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/subStatement.d.ts b/dist/schemaRules/subStatement.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/schemaRules/verb.d.ts b/dist/schemaRules/verb.d.ts
@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare var _default: Rule;
+declare const _default: Rule;
 export default _default;
diff --git a/dist/tests/describeIfiProp.d.ts b/dist/tests/describeIfiProp.d.ts
@@ -1,5 +1,5 @@
 /// <reference types="mocha" />
 import Test from './helpers/test';
 import 'mocha';
-declare var _default: (prop: string, describer: (test: Test) => void, test: Test) => Mocha.ISuite;
+declare const _default: (prop: string, describer: (test: Test) => void, test: Test) => Mocha.ISuite;
 export default _default;
diff --git a/dist/tests/describeInteractionProp.d.ts b/dist/tests/describeInteractionProp.d.ts
@@ -1,4 +1,4 @@
 import 'mocha';
 import Test from './helpers/test';
-declare var _default: (validProps: string[], type: string, test: Test) => void;
+declare const _default: (validProps: string[], type: string, test: Test) => void;
 export default _default;
diff --git a/dist/tests/describeMemberProp.d.ts b/dist/tests/describeMemberProp.d.ts
@@ -1,5 +1,5 @@
 /// <reference types="mocha" />
 import Test from './helpers/test';
 import 'mocha';
-declare var _default: (describer: (test: Test) => void, test: Test) => Mocha.ISuite;
+declare const _default: (describer: (test: Test) => void, test: Test) => Mocha.ISuite;
 export default _default;
diff --git a/dist/tests/describeOptionalProp.d.ts b/dist/tests/describeOptionalProp.d.ts
@@ -1,2 +1,2 @@
-declare var _default: (prop: string, describer: (test: (data: any, valid: boolean) => void) => void, validData: any, test: (data: any, valid: boolean) => void) => void;
+declare const _default: (prop: string, describer: (test: (data: any, valid: boolean) => void) => void, validData: any, test: (data: any, valid: boolean) => void) => void;
 export default _default;
diff --git a/dist/tests/describeProp.d.ts b/dist/tests/describeProp.d.ts
@@ -1,4 +1,4 @@
 import 'mocha';
 import Test from './helpers/test';
-declare var _default: (missingValid: boolean, description: string) => (prop: string, describer: (test: Test) => void, validData: any, test: Test) => void;
+declare const _default: (missingValid: boolean, description: string) => (prop: string, describer: (test: Test) => void, validData: any, test: Test) => void;
 export default _default;
diff --git a/dist/tests/describeRequiredProp.d.ts b/dist/tests/describeRequiredProp.d.ts
@@ -1,2 +1,2 @@
-declare var _default: (prop: string, describer: (test: (data: any, valid: boolean) => void) => void, validData: any, test: (data: any, valid: boolean) => void) => void;
+declare const _default: (prop: string, describer: (test: (data: any, valid: boolean) => void) => void, validData: any, test: (data: any, valid: boolean) => void) => void;
 export default _default;
diff --git a/dist/tests/helpers/agentSchema.d.ts b/dist/tests/helpers/agentSchema.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/helpers/collection.d.ts b/dist/tests/helpers/collection.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (describer: (test: Test) => any) => (test: Test) => any;
+declare const _default: (describer: (test: Test) => any) => (test: Test) => any;
 export default _default;
diff --git a/dist/tests/helpers/object.d.ts b/dist/tests/helpers/object.d.ts
@@ -1,4 +1,4 @@
 import Test from '../helpers/test';
 import { Types } from '../helpers/objectTypeFactory';
-declare var _default: (additionalTypes: Types) => (test: Test) => void;
+declare const _default: (additionalTypes: Types) => (test: Test) => void;
 export default _default;
diff --git a/dist/tests/helpers/objectTypeFactory.d.ts b/dist/tests/helpers/objectTypeFactory.d.ts
@@ -4,5 +4,5 @@ export declare type Type = (test: Test) => any;
 export declare type Types = {
     [key: string]: Type;
 };
-declare var _default: (types: Types, defaultType: string, test: Test, validDefaultData: object) => void;
+declare const _default: (types: Types, defaultType: string, test: Test, validDefaultData: object) => void;
 export default _default;
diff --git a/dist/tests/helpers/statementRules.d.ts b/dist/tests/helpers/statementRules.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/helpers/statementRules.js b/dist/tests/helpers/statementRules.js
@@ -20,12 +20,24 @@ exports.default = function (test) {
             context: { platform: platform },
         }, false);
     });
+    it('should not return an error when platform is set and object has no objectType', function () {
+        return test({
+            object: { id: activity.id },
+            context: { platform: platform },
+        }, true);
+    });
     it('should return an error when revision is set incorrectly', function () {
         return test({
             object: statementRef,
             context: { revision: revision },
         }, false);
     });
+    it('should not return an error when revision is set and object has no objectType', function () {
+        return test({
+            object: { id: activity.id },
+            context: { revision: revision },
+        }, true);
+    });
     it('should not return an error when context is used correctly', function () {
         return test({
             object: activity,
diff --git a/dist/tests/helpers/statementSchema.d.ts b/dist/tests/helpers/statementSchema.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/helpers/validStatementData.d.ts b/dist/tests/helpers/validStatementData.d.ts
@@ -1,4 +1,4 @@
-declare var _default: {
+declare const _default: {
     actor: {
         objectType: string;
         mbox: string;
diff --git a/dist/tests/itsInvalid.d.ts b/dist/tests/itsInvalid.d.ts
@@ -1,4 +1,4 @@
 import 'mocha';
 import Test from './helpers/test';
-declare var _default: (invalidData: any, message: string, test: Test) => any;
+declare const _default: (invalidData: any, message: string, test: Test) => any;
 export default _default;
diff --git a/dist/tests/itsValid.d.ts b/dist/tests/itsValid.d.ts
@@ -1,4 +1,4 @@
 import 'mocha';
 import Test from './helpers/test';
-declare var _default: (validData: any, test: Test) => any;
+declare const _default: (validData: any, test: Test) => any;
 export default _default;
diff --git a/dist/tests/maps/extensions.d.ts b/dist/tests/maps/extensions.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/maps/languageMap.d.ts b/dist/tests/maps/languageMap.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/regexValues/duration.d.ts b/dist/tests/regexValues/duration.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/regexValues/imt.d.ts b/dist/tests/regexValues/imt.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/regexValues/interactionType.d.ts b/dist/tests/regexValues/interactionType.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/regexValues/iri.d.ts b/dist/tests/regexValues/iri.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/regexValues/language.d.ts b/dist/tests/regexValues/language.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/regexValues/mailto.d.ts b/dist/tests/regexValues/mailto.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/regexValues/sha1.d.ts b/dist/tests/regexValues/sha1.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/regexValues/timestamp.d.ts b/dist/tests/regexValues/timestamp.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/regexValues/uuid.d.ts b/dist/tests/regexValues/uuid.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/regexValues/version.d.ts b/dist/tests/regexValues/version.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/schemaRules/account.d.ts b/dist/tests/schemaRules/account.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/schemaRules/activity.d.ts b/dist/tests/schemaRules/activity.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/schemaRules/actor.d.ts b/dist/tests/schemaRules/actor.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/schemaRules/attachment.d.ts b/dist/tests/schemaRules/attachment.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/schemaRules/authority.d.ts b/dist/tests/schemaRules/authority.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/schemaRules/context.d.ts b/dist/tests/schemaRules/context.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/schemaRules/contextActivities.d.ts b/dist/tests/schemaRules/contextActivities.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/schemaRules/definition.d.ts b/dist/tests/schemaRules/definition.d.ts
@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare var _default: (test: Test) => void;
+declare const _default: (test: Test) => void;
 export default _default;
diff --git a/dist/tests/schemaRules/group.d.ts b/dist/tests/schemaRules/group.d.ts
diff --git a/dist/tests/schemaRules/interactionComponent.d.ts b/dist/tests/schemaRules/interactionComponent.d.ts
diff --git a/dist/tests/schemaRules/object.d.ts b/dist/tests/schemaRules/object.d.ts
diff --git a/dist/tests/schemaRules/result.d.ts b/dist/tests/schemaRules/result.d.ts
diff --git a/dist/tests/schemaRules/score.d.ts b/dist/tests/schemaRules/score.d.ts
diff --git a/dist/tests/schemaRules/statement.d.ts b/dist/tests/schemaRules/statement.d.ts
diff --git a/dist/tests/schemaRules/statementRef.d.ts b/dist/tests/schemaRules/statementRef.d.ts
diff --git a/dist/tests/schemaRules/subGroup.d.ts b/dist/tests/schemaRules/subGroup.d.ts
diff --git a/dist/tests/schemaRules/subStatement.d.ts b/dist/tests/schemaRules/subStatement.d.ts
diff --git a/dist/tests/schemaRules/subStatementObject.d.ts b/dist/tests/schemaRules/subStatementObject.d.ts
diff --git a/dist/tests/schemaRules/verb.d.ts b/dist/tests/schemaRules/verb.d.ts
diff --git a/dist/tests/values/boolean.d.ts b/dist/tests/values/boolean.d.ts
diff --git a/dist/tests/values/integer.d.ts b/dist/tests/values/integer.d.ts
diff --git a/dist/tests/values/number.d.ts b/dist/tests/values/number.d.ts
diff --git a/dist/tests/values/scaled.d.ts b/dist/tests/values/scaled.d.ts
diff --git a/dist/tests/values/string.d.ts b/dist/tests/values/string.d.ts
diff --git a/src/helpers/statementRules.ts b/src/helpers/statementRules.ts
diff --git a/src/tests/helpers/statementRules.ts b/src/tests/helpers/statementRules.ts

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-declare var _default: (data: any) => string[];`
	`1`	`+declare const _default: (data: any) => string[];`
`2`	`2`	`export default _default;`