@nangohq/nango-yaml 0.40.10 → 0.41.1
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/errors.d.ts +1 -1
- package/dist/errors.js +5 -2
- package/dist/errors.js.map +1 -1
- package/dist/helpers.js +1 -1
- package/dist/helpers.js.map +1 -1
- package/dist/modelsParser.d.ts +10 -5
- package/dist/modelsParser.js +73 -30
- package/dist/modelsParser.js.map +1 -1
- package/dist/modelsParser.unit.test.js +44 -4
- package/dist/modelsParser.unit.test.js.map +1 -1
- package/dist/parser.js +14 -2
- package/dist/parser.js.map +1 -1
- package/dist/parser.v1.js +4 -2
- package/dist/parser.v1.js.map +1 -1
- package/dist/parser.v1.unit.test.js +6 -3
- package/dist/parser.v1.unit.test.js.map +1 -1
- package/dist/parser.v2.js +3 -1
- package/dist/parser.v2.js.map +1 -1
- package/dist/parser.v2.unit.test.js +47 -3
- package/dist/parser.v2.unit.test.js.map +1 -1
- package/package.json +2 -2
package/dist/errors.d.ts
CHANGED
|
@@ -58,7 +58,7 @@ export declare class ParserErrorModelIsLiteral extends ParserError {
|
|
|
58
58
|
}
|
|
59
59
|
export declare class ParserErrorCycle extends ParserError {
|
|
60
60
|
constructor(options: {
|
|
61
|
-
|
|
61
|
+
stack: Set<string>;
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
export declare class ParserErrorExtendsNotFound extends ParserError {
|
package/dist/errors.js
CHANGED
|
@@ -82,10 +82,13 @@ export class ParserErrorModelIsLiteral extends ParserError {
|
|
|
82
82
|
}
|
|
83
83
|
export class ParserErrorCycle extends ParserError {
|
|
84
84
|
constructor(options) {
|
|
85
|
+
const arr = Array.from(options.stack);
|
|
86
|
+
const start = arr.shift();
|
|
87
|
+
const end = arr.pop();
|
|
85
88
|
super({
|
|
86
89
|
code: 'cyclic_model',
|
|
87
|
-
message: `Cyclic import ${
|
|
88
|
-
path:
|
|
90
|
+
message: `Cyclic import ${start}->${end}`,
|
|
91
|
+
path: Array.from(options.stack)
|
|
89
92
|
});
|
|
90
93
|
}
|
|
91
94
|
}
|
package/dist/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../lib/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,WAAW;IACpB,IAAI,CAAC;IACL,OAAO,CAAS;IAChB,IAAI,CAAS;IAEb,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAqD;QAClF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;CACJ;AAED,MAAM,OAAO,2BAA4B,SAAQ,WAAW;IACxD,YAAY,OAA0C;QAClD,KAAK,CAAC;YACF,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,UAAU,OAAO,CAAC,KAAK,+BAA+B;YAC/D,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,OAAO,yBAA0B,SAAQ,WAAW;IACtD,YAAY,OAA0C;QAClD,KAAK,CAAC;YACF,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,UAAU,OAAO,CAAC,KAAK,yFAAyF;YACzH,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,OAAO,wBAAyB,SAAQ,WAAW;IACrD,YAAY,OAA0C;QAClD,KAAK,CAAC;YACF,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,UAAU,OAAO,CAAC,KAAK,mBAAmB;YACnD,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,OAAO,oBAAqB,SAAQ,WAAW;IACjD,YAAY,OAA0C;QAClD,KAAK,CAAC;YACF,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,UAAU,OAAO,CAAC,KAAK,8FAA8F;YAC9H,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,OAAO,4BAA6B,SAAQ,WAAW;IACzD,YAAY,OAA6C;QACrD,KAAK,CAAC;YACF,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,aAAa,OAAO,CAAC,QAAQ,sEAAsE;YAC5G,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,OAAO,4BAA6B,SAAQ,WAAW;IACzD,YAAY,OAA6C;QACrD,KAAK,CAAC;YACF,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,2EAA2E,OAAO,CAAC,QAAQ,gDAAgD;YACpJ,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,OAAO,sBAAuB,SAAQ,WAAW;IACnD,YAAY,OAA4C;QACpD,KAAK,CAAC;YACF,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,OAAO,yBAA0B,SAAQ,WAAW;IACtD,YAAY,OAA0C;QAClD,KAAK,CAAC;YACF,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,mBAAmB,OAAO,CAAC,KAAK,+FAA+F;YACxI,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IAC7C,YAAY,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../lib/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers.js
CHANGED
package/dist/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../lib/helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../lib/helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/modelsParser.d.ts
CHANGED
|
@@ -11,16 +11,21 @@ export declare class ModelsParser {
|
|
|
11
11
|
});
|
|
12
12
|
parseAll(): void;
|
|
13
13
|
get(name: string): NangoModel | undefined;
|
|
14
|
-
parseOne({ name, fields }: {
|
|
14
|
+
parseOne({ name, fields, stack }: {
|
|
15
15
|
name: string;
|
|
16
16
|
fields: NangoYamlModelFields;
|
|
17
|
+
stack: Set<string>;
|
|
17
18
|
}): void;
|
|
18
|
-
ifModelParse({ name,
|
|
19
|
+
ifModelParse({ name, stack }: {
|
|
19
20
|
name: string;
|
|
20
|
-
|
|
21
|
+
stack: Set<string>;
|
|
21
22
|
}): true | false;
|
|
22
|
-
parseFields({ fields,
|
|
23
|
+
parseFields({ fields, stack }: {
|
|
23
24
|
fields: NangoYamlModelFields;
|
|
24
|
-
|
|
25
|
+
stack: Set<string>;
|
|
25
26
|
}): NangoModelField[];
|
|
26
27
|
}
|
|
28
|
+
/**
|
|
29
|
+
* Get recursively (and safely) all the model names inside a model
|
|
30
|
+
*/
|
|
31
|
+
export declare function getRecursiveModelNames(parser: ModelsParser, name: string): Set<string>;
|
package/dist/modelsParser.js
CHANGED
|
@@ -18,7 +18,7 @@ export class ModelsParser {
|
|
|
18
18
|
if (this.parsed.has(name)) {
|
|
19
19
|
continue;
|
|
20
20
|
}
|
|
21
|
-
this.parseOne({ name, fields });
|
|
21
|
+
this.parseOne({ name, fields, stack: new Set([name]) });
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
get(name) {
|
|
@@ -28,16 +28,15 @@ export class ModelsParser {
|
|
|
28
28
|
}
|
|
29
29
|
return parsed;
|
|
30
30
|
}
|
|
31
|
-
parseOne({ name, fields }) {
|
|
32
|
-
const parsed = this.parseFields({ fields,
|
|
31
|
+
parseOne({ name, fields, stack }) {
|
|
32
|
+
const parsed = this.parseFields({ fields, stack });
|
|
33
33
|
if (parsed) {
|
|
34
34
|
this.parsed.set(name, { name, fields: parsed });
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
-
ifModelParse({ name,
|
|
38
|
-
if (
|
|
39
|
-
this.
|
|
40
|
-
this.warnings.push(new ParserErrorCycle({ name }));
|
|
37
|
+
ifModelParse({ name, stack }) {
|
|
38
|
+
if (stack.has(name)) {
|
|
39
|
+
this.warnings.push(new ParserErrorCycle({ stack }));
|
|
41
40
|
return true;
|
|
42
41
|
}
|
|
43
42
|
// Previously parsed skip things
|
|
@@ -47,37 +46,47 @@ export class ModelsParser {
|
|
|
47
46
|
}
|
|
48
47
|
// Model does not exists but that could just mean string literal
|
|
49
48
|
if (!this.raw[name]) {
|
|
50
|
-
this.warnings.push(new ParserError({
|
|
49
|
+
this.warnings.push(new ParserError({
|
|
50
|
+
code: 'model_not_found_fallback',
|
|
51
|
+
message: `Model "${name}" is not defined, using as string literal`,
|
|
52
|
+
path: [...Array.from(stack), name]
|
|
53
|
+
}));
|
|
51
54
|
return false;
|
|
52
55
|
}
|
|
53
56
|
// At this point we are sure it's a Model
|
|
54
|
-
|
|
57
|
+
stack.add(name);
|
|
58
|
+
this.parseOne({ name, fields: this.raw[name], stack });
|
|
55
59
|
return true;
|
|
56
60
|
}
|
|
57
|
-
parseFields({ fields,
|
|
58
|
-
const parsed =
|
|
61
|
+
parseFields({ fields, stack }) {
|
|
62
|
+
const parsed = new Map();
|
|
59
63
|
let dynamicField = null;
|
|
60
64
|
for (const [nameTmp, value] of Object.entries(fields)) {
|
|
61
65
|
const optional = nameTmp.endsWith('?');
|
|
62
66
|
const name = optional ? nameTmp.substring(0, nameTmp.length - 1) : nameTmp;
|
|
67
|
+
const parent = Array.from(stack).pop();
|
|
63
68
|
// Special key to extends models
|
|
64
69
|
if (name === '__extends') {
|
|
65
70
|
const extendedModels = value.split(',');
|
|
66
71
|
for (const extendedModel of extendedModels) {
|
|
67
72
|
const trimmed = extendedModel.trim();
|
|
68
|
-
const isModel = this.ifModelParse({ name: trimmed,
|
|
73
|
+
const isModel = this.ifModelParse({ name: trimmed, stack });
|
|
69
74
|
if (!isModel) {
|
|
70
|
-
this.errors.push(new ParserErrorExtendsNotFound({ model: parent, inherit: trimmed, path: [
|
|
75
|
+
this.errors.push(new ParserErrorExtendsNotFound({ model: parent, inherit: trimmed, path: [...Array.from(stack), '__extends'] }));
|
|
71
76
|
continue;
|
|
72
77
|
}
|
|
73
78
|
// Merge parent
|
|
74
79
|
const extendedFields = this.parsed.get(trimmed);
|
|
75
80
|
for (const field of extendedFields.fields) {
|
|
81
|
+
if (parsed.has(field.name)) {
|
|
82
|
+
// field already exists
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
76
85
|
if (field.dynamic) {
|
|
77
86
|
dynamicField = field;
|
|
78
87
|
}
|
|
79
88
|
else {
|
|
80
|
-
parsed.
|
|
89
|
+
parsed.set(field.name, field);
|
|
81
90
|
}
|
|
82
91
|
}
|
|
83
92
|
}
|
|
@@ -85,45 +94,45 @@ export class ModelsParser {
|
|
|
85
94
|
}
|
|
86
95
|
// Special key for dynamic interface `[key: string]: *`
|
|
87
96
|
if (name === '__string') {
|
|
88
|
-
const acc = this.parseFields({ fields: { tmp: value },
|
|
97
|
+
const acc = this.parseFields({ fields: { tmp: value }, stack })[0];
|
|
89
98
|
dynamicField = { ...acc, name, dynamic: true, optional };
|
|
90
99
|
continue;
|
|
91
100
|
}
|
|
92
101
|
// Array of unknown
|
|
93
102
|
if (Array.isArray(value)) {
|
|
94
|
-
const acc = this.parseFields({ fields: value,
|
|
103
|
+
const acc = this.parseFields({ fields: value, stack });
|
|
95
104
|
if (!acc) {
|
|
96
105
|
this.errors.push(new ParserError({ code: 'failed_to_parse_array', message: `Failed to parse array in "${parent}"`, path: [parent, name] }));
|
|
97
106
|
continue;
|
|
98
107
|
}
|
|
99
|
-
parsed.
|
|
108
|
+
parsed.set(name, { name, value: acc, array: true, optional });
|
|
100
109
|
continue;
|
|
101
110
|
}
|
|
102
111
|
// Standard data types that requires no change
|
|
103
112
|
if (typeof value === 'boolean' || typeof value === 'number' || value === null || value === undefined) {
|
|
104
|
-
parsed.
|
|
113
|
+
parsed.set(name, { name, value, tsType: true });
|
|
105
114
|
continue;
|
|
106
115
|
}
|
|
107
116
|
// Special case for literal objects
|
|
108
117
|
if (typeof value === 'object') {
|
|
109
|
-
const acc = this.parseFields({ fields: value,
|
|
118
|
+
const acc = this.parseFields({ fields: value, stack });
|
|
110
119
|
if (!acc) {
|
|
111
120
|
this.errors.push(new ParserError({ code: 'failed_to_parse_object', message: `Failed to parse object in "${parent}"`, path: [parent, name] }));
|
|
112
121
|
continue;
|
|
113
122
|
}
|
|
114
|
-
parsed.
|
|
123
|
+
parsed.set(name, { name, value: acc, optional });
|
|
115
124
|
continue;
|
|
116
125
|
}
|
|
117
126
|
// Union type will be split and feed back to the parser
|
|
118
127
|
if (value.includes('|')) {
|
|
119
128
|
// union
|
|
120
129
|
const types = value.split('|').map((v) => v.trim());
|
|
121
|
-
const acc = this.parseFields({ fields: { tmp: types },
|
|
130
|
+
const acc = this.parseFields({ fields: { tmp: types }, stack });
|
|
122
131
|
if (!acc) {
|
|
123
132
|
this.errors.push(new ParserError({ code: 'failed_to_parse_union', message: `Failed to parse union in "${parent}"`, path: [parent, name] }));
|
|
124
133
|
continue;
|
|
125
134
|
}
|
|
126
|
-
parsed.
|
|
135
|
+
parsed.set(name, { name, value: acc[0].value, union: true, optional });
|
|
127
136
|
continue;
|
|
128
137
|
}
|
|
129
138
|
// At this point it's a regular string but it can still be:
|
|
@@ -132,34 +141,68 @@ export class ModelsParser {
|
|
|
132
141
|
// - model
|
|
133
142
|
const isArray = value.endsWith('[]');
|
|
134
143
|
const valueClean = isArray ? value.substring(0, value.length - 2) : value;
|
|
144
|
+
// empty array
|
|
145
|
+
if (valueClean === '') {
|
|
146
|
+
this.errors.push(new ParserErrorTypeSyntax({ value, path: [parent, name] }));
|
|
147
|
+
parsed.set(name, { name, value: valueClean, array: isArray, optional });
|
|
148
|
+
continue;
|
|
149
|
+
}
|
|
135
150
|
const alias = getPotentialTypeAlias(valueClean);
|
|
136
151
|
if (alias) {
|
|
137
|
-
parsed.
|
|
152
|
+
parsed.set(name, { name, value: alias, tsType: true, array: isArray, optional });
|
|
138
153
|
continue;
|
|
139
154
|
}
|
|
140
155
|
const native = getNativeDataType(valueClean);
|
|
141
156
|
if (!(native instanceof Error)) {
|
|
142
|
-
parsed.
|
|
157
|
+
parsed.set(name, { name, value: native, tsType: true, array: isArray, optional });
|
|
143
158
|
continue;
|
|
144
159
|
}
|
|
145
160
|
if (isDisallowedType(valueClean)) {
|
|
146
161
|
this.errors.push(new ParserErrorTypeSyntax({ value: valueClean, path: [parent, name] }));
|
|
147
|
-
parsed.
|
|
162
|
+
parsed.set(name, { name, value: valueClean, array: isArray, optional });
|
|
148
163
|
continue;
|
|
149
164
|
}
|
|
150
165
|
// Model name
|
|
151
|
-
const isModel = this.ifModelParse({ name: valueClean,
|
|
166
|
+
const isModel = this.ifModelParse({ name: valueClean, stack });
|
|
152
167
|
if (isModel) {
|
|
153
|
-
parsed.
|
|
168
|
+
parsed.set(name, { name, value: valueClean, model: true, optional, array: isArray });
|
|
154
169
|
continue;
|
|
155
170
|
}
|
|
156
171
|
// Literal string
|
|
157
|
-
parsed.
|
|
172
|
+
parsed.set(name, { name, value: valueClean, array: isArray, optional });
|
|
158
173
|
}
|
|
159
174
|
if (dynamicField) {
|
|
160
|
-
parsed.
|
|
175
|
+
parsed.set(dynamicField.name, dynamicField);
|
|
176
|
+
}
|
|
177
|
+
return Array.from(parsed.values());
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
/**
|
|
181
|
+
* Get recursively (and safely) all the model names inside a model
|
|
182
|
+
*/
|
|
183
|
+
export function getRecursiveModelNames(parser, name) {
|
|
184
|
+
const model = parser.get(name);
|
|
185
|
+
if (!model) {
|
|
186
|
+
return new Set();
|
|
187
|
+
}
|
|
188
|
+
return getRecursiveModelInModel(parser, model.fields, new Set([name]));
|
|
189
|
+
}
|
|
190
|
+
function getRecursiveModelInModel(parser, fields, names) {
|
|
191
|
+
for (const field of fields) {
|
|
192
|
+
if (field.model) {
|
|
193
|
+
if (names.has(field.value)) {
|
|
194
|
+
continue;
|
|
195
|
+
}
|
|
196
|
+
names.add(field.value);
|
|
197
|
+
const sub = parser.get(field.value);
|
|
198
|
+
const res = getRecursiveModelInModel(parser, sub.fields, names);
|
|
199
|
+
res.forEach((name) => names.add(name));
|
|
200
|
+
}
|
|
201
|
+
if (Array.isArray(field.value)) {
|
|
202
|
+
const res = getRecursiveModelInModel(parser, field.value, names);
|
|
203
|
+
res.forEach((name) => names.add(name));
|
|
161
204
|
}
|
|
162
|
-
return parsed;
|
|
163
205
|
}
|
|
206
|
+
return names;
|
|
164
207
|
}
|
|
165
208
|
//# sourceMappingURL=modelsParser.js.map
|
package/dist/modelsParser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelsParser.js","sourceRoot":"","sources":["../lib/modelsParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACvG,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAE5I,MAAM,OAAO,YAAY;IACrB,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;IACvC,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,GAAkB,EAAE,CAAC;IAC3B,QAAQ,GAAkB,EAAE,CAAC;IAE7B,GAAG,CAAiB;IAEpB,YAAY,EAAE,GAAG,EAA2B;QACxC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAED,QAAQ;QACJ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACpD,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,2BAA2B,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;gBACjF,SAAS;YACb,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,SAAS;YACb,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"modelsParser.js","sourceRoot":"","sources":["../lib/modelsParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,6 +66,22 @@ describe('parse', () => {
|
|
|
66
66
|
Test2: { name: 'Test2', fields: [{ name: 'name', value: null, tsType: true, array: false, optional: false }] }
|
|
67
67
|
});
|
|
68
68
|
});
|
|
69
|
+
it('should handle duplicate field (ordered)', () => {
|
|
70
|
+
const parser = new ModelsParser({ raw: { Test: { __extends: 'TestBase', id: 'string' }, TestBase: { id: 'number' } } });
|
|
71
|
+
parser.parseAll();
|
|
72
|
+
expect(Object.fromEntries(parser.parsed)).toStrictEqual({
|
|
73
|
+
Test: { name: 'Test', fields: [{ name: 'id', value: 'string', tsType: true, array: false, optional: false }] },
|
|
74
|
+
TestBase: { name: 'TestBase', fields: [{ name: 'id', value: 'number', tsType: true, array: false, optional: false }] }
|
|
75
|
+
});
|
|
76
|
+
});
|
|
77
|
+
it('should handle duplicate field (unordered)', () => {
|
|
78
|
+
const parser = new ModelsParser({ raw: { Test: { id: 'string', __extends: 'TestBase' }, TestBase: { id: 'number' } } });
|
|
79
|
+
parser.parseAll();
|
|
80
|
+
expect(Object.fromEntries(parser.parsed)).toStrictEqual({
|
|
81
|
+
Test: { name: 'Test', fields: [{ name: 'id', value: 'string', tsType: true, array: false, optional: false }] },
|
|
82
|
+
TestBase: { name: 'TestBase', fields: [{ name: 'id', value: 'number', tsType: true, array: false, optional: false }] }
|
|
83
|
+
});
|
|
84
|
+
});
|
|
69
85
|
});
|
|
70
86
|
describe('object literal', () => {
|
|
71
87
|
it('should handle yaml object', () => {
|
|
@@ -101,7 +117,7 @@ describe('parse', () => {
|
|
|
101
117
|
expect(Object.fromEntries(parser.parsed)).toStrictEqual({
|
|
102
118
|
Test: {
|
|
103
119
|
name: 'Test',
|
|
104
|
-
fields: [{ name: 'sub', optional: false, tsType: true, value: '
|
|
120
|
+
fields: [{ name: 'sub', optional: false, tsType: true, value: 'Record<string, any>', array: false }]
|
|
105
121
|
}
|
|
106
122
|
});
|
|
107
123
|
});
|
|
@@ -279,6 +295,11 @@ describe('parse', () => {
|
|
|
279
295
|
}
|
|
280
296
|
});
|
|
281
297
|
});
|
|
298
|
+
it('should throw on empty array type', () => {
|
|
299
|
+
const parser = new ModelsParser({ raw: { Test: { user: '[]' } } });
|
|
300
|
+
parser.parseAll();
|
|
301
|
+
expect(parser.errors).toStrictEqual([new ParserErrorTypeSyntax({ value: '[]', path: ['Test', 'user'] })]);
|
|
302
|
+
});
|
|
282
303
|
});
|
|
283
304
|
describe('typescript any', () => {
|
|
284
305
|
it('should handle any', () => {
|
|
@@ -321,7 +342,7 @@ describe('parse', () => {
|
|
|
321
342
|
it('should handle cyclic Model', () => {
|
|
322
343
|
const parser = new ModelsParser({ raw: { Test: { user: 'Test' } } });
|
|
323
344
|
parser.parseAll();
|
|
324
|
-
expect(parser.warnings).toStrictEqual([new ParserErrorCycle({
|
|
345
|
+
expect(parser.warnings).toStrictEqual([new ParserErrorCycle({ stack: new Set(['Test']) })]);
|
|
325
346
|
expect(Object.fromEntries(parser.parsed)).toStrictEqual({
|
|
326
347
|
Test: { name: 'Test', fields: [{ name: 'user', value: 'Test', model: true, optional: false, array: false }] }
|
|
327
348
|
});
|
|
@@ -329,7 +350,7 @@ describe('parse', () => {
|
|
|
329
350
|
it('should handle cyclic through object', () => {
|
|
330
351
|
const parser = new ModelsParser({ raw: { Test: { user: { author: 'Test' } } } });
|
|
331
352
|
parser.parseAll();
|
|
332
|
-
expect(parser.warnings).toStrictEqual([new ParserErrorCycle({
|
|
353
|
+
expect(parser.warnings).toStrictEqual([new ParserErrorCycle({ stack: new Set(['Test']) })]);
|
|
333
354
|
expect(Object.fromEntries(parser.parsed)).toStrictEqual({
|
|
334
355
|
Test: {
|
|
335
356
|
name: 'Test',
|
|
@@ -337,10 +358,29 @@ describe('parse', () => {
|
|
|
337
358
|
}
|
|
338
359
|
});
|
|
339
360
|
});
|
|
361
|
+
it('should handle cyclic through model', () => {
|
|
362
|
+
const parser = new ModelsParser({ raw: { Start: { ref: 'Middle' }, Middle: { ref: 'End' }, End: { ref: 'Start' } } });
|
|
363
|
+
parser.parseAll();
|
|
364
|
+
expect(parser.warnings).toStrictEqual([new ParserErrorCycle({ stack: new Set(['Start', 'Middle', 'End']) })]);
|
|
365
|
+
expect(Object.fromEntries(parser.parsed)).toStrictEqual({
|
|
366
|
+
End: {
|
|
367
|
+
name: 'End',
|
|
368
|
+
fields: [{ array: false, model: true, name: 'ref', optional: false, value: 'Start' }]
|
|
369
|
+
},
|
|
370
|
+
Middle: {
|
|
371
|
+
name: 'Middle',
|
|
372
|
+
fields: [{ array: false, model: true, name: 'ref', optional: false, value: 'End' }]
|
|
373
|
+
},
|
|
374
|
+
Start: {
|
|
375
|
+
name: 'Start',
|
|
376
|
+
fields: [{ array: false, model: true, name: 'ref', optional: false, value: 'Middle' }]
|
|
377
|
+
}
|
|
378
|
+
});
|
|
379
|
+
});
|
|
340
380
|
it('should handle cyclic through array', () => {
|
|
341
381
|
const parser = new ModelsParser({ raw: { Test: { user: ['Test'] } } });
|
|
342
382
|
parser.parseAll();
|
|
343
|
-
expect(parser.warnings).toStrictEqual([new ParserErrorCycle({
|
|
383
|
+
expect(parser.warnings).toStrictEqual([new ParserErrorCycle({ stack: new Set(['Test']) })]);
|
|
344
384
|
expect(Object.fromEntries(parser.parsed)).toStrictEqual({
|
|
345
385
|
Test: {
|
|
346
386
|
name: 'Test',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelsParser.unit.test.js","sourceRoot":"","sources":["../lib/modelsParser.unit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAE5I,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACnB,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;QACrE,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;YACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;SACjH,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAC9B,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC3E,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE;aACtI,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;YAC/B,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YACrG,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;gBACvG,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aAClH,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACtC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YAClJ,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;gBAC9G,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;gBACtH,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aAC3H,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YAC/C,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC3E,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE;aACtI,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;YACvC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7E,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;aACrC,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,0BAA0B,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9I,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YACxC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACjI,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE;wBACJ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;wBACxE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;qBAC7E;iBACJ;gBACD,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;gBAC5G,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aACjH,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACjC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAC/E,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;iBACrI;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YAClD,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7I,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE;wBACJ;4BACI,IAAI,EAAE,KAAK;4BACX,QAAQ,EAAE,KAAK;4BACf,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;yBAC7G;qBACJ;iBACJ;gBACD,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE;aAC9I,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YACzC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YACtE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;iBAC1F;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACpC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YACxE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aACtG,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;YAC3B,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7E,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE;wBACJ;4BACI,IAAI,EAAE,MAAM;4BACZ,QAAQ,EAAE,KAAK;4BACf,KAAK,EAAE,IAAI;4BACX,KAAK,EAAE;gCACH,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;gCAC1D,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;6BAC7D;yBACJ;qBACJ;iBACJ;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YAClD,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YACzG,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE;wBACJ;4BACI,IAAI,EAAE,MAAM;4BACZ,QAAQ,EAAE,KAAK;4BACf,KAAK,EAAE,IAAI;4BACX,KAAK,EAAE;gCACH,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;gCAC3E,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE;6BAC3E;yBACJ;qBACJ;iBACJ;gBACD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aACjH,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACnB,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACnC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAAC,CAAC;YACpF,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE;wBACJ;4BACI,IAAI,EAAE,MAAM;4BACZ,QAAQ,EAAE,KAAK;4BACf,KAAK,EAAE;gCACH,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;gCAC/D,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;6BAClE;4BACD,KAAK,EAAE,IAAI;yBACd;qBACJ;iBACJ;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;YAC/D,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,4CAA4C,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1I,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,WAAW,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;gBAC5H,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE;wBACJ;4BACI,IAAI,EAAE,MAAM;4BACZ,QAAQ,EAAE,KAAK;4BACf,KAAK,EAAE;gCACH,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;gCACvE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;gCAC9D,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;gCAC9E,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;6BAC9E;4BACD,KAAK,EAAE,IAAI;yBACd;qBACJ;iBACJ;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACnC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1E,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;iBAC1F;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAChD,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1E,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;iBAC5F;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,iCAAiC,EAAE,CAAC,GAAG,EAAE,EAAE;YACtE,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YACxE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,2BAA2B,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACpG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAAC,GAAG,EAAE,EAAE;YACpD,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YAClE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aACjH,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,2CAA2C,EAAE,CAAC,GAAG,EAAE,EAAE;YACpG,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YAClE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,qBAAqB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACzG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aAChG,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;YAC5B,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YACvE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aAC9G,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAChC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YACtE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;iBAC1F;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;YACzB,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YACtE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aAC/G,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACnB,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;YAC3B,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7F,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;gBAC9G,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE;aAChH,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YACxC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7F,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE;gBAC7G,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aACjH,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACnC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACrE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;aACnG,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;gBAClC,IAAI,WAAW,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,sDAAsD,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;aACjJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;YAClC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACrE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,gBAAgB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;YAChF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE;aAChH,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC3C,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACjF,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,gBAAgB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;YAChF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;iBACtI;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC1C,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACvE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAElB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,gBAAgB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;YAChF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;gBACpD,IAAI,EAAE;oBACF,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;iBAC9I;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"modelsParser.unit.test.js","sourceRoot":"","sources":["../lib/modelsParser.unit.test.ts"],"names":[],"mappings":"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"}
|
package/dist/parser.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ModelsParser } from './modelsParser.js';
|
|
1
|
+
import { ModelsParser, getRecursiveModelNames } from './modelsParser.js';
|
|
2
2
|
import { ParserErrorDuplicateEndpoint, ParserErrorDuplicateModel, ParserErrorMissingId, ParserErrorModelIsLiteral, ParserErrorModelNotFound } from './errors.js';
|
|
3
3
|
export class NangoYamlParser {
|
|
4
4
|
yaml;
|
|
@@ -25,7 +25,7 @@ export class NangoYamlParser {
|
|
|
25
25
|
continue;
|
|
26
26
|
}
|
|
27
27
|
// Create anonymous model for validation
|
|
28
|
-
const parsed = this.modelsParser.parseFields({ fields: { output: modelOrType },
|
|
28
|
+
const parsed = this.modelsParser.parseFields({ fields: { output: modelOrType }, stack: new Set([name]) });
|
|
29
29
|
const anon = `Anonymous_${integrationName.replace(/[^A-Za-z0-9_]/g, '')}_${type}_${name.replace(/[^A-Za-z0-9_]/g, '')}_output`;
|
|
30
30
|
const anonModel = { name: anon, fields: parsed, isAnon: true };
|
|
31
31
|
this.modelsParser.parsed.set(anon, anonModel);
|
|
@@ -52,8 +52,11 @@ export class NangoYamlParser {
|
|
|
52
52
|
this.errors.push(new ParserErrorDuplicateModel({ model: output, path: [integrationName, 'syncs', sync.name, '[output]'] }));
|
|
53
53
|
continue;
|
|
54
54
|
}
|
|
55
|
+
// We register the model usage and recursively too
|
|
55
56
|
usedModels.add(output);
|
|
56
57
|
usedModelsSync.add(output);
|
|
58
|
+
const find = getRecursiveModelNames(this.modelsParser, output);
|
|
59
|
+
find.forEach((name) => usedModelsSync.add(name));
|
|
57
60
|
const model = this.modelsParser.get(output);
|
|
58
61
|
if (!model.fields.find((field) => field.name === 'id')) {
|
|
59
62
|
this.errors.push(new ParserErrorMissingId({ model: output, path: [integrationName, 'syncs', sync.name, '[output]'] }));
|
|
@@ -72,8 +75,11 @@ export class NangoYamlParser {
|
|
|
72
75
|
this.warnings.push(new ParserErrorModelIsLiteral({ model: model.fields[0].value, path: [integrationName, 'syncs', sync.name, '[input]'] }));
|
|
73
76
|
}
|
|
74
77
|
}
|
|
78
|
+
// We register the model usage and recursively too
|
|
75
79
|
usedModels.add(sync.input);
|
|
76
80
|
usedModelsSync.add(sync.input);
|
|
81
|
+
const find = getRecursiveModelNames(this.modelsParser, sync.input);
|
|
82
|
+
find.forEach((name) => usedModelsSync.add(name));
|
|
77
83
|
}
|
|
78
84
|
for (const endpointByVerb of sync.endpoints) {
|
|
79
85
|
for (const [verb, endpoint] of Object.entries(endpointByVerb)) {
|
|
@@ -106,8 +112,11 @@ export class NangoYamlParser {
|
|
|
106
112
|
this.errors.push(new ParserErrorDuplicateModel({ model: output, path: [integrationName, 'actions', action.name, '[output]'] }));
|
|
107
113
|
continue;
|
|
108
114
|
}
|
|
115
|
+
// We register the model usage and recursively too
|
|
109
116
|
usedModels.add(output);
|
|
110
117
|
usedModelsAction.add(output);
|
|
118
|
+
const find = getRecursiveModelNames(this.modelsParser, output);
|
|
119
|
+
find.forEach((name) => usedModelsAction.add(name));
|
|
111
120
|
const model = this.modelsParser.get(output);
|
|
112
121
|
if (output.startsWith('Anonymous') && !model.fields[0]?.union) {
|
|
113
122
|
this.warnings.push(new ParserErrorModelIsLiteral({
|
|
@@ -127,8 +136,11 @@ export class NangoYamlParser {
|
|
|
127
136
|
}));
|
|
128
137
|
}
|
|
129
138
|
}
|
|
139
|
+
// We register the model usage and recursively too
|
|
130
140
|
usedModels.add(action.input);
|
|
131
141
|
usedModelsAction.add(action.input);
|
|
142
|
+
const find = getRecursiveModelNames(this.modelsParser, action.input);
|
|
143
|
+
find.forEach((name) => usedModelsAction.add(name));
|
|
132
144
|
}
|
|
133
145
|
if (action.endpoint) {
|
|
134
146
|
for (const [verb, endpoint] of Object.entries(action.endpoint)) {
|
package/dist/parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../lib/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../lib/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EACH,4BAA4B,EAC5B,yBAAyB,EACzB,oBAAoB,EACpB,yBAAyB,EACzB,wBAAwB,EAC3B,MAAM,aAAa,CAAC;AAGrB,MAAM,OAAgB,eAAe;IACjC,IAAI,CAAS;IACb,GAAG,CAAY;IACf,MAAM,CAA8B;IACpC,YAAY,CAAe;IAE3B,MAAM,GAAkB,EAAE,CAAC;IAC3B,QAAQ,GAAkB,EAAE,CAAC;IAE7B,YAAY,EAAE,GAAG,EAAE,IAAI,EAAoC;QACvD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;IAID,iBAAiB,CAAC,EACd,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,eAAe,EAMlB;QACG,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAiB,EAAE,CAAC;QAEhC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAClE,KAAK,MAAM,WAAW,IAAI,MAAM,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACjD,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,SAAS;YACb,CAAC;YAED,wCAAwC;YACxC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;YAE1G,MAAM,IAAI,GAAG,aAAa,eAAe,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,SAAS,CAAC;YAC/H,MAAM,SAAS,GAAe,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;YAC3E,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC9C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,qBAAqB;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO;QACX,CAAC;QAED,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YACjD,+EAA+E;YAC/E,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;YACpC,uDAAuD;YACvD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;YACrC,MAAM,eAAe,GAAG,WAAW,CAAC,iBAAiB,CAAC;YAEtD,qBAAqB;YACrB,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC;gBACnC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;gBACzC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;wBAC/B,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;4BACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;4BAC5H,SAAS;wBACb,CAAC;wBAED,kDAAkD;wBAClD,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBACvB,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAC3B,MAAM,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;wBAC/D,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;wBAEjD,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;wBAC7C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;4BACrD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,oBAAoB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;4BACvH,SAAS;wBACb,CAAC;wBACD,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;4BAC5D,IAAI,CAAC,QAAQ,CAAC,IAAI,CACd,IAAI,yBAAyB,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,KAAY,EAAE,IAAI,EAAE,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CACnI,CAAC;4BACF,SAAS;wBACb,CAAC;oBACL,CAAC;gBACL,CAAC;gBACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBACb,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;wBACrC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAE,CAAC;wBACjD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;4BAC1B,IAAI,CAAC,QAAQ,CAAC,IAAI,CACd,IAAI,yBAAyB,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,KAAY,EAAE,IAAI,EAAE,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC,CAClI,CAAC;wBACN,CAAC;oBACL,CAAC;oBAED,kDAAkD;oBAClD,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC3B,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC/B,MAAM,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;oBACnE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBACrD,CAAC;gBACD,KAAK,MAAM,cAAc,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;wBAC5D,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACZ,SAAS,CAAC,cAAc;wBAC5B,CAAC;wBAED,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;wBAClC,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;4BACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,4BAA4B,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;4BAClI,SAAS;wBACb,CAAC;wBAED,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;wBACnB,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;wBAC/C,IAAI,UAAU,EAAE,CAAC;4BACb,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAE,CAAC;4BACjC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gCACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,IAAI,wBAAwB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE,CAAC,CACjH,CAAC;4BACN,CAAC;wBACL,CAAC;oBACL,CAAC;gBACL,CAAC;gBAED,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACjD,CAAC;YAED,uBAAuB;YACvB,KAAK,MAAM,MAAM,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBACvC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;gBAC3C,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAChB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;wBACjC,IAAI,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;4BAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,eAAe,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;4BAChI,SAAS;wBACb,CAAC;wBAED,kDAAkD;wBAClD,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBACvB,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAC7B,MAAM,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;wBAC/D,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;wBAEnD,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;wBAC7C,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;4BAC5D,IAAI,CAAC,QAAQ,CAAC,IAAI,CACd,IAAI,yBAAyB,CAAC;gCAC1B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,KAAY;gCACpC,IAAI,EAAE,CAAC,eAAe,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC;6BAC9D,CAAC,CACL,CAAC;wBACN,CAAC;oBACL,CAAC;gBACL,CAAC;gBACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;wBACvC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAE,CAAC;wBACnD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;4BAC1B,IAAI,CAAC,QAAQ,CAAC,IAAI,CACd,IAAI,yBAAyB,CAAC;gCAC1B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,KAAY;gCACpC,IAAI,EAAE,CAAC,eAAe,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC;6BAC7D,CAAC,CACL,CAAC;wBACN,CAAC;oBACL,CAAC;oBAED,kDAAkD;oBAClD,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAC7B,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACnC,MAAM,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;oBACrE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBACvD,CAAC;gBACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBAClB,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAC7D,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACZ,SAAS,CAAC,cAAc;wBAC5B,CAAC;wBAED,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;wBAClC,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;4BACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,IAAI,4BAA4B,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,eAAe,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,CAAC,CACrH,CAAC;4BACF,SAAS;wBACb,CAAC;wBACD,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;wBACnB,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;wBAC/C,IAAI,UAAU,EAAE,CAAC;4BACb,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;4BAChD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gCACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,IAAI,wBAAwB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,eAAe,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,CAAC,CAClH,CAAC;4BACN,CAAC;wBACL,CAAC;oBACL,CAAC;gBACL,CAAC;gBACD,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACrD,CAAC;QACL,CAAC;IACL,CAAC;CACJ"}
|
package/dist/parser.v1.js
CHANGED
|
@@ -38,7 +38,8 @@ export class NangoYamlParserV1 extends NangoYamlParser {
|
|
|
38
38
|
input: null, // Input was never allowed in v1
|
|
39
39
|
output: modelOutput && modelOutput.length > 0 ? modelOutput.map((m) => m.name) : null,
|
|
40
40
|
scopes: [], // Scopes was never allowed in v1
|
|
41
|
-
usedModels: []
|
|
41
|
+
usedModels: [],
|
|
42
|
+
version: syncOrAction.version || ''
|
|
42
43
|
});
|
|
43
44
|
}
|
|
44
45
|
else {
|
|
@@ -64,7 +65,8 @@ export class NangoYamlParserV1 extends NangoYamlParser {
|
|
|
64
65
|
auto_start: syncOrAction.auto_start === false ? false : true,
|
|
65
66
|
usedModels: modelOutput.map((m) => m.name),
|
|
66
67
|
sync_type: 'incremental',
|
|
67
|
-
webhookSubscriptions: []
|
|
68
|
+
webhookSubscriptions: [],
|
|
69
|
+
version: syncOrAction.version || ''
|
|
68
70
|
});
|
|
69
71
|
}
|
|
70
72
|
}
|
package/dist/parser.v1.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.v1.js","sourceRoot":"","sources":["../lib/parser.v1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAClD,KAAK;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,GAA6B,CAAC;QAChD,MAAM,MAAM,GAAiC,EAAE,CAAC;QAChD,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QAE7B,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QACtD,CAAC;QAED,KAAK,MAAM,eAAe,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;YACvD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,SAAS;YACb,CAAC;YAED,MAAM,KAAK,GAAsB,EAAE,CAAC;YACpC,MAAM,OAAO,GAAwB,EAAE,CAAC;YAExC,KAAK,MAAM,gBAAgB,IAAI,WAAW,EAAE,CAAC;gBACzC,MAAM,YAAY,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAC;gBACnD,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChB,SAAS;gBACb,CAAC;gBAED,IAAI,YAAY,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACjC,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC;wBACvC,SAAS,EAAE,YAAY,CAAC,OAAO;wBAC/B,IAAI,EAAE,gBAAgB;wBACtB,IAAI,EAAE,MAAM;wBACZ,eAAe;qBAClB,CAAC,CAAC;oBACH,OAAO,CAAC,IAAI,CAAC;wBACT,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,gBAAgB;wBACtB,WAAW,EAAE,CAAC,YAAY,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;wBACpD,QAAQ,EAAE,IAAI,EAAE,mCAAmC;wBACnD,KAAK,EAAE,IAAI,EAAE,gCAAgC;wBAC7C,MAAM,EAAE,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;wBACrF,MAAM,EAAE,EAAE,EAAE,iCAAiC;wBAC7C,UAAU,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"parser.v1.js","sourceRoot":"","sources":["../lib/parser.v1.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,8 @@ describe('parse', () => {
|
|
|
33
33
|
track_deletes: false,
|
|
34
34
|
type: 'sync',
|
|
35
35
|
usedModels: ['GithubIssue'],
|
|
36
|
-
webhookSubscriptions: []
|
|
36
|
+
webhookSubscriptions: [],
|
|
37
|
+
version: ''
|
|
37
38
|
}
|
|
38
39
|
],
|
|
39
40
|
postConnectionScripts: [],
|
|
@@ -46,7 +47,8 @@ describe('parse', () => {
|
|
|
46
47
|
output: ['GithubIssue'],
|
|
47
48
|
scopes: [],
|
|
48
49
|
type: 'action',
|
|
49
|
-
usedModels: ['GithubIssue']
|
|
50
|
+
usedModels: ['GithubIssue'],
|
|
51
|
+
version: ''
|
|
50
52
|
}
|
|
51
53
|
]
|
|
52
54
|
}
|
|
@@ -84,7 +86,8 @@ describe('parse', () => {
|
|
|
84
86
|
track_deletes: false,
|
|
85
87
|
type: 'sync',
|
|
86
88
|
usedModels: ['Anonymous_provider_sync_hello_output'],
|
|
87
|
-
webhookSubscriptions: []
|
|
89
|
+
webhookSubscriptions: [],
|
|
90
|
+
version: ''
|
|
88
91
|
}
|
|
89
92
|
],
|
|
90
93
|
postConnectionScripts: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.v1.unit.test.js","sourceRoot":"","sources":["../lib/parser.v1.unit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACnB,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;QACpB,MAAM,EAAE,GAAgB;YACpB,MAAM,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE;YACzC,YAAY,EAAE;gBACV,QAAQ,EAAE;oBACN,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,EAAE;oBACjE,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE;iBAC1D;aACJ;SACJ,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAkB;YACjD,YAAY,EAAE;gBACV;oBACI,iBAAiB,EAAE,UAAU;oBAC7B,KAAK,EAAE;wBACH;4BACI,UAAU,EAAE,IAAI;4BAChB,WAAW,EAAE,EAAE;4BACf,SAAS,EAAE,EAAE;4BACb,KAAK,EAAE,IAAI;4BACX,IAAI,EAAE,MAAM;4BACZ,MAAM,EAAE,CAAC,aAAa,CAAC;4BACvB,IAAI,EAAE,WAAW;4BACjB,MAAM,EAAE,EAAE;4BACV,SAAS,EAAE,aAAa;4BACxB,aAAa,EAAE,KAAK;4BACpB,IAAI,EAAE,MAAM;4BACZ,UAAU,EAAE,CAAC,aAAa,CAAC;4BAC3B,oBAAoB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"parser.v1.unit.test.js","sourceRoot":"","sources":["../lib/parser.v1.unit.test.ts"],"names":[],"mappings":"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"}
|
package/dist/parser.v2.js
CHANGED
|
@@ -94,6 +94,7 @@ export class NangoYamlParserV2 extends NangoYamlParser {
|
|
|
94
94
|
sync_type: sync.sync_type === 'incremental' ? 'incremental' : 'full',
|
|
95
95
|
usedModels: Array.from(modelNames),
|
|
96
96
|
runs: sync.runs,
|
|
97
|
+
version: sync.version || '',
|
|
97
98
|
track_deletes: sync.track_deletes || false,
|
|
98
99
|
auto_start: sync.auto_start === false ? false : true,
|
|
99
100
|
input: modelInput?.name || null,
|
|
@@ -136,6 +137,7 @@ export class NangoYamlParserV2 extends NangoYamlParser {
|
|
|
136
137
|
name: actionName,
|
|
137
138
|
type: 'action',
|
|
138
139
|
description: (action.description || '').trim(),
|
|
140
|
+
version: action.version || '',
|
|
139
141
|
scopes: this.getScopes(action),
|
|
140
142
|
input: modelInput?.name || null,
|
|
141
143
|
output: modelOutput && modelOutput.length > 0 ? modelOutput.map((m) => m.name) : null,
|
|
@@ -155,7 +157,7 @@ export class NangoYamlParserV2 extends NangoYamlParser {
|
|
|
155
157
|
return model;
|
|
156
158
|
}
|
|
157
159
|
// Create anonymous model for validation
|
|
158
|
-
const parsed = this.modelsParser.parseFields({ fields: { input: rawInput },
|
|
160
|
+
const parsed = this.modelsParser.parseFields({ fields: { input: rawInput }, stack: new Set([name]) });
|
|
159
161
|
const anon = `Anonymous_${integrationName.replace(/[^A-Za-z0-9_]/g, '')}_${type}_${name.replace(/[^A-Za-z0-9_]/g, '')}_input`;
|
|
160
162
|
const anonModel = { name: anon, fields: parsed, isAnon: true };
|
|
161
163
|
this.modelsParser.parsed.set(anon, anonModel);
|
package/dist/parser.v2.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.v2.js","sourceRoot":"","sources":["../lib/parser.v2.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"parser.v2.js","sourceRoot":"","sources":["../lib/parser.v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,8 @@ describe('parse', () => {
|
|
|
33
33
|
track_deletes: false,
|
|
34
34
|
type: 'sync',
|
|
35
35
|
usedModels: ['GithubIssue'],
|
|
36
|
-
webhookSubscriptions: []
|
|
36
|
+
webhookSubscriptions: [],
|
|
37
|
+
version: ''
|
|
37
38
|
}
|
|
38
39
|
],
|
|
39
40
|
postConnectionScripts: [],
|
|
@@ -46,7 +47,8 @@ describe('parse', () => {
|
|
|
46
47
|
output: ['GithubIssue'],
|
|
47
48
|
scopes: [],
|
|
48
49
|
type: 'action',
|
|
49
|
-
usedModels: ['GithubIssue', 'Anonymous_provider_action_createIssue_input']
|
|
50
|
+
usedModels: ['GithubIssue', 'Anonymous_provider_action_createIssue_input'],
|
|
51
|
+
version: ''
|
|
50
52
|
}
|
|
51
53
|
]
|
|
52
54
|
}
|
|
@@ -65,6 +67,47 @@ describe('parse', () => {
|
|
|
65
67
|
yamlVersion: 'v2'
|
|
66
68
|
});
|
|
67
69
|
});
|
|
70
|
+
it('should handle recursive model through model', () => {
|
|
71
|
+
const v2 = {
|
|
72
|
+
models: { Start: { ref: 'Middle' }, Middle: { ref: 'End' }, End: { ref: 'Start' } },
|
|
73
|
+
integrations: {
|
|
74
|
+
provider: {
|
|
75
|
+
actions: { createIssue: { endpoint: '/test', output: 'Start' } }
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
};
|
|
79
|
+
const parser = new NangoYamlParserV2({ raw: v2, yaml: '' });
|
|
80
|
+
parser.parse();
|
|
81
|
+
expect(parser.errors).toStrictEqual([]);
|
|
82
|
+
expect(parser.parsed).toStrictEqual({
|
|
83
|
+
integrations: [
|
|
84
|
+
{
|
|
85
|
+
providerConfigKey: 'provider',
|
|
86
|
+
syncs: [],
|
|
87
|
+
postConnectionScripts: [],
|
|
88
|
+
actions: [
|
|
89
|
+
{
|
|
90
|
+
description: '',
|
|
91
|
+
input: null,
|
|
92
|
+
endpoint: { POST: '/test' },
|
|
93
|
+
name: 'createIssue',
|
|
94
|
+
output: ['Start'],
|
|
95
|
+
scopes: [],
|
|
96
|
+
type: 'action',
|
|
97
|
+
usedModels: ['Start', 'Middle', 'End'],
|
|
98
|
+
version: ''
|
|
99
|
+
}
|
|
100
|
+
]
|
|
101
|
+
}
|
|
102
|
+
],
|
|
103
|
+
models: new Map([
|
|
104
|
+
['End', { name: 'End', fields: [{ array: false, model: true, name: 'ref', optional: false, value: 'Start' }] }],
|
|
105
|
+
['Middle', { name: 'Middle', fields: [{ array: false, model: true, name: 'ref', optional: false, value: 'End' }] }],
|
|
106
|
+
['Start', { name: 'Start', fields: [{ array: false, model: true, name: 'ref', optional: false, value: 'Middle' }] }]
|
|
107
|
+
]),
|
|
108
|
+
yamlVersion: 'v2'
|
|
109
|
+
});
|
|
110
|
+
});
|
|
68
111
|
it('should handle input / output as literal', () => {
|
|
69
112
|
const v2 = {
|
|
70
113
|
models: {},
|
|
@@ -94,7 +137,8 @@ describe('parse', () => {
|
|
|
94
137
|
track_deletes: false,
|
|
95
138
|
type: 'sync',
|
|
96
139
|
usedModels: ['Anonymous_provider_sync_top_output', 'Anonymous_provider_sync_top_input'],
|
|
97
|
-
webhookSubscriptions: []
|
|
140
|
+
webhookSubscriptions: [],
|
|
141
|
+
version: ''
|
|
98
142
|
}
|
|
99
143
|
],
|
|
100
144
|
postConnectionScripts: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.v2.unit.test.js","sourceRoot":"","sources":["../lib/parser.v2.unit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEtI,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACnB,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;QACpB,MAAM,EAAE,GAAgB;YACpB,MAAM,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE;YACzC,YAAY,EAAE;gBACV,QAAQ,EAAE;oBACN,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,mBAAmB,EAAE,EAAE;oBACjH,OAAO,EAAE,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE;iBAC1F;aACJ;SACJ,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAkB;YACjD,YAAY,EAAE;gBACV;oBACI,iBAAiB,EAAE,UAAU;oBAC7B,KAAK,EAAE;wBACH;4BACI,UAAU,EAAE,IAAI;4BAChB,WAAW,EAAE,EAAE;4BACf,SAAS,EAAE,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC;4BACrC,KAAK,EAAE,aAAa;4BACpB,IAAI,EAAE,KAAK;4BACX,MAAM,EAAE,CAAC,aAAa,CAAC;4BACvB,IAAI,EAAE,WAAW;4BACjB,MAAM,EAAE,EAAE;4BACV,SAAS,EAAE,MAAM;4BACjB,aAAa,EAAE,KAAK;4BACpB,IAAI,EAAE,MAAM;4BACZ,UAAU,EAAE,CAAC,aAAa,CAAC;4BAC3B,oBAAoB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"parser.v2.unit.test.js","sourceRoot":"","sources":["../lib/parser.v2.unit.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nangohq/nango-yaml",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.41.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"ms": "3.0.0-canary.1"
|
|
18
18
|
},
|
|
19
19
|
"devDependencies": {
|
|
20
|
-
"@nangohq/types": "^0.
|
|
20
|
+
"@nangohq/types": "^0.41.1",
|
|
21
21
|
"vitest": "1.6.0"
|
|
22
22
|
},
|
|
23
23
|
"files": [
|