@zintrust/core 0.1.19 → 0.1.21

package/src/cli/scaffolding/GovernanceScaffolder.js

@@ -0,0 +1,327 @@
+/**
+ * GovernanceScaffolder
+ *
+ * Adds optional governance tooling to a generated app:
+ * - ESLint config + scripts
+ * - Architecture tests (Vitest)
+ */
+import { FileGenerator } from '../scaffolding/FileGenerator.js';
+import { SpawnUtil } from '../utils/spawn.js';
+import { resolvePackageManager } from '../../common/index.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import * as path from '../../node-singletons/path.js';
+const getStringRecord = (value) => {
+    if (typeof value !== 'object' || value === null)
+        return undefined;
+    const obj = value;
+    const out = {};
+    for (const [k, v] of Object.entries(obj)) {
+        if (typeof v === 'string')
+            out[k] = v;
+    }
+    return out;
+};
+const readPackageJsonOrThrow = (projectRoot) => {
+    const pkgPath = path.join(projectRoot, 'package.json');
+    if (!FileGenerator.fileExists(pkgPath)) {
+        throw ErrorFactory.createValidationError(`package.json not found at ${pkgPath}`);
+    }
+    const raw = FileGenerator.readFile(pkgPath);
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== 'object' || parsed === null) {
+        throw ErrorFactory.createValidationError('package.json is not a JSON object');
+    }
+    return parsed;
+};
+const writePackageJson = (projectRoot, pkg) => {
+    const pkgPath = path.join(projectRoot, 'package.json');
+    const content = `${JSON.stringify(pkg, null, 2)}\n`;
+    FileGenerator.writeFile(pkgPath, content, { overwrite: true });
+};
+const upsertScript = (scripts, name, value) => {
+    if (typeof scripts[name] !== 'string' || scripts[name] === '') {
+        scripts[name] = value;
+    }
+};
+const ensureDevDependency = (devDependencies, name, version) => {
+    if (typeof devDependencies[name] !== 'string' || devDependencies[name] === '') {
+        devDependencies[name] = version;
+    }
+};
+const inferGovernanceVersion = (pkg) => {
+    const deps = getStringRecord(pkg.dependencies);
+    const core = deps?.['@zintrust/core'];
+    if (typeof core === 'string' && core.trim() !== '')
+        return core;
+    return '^0.1.0';
+};
+const writeEslintConfig = (projectRoot) => {
+    const eslintConfigPath = path.join(projectRoot, 'eslint.config.mjs');
+    const content = `import { zintrustAppEslintConfig } from '@zintrust/governance';
+
+export default zintrustAppEslintConfig({
+  tsconfigRootDir: import.meta.dirname,
+});
+`;
+    const wrote = FileGenerator.writeFile(eslintConfigPath, content, { overwrite: false });
+    return wrote ? [eslintConfigPath] : [];
+};
+const IMPORT_BOUNDARIES_ARCH_TEST_CONTENT = `import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import * as ts from 'typescript';
+import { describe, expect, it } from 'vitest';
+
+type ImportHit = {
+  specifier: string;
+  line: string;
+};
+
+type Violation = {
+  file: string;
+  reason: string;
+  hit: ImportHit;
+};
+
+const repoRoot = process.cwd();
+
+const isTsFile = (filePath: string): boolean => {
+  if (!filePath.endsWith('.ts')) return false;
+  if (filePath.endsWith('.d.ts')) return false;
+  return true;
+};
+
+const walkTsFiles = async (dir: string): Promise<string[]> => {
+  const entries = await fs.readdir(dir, { withFileTypes: true });
+
+  const files = entries
+    .filter((ent) => ent.isFile())
+    .map((ent) => path.join(dir, ent.name))
+    .filter(isTsFile);
+
+  const subDirs = entries.filter((ent) => ent.isDirectory()).map((ent) => path.join(dir, ent.name));
+  const nested = await Promise.all(subDirs.map((subDir) => walkTsFiles(subDir)));
+
+  return [...files, ...nested.flat()];
+};
+
+const extractImportSpecifiers = (source: string, filePath: string): ImportHit[] => {
+  const sourceFile = ts.createSourceFile(
+    filePath,
+    source,
+    ts.ScriptTarget.ESNext,
+    true,
+    ts.ScriptKind.TS
+  );
+  const lines = source.split(/\r?\n/);
+  const hits: ImportHit[] = [];
+
+  const addHit = (specifier: string, pos: number) => {
+    const { line } = sourceFile.getLineAndCharacterOfPosition(pos);
+    hits.push({
+      specifier,
+      line: (lines[line] ?? '').trim(),
+    });
+  };
+
+  const visit = (node: ts.Node) => {
+    if (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) {
+      const moduleSpecifier = node.moduleSpecifier;
+      if (moduleSpecifier && ts.isStringLiteral(moduleSpecifier)) {
+        addHit(moduleSpecifier.text, moduleSpecifier.getStart(sourceFile));
+      }
+    }
+
+    if (ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword) {
+      const arg = node.arguments.at(0);
+      if (arg && ts.isStringLiteral(arg)) {
+        addHit(arg.text, arg.getStart(sourceFile));
+      }
+    }
+
+    ts.forEachChild(node, visit);
+  };
+
+  visit(sourceFile);
+  return hits.filter((h) => h.specifier.trim() !== '');
+};
+
+const relFromRoot = (absPath: string): string => path.relative(repoRoot, absPath).replaceAll('\\\\', '/');
+
+const startsWithAny = (value: string, prefixes: readonly string[]): boolean => {
+  for (const p of prefixes) {
+    if (value.startsWith(p)) return true;
+  }
+  return false;
+};
+
+const findViolations = async (
+  files: string[],
+  disallowedPrefixes: readonly string[],
+  reasonPrefix: string
+): Promise<Violation[]> => {
+  const perFile = await Promise.all(
+    files.map(async (file): Promise<Violation[]> => {
+      const contents = await fs.readFile(file, 'utf-8');
+      const imports = extractImportSpecifiers(contents, file);
+
+      return imports
+        .filter((hit) => startsWithAny(hit.specifier, disallowedPrefixes))
+        .map((hit) => ({
+          file: relFromRoot(file),
+          reason: reasonPrefix + ' ' + hit.specifier,
+          hit,
+        }));
+    })
+  );
+
+  return perFile.flat();
+};
+
+describe('Architecture: import boundaries', () => {
+  it('prevents src/ from importing app/routes', async () => {
+    const srcDir = path.join(repoRoot, 'src');
+    const files = await walkTsFiles(srcDir);
+
+    const violations = await findViolations(files, ['@app/', '@routes/'], 'src/ must not import');
+
+    expect(violations).toEqual([]);
+  });
+
+  it('prevents app/ from importing routes', async () => {
+    const appDir = path.join(repoRoot, 'app');
+    const files = await walkTsFiles(appDir);
+
+    const violations = await findViolations(files, ['@routes/'], 'app/ must not import');
+
+    expect(violations).toEqual([]);
+  });
+});
+`;
+const ROUTE_MIDDLEWARE_REGISTRY_ARCH_TEST_CONTENT = `import { middlewareConfigObj } from '../../config/middleware';
+import { registerRoutes } from '../../../routes/api';
+import { RouteRegistry, Router } from '../../index.js';
+import { beforeEach, describe, expect, it } from 'vitest';
+
+describe('Architecture: route middleware registry', () => {
+  beforeEach(() => {
+    RouteRegistry.clear();
+  });
+
+  it('ensures all route middleware names exist in middlewareConfigObj', () => {
+    const router = Router.createRouter();
+    registerRoutes(router);
+
+    const allowed = new Set(Object.keys(middlewareConfigObj));
+    const unknown: Array<{ method: string; path: string; middleware: string }> = [];
+
+    for (const route of RouteRegistry.list()) {
+      for (const name of route.middleware ?? []) {
+        if (!allowed.has(name)) {
+          unknown.push({ method: route.method, path: route.path, middleware: name });
+        }
+      }
+    }
+
+    expect(unknown).toEqual([]);
+  });
+});
+`;
+const writeArchTests = (projectRoot) => {
+    const files = [
+        {
+            rel: 'tests/unit/architecture/ImportBoundaries.arch.test.ts',
+            content: IMPORT_BOUNDARIES_ARCH_TEST_CONTENT,
+        },
+        {
+            rel: 'tests/unit/architecture/RouteMiddlewareRegistry.arch.test.ts',
+            content: ROUTE_MIDDLEWARE_REGISTRY_ARCH_TEST_CONTENT,
+        },
+    ];
+    const created = [];
+    for (const file of files) {
+        const abs = path.join(projectRoot, file.rel);
+        const wrote = FileGenerator.writeFile(abs, file.content, {
+            overwrite: false,
+            createDirs: true,
+        });
+        if (wrote)
+            created.push(abs);
+    }
+    return created;
+};
+const installGovernanceDeps = async (projectRoot, pm, packages) => {
+    if (packages.length === 0)
+        return;
+    let command = pm;
+    let args;
+    switch (pm) {
+        case 'pnpm':
+            args = ['add', '-D', ...packages];
+            break;
+        case 'yarn':
+            args = ['add', '--dev', ...packages];
+            break;
+        case 'npm':
+        default:
+            command = 'npm';
+            args = ['install', '--save-dev', ...packages];
+            break;
+    }
+    const exit = await SpawnUtil.spawnAndWait({ command, args, cwd: projectRoot });
+    if (exit !== 0) {
+        throw ErrorFactory.createCliError(`Failed to install governance dependencies (exit ${exit})`);
+    }
+};
+export const GovernanceScaffolder = Object.freeze({
+    async scaffold(projectRoot, options = {}) {
+        try {
+            const pkg = readPackageJsonOrThrow(projectRoot);
+            const scripts = typeof pkg.scripts === 'object' && pkg.scripts !== null ? pkg.scripts : {};
+            pkg.scripts = scripts;
+            upsertScript(scripts, 'lint', 'eslint .');
+            upsertScript(scripts, 'test:coverage', 'vitest run --coverage');
+            upsertScript(scripts, 'sonarqube', 'node -e "console.log(\'SonarQube not configured for this project; skipping.\');"');
+            const devDeps = typeof pkg.devDependencies === 'object' && pkg.devDependencies !== null
+                ? pkg.devDependencies
+                : {};
+            pkg.devDependencies = devDeps;
+            const govVersion = inferGovernanceVersion(pkg);
+            ensureDevDependency(devDeps, 'eslint', '^9.0.0');
+            ensureDevDependency(devDeps, '@zintrust/governance', govVersion);
+            writePackageJson(projectRoot, pkg);
+            const filesCreated = [];
+            if (options.writeEslintConfig !== false) {
+                filesCreated.push(...writeEslintConfig(projectRoot));
+            }
+            if (options.writeArchTests !== false) {
+                filesCreated.push(...writeArchTests(projectRoot));
+            }
+            if (options.install === true) {
+                const pm = typeof options.packageManager === 'string' && options.packageManager.trim() !== ''
+                    ? options.packageManager.trim()
+                    : resolvePackageManager();
+                Logger.info(`Installing governance devDependencies using ${pm}...`);
+                await installGovernanceDeps(projectRoot, pm, [
+                    'eslint',
+                    `@zintrust/governance@${govVersion}`,
+                ]);
+            }
+            return {
+                success: true,
+                filesCreated,
+                message: 'Governance installed successfully',
+            };
+        }
+        catch (error) {
+            Logger.error('Governance scaffolding failed', error);
+            const msg = error instanceof Error ? error.message : String(error);
+            return {
+                success: false,
+                filesCreated: [],
+                message: msg,
+            };
+        }
+    },
+});
+export default GovernanceScaffolder;

package/src/cli/scaffolding/MigrationGenerator.d.ts

@@ -7,6 +7,16 @@ export interface MigrationOptions {
     name: string;
     migrationsPath: string;
     type?: MigrationType;
+    /**
+     * Optional explicit table name to use in generated content.
+     * When provided, the generator will use it instead of inferring from the migration name.
+     */
+    table?: string;
+    /**
+     * Optional column name hint for alter migrations.
+     * When provided, the generator will use it in the example placeholder.
+     */
+    column?: string;
 }
 export interface MigrationScaffoldResult {
     success: boolean;

package/src/cli/scaffolding/MigrationGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationGenerator.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/MigrationGenerator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAExD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,aAAa,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAmB/F;AAED;;GAEG;AAEH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAwD7F;AAqLD;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;EAG7B,CAAC"}
+{"version":3,"file":"MigrationGenerator.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/MigrationGenerator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAExD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAmB/F;AAED;;GAEG;AAEH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAwE7F;AAoRD;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;EAG7B,CAAC"}

package/src/cli/scaffolding/MigrationGenerator.js

@@ -41,6 +41,15 @@ export function generateMigration(options) {
                 message: `Validation failed: ${validation.errors.join(', ')}`,
             });
         }
+        const existing = findExistingMigrationFile(options.migrationsPath, options.name);
+        if (existing !== undefined) {
+            return Promise.resolve({
+                success: false,
+                migrationName: options.name,
+                filePath: existing,
+                message: `Migration '${options.name}' already exists: ${path.basename(existing)}`,
+            });
+        }
         // Generate migration filename with timestamp
         const timestamp = new Date()
             .toISOString()
@@ -48,7 +57,7 @@ export function generateMigration(options) {
             .slice(0, 14);
         const filename = `${timestamp}_${options.name}.ts`;
         const filePath = path.join(options.migrationsPath, filename);
-        // Check if migration already exists
+        // Defensive: exact timestamped file already exists.
         if (FileGenerator.fileExists(filePath)) {
             return Promise.resolve({
                 success: false,
@@ -59,7 +68,13 @@ export function generateMigration(options) {
         }
         // Generate migration content based on type
         const type = options.type ?? detectType(options.name);
-        const content = generateMigrationContent(options.name, type);
+        const content = generateMigrationContent({
+            name: options.name,
+            type,
+            migrationsPath: options.migrationsPath,
+            table: options.table,
+            column: options.column,
+        });
         // Write migration file
         FileGenerator.writeFile(filePath, content);
         Logger.info(`✅ Created migration: ${filename}`);
@@ -81,6 +96,16 @@ export function generateMigration(options) {
         });
     }
 }
+function findExistingMigrationFile(migrationsPath, name) {
+    const suffix = `_${name}.ts`;
+    const files = FileGenerator.listFiles(migrationsPath, false);
+    for (const file of files) {
+        const base = path.basename(file);
+        if (base.endsWith(suffix))
+            return file;
+    }
+    return undefined;
+}
 /**
  * Detect migration type from name
  */
@@ -94,53 +119,85 @@ function detectType(name) {
 /**
  * Generate migration file content
  */
-function generateMigrationContent(name, type) {
-    const className = CommonUtils.toPascalCase(name);
-    if (type === 'create') {
-        return generateCreateMigration(className);
+function generateMigrationContent(options) {
+    const className = CommonUtils.toPascalCase(options.name);
+    const importBlock = resolveMigrationImportBlock(options.migrationsPath);
+    if (options.type === 'create') {
+        return generateCreateMigration({
+            className,
+            importBlock,
+            tableName: options.table ?? getTableNameFromMigrationName(options.name),
+        });
     }
-    else if (type === 'drop') {
-        return generateDropMigration(className);
+    else if (options.type === 'drop') {
+        return generateDropMigration({
+            className,
+            importBlock,
+            tableName: options.table ?? getTableNameFromMigrationName(options.name),
+        });
     }
     else {
-        return generateAlterMigration(className);
+        return generateAlterMigration({
+            className,
+            importBlock,
+            tableName: options.table ?? getTableNameFromMigrationName(options.name),
+            exampleColumn: options.column,
+        });
     }
 }
+function resolveMigrationImportBlock(migrationsPath) {
+    const projectRoot = path.resolve(migrationsPath, '..', '..');
+    const packageJsonPath = path.join(projectRoot, 'package.json');
+    if (FileGenerator.fileExists(packageJsonPath)) {
+        try {
+            const pkgRaw = FileGenerator.readFile(packageJsonPath);
+            const pkg = JSON.parse(pkgRaw);
+            if (pkg.name === '@zintrust/core') {
+                return `import type { IDatabase } from '../../orm/Database';\nimport { Schema as MigrationSchema, type Blueprint } from '../../migrations/schema';`;
+            }
+        }
+        catch {
+            // fall through
+        }
+    }
+    return `import { MigrationSchema, type Blueprint, type IDatabase } from '../../index.js';`;
+}
 /**
  * Generate CREATE migration
  */
-function generateCreateMigration(className) {
-    const tableName = getTableNameFromClass(className);
+function generateCreateMigration(options) {
+    const { className, importBlock, tableName } = options;
     return `/**
  * Migration: ${className}
  * Creates ${tableName} table
  */
 
+${importBlock}
+
 export interface Migration {
-  up(): Promise<void>;
-  down(): Promise<void>;
+  up(db: IDatabase): Promise<void>;
+  down(db: IDatabase): Promise<void>;
 }
 
 export const migration: Migration = {
   /**
    * Run migration
    */
-  async up(): Promise<void> {
-    // Create table
-    // await db.schema.createTable('${tableName}', (table) => {
-    //   table.increments('id').primary();
-    //   table.string('name').notNullable();
-    //   table.string('email').unique();
-    //   table.timestamps();
-    // });
+  async up(db: IDatabase): Promise<void> {
+    const schema = MigrationSchema.create(db);
+
+    await schema.create('${tableName}', (table: Blueprint) => {
+      table.id();
+      table.timestamps();
+    });
   },
 
   /**
    * Rollback migration
    */
-  async down(): Promise<void> {
-    // Drop table
-    // await db.schema.dropTable('${tableName}');
+  async down(db: IDatabase): Promise<void> {
+    const schema = MigrationSchema.create(db);
+    await schema.dropIfExists('${tableName}');
   },
 };
 `;
@@ -148,37 +205,48 @@ export const migration: Migration = {
 /**
  * Generate ALTER migration
  */
-function generateAlterMigration(className) {
-    const tableName = getTableNameFromClass(className);
+function generateAlterMigration(options) {
+    const { className, importBlock, tableName, exampleColumn } = options;
+    const hasConcreteColumn = typeof exampleColumn === 'string' && exampleColumn.trim().length > 0;
+    const example = hasConcreteColumn ? exampleColumn : 'new_column';
+    const tableBody = hasConcreteColumn
+        ? `      table.string('${example}');
+      // Example:
+      // table.dropColumn('old_column');
+      // table.index('new_column');`
+        : `      // Example:
+      // table.string('${example}');
+      // table.dropColumn('old_column');
+      // table.index('new_column');`;
     return `/**
  * Migration: ${className}
  * Modifies ${tableName} table
  */
 
+${importBlock}
+
 export interface Migration {
-  up(): Promise<void>;
-  down(): Promise<void>;
+  up(db: IDatabase): Promise<void>;
+  down(db: IDatabase): Promise<void>;
 }
 
 export const migration: Migration = {
   /**
    * Run migration
    */
-  async up(): Promise<void> {
-    // Add/modify columns
-    // await db.schema.alterTable('${tableName}', (table) => {
-    //   table.string('new_column').nullable();
-    // });
+  async up(db: IDatabase): Promise<void> {
+    const schema = MigrationSchema.create(db);
+
+    await schema.table('${tableName}', (table: Blueprint) => {
+${tableBody}
+    });
   },
 
   /**
    * Rollback migration
    */
-  async down(): Promise<void> {
-    // Remove columns
-    // await db.schema.alterTable('${tableName}', (table) => {
-    //   table.dropColumn('new_column');
-    // });
+  async down(_db: IDatabase): Promise<void> {
+    // Note: dropping columns/FKs varies by driver; SQLite/D1 requires a table rebuild.
   },
 };
 `;
@@ -186,36 +254,34 @@ export const migration: Migration = {
 /**
  * Generate DROP migration
  */
-function generateDropMigration(className) {
-    const tableName = getTableNameFromClass(className);
+function generateDropMigration(options) {
+    const { className, importBlock, tableName } = options;
     return `/**
  * Migration: ${className}
  * Drops ${tableName} table
  */
 
+${importBlock}
+
 export interface Migration {
-  up(): Promise<void>;
-  down(): Promise<void>;
+  up(db: IDatabase): Promise<void>;
+  down(db: IDatabase): Promise<void>;
 }
 
 export const migration: Migration = {
   /**
    * Run migration
    */
-  async up(): Promise<void> {
-    // Drop table
-    // await db.schema.dropTable('${tableName}');
+  async up(db: IDatabase): Promise<void> {
+    const schema = MigrationSchema.create(db);
+    await schema.dropIfExists('${tableName}');
   },
 
   /**
    * Rollback migration
    */
-  async down(): Promise<void> {
-    // Recreate table
-    // await db.schema.createTable('${tableName}', (table) => {
-    //   table.increments('id').primary();
-    //   table.timestamps();
-    // });
+  async down(_db: IDatabase): Promise<void> {
+    // Recreate table (DB-specific). Consider adding back columns explicitly.
   },
 };
 `;
@@ -249,6 +315,26 @@ function getTableNameFromClass(className) {
     }
     return tableName;
 }
+function getTableNameFromMigrationName(name) {
+    if (name.endsWith('_table')) {
+        const ensurePlural = (t) => (t.endsWith('s') ? t : `${t}s`);
+        const withoutSuffix = name.slice(0, -'_table'.length);
+        if (withoutSuffix.startsWith('create_'))
+            return ensurePlural(withoutSuffix.slice('create_'.length));
+        if (withoutSuffix.startsWith('drop_'))
+            return ensurePlural(withoutSuffix.slice('drop_'.length));
+        if (withoutSuffix.includes('_to_'))
+            return ensurePlural(withoutSuffix.split('_to_').at(-1) ?? withoutSuffix);
+        if (withoutSuffix.startsWith('add_')) {
+            // Convention: add_<column>_<table>_table (table is the last segment)
+            const parts = withoutSuffix.split('_');
+            const last = parts.at(-1);
+            if (typeof last === 'string' && last.length > 0)
+                return ensurePlural(last);
+        }
+    }
+    return getTableNameFromClass(CommonUtils.toPascalCase(name));
+}
 /**
  * MigrationGenerator creates database migration files
  */

package/src/cli/scaffolding/ModelGenerator.js

@@ -84,7 +84,7 @@ function buildModelCode(options) {
  * Auto-generated model file
  */
 
-import { type IModel, Model } from '@zintrust/core';
+import { type IModel, Model } from '../../index.js';
 
 export const ${options.name} = Object.freeze(
   Model.define({

package/src/cli/scaffolding/ProjectScaffolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ProjectScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtD,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAC;IACpE,cAAc,IAAI,MAAM,CAAC;IACzB,sBAAsB,IAAI,OAAO,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,WAAW,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;IACtD,gBAAgB,IAAI,OAAO,CAAC;IAC5B,aAAa,IAAI,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC3E;AA0cD,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAsBrE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAsBA;AA0ID;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,GAAE,MAAsB,GAAG,kBAAkB,CAsB/F;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CAEhC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;EAM5B,CAAC"}
+{"version":3,"file":"ProjectScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ProjectScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtD,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAC;IACpE,cAAc,IAAI,MAAM,CAAC;IACzB,sBAAsB,IAAI,OAAO,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,WAAW,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;IACtD,gBAAgB,IAAI,OAAO,CAAC;IAC5B,aAAa,IAAI,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC3E;AA6eD,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAsBrE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAsBA;AA4ID;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,GAAE,MAAsB,GAAG,kBAAkB,CAsB/F;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CAEhC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;EAM5B,CAAC"}