Fixes invalid objectType errors.

ryasmi · ryasmi · commit 07bc828fef91 · 2017-08-18T15:13:38.000+01:00
diff --git a/dist/errors.d.ts b/dist/errors.d.ts
diff --git a/dist/errors.js b/dist/errors.js
diff --git a/dist/helpers/agentSchema.js b/dist/helpers/agentSchema.js
@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
 var factory_1 = require("../factory");
+var restrictToValue_1 = require("./restrictToValue");
 exports.default = {
-    objectType: rulr_1.optional(factory_1.stringValue),
+    objectType: rulr_1.optional(restrictToValue_1.default('Agent')),
     name: rulr_1.optional(factory_1.stringValue),
     mbox: rulr_1.optional(factory_1.mailto),
     mbox_sha1sum: rulr_1.optional(factory_1.sha1),
diff --git a/dist/helpers/restrictToValue.d.ts b/dist/helpers/restrictToValue.d.ts
@@ -0,0 +1,3 @@
+import { Rule } from 'rulr';
+declare var _default: (value: any) => Rule;
+export default _default;
diff --git a/dist/helpers/restrictToValue.js b/dist/helpers/restrictToValue.js
@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var RestrictedValueWarning_1 = require("../warnings/RestrictedValueWarning");
+exports.default = function (value) {
+    return function (data, path) {
+        if (data !== value) {
+            return [new RestrictedValueWarning_1.default(data, path, value)];
+        }
+        return [];
+    };
+};
diff --git a/dist/schemaRules/activity.js b/dist/schemaRules/activity.js
@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
 var factory_1 = require("../factory");
+var restrictToValue_1 = require("../helpers/restrictToValue");
 exports.default = rulr_1.restrictToSchema({
-    objectType: rulr_1.optional(factory_1.stringValue),
+    objectType: rulr_1.optional(restrictToValue_1.default('Activity')),
     id: rulr_1.required(factory_1.iri),
     definition: rulr_1.optional(factory_1.definition),
 });
diff --git a/dist/schemaRules/group.js b/dist/schemaRules/group.js
@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
 var agentSchema_1 = require("../helpers/agentSchema");
 var getUsedIfis_1 = require("../helpers/getUsedIfis");
+var restrictToValue_1 = require("../helpers/restrictToValue");
 var factory_1 = require("../factory");
 var IfiCountWarning_1 = require("../warnings/IfiCountWarning");
 var NoMembersWarning_1 = require("../warnings/NoMembersWarning");
 exports.default = rulr_1.composeRules([
     rulr_1.restrictToSchema(Object.assign({}, agentSchema_1.default, {
-        member: rulr_1.optional(rulr_1.restrictToCollection(function () { return factory_1.actor; }))
+        objectType: rulr_1.optional(restrictToValue_1.default('Group')),
+        member: rulr_1.optional(rulr_1.restrictToCollection(function () { return factory_1.actor; })),
     })),
     function (data, path) {
         var usedIfis = getUsedIfis_1.default(data);
diff --git a/dist/schemaRules/statementRef.js b/dist/schemaRules/statementRef.js
@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
 var factory_1 = require("../factory");
+var restrictToValue_1 = require("../helpers/restrictToValue");
 exports.default = rulr_1.restrictToSchema({
-    objectType: rulr_1.optional(factory_1.stringValue),
+    objectType: rulr_1.optional(restrictToValue_1.default('StatementRef')),
     id: rulr_1.required(factory_1.uuid),
 });
diff --git a/dist/schemaRules/subStatement.js b/dist/schemaRules/subStatement.js
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
 var statementSchema_1 = require("../helpers/statementSchema");
 var statementRules_1 = require("../helpers/statementRules");
-var factory_1 = require("../factory");
+var restrictToValue_1 = require("../helpers/restrictToValue");
 var SubStatementWarning_1 = require("../warnings/SubStatementWarning");
 exports.default = rulr_1.composeRules([
     rulr_1.restrictToSchema(Object.assign({}, statementSchema_1.default, {
-        objectType: rulr_1.optional(factory_1.stringValue),
+        objectType: rulr_1.optional(restrictToValue_1.default('SubStatement')),
     })),
     statementRules_1.default,
     function (data, path) {
diff --git a/dist/tests/describeProp.js b/dist/tests/describeProp.js
@@ -9,8 +9,9 @@ exports.default = function (missingValid, description) {
         });
         describe(prop, function () {
             describer(function (value, valid) {
-                var data = (_a = {}, _a[prop] = value, _a);
-                test(Object.assign({}, validData, data), valid);
+                var overrides = (_a = {}, _a[prop] = value, _a);
+                var data = Object.assign({}, validData, overrides);
+                test(data, valid);
                 var _a;
             });
         });
diff --git a/dist/tests/helpers/object.js b/dist/tests/helpers/object.js
@@ -9,6 +9,6 @@ exports.default = function (additionalTypes) {
             Group: factory_1.group,
             Activity: factory_1.activity,
             StatementRef: factory_1.statementRef,
-        }, additionalTypes), 'Activity', test);
+        }, additionalTypes), 'Activity', test, { id: 'http://www.example.org/activity' });
     };
 };
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) => void;
+declare var _default: (types: Types, defaultType: string, test: Test, validDefaultData: object) => void;
 export default _default;
diff --git a/dist/tests/helpers/objectTypeFactory.js b/dist/tests/helpers/objectTypeFactory.js
@@ -1,9 +1,18 @@
 "use strict";
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 require("mocha");
 var itsInvalid_1 = require("../itsInvalid");
-exports.default = function (types, defaultType, test) {
+exports.default = function (types, defaultType, test, validDefaultData) {
     itsInvalid_1.default(10, 'not an object', test);
+    itsInvalid_1.default(__assign({}, validDefaultData, { objectType: 'InvalidObjectType' }), 'not a valid objectType', test);
     Object.keys(types).forEach(function (type) {
         describe("Object Type: " + type, function () {
             types[type](function (data, valid) {
diff --git a/dist/tests/schemaRules/activity.js b/dist/tests/schemaRules/activity.js
@@ -7,7 +7,6 @@ var factory_1 = require("../factory");
 var validData = {
     objectType: 'Activity',
     id: 'http://www.example.com',
-    definition: {},
 };
 exports.default = function (test) {
     itsInvalid_1.default(10, 'not an object', test);
diff --git a/dist/tests/schemaRules/actor.js b/dist/tests/schemaRules/actor.js
@@ -6,5 +6,5 @@ exports.default = function (test) {
     return objectTypeFactory_1.default({
         Agent: factory_1.agent,
         Group: factory_1.group,
-    }, 'Agent', test);
+    }, 'Agent', test, { mbox: 'mailto:test@example.org' });
 };
diff --git a/dist/tests/schemaRules/authority.js b/dist/tests/schemaRules/authority.js
@@ -9,6 +9,10 @@ var agentMember = {
 };
 exports.default = function (test) {
     itsInvalid_1.default(10, 'not an object', test);
+    itsInvalid_1.default({
+        objectType: 'InvalidObjectType',
+        mbox: 'mailto:test@example.org',
+    }, 'uses invalid objectType', test);
     itsInvalid_1.default({
         objectType: 'Group',
         member: [],
diff --git a/dist/tests/schemaRules/context.js b/dist/tests/schemaRules/context.js
@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var describeOptionalProp_1 = require("../describeOptionalProp");
 var itsInvalid_1 = require("../itsInvalid");
+var objectTypeFactory_1 = require("../helpers/objectTypeFactory");
 var factory_1 = require("../factory");
 var validData = {
     registration: 'd0310d1c-65fe-4b59-9d4f-c56de054243a',
@@ -27,11 +28,19 @@ exports.default = function (test) {
     itsInvalid_1.default(10, 'not an object', test);
     describeOptionalProp_1.default('registration', factory_1.uuid, validData, test);
     describeOptionalProp_1.default('instructor', factory_1.actor, validData, test);
-    describeOptionalProp_1.default('team', factory_1.group, validData, test);
+    describeOptionalProp_1.default('team', function (test) {
+        return objectTypeFactory_1.default({
+            Group: factory_1.group
+        }, 'Group', test, {});
+    }, validData, test);
     describeOptionalProp_1.default('contextActivities', factory_1.contextActivities, validData, test);
     describeOptionalProp_1.default('revision', factory_1.stringValue, validData, test);
     describeOptionalProp_1.default('platform', factory_1.stringValue, validData, test);
     describeOptionalProp_1.default('language', factory_1.language, validData, test);
-    describeOptionalProp_1.default('statement', factory_1.statementRef, validData, test);
+    describeOptionalProp_1.default('statement', function (test) {
+        return objectTypeFactory_1.default({
+            StatementRef: factory_1.statementRef
+        }, 'StatementRef', test, {});
+    }, validData, test);
     describeOptionalProp_1.default('extensions', factory_1.extensions, validData, test);
 };
diff --git a/dist/tests/schemaRules/contextActivities.js b/dist/tests/schemaRules/contextActivities.js
@@ -3,14 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var describeOptionalProp_1 = require("../describeOptionalProp");
 var itsInvalid_1 = require("../itsInvalid");
 var collection_1 = require("../helpers/collection");
+var objectTypeFactory_1 = require("../helpers/objectTypeFactory");
 var factory_1 = require("../factory");
 var validData = {
     parent: [],
     category: [],
     grouping: [],
     other: [],
 };
-var activities = collection_1.default(factory_1.activity);
+var activities = collection_1.default(function (test) {
+    return objectTypeFactory_1.default({
+        Activity: factory_1.activity
+    }, 'Activity', test, {});
+});
 exports.default = function (test) {
     itsInvalid_1.default(10, 'not an object', test);
     describeOptionalProp_1.default('parent', activities, validData, test);
diff --git a/dist/tests/schemaRules/group.js b/dist/tests/schemaRules/group.js
@@ -5,9 +5,15 @@ var itsInvalid_1 = require("../itsInvalid");
 var agentSchema_1 = require("../helpers/agentSchema");
 var describeMemberProp_1 = require("../describeMemberProp");
 var factory_1 = require("../factory");
+var objectTypeFactory_1 = require("../helpers/objectTypeFactory");
 exports.default = function (test) {
     itsInvalid_1.default(10, 'not an object', test);
     factory_1.subGroup(test);
-    describeMemberProp_1.default(factory_1.subGroup, test);
+    describeMemberProp_1.default(function (test) {
+        return objectTypeFactory_1.default({
+            Agent: factory_1.agent,
+            Group: factory_1.subGroup,
+        }, 'Agent', test, { mbox: 'mailto:test@example.org' });
+    }, test);
     agentSchema_1.default(test);
 };
diff --git a/dist/warnings/RestrictedValueWarning.d.ts b/dist/warnings/RestrictedValueWarning.d.ts
@@ -0,0 +1,5 @@
+import { Path, Warning } from 'rulr';
+export default class RestrictedValueWarning extends Warning {
+    requiredValue: any;
+    constructor(data: any, path: Path, requiredValue: any);
+}
diff --git a/dist/warnings/RestrictedValueWarning.js b/dist/warnings/RestrictedValueWarning.js
@@ -11,11 +11,13 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
-var default_1 = (function (_super) {
-    __extends(default_1, _super);
-    function default_1() {
-        return _super !== null && _super.apply(this, arguments) || this;
+var RestrictedValueWarning = (function (_super) {
+    __extends(RestrictedValueWarning, _super);
+    function RestrictedValueWarning(data, path, requiredValue) {
+        var _this = _super.call(this, data, path) || this;
+        _this.requiredValue = requiredValue;
+        return _this;
     }
-    return default_1;
+    return RestrictedValueWarning;
 }(rulr_1.Warning));
-exports.default = default_1;
+exports.default = RestrictedValueWarning;
diff --git a/dist/warnings/Warning.d.ts b/dist/warnings/Warning.d.ts
diff --git a/src/helpers/agentSchema.ts b/src/helpers/agentSchema.ts
@@ -1,8 +1,9 @@
 import { optional, Rule } from 'rulr';
 import { stringValue, mailto, sha1, iri, account } from '../factory';
+import restrictToValue from './restrictToValue';
 
 export default {
-  objectType: optional(stringValue) as Rule,
+  objectType: optional(restrictToValue('Agent')) as Rule,
   name: optional(stringValue),
   mbox: optional(mailto),
   mbox_sha1sum: optional(sha1),
diff --git a/src/helpers/restrictToValue.ts b/src/helpers/restrictToValue.ts
@@ -0,0 +1,11 @@
+import { Rule } from 'rulr';
+import RestrictedValueWarning from '../warnings/RestrictedValueWarning';
+
+export default (value: any): Rule => {
+  return (data, path) => {
+    if (data !== value) {
+      return [new RestrictedValueWarning(data, path, value)];
+    }
+    return [];
+  };
+};
diff --git a/src/schemaRules/activity.ts b/src/schemaRules/activity.ts
@@ -1,8 +1,9 @@
 import { restrictToSchema, optional, required, Rule } from 'rulr';
-import { stringValue, iri, definition } from '../factory';
+import { iri, definition } from '../factory';
+import restrictToValue from '../helpers/restrictToValue';
 
 export default restrictToSchema({
-  objectType: optional(stringValue),
+  objectType: optional(restrictToValue('Activity')),
   id: required(iri),
   definition: optional(definition),
 }) as Rule;
diff --git a/src/schemaRules/context.ts b/src/schemaRules/context.ts
@@ -1,5 +1,6 @@
 import { restrictToSchema, restrictToCollection, optional, Rule } from 'rulr';
-import { activity,
+import {
+  activity,
   uuid,
   actor,
   group,
diff --git a/src/schemaRules/group.ts b/src/schemaRules/group.ts
@@ -7,13 +7,15 @@ import {
 } from 'rulr';
 import agentSchema from '../helpers/agentSchema';
 import getUsedIfis from '../helpers/getUsedIfis';
+import restrictToValue from '../helpers/restrictToValue';
 import { actor } from '../factory';
 import IfiCountWarning from '../warnings/IfiCountWarning';
 import NoMembersWarning from '../warnings/NoMembersWarning';
 
 export default composeRules([
   restrictToSchema(Object.assign({}, agentSchema, {
-    member: optional(restrictToCollection(() => actor))
+    objectType: optional(restrictToValue('Group')),
+    member: optional(restrictToCollection(() => actor)),
   })),
   (data, path) => {
     const usedIfis = getUsedIfis(data);
diff --git a/src/schemaRules/statementRef.ts b/src/schemaRules/statementRef.ts
@@ -1,7 +1,8 @@
 import { restrictToSchema, required, optional, Rule } from 'rulr';
-import { uuid, stringValue } from '../factory';
+import { uuid } from '../factory';
+import restrictToValue from '../helpers/restrictToValue';
 
 export default restrictToSchema({
-  objectType: optional(stringValue),
+  objectType: optional(restrictToValue('StatementRef')),
   id: required(uuid),
 }) as Rule;
diff --git a/src/schemaRules/subStatement.ts b/src/schemaRules/subStatement.ts
@@ -1,12 +1,12 @@
 import { restrictToSchema, composeRules, optional, Rule } from 'rulr';
 import statementSchema from '../helpers/statementSchema';
 import statementRules from '../helpers/statementRules';
-import { stringValue } from '../factory';
+import restrictToValue from '../helpers/restrictToValue';
 import SubStatementWarning from '../warnings/SubStatementWarning';
 
 export default composeRules([
   restrictToSchema(Object.assign({}, statementSchema, {
-    objectType: optional(stringValue),
+    objectType: optional(restrictToValue('SubStatement')),
   })),
   statementRules,
   (data, path) => {
diff --git a/src/tests/describeProp.ts b/src/tests/describeProp.ts
diff --git a/src/tests/helpers/object.ts b/src/tests/helpers/object.ts
diff --git a/src/tests/helpers/objectTypeFactory.ts b/src/tests/helpers/objectTypeFactory.ts
diff --git a/src/tests/schemaRules/activity.ts b/src/tests/schemaRules/activity.ts
diff --git a/src/tests/schemaRules/actor.ts b/src/tests/schemaRules/actor.ts
diff --git a/src/tests/schemaRules/authority.ts b/src/tests/schemaRules/authority.ts
diff --git a/src/tests/schemaRules/context.ts b/src/tests/schemaRules/context.ts
diff --git a/src/tests/schemaRules/contextActivities.ts b/src/tests/schemaRules/contextActivities.ts
diff --git a/src/tests/schemaRules/group.ts b/src/tests/schemaRules/group.ts
diff --git a/src/warnings/RestrictedValueWarning.ts b/src/warnings/RestrictedValueWarning.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { Rule } from 'rulr';`
	`2`	`+declare var _default: (value: any) => Rule;`
	`3`	`+export default _default;`