Merges master.

Author: ryasmi

dist/regexValues/duration.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
 var TypeWarning_1 = require("../warnings/TypeWarning");
-exports.default = rulr_1.checkRegex(/^P((\d+([\.,]\d+)?Y)?(\d+([\.,]\d+)?M)?(\d+([\.,]\d+)?W)?(\d+([\.,]\d+)?D)?)?(T(\d+([\.,]\d+)?H)?(\d+([\.,]\d+)?M)?(\d+([\.,]\d+)?S)?)?$/i, TypeWarning_1.createTypeWarning('ISO Duration'));
+exports.default = rulr_1.checkRegex(/^(-?)P(?=\d|T\d)(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)([DW]))?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?$/, TypeWarning_1.createTypeWarning('ISO Duration'));

dist/schemaRules/definition.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
 var InvalidComponentsWarning_1 = require("../warnings/InvalidComponentsWarning");
+var MissingInteractionTypeWarning_1 = require("../warnings/MissingInteractionTypeWarning");
 var factory_1 = require("../factory");
 var getSupportedComponents = function (interactionType) {
     switch (interactionType) {
@@ -55,4 +56,16 @@ exports.default = rulr_1.composeRules([
             ];
         return [];
     },
+    function (data, path) {
+        if (data == null || data.constructor !== Object)
+            return [];
+        var missingInteractionType = (data.correctResponsesPattern !== undefined &&
+            data.interactionType === undefined);
+        if (missingInteractionType) {
+            return [
+                new MissingInteractionTypeWarning_1.default(data, path)
+            ];
+        }
+        return [];
+    }
 ]);

dist/tests/regexValues/duration.js

@@ -3,8 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var itsInvalid_1 = require("../itsInvalid");
 var itsValid_1 = require("../itsValid");
 var validData = 'P3Y6M4DT12H30M5S';
+var validData2 = 'P4W';
 exports.default = function (test) {
     itsInvalid_1.default('3Y6M4DT12H30M5S', 'not a Duration', test);
+    itsInvalid_1.default('P4W1D', 'not a Duration', test);
     itsInvalid_1.default(10, 'not a String', test);
     itsValid_1.default(validData, test);
+    itsValid_1.default(validData2, test);
 };

dist/tests/schemaRules/definition.js

@@ -1,4 +1,12 @@
 "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 });
 var describeInteractionProp_1 = require("../describeInteractionProp");
 var describeOptionalProp_1 = require("../describeOptionalProp");
@@ -9,13 +17,19 @@ var validData = {};
 var correctResponsesPattern = collection_1.default(factory_1.stringValue);
 exports.default = function (test) {
     itsInvalid_1.default(10, 'not an object', test);
+    itsInvalid_1.default({
+        type: 'http://adlnet.gov/expapi/activities/cmi.interaction',
+        correctResponsesPattern: [
+            'Bob\'s your uncle'
+        ]
+    }, 'Missing interactionType', test);
     describeOptionalProp_1.default('name', factory_1.languageMap, validData, test);
     describeOptionalProp_1.default('description', factory_1.languageMap, validData, test);
     describeOptionalProp_1.default('type', factory_1.iri, validData, test);
     describeOptionalProp_1.default('moreInfo', factory_1.iri, validData, test);
     describeOptionalProp_1.default('extensions', factory_1.extensions, validData, test);
     describeOptionalProp_1.default('interactionType', factory_1.interactionType, validData, test);
-    describeOptionalProp_1.default('correctResponsesPattern', correctResponsesPattern, validData, test);
+    describeOptionalProp_1.default('correctResponsesPattern', correctResponsesPattern, __assign({}, validData, { type: 'http://adlnet.gov/expapi/activities/cmi.interaction', interactionType: 'fill-in' }), test);
     describeInteractionProp_1.default(['choices'], 'choice', test);
     describeInteractionProp_1.default(['choices'], 'sequencing', test);
     describeInteractionProp_1.default(['scale'], 'likert', test);

dist/warnings/MissingInteractionTypeWarning.d.ts

@@ -0,0 +1,4 @@
+import { Path, Warning } from 'rulr';
+export default class MissingInteractionTypeWarning extends Warning {
+    constructor(data: any, path: Path);
+}

dist/warnings/MissingInteractionTypeWarning.js

@@ -0,0 +1,21 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var rulr_1 = require("rulr");
+var MissingInteractionTypeWarning = (function (_super) {
+    __extends(MissingInteractionTypeWarning, _super);
+    function MissingInteractionTypeWarning(data, path) {
+        return _super.call(this, data, path) || this;
+    }
+    return MissingInteractionTypeWarning;
+}(rulr_1.Warning));
+exports.default = MissingInteractionTypeWarning;

src/regexValues/duration.ts

@@ -3,5 +3,5 @@ import { checkRegex, Rule } from 'rulr';
 import { createTypeWarning } from '../warnings/TypeWarning';
 
 export default checkRegex(
-  /^P((\d+([\.,]\d+)?Y)?(\d+([\.,]\d+)?M)?(\d+([\.,]\d+)?W)?(\d+([\.,]\d+)?D)?)?(T(\d+([\.,]\d+)?H)?(\d+([\.,]\d+)?M)?(\d+([\.,]\d+)?S)?)?$/i
+  /^(-?)P(?=\d|T\d)(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)([DW]))?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?$/
 , createTypeWarning('ISO Duration')) as Rule;

src/schemaRules/definition.ts

@@ -1,7 +1,8 @@
 import {
-  restrictToSchema, restrictToCollection, composeRules, optional, Rule
+  restrictToSchema, restrictToCollection, composeRules, optional, Rule, Warning
 } from 'rulr';
 import InvalidComponentsWarning from '../warnings/InvalidComponentsWarning';
+import MissingInteractionTypeWarning from '../warnings/MissingInteractionTypeWarning';
 import {
   languageMap,
   iri,
@@ -54,7 +55,7 @@ export default composeRules([
     target: optional(restrictToCollection(() => interactionComponent)),
     steps: optional(restrictToCollection(() => interactionComponent)),
   }),
-  (data, path) => {
+  (data, path): Warning[] => {
     if (data == null || data.constructor !== Object) return [];
     const interactionType = data.interactionType;
     const unsupportedComponents = getUnsupportedComponents(interactionType);
@@ -66,4 +67,17 @@ export default composeRules([
     ];
     return [];
   },
+  (data, path): Warning[] => {
+    if (data == null || data.constructor !== Object) return [];
+    const missingInteractionType = (
+      data.correctResponsesPattern !== undefined &&
+      data.interactionType === undefined
+    );
+    if (missingInteractionType) {
+      return [
+        new MissingInteractionTypeWarning(data, path)
+      ];
+    }
+    return [];
+  }
 ]) as Rule;

src/tests/regexValues/duration.ts

@@ -3,9 +3,12 @@ import itsInvalid from '../itsInvalid';
 import itsValid from '../itsValid';
 
 const validData = 'P3Y6M4DT12H30M5S';
+const validData2 = 'P4W';
 
 export default (test: Test) => {
   itsInvalid('3Y6M4DT12H30M5S', 'not a Duration', test);
+  itsInvalid('P4W1D', 'not a Duration', test);
   itsInvalid(10, 'not a String', test);
   itsValid(validData, test);
+  itsValid(validData2, test);
 };

src/tests/schemaRules/definition.ts

@@ -16,14 +16,24 @@ const correctResponsesPattern = collection(stringValue);
 
 export default (test: Test) => {
   itsInvalid(10, 'not an object', test);
+  itsInvalid({
+    type: 'http://adlnet.gov/expapi/activities/cmi.interaction',
+    correctResponsesPattern: [
+      'Bob\'s your uncle'
+    ]
+  }, 'Missing interactionType', test);
 
   describeOptionalProp('name', languageMap, validData, test);
   describeOptionalProp('description', languageMap, validData, test);
   describeOptionalProp('type', iri, validData, test);
   describeOptionalProp('moreInfo', iri, validData, test);
   describeOptionalProp('extensions', extensions, validData, test);
   describeOptionalProp('interactionType', interactionType, validData, test);
-  describeOptionalProp('correctResponsesPattern', correctResponsesPattern, validData, test);
+  describeOptionalProp('correctResponsesPattern', correctResponsesPattern, {
+    ...validData,
+    type: 'http://adlnet.gov/expapi/activities/cmi.interaction',
+    interactionType: 'fill-in'
+  }, test);
 
   describeInteractionProp(['choices'], 'choice', test);
   describeInteractionProp(['choices'], 'sequencing', test);