npm - @axinom/mosaic-cli - Versions diffs - 0.3.10-rc.2 → 0.4.0-rc.0 - Mend

@axinom/mosaic-cli 0.3.10-rc.2 → 0.4.0-rc.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.

Files changed (7) hide show

package/CHANGELOG.md +8 -0
package/dist/commands/msg-codegen/codegen.d.ts +24 -10
package/dist/commands/msg-codegen/codegen.js +290 -66
package/dist/commands/msg-codegen/codegen.js.map +1 -1
package/dist/commands/msg-codegen/index.js +3 -3
package/dist/commands/msg-codegen/index.js.map +1 -1
package/package.json +6 -5

package/CHANGELOG.md CHANGED Viewed

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+### [0.3.10](https://dev.azure.com/axinom/CMS/_git/Navy/branchCompare?baseVersion=GT@axinom/mosaic-cli@0.3.8&targetVersion=GT@axinom/mosaic-cli@0.3.10) (2021-10-25)
+**Note:** Version bump only for package @axinom/mosaic-cli
 ### [0.3.9](https://dev.azure.com/axinom/CMS/_git/Navy/branchCompare?baseVersion=GT@axinom/mosaic-cli@0.3.8&targetVersion=GT@axinom/mosaic-cli@0.3.9) (2021-10-13)
 **Note:** Version bump only for package @axinom/mosaic-cli

package/dist/commands/msg-codegen/codegen.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 #!/usr/bin/env ts-node-script
+import { AsyncAPIDocument } from '@asyncapi/parser';
 import { MessageCodegenOptions } from './message-codegen-options';
 export declare class Codegen {
     private readonly schemaRoot;
@@ -15,26 +16,39 @@ export declare class Codegen {
     walk(dir: string): Promise<void>;
     /**
      * Builds a path for the generated TS file from an input JSON schema path, retains directory structure.
-     * @param schemaPath - Input JSON schema path.
+     * @param outputPath - output directory.
+     * @param typeName - Name of the type.
      */
-    buildTsOutPath(schemaPath: string): string;
+    buildTsOutPath(outputPath: string, typeName: string): string;
     /**
      * Builds a path for the bundled JSON schema file from an input JSON schema path, retains directory structure.
-     * @param schemaPath - Input JSON schema path.
+     * @param outputPath - output directory.
+     * @param typeName - Name of the type.
      */
-    buildSchemaOutPath(schemaPath: string): string;
+    buildSchemaOutPath(outputPath: string, typeName: string): string;
     /**
-     * Generates TS interfaces from JSON schema.
-     * @param schemaPath - Input JSON schema path.
-     * @param outPath - Output file path.
+     * Generates TS interfaces and JSON schemas from AsyncAPI schema.
+     * @param asyncApiFile - path to AsyncAPI document
      */
-    generateTs(schemaPath: string, outPath: string): Promise<void>;
+    processAsyncAPIDocument(asyncApiFile: string): Promise<void>;
+    /**
+     * Export all TS models from AsyncAPI document
+     * @param asyncAPIDocument - AsyncAPI Document object
+     * @param outputPath - output path for generated files
+     */
+    exportTsModels(asyncAPIDocument: AsyncAPIDocument, outputPath: string): Promise<void>;
+    /**
+     * Export all JSON Schemas from AsyncAPI document
+     * @param asyncAPIDocument - AsyncAPI Document object
+     * @param outputPath - output path for generated files
+     */
+    exportSchemas(asyncAPIDocument: AsyncAPIDocument, outputPath: string): Promise<void>;
     /**
      * Bundles a JSON schema into a self-contained file by including all external refs.
-     * @param schemaPath - Input JSON schema path.
+     * @param jsonSchema - Schema object.
      * @param outPath - Output JSON schema path.
      */
-    bundleSchema(schemaPath: string, outPath: string): Promise<void>;
+    bundleSchema(jsonSchema: unknown, outPath: string): Promise<void>;
     /**
      * Generates a barrel index.ts for all modules inside `outPath`.
      * In addition it generates a schemas enum for the included modules to make it easier to map them to bundled JSON schemas.

package/dist/commands/msg-codegen/codegen.js CHANGED Viewed

@@ -4,19 +4,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Codegen = void 0;
 const tslib_1 = require("tslib");
+const modelina_1 = require("@asyncapi/modelina");
+const parser_1 = require("@asyncapi/parser");
 const endent_1 = require("endent");
 const fs = require("fs");
-const json_schema_ref_parser_1 = require("json-schema-ref-parser");
-const json_schema_to_typescript_1 = require("json-schema-to-typescript");
 const path = require("path");
-// Need to specify 'title' for all schemas - this is used to name generated TS interfaces/types:
-// https://github.com/bcherny/json-schema-to-typescript/issues/214
-// allOf (kind of) broken:
-// https://github.com/bcherny/json-schema-to-typescript/issues/96
-// Duplicate interfaces/types generated if description differs from the one in $ref:
-// https://github.com/bcherny/json-schema-to-typescript/issues/193
-// Shared references currently not supported:
-// https://github.com/bcherny/json-schema-to-typescript/issues/258
 class Codegen {
     constructor(options) {
         this.schemaRoot = path.resolve(options.inputDir);
@@ -31,10 +23,6 @@ class Codegen {
         this.typesOutputRoot = path.join(this.outputRoot, 'types');
         this.schemasOutputRoot = path.join(this.outputRoot, 'schemas');
     }
-    // TODO: Add schema info for validation
-    // TODO: Namespaces for better grouping of generated code?
-    // TODO: Consider using TS AST API to build the source files.
-    // TODO: Don't regenerate the whole dir tree on each change - update only what's needed, see https://github.com/mikeal/watch#watchwatchtreeroot-options-callback.
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             console.log('Running message cogegen.');
@@ -57,66 +45,162 @@ class Codegen {
             if ([...files, ...dirs].length === 0) {
                 return;
             }
-            for (const schemaFile of files) {
-                console.log(`Processing ${schemaFile}.`);
-                yield this.generateTs(schemaFile, this.buildTsOutPath(schemaFile));
-                yield this.bundleSchema(schemaFile, this.buildSchemaOutPath(schemaFile));
+            for (const asyncApiFile of files) {
+                console.log(`Processing ${asyncApiFile}.`);
+                yield this.processAsyncAPIDocument(asyncApiFile);
             }
             for (const directory of dirs) {
                 yield this.walk(directory);
             }
-            // Calculate correct TS output related directories for barrel exports.
-            const tsFiles = files.map((f) => this.buildTsOutPath(f));
-            const tsDirs = dirs.map((d) => path.join(this.typesOutputRoot, path.relative(this.schemaRoot, d)));
-            const tsIndexOutPath = path.join(this.typesOutputRoot, getRelativeDir(this.schemaRoot, dir), 'index.ts');
-            yield this.barrelExportTs(tsFiles, tsDirs, tsIndexOutPath);
-            // Calculate correct JSON schema output related directories for barrel exports.
-            const schemaFiles = files.map((f) => this.buildSchemaOutPath(f));
-            const schemaDirs = dirs.map((d) => path.join(this.schemasOutputRoot, path.relative(this.schemaRoot, d)));
-            const schemaIndexOutPath = path.join(this.schemasOutputRoot, getRelativeDir(this.schemaRoot, dir), 'index.ts');
-            yield this.barrelExportSchema(schemaFiles, schemaDirs, schemaIndexOutPath);
+            if (files.length === 0) {
+                //Calculate correct TS output related directories for barrel exports.
+                const tsDirs = dirs.map((d) => path.join(this.typesOutputRoot, path.relative(this.schemaRoot, d)));
+                const tsIndexOutPath = path.join(this.typesOutputRoot, getRelativeDir(this.schemaRoot, dir), 'index.ts');
+                yield this.barrelExportTs([], tsDirs, tsIndexOutPath);
+                // Calculate correct JSON schema output related directories for barrel exports.
+                const schemaDirs = dirs.map((d) => path.join(this.schemasOutputRoot, path.relative(this.schemaRoot, d)));
+                const schemaIndexOutPath = path.join(this.schemasOutputRoot, getRelativeDir(this.schemaRoot, dir), 'index.ts');
+                yield this.barrelExportSchema([], schemaDirs, schemaIndexOutPath);
+            }
         });
     }
     /**
      * Builds a path for the generated TS file from an input JSON schema path, retains directory structure.
-     * @param schemaPath - Input JSON schema path.
+     * @param outputPath - output directory.
+     * @param typeName - Name of the type.
      */
-    buildTsOutPath(schemaPath) {
-        return path.join(this.typesOutputRoot, getRelativeDir(this.schemaRoot, schemaPath), `${path.basename(schemaPath, '.json')}.ts`);
+    buildTsOutPath(outputPath, typeName) {
+        return path.join(outputPath, `${modelina_1.FormatHelpers.toParamCase(typeName)}.ts`);
     }
     /**
      * Builds a path for the bundled JSON schema file from an input JSON schema path, retains directory structure.
-     * @param schemaPath - Input JSON schema path.
+     * @param outputPath - output directory.
+     * @param typeName - Name of the type.
      */
-    buildSchemaOutPath(schemaPath) {
-        const relPath = path.relative(this.schemaRoot, schemaPath);
-        return path.join(this.schemasOutputRoot, relPath);
+    buildSchemaOutPath(outputPath, typeName) {
+        return path.join(outputPath, `${modelina_1.FormatHelpers.toParamCase(typeName)}.json`);
     }
     /**
-     * Generates TS interfaces from JSON schema.
-     * @param schemaPath - Input JSON schema path.
-     * @param outPath - Output file path.
+     * Generates TS interfaces and JSON schemas from AsyncAPI schema.
+     * @param asyncApiFile - path to AsyncAPI document
      */
-    generateTs(schemaPath, outPath) {
+    processAsyncAPIDocument(asyncApiFile) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield fs.promises.mkdir(path.dirname(outPath), { recursive: true });
-            const ts = yield json_schema_to_typescript_1.compileFromFile(schemaPath, {
-                cwd: path.dirname(schemaPath),
-                unknownAny: true,
+            const schemaContent = fs.readFileSync(asyncApiFile, 'utf8');
+            const asyncApiDocument = yield parser_1.parse(schemaContent, { path: asyncApiFile });
+            //export Typescript models
+            const tsModelsOutputPath = path.join(this.typesOutputRoot, getRelativeDir(this.schemaRoot, asyncApiFile));
+            yield this.exportTsModels(asyncApiDocument, tsModelsOutputPath);
+            //export JSON Schemas
+            const schemasOutputPath = path.join(this.schemasOutputRoot, getRelativeDir(this.schemaRoot, asyncApiFile));
+            yield this.exportSchemas(asyncApiDocument, schemasOutputPath);
+        });
+    }
+    /**
+     * Export all TS models from AsyncAPI document
+     * @param asyncAPIDocument - AsyncAPI Document object
+     * @param outputPath - output path for generated files
+     */
+    exportTsModels(asyncAPIDocument, outputPath) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const generator = new modelina_1.TypeScriptGenerator({
+                modelType: 'interface',
+                namingConvention: CustomNamingConvention,
+                enumType: 'union',
+                presets: [
+                    ADDITIONAL_PROPERTIES_PRESET,
+                    NULLABLE_PROPERTY_TO_UNION_PRESET,
+                    DESCRIPTION_PRESET,
+                    IMPORTS_PRESET,
+                ],
             });
-            yield fs.promises.writeFile(outPath, ts);
+            let outputModels = yield yield generator.generate(asyncAPIDocument);
+            for (const key in asyncAPIDocument.components().schemas()) {
+                const referencedModels = yield generator.generate(asyncAPIDocument.components().schemas()[key].json());
+                outputModels = outputModels.map((om) => referencedModels.find((rm) => om.modelName === rm.modelName) || om);
+            }
+            const groupedModels = {};
+            outputModels.map((outModel) => {
+                const modelPathPrefix = getModelPathPrefix(outModel.modelName);
+                if (groupedModels[modelPathPrefix] === undefined) {
+                    groupedModels[modelPathPrefix] = [];
+                }
+                groupedModels[modelPathPrefix].push(outModel);
+            });
+            const tsDirs = [];
+            for (const pathPrefix in groupedModels) {
+                const models = groupedModels[pathPrefix];
+                const groupOutPutPath = path.join(outputPath, pathPrefix);
+                if (pathPrefix) {
+                    tsDirs.push(groupOutPutPath);
+                }
+                yield fs.promises.mkdir(groupOutPutPath, {
+                    recursive: true,
+                });
+                const tsFiles = [];
+                for (const outputModel of models) {
+                    const outputFilePath = this.buildTsOutPath(groupOutPutPath, outputModel.modelName);
+                    yield fs.promises.writeFile(outputFilePath, outputModel.result);
+                    tsFiles.push(outputFilePath);
+                }
+                //generate barrel export for all model in AsyncAPI document
+                const tsIndexOutPath = path.join(groupOutPutPath, 'index.ts');
+                yield this.barrelExportTs(tsFiles, [], tsIndexOutPath);
+            }
+            if (tsDirs.length > 0) {
+                const tsIndexOutPath = path.join(outputPath, 'index.ts');
+                yield this.barrelExportTs([], tsDirs, tsIndexOutPath);
+            }
+        });
+    }
+    /**
+     * Export all JSON Schemas from AsyncAPI document
+     * @param asyncAPIDocument - AsyncAPI Document object
+     * @param outputPath - output path for generated files
+     */
+    exportSchemas(asyncAPIDocument, outputPath) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const groupedSchemas = {};
+            for (const [, message] of asyncAPIDocument.allMessages()) {
+                const schemaPathPrefix = getModelPathPrefix(getMessageTitle(message));
+                if (groupedSchemas[schemaPathPrefix] === undefined) {
+                    groupedSchemas[schemaPathPrefix] = [];
+                }
+                groupedSchemas[schemaPathPrefix].push(message);
+            }
+            const schemaDirs = [];
+            for (const pathPrefix in groupedSchemas) {
+                const messages = groupedSchemas[pathPrefix];
+                const schemaFiles = [];
+                const groupOutPutPath = path.join(outputPath, pathPrefix);
+                if (pathPrefix) {
+                    schemaDirs.push(groupOutPutPath);
+                }
+                yield fs.promises.mkdir(groupOutPutPath, {
+                    recursive: true,
+                });
+                for (const msg of messages) {
+                    const outputSchemaPath = this.buildSchemaOutPath(groupOutPutPath, getMessageTitle(msg));
+                    yield this.bundleSchema(msg.originalPayload(), outputSchemaPath);
+                    schemaFiles.push(outputSchemaPath);
+                }
+                //generate barrel export for all model in AsyncAPI document
+                const schemasIndexOutPath = path.join(groupOutPutPath, 'index.ts');
+                yield this.barrelExportSchema(schemaFiles, [], schemasIndexOutPath);
+            }
+            const schemaIndexOutPath = path.join(outputPath, 'index.ts');
+            yield this.barrelExportSchema([], schemaDirs, schemaIndexOutPath);
         });
     }
     /**
      * Bundles a JSON schema into a self-contained file by including all external refs.
-     * @param schemaPath - Input JSON schema path.
+     * @param jsonSchema - Schema object.
      * @param outPath - Output JSON schema path.
      */
-    bundleSchema(schemaPath, outPath) {
+    bundleSchema(jsonSchema, outPath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             yield fs.promises.mkdir(path.dirname(outPath), { recursive: true });
-            const schema = yield json_schema_ref_parser_1.bundle(schemaPath);
-            yield fs.promises.writeFile(outPath, JSON.stringify(schema, null, 2));
+            yield fs.promises.writeFile(outPath, JSON.stringify(jsonSchema, null, 2));
         });
     }
     // TODO: Consider doing named exports based on message groups to not just put all messages in one namespace.
@@ -159,20 +243,23 @@ class Codegen {
         `;
                 }
                 else {
-                    const enumNameBase = pathToPascalCase(getRelativeDir(this.typesOutputRoot, path.dirname(outPath))).replace('Payloads', ''); // Remove the Payloads prefix to reduce noise
-                    schemaEnum = endent_1.default `
+                    let enumNameBase = modelina_1.FormatHelpers.toPascalCase(getRelativeDir(this.typesOutputRoot, path.dirname(outPath)));
+                    if (!enumNameBase.includes('Types')) {
+                        enumNameBase = enumNameBase.replace('Payloads', ''); // Remove the Payloads prefix to reduce noise
+                        schemaEnum = endent_1.default `
         export enum ${enumNameBase}Schemas {
           ${sortedFiles
-                        .map((f) => `${pathToPascalCase(path.basename(f, '.ts'))} = '${toPosixPath(this.tsPathToSchemaPath(f))}'`)
-                        .join(',\n')}
+                            .map((f) => `${modelina_1.FormatHelpers.toPascalCase(path.basename(f, '.ts'))} = '${toPosixPath(this.tsPathToSchemaPath(f))}'`)
+                            .join(',\n')}
         }`;
-                    typeNamesEnum = endent_1.default `
+                        typeNamesEnum = endent_1.default `
         export enum ${enumNameBase}Types {
           ${sortedFiles
-                        .sort()
-                        .map((f) => `${pathToPascalCase(path.basename(f, '.ts'))} = '${pathToPascalCase(path.basename(f, '.ts'))}'`)
-                        .join(',\n')}
+                            .sort()
+                            .map((f) => `${modelina_1.FormatHelpers.toPascalCase(path.basename(f, '.ts'))} = '${modelina_1.FormatHelpers.toPascalCase(path.basename(f, '.ts'))}'`)
+                            .join(',\n')}
         }`;
+                    }
                 }
             }
             const contents = endent_1.default `
@@ -208,8 +295,8 @@ class Codegen {
             let contents = '';
             if (files.length > 0) {
                 const baseNames = files.map((f) => path.basename(f, '.json')).sort();
-                const schemaImports = baseNames.map((n) => `import * as ${pathToPascalCase(n)} from './${n}.json';`);
-                const schemaExports = baseNames.map((n) => `export const ${pathToPascalCase(n)}Schema = ${pathToPascalCase(n)};`);
+                const schemaImports = baseNames.map((n) => `import * as ${modelina_1.FormatHelpers.toPascalCase(n)} from './${n}.json';`);
+                const schemaExports = baseNames.map((n) => `export const ${modelina_1.FormatHelpers.toPascalCase(n)}Schema = ${modelina_1.FormatHelpers.toPascalCase(n)};`);
                 contents = endent_1.default `
       ${schemaImports.join('\n')}
@@ -235,14 +322,9 @@ function getRelativeDir(from, to) {
         ? path.dirname(path.relative(from, to))
         : path.relative(from, to);
 }
-/**
- * Converts a path or a file name to PascalCalse e.g. /some/long-ass/path becomes SomeLongAssPath
- * @param input - Path to convert to a PascalCase string.
- */
-function pathToPascalCase(input) {
-    return input
-        .split(/[-_/\\]/) // Assuming here that people use _ or - as the word separator in directory names.
-        .reduce((res, word) => `${res}${word.charAt(0).toUpperCase()}${word.substr(1).toLowerCase()}`, '');
+function getMessageTitle(message) {
+    var _a, _b;
+    return ((_b = (_a = message.payload().title()) !== null && _a !== void 0 ? _a : message.extension('x-parser-message-name')) !== null && _b !== void 0 ? _b : message.payload().extension('x-parser-schema-id'));
 }
 /**
  * Converts a path into a POSIX path by replacing current path separator with `/`.
@@ -251,4 +333,146 @@ function pathToPascalCase(input) {
 function toPosixPath(p) {
     return path.posix.join(...p.split(path.sep));
 }
+/**
+ * Extension function for @asyncapi/modelina CommonModel type.
+ * @asyncapi/modelina CommonModel.getNearestDependencies method doesn't return dependency, if it is an array of items.
+ * @param model - object of type CommonModel, generated by @asyncapi/modelina library.
+ */
+function getDependencies(model) {
+    const dependsOn = model.getNearestDependencies();
+    if (model.properties !== undefined && Object.keys(model.properties).length) {
+        Object.values(model.properties)
+            .filter((propertyModel) => propertyModel.items !== undefined &&
+            modelina_1.TypeHelpers.extractKind(propertyModel))
+            .map((propertyModel) => dependsOn.push(...getDependencies(propertyModel)));
+    }
+    return [...new Set(dependsOn)];
+}
+/**
+ * Generating the path prefix for model.
+ * model name ends with "command" - prefix "commands"
+ * model name ends with "event" - prefix "events"
+ * default prefix "types"
+ * @param modelName - name of the model, defined in json schema, or AsyncAPI document
+ */
+function getModelPathPrefix(modelName) {
+    return modelName
+        ? modelName.endsWith('command')
+            ? 'commands'
+            : modelName.endsWith('event')
+                ? 'events'
+                : 'types'
+        : 'types';
+}
+/**
+ * Preset for TypeScriptGenerator, adds descriptions to types and properties.
+ */
+const DESCRIPTION_PRESET = {
+    interface: {
+        self({ renderer, content, model }) {
+            const desc = model.getFromOriginalInput('description');
+            if (desc) {
+                const renderedDesc = renderer.renderComments(desc);
+                return `${renderedDesc}\n${content}`;
+            }
+            return content;
+        },
+        property({ renderer, model, content }) {
+            const propertyName = content
+                .split(':')[0]
+                .replace('?', '')
+                .replace('[', '');
+            if (model.getFromOriginalInput('properties') !== undefined) {
+                const property = model.getFromOriginalInput('properties')[propertyName];
+                if (property !== undefined) {
+                    const desc = property['description'];
+                    if (desc) {
+                        const renderedDesc = renderer.renderComments(desc);
+                        return `${renderedDesc}\n${content}`;
+                    }
+                }
+            }
+            return content;
+        },
+    },
+};
+/**
+ * Preset for TypeScriptGenerator, additionalProperties added to models as "[k: string]: unknown;"
+ */
+const ADDITIONAL_PROPERTIES_PRESET = {
+    interface: {
+        self({ content }) {
+            return content;
+        },
+        property({ content }) {
+            const propertyName = content
+                .split(':')[0]
+                .replace('?', '')
+                .replace('[', '');
+            if (propertyName === 'additionalProperties') {
+                return `\n[k: string]: unknown;`;
+            }
+            return content;
+        },
+    },
+};
+/**
+ * Preset for TypeScriptGenerator, adds imports to resulting model.
+ */
+const IMPORTS_PRESET = {
+    interface: {
+        self({ content, model }) {
+            const modelName = model.getFromOriginalInput('title');
+            const modelPrefix = getModelPathPrefix(modelName);
+            const modelDependencies = getDependencies(model);
+            const modelImports = modelDependencies.map((modelDependency) => `import { ${modelina_1.FormatHelpers.toPascalCase(modelDependency)} } from '${modelPrefix !== getModelPathPrefix(modelDependency)
+                ? `../${getModelPathPrefix(modelDependency)}/${modelina_1.FormatHelpers.toParamCase(modelDependency)}`
+                : `./${modelina_1.FormatHelpers.toParamCase(modelDependency)}`}'`);
+            return endent_1.default `
+    ${modelImports.join('\n')}
+    ${content}`;
+        },
+        property({ content }) {
+            return content;
+        },
+    },
+};
+/**
+ * Preset for TypeScriptGenerator, sets nullable properties as unions in resulted models(compatibility with zapatos generated models).
+ */
+const NULLABLE_PROPERTY_TO_UNION_PRESET = {
+    interface: {
+        self({ content }) {
+            return content;
+        },
+        property({ renderer, model, content }) {
+            const propertyName = content
+                .split(':')[0]
+                .replace('?', '')
+                .replace('[', '');
+            if (model.getFromOriginalInput('properties') !== undefined) {
+                const property = model.getFromOriginalInput('properties')[propertyName];
+                if (property !== undefined) {
+                    const type = property['type'];
+                    if (Array.isArray(type)) {
+                        const renderProp = renderer.renderProperty(propertyName, property);
+                        return renderProp.replace('object', content.split(':')[1].replace(';', ''));
+                    }
+                }
+            }
+            return content;
+        },
+    },
+};
+/**
+ * Extension for @asyncapi/modelina, to make sure that the type name is in pascal.
+ */
+const CustomNamingConvention = {
+    type: (name) => {
+        if (!name) {
+            return '';
+        }
+        return modelina_1.FormatHelpers.toPascalCase(name);
+    },
+};
 //# sourceMappingURL=codegen.js.map

package/dist/commands/msg-codegen/codegen.js.map CHANGED Viewed

	@@ -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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"}

package/dist/commands/msg-codegen/index.js CHANGED Viewed

@@ -6,11 +6,11 @@ const codegen_1 = require("./codegen");
 const lint_1 = require("./lint");
 exports.msgCodegen = {
     command: 'msg-codegen',
-    describe: 'Generates code from message JSON schemas.',
+    describe: 'Generates code from AsyncAPI document.',
     builder: (yargs) => yargs
         .option('inputDir', {
         alias: 'i',
-        describe: 'Path to input directory - schemas root.',
+        describe: 'Path to input directory - AsyncAPI document root.',
         type: 'string',
         demandOption: true,
     })
@@ -18,7 +18,7 @@ exports.msgCodegen = {
         alias: 'p',
         describe: 'Regular expression that matches suitable input files.',
         type: 'string',
-        default: '^.*(-event|-command).json$',
+        default: '^.*(-payloads).(json|yaml|yml)$',
     })
         .option('outputDir', {
         alias: 'o',

package/dist/commands/msg-codegen/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/msg-codegen/index.ts"],"names":[],"mappings":";;;;AACA,uCAAoC;AACpC,iCAA8B;AAGjB,QAAA,UAAU,GAAkD;IACvE,OAAO,EAAE,aAAa;IACtB,QAAQ,EAAE,~~2CAA2C~~;~~IACrD~~,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,MAAM,CAAC,UAAU,EAAE;QAClB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,~~yCAAyC~~;~~QACnD~~,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB,CAAC;SACD,MAAM,CAAC,aAAa,EAAE;QACrB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,uDAAuD;QACjE,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,~~4BAA4B~~;~~KACtC~~,CAAC;SACD,MAAM,CAAC,WAAW,EAAE;QACnB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,yCAAyC;QACnD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,eAAe;KACzB,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,6CAA6C;QACvD,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;SACD,MAAM,CAAC,aAAa,EAAE;QACrB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,8CAA8C;QACxD,IAAI,EAAE,QAAQ;KACf,CAAC;IACN,OAAO,EAAE,CAAO,IAAI,EAAE,EAAE;QACtB,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,MAAM,WAAI,CAAC,IAAI,CAAC,CAAC;SAClB;aAAM;YACL,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC;SACrB;QACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC,CAAA;CACF,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/msg-codegen/index.ts"],"names":[],"mappings":";;;;AACA,uCAAoC;AACpC,iCAA8B;AAGjB,QAAA,UAAU,GAAkD;IACvE,OAAO,EAAE,aAAa;IACtB,QAAQ,EAAE,wCAAwC;IAClD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,MAAM,CAAC,UAAU,EAAE;QAClB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,mDAAmD;QAC7D,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB,CAAC;SACD,MAAM,CAAC,aAAa,EAAE;QACrB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,uDAAuD;QACjE,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,iCAAiC;KAC3C,CAAC;SACD,MAAM,CAAC,WAAW,EAAE;QACnB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,yCAAyC;QACnD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,eAAe;KACzB,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,6CAA6C;QACvD,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;SACD,MAAM,CAAC,aAAa,EAAE;QACrB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,8CAA8C;QACxD,IAAI,EAAE,QAAQ;KACf,CAAC;IACN,OAAO,EAAE,CAAO,IAAI,EAAE,EAAE;QACtB,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,MAAM,WAAI,CAAC,IAAI,CAAC,CAAC;SAClB;aAAM;YACL,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC;SACrB;QACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC,CAAA;CACF,CAAC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@axinom/mosaic-cli",
-  "version": "0.3.10-rc.2",
+  "version": "0.4.0-rc.0",
   "description": "The Axinom Mosaic CLI",
   "author": "Axinom",
   "license": "PROPRIETARY",
@@ -25,8 +25,10 @@
     "test:ci": "jest --reporters=default --reporters=jest-junit --coverage --coverageReporters=cobertura --coverageReporters=html"
   },
   "dependencies": {
-    "@axinom/mosaic-id-link-be": "^0.3.10-rc.2",
-    "@axinom/mosaic-service-common": "^0.8.0-rc.2",
+    "@asyncapi/modelina": "^0.39.0",
+    "@asyncapi/parser": "^1.10.0",
+    "@axinom/mosaic-id-link-be": "^0.3.9-rc.4",
+    "@axinom/mosaic-service-common": "^0.7.0-rc.23",
     "@stoplight/spectral": "^5.9.1",
     "chalk": "^4.1.0",
     "diff": "^5.0.0",
@@ -38,7 +40,6 @@
     "graphql": "^15.4.0",
     "json-schema": "^0.3.0",
     "json-schema-ref-parser": "^9.0.7",
-    "json-schema-to-typescript": "^9.1.1",
     "json5": "^2.2.0",
     "pg": "^8.5.1",
     "sql-formatter": "^4.0.2",
@@ -56,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a5b81d6d2e09515421e809d297e69ad2459f90f1"
+  "gitHead": "5bb6a0a701912547ba31c2cc1b33f63f5128e1c6"
 }