@c8y/client 1022.27.0 → 1022.30.0
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/lib/cjs/src/core/QueriesUtil.d.ts +1 -0
- package/lib/cjs/src/core/QueriesUtil.d.ts.map +1 -1
- package/lib/cjs/src/core/QueriesUtil.js +11 -4
- package/lib/cjs/src/core/QueriesUtil.js.map +1 -1
- package/lib/esm2015/src/core/QueriesUtil.d.ts +1 -0
- package/lib/esm2015/src/core/QueriesUtil.d.ts.map +1 -1
- package/lib/esm2015/src/core/QueriesUtil.js +11 -4
- package/lib/esm2015/src/core/QueriesUtil.js.map +1 -1
- package/lib/src/core/QueriesUtil.d.ts +1 -0
- package/lib/src/core/QueriesUtil.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -91,6 +91,7 @@ export declare class QueriesUtil {
|
|
|
91
91
|
addOrderbys(query: any, orderbys: any, how: 'prepend' | 'append'): any;
|
|
92
92
|
extractAndMergeOrderBys(queries: string[]): string;
|
|
93
93
|
protected glue(stmts: any[], type: string): any;
|
|
94
|
+
protected useAsFloat(operand: string | number): string;
|
|
94
95
|
protected quoteString(s: any): any;
|
|
95
96
|
protected skipEmptyObjects(objs: any[]): any[];
|
|
96
97
|
protected isEmptyObject(obj: object): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueriesUtil.d.ts","sourceRoot":"","sources":["../../../../src/core/QueriesUtil.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW;IACtB,SAAS,CAAC,WAAW;;;;;;;;;;;;;;8CAgDmB,MAAM;MAM5C;IAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgEG;IACH,UAAU,CAAC,KAAK,KAAA,GAAG,MAAM;IAazB,gBAAgB,CAAC,WAAW,KAAA,EAAE,SAAS,CAAC,KAAA,EAAE,SAAS,CAAC,KAAA,GAAG,MAAM;IAiC7D,iBAAiB,CAAC,aAAa,KAAA,GAAG,MAAM;IAcxC,YAAY,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAI1B,WAAW,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAIzB,SAAS,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;IAU/C,eAAe,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI/B,cAAc,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI9B,WAAW,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA,EAAE,GAAG,EAAE,SAAS,GAAG,QAAQ;IActD,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM;IAclD,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM;IAIzC,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG;IAI5B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE;IAItC,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM;IAInC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;CAMrB"}
|
|
1
|
+
{"version":3,"file":"QueriesUtil.d.ts","sourceRoot":"","sources":["../../../../src/core/QueriesUtil.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW;IACtB,SAAS,CAAC,WAAW;;;;;;;;;;;;;;8CAgDmB,MAAM;MAM5C;IAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgEG;IACH,UAAU,CAAC,KAAK,KAAA,GAAG,MAAM;IAazB,gBAAgB,CAAC,WAAW,KAAA,EAAE,SAAS,CAAC,KAAA,EAAE,SAAS,CAAC,KAAA,GAAG,MAAM;IAiC7D,iBAAiB,CAAC,aAAa,KAAA,GAAG,MAAM;IAcxC,YAAY,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAI1B,WAAW,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAIzB,SAAS,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;IAU/C,eAAe,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI/B,cAAc,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI9B,WAAW,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA,EAAE,GAAG,EAAE,SAAS,GAAG,QAAQ;IActD,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM;IAclD,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM;IAIzC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAQ7C,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG;IAI5B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE;IAItC,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM;IAInC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;CAMrB"}
|
|
@@ -20,16 +20,16 @@ class QueriesUtil {
|
|
|
20
20
|
return `${contextKey} eq ${this.quoteString(operand)}`;
|
|
21
21
|
},
|
|
22
22
|
__gt: (operand, contextKey) => {
|
|
23
|
-
return `${contextKey} gt ${this.
|
|
23
|
+
return `${contextKey} gt ${this.useAsFloat(operand)}`;
|
|
24
24
|
},
|
|
25
25
|
__ge: (operand, contextKey) => {
|
|
26
|
-
return `${contextKey} ge ${this.
|
|
26
|
+
return `${contextKey} ge ${this.useAsFloat(operand)}`;
|
|
27
27
|
},
|
|
28
28
|
__lt: (operand, contextKey) => {
|
|
29
|
-
return `${contextKey} lt ${this.
|
|
29
|
+
return `${contextKey} lt ${this.useAsFloat(operand)}`;
|
|
30
30
|
},
|
|
31
31
|
__le: (operand, contextKey) => {
|
|
32
|
-
return `${contextKey} le ${this.
|
|
32
|
+
return `${contextKey} le ${this.useAsFloat(operand)}`;
|
|
33
33
|
},
|
|
34
34
|
__in: (operand, contextKey) => {
|
|
35
35
|
const stmts = operand
|
|
@@ -229,6 +229,13 @@ class QueriesUtil {
|
|
|
229
229
|
glue(stmts, type) {
|
|
230
230
|
return stmts.length > 1 ? `(${stmts.join(`) ${type} (`)})` : stmts[0];
|
|
231
231
|
}
|
|
232
|
+
useAsFloat(operand) {
|
|
233
|
+
operand = this.quoteString(operand);
|
|
234
|
+
if (typeof operand === 'number') {
|
|
235
|
+
return `${operand}f`;
|
|
236
|
+
}
|
|
237
|
+
return operand;
|
|
238
|
+
}
|
|
232
239
|
quoteString(s) {
|
|
233
240
|
return typeof s === 'string' ? `'${this.escapeString(s)}'` : s;
|
|
234
241
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueriesUtil.js","sourceRoot":"","sources":["../../../../src/core/QueriesUtil.ts"],"names":[],"mappings":";;;AAAA,MAAa,WAAW;IAAxB;QACY,gBAAW,GAAG;YACtB,KAAK,EAAE,OAAO,CAAC,EAAE;gBACf,OAAO,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC;YACxD,CAAC;YACD,KAAK,EAAE,OAAO,CAAC,EAAE;gBACf,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;YACD,IAAI,EAAE,OAAO,CAAC,EAAE;gBACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACpD,CAAC;YACD,IAAI,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE;gBAC5B,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;oBACpD,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;gBACpD,CAAC;gBACD,OAAO,GAAG,UAAU,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YACzD,CAAC;YACD,IAAI,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE;gBAC5B,OAAO,GAAG,UAAU,OAAO,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"QueriesUtil.js","sourceRoot":"","sources":["../../../../src/core/QueriesUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -91,6 +91,7 @@ export declare class QueriesUtil {
|
|
|
91
91
|
addOrderbys(query: any, orderbys: any, how: 'prepend' | 'append'): any;
|
|
92
92
|
extractAndMergeOrderBys(queries: string[]): string;
|
|
93
93
|
protected glue(stmts: any[], type: string): any;
|
|
94
|
+
protected useAsFloat(operand: string | number): string;
|
|
94
95
|
protected quoteString(s: any): any;
|
|
95
96
|
protected skipEmptyObjects(objs: any[]): any[];
|
|
96
97
|
protected isEmptyObject(obj: object): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueriesUtil.d.ts","sourceRoot":"","sources":["../../../../src/core/QueriesUtil.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW;IACtB,SAAS,CAAC,WAAW;;;;;;;;;;;;;;8CAgDmB,MAAM;MAM5C;IAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgEG;IACH,UAAU,CAAC,KAAK,KAAA,GAAG,MAAM;IAazB,gBAAgB,CAAC,WAAW,KAAA,EAAE,SAAS,CAAC,KAAA,EAAE,SAAS,CAAC,KAAA,GAAG,MAAM;IAiC7D,iBAAiB,CAAC,aAAa,KAAA,GAAG,MAAM;IAcxC,YAAY,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAI1B,WAAW,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAIzB,SAAS,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;IAU/C,eAAe,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI/B,cAAc,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI9B,WAAW,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA,EAAE,GAAG,EAAE,SAAS,GAAG,QAAQ;IActD,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM;IAclD,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM;IAIzC,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG;IAI5B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE;IAItC,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM;IAInC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;CAMrB"}
|
|
1
|
+
{"version":3,"file":"QueriesUtil.d.ts","sourceRoot":"","sources":["../../../../src/core/QueriesUtil.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW;IACtB,SAAS,CAAC,WAAW;;;;;;;;;;;;;;8CAgDmB,MAAM;MAM5C;IAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgEG;IACH,UAAU,CAAC,KAAK,KAAA,GAAG,MAAM;IAazB,gBAAgB,CAAC,WAAW,KAAA,EAAE,SAAS,CAAC,KAAA,EAAE,SAAS,CAAC,KAAA,GAAG,MAAM;IAiC7D,iBAAiB,CAAC,aAAa,KAAA,GAAG,MAAM;IAcxC,YAAY,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAI1B,WAAW,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAIzB,SAAS,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;IAU/C,eAAe,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI/B,cAAc,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI9B,WAAW,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA,EAAE,GAAG,EAAE,SAAS,GAAG,QAAQ;IActD,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM;IAclD,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM;IAIzC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAQ7C,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG;IAI5B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE;IAItC,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM;IAInC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;CAMrB"}
|
|
@@ -17,16 +17,16 @@ export class QueriesUtil {
|
|
|
17
17
|
return `${contextKey} eq ${this.quoteString(operand)}`;
|
|
18
18
|
},
|
|
19
19
|
__gt: (operand, contextKey) => {
|
|
20
|
-
return `${contextKey} gt ${this.
|
|
20
|
+
return `${contextKey} gt ${this.useAsFloat(operand)}`;
|
|
21
21
|
},
|
|
22
22
|
__ge: (operand, contextKey) => {
|
|
23
|
-
return `${contextKey} ge ${this.
|
|
23
|
+
return `${contextKey} ge ${this.useAsFloat(operand)}`;
|
|
24
24
|
},
|
|
25
25
|
__lt: (operand, contextKey) => {
|
|
26
|
-
return `${contextKey} lt ${this.
|
|
26
|
+
return `${contextKey} lt ${this.useAsFloat(operand)}`;
|
|
27
27
|
},
|
|
28
28
|
__le: (operand, contextKey) => {
|
|
29
|
-
return `${contextKey} le ${this.
|
|
29
|
+
return `${contextKey} le ${this.useAsFloat(operand)}`;
|
|
30
30
|
},
|
|
31
31
|
__in: (operand, contextKey) => {
|
|
32
32
|
const stmts = operand
|
|
@@ -227,6 +227,13 @@ export class QueriesUtil {
|
|
|
227
227
|
glue(stmts, type) {
|
|
228
228
|
return stmts.length > 1 ? `(${stmts.join(`) ${type} (`)})` : stmts[0];
|
|
229
229
|
}
|
|
230
|
+
useAsFloat(operand) {
|
|
231
|
+
operand = this.quoteString(operand);
|
|
232
|
+
if (typeof operand === 'number') {
|
|
233
|
+
return `${operand}f`;
|
|
234
|
+
}
|
|
235
|
+
return operand;
|
|
236
|
+
}
|
|
230
237
|
quoteString(s) {
|
|
231
238
|
return typeof s === 'string' ? `'${this.escapeString(s)}'` : s;
|
|
232
239
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueriesUtil.js","sourceRoot":"","sources":["../../../../src/core/QueriesUtil.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,WAAW;IAAxB;QACY,gBAAW,GAAG;YACtB,KAAK,EAAE,OAAO,CAAC,EAAE;gBACf,OAAO,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC;YACxD,CAAC;YACD,KAAK,EAAE,OAAO,CAAC,EAAE;gBACf,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;YACD,IAAI,EAAE,OAAO,CAAC,EAAE;gBACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACpD,CAAC;YACD,IAAI,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE;gBAC5B,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;oBACpD,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;gBACpD,CAAC;gBACD,OAAO,GAAG,UAAU,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YACzD,CAAC;YACD,IAAI,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE;gBAC5B,OAAO,GAAG,UAAU,OAAO,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"QueriesUtil.js","sourceRoot":"","sources":["../../../../src/core/QueriesUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -91,6 +91,7 @@ export declare class QueriesUtil {
|
|
|
91
91
|
addOrderbys(query: any, orderbys: any, how: 'prepend' | 'append'): any;
|
|
92
92
|
extractAndMergeOrderBys(queries: string[]): string;
|
|
93
93
|
protected glue(stmts: any[], type: string): any;
|
|
94
|
+
protected useAsFloat(operand: string | number): string;
|
|
94
95
|
protected quoteString(s: any): any;
|
|
95
96
|
protected skipEmptyObjects(objs: any[]): any[];
|
|
96
97
|
protected isEmptyObject(obj: object): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueriesUtil.d.ts","sourceRoot":"","sources":["../../../src/core/QueriesUtil.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW;IACtB,SAAS,CAAC,WAAW;;;;;;;;;;;;;;8CAgDmB,MAAM;MAM5C;IAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgEG;IACH,UAAU,CAAC,KAAK,KAAA,GAAG,MAAM;IAazB,gBAAgB,CAAC,WAAW,KAAA,EAAE,SAAS,CAAC,KAAA,EAAE,SAAS,CAAC,KAAA,GAAG,MAAM;IAiC7D,iBAAiB,CAAC,aAAa,KAAA,GAAG,MAAM;IAcxC,YAAY,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAI1B,WAAW,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAIzB,SAAS,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;IAU/C,eAAe,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI/B,cAAc,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI9B,WAAW,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA,EAAE,GAAG,EAAE,SAAS,GAAG,QAAQ;IActD,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM;IAclD,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM;IAIzC,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG;IAI5B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE;IAItC,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM;IAInC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;CAMrB"}
|
|
1
|
+
{"version":3,"file":"QueriesUtil.d.ts","sourceRoot":"","sources":["../../../src/core/QueriesUtil.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW;IACtB,SAAS,CAAC,WAAW;;;;;;;;;;;;;;8CAgDmB,MAAM;MAM5C;IAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgEG;IACH,UAAU,CAAC,KAAK,KAAA,GAAG,MAAM;IAazB,gBAAgB,CAAC,WAAW,KAAA,EAAE,SAAS,CAAC,KAAA,EAAE,SAAS,CAAC,KAAA,GAAG,MAAM;IAiC7D,iBAAiB,CAAC,aAAa,KAAA,GAAG,MAAM;IAcxC,YAAY,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAI1B,WAAW,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAIzB,SAAS,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;IAU/C,eAAe,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI/B,cAAc,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA;IAI9B,WAAW,CAAC,KAAK,KAAA,EAAE,QAAQ,KAAA,EAAE,GAAG,EAAE,SAAS,GAAG,QAAQ;IActD,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM;IAclD,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM;IAIzC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAQ7C,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG;IAI5B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE;IAItC,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM;IAInC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;CAMrB"}
|
package/package.json
CHANGED