@zintrust/core 0.4.79 → 0.4.80

package/bin/zintrust-main.d.ts

@@ -12,9 +12,12 @@ export declare function run(): Promise<void>;
 export declare const CliLauncherInternal: Readonly<{
     CLI_HANDOFF_ENV_KEY: "ZINTRUST_CLI_HANDOFF";
     findProjectLocalCliTarget: (cwd: string) => ProjectLocalCliTarget | undefined;
+    getHandoffExitCode: (exitCode: number | null, signal: NodeJS.Signals | null) => number;
     getCurrentPackageRoot: () => string;
     getRealPath: (targetPath: string) => string;
+    handoffToProjectLocalCli: (target: ProjectLocalCliTarget, rawArgs: string[]) => Promise<never>;
     isWithinDirectory: (targetPath: string, possibleParentPath: string) => boolean;
+    maybeHandoffToProjectLocalCli: (rawArgs: string[]) => Promise<boolean>;
     resolveProjectLocalCliHandoff: (cwd: string, currentPackageRoot: string, env?: NodeJS.ProcessEnv) => ProjectLocalCliTarget | undefined;
 }>;
 export {};

package/bin/zintrust-main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zintrust-main.d.ts","sourceRoot":"","sources":["../../bin/zintrust-main.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAmTF,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzC;AAED,eAAO,MAAM,mBAAmB;;qCAjSQ,MAAM,KAAG,qBAAqB,GAAG,SAAS;iCAtBhD,MAAM;8BAIP,MAAM,KAAG,MAAM;oCAQT,MAAM,sBAAsB,MAAM,KAAG,OAAO;yCAqC5E,MAAM,sBACS,MAAM,QACrB,MAAM,CAAC,UAAU,KACrB,qBAAqB,GAAG,SAAS;EA0QlC,CAAC;AAEH,OAAO,EAAE,CAAC"}
+{"version":3,"file":"zintrust-main.d.ts","sourceRoot":"","sources":["../../bin/zintrust-main.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAuVF,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzC;AAED,eAAO,MAAM,mBAAmB;;qCArUQ,MAAM,KAAG,qBAAqB,GAAG,SAAS;mCA6C5C,MAAM,GAAG,IAAI,UAAU,MAAM,CAAC,OAAO,GAAG,IAAI,KAAG,MAAM;iCAnEzD,MAAM;8BAIP,MAAM,KAAG,MAAM;uCAsEtC,qBAAqB,WACpB,MAAM,EAAE,KAChB,OAAO,CAAC,KAAK,CAAC;oCAhEsB,MAAM,sBAAsB,MAAM,KAAG,OAAO;6CA2G7B,MAAM,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;yCAtE1E,MAAM,sBACS,MAAM,QACrB,MAAM,CAAC,UAAU,KACrB,qBAAqB,GAAG,SAAS;EAiTlC,CAAC;AAEH,OAAO,EAAE,CAAC"}

package/bin/zintrust-main.js

@@ -5,7 +5,7 @@
  * be imported by other bin shortcuts (zin/z/zt) without parse errors.
  */
 import { Logger } from '../src/config/logger.js';
-import { spawnSync } from 'node:child_process';
+import { spawn } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -65,24 +65,55 @@ const resolveProjectLocalCliHandoff = (cwd, currentPackageRoot, env = process.en
     }
     return target;
 };
-const handoffToProjectLocalCli = (target, rawArgs) => {
-    const result = spawnSync(process.execPath, [target.binPath, ...rawArgs], {
+const getHandoffExitCode = (exitCode, signal) => {
+    if (typeof exitCode === 'number')
+        return exitCode;
+    if (signal === 'SIGINT' || signal === 'SIGTERM')
+        return 0;
+    return 1;
+};
+const handoffToProjectLocalCli = async (target, rawArgs) => {
+    const child = spawn(process.execPath, [target.binPath, ...rawArgs], {
         stdio: 'inherit',
         env: {
             ...process.env,
             [CLI_HANDOFF_ENV_KEY]: '1',
         },
     });
-    if (result.error !== undefined) {
-        throw result.error;
+    const forwardSignals = !process.stdin.isTTY;
+    const forwardSignal = (signal) => {
+        if (!forwardSignals)
+            return;
+        try {
+            child.kill(signal);
+        }
+        catch {
+            // best-effort forwarding during CLI handoff
+        }
+    };
+    const onSigint = () => forwardSignal('SIGINT');
+    const onSigterm = () => forwardSignal('SIGTERM');
+    process.on('SIGINT', onSigint);
+    process.on('SIGTERM', onSigterm);
+    try {
+        const result = await new Promise((resolve, reject) => {
+            child.once('error', reject);
+            child.once('close', (exitCode, signal) => {
+                resolve({ exitCode, signal });
+            });
+        });
+        process.exit(getHandoffExitCode(result.exitCode, result.signal));
+    }
+    finally {
+        process.off('SIGINT', onSigint);
+        process.off('SIGTERM', onSigterm);
     }
-    process.exit(typeof result.status === 'number' ? result.status : 1);
 };
-const maybeHandoffToProjectLocalCli = (rawArgs) => {
+const maybeHandoffToProjectLocalCli = async (rawArgs) => {
     const localCliTarget = resolveProjectLocalCliHandoff(process.cwd(), getCurrentPackageRoot());
     if (localCliTarget === undefined)
         return false;
-    handoffToProjectLocalCli(localCliTarget, rawArgs);
+    await handoffToProjectLocalCli(localCliTarget, rawArgs);
     return true;
 };
 const loadPackageVersionFast = () => {
@@ -195,7 +226,7 @@ const handleCliFatal = async (error, context) => {
 };
 const runCliInternal = async () => {
     const { rawArgs: rawArgs0, args: args0 } = getArgsFromProcess();
-    if (maybeHandoffToProjectLocalCli(rawArgs0)) {
+    if (await maybeHandoffToProjectLocalCli(rawArgs0)) {
         return;
     }
     // Fast path: print version and exit without bootstrapping the CLI.
@@ -266,8 +297,11 @@ export async function run() {
 export const CliLauncherInternal = Object.freeze({
     CLI_HANDOFF_ENV_KEY,
     findProjectLocalCliTarget,
+    getHandoffExitCode,
     getCurrentPackageRoot,
     getRealPath,
+    handoffToProjectLocalCli,
     isWithinDirectory,
+    maybeHandoffToProjectLocalCli,
     resolveProjectLocalCliHandoff,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "0.4.79",
+  "version": "0.4.80",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {

package/src/boot/bootstrap.js

@@ -145,6 +145,7 @@ const gracefulShutdown = async (signal) => {
             catch (error) {
                 Logger.warn('Redis connection shutdown failed (continuing with app shutdown)', error);
             }
+            Logger.info('✅ Application shut down successfully');
         })(), shutdownBudgetMs, 'Graceful shutdown timed out');
         globalThis.clearTimeout(forceExitTimer);
         process.exit(0);

package/src/boot/registry/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/boot/registry/runtime.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AASvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AA2O9C,eAAO,MAAM,8BAA8B,GAAI,iBAAiB,gBAAgB,KAAG,IA6BlF,CAAC;AAqUF,eAAO,MAAM,eAAe,GAAI,QAAQ;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,gBAAgB,CAAC;IAClC,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACrC,KAAG;IAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CA0F7D,CAAC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/boot/registry/runtime.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AASvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AA2O9C,eAAO,MAAM,8BAA8B,GAAI,iBAAiB,gBAAgB,KAAG,IA6BlF,CAAC;AAqUF,eAAO,MAAM,eAAe,GAAI,QAAQ;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,gBAAgB,CAAC;IAClC,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACrC,KAAG;IAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAyF7D,CAAC"}

package/src/boot/registry/runtime.js

@@ -545,7 +545,6 @@ export const createLifecycle = (params) => {
             /* best-effort */
         }
         params.setBooted(false);
-        Logger.info('✅ Application shut down successfully');
     };
     return { boot, shutdown };
 };

package/src/cli/commands/WranglerProxyCommandUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WranglerProxyCommandUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/WranglerProxyCommandUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAarE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,2BAA2B,GAAG,cAAc,GAAG;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,+BAA+B,CAAC,OAAO,EAAE,QAAQ,SAAS,2BAA2B,IAAI;IAC5F,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC3E,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5C,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CACjD,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,SAAS,OAAO,EAAE,eAAe,MAAM,KAAG,IAIrF,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,OAAO,EAAE,QAAQ,SAAS,2BAA2B,EAC9F,OAAO,+BAA+B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACxD,YAuEF,CAAC"}
+{"version":3,"file":"WranglerProxyCommandUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/WranglerProxyCommandUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAerE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,2BAA2B,GAAG,cAAc,GAAG;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,+BAA+B,CAAC,OAAO,EAAE,QAAQ,SAAS,2BAA2B,IAAI;IAC5F,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC3E,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5C,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CACjD,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,SAAS,OAAO,EAAE,eAAe,MAAM,KAAG,IAIrF,CAAC;AA0BF,eAAO,MAAM,0BAA0B,GAAI,OAAO,EAAE,QAAQ,SAAS,2BAA2B,EAC9F,OAAO,+BAA+B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACxD,YAsFF,CAAC"}

package/src/cli/commands/WranglerProxyCommandUtils.js

@@ -1,15 +1,38 @@
 import { BaseCommand } from '../BaseCommand.js';
+import { withWranglerDevVarsSnapshot } from '../cloudflare/CloudflareWranglerDevEnv.js';
 import { maybeRunProxyWatchMode, parseIntOption } from '../commands/ProxyCommandUtils.js';
 import { ensureProxyEntrypoint, ensureWranglerConfig, renderProxyWranglerDevConfig, resolveConfigPath, } from '../commands/ProxyScaffoldUtils.js';
+import { EnvFileLoader } from '../utils/EnvFileLoader.js';
 import { SpawnUtil } from '../utils/spawn.js';
 import { Logger } from '../../config/logger.js';
-import { mkdirSync, writeFileSync } from '../../node-singletons/fs.js';
-import { join } from '../../node-singletons/path.js';
+import { existsSync, mkdirSync, writeFileSync } from '../../node-singletons/fs.js';
+import { dirname, join } from '../../node-singletons/path.js';
 export const addWranglerProxyBaseOptions = (command, defaultConfig) => {
     command.option('-c, --config <path>', 'Wrangler config file', defaultConfig);
     command.option('--port <port>', 'Local Wrangler dev port');
     command.option('--watch', 'Auto-restart proxy on file changes');
 };
+const findNearestPackageJsonDir = (cwd) => {
+    let current = cwd;
+    while (true) {
+        if (existsSync(join(current, 'package.json')))
+            return current;
+        const parent = dirname(current);
+        if (parent === current)
+            return undefined;
+        current = parent;
+    }
+};
+const resolveProxyProjectRoot = (cwd) => {
+    return findNearestPackageJsonDir(cwd) ?? cwd;
+};
+const ensureProxyEnvLoaded = (cwd, projectRoot) => {
+    EnvFileLoader.ensureLoaded({
+        cwd: projectRoot,
+        includeCwd: true,
+        ...(cwd === projectRoot ? {} : { extraCwds: [cwd] }),
+    });
+};
 export const createWranglerProxyCommand = (input) => {
     return BaseCommand.create({
         name: input.name,
@@ -21,6 +44,8 @@ export const createWranglerProxyCommand = (input) => {
             await maybeRunProxyWatchMode(typedOptions.watch);
             const port = parseIntOption(typedOptions.port, 'port');
             const cwd = process.cwd();
+            const projectRoot = resolveProxyProjectRoot(cwd);
+            ensureProxyEnvLoaded(cwd, projectRoot);
             const entrypoint = ensureProxyEntrypoint({
                 cwd,
                 entryFile: input.entryFile,
@@ -61,11 +86,19 @@ export const createWranglerProxyCommand = (input) => {
             if (port !== undefined) {
                 args.push('--port', String(port));
             }
-            const exitCode = await SpawnUtil.spawnAndWait({
-                command: 'wrangler',
-                args,
-                env: process.env,
-                forwardSignals: false,
+            const exitCode = await withWranglerDevVarsSnapshot({
+                cwd,
+                projectRoot,
+                envName: input.envName,
+                configPath,
+                runtimeEnv: process.env,
+            }, async () => {
+                return SpawnUtil.spawnAndWait({
+                    command: 'wrangler',
+                    args,
+                    env: process.env,
+                    forwardSignals: false,
+                });
             });
             if (exitCode !== 0) {
                 process.exit(exitCode);

package/src/index.js

@@ -1,11 +1,11 @@
 /**
- * @zintrust/core v0.4.79
+ * @zintrust/core v0.4.80
  *
  * ZinTrust Framework - Production-Grade TypeScript Backend
  * Built for performance, type safety, and exceptional developer experience
  *
  * Build Information:
- *   Built: 2026-04-08T11:45:55.486Z
+ *   Built: 2026-04-08T12:38:34.978Z
  *   Node: >=20.0.0
  *   License: MIT
  *
@@ -21,7 +21,7 @@
  * Available at runtime for debugging and health checks
  */
 export const ZINTRUST_VERSION = '0.1.41';
-export const ZINTRUST_BUILD_DATE = '2026-04-08T11:45:55.451Z'; // Replaced during build
+export const ZINTRUST_BUILD_DATE = '2026-04-08T12:38:34.943Z'; // Replaced during build
 export { Application } from './boot/Application.js';
 export { AwsSigV4 } from './common/index.js';
 export { SignedRequest } from './security/SignedRequest.js';

package/src/orm/migrations/MigrationStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationStore.d.ts","sourceRoot":"","sources":["../../../../src/orm/migrations/MigrationStore.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAI/C,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AA6dhG,eAAO,MAAM,cAAc;oBACH,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;8BAKzC,SAAS,UACN,cAAc,YACZ,MAAM,GACd,OAAO,CAAC,MAAM,CAAC;sBA4BZ,SAAS,SACN,cAAc,WACZ,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;sBAmDlC,SAAS,UACL;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAC9E,OAAO,CAAC,IAAI,CAAC;mBA2DV,SAAS,UACL;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,cAAc,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,qBAAqB,CAAC;QAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC3B,GACA,OAAO,CAAC,IAAI,CAAC;kCAmDV,SAAS,UACL;QAAE,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GACnE,OAAO,CAAC,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;8BA6C5C,SAAS,UACL;QAAE,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GACjD,OAAO,CAAC,MAAM,EAAE,CAAC;qBA0Bd,SAAS,UACL;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAC/D,OAAO,CAAC,IAAI,CAAC;EAmBhB,CAAC"}
+{"version":3,"file":"MigrationStore.d.ts","sourceRoot":"","sources":["../../../../src/orm/migrations/MigrationStore.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAI/C,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAkhBhG,eAAO,MAAM,cAAc;oBACH,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;8BAKzC,SAAS,UACN,cAAc,YACZ,MAAM,GACd,OAAO,CAAC,MAAM,CAAC;sBA4BZ,SAAS,SACN,cAAc,WACZ,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;sBAsBlC,SAAS,UACL;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAC9E,OAAO,CAAC,IAAI,CAAC;mBA2DV,SAAS,UACL;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,cAAc,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,qBAAqB,CAAC;QAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC3B,GACA,OAAO,CAAC,IAAI,CAAC;kCAmDV,SAAS,UACL;QAAE,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GACnE,OAAO,CAAC,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;8BA6C5C,SAAS,UACL;QAAE,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GACjD,OAAO,CAAC,MAAM,EAAE,CAAC;qBA0Bd,SAAS,UACL;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAC/D,OAAO,CAAC,IAAI,CAAC;EAmBhB,CAAC"}

package/src/orm/migrations/MigrationStore.js

@@ -205,6 +205,42 @@ const getLegacyBatch = (row) => {
 const getLegacyAppliedAt = (row) => {
     return typeof row['applied_at'] === 'string' ? row['applied_at'] : null;
 };
+const toLegacyMigrationRecord = (row, layout, scope, normalizedService) => {
+    const name = normalizeLegacyName(row);
+    const batch = getLegacyBatch(row);
+    if (name === '' || !Number.isFinite(batch))
+        return undefined;
+    return {
+        name,
+        scope: layout.hasScope ? scope : 'global',
+        service: layout.hasService ? normalizedService : '',
+        batch,
+        status: typeof row['status'] === 'string' ? row['status'] : 'completed',
+        appliedAt: getLegacyAppliedAt(row),
+    };
+};
+const buildLegacyAppliedMap = (rows, layout, scope, normalizedService) => {
+    const map = new Map();
+    for (const row of rows) {
+        const record = toLegacyMigrationRecord(row, layout, scope, normalizedService);
+        if (record === undefined)
+            continue;
+        map.set(record.name, record);
+    }
+    return map;
+};
+const buildAppliedMap = (rows) => {
+    const map = new Map();
+    for (const row of rows) {
+        if (typeof row.name !== 'string' || row.name.length === 0)
+            continue;
+        map.set(row.name, {
+            ...row,
+            service: toSafeService(row.service),
+        });
+    }
+    return map;
+};
 const getLegacyAppliedRows = async (db, layout, scope, service) => {
     const normalizedService = toSafeService(service);
     assertCompatibleTrackingTarget(layout, scope, normalizedService);
@@ -339,24 +375,7 @@ export const MigrationStore = Object.freeze({
         const layout = await resolveTableLayout(db);
         if (layout.requiresCompatibilityMode) {
             const rows = await getLegacyAppliedRows(db, layout, scope, normalizedService);
-            const map = new Map();
-            for (const row of rows) {
-                const name = normalizeLegacyName(row);
-                const batch = getLegacyBatch(row);
-                if (name === '' || !Number.isFinite(batch))
-                    continue;
-                map.set(name, {
-                    name,
-                    scope: layout.hasScope ? scope : 'global',
-                    service: layout.hasService ? normalizedService : '',
-                    batch,
-                    status: typeof row['status'] === 'string'
-                        ? row['status']
-                        : 'completed',
-                    appliedAt: getLegacyAppliedAt(row),
-                });
-            }
-            return map;
+            return buildLegacyAppliedMap(rows, layout, scope, normalizedService);
         }
         const rows = await QueryBuilder.create('migrations', db)
             .select('name', 'scope', 'service', 'batch', 'status')
@@ -364,16 +383,7 @@ export const MigrationStore = Object.freeze({
             .where('scope', '=', scope)
             .andWhere('service', '=', normalizedService)
             .get();
-        const map = new Map();
-        for (const r of rows) {
-            if (typeof r.name === 'string' && r.name.length > 0) {
-                map.set(r.name, {
-                    ...r,
-                    service: toSafeService(r.service),
-                });
-            }
-        }
-        return map;
+        return buildAppliedMap(rows);
     },
     async insertRunning(db, params) {
         assertDbSupportsMigrations(db);