Fixes scores validation

dist/helpers/agentSchema.d.ts

@@ -1,5 +1,5 @@
 import { Rule } from 'rulr';
-declare const _default: {
+declare var _default: {
     objectType: Rule;
     name: Rule;
     mbox: Rule;

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),

dist/helpers/getUsedIfis.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (data: any) => string[];
+declare var _default: (data: any) => string[];
 export default _default;

dist/helpers/objectTypeFactory.d.ts

@@ -2,5 +2,5 @@ import { Rule } from 'rulr';
 export declare type Types = {
     [key: string]: Rule;
 };
-declare const _default: (types: () => Types, defaultType: string) => Rule;
+declare var _default: (types: () => Types, defaultType: string) => Rule;
 export default _default;

dist/helpers/restrictToValue.d.ts

@@ -0,0 +1,3 @@
+import { Rule } from 'rulr';
+declare var _default: (value: any) => Rule;
+export default _default;

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 [];
+    };
+};

dist/helpers/statementRules.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/helpers/statementSchema.d.ts

@@ -1,5 +1,5 @@
 import { Rule } from 'rulr';
-declare const _default: {
+declare var _default: {
     actor: Rule;
     verb: Rule;
     object: Rule;

dist/index.d.ts

@@ -1,3 +1,3 @@
 import { Warning } from 'rulr';
-declare const _default: (data: any) => Warning[];
+declare var _default: (data: any) => Warning[];
 export default _default;

dist/regexValues/duration.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/regexValues/imt.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/regexValues/interactionType.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/regexValues/iri.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/regexValues/language.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/regexValues/mailto.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/regexValues/sha1.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/regexValues/timestamp.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/regexValues/uuid.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/regexValues/version.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/account.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/activity.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

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),
 });

dist/schemaRules/actor.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/agent.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/attachment.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/authority.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/context.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/definition.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/group.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

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);

dist/schemaRules/interactionComponent.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/object.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/result.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/result.js

@@ -2,12 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
 var factory_1 = require("../factory");
-var score = rulr_1.restrictToSchema({
-    scaled: rulr_1.optional(factory_1.scaledValue),
-    raw: rulr_1.optional(factory_1.numberValue),
-    min: rulr_1.optional(factory_1.numberValue),
-    max: rulr_1.optional(factory_1.numberValue),
-});
+var RawLessThanMinWarning_1 = require("../warnings/RawLessThanMinWarning");
+var RawMoreThanMaxWarning_1 = require("../warnings/RawMoreThanMaxWarning");
+var MinMoreThanMaxWarning_1 = require("../warnings/MinMoreThanMaxWarning");
+var checkRawMoreThanMin = function (data, path) {
+    if (data.raw !== undefined && data.min !== undefined && data.raw < data.min) {
+        return [new RawLessThanMinWarning_1.default(data, path, data.raw, data.min)];
+    }
+    return [];
+};
+var checkRawLessThanMax = function (data, path) {
+    if (data.raw !== undefined && data.max !== undefined && data.raw > data.max) {
+        return [new RawMoreThanMaxWarning_1.default(data, path, data.raw, data.max)];
+    }
+    return [];
+};
+var checkMinLessThanMax = function (data, path) {
+    if (data.min !== undefined && data.max !== undefined && data.min > data.max) {
+        return [new MinMoreThanMaxWarning_1.default(data, path, data.min, data.max)];
+    }
+    return [];
+};
+var score = rulr_1.composeRules([
+    rulr_1.restrictToSchema({
+        scaled: rulr_1.optional(factory_1.scaledValue),
+        raw: rulr_1.optional(factory_1.numberValue),
+        min: rulr_1.optional(factory_1.numberValue),
+        max: rulr_1.optional(factory_1.numberValue),
+    }),
+    checkRawMoreThanMin,
+    checkRawLessThanMax,
+    checkMinLessThanMax,
+]);
 exports.default = rulr_1.restrictToSchema({
     score: rulr_1.optional(score),
     success: rulr_1.optional(factory_1.booleanValue),

dist/schemaRules/statement.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/schemaRules/statementRef.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

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),
 });

dist/schemaRules/subStatement.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

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) {

dist/schemaRules/verb.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from 'rulr';
-declare const _default: Rule;
+declare var _default: Rule;
 export default _default;

dist/tests/describeIfiProp.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="mocha" />
 import Test from './helpers/test';
 import 'mocha';
-declare const _default: (prop: string, describer: (test: Test) => void, test: Test) => Mocha.ISuite;
+declare var _default: (prop: string, describer: (test: Test) => void, test: Test) => Mocha.ISuite;
 export default _default;

dist/tests/describeInteractionProp.d.ts

@@ -1,4 +1,4 @@
 import 'mocha';
 import Test from './helpers/test';
-declare const _default: (validProps: string[], type: string, test: Test) => void;
+declare var _default: (validProps: string[], type: string, test: Test) => void;
 export default _default;

dist/tests/describeMemberProp.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="mocha" />
 import Test from './helpers/test';
 import 'mocha';
-declare const _default: (describer: (test: Test) => void, test: Test) => Mocha.ISuite;
+declare var _default: (describer: (test: Test) => void, test: Test) => Mocha.ISuite;
 export default _default;

dist/tests/describeOptionalProp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (prop: string, describer: (test: (data: any, valid: boolean) => void) => void, validData: any, test: (data: any, valid: boolean) => void) => void;
+declare var _default: (prop: string, describer: (test: (data: any, valid: boolean) => void) => void, validData: any, test: (data: any, valid: boolean) => void) => void;
 export default _default;

dist/tests/describeProp.d.ts

@@ -1,4 +1,4 @@
 import 'mocha';
 import Test from './helpers/test';
-declare const _default: (missingValid: boolean, description: string) => (prop: string, describer: (test: Test) => void, validData: any, test: Test) => void;
+declare var _default: (missingValid: boolean, description: string) => (prop: string, describer: (test: Test) => void, validData: any, test: Test) => void;
 export default _default;

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;
             });
         });

dist/tests/describeRequiredProp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (prop: string, describer: (test: (data: any, valid: boolean) => void) => void, validData: any, test: (data: any, valid: boolean) => void) => void;
+declare var _default: (prop: string, describer: (test: (data: any, valid: boolean) => void) => void, validData: any, test: (data: any, valid: boolean) => void) => void;
 export default _default;

dist/tests/helpers/agentSchema.d.ts

@@ -1,3 +1,3 @@
 import Test from '../helpers/test';
-declare const _default: (test: Test) => void;
+declare var _default: (test: Test) => void;
 export default _default;