Skip to content

Commit e86a4de

Browse files
authored
Merge pull request #26 from LearningLocker/conformance
Fix revision and platform when objectType not set
2 parents c98b48e + 38f82ed commit e86a4de

File tree

98 files changed

+230
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+230
-142
lines changed

dist/factory.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export declare const definition: Rule;
1212
export declare const duration: Rule;
1313
export declare const extensions: Rule;
1414
export declare const group: Rule;
15+
export declare const groupAuthority: Rule;
1516
export declare const imt: Rule;
1617
export declare const integerValue: Rule;
1718
export declare const interactionComponent: Rule;

dist/factory.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ exports.definition = requireRule('./schemaRules/definition');
2323
exports.duration = requireRule('./regexValues/duration');
2424
exports.extensions = requireMap(function (maps) { return maps.extensions; });
2525
exports.group = requireRule('./schemaRules/group');
26+
exports.groupAuthority = requireRule('./schemaRules/groupAuthority');
2627
exports.imt = requireRule('./regexValues/imt');
2728
exports.integerValue = values.integerValue;
2829
exports.interactionComponent = requireRule('./schemaRules/interactionComponent');

dist/helpers/agentSchema.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Rule } from 'rulr';
2-
declare var _default: {
2+
declare const _default: {
33
objectType: Rule;
44
name: Rule;
55
mbox: Rule;

dist/helpers/getUsedIfis.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
declare var _default: (data: any) => string[];
1+
declare const _default: (data: any) => string[];
22
export default _default;

dist/helpers/objectTypeFactory.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ import { Rule } from 'rulr';
22
export declare type Types = {
33
[key: string]: Rule;
44
};
5-
declare var _default: (types: () => Types, defaultType: string) => Rule;
5+
declare const _default: (types: () => Types, defaultType: string) => Rule;
66
export default _default;

dist/helpers/restrictToValue.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import { Rule } from 'rulr';
2-
declare var _default: (value: any) => Rule;
2+
declare const _default: (value: any) => Rule;
33
export default _default;

dist/helpers/statementRules.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import { Rule } from 'rulr';
2-
declare var _default: Rule;
2+
declare const _default: Rule;
33
export default _default;

dist/helpers/statementRules.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
33
var rulr_1 = require("rulr");
44
var ContextPropWarning_1 = require("../warnings/ContextPropWarning");
55
var VoidWarning_1 = require("../warnings/VoidWarning");
6+
var lodash_1 = require("lodash");
67
exports.default = rulr_1.composeRules([
78
function (data, path) {
8-
var objectIsActivity = (data.object != null &&
9-
data.object.constructor === Object &&
10-
data.object.objectType === 'Activity');
11-
var hasInvalidProps = (data.context != null &&
12-
data.context.constructor === Object && (data.context.platform !== undefined ||
13-
data.context.revision !== undefined));
9+
var objectIsActivity = (lodash_1.isObject(data.object) &&
10+
(data.object.objectType === 'Activity' || data.object.objectType === undefined));
11+
var hasInvalidProps = (lodash_1.isObject(data.context) &&
12+
(data.context.platform !== undefined || data.context.revision !== undefined));
1413
var invalidContext = !objectIsActivity && hasInvalidProps;
1514
return invalidContext ? [new ContextPropWarning_1.default(data, path)] : [];
1615
},

dist/helpers/statementSchema.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Rule } from 'rulr';
2-
declare var _default: {
2+
declare const _default: {
33
actor: Rule;
44
verb: Rule;
55
object: Rule;

dist/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import { Warning } from 'rulr';
2-
declare var _default: (data: any) => Warning[];
2+
declare const _default: (data: any) => Warning[];
33
export default _default;

0 commit comments

Comments
 (0)