@based/schema 1.1.0 → 1.1.2
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/set/fields/array.js +1 -2
- package/dist/set/fields/array.js.map +1 -1
- package/dist/set/fields/object.js +3 -2
- package/dist/set/fields/object.js.map +1 -1
- package/dist/walker/args.js +3 -4
- package/dist/walker/args.js.map +1 -1
- package/package.json +1 -1
- package/src/set/fields/array.ts +1 -4
- package/src/set/fields/object.ts +5 -2
- package/src/walker/args.ts +5 -4
- package/test/walker.ts +85 -0
package/dist/set/fields/array.js
CHANGED
|
@@ -22,8 +22,7 @@ const parseArray = async (args, value) => {
|
|
|
22
22
|
};
|
|
23
23
|
const operations = {
|
|
24
24
|
$insert: async (args, value) => {
|
|
25
|
-
if (typeof value.$insert !== '
|
|
26
|
-
typeof value.$insert.$idx !== 'number') {
|
|
25
|
+
if (typeof value.$insert.$idx !== 'number') {
|
|
27
26
|
args.error(error_1.ParseError.incorrectFormat);
|
|
28
27
|
return;
|
|
29
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../src/set/fields/array.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AACxC,uCAAwC;AAIxC,MAAM,UAAU,GAAG,KAAK,EACtB,IAAwC,EACxC,KAAU,EACM,EAAE;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACxD,MAAM,CAAC,GAAmB,EAAE,CAAA;IAC5B,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,CAAC,CAAC,IAAI,CACJ,IAAI,CAAC,KAAK,CAAC;YACT,IAAI,EAAE,CAAC,CAAC,CAAC;YACT,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;YACnB,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;YACpC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChB,IAAA,iBAAS,EAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;YACvC,CAAC;SACF,CAAC,CACH,CAAA;KACF;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACpB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,UAAU,GAKZ;IACF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAC7B,
|
|
1
|
+
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../src/set/fields/array.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.record = exports.object = void 0;
|
|
4
4
|
const error_1 = require("../../error");
|
|
5
5
|
const object = async (args) => {
|
|
6
|
-
if (typeof args.value !== 'object') {
|
|
6
|
+
if (typeof args.value !== 'object' || args.value === null) {
|
|
7
7
|
args.error(error_1.ParseError.incorrectFormat);
|
|
8
8
|
return;
|
|
9
9
|
}
|
|
10
|
+
console.log('hello wtf....', args.value);
|
|
10
11
|
const isArray = Array.isArray(args.value);
|
|
11
12
|
if (isArray) {
|
|
12
13
|
args.error(error_1.ParseError.incorrectFormat);
|
|
@@ -17,7 +18,7 @@ const object = async (args) => {
|
|
|
17
18
|
};
|
|
18
19
|
exports.object = object;
|
|
19
20
|
const record = async (args) => {
|
|
20
|
-
if (typeof args.value !== 'object') {
|
|
21
|
+
if (typeof args.value !== 'object' || args.value === null) {
|
|
21
22
|
args.error(error_1.ParseError.incorrectFormat);
|
|
22
23
|
return;
|
|
23
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../src/set/fields/object.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AAGjC,MAAM,MAAM,GAA0B,KAAK,EAAE,IAAI,EAAE,EAAE;IAC1D,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../src/set/fields/object.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AAGjC,MAAM,MAAM,GAA0B,KAAK,EAAE,IAAI,EAAE,EAAE;IAC1D,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE;QACzD,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,eAAe,CAAC,CAAA;QACtC,OAAM;KACP;IAED,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;IAExC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACzC,IAAI,OAAO,EAAE;QACX,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,eAAe,CAAC,CAAA;QACtC,OAAM;KACP;IACD,IAAI,CAAC,OAAO,EAAE,CAAA;IACd,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAfY,QAAA,MAAM,UAelB;AAEM,MAAM,MAAM,GAA0B,KAAK,EAAE,IAAI,EAAE,EAAE;IAC1D,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE;QACzD,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,eAAe,CAAC,CAAA;QACtC,OAAM;KACP;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACzC,IAAI,OAAO,EAAE;QACX,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,eAAe,CAAC,CAAA;QACtC,OAAM;KACP;IACD,IAAI,CAAC,OAAO,EAAE,CAAA;IACd,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAZY,QAAA,MAAM,UAYlB"}
|
package/dist/walker/args.js
CHANGED
|
@@ -49,6 +49,9 @@ class ArgsClass {
|
|
|
49
49
|
if (opts.collect) {
|
|
50
50
|
this._collectOverride = opts.collect;
|
|
51
51
|
}
|
|
52
|
+
else if (prev?._collectOverride) {
|
|
53
|
+
this._collectOverride = prev._collectOverride;
|
|
54
|
+
}
|
|
52
55
|
if (opts.skipCollection) {
|
|
53
56
|
this.skipCollection = opts.skipCollection;
|
|
54
57
|
}
|
|
@@ -102,9 +105,6 @@ class ArgsClass {
|
|
|
102
105
|
if (newArgs.value === undefined) {
|
|
103
106
|
newArgs.value = this.value;
|
|
104
107
|
}
|
|
105
|
-
if (this._collectOverride) {
|
|
106
|
-
newArgs._collectOverride = this._collectOverride;
|
|
107
|
-
}
|
|
108
108
|
return newArgs.parse();
|
|
109
109
|
}
|
|
110
110
|
}
|
|
@@ -149,7 +149,6 @@ class ArgsClass {
|
|
|
149
149
|
return;
|
|
150
150
|
}
|
|
151
151
|
const collectArgs = value !== undefined ? new ArgsClass({ value }, this) : this;
|
|
152
|
-
// this is prob still wrong
|
|
153
152
|
let collectTarget = this.prev;
|
|
154
153
|
if (this._collectOverride) {
|
|
155
154
|
collectTarget.collectedCommands.push(this._collectOverride(collectArgs));
|
package/dist/walker/args.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/walker/args.ts"],"names":[],"mappings":";;;AAEA,mCAA8E;AAC9E,mCAA+B;AAE/B,wCAAwC;AAExC,IAAI,EAAE,GAAG,CAAC,CAAA;AAEV,MAAa,SAAS;IAuCpB,YAAY,IAAoB,EAAE,IAAsB;QACtD,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAA;QACd,IAAI,CAAC,aAAa,GAAG,EAAE,CAAA;QACvB,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAA;QAC3B,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;SACjB;QACD,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAA;SACxC;QACD,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;YAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;YACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;SACpC;QACD,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;SACtB;aAAM,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE;YACzC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;SACrC;aAAM,IAAI,IAAI,IAAI,IAAI,EAAE;YACvB,kDAAkD;YAClD,0CAA0C;YAE1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;SACtB;aAAM;YACL,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;SACf;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACvB,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,4BAA4B;YAC5B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;SACpC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;SAClC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;SAC3B;QACD,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAA;SACrC;
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/walker/args.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/set/fields/array.ts
CHANGED
|
@@ -33,10 +33,7 @@ const operations: {
|
|
|
33
33
|
) => Promise<void>
|
|
34
34
|
} = {
|
|
35
35
|
$insert: async (args, value) => {
|
|
36
|
-
if (
|
|
37
|
-
typeof value.$insert !== 'object' ||
|
|
38
|
-
typeof value.$insert.$idx !== 'number'
|
|
39
|
-
) {
|
|
36
|
+
if (typeof value.$insert.$idx !== 'number') {
|
|
40
37
|
args.error(ParseError.incorrectFormat)
|
|
41
38
|
return
|
|
42
39
|
}
|
package/src/set/fields/object.ts
CHANGED
|
@@ -2,10 +2,13 @@ import { ParseError } from '../../error'
|
|
|
2
2
|
import { FieldParser } from '../../walker'
|
|
3
3
|
|
|
4
4
|
export const object: FieldParser<'object'> = async (args) => {
|
|
5
|
-
if (typeof args.value !== 'object') {
|
|
5
|
+
if (typeof args.value !== 'object' || args.value === null) {
|
|
6
6
|
args.error(ParseError.incorrectFormat)
|
|
7
7
|
return
|
|
8
8
|
}
|
|
9
|
+
|
|
10
|
+
console.log('hello wtf....', args.value)
|
|
11
|
+
|
|
9
12
|
const isArray = Array.isArray(args.value)
|
|
10
13
|
if (isArray) {
|
|
11
14
|
args.error(ParseError.incorrectFormat)
|
|
@@ -16,7 +19,7 @@ export const object: FieldParser<'object'> = async (args) => {
|
|
|
16
19
|
}
|
|
17
20
|
|
|
18
21
|
export const record: FieldParser<'record'> = async (args) => {
|
|
19
|
-
if (typeof args.value !== 'object') {
|
|
22
|
+
if (typeof args.value !== 'object' || args.value === null) {
|
|
20
23
|
args.error(ParseError.incorrectFormat)
|
|
21
24
|
return
|
|
22
25
|
}
|
package/src/walker/args.ts
CHANGED
|
@@ -86,7 +86,10 @@ export class ArgsClass<
|
|
|
86
86
|
}
|
|
87
87
|
if (opts.collect) {
|
|
88
88
|
this._collectOverride = opts.collect
|
|
89
|
+
} else if (prev?._collectOverride) {
|
|
90
|
+
this._collectOverride = prev._collectOverride
|
|
89
91
|
}
|
|
92
|
+
|
|
90
93
|
if (opts.skipCollection) {
|
|
91
94
|
this.skipCollection = opts.skipCollection
|
|
92
95
|
}
|
|
@@ -141,12 +144,11 @@ export class ArgsClass<
|
|
|
141
144
|
return parse(this)
|
|
142
145
|
} else {
|
|
143
146
|
const newArgs = new ArgsClass(opts, this)
|
|
147
|
+
|
|
144
148
|
if (newArgs.value === undefined) {
|
|
145
149
|
newArgs.value = this.value
|
|
146
150
|
}
|
|
147
|
-
|
|
148
|
-
newArgs._collectOverride = this._collectOverride
|
|
149
|
-
}
|
|
151
|
+
|
|
150
152
|
return newArgs.parse()
|
|
151
153
|
}
|
|
152
154
|
}
|
|
@@ -197,7 +199,6 @@ export class ArgsClass<
|
|
|
197
199
|
const collectArgs =
|
|
198
200
|
value !== undefined ? new ArgsClass({ value }, this) : this
|
|
199
201
|
|
|
200
|
-
// this is prob still wrong
|
|
201
202
|
let collectTarget = this.prev
|
|
202
203
|
|
|
203
204
|
if (this._collectOverride) {
|
package/test/walker.ts
CHANGED
|
@@ -71,6 +71,31 @@ const schema: BasedSchema = {
|
|
|
71
71
|
},
|
|
72
72
|
},
|
|
73
73
|
},
|
|
74
|
+
record: {
|
|
75
|
+
type: 'record',
|
|
76
|
+
values: {
|
|
77
|
+
type: 'object',
|
|
78
|
+
properties: {
|
|
79
|
+
bla: {
|
|
80
|
+
type: 'array',
|
|
81
|
+
values: {
|
|
82
|
+
type: 'object',
|
|
83
|
+
properties: {
|
|
84
|
+
snux: {
|
|
85
|
+
type: 'object',
|
|
86
|
+
properties: {
|
|
87
|
+
x: {
|
|
88
|
+
type: 'number',
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
},
|
|
92
|
+
flap: { type: 'number' },
|
|
93
|
+
},
|
|
94
|
+
},
|
|
95
|
+
},
|
|
96
|
+
},
|
|
97
|
+
},
|
|
98
|
+
},
|
|
74
99
|
bla: {
|
|
75
100
|
type: 'set',
|
|
76
101
|
items: { type: 'string', minLength: 3, maxLength: 6 },
|
|
@@ -920,5 +945,65 @@ test('string', async (t) => {
|
|
|
920
945
|
{ depth: 10 }
|
|
921
946
|
)
|
|
922
947
|
|
|
948
|
+
console.info('---- doink 40 array ------')
|
|
949
|
+
r = await setWalker(
|
|
950
|
+
schema,
|
|
951
|
+
{
|
|
952
|
+
$id: 'bl120',
|
|
953
|
+
intarray: {
|
|
954
|
+
$insert: {
|
|
955
|
+
$idx: 10,
|
|
956
|
+
$value: 1212,
|
|
957
|
+
},
|
|
958
|
+
},
|
|
959
|
+
},
|
|
960
|
+
async (args, type) => {
|
|
961
|
+
console.info('GO ASYNC', args.path, args.value, type)
|
|
962
|
+
if (args.value.type === 'thing') {
|
|
963
|
+
return 'ti' + Math.floor(Math.random() * 10000).toString(16)
|
|
964
|
+
} else {
|
|
965
|
+
return 'bl1221'
|
|
966
|
+
}
|
|
967
|
+
}
|
|
968
|
+
)
|
|
969
|
+
|
|
970
|
+
console.dir(r.errors)
|
|
971
|
+
console.dir(
|
|
972
|
+
r.collected.map((v) => ({ path: v.path, value: v.value })),
|
|
973
|
+
{ depth: 10 }
|
|
974
|
+
)
|
|
975
|
+
|
|
976
|
+
console.info('---- doink 41 record + array ------')
|
|
977
|
+
r = await setWalker(
|
|
978
|
+
schema,
|
|
979
|
+
{
|
|
980
|
+
$id: 'bl120',
|
|
981
|
+
record: {
|
|
982
|
+
blabla: {
|
|
983
|
+
bla: {
|
|
984
|
+
$insert: {
|
|
985
|
+
$value: { flap: 100 },
|
|
986
|
+
$idx: 0,
|
|
987
|
+
},
|
|
988
|
+
},
|
|
989
|
+
},
|
|
990
|
+
},
|
|
991
|
+
},
|
|
992
|
+
async (args, type) => {
|
|
993
|
+
console.info('GO ASYNC', args.path, args.value, type)
|
|
994
|
+
if (args.value.type === 'thing') {
|
|
995
|
+
return 'ti' + Math.floor(Math.random() * 10000).toString(16)
|
|
996
|
+
} else {
|
|
997
|
+
return 'bl1221'
|
|
998
|
+
}
|
|
999
|
+
}
|
|
1000
|
+
)
|
|
1001
|
+
|
|
1002
|
+
console.dir(r.errors)
|
|
1003
|
+
console.dir(
|
|
1004
|
+
r.collected.map((v) => ({ path: v.path, value: v.value })),
|
|
1005
|
+
{ depth: 10 }
|
|
1006
|
+
)
|
|
1007
|
+
|
|
923
1008
|
t.true(true)
|
|
924
1009
|
})
|