@alpha.consultings/eloquent-orm.js 1.0.9 → 1.0.11

package/dist/cli/commands/makeFactory.js

@@ -7,11 +7,11 @@ exports.makeFactory = makeFactory;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
-const PathMap_1 = require("../utils/PathMap");
-const TemplateEngine_1 = require("../utils/TemplateEngine");
-const fileWriter_1 = require("../utils/fileWriter");
-const ModelIntrospector_1 = require("../utils/ModelIntrospector");
-const ImportResolver_1 = require("../utils/ImportResolver");
+const PathMap_js_1 = require("../utils/PathMap.js");
+const TemplateEngine_js_1 = require("../utils/TemplateEngine.js");
+const fileWriter_js_1 = require("../utils/fileWriter.js");
+const ModelIntrospector_js_1 = require("../utils/ModelIntrospector.js");
+const ImportResolver_js_1 = require("../utils/ImportResolver.js");
 function ensureDirSync(dir) {
     if (!fs_1.default.existsSync(dir))
         fs_1.default.mkdirSync(dir, { recursive: true });
@@ -28,7 +28,7 @@ async function makeFactory(factoryName, options = {}) {
             : `${factoryName}Factory`;
         const ModelName = options.model ?? factoryName.replace(/Factory$/i, "");
         // Reflect schema using ModelIntrospector.
-        const analysisRaw = (await ModelIntrospector_1.ModelIntrospector.analyze(ModelName, {
+        const analysisRaw = (await ModelIntrospector_js_1.ModelIntrospector.analyze(ModelName, {
             test: !!options.test,
         }));
         if (!analysisRaw) {
@@ -59,7 +59,7 @@ async function makeFactory(factoryName, options = {}) {
             fakerPath: fakerMap[String(f.type ?? "").toLowerCase()] ?? "lorem.word()",
         }));
         // Load the main factory template and fail early if it is missing.
-        const templatePath = PathMap_1.PathMap.template("factory");
+        const templatePath = PathMap_js_1.PathMap.template("factory");
         if (!fs_1.default.existsSync(templatePath)) {
             console.error(chalk_1.default.red(`ERROR: Factory template not found at: ${templatePath}`));
             return;
@@ -68,10 +68,12 @@ async function makeFactory(factoryName, options = {}) {
         // Build relation imports and example usage snippets for template.
         const relationImports = new Set();
         const relationExamples = [];
+        const rootDir = PathMap_js_1.PathMap.root;
+        const modelImportPath = ImportResolver_js_1.ImportResolver.withRuntimeRelativeImportExtension(options.test ? `../models/${ModelName}` : `../../models/${ModelName}`, rootDir);
         for (const rel of relations) {
             if (rel.target && typeof rel.target === "string") {
                 const candidateFactoryName = `${rel.target}Factory`;
-                const candidateImportPath = `../factories/${candidateFactoryName}`;
+                const candidateImportPath = ImportResolver_js_1.ImportResolver.withRuntimeRelativeImportExtension(`../factories/${candidateFactoryName}`, rootDir);
                 relationImports.add(`import { ${candidateFactoryName} } from "${candidateImportPath}";`);
             }
             const relatedName = String(rel.target ?? "Related");
@@ -93,9 +95,9 @@ async function makeFactory(factoryName, options = {}) {
                     relationExamples.push(`// relation ${rel.name} (${String(rel.type)})`);
             }
         }
-        const factoriesDir = PathMap_1.PathMap.factories(!!options.test);
+        const factoriesDir = PathMap_js_1.PathMap.factories(!!options.test);
         const outputPath = path_1.default.join(factoriesDir, `${FactoryName}.ts`);
-        const packageImportPath = ImportResolver_1.ImportResolver.publicApiImportPath(outputPath);
+        const packageImportPath = ImportResolver_js_1.ImportResolver.publicApiImportPath(outputPath, rootDir);
         const renderData = {
             ModelName,
             FactoryName,
@@ -105,24 +107,22 @@ async function makeFactory(factoryName, options = {}) {
             relationImports: Array.from(relationImports),
             relationExamples,
             features,
+            modelImportPath,
             packageImportPath,
         };
-        let rendered = TemplateEngine_1.TemplateEngine.render(templateContent, renderData);
-        if (options.test) {
-            rendered = rendered.replace(/from \"\.\.\/\.\.\/models\//g, 'from "../models/');
-        }
+        const rendered = TemplateEngine_js_1.TemplateEngine.render(templateContent, renderData);
         // Write the main factory file using writeFileSafe / overwriteFile.
         ensureDirSync(factoriesDir);
         if (fs_1.default.existsSync(outputPath)) {
             if (shouldOverwrite) {
-                (0, fileWriter_1.overwriteFile)(outputPath, rendered);
+                (0, fileWriter_js_1.overwriteFile)(outputPath, rendered);
             }
             else {
                 console.log(chalk_1.default.yellow(`INFO: Factory file already exists: ${outputPath}. Use overwrite option to replace.`));
             }
         }
         else {
-            (0, fileWriter_1.writeFileSafe)(outputPath, rendered);
+            (0, fileWriter_js_1.writeFileSafe)(outputPath, rendered);
         }
         // Generate pivot factories automatically.
         for (const rel of relations) {
@@ -132,7 +132,7 @@ async function makeFactory(factoryName, options = {}) {
                 const pivotTable = rel.pivotTable ??
                     [left.toLowerCase(), right.toLowerCase()].sort().join("_") + "_pivot";
                 const pivotFactoryName = `${left}${right}PivotFactory`;
-                const pivotTemplatePath = PathMap_1.PathMap.template("pivot-factory");
+                const pivotTemplatePath = PathMap_js_1.PathMap.template("pivot-factory");
                 if (!fs_1.default.existsSync(pivotTemplatePath)) {
                     console.warn(chalk_1.default.yellow(`WARN: Pivot template not found at: ${pivotTemplatePath} - skipping pivot ${pivotTable}.`));
                     continue;
@@ -144,7 +144,7 @@ async function makeFactory(factoryName, options = {}) {
                     ? rel.relatedKey
                     : `${right.toLowerCase()}_id`;
                 const pivotOutputPath = path_1.default.join(factoriesDir, `${pivotFactoryName}.ts`);
-                const pivotPackageImportPath = ImportResolver_1.ImportResolver.publicApiImportPath(pivotOutputPath);
+                const pivotPackageImportPath = ImportResolver_js_1.ImportResolver.publicApiImportPath(pivotOutputPath, rootDir);
                 const pivotRenderData = {
                     PivotFactoryName: pivotFactoryName,
                     pivotTable,
@@ -152,17 +152,17 @@ async function makeFactory(factoryName, options = {}) {
                     relatedKey,
                     packageImportPath: pivotPackageImportPath,
                 };
-                const pivotRendered = TemplateEngine_1.TemplateEngine.render(fs_1.default.readFileSync(pivotTemplatePath, "utf8"), pivotRenderData);
+                const pivotRendered = TemplateEngine_js_1.TemplateEngine.render(fs_1.default.readFileSync(pivotTemplatePath, "utf8"), pivotRenderData);
                 if (fs_1.default.existsSync(pivotOutputPath)) {
                     if (shouldOverwrite) {
-                        (0, fileWriter_1.overwriteFile)(pivotOutputPath, pivotRendered);
+                        (0, fileWriter_js_1.overwriteFile)(pivotOutputPath, pivotRendered);
                     }
                     else {
                         console.log(chalk_1.default.yellow(`INFO: Pivot factory already exists: ${pivotOutputPath}`));
                     }
                 }
                 else {
-                    (0, fileWriter_1.writeFileSafe)(pivotOutputPath, pivotRendered);
+                    (0, fileWriter_js_1.writeFileSafe)(pivotOutputPath, pivotRendered);
                 }
             }
         }

package/dist/cli/commands/makeMigration.d.ts

@@ -1,4 +1,4 @@
-import { type ConnectionName } from "../../core/connection/ConnectionFactory";
+import { type ConnectionName } from "../../core/connection/ConnectionFactory.js";
 interface MigrationOptions {
     test?: boolean;
     exit?: boolean;

package/dist/cli/commands/makeMigration.js

@@ -8,13 +8,13 @@ exports.makeMigration = makeMigration;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
-const SchemaBuilder_1 = require("../../core/schema/SchemaBuilder");
-const PathMap_1 = require("../utils/PathMap");
-const resolveConnectionName_1 = require("../../core/connection/resolveConnectionName");
-const TypeScriptCompiler_1 = require("../utils/typescript/TypeScriptCompiler");
-const ConnectionFactory_1 = require("../../core/connection/ConnectionFactory");
-const database_1 = require("../../config/database");
-const tsRuntime_1 = require("../utils/typescript/tsRuntime");
+const SchemaBuilder_js_1 = require("../../core/schema/SchemaBuilder.js");
+const PathMap_js_1 = require("../utils/PathMap.js");
+const resolveConnectionName_js_1 = require("../../core/connection/resolveConnectionName.js");
+const TypeScriptCompiler_js_1 = require("../utils/typescript/TypeScriptCompiler.js");
+const ConnectionFactory_js_1 = require("../../core/connection/ConnectionFactory.js");
+const database_js_1 = require("../../config/database.js");
+const tsRuntime_js_1 = require("../utils/typescript/tsRuntime.js");
 function hasSoftDeletesSchema(schema) {
     for (const [name, field] of Object.entries(schema)) {
         if (field.kind === "mixin" && field.name === "SoftDeletes") {
@@ -169,14 +169,14 @@ async function makeMigration(modelName, options = {}) {
     const isTest = options.test === true;
     const forcedConnectionName = options.connectionName;
     const pivotSeparate = options.pivotSeparate === true || modelName.toLowerCase() === "all";
-    const modelsDir = PathMap_1.PathMap.models(isTest);
-    PathMap_1.PathMap.ensureDirs();
+    const modelsDir = PathMap_js_1.PathMap.models(isTest);
+    PathMap_js_1.PathMap.ensureDirs();
     if (!fs_1.default.existsSync(modelsDir)) {
         console.error(chalk_1.default.red(`ERROR: Models folder not found: ${modelsDir}`));
         return;
     }
     console.log(chalk_1.default.gray(`INFO: Models Path: ${modelsDir}`));
-    console.log(chalk_1.default.gray(`INFO: Migrations Root: ${isTest ? PathMap_1.PathMap.testMigrations() : PathMap_1.PathMap.appMigrations()}`));
+    console.log(chalk_1.default.gray(`INFO: Migrations Root: ${isTest ? PathMap_js_1.PathMap.testMigrations() : PathMap_js_1.PathMap.appMigrations()}`));
     const requestedModelFiles = modelName.toLowerCase() === "all"
         ? fs_1.default.readdirSync(modelsDir).filter((f) => f.endsWith(".ts"))
         : [`${pascalCase(modelName)}.ts`];
@@ -186,6 +186,7 @@ async function makeMigration(modelName, options = {}) {
     }
     const loadedModels = [];
     const pendingPivotMigrations = new Map();
+    const failedFiles = new Set();
     const timestampSeed = new Date()
         .toISOString()
         .replace(/[-:.TZ]/g, "")
@@ -202,13 +203,13 @@ async function makeMigration(modelName, options = {}) {
             continue;
         }
         try {
-            if (!TypeScriptCompiler_1.TypeScriptCompiler.compile([modelPath])) {
+            if (!TypeScriptCompiler_js_1.TypeScriptCompiler.compile([modelPath])) {
                 console.warn(chalk_1.default.yellow(`WARN: Skipping migration due to TS error in ${file}`));
                 continue;
             }
             const absModelPath = path_1.default.resolve(modelPath);
             delete require.cache[require.resolve(absModelPath)];
-            const modelModule = (0, tsRuntime_1.loadModule)(absModelPath);
+            const modelModule = (0, tsRuntime_js_1.loadModule)(absModelPath);
             const modelClassName = path_1.default.basename(file, ".ts");
             const ModelClass = modelModule[modelClassName];
             if (!ModelClass?.schema || !ModelClass?.tableName) {
@@ -227,6 +228,7 @@ async function makeMigration(modelName, options = {}) {
             });
         }
         catch (err) {
+            failedFiles.add(file);
             console.error(chalk_1.default.red(`ERROR: Error processing ${file}:`));
             console.error(err instanceof Error ? err.message : err);
         }
@@ -236,9 +238,9 @@ async function makeMigration(modelName, options = {}) {
         : loadedModels;
     for (const { file, modelClassName, ModelClass } of orderedModels) {
         try {
-            const resolvedConnectionName = (0, resolveConnectionName_1.resolveConnectionName)(ModelClass, { test: isTest });
+            const resolvedConnectionName = (0, resolveConnectionName_js_1.resolveConnectionName)(ModelClass, { test: isTest });
             const connectionName = forcedConnectionName ?? resolvedConnectionName;
-            const migrationsDir = PathMap_1.PathMap.migrations(isTest, connectionName);
+            const migrationsDir = PathMap_js_1.PathMap.migrations(isTest, connectionName);
             if (!fs_1.default.existsSync(migrationsDir)) {
                 fs_1.default.mkdirSync(migrationsDir, { recursive: true });
             }
@@ -250,7 +252,7 @@ async function makeMigration(modelName, options = {}) {
             const needsBaselineCreate = createFiles.length === 0 && updateFiles.length === 0;
             console.log(chalk_1.default.gray(`INFO: Using connection: ${connectionName}`));
             console.log(chalk_1.default.gray(`INFO: Migrations Path: ${migrationsDir}`));
-            const driver = database_1.dbConfig.connections[connectionName]?.driver ??
+            const driver = database_js_1.dbConfig.connections[connectionName]?.driver ??
                 connectionName;
             const normalizedSchema = normalizedSchemaForMigration(ModelClass);
             if (driver === "mongo") {
@@ -357,7 +359,7 @@ export async function down(db: { dropCollection(name: string): Promise<void> })
                 console.warn(chalk_1.default.yellow(`Skipping make:migration for "${connectionName}": unsupported driver "${driver}".`));
                 continue;
             }
-            const { mainSQL, extraTables, rollbackMainSQL, rollbackExtraTables } = await SchemaBuilder_1.SchemaBuilder.toCreateSQL(ModelClass.tableName, normalizedSchema, driver, !needsBaselineCreate, connectionName, needsBaselineCreate);
+            const { mainSQL, extraTables, rollbackMainSQL, rollbackExtraTables } = await SchemaBuilder_js_1.SchemaBuilder.toCreateSQL(ModelClass.tableName, normalizedSchema, driver, !needsBaselineCreate, connectionName, needsBaselineCreate);
             if ((!mainSQL || mainSQL.trim() === "") && extraTables.length === 0) {
                 console.log(chalk_1.default.gray("INFO: No new columns or schema changes - skipping."));
                 continue;
@@ -454,6 +456,7 @@ export async function down(db: { query(sql: string): Promise<void> }) {
             }
         }
         catch (err) {
+            failedFiles.add(file);
             console.error(chalk_1.default.red(`ERROR: Error processing ${file}:`));
             console.error(err instanceof Error ? err.message : err);
         }
@@ -482,12 +485,23 @@ export async function down(db: { query(sql: string): Promise<void> }) {
         console.log(chalk_1.default.green(`OK: Pivot migration saved: ${pivotPath}`));
     }
     try {
-        await (0, ConnectionFactory_1.closeAllConnections)();
+        await (0, ConnectionFactory_js_1.closeAllConnections)();
         console.log(chalk_1.default.gray("INFO: All database connections closed.\n"));
     }
     catch {
         console.warn(chalk_1.default.yellow("WARN: Could not close DB connections cleanly."));
     }
+    if (failedFiles.size > 0) {
+        const failureSummary = `ERROR: Migration generation failed for ${failedFiles.size} model` +
+            `${failedFiles.size === 1 ? "" : "s"}: ${[...failedFiles].join(", ")}`;
+        console.error(chalk_1.default.red(failureSummary));
+        if (options.exit !== false) {
+            process.exit(1);
+            /* istanbul ignore next -- process.exit terminates the process in runtime */
+            return;
+        }
+        throw new Error(failureSummary);
+    }
     console.log(chalk_1.default.cyanBright(`OK: Migration generation complete in ${isTest ? "TEST" : "DEVELOPMENT"} mode.\n`));
     if (options.exit !== false) {
         process.exit(0);

package/dist/cli/commands/makeModel.js

@@ -8,16 +8,16 @@ exports.makeModel = makeModel;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
-const SchemaBuilder_1 = require("../../core/schema/SchemaBuilder");
-const PathMap_1 = require("../utils/PathMap");
-const TemplateEngine_1 = require("../utils/TemplateEngine");
-const ImportResolver_1 = require("../utils/ImportResolver");
-const resolveConnectionName_1 = require("../../core/connection/resolveConnectionName");
-const TypeScriptCompiler_1 = require("../utils/typescript/TypeScriptCompiler");
-const ConnectionFactory_1 = require("../../core/connection/ConnectionFactory");
-const database_1 = require("../../config/database");
-const tsRuntime_1 = require("../utils/typescript/tsRuntime");
-const makeMigration_1 = require("./makeMigration");
+const SchemaBuilder_js_1 = require("../../core/schema/SchemaBuilder.js");
+const PathMap_js_1 = require("../utils/PathMap.js");
+const TemplateEngine_js_1 = require("../utils/TemplateEngine.js");
+const ImportResolver_js_1 = require("../utils/ImportResolver.js");
+const resolveConnectionName_js_1 = require("../../core/connection/resolveConnectionName.js");
+const TypeScriptCompiler_js_1 = require("../utils/typescript/TypeScriptCompiler.js");
+const ConnectionFactory_js_1 = require("../../core/connection/ConnectionFactory.js");
+const database_js_1 = require("../../config/database.js");
+const tsRuntime_js_1 = require("../utils/typescript/tsRuntime.js");
+const makeMigration_js_1 = require("./makeMigration.js");
 function pascalCase(name) {
     return name.charAt(0).toUpperCase() + name.slice(1);
 }
@@ -155,19 +155,19 @@ async function makeModel(name, options = {}) {
         ? defaultConnectionName
         : `process.env.DB_CONNECTION ?? "${defaultConnectionName}"`;
     let wroteModel = false;
-    PathMap_1.PathMap.ensureDirs();
-    const modelsDir = PathMap_1.PathMap.models(isTest);
-    const migrationsDir = isTest ? PathMap_1.PathMap.testMigrations() : PathMap_1.PathMap.appMigrations();
+    PathMap_js_1.PathMap.ensureDirs();
+    const modelsDir = PathMap_js_1.PathMap.models(isTest);
+    const migrationsDir = isTest ? PathMap_js_1.PathMap.testMigrations() : PathMap_js_1.PathMap.appMigrations();
     console.log(chalk_1.default.gray(`📁 Models Path: ${modelsDir}`));
     console.log(chalk_1.default.gray(`📁 Migrations Path: ${migrationsDir}`));
-    const coreImportPath = ImportResolver_1.ImportResolver.coreImportPath(isTest);
-    const schemaImportPath = ImportResolver_1.ImportResolver.schemaImportPath(isTest);
+    const coreImportPath = ImportResolver_js_1.ImportResolver.coreImportPath(isTest, PathMap_js_1.PathMap.root);
+    const schemaImportPath = ImportResolver_js_1.ImportResolver.schemaImportPath(isTest, PathMap_js_1.PathMap.root);
     let tpl = "";
     // 🧠 1️⃣ Generate Model
     const modelFilePath = path_1.default.join(modelsDir, `${modelName}.ts`);
     try {
-        tpl = TemplateEngine_1.TemplateEngine.load("model");
-        const modelContent = TemplateEngine_1.TemplateEngine.render(tpl, {
+        tpl = TemplateEngine_js_1.TemplateEngine.load("model");
+        const modelContent = TemplateEngine_js_1.TemplateEngine.render(tpl, {
             ModelName: modelName,
             tableName,
             coreImportPath,
@@ -189,7 +189,7 @@ async function makeModel(name, options = {}) {
             console.log(chalk_1.default.yellow(`⚠️  Model already exists: ${modelFilePath}`));
         }
         else {
-            TemplateEngine_1.TemplateEngine.save(modelFilePath, finalContent);
+            TemplateEngine_js_1.TemplateEngine.save(modelFilePath, finalContent);
             wroteModel = true;
             console.log(chalk_1.default.green(`✅ Model created: ${modelFilePath}`));
         }
@@ -200,13 +200,13 @@ async function makeModel(name, options = {}) {
     }
     if (attrsFromSchema && wroteModel) {
         try {
-            if (!TypeScriptCompiler_1.TypeScriptCompiler.compile([modelFilePath])) {
+            if (!TypeScriptCompiler_js_1.TypeScriptCompiler.compile([modelFilePath])) {
                 console.warn(chalk_1.default.yellow(`⚠️  Skipping attrs inference — ${modelName}.ts has TS errors.`));
             }
             else {
                 const absModelPath = path_1.default.resolve(modelFilePath);
                 delete require.cache[require.resolve(absModelPath)];
-                const modelModule = (0, tsRuntime_1.loadModule)(absModelPath);
+                const modelModule = (0, tsRuntime_js_1.loadModule)(absModelPath);
                 const ModelClass = modelModule[modelName];
                 if (!ModelClass?.schema) {
                     console.log(chalk_1.default.yellow(`⚠️  Schema not found in ${modelName}.ts — keeping defaults.`));
@@ -216,7 +216,7 @@ async function makeModel(name, options = {}) {
                         includeTimestamps: Boolean(ModelClass.timestamps),
                         includeSoftDeletes: Boolean(ModelClass.softDeletes),
                     });
-                    const modelContent = TemplateEngine_1.TemplateEngine.render(tpl, {
+                    const modelContent = TemplateEngine_js_1.TemplateEngine.render(tpl, {
                         ModelName: modelName,
                         tableName,
                         coreImportPath,
@@ -233,7 +233,7 @@ async function makeModel(name, options = {}) {
  * Mode: ${mode}
  * Generated at: ${new Date().toISOString()}
  */\n\n`;
-                    TemplateEngine_1.TemplateEngine.save(modelFilePath, header + modelContent);
+                    TemplateEngine_js_1.TemplateEngine.save(modelFilePath, header + modelContent);
                     console.log(chalk_1.default.green(`✅ Inferred attrs type from schema for ${modelName}.ts`));
                 }
             }
@@ -252,30 +252,30 @@ async function makeModel(name, options = {}) {
     }
     // 🧱 3️⃣ Generate smart migration (SchemaBuilder v3)
     try {
-        if (!TypeScriptCompiler_1.TypeScriptCompiler.compile([modelFilePath])) {
+        if (!TypeScriptCompiler_js_1.TypeScriptCompiler.compile([modelFilePath])) {
             console.warn(chalk_1.default.yellow(`⚠️  Skipping migration — ${modelName}.ts has TS errors.`));
             return;
         }
         const absModelPath = path_1.default.resolve(modelFilePath);
         delete require.cache[require.resolve(absModelPath)];
-        const modelModule = (0, tsRuntime_1.loadModule)(absModelPath);
+        const modelModule = (0, tsRuntime_js_1.loadModule)(absModelPath);
         const ModelClass = modelModule[modelName];
         if (!ModelClass?.schema || !ModelClass?.tableName) {
             console.log(chalk_1.default.yellow(`⚠️  Schema not found in ${modelName}.ts — skipping migration.`));
             return;
         }
         const resolvedModelClass = ModelClass;
-        const connectionName = (0, resolveConnectionName_1.resolveConnectionName)(resolvedModelClass, { test: isTest });
-        const connectionMigrationsDir = PathMap_1.PathMap.migrations(isTest, connectionName);
+        const connectionName = (0, resolveConnectionName_js_1.resolveConnectionName)(resolvedModelClass, { test: isTest });
+        const connectionMigrationsDir = PathMap_js_1.PathMap.migrations(isTest, connectionName);
         if (!fs_1.default.existsSync(connectionMigrationsDir)) {
             fs_1.default.mkdirSync(connectionMigrationsDir, { recursive: true });
         }
         console.log(chalk_1.default.gray(`Using connection: ${connectionName}`));
         console.log(chalk_1.default.gray(`Migrations Path: ${connectionMigrationsDir}`));
-        const driver = database_1.dbConfig.connections[connectionName]?.driver ??
+        const driver = database_js_1.dbConfig.connections[connectionName]?.driver ??
             connectionName;
         if (driver === "mongo") {
-            await (0, makeMigration_1.makeMigration)(modelName, {
+            await (0, makeMigration_js_1.makeMigration)(modelName, {
                 test: isTest,
                 connectionName,
                 exit: false,
@@ -283,7 +283,7 @@ async function makeModel(name, options = {}) {
             return;
         }
         const normalizedSchema = normalizedSchemaForMigration(resolvedModelClass);
-        const { mainSQL, extraTables, rollbackMainSQL, rollbackExtraTables } = await SchemaBuilder_1.SchemaBuilder.toCreateSQL(resolvedModelClass.tableName, normalizedSchema, driver, true, // smart update detection
+        const { mainSQL, extraTables, rollbackMainSQL, rollbackExtraTables } = await SchemaBuilder_js_1.SchemaBuilder.toCreateSQL(resolvedModelClass.tableName, normalizedSchema, driver, true, // smart update detection
         connectionName);
         const isCreate = mainSQL.trim().toUpperCase().startsWith("CREATE TABLE");
         const prefix = isCreate ? "create" : "update";
@@ -349,7 +349,7 @@ export async function down(db: { query(sql: string): Promise<void> }) {
     }
     finally {
         try {
-            await (0, ConnectionFactory_1.closeAllConnections)();
+            await (0, ConnectionFactory_js_1.closeAllConnections)();
             console.log(chalk_1.default.gray("All database connections closed."));
         }
         catch {

package/dist/cli/commands/makeRegistry.d.ts

@@ -1,16 +1,13 @@
+import { ImportResolver } from "../utils/ImportResolver.js";
 type RegistryOptions = {
     test?: boolean;
     force?: boolean;
 };
-declare function stripJsonComments(raw: string): string;
-declare function readJsonFile<T>(filePath: string): T | null;
-declare function usesNodeEsmRegistryImports(rootDir: string): boolean;
-declare function withRuntimeRelativeImportExtension(importPath: string, rootDir: string): string;
 export declare const __makeRegistryInternals: {
-    stripJsonComments: typeof stripJsonComments;
-    readJsonFile: typeof readJsonFile;
-    usesNodeEsmRegistryImports: typeof usesNodeEsmRegistryImports;
-    withRuntimeRelativeImportExtension: typeof withRuntimeRelativeImportExtension;
+    stripJsonComments: (raw: string) => string;
+    readJsonFile: <T>(filePath: string) => T | null;
+    usesNodeEsmRegistryImports: typeof ImportResolver.usesNodeEsmRuntime;
+    withRuntimeRelativeImportExtension: typeof ImportResolver.withRuntimeRelativeImportExtension;
 };
 export declare function makeRegistry(options?: RegistryOptions): Promise<void>;
 export {};

package/dist/cli/commands/makeRegistry.js

@@ -8,67 +8,17 @@ exports.makeRegistry = makeRegistry;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
-const TemplateEngine_1 = require("../utils/TemplateEngine");
-const fileWriter_1 = require("../utils/fileWriter");
-const PathMap_1 = require("../utils/PathMap");
-const ImportResolver_1 = require("../utils/ImportResolver");
+const TemplateEngine_js_1 = require("../utils/TemplateEngine.js");
+const fileWriter_js_1 = require("../utils/fileWriter.js");
+const PathMap_js_1 = require("../utils/PathMap.js");
+const ImportResolver_js_1 = require("../utils/ImportResolver.js");
 function isValidIdentifier(name) {
     return /^[A-Za-z_][A-Za-z0-9_]*$/.test(name);
 }
-function stripJsonComments(raw) {
-    return raw
-        .replace(/\/\*[\s\S]*?\*\//g, "")
-        .replace(/^\s*\/\/.*$/gm, "");
-}
-function readJsonFile(filePath) {
-    if (!fs_1.default.existsSync(filePath)) {
-        return null;
-    }
-    try {
-        const raw = fs_1.default.readFileSync(filePath, "utf8");
-        return JSON.parse(stripJsonComments(raw));
-    }
-    catch {
-        return null;
-    }
-}
-function usesNodeEsmRegistryImports(rootDir) {
-    const packageJson = readJsonFile(path_1.default.join(rootDir, "package.json"));
-    const packageType = typeof packageJson?.type === "string" ? packageJson.type.trim() : "";
-    if (packageType === "module") {
-        return true;
-    }
-    const tsconfig = readJsonFile(path_1.default.join(rootDir, "tsconfig.json"));
-    const compilerOptions = tsconfig && typeof tsconfig === "object" ? tsconfig.compilerOptions : undefined;
-    const moduleName = typeof compilerOptions?.module === "string"
-        ? compilerOptions.module.trim().toLowerCase()
-        : "";
-    const moduleResolution = typeof compilerOptions?.moduleResolution === "string"
-        ? compilerOptions.moduleResolution.trim().toLowerCase()
-        : "";
-    return (moduleName === "nodenext" ||
-        moduleName === "node16" ||
-        moduleResolution === "nodenext" ||
-        moduleResolution === "node16");
-}
-function withRuntimeRelativeImportExtension(importPath, rootDir) {
-    if (!usesNodeEsmRegistryImports(rootDir)) {
-        return importPath;
-    }
-    const isRelativeImport = importPath.startsWith(".");
-    if (!isRelativeImport) {
-        return importPath;
-    }
-    const hasRuntimeExtension = /\.(?:[cm]?js|json)$/i.test(importPath);
-    if (hasRuntimeExtension) {
-        return importPath;
-    }
-    return `${importPath}.js`;
-}
 function discoverRegistryModels(isTest) {
-    const modelsDir = PathMap_1.PathMap.models(isTest);
+    const modelsDir = PathMap_js_1.PathMap.models(isTest);
     const importBase = isTest ? "./database/models" : "./models";
-    const rootDir = PathMap_1.PathMap.root;
+    const rootDir = PathMap_js_1.PathMap.root;
     if (!fs_1.default.existsSync(modelsDir)) {
         return [];
     }
@@ -84,11 +34,11 @@ function discoverRegistryModels(isTest) {
         .sort((a, b) => a.localeCompare(b))
         .map((name) => ({
         name,
-        importPath: withRuntimeRelativeImportExtension(`${importBase}/${name}`, rootDir),
+        importPath: ImportResolver_js_1.ImportResolver.withRuntimeRelativeImportExtension(`${importBase}/${name}`, rootDir),
     }));
 }
 function registryOutputPath(isTest) {
-    return path_1.default.resolve(PathMap_1.PathMap.root, isTest ? "src/test/registerModels.ts" : "src/app/registerModels.ts");
+    return path_1.default.resolve(PathMap_js_1.PathMap.root, isTest ? "src/test/registerModels.ts" : "src/app/registerModels.ts");
 }
 function registryRelativePath(isTest) {
     return isTest ? "src/test/registerModels.ts" : "src/app/registerModels.ts";
@@ -100,22 +50,22 @@ function registryConstName(isTest) {
     return isTest ? "TEST_MODELS" : "APP_MODELS";
 }
 exports.__makeRegistryInternals = {
-    stripJsonComments,
-    readJsonFile,
-    usesNodeEsmRegistryImports,
-    withRuntimeRelativeImportExtension,
+    stripJsonComments: ImportResolver_js_1.__importResolverInternals.stripJsonComments,
+    readJsonFile: ImportResolver_js_1.__importResolverInternals.readJsonFile,
+    usesNodeEsmRegistryImports: ImportResolver_js_1.ImportResolver.usesNodeEsmRuntime.bind(ImportResolver_js_1.ImportResolver),
+    withRuntimeRelativeImportExtension: ImportResolver_js_1.ImportResolver.withRuntimeRelativeImportExtension.bind(ImportResolver_js_1.ImportResolver),
 };
 async function makeRegistry(options = {}) {
     try {
         const isTest = !!options.test;
         const forceWrite = !!options.force;
-        PathMap_1.PathMap.ensureDirs();
+        PathMap_js_1.PathMap.ensureDirs();
         const outputPath = registryOutputPath(isTest);
         const relativePath = registryRelativePath(isTest);
         const models = discoverRegistryModels(isTest);
-        const template = TemplateEngine_1.TemplateEngine.load("model-registry");
-        const outputImportPath = withRuntimeRelativeImportExtension(ImportResolver_1.ImportResolver.publicApiImportPath(outputPath), PathMap_1.PathMap.root);
-        const rendered = TemplateEngine_1.TemplateEngine.render(template, {
+        const template = TemplateEngine_js_1.TemplateEngine.load("model-registry");
+        const outputImportPath = ImportResolver_js_1.ImportResolver.withRuntimeRelativeImportExtension(ImportResolver_js_1.ImportResolver.publicApiImportPath(outputPath, PathMap_js_1.PathMap.root), PathMap_js_1.PathMap.root);
+        const rendered = TemplateEngine_js_1.TemplateEngine.render(template, {
             packageImportPath: outputImportPath,
             models,
             modelsConstName: registryConstName(isTest),
@@ -129,8 +79,8 @@ async function makeRegistry(options = {}) {
 
 `;
         const created = forceWrite
-            ? (0, fileWriter_1.overwriteFile)(outputPath, header + rendered)
-            : (0, fileWriter_1.writeFileSafe)(outputPath, header + rendered);
+            ? (0, fileWriter_js_1.overwriteFile)(outputPath, header + rendered)
+            : (0, fileWriter_js_1.writeFileSafe)(outputPath, header + rendered);
         if (!created) {
             return;
         }