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

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

@@ -1,15 +1,17 @@
 import {
-  AsyncAPIDocumentInterface,
-  Diagnostic,
+  type AsyncAPIDocumentInterface,
+  type Diagnostic,
   fromFile,
   Parser,
 } from '@asyncapi/parser';
 import * as fs from 'fs';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { MessageDiffOptions } from './message-diff-options';
-import { MessageDiff } from './msg-diff';
+import type { MessageDiffOptions } from './message-diff-options.js';
+import { MessageDiff } from './msg-diff.js';
 
-const resources = `${__dirname}/test-resources`;
+const resources = `${dirname(fileURLToPath(import.meta.url))}/test-resources`;
 
 describe('sanity', () => {
   const options: MessageDiffOptions = {

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

@@ -1,20 +1,27 @@
 /* eslint-disable no-console */
-import { diff, DiffOutputItem } from '@asyncapi/diff';
-import Parser, {
-  AsyncAPIDocumentInterface,
-  ChannelInterface,
+import { diff, type DiffOutputItem } from '@asyncapi/diff';
+import _Parser, {
+  type AsyncAPIDocumentInterface,
+  type ChannelInterface,
   fromFile,
-  SchemaInterface,
+  type SchemaInterface,
 } from '@asyncapi/parser';
-import { green, red, white } from 'chalk';
+import chalk from 'chalk';
 import * as jsonDiff from 'diff';
 import * as fs from 'fs';
-import * as jsonSchemaDiff from 'json-schema-diff';
+import jsonSchemaDiff from 'json-schema-diff';
 import * as path from 'path';
-import { exitCode } from '../../common';
-import { override } from './asyncapi-override';
-import { GitCheckoutTmp } from './git-checkout-tmp';
-import { MessageDiffOptions } from './message-diff-options';
+import { exitCode } from '../../common/index.js';
+import { override } from './asyncapi-override.js';
+import { GitCheckoutTmp } from './git-checkout-tmp.js';
+import type { MessageDiffOptions } from './message-diff-options.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;
+const { green, red, white } = chalk;
 
 /**
  * Diff results. Each file (asyncapi document or payload) is classified to one of 'skipped', 'same', 'changed' or 'breaking'.
@@ -333,7 +340,7 @@ export class MessageDiff {
       throw new Error(`Could not find payload schema`);
     }
 
-    let result: jsonSchemaDiff.DiffResult;
+    let result: Awaited<ReturnType<typeof jsonSchemaDiff.diffSchemas>>;
     try {
       result = await jsonSchemaDiff.diffSchemas({
         sourceSchema: schema1.json(),

package/src/commands/msg-diff/test-resources/0/command.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "type":"object",
+  "type": "object",
   "title": "synchronize_claim_definitions_start_command",
   "description": "Synchronize claim definitions start command schema.",
   "additionalProperties": false,
@@ -21,11 +21,7 @@
       "type": "object",
       "title": "claim_definition_group",
       "additionalProperties": false,
-      "required": [
-        "title",
-        "selection_mode",
-        "claim_definitions"
-      ],
+      "required": ["title", "selection_mode", "claim_definitions"],
       "properties": {
         "title": {
           "$ref": "../common.json#/definitions/non_empty_string",
@@ -35,10 +31,7 @@
           "type": "string",
           "title": "claim_selection_mode",
           "description": "Selection options for a claim definition group.",
-          "enum": [
-            "SINGLE",
-            "MULTIPLE"
-          ]
+          "enum": ["SINGLE", "MULTIPLE"]
         },
         "claim_definitions": {
           "type": "array",
@@ -55,10 +48,7 @@
       "type": "object",
       "title": "claim_definition",
       "additionalProperties": false,
-      "required": [
-        "claim",
-        "title"
-      ],
+      "required": ["claim", "title"],
       "properties": {
         "claim": {
           "$ref": "../common.json#/definitions/non_empty_string",

package/src/commands/msg-diff/test-resources/0/event.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "type":"object",
+  "type": "object",
   "title": "example_post_created_event",
   "description": "New post created event.",
   "properties": {
@@ -18,8 +18,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "title",
-    "content"
-  ]
+  "required": ["title", "content"]
 }

package/src/commands/msg-diff/test-resources/1/moved-event.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "type":"object",
+  "type": "object",
   "title": "example_post_created_event",
   "description": "New post created event.",
   "properties": {
@@ -18,8 +18,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "title",
-    "content"
-  ]
+  "required": ["title", "content"]
 }

package/src/commands/pg-dump/generate.ts

@@ -6,11 +6,11 @@ import {
   pick,
 } from '@axinom/mosaic-service-common';
 import chalk from 'chalk';
-import { ExecException, exec } from 'child_process';
+import { type ExecException, exec } from 'child_process';
 import { existsSync, mkdirSync, statSync } from 'fs';
 import { basename, dirname, isAbsolute, join, normalize, relative } from 'path';
-import { exitCode, getTimestamp } from '../../common';
-import { PgDumpOptions } from './pg-dump-options';
+import { exitCode, getTimestamp } from '../../common/index.js';
+import type { PgDumpOptions } from './pg-dump-options.js';
 
 /**
  * Type needed for findCompose functions

package/src/commands/pg-dump/index.ts

@@ -1,6 +1,6 @@
-import { CommandModule } from 'yargs';
-import { generate } from './generate';
-import { PgDumpOptions } from './pg-dump-options';
+import type { CommandModule } from 'yargs';
+import { generate } from './generate.js';
+import type { PgDumpOptions } from './pg-dump-options.js';
 
 export const pgDump: CommandModule<unknown, PgDumpOptions> = {
   command: 'pg-dump',

package/src/commands/publish-schema-to-db/README.md

@@ -122,9 +122,10 @@ Mapping of supported property types to DB constructs:
   > Checked a bit on the implementation. The "ignored properties" seems to be
   > just a flat string list. So it is not possible to exclude propertyA from
   > movie but keep propertyB on TV show - right? In the used env variable I see
-  > $schema,related_items. The schema part I understand (and I would even hard-code that potentially - or even exclude anything starting with $).
-  > But for "related_items" I am very unsure about. The name can be custom, it
-  > can change over time etc. I would rather say to hard code the \$ part. And
-  > then have some callback function that you can implement in code that would
-  > get the content type (and for objects also that type). And then this could
-  > be customized to exclude if it is needed.
+  > $schema,related_items. The schema part I understand (and I would even
+  > hard-code that potentially - or even exclude anything starting with $). But
+  > for "related_items" I am very unsure about. The name can be custom, it can
+  > change over time etc. I would rather say to hard code the \$ part. And then
+  > have some callback function that you can implement in code that would get
+  > the content type (and for objects also that type). And then this could be
+  > customized to exclude if it is needed.

package/src/commands/publish-schema-to-db/abstractions/base-smart-tags.ts

@@ -1,4 +1,4 @@
-import { PgSmartTagTags } from 'graphile-utils/node8plus/makePgSmartTagsPlugin';
+import type { PgSmartTagTags } from 'graphile-utils/node8plus/makePgSmartTagsPlugin';
 
 export interface BaseSmartTags {
   tags?: PgSmartTagTags;

package/src/commands/publish-schema-to-db/abstractions/index.ts

@@ -1,5 +1,5 @@
-export * from './base-smart-tags';
-export * from './pg-column';
-export * from './pg-fk-column';
-export * from './pg-table';
-export * from './pg-type';
+export * from './base-smart-tags.js';
+export * from './pg-column.js';
+export * from './pg-fk-column.js';
+export * from './pg-table.js';
+export * from './pg-type.js';

package/src/commands/publish-schema-to-db/abstractions/pg-column.ts

@@ -1,6 +1,6 @@
-import { BaseSmartTags } from './base-smart-tags';
-import { PgTable } from './pg-table';
-import { PgType } from './pg-type';
+import type { BaseSmartTags } from './base-smart-tags.js';
+import type { PgTable } from './pg-table.js';
+import type { PgType } from './pg-type.js';
 
 /**
  * Abstraction over a Postgres table column.

package/src/commands/publish-schema-to-db/abstractions/pg-fk-column.ts

@@ -1,4 +1,4 @@
-import { PgColumn } from './pg-column';
+import type { PgColumn } from './pg-column.js';
 
 export interface PgFkColumn extends PgColumn {
   readonly targetPk: PgColumn;

package/src/commands/publish-schema-to-db/abstractions/pg-table.ts

@@ -1,7 +1,7 @@
-import { PgSmartTagTags } from 'graphile-utils';
-import { BaseSmartTags } from './base-smart-tags';
-import { PgColumn } from './pg-column';
-import { PgFkColumn } from './pg-fk-column';
+import type { PgSmartTagTags } from 'graphile-utils';
+import type { BaseSmartTags } from './base-smart-tags.js';
+import type { PgColumn } from './pg-column.js';
+import type { PgFkColumn } from './pg-fk-column.js';
 
 // TODO: Consider adding a separate property for FKs for consistency.
 /**

package/src/commands/publish-schema-to-db/content-entity-model.ts

@@ -1,10 +1,13 @@
 /* eslint-disable no-console */
-import { JSONSchema4 } from 'json-schema';
-import { PgTable, TableSmartTags } from './abstractions';
-import { separateProperties } from './pg-models/json-schema-parse-utils';
-import { isReservedPgWord } from './pg-models/pg-sql-gen-utils';
-import { ContentEntityTable, ObjectPropertyTable } from './pg-models/tables';
-import { PublishSchemaToDbOptions } from './publish-schema-to-db-options';
+import type { JSONSchema4 } from 'json-schema';
+import type { PgTable, TableSmartTags } from './abstractions/index.js';
+import { separateProperties } from './pg-models/json-schema-parse-utils.js';
+import { isReservedPgWord } from './pg-models/pg-sql-gen-utils.js';
+import {
+  ContentEntityTable,
+  ObjectPropertyTable,
+} from './pg-models/tables/index.js';
+import type { PublishSchemaToDbOptions } from './publish-schema-to-db-options.js';
 
 export class ContentEntityModel {
   public name: string;

package/src/commands/publish-schema-to-db/generate.ts

@@ -1,20 +1,20 @@
 /* eslint-disable no-console */
-import { JSONPgSmartTags } from 'graphile-utils';
+import type { JSONPgSmartTags } from 'graphile-utils';
 import * as path from 'path';
-import { exitCode } from '../../common';
-import { ContentEntityModel } from './content-entity-model';
-import { getContentMetadataSchemas } from './pg-models/json-schema-parse-utils';
-import { generateMigration } from './pg-models/pg-sql-gen-utils';
-import { generateSmartTagsPlugin } from './pg-models/pgl-utils';
+import { exitCode } from '../../common/index.js';
+import { ContentEntityModel } from './content-entity-model.js';
+import { getContentMetadataSchemas } from './pg-models/json-schema-parse-utils.js';
+import { generateMigration } from './pg-models/pg-sql-gen-utils.js';
+import { generateSmartTagsPlugin } from './pg-models/pgl-utils.js';
 import {
   collectionPostprocessor,
-  ContentEntityModelPostprocessor,
+  type ContentEntityModelPostprocessor,
   episodePostprocessor,
   moviePostprocessor,
   seasonPostprocessor,
   tvshowPostprocessor,
-} from './postprocessors';
-import { PublishSchemaToDbOptions } from './publish-schema-to-db-options';
+} from './postprocessors/index.js';
+import type { PublishSchemaToDbOptions } from './publish-schema-to-db-options.js';
 
 /**
  * Generates a database schema from an asset publish format JSON schema.

package/src/commands/publish-schema-to-db/index.ts

@@ -1,6 +1,6 @@
-import { CommandModule } from 'yargs';
-import { generate } from './generate';
-import { PublishSchemaToDbOptions } from './publish-schema-to-db-options';
+import type { CommandModule } from 'yargs';
+import { generate } from './generate.js';
+import type { PublishSchemaToDbOptions } from './publish-schema-to-db-options.js';
 
 export const publishSchemaToDb: CommandModule<
   unknown,

package/src/commands/publish-schema-to-db/pg-models/columns/fk-column.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest';
-import { PgColumn, PgTable, PgType } from '../../abstractions';
-import { FkColumn } from './fk-column';
+import type { PgColumn, PgTable, PgType } from '../../abstractions/index.js';
+import { FkColumn } from './fk-column.js';
 
 interface FkColumnTestInput {
   pkType: PgType;

package/src/commands/publish-schema-to-db/pg-models/columns/fk-column.ts

@@ -1,11 +1,11 @@
 import {
-  BaseSmartTags,
-  PgColumn,
-  PgFkColumn,
-  PgTable,
-  PgType,
-} from '../../abstractions';
-import { buildName } from '../pg-sql-gen-utils';
+  type BaseSmartTags,
+  type PgColumn,
+  type PgFkColumn,
+  type PgTable,
+  type PgType,
+} from '../../abstractions/index.js';
+import { buildName } from '../pg-sql-gen-utils.js';
 
 export class FkColumn implements PgFkColumn {
   name: string;

package/src/commands/publish-schema-to-db/pg-models/columns/index.ts

@@ -1,4 +1,4 @@
-export * from './fk-column';
-export * from './pk-column';
-export * from './primitive-column';
-export * from './virtual-fk-column';
+export * from './fk-column.js';
+export * from './pk-column.js';
+export * from './primitive-column.js';
+export * from './virtual-fk-column.js';

package/src/commands/publish-schema-to-db/pg-models/columns/pk-column.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest';
-import { PgTable, PgType } from '../../abstractions';
-import { PkColumn } from './pk-column';
+import type { PgTable, PgType } from '../../abstractions/index.js';
+import { PkColumn } from './pk-column.js';
 
 interface PkColumnTestInput {
   type: PgType;

package/src/commands/publish-schema-to-db/pg-models/columns/pk-column.ts

@@ -1,4 +1,9 @@
-import { BaseSmartTags, PgColumn, PgTable, PgType } from '../../abstractions';
+import type {
+  BaseSmartTags,
+  PgColumn,
+  PgTable,
+  PgType,
+} from '../../abstractions/index.js';
 
 export class PkColumn implements PgColumn {
   name: string;

package/src/commands/publish-schema-to-db/pg-models/columns/primitive-column.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest';
-import { PgTable } from '../../abstractions';
-import { PrimitiveColumn } from './primitive-column';
+import type { PgTable } from '../../abstractions/index.js';
+import { PrimitiveColumn } from './primitive-column.js';
 
 const dummyTable: PgTable = {
   name: 'some_table',

package/src/commands/publish-schema-to-db/pg-models/columns/primitive-column.ts

@@ -1,4 +1,9 @@
-import { BaseSmartTags, PgColumn, PgTable, PgType } from '../../abstractions';
+import type {
+  BaseSmartTags,
+  PgColumn,
+  PgTable,
+  PgType,
+} from '../../abstractions/index.js';
 
 export interface PrimitiveColumnOptions {
   description?: string;

package/src/commands/publish-schema-to-db/pg-models/columns/virtual-fk-column.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest';
-import { PgColumn, PgTable } from '../../abstractions';
-import { VirtualFkColumn } from './virtual-fk-column';
+import type { PgColumn, PgTable } from '../../abstractions/index.js';
+import { VirtualFkColumn } from './virtual-fk-column.js';
 
 describe('VirtualFkColumn', () => {
   test('Virtual FK is created with correct references', () => {

package/src/commands/publish-schema-to-db/pg-models/columns/virtual-fk-column.ts

@@ -1,11 +1,11 @@
 import {
-  BaseSmartTags,
-  PgColumn,
-  PgFkColumn,
-  PgTable,
-  PgType,
-} from '../../abstractions';
-import { buildName } from '../pg-sql-gen-utils';
+  type BaseSmartTags,
+  type PgColumn,
+  type PgFkColumn,
+  type PgTable,
+  type PgType,
+} from '../../abstractions/index.js';
+import { buildName } from '../pg-sql-gen-utils.js';
 
 export class VirtualFkColumn implements PgFkColumn {
   name: string;

package/src/commands/publish-schema-to-db/pg-models/json-schema-parse-utils.spec.ts

@@ -1,7 +1,7 @@
-import { JSONSchema4 } from 'json-schema';
+import type { JSONSchema4 } from 'json-schema';
 import { describe, expect, test } from 'vitest';
-import { PgType } from '../abstractions';
-import { getPropertySchema, mapToPgType } from './json-schema-parse-utils';
+import type { PgType } from '../abstractions/index.js';
+import { getPropertySchema, mapToPgType } from './json-schema-parse-utils.js';
 
 describe('mapToPgType', () => {
   interface TestInput {

package/src/commands/publish-schema-to-db/pg-models/json-schema-parse-utils.ts

@@ -1,7 +1,9 @@
-import { glob } from 'glob';
-import { JSONSchema4 } from 'json-schema';
-import { dereference } from 'json-schema-ref-parser';
-import { PgType } from '../abstractions';
+import glob from 'glob';
+import type { JSONSchema4 } from 'json-schema';
+import refParser from 'json-schema-ref-parser';
+import type { PgType } from '../abstractions/index.js';
+const { dereference } =
+  refParser as unknown as typeof import('json-schema-ref-parser');
 
 /**
  * Returns true if a JSON schema property element is a primitive property.

package/src/commands/publish-schema-to-db/pg-models/pg-sql-gen-utils.spec.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import { buildName } from './pg-sql-gen-utils';
+import { buildName } from './pg-sql-gen-utils.js';
 
 describe('buildName', () => {
   test('single part', () => {

package/src/commands/publish-schema-to-db/pg-models/pg-sql-gen-utils.ts

@@ -2,8 +2,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { format } from 'sql-formatter';
-import { PgColumn, PgTable } from '../abstractions';
-import { ContentEntityModel } from '../content-entity-model';
+import type { PgTable } from '../abstractions/index.js';
 
 export function buildFullTableName(tableName: string, schema?: string): string {
   return schema ? `${schema}.${tableName}` : tableName;
@@ -117,41 +116,6 @@ export function buildName(...nameParts: string[]): string {
   return nameParts.join('_');
 }
 
-export function renameDbItem(
-  item: PgTable | PgColumn,
-  newName: string,
-  displayName?: string,
-): void {
-  item.name = newName;
-  if (displayName) {
-    item.displayName = displayName;
-  }
-}
-
-export interface NameOverride {
-  [name: string]: [string, string?];
-}
-
-export function applyNameOverrides(
-  model: ContentEntityModel,
-  overrides: NameOverride,
-): void {
-  const mainModelTables = [model.contentEntity, ...model.relatedObjects];
-
-  for (const table of mainModelTables) {
-    let rename = overrides[table.name];
-    if (rename) {
-      renameDbItem(table, ...rename);
-    }
-    for (const column of table.columns) {
-      rename = overrides[column.name];
-      if (rename) {
-        renameDbItem(column, ...rename);
-      }
-    }
-  }
-}
-
 export function isReservedPgWord(s: string): boolean {
   return PgReservedWords.includes(s.toUpperCase());
 }

package/src/commands/publish-schema-to-db/pg-models/pgl-utils.spec.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import { snakeCaseToCamelCase } from './pgl-utils';
+import { snakeCaseToCamelCase } from './pgl-utils.js';
 
 describe('snakeCaseToCamelCase', () => {
   test('single part', () => {

package/src/commands/publish-schema-to-db/pg-models/pgl-utils.ts

@@ -1,15 +1,22 @@
-import endent from 'endent';
+import _endent from 'endent';
 import * as fs from 'fs';
-import { JSONPgSmartTags } from 'graphile-utils';
-import * as JSON5 from 'json5';
+import type { JSONPgSmartTags } from 'graphile-utils';
+import JSON5 from 'json5';
 import * as path from 'path';
 import {
-  BaseSmartTags,
-  PgColumn,
-  PgFkColumn,
-  PgTable,
-  TableSmartTags,
-} from '../abstractions';
+  type BaseSmartTags,
+  type PgColumn,
+  type PgFkColumn,
+  type PgTable,
+  type TableSmartTags,
+} from '../abstractions/index.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. `endent.pretty()` is also
+// accessible via `.default.pretty`. 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;
 
 /**
  * Builds smart tags for FK constraints.
@@ -101,7 +108,8 @@ export function generateSmartTagsPlugin(
   console.log(`Writing smart tags plugn to to ${outPath}.`);
 
   const pluginSrc = endent`
-  import { makeJSONPgSmartTagsPlugin } from 'graphile-utils';
+  import graphileUtils from 'graphile-utils';
+  const { makeJSONPgSmartTagsPlugin } = graphileUtils;
   /**
   * Smart tags to adjust and enhance the generated GraphQL API.
   */

package/src/commands/publish-schema-to-db/pg-models/tables/content-entity-table.ts

@@ -1,17 +1,17 @@
-import { JSONSchema4 } from 'json-schema';
+import type { JSONSchema4 } from 'json-schema';
 import {
-  PgColumn,
-  PgFkColumn,
-  PgTable,
-  TableSmartTags,
-} from '../../abstractions';
-import { PublishSchemaToDbOptions } from '../../publish-schema-to-db-options';
-import { PkColumn, PrimitiveColumn } from '../columns';
+  type PgColumn,
+  type PgFkColumn,
+  type PgTable,
+  type TableSmartTags,
+} from '../../abstractions/index.js';
+import type { PublishSchemaToDbOptions } from '../../publish-schema-to-db-options.js';
+import { PkColumn, PrimitiveColumn } from '../columns/index.js';
 import {
   filterProperties,
   isPrimitiveProperty,
   mapToPgType,
-} from '../json-schema-parse-utils';
+} from '../json-schema-parse-utils.js';
 import {
   buildAdditionalTableStatements,
   buildCreateTable,
@@ -19,8 +19,8 @@ import {
   buildFullTableName,
   buildInsertUpdateGrants,
   buildSelectDeleteGrants,
-} from '../pg-sql-gen-utils';
-import { buildAttributeSmartTags } from '../pgl-utils';
+} from '../pg-sql-gen-utils.js';
+import { buildAttributeSmartTags } from '../pgl-utils.js';
 
 /**
  * Table model for storing primitive properties of a root entity (movie, collection etc.).

package/src/commands/publish-schema-to-db/pg-models/tables/index.ts

@@ -1,3 +1,3 @@
-export * from './content-entity-table';
-export * from './object-property-table';
-export * from './relations-table';
+export * from './content-entity-table.js';
+export * from './object-property-table.js';
+export * from './relations-table.js';