valleyed 4.1.4 → 4.1.6
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/CHANGELOG.md +9 -0
- package/README.md +6 -6
- package/lib/utils/differ.js +2 -2
- package/lib/utils/differ.js.map +1 -1
- package/lib/validators/index.d.ts +2 -4
- package/lib/validators/index.js +24 -18
- package/lib/validators/index.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [4.1.6](https://github.com/kevinand11/valleyed/compare/v4.1.5...v4.1.6) (2023-03-30)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* differ equal algo for object vs undefined/null ([beefccf](https://github.com/kevinand11/valleyed/commit/beefccf7b4e5d9d1c3a3aca8e85fa7836546be32))
|
|
11
|
+
|
|
12
|
+
### [4.1.5](https://github.com/kevinand11/valleyed/compare/v4.1.4...v4.1.5) (2023-03-19)
|
|
13
|
+
|
|
5
14
|
### [4.1.4](https://github.com/kevinand11/valleyed/compare/v4.1.3...v4.1.4) (2023-03-18)
|
|
6
15
|
|
|
7
16
|
|
package/README.md
CHANGED
|
@@ -221,24 +221,24 @@ const res = isCustom((value) => typeof value === 'function')(() => {}) // res.va
|
|
|
221
221
|
import { Validator, isEmail, isMinOf, isString, isNumber } from 'valleyed'
|
|
222
222
|
|
|
223
223
|
// The Validator.and function is used to build up a schema or list of rules to validate a value against
|
|
224
|
-
let res = Validator.and(
|
|
224
|
+
let res = Validator.and([[isEmail(), isMinOf(1)]])('johndoe@mail.com')
|
|
225
225
|
console.log(res) // { valid: true, errors: [], value: 'johndoe@mail.com' }
|
|
226
226
|
|
|
227
227
|
// if the value fails validation, it returns a list of all errors in the errors array
|
|
228
|
-
res = Validator.and(
|
|
228
|
+
res = Validator.and([[isEmail(), isMinOf(1)]])('')
|
|
229
229
|
console.log(res) // { valid: false, value: '', errors: [ 'is not a valid email', 'must contain 1 or more characters' ] }
|
|
230
230
|
|
|
231
231
|
// Similar to the And function, Validator has an or function that checks if the value passes validation for any of the list of rules passed in
|
|
232
|
-
let res = Validator.or(
|
|
232
|
+
let res = Validator.or([[isString(), isMinOf(1)], [isNumber()]])(2)
|
|
233
233
|
console.log(res) // { valid: true, value: 2, errors: [] }
|
|
234
234
|
|
|
235
235
|
// if the value fails validation, it returns a list of all errors in the errors array
|
|
236
|
-
res = Validator.or(
|
|
236
|
+
res = Validator.or([[isString(), isMinOf(1)], [isNumber()]])(false)
|
|
237
237
|
console.log(res) // { valid: false, value: false, errors: [ 'doesn't match any of the schema' ] }
|
|
238
238
|
|
|
239
239
|
// An optional third paramater can be passed into the And/Or functions to control if null and undefined are allowed to pass validation
|
|
240
|
-
Validator.and(
|
|
240
|
+
Validator.and([[isEmail()]], {
|
|
241
241
|
nullable: true, // Boolean: if true, null passed as the first argument passes validation
|
|
242
242
|
required: () => false // Boolean or Function that returns a boolean: if false, undefined passed as the first argument passes validation
|
|
243
|
-
})
|
|
243
|
+
})('')
|
|
244
244
|
```
|
package/lib/utils/differ.js
CHANGED
|
@@ -45,8 +45,8 @@ class Differ {
|
|
|
45
45
|
return false;
|
|
46
46
|
return val1.every((c, i) => Differ.equal(c, val2.at(i)));
|
|
47
47
|
}
|
|
48
|
-
const keys1 = Object.keys(val1);
|
|
49
|
-
const keys2 = Object.keys(val2);
|
|
48
|
+
const keys1 = Object.keys(val1 !== null && val1 !== void 0 ? val1 : {});
|
|
49
|
+
const keys2 = Object.keys(val2 !== null && val2 !== void 0 ? val2 : {});
|
|
50
50
|
if (keys1.length !== keys2.length)
|
|
51
51
|
return false;
|
|
52
52
|
const keys = [...new Set(keys1.concat(keys2))];
|
package/lib/utils/differ.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"differ.js","sourceRoot":"","sources":["../../src/utils/differ.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"differ.js","sourceRoot":"","sources":["../../src/utils/differ.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAa,MAAM;IAqBlB,MAAM,CAAC,KAAK,CAAE,EAAO,EAAE,EAAO;QAC7B,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAEvC,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;gBAAE,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;YACvE,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;YACxC,OAAO,CAAC,CAAA;QACT,CAAC,CAAC,CAAA;QAEF,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAE9B,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,KAAK,IAAI,CAAA;QACrD,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,KAAK,IAAI,CAAA;QACrD,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,KAAK,IAAI,CAAA;QACrD,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,KAAK,IAAI,CAAA;QACtD,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,KAAK,IAAI,CAAA;QACnD,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,SAAS,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,KAAK,IAAI,CAAA;QACxD,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,KAAK,IAAI,CAAA;QAEvD,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,OAAO,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAA;QAChG,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC7D,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,OAAO,EAAE,CAAA;QACpG,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAC,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,OAAO,KAAK,CAAA;YAC7C,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;gBAAE,OAAO,KAAK,CAAA;YAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;SACxD;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,CAAA;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,CAAA;QACrC,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC/C,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC9C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IAC7F,CAAC;IAoBD,MAAM,CAAC,IAAI,CAAE,IAAS,EAAE,IAAS;QAChC,OAAO,uBAAA,MAAM,2BAAS,MAAf,MAAM,EAAU,IAAI,EAAE,IAAI,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,CAAC,IAAI,CAAE,IAAc;QAC1B,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;aAC/C,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;;YACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;YACrB,MAAM,CAAC,GAAG,CAAC,GAAG,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,MAAA,MAAM,CAAC,GAAG,CAAC,mCAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YAClF,OAAO,MAAM,CAAA;QACd,CAAC,oBAAO,EAAE,EAAG,CAAA;QAEd,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,IAAI,EAAE,CAAC,EAAE,IAAkC,CAAC,CAAA;QAE3I,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IAClD,CAAC;CACD;AAzFD,wBAyFC;;IAvFC,OAAO;QACN,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA;QAC7D,KAAK,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA;QAC5D,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA;QAC7D,QAAQ,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,UAAU,CAAA,EAAA;QACjE,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA;QAC7D,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA,EAAA;QACrF,GAAG,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;QACxC,IAAI,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI;QACpC,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS;QAC9C,OAAO,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,SAAS,CAAA,EAAA;QAC/D,KAAK,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAC3C,IAAI,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA,EAAA;QAC3F,GAAG,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,KAAK,CAAA,EAAA;QACvD,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA;QAC7D,GAAG,EAAE,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,KAAK,CAAA,EAAA;KACvD,CAAA;AACF,CAAC,6CAoCgB,IAAS,EAAE,IAAS,EAAE,MAAe;IACrD,IAAI,CAAC,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAA;IAC3E,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IACtE,MAAM,IAAI,GAAa,EAAE,CAAA;IACzB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACvB,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAA;QACpD,IAAI,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE;YACrC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACpB,SAAQ;SACR;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;QACtB,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,uBAAA,MAAM,wBAAM,MAAZ,MAAM,CAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,GAAG,uBAAA,MAAM,2BAAS,MAAf,MAAM,EAAU,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAA;aAC/G,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;KACxD;IACD,OAAO,IAAI,CAAA;AACZ,CAAC"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { Options, Rule } from '../utils/rules';
|
|
2
|
-
type Validity<T> = ReturnType<Rule<T>>;
|
|
3
2
|
export declare class Validator {
|
|
4
|
-
static and<T>(
|
|
5
|
-
static or<T>(
|
|
3
|
+
static and<T>(rules: Rule<T>[][], options?: Partial<Options>): Rule<T>;
|
|
4
|
+
static or<T>(rules: Rule<T>[][], options?: Partial<Options>): Rule<T>;
|
|
6
5
|
}
|
|
7
|
-
export {};
|
package/lib/validators/index.js
CHANGED
|
@@ -3,25 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Validator = void 0;
|
|
4
4
|
const rules_1 = require("../utils/rules");
|
|
5
5
|
class Validator {
|
|
6
|
-
static and(
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
6
|
+
static and(rules, options) {
|
|
7
|
+
return (0, rules_1.makeRule)((val) => {
|
|
8
|
+
const value = val;
|
|
9
|
+
for (const rule of rules) {
|
|
10
|
+
const valid = (0, rules_1.check)(value, rule, options);
|
|
11
|
+
if (valid.valid)
|
|
12
|
+
continue;
|
|
13
|
+
else
|
|
14
|
+
return valid;
|
|
15
|
+
}
|
|
16
|
+
return { valid: true, value: value, errors: [] };
|
|
17
|
+
});
|
|
15
18
|
}
|
|
16
|
-
static or(
|
|
17
|
-
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
19
|
+
static or(rules, options) {
|
|
20
|
+
return (0, rules_1.makeRule)((val) => {
|
|
21
|
+
const value = val;
|
|
22
|
+
for (const rule of rules) {
|
|
23
|
+
const valid = (0, rules_1.check)(value, rule, options);
|
|
24
|
+
if (valid.valid)
|
|
25
|
+
return valid;
|
|
26
|
+
else
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
return { valid: false, value: value, errors: ['doesn\'t match any of the schema'] };
|
|
30
|
+
});
|
|
25
31
|
}
|
|
26
32
|
}
|
|
27
33
|
exports.Validator = Validator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validators/index.ts"],"names":[],"mappings":";;;AAAA,0CAA+D;AAE/D,MAAa,SAAS;IACd,MAAM,CAAC,GAAG,CAAK,KAAkB,EAAE,OAA0B;QACnE,OAAO,IAAA,gBAAQ,EAAI,CAAC,GAAG,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,GAAQ,CAAA;YACtB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACzB,MAAM,KAAK,GAAG,IAAA,aAAK,EAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;gBACzC,IAAI,KAAK,CAAC,KAAK;oBAAE,SAAQ;;oBACpB,OAAO,KAAK,CAAA;aACjB;YACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;QACjD,CAAC,CAAC,CAAA;IACH,CAAC;IAGM,MAAM,CAAC,EAAE,CAAK,KAAkB,EAAE,OAA0B;QAClE,OAAO,IAAA,gBAAQ,EAAI,CAAC,GAAG,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,GAAQ,CAAA;YACtB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACzB,MAAM,KAAK,GAAG,IAAA,aAAK,EAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;gBACzC,IAAI,KAAK,CAAC,KAAK;oBAAE,OAAO,KAAK,CAAA;;oBACxB,SAAQ;aACb;YACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,kCAAkC,CAAC,EAAE,CAAA;QACpF,CAAC,CAAC,CAAA;IACH,CAAC;CACD;AAzBD,8BAyBC"}
|
package/package.json
CHANGED