@zintrust/core 0.4.79 → 0.4.81

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;AAOH,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA0WF,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzC;AAED,eAAO,MAAM,mBAAmB;;qCAzUQ,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;EAqTlC,CAAC;AAEH,OAAO,EAAE,CAAC"}

package/bin/zintrust-main.js

@@ -4,12 +4,20 @@
  * This module contains the CLI implementation without a hashbang so that it can
  * 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';
 const CLI_HANDOFF_ENV_KEY = 'ZINTRUST_CLI_HANDOFF';
+const loadLogger = async () => {
+    try {
+        const { Logger } = await import('../src/config/logger.js');
+        return Logger;
+    }
+    catch {
+        return undefined;
+    }
+};
 const getCurrentPackageRoot = () => {
     return path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 };
@@ -65,24 +73,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 = () => {
@@ -168,18 +207,22 @@ const shouldDeferPluginAutoImportWarnings = (args) => {
     const command = getPrimaryCommand(args);
     return command === 'start' || command === 's';
 };
-const logPluginAutoImportFailure = (args, scope, details) => {
+const logPluginAutoImportFailure = async (args, scope, details) => {
+    const logger = await loadLogger();
+    if (logger === undefined)
+        return;
     if (shouldDeferPluginAutoImportWarnings(args)) {
-        Logger.debug(`${scope} plugin auto-import advisory deferred to runtime bootstrap`, {
+        logger.debug(`${scope} plugin auto-import advisory deferred to runtime bootstrap`, {
             details,
         });
         return;
     }
-    Logger.warn(`${scope} plugin auto-imports failed:`, details);
+    logger.warn(`${scope} plugin auto-imports failed:`, details);
 };
 const handleCliFatal = async (error, context) => {
     try {
-        Logger.error(context, error);
+        const logger = await loadLogger();
+        logger?.error(context, error);
     }
     catch {
         // best-effort logging
@@ -195,7 +238,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.
@@ -228,11 +271,11 @@ const runCliInternal = async () => {
         const runtimeImportMode = process.env['DOCKER_WORKER'] === 'true' ? 'worker' : 'base';
         const officialImports = await PluginAutoImports.tryImportRuntimeAutoImports(runtimeImportMode);
         if (!officialImports.ok) {
-            logPluginAutoImportFailure(args0, 'Official', officialImports.errorMessage);
+            await logPluginAutoImportFailure(args0, 'Official', officialImports.errorMessage);
         }
         const projectImports = await PluginAutoImports.tryImportProjectAutoImports();
         if (!projectImports.ok && projectImports.reason !== 'not-found') {
-            logPluginAutoImportFailure(args0, 'Project', projectImports.errorMessage);
+            await logPluginAutoImportFailure(args0, 'Project', projectImports.errorMessage);
         }
     }
     catch {
@@ -266,8 +309,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.81",
   "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/D1ProxyCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"D1ProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1ProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmHrD,eAAO,MAAM,cAAc;cACf,YAAY;EAkBtB,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"D1ProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1ProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAkIrD,eAAO,MAAM,cAAc;cACf,YAAY;EAkBtB,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/src/cli/commands/D1ProxyCommand.js

@@ -66,6 +66,17 @@ const warnOnPlaceholderDatabaseId = (values) => {
         return;
     Logger.warn('Could not resolve a D1 database id automatically. Update wrangler.jsonc or pass --database-id before relying on the generated d1-proxy environment.');
 };
+const warnOnMissingSigningSecret = () => {
+    const directSecret = trimNonEmptyOption(Env.get('D1_REMOTE_SECRET', ''));
+    const fallbackSecret = trimNonEmptyOption(Env.get('APP_KEY', ''));
+    if (directSecret !== undefined || fallbackSecret !== undefined)
+        return;
+    Logger.warn('D1 proxy signing will fail: the resolved project env does not expose D1_REMOTE_SECRET or APP_KEY to the Worker runtime. Signed requests will be rejected with 401 CONFIG_ERROR until one of those keys is set.');
+};
+const runD1ProxyDiagnostics = (values) => {
+    warnOnPlaceholderDatabaseId(values);
+    warnOnMissingSigningSecret();
+};
 const addOptions = (command) => {
     addWranglerProxyBaseOptions(command, DEFAULT_CONFIG);
     command.option('--binding <name>', 'D1 binding name', DEFAULT_BINDING);
@@ -88,7 +99,7 @@ export const D1ProxyCommand = Object.freeze({
             addOptions,
             resolveValues: resolveConfigValues,
             renderEnvBlock: renderD1ProxyEnvBlock,
-            afterConfigResolved: warnOnPlaceholderDatabaseId,
+            afterConfigResolved: runD1ProxyDiagnostics,
         });
     },
 });

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

@@ -1 +1 @@
-{"version":3,"file":"MongoDBProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MongoDBProxyCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4DpC,eAAO,MAAM,mBAAmB;cACpB,OAAO;EAoEjB,CAAC"}
+{"version":3,"file":"MongoDBProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MongoDBProxyCommand.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4DpC,eAAO,MAAM,mBAAmB;cACpB,OAAO;EA0EjB,CAAC"}

package/src/cli/commands/MongoDBProxyCommand.js

@@ -1,6 +1,7 @@
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { ensureProxyEnvLoadedForCwd } from '../commands/ProxyCommandUtils.js';
 import { Command } from 'commander';
 const startWatchMode = async (options) => {
     Logger.info('Starting MongoDB proxy in watch mode...');
@@ -57,13 +58,14 @@ export const MongoDBProxyCommand = Object.freeze({
         const cmd = new Command('proxy:mongodb');
         cmd.description('Start MongoDB HTTP proxy server');
         const configureOptions = () => {
+            ensureProxyEnvLoadedForCwd();
             cmd.option('--host <host>', 'Proxy host', Env.get('MONGODB_PROXY_HOST', '127.0.0.1'));
             cmd.option('--port <port>', 'Proxy port', String(Env.getInt('MONGODB_PROXY_PORT', 8792)));
             cmd.option('--mongo-uri <uri>', 'MongoDB connection URI', Env.get('MONGO_URI', ''));
             cmd.option('--mongo-db <database>', 'MongoDB database name', Env.get('MONGO_DB', ''));
             cmd.option('--key-id <keyId>', 'Signing key ID', Env.get('MONGODB_PROXY_KEY_ID', 'default'));
             cmd.option('--secret <secret>', 'Signing secret', Env.get('MONGODB_PROXY_SECRET', ''));
-            cmd.option('--require-signing', 'Require request signing', Env.MONGODB_PROXY_REQUIRE_SIGNING);
+            cmd.option('--require-signing', 'Require request signing', Env.getBool('MONGODB_PROXY_REQUIRE_SIGNING', true));
             cmd.option('--signing-window-ms <ms>', 'Signing window in milliseconds', String(Env.getInt('MONGODB_PROXY_SIGNING_WINDOW_MS', 60000)));
             cmd.option('--watch', 'Watch mode: restart on file changes');
         };

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

@@ -1 +1 @@
-{"version":3,"file":"MySqlProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MySqlProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0BrE,eAAO,MAAM,iBAAiB;cAClB,YAAY;EAatB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"MySqlProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MySqlProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAgCrE,eAAO,MAAM,iBAAiB;cAClB,YAAY;EAatB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/src/cli/commands/MySqlProxyCommand.js

@@ -1,17 +1,19 @@
 import { BaseCommand } from '../BaseCommand.js';
+import { ensureProxyEnvLoadedForCwd } from '../commands/ProxyCommandUtils.js';
 import { addSqlProxyOptions, runSqlProxyCommand, } from '../commands/SqlProxyCommandUtils.js';
 import { Env } from '../../config/env.js';
 import { MySqlProxyServer } from '../../proxy/mysql/MySqlProxyServer.js';
 const addOptions = (command) => {
+    ensureProxyEnvLoadedForCwd();
     addSqlProxyOptions(command, {
-        hostDefault: Env.MYSQL_PROXY_HOST,
-        portDefault: Env.MYSQL_PROXY_PORT,
-        maxBodyBytesDefault: Env.MYSQL_PROXY_MAX_BODY_BYTES,
+        hostDefault: Env.get('MYSQL_PROXY_HOST', '127.0.0.1'),
+        portDefault: Env.getInt('MYSQL_PROXY_PORT', 8789),
+        maxBodyBytesDefault: Env.getInt('MYSQL_PROXY_MAX_BODY_BYTES', 131072),
         dbVendorLabel: 'MySQL',
-        requireSigningDefault: Env.MYSQL_PROXY_REQUIRE_SIGNING,
-        keyIdDefault: Env.MYSQL_PROXY_KEY_ID,
-        secretDefault: Env.MYSQL_PROXY_SECRET,
-        signingWindowMsDefault: Env.MYSQL_PROXY_SIGNING_WINDOW_MS,
+        requireSigningDefault: Env.getBool('MYSQL_PROXY_REQUIRE_SIGNING', true),
+        keyIdDefault: Env.get('MYSQL_PROXY_KEY_ID', Env.get('APP_NAME', 'ZinTrust')),
+        secretDefault: Env.get('MYSQL_PROXY_SECRET', Env.get('APP_KEY', '')),
+        signingWindowMsDefault: Env.getInt('MYSQL_PROXY_SIGNING_WINDOW_MS', Env.getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
     });
 };
 export const MySqlProxyCommand = Object.freeze({

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

@@ -1 +1 @@
-{"version":3,"file":"PostgresProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/PostgresProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0BrE,eAAO,MAAM,oBAAoB;cACrB,YAAY;EAatB,CAAC;AAEH,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"PostgresProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/PostgresProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAgCrE,eAAO,MAAM,oBAAoB;cACrB,YAAY;EAatB,CAAC;AAEH,eAAe,oBAAoB,CAAC"}

package/src/cli/commands/PostgresProxyCommand.js

@@ -1,17 +1,19 @@
 import { BaseCommand } from '../BaseCommand.js';
+import { ensureProxyEnvLoadedForCwd } from '../commands/ProxyCommandUtils.js';
 import { addSqlProxyOptions, runSqlProxyCommand, } from '../commands/SqlProxyCommandUtils.js';
 import { Env } from '../../config/env.js';
 import { PostgresProxyServer } from '../../proxy/postgres/PostgresProxyServer.js';
 const addOptions = (command) => {
+    ensureProxyEnvLoadedForCwd();
     addSqlProxyOptions(command, {
-        hostDefault: Env.POSTGRES_PROXY_HOST,
-        portDefault: Env.POSTGRES_PROXY_PORT,
-        maxBodyBytesDefault: Env.POSTGRES_PROXY_MAX_BODY_BYTES,
+        hostDefault: Env.get('POSTGRES_PROXY_HOST', '127.0.0.1'),
+        portDefault: Env.getInt('POSTGRES_PROXY_PORT', 8790),
+        maxBodyBytesDefault: Env.getInt('POSTGRES_PROXY_MAX_BODY_BYTES', 131072),
         dbVendorLabel: 'PostgreSQL',
-        requireSigningDefault: Env.POSTGRES_PROXY_REQUIRE_SIGNING,
-        keyIdDefault: Env.POSTGRES_PROXY_KEY_ID,
-        secretDefault: Env.POSTGRES_PROXY_SECRET,
-        signingWindowMsDefault: Env.POSTGRES_PROXY_SIGNING_WINDOW_MS,
+        requireSigningDefault: Env.getBool('POSTGRES_PROXY_REQUIRE_SIGNING', true),
+        keyIdDefault: Env.get('POSTGRES_PROXY_KEY_ID', Env.get('APP_NAME', 'ZinTrust')),
+        secretDefault: Env.get('POSTGRES_PROXY_SECRET', Env.get('APP_KEY', '')),
+        signingWindowMsDefault: Env.getInt('POSTGRES_PROXY_SIGNING_WINDOW_MS', Env.getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
     });
 };
 export const PostgresProxyCommand = Object.freeze({

package/src/cli/commands/ProxyCommandUtils.d.ts

@@ -1,6 +1,8 @@
 type NumberExpectation = 'positive' | 'non-negative';
 export declare const parseIntOption: (raw: string | undefined, name: string, expectation?: NumberExpectation) => number | undefined;
 export declare const trimOption: (value: string | undefined) => string | undefined;
+export declare const resolveProxyProjectRoot: (cwd: string) => string;
+export declare const ensureProxyEnvLoadedForCwd: (cwd?: string) => string;
 export declare const maybeRunProxyWatchMode: (watch: boolean | undefined) => Promise<void>;
 export {};
 //# sourceMappingURL=ProxyCommandUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ProxyCommandUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ProxyCommandUtils.ts"],"names":[],"mappings":"AAIA,KAAK,iBAAiB,GAAG,UAAU,GAAG,cAAc,CAAC;AAErD,eAAO,MAAM,cAAc,GACzB,KAAK,MAAM,GAAG,SAAS,EACvB,MAAM,MAAM,EACZ,cAAa,iBAA8B,KAC1C,MAAM,GAAG,SAeX,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAA0B,CAAC;AAU3F,eAAO,MAAM,sBAAsB,GAAU,OAAO,OAAO,GAAG,SAAS,KAAG,OAAO,CAAC,IAAI,CAerF,CAAC"}
+{"version":3,"file":"ProxyCommandUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ProxyCommandUtils.ts"],"names":[],"mappings":"AAMA,KAAK,iBAAiB,GAAG,UAAU,GAAG,cAAc,CAAC;AAErD,eAAO,MAAM,cAAc,GACzB,KAAK,MAAM,GAAG,SAAS,EACvB,MAAM,MAAM,EACZ,cAAa,iBAA8B,KAC1C,MAAM,GAAG,SAeX,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAA0B,CAAC;AAc3F,eAAO,MAAM,uBAAuB,GAAI,KAAK,MAAM,KAAG,MAErD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,MAAK,MAAsB,KAAG,MAUxE,CAAC;AAUF,eAAO,MAAM,sBAAsB,GAAU,OAAO,OAAO,GAAG,SAAS,KAAG,OAAO,CAAC,IAAI,CAerF,CAAC"}

package/src/cli/commands/ProxyCommandUtils.js

@@ -1,5 +1,7 @@
+import { EnvFileLoader } from '../utils/EnvFileLoader.js';
 import { SpawnUtil } from '../utils/spawn.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { existsSync } from '../../node-singletons/fs.js';
 import * as path from '../../node-singletons/path.js';
 export const parseIntOption = (raw, name, expectation = 'positive') => {
     if (raw === undefined)
@@ -15,6 +17,29 @@ export const parseIntOption = (raw, name, expectation = 'positive') => {
     return parsed;
 };
 export const trimOption = (value) => value?.trim();
+const findNearestPackageJsonDir = (cwd) => {
+    let current = cwd;
+    while (true) {
+        if (existsSync(path.join(current, 'package.json')))
+            return current;
+        const parent = path.dirname(current);
+        if (parent === current)
+            return undefined;
+        current = parent;
+    }
+};
+export const resolveProxyProjectRoot = (cwd) => {
+    return findNearestPackageJsonDir(cwd) ?? cwd;
+};
+export const ensureProxyEnvLoadedForCwd = (cwd = process.cwd()) => {
+    const projectRoot = resolveProxyProjectRoot(cwd);
+    EnvFileLoader.ensureLoaded({
+        cwd: projectRoot,
+        includeCwd: true,
+        ...(cwd === projectRoot ? {} : { extraCwds: [cwd] }),
+    });
+    return projectRoot;
+};
 const isWatchChild = () => process.env['ZINTRUST_PROXY_WATCH_CHILD'] === '1';
 const buildWatchArgs = () => {
     const rawArgs = process.argv.slice(2);

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

@@ -1 +1 @@
-{"version":3,"file":"RedisProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/RedisProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmDrE,eAAO,MAAM,iBAAiB;cAClB,YAAY;EAoCtB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"RedisProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/RedisProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0DrE,eAAO,MAAM,iBAAiB;cAClB,YAAY;EAoCtB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/src/cli/commands/RedisProxyCommand.js

@@ -1,8 +1,9 @@
 import { BaseCommand } from '../BaseCommand.js';
-import { maybeRunProxyWatchMode, parseIntOption, trimOption, } from '../commands/ProxyCommandUtils.js';
+import { ensureProxyEnvLoadedForCwd, maybeRunProxyWatchMode, parseIntOption, trimOption, } from '../commands/ProxyCommandUtils.js';
 import { Env } from '../../config/env.js';
 import { RedisProxyServer } from '../../proxy/redis/RedisProxyServer.js';
 const addOptions = (command) => {
+    ensureProxyEnvLoadedForCwd();
     command.option('--host <host>', 'Host to bind', Env.get('REDIS_PROXY_HOST', '127.0.0.1'));
     command.option('--port <port>', 'Port to bind', String(Env.getInt('REDIS_PROXY_PORT', 8791)));
     command.option('--max-body-bytes <bytes>', 'Max request size in bytes', String(Env.getInt('REDIS_PROXY_MAX_BODY_BYTES', 131072)));
@@ -11,7 +12,7 @@ const addOptions = (command) => {
     command.option('--redis-port <port>', 'Redis port');
     command.option('--redis-password <password>', 'Redis password');
     command.option('--redis-db <db>', 'Redis database');
-    command.option('--require-signing', 'Require signed requests', Env.REDIS_PROXY_REQUIRE_SIGNING);
+    command.option('--require-signing', 'Require signed requests', Env.getBool('REDIS_PROXY_REQUIRE_SIGNING', true));
     command.option('--key-id <id>', 'Signing key id', Env.get('REDIS_PROXY_KEY_ID', ''));
     command.option('--secret <secret>', 'Signing secret', Env.get('REDIS_PROXY_SECRET', ''));
     command.option('--signing-window-ms <ms>', 'Signing time window in ms', String(Env.getInt('REDIS_PROXY_SIGNING_WINDOW_MS', 60000)));

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

@@ -1 +1 @@
-{"version":3,"file":"SmtpProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/SmtpProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAyDrE,eAAO,MAAM,gBAAgB;cACjB,YAAY;EAsCtB,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"SmtpProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/SmtpProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA4DrE,eAAO,MAAM,gBAAgB;cACjB,YAAY;EAsCtB,CAAC;AAEH,eAAe,gBAAgB,CAAC"}

package/src/cli/commands/SmtpProxyCommand.js

@@ -1,8 +1,9 @@
 import { BaseCommand } from '../BaseCommand.js';
-import { maybeRunProxyWatchMode, parseIntOption, trimOption, } from '../commands/ProxyCommandUtils.js';
+import { ensureProxyEnvLoadedForCwd, maybeRunProxyWatchMode, parseIntOption, trimOption, } from '../commands/ProxyCommandUtils.js';
 import { Env } from '../../config/env.js';
 import { SmtpProxyServer } from '../../proxy/smtp/SmtpProxyServer.js';
 const addOptions = (command) => {
+    ensureProxyEnvLoadedForCwd();
     command.option('--host <host>', 'Host to bind', Env.get('SMTP_PROXY_HOST', '127.0.0.1'));
     command.option('--port <port>', 'Port to bind', String(Env.getInt('SMTP_PROXY_PORT', 8794)));
     command.option('--max-body-bytes <bytes>', 'Max request size in bytes', String(Env.getInt('SMTP_PROXY_MAX_BODY_BYTES', 131072)));

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

@@ -1 +1 @@
-{"version":3,"file":"SqlServerProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/SqlServerProxyCommand.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2DpC,eAAO,MAAM,qBAAqB;cACtB,OAAO;EAsEjB,CAAC"}
+{"version":3,"file":"SqlServerProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/SqlServerProxyCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2DpC,eAAO,MAAM,qBAAqB;cACtB,OAAO;EAwEjB,CAAC"}

package/src/cli/commands/SqlServerProxyCommand.js

@@ -1,4 +1,5 @@
 import { Env } from '../../config/env.js';
+import { ensureProxyEnvLoadedForCwd } from '../commands/ProxyCommandUtils.js';
 import { Logger } from '../../config/logger.js';
 import { Command } from 'commander';
 const startWatchMode = async (options) => {
@@ -39,6 +40,7 @@ export const SqlServerProxyCommand = Object.freeze({
         const cmd = new Command('proxy:sqlserver');
         cmd.description('Start SQL Server HTTP proxy server');
         const configureOptions = () => {
+            ensureProxyEnvLoadedForCwd();
             cmd.option('--host <host>', 'Proxy host', Env.get('SQLSERVER_PROXY_HOST', '127.0.0.1'));
             cmd.option('--port <port>', 'Proxy port', String(Env.getInt('SQLSERVER_PROXY_PORT', 8793)));
             cmd.option('--db-host <host>', 'SQL Server host', Env.get('DB_HOST_MSSQL', '127.0.0.1'));
@@ -49,7 +51,7 @@ export const SqlServerProxyCommand = Object.freeze({
             cmd.option('--connection-limit <limit>', 'Connection pool limit', String(Env.getInt('SQLSERVER_PROXY_POOL_LIMIT', 10)));
             cmd.option('--key-id <keyId>', 'Signing key ID', Env.get('SQLSERVER_PROXY_KEY_ID', 'default'));
             cmd.option('--secret <secret>', 'Signing secret', Env.get('SQLSERVER_PROXY_SECRET', ''));
-            cmd.option('--require-signing', 'Require request signing', Env.SQLSERVER_PROXY_REQUIRE_SIGNING);
+            cmd.option('--require-signing', 'Require request signing', Env.getBool('SQLSERVER_PROXY_REQUIRE_SIGNING', true));
             cmd.option('--signing-window-ms <ms>', 'Signing window in milliseconds', String(Env.getInt('SQLSERVER_PROXY_SIGNING_WINDOW_MS', 60000)));
             cmd.option('--watch', 'Watch mode: restart on file changes');
         };

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;AAkBrE,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;AAMF,eAAO,MAAM,0BAA0B,GAAI,OAAO,EAAE,QAAQ,SAAS,2BAA2B,EAC9F,OAAO,+BAA+B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACxD,YAoFF,CAAC"}

package/src/cli/commands/WranglerProxyCommandUtils.js

@@ -1,15 +1,19 @@
 import { BaseCommand } from '../BaseCommand.js';
-import { maybeRunProxyWatchMode, parseIntOption } from '../commands/ProxyCommandUtils.js';
+import { withWranglerDevVarsSnapshot } from '../cloudflare/CloudflareWranglerDevEnv.js';
+import { ensureProxyEnvLoadedForCwd, maybeRunProxyWatchMode, parseIntOption, } from '../commands/ProxyCommandUtils.js';
 import { ensureProxyEntrypoint, ensureWranglerConfig, renderProxyWranglerDevConfig, resolveConfigPath, } from '../commands/ProxyScaffoldUtils.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 { 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 toRootedProxyConfigContent = (content) => {
+    return content.replaceAll('": "../../', '": "./');
+};
 export const createWranglerProxyCommand = (input) => {
     return BaseCommand.create({
         name: input.name,
@@ -21,6 +25,7 @@ export const createWranglerProxyCommand = (input) => {
             await maybeRunProxyWatchMode(typedOptions.watch);
             const port = parseIntOption(typedOptions.port, 'port');
             const cwd = process.cwd();
+            const projectRoot = ensureProxyEnvLoadedForCwd(cwd);
             const entrypoint = ensureProxyEntrypoint({
                 cwd,
                 entryFile: input.entryFile,
@@ -47,25 +52,32 @@ export const createWranglerProxyCommand = (input) => {
             }
             input.afterConfigResolved?.(result.values);
             const proxyConfigContent = renderProxyWranglerDevConfig(result.content, input.envName);
-            const proxyConfigDir = join(cwd, '.wrangler', 'tmp');
-            const proxyConfigPath = join(proxyConfigDir, `zin.proxy.${input.envName}.jsonc`);
+            const proxyConfigDir = cwd;
+            const proxyConfigPath = join(proxyConfigDir, `.zin.proxy.${input.envName}.jsonc`);
             if (proxyConfigContent !== undefined) {
                 mkdirSync(proxyConfigDir, { recursive: true });
-                writeFileSync(proxyConfigPath, proxyConfigContent, 'utf-8');
+                writeFileSync(proxyConfigPath, toRootedProxyConfigContent(proxyConfigContent), 'utf-8');
             }
-            const args = [
-                'dev',
-                '--config',
-                proxyConfigContent === undefined ? configPath : proxyConfigPath,
-            ];
+            const wranglerRunConfigPath = proxyConfigContent === undefined ? configPath : proxyConfigPath;
+            const wranglerDevVarsCwd = proxyConfigContent === undefined ? cwd : dirname(proxyConfigPath);
+            const wranglerDevVarsEnvName = proxyConfigContent === undefined ? input.envName : '';
+            const args = ['dev', '--config', wranglerRunConfigPath];
             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: wranglerDevVarsCwd,
+                projectRoot,
+                envName: wranglerDevVarsEnvName,
+                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.81
  *
  * 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-08T13:57:15.723Z
  *   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-08T13:57:15.665Z'; // 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);