@axinom/mosaic-cli 0.56.0 → 0.57.0-rc.3

package/src/commands/create/command.ts

@@ -1,10 +1,10 @@
 import { ExitPromptError } from '@inquirer/core';
-import { CommandModule } from 'yargs';
-import { createSolution } from './createSolution';
-import { defaultValues } from './defaultValues';
-import { logger, setDebug } from './helpers/logger';
-import { CliResults } from './helpers/types';
-import { runQuestionaire } from './runQuestionaire';
+import type { CommandModule } from 'yargs';
+import { createSolution } from './createSolution.js';
+import { defaultValues } from './defaultValues.js';
+import { logger, setDebug } from './helpers/logger.js';
+import type { CliResults } from './helpers/types.js';
+import { runQuestionaire } from './runQuestionaire.js';
 
 export const createSolutionCommand: CommandModule<unknown, CliResults> = {
   command: 'create',

package/src/commands/create/createSolution.ts

@@ -4,9 +4,9 @@ import { createGunzip } from 'node:zlib';
 import * as path from 'path';
 import { simpleGit } from 'simple-git';
 import { extract } from 'tar';
-import { getCommitId } from './helpers/git';
-import * as logger from './helpers/logger';
-import { CreateSolutionInput } from './helpers/types';
+import { getCommitId } from './helpers/git.js';
+import * as logger from './helpers/logger.js';
+import type { CreateSolutionInput } from './helpers/types.js';
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 const getOra = async () => (await import('ora')).default;

package/src/commands/create/helpers/git.ts

@@ -1,4 +1,4 @@
-import { CreateSolutionInput } from './types';
+import type { CreateSolutionInput } from './types.js';
 
 export const getBranches = async (): Promise<string[]> => {
   const branches: string[] = [];

package/src/commands/create/runQuestionaire.ts

@@ -1,9 +1,9 @@
 import confirm from '@inquirer/confirm';
 import input from '@inquirer/input';
 import select from '@inquirer/select';
-import { defaultValues } from './defaultValues';
-import { getBranches } from './helpers/git';
-import { CliResults } from './helpers/types';
+import { defaultValues } from './defaultValues.js';
+import { getBranches } from './helpers/git.js';
+import type { CliResults } from './helpers/types.js';
 
 /**
  * Runs the questionnaire to gather user input for the project creation.

package/src/commands/create-extension-config/create-extension-config.ts

@@ -3,7 +3,7 @@ import findNearestFile from 'find-nearest-file';
 import * as fs from 'fs';
 import * as path from 'path';
 import { promisify } from 'util';
-import { exitCode } from '../../common';
+import { exitCode, getCliExtensionFactory } from '../../common/index.js';
 
 const execAsync = promisify(exec);
 
@@ -74,8 +74,8 @@ export const createExtensionConfig = async (): Promise<void> => {
     installedMosaicLibs.map(async (lib: string) => {
       //filter libraries, that have cli extension
       try {
-        const result = await import(lib);
-        if (result.cliExtension) {
+        const cliExtension = getCliExtensionFactory(await import(lib));
+        if (cliExtension) {
           extensions.push(lib);
         }
       } catch (error) {

package/src/commands/create-extension-config/index.ts

@@ -1,9 +1,9 @@
 import * as dotenv from 'dotenv';
-import { CommandModule } from 'yargs';
+import type { CommandModule } from 'yargs';
 import {
   createExtensionConfig,
   getExtensionConfigPath,
-} from './create-extension-config';
+} from './create-extension-config.js';
 
 export const createExtensionConfigCommand: CommandModule<unknown, undefined> = {
   command: 'create-extension-config',

package/src/commands/get-access-token/index.ts

@@ -1,9 +1,9 @@
 import { ensureError } from '@axinom/mosaic-service-common';
 import chalk from 'chalk';
-import { CommandModule } from 'yargs';
-import { exitCode } from '../../common';
-import { GetAccessTokenOptions } from './get-access-token-options';
-import { getDevAccessToken } from './get-dev-access-token';
+import type { CommandModule } from 'yargs';
+import { exitCode } from '../../common/index.js';
+import type { GetAccessTokenOptions } from '../../lib/get-access-token-options.js';
+import { getDevAccessToken } from '../../lib/get-dev-access-token.js';
 
 export const getAccessToken: CommandModule<unknown, GetAccessTokenOptions> = {
   command: 'get-access-token',

package/src/commands/graphql-diff.ts

@@ -6,13 +6,14 @@
 /* eslint-disable no-console */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { CriticalityLevel, diff } from '@graphql-inspector/core';
-import { green, red } from 'chalk';
+import chalk from 'chalk';
 import { execSync } from 'child_process';
 import * as fs from 'fs';
 import { GraphQLSchema, buildSchema } from 'graphql';
 import * as path from 'path';
-import { CommandModule } from 'yargs';
-import { exitCode } from '../common';
+import type { CommandModule } from 'yargs';
+import { exitCode } from '../common/index.js';
+const { green, red } = chalk;
 
 interface GraphqlDiffOptions {
   files: (string | number)[];
@@ -69,8 +70,7 @@ async function gqlDiff(
   branch: string,
   verbose: boolean,
 ): Promise<number> {
-  const root = path.dirname(__dirname);
-  const relPath = path.relative(root, file);
+  const relPath = path.relative(process.cwd(), file);
   console.log(`Comparing schema '${relPath}' with branch '${branch}':`);
 
   let schema1: GraphQLSchema | undefined = undefined;

package/src/commands/hosting/index.ts

@@ -1,7 +1,7 @@
-import { CommandModule } from 'yargs';
-import { manifestCommands } from './manifest/manifest-commands';
-import { piletCommands } from './pilet/pilet-commands';
-import { serviceCommands } from './service/service-commands';
+import type { CommandModule } from 'yargs';
+import { manifestCommands } from './manifest/manifest-commands.js';
+import { piletCommands } from './pilet/pilet-commands.js';
+import { serviceCommands } from './service/service-commands.js';
 
 export const hosting: CommandModule<unknown, unknown> = {
   command: 'hosting',

package/src/commands/hosting/manifest/manifest-commands.ts

@@ -1,6 +1,6 @@
-import { CommandModule } from 'yargs';
-import { uploadDeploymentManifest, validateArgs } from './upload-manifest';
-import { GetUploadManifestOptions } from './upload-manifest-options';
+import type { CommandModule } from 'yargs';
+import type { GetUploadManifestOptions } from './upload-manifest-options.js';
+import { uploadDeploymentManifest, validateArgs } from './upload-manifest.js';
 
 export const manifestCommands: CommandModule<unknown, unknown> = {
   builder: (yargs) =>

package/src/commands/hosting/manifest/upload-manifest.ts

@@ -1,11 +1,11 @@
 import { getServiceAccountToken } from '@axinom/mosaic-id-link-be';
 import { isNullOrWhitespace } from '@axinom/mosaic-service-common';
-import axios, { AxiosError, AxiosInstance } from 'axios';
+import axios, { AxiosError, type AxiosInstance } from 'axios';
 import { existsSync, lstatSync, readFileSync } from 'fs';
 import * as yaml from 'js-yaml';
 import * as path from 'path';
-import { exitCode } from '../../../common';
-import { GetUploadManifestOptions } from './upload-manifest-options';
+import { exitCode } from '../../../common/index.js';
+import type { GetUploadManifestOptions } from './upload-manifest-options.js';
 
 const getAxiosInstance = (
   hostingServiceBaseUrl: string,

package/src/commands/hosting/pilet/pilet-commands.ts

@@ -1,6 +1,6 @@
-import { CommandModule } from 'yargs';
-import { registerPilet, validateArgs } from './register-pilet';
-import { GetRegisterPiletOptions } from './register-pilet-options';
+import type { CommandModule } from 'yargs';
+import type { GetRegisterPiletOptions } from './register-pilet-options.js';
+import { registerPilet, validateArgs } from './register-pilet.js';
 
 export const piletCommands: CommandModule<unknown, unknown> = {
   builder: (yargs) =>

package/src/commands/hosting/pilet/register-pilet.ts

@@ -1,11 +1,14 @@
-import { TokenResult, getServiceAccountToken } from '@axinom/mosaic-id-link-be';
+import {
+  type TokenResult,
+  getServiceAccountToken,
+} from '@axinom/mosaic-id-link-be';
 import { isNullOrWhitespace } from '@axinom/mosaic-service-common';
 import axios, { AxiosError } from 'axios';
 import FormData from 'form-data';
 import { createReadStream, existsSync, lstatSync, readdirSync } from 'fs';
 import * as path from 'path';
-import { exitCode } from '../../../common';
-import { GetRegisterPiletOptions } from './register-pilet-options';
+import { exitCode } from '../../../common/index.js';
+import type { GetRegisterPiletOptions } from './register-pilet-options.js';
 
 export const registerPilet = async (
   args: Required<GetRegisterPiletOptions>,

package/src/commands/hosting/service/deploy/service-deploy-command.ts

@@ -1,7 +1,8 @@
-import { red, yellow } from 'chalk';
-import { CommandModule } from 'yargs';
-import { deployService, validateDeploymentArgs } from './service-deploy';
-import { GetServiceDeployOptions } from './service-deploy-options';
+import chalk from 'chalk';
+import type { CommandModule } from 'yargs';
+import type { GetServiceDeployOptions } from './service-deploy-options.js';
+import { deployService, validateDeploymentArgs } from './service-deploy.js';
+const { red, yellow } = chalk;
 
 export const serviceDeploy: CommandModule<unknown, GetServiceDeployOptions> = {
   builder: (yargs) => {

package/src/commands/hosting/service/deploy/service-deploy.ts

@@ -1,11 +1,12 @@
 import { getServiceAccountToken } from '@axinom/mosaic-id-link-be';
 import { isNullOrWhitespace } from '@axinom/mosaic-service-common';
-import axios, { AxiosError, AxiosInstance } from 'axios';
-import { green, red, yellow } from 'chalk';
+import axios, { AxiosError, type AxiosInstance } from 'axios';
+import chalk from 'chalk';
 import { readFileSync } from 'fs';
 import * as yaml from 'js-yaml';
-import { exitCode } from '../../../../common';
-import { GetServiceDeployOptions } from './service-deploy-options';
+import { exitCode } from '../../../../common/index.js';
+import type { GetServiceDeployOptions } from './service-deploy-options.js';
+const { green, red, yellow } = chalk;
 
 const getAxiosInstance = (
   hostingServiceBaseUrl: string,

package/src/commands/hosting/service/service-commands.ts

@@ -1,6 +1,6 @@
-import { CommandModule } from 'yargs';
-import { serviceDeploy } from './deploy/service-deploy-command';
-import { serviceUndeploy } from './undeploy/service-undeploy-command';
+import type { CommandModule } from 'yargs';
+import { serviceDeploy } from './deploy/service-deploy-command.js';
+import { serviceUndeploy } from './undeploy/service-undeploy-command.js';
 
 export const serviceCommands: CommandModule<unknown, unknown> = {
   builder: (yargs) =>

package/src/commands/hosting/service/undeploy/service-undeploy-command.ts

@@ -1,7 +1,11 @@
-import { red, yellow } from 'chalk';
-import { CommandModule } from 'yargs';
-import { undeployService, validateUndeploymentArgs } from './service-undeploy';
-import { GetServiceUndeployOptions } from './service-undeploy-options';
+import chalk from 'chalk';
+import type { CommandModule } from 'yargs';
+import type { GetServiceUndeployOptions } from './service-undeploy-options.js';
+import {
+  undeployService,
+  validateUndeploymentArgs,
+} from './service-undeploy.js';
+const { red, yellow } = chalk;
 
 export const serviceUndeploy: CommandModule<
   unknown,

package/src/commands/hosting/service/undeploy/service-undeploy.ts

@@ -1,9 +1,10 @@
 import { getServiceAccountToken } from '@axinom/mosaic-id-link-be';
 import { isNullOrWhitespace } from '@axinom/mosaic-service-common';
-import axios, { AxiosError, AxiosInstance } from 'axios';
-import { green, red, yellow } from 'chalk';
-import { exitCode } from '../../../../common';
-import { GetServiceUndeployOptions } from './service-undeploy-options';
+import axios, { AxiosError, type AxiosInstance } from 'axios';
+import chalk from 'chalk';
+import { exitCode } from '../../../../common/index.js';
+import type { GetServiceUndeployOptions } from './service-undeploy-options.js';
+const { green, red, yellow } = chalk;
 
 const getAxiosInstance = (
   hostingServiceBaseUrl: string,

package/src/commands/msg-codegen/codegen.ts

@@ -8,23 +8,23 @@ import {
   typeScriptDefaultPropertyKeyConstraints,
   TypeScriptGenerator,
 } from '@asyncapi/modelina';
-import Parser, {
-  AsyncAPIDocumentInterface,
+import _Parser, {
+  type AsyncAPIDocumentInterface,
   fromFile,
-  MessageInterface,
+  type MessageInterface,
 } from '@asyncapi/parser';
-import endent from 'endent';
+import _endent from 'endent';
 import * as fs from 'fs';
 import * as path from 'path';
-import { exitCode } from '../../common';
-import { MessageCodegenOptions } from './message-codegen-options';
+import { exitCode } from '../../common/index.js';
+import type { MessageCodegenOptions } from './message-codegen-options.js';
 import {
   ADDITIONAL_PROPERTIES_PRESET,
   ANY_TO_UNKNOWN_PRESET,
+  createImportsPreset,
   EXPORT_TYPES_PRESET,
-  IMPORTS_PRESET,
   NULLABLE_PROPERTY_TO_UNION_PRESET,
-} from './presets';
+} from './presets.js';
 import {
   createDummyReservedKeywordsChecker,
   getChannelAction,
@@ -38,7 +38,19 @@ import {
   getServiceTitle,
   removeXParserProperties,
   toPosixPath,
-} from './utils';
+} from './utils.js';
+// @asyncapi/parser is a TypeScript-compiled CJS package that emits
+// `module.exports = { __esModule: true, default: value }`.
+// Node.js native ESM does not honour the __esModule sentinel, so the default
+// import receives the whole module.exports wrapper. Pattern 9 in
+// ESM_MIGRATION_GUIDE.md. The `?? _Parser` fallback keeps the CJS build safe.
+const Parser = ((_Parser as any).default ?? _Parser) as typeof _Parser;
+// endent is a TypeScript-compiled CJS package that emits
+// `module.exports = { __esModule: true, default: value }`.
+// Node.js native ESM does not honour the __esModule sentinel — the default
+// import receives the whole module.exports wrapper. Pattern 9 in
+// ESM_MIGRATION_GUIDE.md. The `?? _endent` fallback keeps the CJS build safe.
+const endent = ((_endent as any).default ?? _endent) as typeof _endent;
 
 const AX_COMMON_SERVICE_ID = 'ax-common-service';
 
@@ -58,6 +70,7 @@ export class Codegen {
   private readonly typesOutputRoot: string;
   private readonly schemasOutputRoot: string;
   private readonly messagingSettingsOutputRoot: string;
+  private readonly importSpecifierExtension: string;
 
   constructor(options: MessageCodegenOptions) {
     this.schemaRoot = path.resolve(options.inputDir);
@@ -74,6 +87,7 @@ export class Codegen {
     this.typesOutputRoot = path.join(this.outputRoot, 'types');
     this.schemasOutputRoot = path.join(this.outputRoot, 'schemas');
     this.messagingSettingsOutputRoot = path.join(this.outputRoot, 'config');
+    this.importSpecifierExtension = options.importSpecifierExtension ?? '';
   }
 
   public async run(): Promise<void> {
@@ -249,7 +263,7 @@ export class Codegen {
         ADDITIONAL_PROPERTIES_PRESET,
         EXPORT_TYPES_PRESET,
         TS_DESCRIPTION_PRESET,
-        IMPORTS_PRESET,
+        createImportsPreset(this.importSpecifierExtension),
       ],
     });
 
@@ -526,7 +540,11 @@ export class Codegen {
         serviceId === AX_COMMON_SERVICE_ID,
       ),
     );
-    const content = endent`import { ${baseClass} } from '@axinom/mosaic-message-bus-abstractions';
+    // MessagingSettings is an interface (implements clause is erased at runtime),
+    // so it only needs a type import. MultiTenantMessagingSettings is an abstract
+    // class used in extends, so it requires a value import.
+    const importKeyword = isMultiTenant ? 'import' : 'import type';
+    const content = endent`${importKeyword} { ${baseClass} } from '@axinom/mosaic-message-bus-abstractions';
 
     export class ${className} ${action} ${baseClass} {
       ${properties.join(`\n`)}
@@ -642,19 +660,26 @@ export class Codegen {
     outPath: string,
   ): Promise<void> {
     console.log(`Rolling up TS exports to ${outPath}.`);
-    const items = [
-      ...files.map((f) => path.basename(f, '.ts')),
-      ...dirs.filter((d) => fs.existsSync(d)).map((d) => path.basename(d)),
+    const ext = this.importSpecifierExtension;
+    const allItems: { key: string; isDir: boolean }[] = [
+      ...files.map((f) => ({ key: path.basename(f, '.ts'), isDir: false })),
+      ...dirs
+        .filter((d) => fs.existsSync(d))
+        .map((d) => ({ key: path.basename(d), isDir: true })),
     ];
 
-    if (items.length < 1) {
+    if (allItems.length < 1) {
       return;
     }
 
-    const exports = `${items
-      .sort()
-      .map((p) => `export * from './${p}';`)
-      .join('\n')}`;
+    const exports = allItems
+      .sort((a, b) => (a.key < b.key ? -1 : a.key > b.key ? 1 : 0))
+      .map(({ key, isDir }) =>
+        isDir && ext
+          ? `export * from './${key}/index${ext}';`
+          : `export * from './${key}${ext}';`,
+      )
+      .join('\n');
     let schemaEnum = '';
     let typeNamesEnum = '';
 
@@ -727,6 +752,7 @@ export class Codegen {
     outPath: string,
   ): Promise<void> {
     console.log(`Rolling up Messaging Settings exports to ${outPath}.`);
+    const ext = this.importSpecifierExtension;
     const items = [
       ...files.map((f) => path.basename(f, '.ts')),
       ...dirs.filter((d) => fs.existsSync(d)).map((d) => path.basename(d)),
@@ -745,14 +771,22 @@ export class Codegen {
 
     if (files.length > 0) {
       const baseNames = files.map((f) => path.basename(f, '.ts')).sort();
-      const messagingImports = baseNames.map((n) => `export * from './${n}';`);
+      const messagingImports = baseNames.map(
+        (n) => `export * from './${n}${ext}';`,
+      );
       contents = endent`
         ${messagingImports.join('\n')}
         `;
     }
 
     contents += endent`\n
-      ${dirExports.map((d) => `export * from './${d}';`).join('\n')}`;
+      ${dirExports
+        .map((d) =>
+          ext
+            ? `export * from './${d}/index${ext}';`
+            : `export * from './${d}';`,
+        )
+        .join('\n')}`;
 
     await fs.promises.writeFile(outPath, contents);
   }
@@ -768,6 +802,7 @@ export class Codegen {
     outPath: string,
   ): Promise<void> {
     console.log(`Rolling up JSON exports to ${outPath}.`);
+    const ext = this.importSpecifierExtension;
     const items = [
       ...files.map((f) => path.basename(f, '.json')),
       ...dirs.filter((d) => fs.existsSync(d)).map((d) => path.basename(d)),
@@ -804,7 +839,11 @@ export class Codegen {
     }
 
     contents += endent`\n
-    ${dirExports.map((d) => `export * from './${d}';`).join('\n')}`;
+    ${dirExports
+      .map((d) =>
+        ext ? `export * from './${d}/index${ext}';` : `export * from './${d}';`,
+      )
+      .join('\n')}`;
 
     await fs.promises.writeFile(outPath, contents);
   }

package/src/commands/msg-codegen/index.ts

@@ -1,7 +1,7 @@
-import { CommandModule } from 'yargs';
-import { Codegen } from './codegen';
-import { lint } from './lint';
-import { MessageCodegenOptions } from './message-codegen-options';
+import type { CommandModule } from 'yargs';
+import { Codegen } from './codegen.js';
+import { lint } from './lint.js';
+import type { MessageCodegenOptions } from './message-codegen-options.js';
 
 export const msgCodegen: CommandModule<unknown, MessageCodegenOptions> = {
   command: 'msg-codegen',
@@ -35,6 +35,13 @@ export const msgCodegen: CommandModule<unknown, MessageCodegenOptions> = {
         alias: 'r',
         describe: 'Path to a Spectral ruleset file for linting.',
         type: 'string',
+      })
+      .option('importSpecifierExtension', {
+        alias: 'e',
+        describe:
+          'Extension appended to relative import specifiers in generated barrel files (e.g. ".js" for ESM-compatible output). Default empty string preserves existing CJS behaviour.',
+        type: 'string',
+        default: '',
       }),
   handler: async (argv) => {
     if (argv.lint) {

package/src/commands/msg-codegen/lint.ts

@@ -1,11 +1,14 @@
-import { Document, Ruleset, Spectral } from '@stoplight/spectral-core';
-import * as Parsers from '@stoplight/spectral-parsers';
+import spectralCore, { type Ruleset } from '@stoplight/spectral-core';
+import spectralParsers from '@stoplight/spectral-parsers';
 import { bundleAndLoadRuleset } from '@stoplight/spectral-ruleset-bundler/with-loader';
-import { fetch } from '@stoplight/spectral-runtime';
+import spectralRuntime from '@stoplight/spectral-runtime';
 import * as fs from 'fs';
-import * as glob from 'glob';
+import glob from 'glob';
 import * as path from 'path';
-import { MessageCodegenOptions } from './message-codegen-options';
+import type { MessageCodegenOptions } from './message-codegen-options.js';
+const { Document, Spectral } = spectralCore;
+const { Json } = spectralParsers;
+const { fetch } = spectralRuntime;
 
 export async function lint(options: MessageCodegenOptions): Promise<void> {
   console.log(`Linting schemas at ${options.inputDir}.`);
@@ -29,7 +32,7 @@ export async function lint(options: MessageCodegenOptions): Promise<void> {
     // console.log(schema);
     const document = new Document(
       fs.readFileSync(schema, 'utf-8'),
-      Parsers.Json,
+      Json,
       schema,
     );
     const results = await spectral.run(document);

package/src/commands/msg-codegen/message-codegen-options.ts

@@ -4,4 +4,5 @@ export interface MessageCodegenOptions {
   outputDir: string;
   lint: boolean;
   rulesetPath?: string;
+  importSpecifierExtension: string;
 }

package/src/commands/msg-codegen/presets.ts

@@ -1,5 +1,5 @@
-import { FormatHelpers, TypeScriptPreset } from '@asyncapi/modelina';
-import endent from 'endent';
+import { FormatHelpers, type TypeScriptPreset } from '@asyncapi/modelina';
+import _endent from 'endent';
 import {
   ensureNullable,
   getArrayItemNonNullTypes,
@@ -7,7 +7,13 @@ import {
   indexOfNullArrayProperty,
   indexOfNullObjectProperty,
   replaceAnyType,
-} from './utils';
+} from './utils.js';
+// endent is a TypeScript-compiled CJS package that emits
+// `module.exports = { __esModule: true, default: value }`.
+// Node.js native ESM does not honour the __esModule sentinel — the default
+// import receives the whole module.exports wrapper. Pattern 9 in
+// ESM_MIGRATION_GUIDE.md. The `?? _endent` fallback keeps the CJS build safe.
+const endent = ((_endent as any).default ?? _endent) as typeof _endent;
 
 /**
  * Exports types.
@@ -48,9 +54,15 @@ export const ADDITIONAL_PROPERTIES_PRESET: TypeScriptPreset = {
 };
 
 /**
- * Preset for TypeScriptGenerator, adds imports to resulting model.
+ * Creates a preset for TypeScriptGenerator that adds imports to resulting models.
+ * Pass `importSpecifierExtension` (e.g. `".js"`) to emit explicit file extensions
+ * on relative specifiers, required for ESM-compatible output.
+ * All cross-model dependencies are TypeScript interfaces, so imports are always
+ * emitted as `import type` to satisfy `verbatimModuleSyntax`.
  */
-export const IMPORTS_PRESET: TypeScriptPreset = {
+export const createImportsPreset = (
+  importSpecifierExtension = '',
+): TypeScriptPreset => ({
   interface: {
     self({ content, model }) {
       const interfacePrefix = getModelPathPrefix(model.name);
@@ -62,13 +74,15 @@ export const IMPORTS_PRESET: TypeScriptPreset = {
           interfacePrefix !== getModelPathPrefix(dep.name)
             ? `../${getModelPathPrefix(dep.name)}/${FormatHelpers.toParamCase(
                 dep.name,
-              )}`
-            : `./${FormatHelpers.toParamCase(dep.name)}`,
+              )}${importSpecifierExtension}`
+            : `./${FormatHelpers.toParamCase(
+                dep.name,
+              )}${importSpecifierExtension}`,
       }));
       return endent`
       ${imports
         .sort((a, b) => a.location.localeCompare(b.location))
-        .map((i) => `import { ${i.class} } from '${i.location}';`)
+        .map((i) => `import type { ${i.class} } from '${i.location}';`)
         .join('\n')}
       ${content}`;
     },
@@ -76,7 +90,7 @@ export const IMPORTS_PRESET: TypeScriptPreset = {
       return content;
     },
   },
-};
+});
 
 /**
  * Preset for TypeScriptGenerator, sets nullable properties as unions in resulted models(compatibility with zapatos generated models).

package/src/commands/msg-codegen/utils.ts

@@ -6,10 +6,10 @@ import {
   FormatHelpers,
 } from '@asyncapi/modelina';
 import {
-  AsyncAPIDocumentInterface,
-  ChannelInterface,
-  MessageInterface,
-  SpecTypesV2,
+  type AsyncAPIDocumentInterface,
+  type ChannelInterface,
+  type MessageInterface,
+  type SpecTypesV2,
 } from '@asyncapi/parser';
 import * as fs from 'fs';
 import * as path from 'path';

package/src/commands/msg-diff/asyncapi-override.ts

@@ -1,4 +1,4 @@
-import { OverrideObject } from '@asyncapi/diff';
+import type { OverrideObject } from '@asyncapi/diff';
 
 const unclassified: OverrideObject[string] = {
   add: 'unclassified',

package/src/commands/msg-diff/index.ts

@@ -1,7 +1,8 @@
-import * as yargs from 'yargs';
-import { CommandModule } from 'yargs';
-import { MessageDiffOptions } from './message-diff-options';
-import { MessageDiff } from './msg-diff';
+import { pathToFileURL } from 'url';
+import type { CommandModule } from 'yargs';
+import yargs from 'yargs';
+import type { MessageDiffOptions } from './message-diff-options.js';
+import { MessageDiff } from './msg-diff.js';
 
 export const msgDiff: CommandModule<unknown, MessageDiffOptions> = {
   command: 'msg-diff',
@@ -47,7 +48,10 @@ export const msgDiff: CommandModule<unknown, MessageDiffOptions> = {
 };
 
 // Dev helper. Script can be run directly with command:
-//   ts-node libs/cli/src/commands/msg-diff/index.ts msg-diff -i libs/messages/schemas
-if (require.main === module) {
-  yargs.command(msgDiff).demandCommand().argv;
+//   yarn tsx libs/cli/src/commands/msg-diff/index.ts msg-diff -i libs/messages/schemas
+const isDirectRun =
+  process.argv[1] !== undefined &&
+  import.meta.url === pathToFileURL(process.argv[1]).href;
+if (isDirectRun) {
+  yargs(process.argv.slice(2)).command(msgDiff).demandCommand().argv;
 }