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

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

@@ -1,5 +1,5 @@
-import { FormatHelpers, type TypeScriptPreset } from '@asyncapi/modelina';
-import _endent from 'endent';
+import { FormatHelpers, TypeScriptPreset } from '@asyncapi/modelina';
+import endent from 'endent';
 import {
   ensureNullable,
   getArrayItemNonNullTypes,
@@ -7,13 +7,7 @@ import {
   indexOfNullArrayProperty,
   indexOfNullObjectProperty,
   replaceAnyType,
-} 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;
+} from './utils';
 
 /**
  * Exports types.
@@ -54,15 +48,9 @@ export const ADDITIONAL_PROPERTIES_PRESET: TypeScriptPreset = {
 };
 
 /**
- * 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`.
+ * Preset for TypeScriptGenerator, adds imports to resulting model.
  */
-export const createImportsPreset = (
-  importSpecifierExtension = '',
-): TypeScriptPreset => ({
+export const IMPORTS_PRESET: TypeScriptPreset = {
   interface: {
     self({ content, model }) {
       const interfacePrefix = getModelPathPrefix(model.name);
@@ -74,15 +62,13 @@ export const createImportsPreset = (
           interfacePrefix !== getModelPathPrefix(dep.name)
             ? `../${getModelPathPrefix(dep.name)}/${FormatHelpers.toParamCase(
                 dep.name,
-              )}${importSpecifierExtension}`
-            : `./${FormatHelpers.toParamCase(
-                dep.name,
-              )}${importSpecifierExtension}`,
+              )}`
+            : `./${FormatHelpers.toParamCase(dep.name)}`,
       }));
       return endent`
       ${imports
         .sort((a, b) => a.location.localeCompare(b.location))
-        .map((i) => `import type { ${i.class} } from '${i.location}';`)
+        .map((i) => `import { ${i.class} } from '${i.location}';`)
         .join('\n')}
       ${content}`;
     },
@@ -90,7 +76,7 @@ export const createImportsPreset = (
       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 {
-  type AsyncAPIDocumentInterface,
-  type ChannelInterface,
-  type MessageInterface,
-  type SpecTypesV2,
+  AsyncAPIDocumentInterface,
+  ChannelInterface,
+  MessageInterface,
+  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 type { OverrideObject } from '@asyncapi/diff';
+import { OverrideObject } from '@asyncapi/diff';
 
 const unclassified: OverrideObject[string] = {
   add: 'unclassified',

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

@@ -1,8 +1,7 @@
-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';
+import * as yargs from 'yargs';
+import { CommandModule } from 'yargs';
+import { MessageDiffOptions } from './message-diff-options';
+import { MessageDiff } from './msg-diff';
 
 export const msgDiff: CommandModule<unknown, MessageDiffOptions> = {
   command: 'msg-diff',
@@ -48,10 +47,7 @@ export const msgDiff: CommandModule<unknown, MessageDiffOptions> = {
 };
 
 // Dev helper. Script can be run directly with command:
-//   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;
+//   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;
 }

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

@@ -1,17 +1,15 @@
 import {
-  type AsyncAPIDocumentInterface,
-  type Diagnostic,
+  AsyncAPIDocumentInterface,
+  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 type { MessageDiffOptions } from './message-diff-options.js';
-import { MessageDiff } from './msg-diff.js';
+import { MessageDiffOptions } from './message-diff-options';
+import { MessageDiff } from './msg-diff';
 
-const resources = `${dirname(fileURLToPath(import.meta.url))}/test-resources`;
+const resources = `${__dirname}/test-resources`;
 
 describe('sanity', () => {
   const options: MessageDiffOptions = {

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

@@ -1,27 +1,20 @@
 /* eslint-disable no-console */
-import { diff, type DiffOutputItem } from '@asyncapi/diff';
-import _Parser, {
-  type AsyncAPIDocumentInterface,
-  type ChannelInterface,
+import { diff, DiffOutputItem } from '@asyncapi/diff';
+import Parser, {
+  AsyncAPIDocumentInterface,
+  ChannelInterface,
   fromFile,
-  type SchemaInterface,
+  SchemaInterface,
 } from '@asyncapi/parser';
-import chalk from 'chalk';
+import { green, red, white } from 'chalk';
 import * as jsonDiff from 'diff';
 import * as fs from 'fs';
-import jsonSchemaDiff from 'json-schema-diff';
+import * as jsonSchemaDiff from 'json-schema-diff';
 import * as path from 'path';
-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;
+import { exitCode } from '../../common';
+import { override } from './asyncapi-override';
+import { GitCheckoutTmp } from './git-checkout-tmp';
+import { MessageDiffOptions } from './message-diff-options';
 
 /**
  * Diff results. Each file (asyncapi document or payload) is classified to one of 'skipped', 'same', 'changed' or 'breaking'.
@@ -340,7 +333,7 @@ export class MessageDiff {
       throw new Error(`Could not find payload schema`);
     }
 
-    let result: Awaited<ReturnType<typeof jsonSchemaDiff.diffSchemas>>;
+    let result: jsonSchemaDiff.DiffResult;
     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,7 +21,11 @@
       "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",
@@ -31,7 +35,10 @@
           "type": "string",
           "title": "claim_selection_mode",
           "description": "Selection options for a claim definition group.",
-          "enum": ["SINGLE", "MULTIPLE"]
+          "enum": [
+            "SINGLE",
+            "MULTIPLE"
+          ]
         },
         "claim_definitions": {
           "type": "array",
@@ -48,7 +55,10 @@
       "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,5 +18,8 @@
     }
   },
   "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,5 +18,8 @@
     }
   },
   "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 { type ExecException, exec } from 'child_process';
+import { 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/index.js';
-import type { PgDumpOptions } from './pg-dump-options.js';
+import { exitCode, getTimestamp } from '../../common';
+import { PgDumpOptions } from './pg-dump-options';
 
 /**
  * Type needed for findCompose functions

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

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

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

@@ -122,10 +122,9 @@ 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 type { PgSmartTagTags } from 'graphile-utils/node8plus/makePgSmartTagsPlugin';
+import { 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.js';
-export * from './pg-column.js';
-export * from './pg-fk-column.js';
-export * from './pg-table.js';
-export * from './pg-type.js';
+export * from './base-smart-tags';
+export * from './pg-column';
+export * from './pg-fk-column';
+export * from './pg-table';
+export * from './pg-type';

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

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

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

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

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

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

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

@@ -1,13 +1,10 @@
 /* eslint-disable no-console */
-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';
+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';
 
 export class ContentEntityModel {
   public name: string;

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

@@ -1,20 +1,20 @@
 /* eslint-disable no-console */
-import type { JSONPgSmartTags } from 'graphile-utils';
+import { JSONPgSmartTags } from 'graphile-utils';
 import * as path from 'path';
-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 { 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 {
   collectionPostprocessor,
-  type ContentEntityModelPostprocessor,
+  ContentEntityModelPostprocessor,
   episodePostprocessor,
   moviePostprocessor,
   seasonPostprocessor,
   tvshowPostprocessor,
-} from './postprocessors/index.js';
-import type { PublishSchemaToDbOptions } from './publish-schema-to-db-options.js';
+} from './postprocessors';
+import { PublishSchemaToDbOptions } from './publish-schema-to-db-options';
 
 /**
  * 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 type { CommandModule } from 'yargs';
-import { generate } from './generate.js';
-import type { PublishSchemaToDbOptions } from './publish-schema-to-db-options.js';
+import { CommandModule } from 'yargs';
+import { generate } from './generate';
+import { PublishSchemaToDbOptions } from './publish-schema-to-db-options';
 
 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 type { PgColumn, PgTable, PgType } from '../../abstractions/index.js';
-import { FkColumn } from './fk-column.js';
+import { PgColumn, PgTable, PgType } from '../../abstractions';
+import { FkColumn } from './fk-column';
 
 interface FkColumnTestInput {
   pkType: PgType;

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

@@ -1,11 +1,11 @@
 import {
-  type BaseSmartTags,
-  type PgColumn,
-  type PgFkColumn,
-  type PgTable,
-  type PgType,
-} from '../../abstractions/index.js';
-import { buildName } from '../pg-sql-gen-utils.js';
+  BaseSmartTags,
+  PgColumn,
+  PgFkColumn,
+  PgTable,
+  PgType,
+} from '../../abstractions';
+import { buildName } from '../pg-sql-gen-utils';
 
 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.js';
-export * from './pk-column.js';
-export * from './primitive-column.js';
-export * from './virtual-fk-column.js';
+export * from './fk-column';
+export * from './pk-column';
+export * from './primitive-column';
+export * from './virtual-fk-column';

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 type { PgTable, PgType } from '../../abstractions/index.js';
-import { PkColumn } from './pk-column.js';
+import { PgTable, PgType } from '../../abstractions';
+import { PkColumn } from './pk-column';
 
 interface PkColumnTestInput {
   type: PgType;

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

@@ -1,9 +1,4 @@
-import type {
-  BaseSmartTags,
-  PgColumn,
-  PgTable,
-  PgType,
-} from '../../abstractions/index.js';
+import { BaseSmartTags, PgColumn, PgTable, PgType } from '../../abstractions';
 
 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 type { PgTable } from '../../abstractions/index.js';
-import { PrimitiveColumn } from './primitive-column.js';
+import { PgTable } from '../../abstractions';
+import { PrimitiveColumn } from './primitive-column';
 
 const dummyTable: PgTable = {
   name: 'some_table',

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

@@ -1,9 +1,4 @@
-import type {
-  BaseSmartTags,
-  PgColumn,
-  PgTable,
-  PgType,
-} from '../../abstractions/index.js';
+import { BaseSmartTags, PgColumn, PgTable, PgType } from '../../abstractions';
 
 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 type { PgColumn, PgTable } from '../../abstractions/index.js';
-import { VirtualFkColumn } from './virtual-fk-column.js';
+import { PgColumn, PgTable } from '../../abstractions';
+import { VirtualFkColumn } from './virtual-fk-column';
 
 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 {
-  type BaseSmartTags,
-  type PgColumn,
-  type PgFkColumn,
-  type PgTable,
-  type PgType,
-} from '../../abstractions/index.js';
-import { buildName } from '../pg-sql-gen-utils.js';
+  BaseSmartTags,
+  PgColumn,
+  PgFkColumn,
+  PgTable,
+  PgType,
+} from '../../abstractions';
+import { buildName } from '../pg-sql-gen-utils';
 
 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 type { JSONSchema4 } from 'json-schema';
+import { JSONSchema4 } from 'json-schema';
 import { describe, expect, test } from 'vitest';
-import type { PgType } from '../abstractions/index.js';
-import { getPropertySchema, mapToPgType } from './json-schema-parse-utils.js';
+import { PgType } from '../abstractions';
+import { getPropertySchema, mapToPgType } from './json-schema-parse-utils';
 
 describe('mapToPgType', () => {
   interface TestInput {

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

@@ -1,9 +1,7 @@
-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');
+import { glob } from 'glob';
+import { JSONSchema4 } from 'json-schema';
+import { dereference } from 'json-schema-ref-parser';
+import { PgType } from '../abstractions';
 
 /**
  * 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.js';
+import { buildName } from './pg-sql-gen-utils';
 
 describe('buildName', () => {
   test('single part', () => {

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

@@ -2,7 +2,8 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { format } from 'sql-formatter';
-import type { PgTable } from '../abstractions/index.js';
+import { PgColumn, PgTable } from '../abstractions';
+import { ContentEntityModel } from '../content-entity-model';
 
 export function buildFullTableName(tableName: string, schema?: string): string {
   return schema ? `${schema}.${tableName}` : tableName;
@@ -116,6 +117,41 @@ 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());
 }