Skip to content

Commit 53bfdf2

Browse files
committed
Upgrades rulr to 2.0.0.
1 parent 5ba70fb commit 53bfdf2

187 files changed

Lines changed: 673 additions & 283 deletions

File tree

Some content is hidden

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

dist/errors.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
23
var rulr_1 = require("rulr");
34
exports.subStatementError = function () {
45
return function (path) {

dist/factory.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
23
var values = require("./values");
34
var requireFile = function (file) {
45
return function (ruleAccessor) {

dist/helpers/agentSchema.d.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
import { Rule } from 'rulr';
12
declare var _default: {
2-
objectType: (data: any, path: string[]) => string[];
3-
name: (data: any, path: string[]) => string[];
4-
mbox: (data: any, path: string[]) => string[];
5-
mbox_sha1sum: (data: any, path: string[]) => string[];
6-
openid: (data: any, path: string[]) => string[];
7-
account: (data: any, path: string[]) => string[];
3+
objectType: Rule;
4+
name: Rule;
5+
mbox: Rule;
6+
mbox_sha1sum: Rule;
7+
openid: Rule;
8+
account: Rule;
89
};
910
export default _default;

dist/helpers/agentSchema.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
23
var rulr_1 = require("rulr");
34
var factory_1 = require("../factory");
4-
Object.defineProperty(exports, "__esModule", { value: true });
55
exports.default = {
66
objectType: rulr_1.optional(factory_1.stringValue),
77
name: rulr_1.optional(factory_1.stringValue),

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, error?: (data: any) => (path: string[]) => string) => Rule;
5+
declare var _default: (types: () => Types, defaultType: string) => Rule;
66
export default _default;

dist/helpers/objectTypeFactory.js

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
"use strict";
2-
var rulr_1 = require("rulr");
32
Object.defineProperty(exports, "__esModule", { value: true });
4-
exports.default = function (types, defaultType, error) {
5-
if (error === void 0) { error = function (data) { return rulr_1.warn("Invalid object type `" + data + "`"); }; }
6-
return rulr_1.first(rulr_1.checkType(Object), function (data, path) {
7-
var typeRules = types();
8-
var type = typeRules[data.objectType || defaultType];
9-
return (type === undefined ?
10-
[error(data.objectType)(path)] :
11-
type(data, path));
12-
});
13-
};
3+
var rulr_1 = require("rulr");
4+
var ObjectTypeWarning_1 = require("../warnings/ObjectTypeWarning");
5+
exports.default = function (types, defaultType) { return rulr_1.first(rulr_1.checkType(Object), function (data, path) {
6+
var typeRules = types();
7+
var type = typeRules[data.objectType || defaultType];
8+
return (type === undefined ?
9+
[new ObjectTypeWarning_1.default(data.objectType, path)] :
10+
type(data, path));
11+
}); };

dist/helpers/statementRules.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
declare var _default: (data: any, path: string[]) => string[];
1+
import { Rule } from 'rulr';
2+
declare var _default: Rule;
23
export default _default;

dist/helpers/statementRules.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
"use strict";
2-
var rulr_1 = require("rulr");
3-
var errors_1 = require("../errors");
42
Object.defineProperty(exports, "__esModule", { value: true });
3+
var rulr_1 = require("rulr");
4+
var ContextPropWarning_1 = require("../warnings/ContextPropWarning");
5+
var VoidWarning_1 = require("../warnings/VoidWarning");
56
exports.default = rulr_1.composeRules([
67
function (data, path) {
78
var objectIsActivity = (data.object != null &&
@@ -11,13 +12,13 @@ exports.default = rulr_1.composeRules([
1112
data.context.constructor === Object && (data.context.platform !== undefined ||
1213
data.context.revision !== undefined));
1314
var invalidContext = !objectIsActivity && hasInvalidProps;
14-
return invalidContext ? [errors_1.contextPropError()(path)] : [];
15+
return invalidContext ? [new ContextPropWarning_1.default(data, path)] : [];
1516
},
1617
function (data, path) {
1718
var voidVerbId = 'http://adlnet.gov/expapi/verbs/voided';
1819
var objectIsStatementRef = (data.object && data.object.objectType === 'StatementRef');
1920
var verbIsVoid = data.verb && data.verb.id === voidVerbId;
2021
var hasVoidError = verbIsVoid && !objectIsStatementRef;
21-
return hasVoidError ? [errors_1.voidError(voidVerbId)(path)] : [];
22+
return hasVoidError ? [new VoidWarning_1.default(data, path, voidVerbId)] : [];
2223
},
2324
]);

dist/helpers/statementSchema.d.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import { Rule } from 'rulr';
12
declare var _default: {
2-
actor: (data: any, path: string[]) => string[];
3-
verb: (data: any, path: string[]) => string[];
4-
object: (data: any, path: string[]) => string[];
5-
result: (data: any, path: string[]) => string[];
6-
context: (data: any, path: string[]) => string[];
7-
timestamp: (data: any, path: string[]) => string[];
8-
attachments: (data: any, path: string[]) => string[];
3+
actor: Rule;
4+
verb: Rule;
5+
object: Rule;
6+
result: Rule;
7+
context: Rule;
8+
timestamp: Rule;
9+
attachments: Rule;
910
};
1011
export default _default;

dist/helpers/statementSchema.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
23
var rulr_1 = require("rulr");
34
var factory_1 = require("../factory");
4-
Object.defineProperty(exports, "__esModule", { value: true });
55
exports.default = {
66
actor: rulr_1.required(factory_1.actor),
77
verb: rulr_1.required(factory_1.verb),

0 commit comments

Comments
 (0)