@based/schema 0.0.10 → 0.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/set/collections.js +39 -17
- package/dist/set/collections.js.map +1 -1
- package/dist/set/error.d.ts +4 -2
- package/dist/set/error.js +9 -3
- package/dist/set/error.js.map +1 -1
- package/dist/set/index.d.ts +2 -2
- package/dist/set/index.js +48 -8
- package/dist/set/index.js.map +1 -1
- package/dist/set/number.js +37 -23
- package/dist/set/number.js.map +1 -1
- package/dist/set/parseDefaultAndValue.js +5 -3
- package/dist/set/parseDefaultAndValue.js.map +1 -1
- package/dist/set/references.js +12 -5
- package/dist/set/references.js.map +1 -1
- package/dist/set/rest.js +4 -4
- package/dist/set/rest.js.map +1 -1
- package/dist/set/string.js +38 -34
- package/dist/set/string.js.map +1 -1
- package/dist/set2/index.js +1 -0
- package/dist/set2/index.js.map +1 -0
- package/dist/types.d.ts +8 -2
- package/dist/types.js.map +1 -1
- package/dist/walker.d.ts +50 -0
- package/dist/walker.js +83 -0
- package/dist/walker.js.map +1 -0
- package/package.json +1 -1
- package/src/index.ts +2 -0
- package/src/set/collections.ts +42 -17
- package/src/set/error.ts +13 -3
- package/src/set/index.ts +65 -8
- package/src/set/number.ts +39 -22
- package/src/set/parseDefaultAndValue.ts +13 -3
- package/src/set/references.ts +11 -5
- package/src/set/rest.ts +4 -4
- package/src/set/string.ts +48 -36
- package/src/set2/index.ts +0 -0
- package/src/types.ts +16 -7
- package/src/walker.ts +152 -0
- package/test/number.ts +646 -0
- package/test/reference.ts +207 -0
- package/test/setWalker.ts +101 -21
- package/test/string.ts +183 -0
- package/test/text.ts +171 -0
- package/test/validateSchema.ts +0 -1
- package/test/walker.ts +99 -0
- package/dist/deepPartial.js +0 -3
- package/dist/deepPartial.js.map +0 -1
- package/dist/schema.d.ts +0 -1
- package/dist/schema.js +0 -3
- package/dist/schema.js.map +0 -1
- package/dist/set/checkDefaultAndValue.d.ts +0 -3
- package/dist/set/checkDefaultAndValue.js +0 -33
- package/dist/set/checkDefaultAndValue.js.map +0 -1
- package/dist/set/enum.d.ts +0 -2
- package/dist/set/enum.js +0 -15
- package/dist/set/enum.js.map +0 -1
- package/dist/set/fieldValidator.d.ts +0 -6
- package/dist/set/fieldValidator.js +0 -144
- package/dist/set/fieldValidator.js.map +0 -1
- package/dist/set/handleError.d.ts +0 -1
- package/dist/set/handleError.js +0 -9
- package/dist/set/handleError.js.map +0 -1
- package/dist/set/number copy.d.ts +0 -4
- package/dist/set/number copy.js +0 -57
- package/dist/set/number copy.js.map +0 -1
- package/dist/set/rest copy.d.ts +0 -5
- package/dist/set/rest copy.js +0 -53
- package/dist/set/rest copy.js.map +0 -1
- package/dist/setWalker.d.ts +0 -11
- package/dist/setWalker.js +0 -189
- package/dist/setWalker.js.map +0 -1
- package/dist/transformers.d.ts +0 -3
- package/dist/transformers.js +0 -18
- package/dist/transformers.js.map +0 -1
- package/dist/typeWalker.d.ts +0 -3
- package/dist/typeWalker.js +0 -18
- package/dist/typeWalker.js.map +0 -1
- package/dist/validate.d.ts +0 -4
- package/dist/validate.js +0 -34
- package/dist/validate.js.map +0 -1
- package/dist/validateFields.d.ts +0 -4
- package/dist/validateFields.js +0 -34
- package/dist/validateFields.js.map +0 -1
- package/dist/validateSchema copy.d.ts +0 -4
- package/dist/validateSchema copy.js +0 -34
- package/dist/validateSchema copy.js.map +0 -1
- /package/dist/{deepPartial.d.ts → set2/index.d.ts} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"references.js","sourceRoot":"","sources":["../../src/set/references.ts"],"names":[],"mappings":";;;AACA,mCAA2C;AAEpC,MAAM,SAAS,GAAwB,KAAK,EACjD,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACT,EAAE;IACF,WAAW;IACX,6BAA6B;IAC7B,iBAAiB;IACjB,SAAS;IAET,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,IAAA,aAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"references.js","sourceRoot":"","sources":["../../src/set/references.ts"],"names":[],"mappings":"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"}
|
package/dist/set/rest.js
CHANGED
|
@@ -8,7 +8,7 @@ const parseDefaultAndValue_1 = require("./parseDefaultAndValue");
|
|
|
8
8
|
const cardinality = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
|
|
9
9
|
if (value && typeof value === 'object') {
|
|
10
10
|
if (value.$default !== undefined) {
|
|
11
|
-
(0, error_1.error)(
|
|
11
|
+
(0, error_1.error)(handlers, error_1.ParseError.defaultNotSupported, path);
|
|
12
12
|
}
|
|
13
13
|
if (value.$value !== undefined) {
|
|
14
14
|
value = (0, hash_1.hashObjectIgnoreKeyOrder)(value.$value).toString(16);
|
|
@@ -30,7 +30,7 @@ const boolean = async (path, value, fieldSchema, typeSchema, target, handlers, n
|
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
32
|
if (typeof value !== 'boolean') {
|
|
33
|
-
(0, error_1.error)(
|
|
33
|
+
(0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
|
|
34
34
|
}
|
|
35
35
|
if (!noCollect) {
|
|
36
36
|
handlers.collect({ path, value, typeSchema, fieldSchema, target });
|
|
@@ -48,7 +48,7 @@ const enumParser = async (path, value, fieldSchema, typeSchema, target, handlers
|
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
-
(0, error_1.error)(
|
|
51
|
+
(0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
|
|
52
52
|
}
|
|
53
53
|
};
|
|
54
54
|
exports.enumParser = enumParser;
|
|
@@ -69,7 +69,7 @@ const json = async (path, value, fieldSchema, typeSchema, target, handlers, noCo
|
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
catch (err) {
|
|
72
|
-
(0, error_1.error)(
|
|
72
|
+
(0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
|
|
73
73
|
}
|
|
74
74
|
};
|
|
75
75
|
exports.json = json;
|
package/dist/set/rest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../src/set/rest.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AACxC,sCAA4D;AAC5D,mCAA2C;AAC3C,iEAA6D;AAEtD,MAAM,WAAW,GAA0B,KAAK,EACrD,IAAI,EACJ,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACT,EAAE;IACF,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACtC,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;YAChC,IAAA,aAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../src/set/rest.ts"],"names":[],"mappings":"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"}
|
package/dist/set/string.js
CHANGED
|
@@ -70,31 +70,32 @@ const formatPatterns = {
|
|
|
70
70
|
licensePlate: validator_1.default.isLicensePlate,
|
|
71
71
|
VAT: validator_1.default.isVAT,
|
|
72
72
|
};
|
|
73
|
-
const validate = (path, value, fieldSchema) => {
|
|
73
|
+
const validate = (handlers, path, value, fieldSchema) => {
|
|
74
74
|
if (typeof value !== 'string') {
|
|
75
|
-
(0, error_1.error)(
|
|
75
|
+
(0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
|
|
76
76
|
}
|
|
77
77
|
if (fieldSchema.minLength && value.length < fieldSchema.minLength) {
|
|
78
|
-
(0, error_1.error)(
|
|
78
|
+
(0, error_1.error)(handlers, error_1.ParseError.subceedsMinimum, path);
|
|
79
79
|
}
|
|
80
80
|
if (fieldSchema.maxLength && value.length > fieldSchema.maxLength) {
|
|
81
|
-
(0, error_1.error)(
|
|
81
|
+
(0, error_1.error)(handlers, error_1.ParseError.exceedsMaximum, path);
|
|
82
82
|
}
|
|
83
83
|
if (fieldSchema.pattern) {
|
|
84
84
|
const re = new RegExp(fieldSchema.pattern);
|
|
85
85
|
if (!re.test(value)) {
|
|
86
|
-
(0, error_1.error)(
|
|
86
|
+
(0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
if (fieldSchema.format && !formatPatterns[fieldSchema.format](value)) {
|
|
90
|
-
(0, error_1.error)(
|
|
90
|
+
(0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
|
|
91
91
|
}
|
|
92
|
+
// return true / false and add collectError
|
|
92
93
|
};
|
|
93
94
|
const string = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
|
|
94
95
|
if (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, noCollect)) {
|
|
95
96
|
return;
|
|
96
97
|
}
|
|
97
|
-
validate(path, value, fieldSchema);
|
|
98
|
+
validate(handlers, path, value, fieldSchema);
|
|
98
99
|
if (!noCollect) {
|
|
99
100
|
handlers.collect({ path, value, typeSchema, fieldSchema, target });
|
|
100
101
|
}
|
|
@@ -103,7 +104,7 @@ exports.string = string;
|
|
|
103
104
|
const text = async (path, value, fieldSchema, typeSchema, target, handlers, noCollect) => {
|
|
104
105
|
const valueType = typeof value;
|
|
105
106
|
if (target.$language && valueType === 'string') {
|
|
106
|
-
validate(path, value, fieldSchema);
|
|
107
|
+
validate(handlers, path, value, fieldSchema);
|
|
107
108
|
if (!noCollect) {
|
|
108
109
|
handlers.collect({
|
|
109
110
|
path,
|
|
@@ -116,10 +117,21 @@ const text = async (path, value, fieldSchema, typeSchema, target, handlers, noCo
|
|
|
116
117
|
return;
|
|
117
118
|
}
|
|
118
119
|
if (valueType !== 'object') {
|
|
119
|
-
(0, error_1.error)(
|
|
120
|
+
(0, error_1.error)(handlers, error_1.ParseError.incorrectFormat, path);
|
|
120
121
|
}
|
|
121
122
|
if (target.$language &&
|
|
122
|
-
(await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers,
|
|
123
|
+
(await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, true))) {
|
|
124
|
+
if (!noCollect) {
|
|
125
|
+
handlers.collect({
|
|
126
|
+
path,
|
|
127
|
+
value: {
|
|
128
|
+
[target.$language]: value,
|
|
129
|
+
},
|
|
130
|
+
typeSchema,
|
|
131
|
+
fieldSchema,
|
|
132
|
+
target,
|
|
133
|
+
});
|
|
134
|
+
}
|
|
123
135
|
return;
|
|
124
136
|
}
|
|
125
137
|
else if (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value, fieldSchema, typeSchema, target, handlers, true)) {
|
|
@@ -135,35 +147,27 @@ const text = async (path, value, fieldSchema, typeSchema, target, handlers, noCo
|
|
|
135
147
|
return;
|
|
136
148
|
}
|
|
137
149
|
for (const key in value) {
|
|
138
|
-
|
|
150
|
+
if (!target.schema.languages.includes(key)) {
|
|
151
|
+
(0, error_1.error)(handlers, error_1.ParseError.languageNotSupported, path);
|
|
152
|
+
}
|
|
139
153
|
if (typeof value[key] === 'object') {
|
|
140
|
-
if (value[key]
|
|
141
|
-
|
|
142
|
-
}
|
|
143
|
-
if (!noCollect) {
|
|
144
|
-
handlers.collect({
|
|
145
|
-
path: newPath,
|
|
146
|
-
value: null,
|
|
147
|
-
typeSchema,
|
|
148
|
-
fieldSchema,
|
|
149
|
-
target,
|
|
150
|
-
});
|
|
154
|
+
if (await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, value[key], fieldSchema, typeSchema, target, handlers, true)) {
|
|
155
|
+
continue;
|
|
151
156
|
}
|
|
152
|
-
continue;
|
|
153
157
|
}
|
|
154
|
-
if (!(await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, {
|
|
155
|
-
validate(
|
|
156
|
-
}
|
|
157
|
-
if (!noCollect) {
|
|
158
|
-
handlers.collect({
|
|
159
|
-
path: newPath,
|
|
160
|
-
value: value[key],
|
|
161
|
-
typeSchema,
|
|
162
|
-
fieldSchema,
|
|
163
|
-
target,
|
|
164
|
-
});
|
|
158
|
+
if (!(await (0, parseDefaultAndValue_1.parseValueAndDefault)(path, { [key]: value[key] }, fieldSchema, typeSchema, target, handlers, true))) {
|
|
159
|
+
validate(handlers, path, value[key], fieldSchema);
|
|
165
160
|
}
|
|
166
161
|
}
|
|
162
|
+
if (!noCollect) {
|
|
163
|
+
handlers.collect({
|
|
164
|
+
path,
|
|
165
|
+
value,
|
|
166
|
+
typeSchema,
|
|
167
|
+
fieldSchema,
|
|
168
|
+
target,
|
|
169
|
+
});
|
|
170
|
+
}
|
|
167
171
|
};
|
|
168
172
|
exports.text = text;
|
|
169
173
|
//# sourceMappingURL=string.js.map
|
package/dist/set/string.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/set/string.ts"],"names":[],"mappings":";;;;;;AACA,mCAA2C;
|
|
1
|
+
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/set/string.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/set2/index.ts"],"names":[],"mappings":""}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Language } from './languages';
|
|
2
|
-
import type { PartialDeep } from 'type-fest';
|
|
2
|
+
import type { PartialDeep, SetOptional } from 'type-fest';
|
|
3
|
+
import { ParseError } from './set/error';
|
|
3
4
|
export type AllowedTypes = (string | {
|
|
4
5
|
type?: string;
|
|
5
6
|
$filter: any | any[];
|
|
@@ -9,7 +10,7 @@ export declare const isCollection: (type: string) => boolean;
|
|
|
9
10
|
export type BasedSchemaPattern = string;
|
|
10
11
|
export type BasedSchemaLanguage = Language;
|
|
11
12
|
export type BasedSchemaTypePrefix = string;
|
|
12
|
-
export type BasedSchemaContentMediaType = 'text/html' | 'text/plain' | 'text/markdown' | 'image/png' | 'image/jpeg' | 'video/mp4' | string
|
|
13
|
+
export type BasedSchemaContentMediaType = 'text/html' | 'text/plain' | 'text/markdown' | 'image/png' | 'image/jpeg' | 'video/mp4' | 'image/*' | 'video/*' | 'audio/*' | '*/*' | `${string}/${string}`;
|
|
13
14
|
export type BasedSchemaFieldShared = {
|
|
14
15
|
hooks?: {
|
|
15
16
|
interval?: number;
|
|
@@ -180,8 +181,13 @@ export type BasedSchemaCollectProps = {
|
|
|
180
181
|
target: BasedSetTarget;
|
|
181
182
|
};
|
|
182
183
|
export type BasedSetHandlers = {
|
|
184
|
+
collectErrors: (props: {
|
|
185
|
+
message: string;
|
|
186
|
+
code: ParseError;
|
|
187
|
+
}) => void;
|
|
183
188
|
collect: (props: BasedSchemaCollectProps) => void;
|
|
184
189
|
checkRequiredFields: (path: (string | number)[]) => Promise<boolean>;
|
|
185
190
|
referenceFilterCondition: (referenceId: string, $filter: any) => Promise<boolean>;
|
|
186
191
|
};
|
|
192
|
+
export type BasedSetOptionalHandlers = SetOptional<BasedSetHandlers, 'collectErrors' | 'collect'>;
|
|
187
193
|
export {};
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAuCO,MAAM,YAAY,GAAG,CAAC,IAAY,EAAW,EAAE;IACpD,OAAO,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ,CAAA;AACnE,CAAC,CAAA;AAFY,QAAA,YAAY,gBAExB"}
|
package/dist/walker.d.ts
ADDED
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { ParseError } from './set/error';
|
|
2
|
+
import { BasedSchema } from './types';
|
|
3
|
+
import { BasedSchemaType, BasedSchemaFields } from './types';
|
|
4
|
+
type Path = (string | number)[];
|
|
5
|
+
type ErrorHandler<T> = (args: Args<T>, code: ParseError) => void;
|
|
6
|
+
type Parse<T> = (args: Args<T>, key?: string | number, value?: any) => Promise<Args<T> | void>;
|
|
7
|
+
export type Args<T, K extends keyof BasedSchemaFields = keyof BasedSchemaFields> = {
|
|
8
|
+
schema: BasedSchema;
|
|
9
|
+
parentValue?: any;
|
|
10
|
+
skipCollection?: boolean;
|
|
11
|
+
fieldSchema?: BasedSchemaFields[K];
|
|
12
|
+
typeSchema?: BasedSchemaType;
|
|
13
|
+
path: Path;
|
|
14
|
+
value: any;
|
|
15
|
+
target: T;
|
|
16
|
+
parse: Parse<T>;
|
|
17
|
+
collect: (args: Args<T>) => any;
|
|
18
|
+
backtrack: (collectedCommands: any[]) => any;
|
|
19
|
+
requiresAsyncValidaton: (validationType: any) => Promise<any>;
|
|
20
|
+
error: ErrorHandler<T>;
|
|
21
|
+
};
|
|
22
|
+
export type FieldParser<T, K extends keyof BasedSchemaFields> = (args: Args<T, K>) => Promise<Args<T> | void>;
|
|
23
|
+
export type KeyParser<T> = (args: Args<T, keyof BasedSchemaFields>) => Promise<Args<T> | void>;
|
|
24
|
+
export type Opts<T> = {
|
|
25
|
+
schema: BasedSchema;
|
|
26
|
+
init: (value: any, opts: Opts<T>, errors: {
|
|
27
|
+
code: ParseError;
|
|
28
|
+
message: string;
|
|
29
|
+
}[]) => Promise<T>;
|
|
30
|
+
parsers: {
|
|
31
|
+
fields: Partial<{
|
|
32
|
+
[Key in keyof BasedSchemaFields]: FieldParser<T, Key>;
|
|
33
|
+
}>;
|
|
34
|
+
keys: {
|
|
35
|
+
[key: string]: KeyParser<T>;
|
|
36
|
+
};
|
|
37
|
+
any: KeyParser<T>;
|
|
38
|
+
};
|
|
39
|
+
collect: (args: Args<T>) => any;
|
|
40
|
+
backtrack: (collectedCommands: any[]) => any;
|
|
41
|
+
requiresAsyncValidaton: (validationType: any) => Promise<boolean>;
|
|
42
|
+
};
|
|
43
|
+
export declare const walk: <T>(opts: Opts<T>, value: any) => Promise<{
|
|
44
|
+
target: T;
|
|
45
|
+
errors: {
|
|
46
|
+
code: ParseError;
|
|
47
|
+
message: string;
|
|
48
|
+
}[];
|
|
49
|
+
}>;
|
|
50
|
+
export {};
|
package/dist/walker.js
ADDED
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.walk = void 0;
|
|
4
|
+
const walk = async (opts, value) => {
|
|
5
|
+
const errors = [];
|
|
6
|
+
const target = await opts.init(value, opts, errors);
|
|
7
|
+
const errorsCollector = (args, code) => {
|
|
8
|
+
errors.push({
|
|
9
|
+
code,
|
|
10
|
+
message: 'flap flap',
|
|
11
|
+
});
|
|
12
|
+
};
|
|
13
|
+
const parse = async (prevArgs, key, value) => {
|
|
14
|
+
const collectedCommands = [];
|
|
15
|
+
const fromBackTrack = [];
|
|
16
|
+
const args = {
|
|
17
|
+
schema: opts.schema,
|
|
18
|
+
path: key ? [...prevArgs.path, key] : prevArgs.path,
|
|
19
|
+
parentValue: value ? prevArgs.value : undefined,
|
|
20
|
+
value: value ?? prevArgs.value,
|
|
21
|
+
target,
|
|
22
|
+
parse: prevArgs.parse,
|
|
23
|
+
collect: (args) => {
|
|
24
|
+
collectedCommands.push(opts.collect(args));
|
|
25
|
+
},
|
|
26
|
+
backtrack: (args) => {
|
|
27
|
+
fromBackTrack.push(opts.backtrack(args));
|
|
28
|
+
},
|
|
29
|
+
error: errorsCollector,
|
|
30
|
+
requiresAsyncValidaton: opts.requiresAsyncValidaton,
|
|
31
|
+
};
|
|
32
|
+
if (typeof args.value === 'object' && args.value !== null) {
|
|
33
|
+
const q = [];
|
|
34
|
+
if (Array.isArray(args.value)) {
|
|
35
|
+
for (let i = 0; i < args.value.length; i++) {
|
|
36
|
+
//
|
|
37
|
+
const parser = opts.parsers.keys[i] || opts.parsers.any;
|
|
38
|
+
q.push(parser({ ...args, value: args.value[i], path: [...args.path, i] }));
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
for (const key in args.value) {
|
|
43
|
+
const parser = opts.parsers.keys[key] || opts.parsers.any;
|
|
44
|
+
q.push((async () => {
|
|
45
|
+
const newArgs = await parser({
|
|
46
|
+
...args,
|
|
47
|
+
value: args.value[key],
|
|
48
|
+
path: [...args.path, key],
|
|
49
|
+
});
|
|
50
|
+
if (newArgs) {
|
|
51
|
+
return parse(newArgs);
|
|
52
|
+
}
|
|
53
|
+
})());
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
await Promise.all(q);
|
|
57
|
+
if (fromBackTrack.length) {
|
|
58
|
+
opts.backtrack(fromBackTrack);
|
|
59
|
+
}
|
|
60
|
+
else if (collectedCommands.length) {
|
|
61
|
+
opts.backtrack(collectedCommands);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
const args = {
|
|
66
|
+
schema: opts.schema,
|
|
67
|
+
path: [],
|
|
68
|
+
value,
|
|
69
|
+
target,
|
|
70
|
+
parse,
|
|
71
|
+
collect: opts.collect,
|
|
72
|
+
backtrack: opts.backtrack,
|
|
73
|
+
error: errorsCollector,
|
|
74
|
+
requiresAsyncValidaton: opts.requiresAsyncValidaton,
|
|
75
|
+
};
|
|
76
|
+
parse(args);
|
|
77
|
+
return {
|
|
78
|
+
target,
|
|
79
|
+
errors,
|
|
80
|
+
};
|
|
81
|
+
};
|
|
82
|
+
exports.walk = walk;
|
|
83
|
+
//# sourceMappingURL=walker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"walker.js","sourceRoot":"","sources":["../src/walker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
package/src/set/collections.ts
CHANGED
|
@@ -2,6 +2,8 @@ import { Parser } from './types'
|
|
|
2
2
|
import { error, ParseError } from './error'
|
|
3
3
|
import { fieldWalker } from '.'
|
|
4
4
|
|
|
5
|
+
// what about making errors return signature
|
|
6
|
+
|
|
5
7
|
export const set: Parser<'set'> = async (
|
|
6
8
|
path,
|
|
7
9
|
value,
|
|
@@ -11,11 +13,19 @@ export const set: Parser<'set'> = async (
|
|
|
11
13
|
handlers,
|
|
12
14
|
noCollect
|
|
13
15
|
) => {
|
|
14
|
-
if (value && typeof value === 'object'
|
|
15
|
-
|
|
16
|
+
if (value && typeof value === 'object') {
|
|
17
|
+
if (value.$default) {
|
|
18
|
+
error(handlers, ParseError.defaultNotSupported, path)
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
if (value.$value) {
|
|
22
|
+
value = value.$value
|
|
23
|
+
}
|
|
16
24
|
}
|
|
25
|
+
|
|
17
26
|
const q: Promise<void>[] = []
|
|
18
27
|
const fieldDef = fieldSchema.items
|
|
28
|
+
|
|
19
29
|
if (Array.isArray(value)) {
|
|
20
30
|
const parsedArray = []
|
|
21
31
|
for (let i = 0; i < value.length; i++) {
|
|
@@ -86,17 +96,20 @@ export const object: Parser<'object'> = async (
|
|
|
86
96
|
noCollect
|
|
87
97
|
) => {
|
|
88
98
|
if (typeof value !== 'object') {
|
|
89
|
-
error(
|
|
99
|
+
error(handlers, ParseError.incorrectFormat, path)
|
|
100
|
+
return
|
|
90
101
|
}
|
|
91
102
|
const isArray = Array.isArray(value)
|
|
92
103
|
if (isArray) {
|
|
93
|
-
error(
|
|
104
|
+
error(handlers, ParseError.incorrectFormat, path)
|
|
105
|
+
return
|
|
94
106
|
}
|
|
95
107
|
const q: Promise<void>[] = []
|
|
96
108
|
for (const key in value) {
|
|
97
109
|
const propDef = fieldSchema.properties[key]
|
|
98
110
|
if (!propDef) {
|
|
99
|
-
error([...path, key]
|
|
111
|
+
error(handlers, ParseError.fieldDoesNotExist, [...path, key])
|
|
112
|
+
continue
|
|
100
113
|
}
|
|
101
114
|
q.push(
|
|
102
115
|
fieldWalker(
|
|
@@ -120,7 +133,7 @@ export const object: Parser<'object'> = async (
|
|
|
120
133
|
}
|
|
121
134
|
}
|
|
122
135
|
|
|
123
|
-
//
|
|
136
|
+
// IF REQUIRED AND PUSH OR UNSHIFT just throw here scince we dont need to parse at all...
|
|
124
137
|
export const array: Parser<'array'> = async (
|
|
125
138
|
path,
|
|
126
139
|
value,
|
|
@@ -144,13 +157,15 @@ export const array: Parser<'array'> = async (
|
|
|
144
157
|
if (value.$insert) {
|
|
145
158
|
opCount++
|
|
146
159
|
if (opCount > 1) {
|
|
147
|
-
error(
|
|
160
|
+
error(handlers, ParseError.multipleOperationsNotAllowed, path)
|
|
161
|
+
return
|
|
148
162
|
}
|
|
149
163
|
if (
|
|
150
164
|
typeof value.$insert !== 'object' ||
|
|
151
165
|
value.$insert.$idx === undefined
|
|
152
166
|
) {
|
|
153
|
-
error(
|
|
167
|
+
error(handlers, ParseError.incorrectFormat, path)
|
|
168
|
+
return
|
|
154
169
|
} else {
|
|
155
170
|
const insert = Array.isArray(value.$insert.$value)
|
|
156
171
|
? value.$insert.$value
|
|
@@ -175,16 +190,19 @@ export const array: Parser<'array'> = async (
|
|
|
175
190
|
if (value.$remove) {
|
|
176
191
|
opCount++
|
|
177
192
|
if (opCount > 1) {
|
|
178
|
-
error(
|
|
193
|
+
error(handlers, ParseError.multipleOperationsNotAllowed, path)
|
|
194
|
+
return
|
|
179
195
|
}
|
|
180
196
|
if (value.$remove.$idx === undefined) {
|
|
181
|
-
error(
|
|
197
|
+
error(handlers, ParseError.incorrectFormat, path)
|
|
198
|
+
return
|
|
182
199
|
}
|
|
183
200
|
}
|
|
184
201
|
if (value.$push) {
|
|
185
202
|
opCount++
|
|
186
203
|
if (opCount > 1) {
|
|
187
|
-
error(
|
|
204
|
+
error(handlers, ParseError.multipleOperationsNotAllowed, path)
|
|
205
|
+
return
|
|
188
206
|
}
|
|
189
207
|
|
|
190
208
|
// TODO: FIX PUSH PARSING
|
|
@@ -193,7 +211,8 @@ export const array: Parser<'array'> = async (
|
|
|
193
211
|
for (let i = 0; i < push.length; i++) {
|
|
194
212
|
q.push(
|
|
195
213
|
fieldWalker(
|
|
196
|
-
|
|
214
|
+
// exception
|
|
215
|
+
[...path, '$push', i],
|
|
197
216
|
push[i],
|
|
198
217
|
fieldSchema.values,
|
|
199
218
|
typeSchema,
|
|
@@ -209,7 +228,8 @@ export const array: Parser<'array'> = async (
|
|
|
209
228
|
if (value.$unshift) {
|
|
210
229
|
opCount++
|
|
211
230
|
if (opCount > 1) {
|
|
212
|
-
error(
|
|
231
|
+
error(handlers, ParseError.multipleOperationsNotAllowed, path)
|
|
232
|
+
return
|
|
213
233
|
}
|
|
214
234
|
const q: Promise<void>[] = []
|
|
215
235
|
const unshift = Array.isArray(value.$unshift)
|
|
@@ -220,7 +240,8 @@ export const array: Parser<'array'> = async (
|
|
|
220
240
|
for (let i = 0; i < unshift.length; i++) {
|
|
221
241
|
q.push(
|
|
222
242
|
fieldWalker(
|
|
223
|
-
|
|
243
|
+
// exception
|
|
244
|
+
[...path, '$unshift', i],
|
|
224
245
|
unshift[i],
|
|
225
246
|
fieldSchema.values,
|
|
226
247
|
typeSchema,
|
|
@@ -236,13 +257,15 @@ export const array: Parser<'array'> = async (
|
|
|
236
257
|
if (value.$assign) {
|
|
237
258
|
opCount++
|
|
238
259
|
if (opCount > 1) {
|
|
239
|
-
error(
|
|
260
|
+
error(handlers, ParseError.multipleOperationsNotAllowed, path)
|
|
261
|
+
return
|
|
240
262
|
}
|
|
241
263
|
if (
|
|
242
264
|
typeof value.$assign !== 'object' ||
|
|
243
265
|
typeof value.$assign.$idx !== 'number'
|
|
244
266
|
) {
|
|
245
|
-
error(
|
|
267
|
+
error(handlers, ParseError.incorrectFormat, path)
|
|
268
|
+
return
|
|
246
269
|
}
|
|
247
270
|
await fieldWalker(
|
|
248
271
|
[...path, value.$assign.$idx],
|
|
@@ -269,7 +292,8 @@ export const array: Parser<'array'> = async (
|
|
|
269
292
|
}
|
|
270
293
|
}
|
|
271
294
|
if (!isArray) {
|
|
272
|
-
error(
|
|
295
|
+
error(handlers, ParseError.incorrectFieldType, path)
|
|
296
|
+
return
|
|
273
297
|
}
|
|
274
298
|
const q: Promise<void>[] = []
|
|
275
299
|
const collector: any[] = []
|
|
@@ -294,6 +318,7 @@ export const array: Parser<'array'> = async (
|
|
|
294
318
|
)
|
|
295
319
|
)
|
|
296
320
|
}
|
|
321
|
+
|
|
297
322
|
await Promise.all(q)
|
|
298
323
|
|
|
299
324
|
if (!noCollect) {
|
package/src/set/error.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { BasedSetHandlers } from '../types'
|
|
2
|
+
|
|
1
3
|
export enum ParseError {
|
|
2
4
|
'incorrectFieldType',
|
|
3
5
|
'incorrectNodeType',
|
|
@@ -10,12 +12,20 @@ export enum ParseError {
|
|
|
10
12
|
'defaultNotSupported',
|
|
11
13
|
'multipleOperationsNotAllowed',
|
|
12
14
|
'requiredFieldNotDefined',
|
|
15
|
+
'languageNotSupported',
|
|
13
16
|
}
|
|
14
17
|
|
|
15
18
|
export const error = (
|
|
16
|
-
|
|
19
|
+
handlers: BasedSetHandlers,
|
|
17
20
|
error: ParseError,
|
|
18
|
-
|
|
21
|
+
path?: (number | string)[]
|
|
19
22
|
) => {
|
|
20
|
-
|
|
23
|
+
const message = path
|
|
24
|
+
? `${ParseError[error]} ${path.join('.')}`
|
|
25
|
+
: `${ParseError[error]}`
|
|
26
|
+
|
|
27
|
+
handlers.collectErrors({
|
|
28
|
+
message,
|
|
29
|
+
code: error,
|
|
30
|
+
})
|
|
21
31
|
}
|