@axinom/mosaic-cli 0.54.0-rc.23 → 0.54.0-rc.25
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/commands/msg-codegen/codegen.js +34 -6
- package/dist/commands/msg-codegen/codegen.js.map +1 -1
- package/dist/commands/msg-codegen/presets.js +8 -0
- package/dist/commands/msg-codegen/presets.js.map +1 -1
- package/dist/commands/msg-codegen/utils.d.ts +1 -0
- package/dist/commands/msg-codegen/utils.js +13 -1
- package/dist/commands/msg-codegen/utils.js.map +1 -1
- package/package.json +7 -7
- package/src/commands/msg-codegen/codegen.ts +34 -6
- package/src/commands/msg-codegen/presets.ts +12 -0
- package/src/commands/msg-codegen/utils.ts +14 -1
|
@@ -185,11 +185,23 @@ class Codegen {
|
|
|
185
185
|
}
|
|
186
186
|
//generate barrel export for all model in AsyncAPI document
|
|
187
187
|
const tsIndexOutPath = path.join(groupOutPutPath, 'index.ts');
|
|
188
|
-
|
|
188
|
+
const existingTsFiles = fs.existsSync(groupOutPutPath)
|
|
189
|
+
? (await fs.promises.readdir(groupOutPutPath))
|
|
190
|
+
.filter((f) => f.endsWith('.ts') && f !== 'index.ts')
|
|
191
|
+
.map((f) => path.join(groupOutPutPath, f))
|
|
192
|
+
: [];
|
|
193
|
+
const mergedTsFiles = [...new Set([...tsFiles, ...existingTsFiles])];
|
|
194
|
+
await this.barrelExportTs(mergedTsFiles, [], tsIndexOutPath);
|
|
189
195
|
}
|
|
190
196
|
if (tsDirs.length > 0) {
|
|
191
197
|
const tsIndexOutPath = path.join(outputPath, 'index.ts');
|
|
192
|
-
|
|
198
|
+
const existingDirs = fs.existsSync(outputPath)
|
|
199
|
+
? (await fs.promises.readdir(outputPath, { withFileTypes: true }))
|
|
200
|
+
.filter((d) => d.isDirectory())
|
|
201
|
+
.map((d) => path.join(outputPath, d.name))
|
|
202
|
+
: [];
|
|
203
|
+
const mergedDirs = [...new Set([...tsDirs, ...existingDirs])];
|
|
204
|
+
await this.barrelExportTs([], mergedDirs, tsIndexOutPath);
|
|
193
205
|
}
|
|
194
206
|
}
|
|
195
207
|
/**
|
|
@@ -228,10 +240,26 @@ class Codegen {
|
|
|
228
240
|
}
|
|
229
241
|
//generate barrel export for all model in AsyncAPI document
|
|
230
242
|
const schemasIndexOutPath = path.join(groupOutPutPath, 'index.ts');
|
|
231
|
-
|
|
243
|
+
const existingSchemaFiles = fs.existsSync(groupOutPutPath)
|
|
244
|
+
? (await fs.promises.readdir(groupOutPutPath))
|
|
245
|
+
.filter((f) => f.endsWith('.json'))
|
|
246
|
+
.map((f) => path.join(groupOutPutPath, f))
|
|
247
|
+
: [];
|
|
248
|
+
const mergedSchemaFiles = [
|
|
249
|
+
...new Set([...schemaFiles, ...existingSchemaFiles]),
|
|
250
|
+
];
|
|
251
|
+
await this.barrelExportSchema(mergedSchemaFiles, [], schemasIndexOutPath);
|
|
232
252
|
}
|
|
233
253
|
const schemaIndexOutPath = path.join(outputPath, 'index.ts');
|
|
234
|
-
|
|
254
|
+
const existingSchemaDirs = fs.existsSync(outputPath)
|
|
255
|
+
? (await fs.promises.readdir(outputPath, { withFileTypes: true }))
|
|
256
|
+
.filter((d) => d.isDirectory())
|
|
257
|
+
.map((d) => path.join(outputPath, d.name))
|
|
258
|
+
: [];
|
|
259
|
+
const mergedSchemaDirs = [
|
|
260
|
+
...new Set([...schemaDirs, ...existingSchemaDirs]),
|
|
261
|
+
];
|
|
262
|
+
await this.barrelExportSchema([], mergedSchemaDirs, schemaIndexOutPath);
|
|
235
263
|
}
|
|
236
264
|
/**
|
|
237
265
|
* Export all AsyncAPI document channels to Messaging Settings
|
|
@@ -245,8 +273,8 @@ class Codegen {
|
|
|
245
273
|
const channelsData = [];
|
|
246
274
|
for (const channel of asyncAPIDocument.channels()) {
|
|
247
275
|
const queueName = (_a = channel.bindings().get('amqp')) === null || _a === void 0 ? void 0 : _a.value().queue.name;
|
|
248
|
-
|
|
249
|
-
|
|
276
|
+
const routingKey = channel.address();
|
|
277
|
+
if (queueName !== undefined && routingKey != null) {
|
|
250
278
|
const action = (0, utils_1.getChannelAction)(channel);
|
|
251
279
|
const payloadName = (_b = (0, utils_1.getPayloadTitle)(channel)) !== null && _b !== void 0 ? _b : 'undefined';
|
|
252
280
|
const aggregateType = (0, utils_1.getChannelAggregateType)(channel);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/commands/msg-codegen/codegen.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/commands/msg-codegen/codegen.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,6 +86,14 @@ exports.NULLABLE_PROPERTY_TO_UNION_PRESET = {
|
|
|
86
86
|
// Array property.
|
|
87
87
|
index = (0, utils_1.indexOfNullArrayProperty)(property);
|
|
88
88
|
if (index > -1) {
|
|
89
|
+
// Workaround: modelina drops non-null types from nullable array items
|
|
90
|
+
// e.g. items: { type: ["string", "null"] } renders as null[] instead of (string | null)[].
|
|
91
|
+
// Reconstruct from the original schema instead.
|
|
92
|
+
const nonNullTypes = (0, utils_1.getArrayItemNonNullTypes)(property);
|
|
93
|
+
if (nonNullTypes) {
|
|
94
|
+
property.property.type = `(${[...nonNullTypes, 'null'].join(' | ')})[]`;
|
|
95
|
+
return renderer.renderProperty(property);
|
|
96
|
+
}
|
|
89
97
|
// This pattern is not perfect but it's good enough for this use case.
|
|
90
98
|
const regex = /((?<single>\w+)|\((?<multiple>[\w\s|]+)\))\[\]/;
|
|
91
99
|
const match = regex.exec(property.property.type);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../src/commands/msg-codegen/presets.ts"],"names":[],"mappings":";;;;AAAA,iDAAqE;AACrE,4DAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../src/commands/msg-codegen/presets.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,6 +64,7 @@ export declare function indexOfNullOneOf(model: ConstrainedObjectPropertyModel):
|
|
|
64
64
|
export declare function indexOfNullArrayPlain(model: ConstrainedObjectPropertyModel): number;
|
|
65
65
|
export declare function indexOfNullArrayUnion(model: ConstrainedObjectPropertyModel): number;
|
|
66
66
|
export declare function indexOfNullArrayOneOf(model: ConstrainedObjectPropertyModel): number;
|
|
67
|
+
export declare function getArrayItemNonNullTypes(model: ConstrainedObjectPropertyModel): string[] | null;
|
|
67
68
|
export declare function indexOfNullObjectProperty(model: ConstrainedObjectPropertyModel): number;
|
|
68
69
|
export declare function indexOfNullArrayProperty(model: ConstrainedObjectPropertyModel): number;
|
|
69
70
|
export declare function ensureNullable(type: string, index: number): string;
|
|
@@ -19,6 +19,7 @@ exports.indexOfNullOneOf = indexOfNullOneOf;
|
|
|
19
19
|
exports.indexOfNullArrayPlain = indexOfNullArrayPlain;
|
|
20
20
|
exports.indexOfNullArrayUnion = indexOfNullArrayUnion;
|
|
21
21
|
exports.indexOfNullArrayOneOf = indexOfNullArrayOneOf;
|
|
22
|
+
exports.getArrayItemNonNullTypes = getArrayItemNonNullTypes;
|
|
22
23
|
exports.indexOfNullObjectProperty = indexOfNullObjectProperty;
|
|
23
24
|
exports.indexOfNullArrayProperty = indexOfNullArrayProperty;
|
|
24
25
|
exports.ensureNullable = ensureNullable;
|
|
@@ -257,6 +258,17 @@ function indexOfNullArrayOneOf(model) {
|
|
|
257
258
|
}
|
|
258
259
|
return -1;
|
|
259
260
|
}
|
|
261
|
+
function getArrayItemNonNullTypes(model) {
|
|
262
|
+
var _a, _b;
|
|
263
|
+
if (model.property instanceof modelina_1.ConstrainedArrayModel) {
|
|
264
|
+
const itemsType = (_b = (_a = model.property.originalInput) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.type;
|
|
265
|
+
if (Array.isArray(itemsType)) {
|
|
266
|
+
const nonNullTypes = itemsType.filter((t) => t !== 'null');
|
|
267
|
+
return nonNullTypes.length > 0 ? nonNullTypes : null;
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
return null;
|
|
271
|
+
}
|
|
260
272
|
function indexOfNullObjectProperty(model) {
|
|
261
273
|
if (indexOfNullPlain(model) > -1) {
|
|
262
274
|
return indexOfNullPlain(model);
|
|
@@ -286,7 +298,7 @@ function ensureNullable(type, index) {
|
|
|
286
298
|
if (types[index] === 'any') {
|
|
287
299
|
types[index] = replaceAnyType(types[index], 'null');
|
|
288
300
|
}
|
|
289
|
-
else {
|
|
301
|
+
else if (!types.includes('null')) {
|
|
290
302
|
types.splice(index, 0, 'null');
|
|
291
303
|
}
|
|
292
304
|
return types.join(' | ');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/msg-codegen/utils.ts"],"names":[],"mappings":";;AAgBA,wCAIC;AAED,0CAWC;AAID,gFAIC;AAOD,0CAIC;AAQD,oCAQC;AAOD,4CAkBC;AAOD,0DA6BC;AAOD,gEA+BC;AAOD,0CAUC;AAMD,kCAEC;AASD,gDAQC;AAED,0DAgBC;AAKD,wCAGC;AAED,4CAUC;AAED,4CAOC;AAED,4CAQC;AAED,sDAUC;AAED,sDAOC;AAED,sDAUC;AAED,8DAaC;AAED,4DAaC;AAED,wCAQC;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/msg-codegen/utils.ts"],"names":[],"mappings":";;AAgBA,wCAIC;AAED,0CAWC;AAID,gFAIC;AAOD,0CAIC;AAQD,oCAQC;AAOD,4CAkBC;AAOD,0DA6BC;AAOD,gEA+BC;AAOD,0CAUC;AAMD,kCAEC;AASD,gDAQC;AAED,0DAgBC;AAKD,wCAGC;AAED,4CAUC;AAED,4CAOC;AAED,4CAQC;AAED,sDAUC;AAED,sDAOC;AAED,sDAUC;AAED,4DAWC;AAED,8DAaC;AAED,4DAaC;AAED,wCAQC;;AAhWD,iDAM4B;AAO5B,+CAAyB;AACzB,mDAA6B;AAE7B,SAAgB,cAAc,CAAC,IAAY,EAAE,EAAU;IACrD,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE;QAC7B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AAED,SAAgB,eAAe,CAAC,OAAyB;;IACvD,MAAM,YAAY,GAChB,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,EAAE,0CAAE,KAAK,EAAE,mCAC1B,MAAA,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,uBAAuB,CAAC,0CAAE,KAAK,EAAE,mCAC1D,MAAA,MAAA,OAAO,CAAC,OAAO,EAAE,0CAAE,UAAU,GAAG,GAAG,CAAC,oBAAoB,CAAC,0CAAE,KAAK,EAAE,CAAC;IAErE,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,qEAAqE;AACrE,iHAAiH;AACjH,SAAgB,kCAAkC;IAChD,OAAO,CAAC,IAAY,EAAU,EAAE;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAC7B,gBAA2C;IAE3C,OAAO,gBAAgB,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;AACzC,CAAC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAC1B,gBAA2C;;IAE3C,MAAM,SAAS,GACb,MAAA,MAAA,gBAAgB,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,0CAAE,KAAK,EAAE,mCAC1D,gBAAgB,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;IAElC,OAAO,wBAAa,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;AAC9C,CAAC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,OAAyB;IAEzB,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IACxC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAEtC,IAAI,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,mCAAmC,MAAM,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,OAAyB;;IAC/D,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IACpC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,aAAa,GAAuB,SAAS,CAAC;IAClD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,KAAK;YAClC,KAAK,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAC1C,CAAC;YACD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC1E,CAAC;YACD,aAAa,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IACD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;GAIG;AACH,SAAgB,0BAA0B,CAAC,OAAyB;;IAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IACpC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,gBAAgB,GAAuB,SAAS,CAAC;IACrD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,MAAK,KAAK;YAClC,KAAK,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAC9C,CAAC;YACD,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;YACJ,CAAC;YACD,gBAAgB,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IACD,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,OAAyB;;IACvD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IACpC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,MAAA,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,0CAAE,KAAK,EAAE,CAAC;AACxC,CAAC;AAED;;;GAGG;AACH,SAAgB,WAAW,CAAC,CAAS;IACnC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,SAAiB;IAClD,OAAO,SAAS;QACd,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC3C,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAC3C,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,OAAO;QACX,CAAC,CAAC,OAAO,CAAC;AACd,CAAC;AAED,SAAgB,uBAAuB,CACrC,GAAqC;IAErC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAC1C,CAAC;SAAM,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBACjC,MAAM,CAAC,GAAG,CAAC,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,cAAc,CAAC,IAAY,EAAE,WAAmB;IAC9D,MAAM,OAAO,GAAG,YAAY,CAAC;IAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AAC5C,CAAC;AAED,SAAgB,gBAAgB,CAC9B,KAAqC;;IAErC,IACE,KAAK,CAAC,QAAQ,YAAY,+BAAoB;QAC9C,CAAA,MAAA,KAAK,CAAC,QAAQ,CAAC,aAAa,0CAAE,QAAQ,MAAK,IAAI,EAC/C,CAAC;QACD,OAAO,CAAC,CAAC,CAAC,sCAAsC;IAClD,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,SAAgB,gBAAgB,CAC9B,KAAqC;;IAErC,IAAI,KAAK,CAAC,QAAQ,YAAY,gCAAqB,EAAE,CAAC;QACpD,OAAO,MAAA,MAAA,MAAA,KAAK,CAAC,QAAQ,CAAC,aAAa,0CAAE,IAAI,0CAAE,OAAO,CAAC,MAAM,CAAC,mCAAI,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,SAAgB,gBAAgB,CAC9B,KAAqC;;IAErC,IAAI,KAAK,CAAC,QAAQ,YAAY,gCAAqB,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,MAAA,MAAA,KAAK,CAAC,QAAQ,CAAC,aAAa,0CAAE,KAAK,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtE,OAAO,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,MAAM,CAAC,mCAAI,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,SAAgB,qBAAqB,CACnC,KAAqC;;IAErC,IACE,KAAK,CAAC,QAAQ,YAAY,gCAAqB;QAC/C,CAAA,MAAA,MAAA,KAAK,CAAC,QAAQ,CAAC,aAAa,0CAAE,KAAK,0CAAE,QAAQ,MAAK,IAAI,EACtD,CAAC;QACD,OAAO,CAAC,CAAC,CAAC,sCAAsC;IAClD,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,SAAgB,qBAAqB,CACnC,KAAqC;;IAErC,IAAI,KAAK,CAAC,QAAQ,YAAY,gCAAqB,EAAE,CAAC;QACpD,OAAO,MAAA,MAAA,MAAA,MAAA,KAAK,CAAC,QAAQ,CAAC,aAAa,0CAAE,KAAK,0CAAE,IAAI,0CAAE,OAAO,CAAC,MAAM,CAAC,mCAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,SAAgB,qBAAqB,CACnC,KAAqC;;IAErC,IAAI,KAAK,CAAC,QAAQ,YAAY,gCAAqB,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,MAAA,MAAA,MAAA,KAAK,CAAC,QAAQ,CAAC,aAAa,0CAAE,KAAK,0CAAE,KAAK,0CAAE,GAAG,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CACd,CAAC;QACF,OAAO,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,MAAM,CAAC,mCAAI,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,SAAgB,wBAAwB,CACtC,KAAqC;;IAErC,IAAI,KAAK,CAAC,QAAQ,YAAY,gCAAqB,EAAE,CAAC;QACpD,MAAM,SAAS,GAAG,MAAA,MAAA,KAAK,CAAC,QAAQ,CAAC,aAAa,0CAAE,KAAK,0CAAE,IAAI,CAAC;QAC5D,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;YACnE,OAAO,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;QACvD,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,yBAAyB,CACvC,KAAqC;IAErC,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACjC,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IACD,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACjC,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IACD,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACjC,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,SAAgB,wBAAwB,CACtC,KAAqC;IAErC,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACtC,OAAO,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACtC,OAAO,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACtC,OAAO,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,SAAgB,cAAc,CAAC,IAAY,EAAE,KAAa;IACxD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACnD,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC;QAC3B,KAAK,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;SAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACnC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-cli",
|
|
3
|
-
"version": "0.54.0-rc.
|
|
3
|
+
"version": "0.54.0-rc.25",
|
|
4
4
|
"description": "The Axinom Mosaic CLI",
|
|
5
5
|
"author": "Axinom",
|
|
6
6
|
"license": "PROPRIETARY",
|
|
@@ -34,11 +34,11 @@
|
|
|
34
34
|
"lint": "eslint . --ext .ts,.tsx,.js --color --cache"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@asyncapi/diff": "^0.
|
|
38
|
-
"@asyncapi/modelina": "^
|
|
39
|
-
"@asyncapi/parser": "^
|
|
40
|
-
"@axinom/mosaic-id-link-be": "^0.37.0-rc.
|
|
41
|
-
"@axinom/mosaic-service-common": "^0.67.0-rc.
|
|
37
|
+
"@asyncapi/diff": "^0.5.0",
|
|
38
|
+
"@asyncapi/modelina": "^5.10.1",
|
|
39
|
+
"@asyncapi/parser": "^3.6.0",
|
|
40
|
+
"@axinom/mosaic-id-link-be": "^0.37.0-rc.25",
|
|
41
|
+
"@axinom/mosaic-service-common": "^0.67.0-rc.25",
|
|
42
42
|
"@graphql-inspector/core": "^3.1.2",
|
|
43
43
|
"@inquirer/confirm": "^3.1.0",
|
|
44
44
|
"@inquirer/core": "^9.1.0",
|
|
@@ -85,5 +85,5 @@
|
|
|
85
85
|
"publishConfig": {
|
|
86
86
|
"access": "public"
|
|
87
87
|
},
|
|
88
|
-
"gitHead": "
|
|
88
|
+
"gitHead": "e2116e3beb465bdea9e9433d663781d33f3d9846"
|
|
89
89
|
}
|
|
@@ -292,11 +292,23 @@ export class Codegen {
|
|
|
292
292
|
}
|
|
293
293
|
//generate barrel export for all model in AsyncAPI document
|
|
294
294
|
const tsIndexOutPath = path.join(groupOutPutPath, 'index.ts');
|
|
295
|
-
|
|
295
|
+
const existingTsFiles = fs.existsSync(groupOutPutPath)
|
|
296
|
+
? (await fs.promises.readdir(groupOutPutPath))
|
|
297
|
+
.filter((f) => f.endsWith('.ts') && f !== 'index.ts')
|
|
298
|
+
.map((f) => path.join(groupOutPutPath, f))
|
|
299
|
+
: [];
|
|
300
|
+
const mergedTsFiles = [...new Set([...tsFiles, ...existingTsFiles])];
|
|
301
|
+
await this.barrelExportTs(mergedTsFiles, [], tsIndexOutPath);
|
|
296
302
|
}
|
|
297
303
|
if (tsDirs.length > 0) {
|
|
298
304
|
const tsIndexOutPath = path.join(outputPath, 'index.ts');
|
|
299
|
-
|
|
305
|
+
const existingDirs = fs.existsSync(outputPath)
|
|
306
|
+
? (await fs.promises.readdir(outputPath, { withFileTypes: true }))
|
|
307
|
+
.filter((d) => d.isDirectory())
|
|
308
|
+
.map((d) => path.join(outputPath, d.name))
|
|
309
|
+
: [];
|
|
310
|
+
const mergedDirs = [...new Set([...tsDirs, ...existingDirs])];
|
|
311
|
+
await this.barrelExportTs([], mergedDirs, tsIndexOutPath);
|
|
300
312
|
}
|
|
301
313
|
}
|
|
302
314
|
|
|
@@ -344,11 +356,27 @@ export class Codegen {
|
|
|
344
356
|
|
|
345
357
|
//generate barrel export for all model in AsyncAPI document
|
|
346
358
|
const schemasIndexOutPath = path.join(groupOutPutPath, 'index.ts');
|
|
347
|
-
|
|
359
|
+
const existingSchemaFiles = fs.existsSync(groupOutPutPath)
|
|
360
|
+
? (await fs.promises.readdir(groupOutPutPath))
|
|
361
|
+
.filter((f) => f.endsWith('.json'))
|
|
362
|
+
.map((f) => path.join(groupOutPutPath, f))
|
|
363
|
+
: [];
|
|
364
|
+
const mergedSchemaFiles = [
|
|
365
|
+
...new Set([...schemaFiles, ...existingSchemaFiles]),
|
|
366
|
+
];
|
|
367
|
+
await this.barrelExportSchema(mergedSchemaFiles, [], schemasIndexOutPath);
|
|
348
368
|
}
|
|
349
369
|
|
|
350
370
|
const schemaIndexOutPath = path.join(outputPath, 'index.ts');
|
|
351
|
-
|
|
371
|
+
const existingSchemaDirs = fs.existsSync(outputPath)
|
|
372
|
+
? (await fs.promises.readdir(outputPath, { withFileTypes: true }))
|
|
373
|
+
.filter((d) => d.isDirectory())
|
|
374
|
+
.map((d) => path.join(outputPath, d.name))
|
|
375
|
+
: [];
|
|
376
|
+
const mergedSchemaDirs = [
|
|
377
|
+
...new Set([...schemaDirs, ...existingSchemaDirs]),
|
|
378
|
+
];
|
|
379
|
+
await this.barrelExportSchema([], mergedSchemaDirs, schemaIndexOutPath);
|
|
352
380
|
}
|
|
353
381
|
|
|
354
382
|
/**
|
|
@@ -367,8 +395,8 @@ export class Codegen {
|
|
|
367
395
|
for (const channel of asyncAPIDocument.channels()) {
|
|
368
396
|
const queueName = channel.bindings().get('amqp')?.value().queue.name;
|
|
369
397
|
|
|
370
|
-
|
|
371
|
-
|
|
398
|
+
const routingKey = channel.address();
|
|
399
|
+
if (queueName !== undefined && routingKey != null) {
|
|
372
400
|
const action = getChannelAction(channel);
|
|
373
401
|
const payloadName = getPayloadTitle(channel) ?? 'undefined';
|
|
374
402
|
const aggregateType = getChannelAggregateType(channel);
|
|
@@ -2,6 +2,7 @@ import { FormatHelpers, TypeScriptPreset } from '@asyncapi/modelina';
|
|
|
2
2
|
import endent from 'endent';
|
|
3
3
|
import {
|
|
4
4
|
ensureNullable,
|
|
5
|
+
getArrayItemNonNullTypes,
|
|
5
6
|
getModelPathPrefix,
|
|
6
7
|
indexOfNullArrayProperty,
|
|
7
8
|
indexOfNullObjectProperty,
|
|
@@ -97,6 +98,17 @@ export const NULLABLE_PROPERTY_TO_UNION_PRESET: TypeScriptPreset = {
|
|
|
97
98
|
// Array property.
|
|
98
99
|
index = indexOfNullArrayProperty(property);
|
|
99
100
|
if (index > -1) {
|
|
101
|
+
// Workaround: modelina drops non-null types from nullable array items
|
|
102
|
+
// e.g. items: { type: ["string", "null"] } renders as null[] instead of (string | null)[].
|
|
103
|
+
// Reconstruct from the original schema instead.
|
|
104
|
+
const nonNullTypes = getArrayItemNonNullTypes(property);
|
|
105
|
+
if (nonNullTypes) {
|
|
106
|
+
property.property.type = `(${[...nonNullTypes, 'null'].join(
|
|
107
|
+
' | ',
|
|
108
|
+
)})[]`;
|
|
109
|
+
return renderer.renderProperty(property);
|
|
110
|
+
}
|
|
111
|
+
|
|
100
112
|
// This pattern is not perfect but it's good enough for this use case.
|
|
101
113
|
const regex = /((?<single>\w+)|\((?<multiple>[\w\s|]+)\))\[\]/;
|
|
102
114
|
const match = regex.exec(property.property.type);
|
|
@@ -299,6 +299,19 @@ export function indexOfNullArrayOneOf(
|
|
|
299
299
|
return -1;
|
|
300
300
|
}
|
|
301
301
|
|
|
302
|
+
export function getArrayItemNonNullTypes(
|
|
303
|
+
model: ConstrainedObjectPropertyModel,
|
|
304
|
+
): string[] | null {
|
|
305
|
+
if (model.property instanceof ConstrainedArrayModel) {
|
|
306
|
+
const itemsType = model.property.originalInput?.items?.type;
|
|
307
|
+
if (Array.isArray(itemsType)) {
|
|
308
|
+
const nonNullTypes = itemsType.filter((t: string) => t !== 'null');
|
|
309
|
+
return nonNullTypes.length > 0 ? nonNullTypes : null;
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
return null;
|
|
313
|
+
}
|
|
314
|
+
|
|
302
315
|
export function indexOfNullObjectProperty(
|
|
303
316
|
model: ConstrainedObjectPropertyModel,
|
|
304
317
|
): number {
|
|
@@ -333,7 +346,7 @@ export function ensureNullable(type: string, index: number): string {
|
|
|
333
346
|
const types = type.split('|').map((t) => t.trim());
|
|
334
347
|
if (types[index] === 'any') {
|
|
335
348
|
types[index] = replaceAnyType(types[index], 'null');
|
|
336
|
-
} else {
|
|
349
|
+
} else if (!types.includes('null')) {
|
|
337
350
|
types.splice(index, 0, 'null');
|
|
338
351
|
}
|
|
339
352
|
return types.join(' | ');
|