@zintrust/core 0.4.5 → 0.4.6

package/package.json

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

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

@@ -1 +1 @@
-{"version":3,"file":"D1MigrateCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1MigrateCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA+GrE;;;GAGG;AAEH;;GAEG;AACH,eAAO,MAAM,gBAAgB;IAC3B;;OAEG;cACO,YAAY;EAyBtB,CAAC"}
+{"version":3,"file":"D1MigrateCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1MigrateCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA2HrE;;;GAGG;AAEH;;GAEG;AACH,eAAO,MAAM,gBAAgB;IAC3B;;OAEG;cACO,YAAY;EAyBtB,CAAC"}

package/src/cli/commands/D1MigrateCommand.js

@@ -21,7 +21,14 @@ const getDbName = (projectRoot, options) => {
     const value = options['database'];
     if (typeof value === 'string' && value.trim() !== '')
         return value.trim();
-    return WranglerConfig.getDefaultD1DatabaseName(projectRoot) ?? 'zintrust_db';
+    const resolution = WranglerConfig.resolveD1Database(projectRoot);
+    if (resolution.status === 'resolved') {
+        return WranglerConfig.getDefaultD1DatabaseName(projectRoot) ?? 'zintrust_db';
+    }
+    if (resolution.status === 'ambiguous') {
+        throw ErrorFactory.createCliError('Multiple D1 targets are configured. Re-run with --database <database_name|binding> to choose the intended Wrangler D1 target.');
+    }
+    return 'zintrust_db';
 };
 const buildExecutionContext = (options) => {
     const isWorkerCommand = process.argv.includes('d1:migrate:worker');

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

@@ -1 +1 @@
-{"version":3,"file":"MigrateCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MigrateCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0erE;;GAEG;AACH,eAAO,MAAM,cAAc;IACzB;;OAEG;cACO,YAAY;EAUtB,CAAC"}
+{"version":3,"file":"MigrateCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MigrateCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmfrE;;GAEG;AACH,eAAO,MAAM,cAAc;IACzB;;OAEG;cACO,YAAY;EAUtB,CAAC"}

package/src/cli/commands/MigrateCommand.js

@@ -169,9 +169,19 @@ const runD1Actions = async (params) => {
         cmd.warn('Note: MIGRATIONS_SEPARATE_TRACKING is ignored for D1 (Wrangler owns tracking).');
     }
     const isLocal = options['local'] === true || options['remote'] !== true;
-    const dbName = typeof options['database'] === 'string' && options['database'].trim() !== ''
-        ? options['database'].trim()
-        : (WranglerConfig.getDefaultD1DatabaseName(projectRoot) ?? 'zintrust_db');
+    let dbName = 'zintrust_db';
+    if (typeof options['database'] === 'string' && options['database'].trim() !== '') {
+        dbName = options['database'].trim();
+    }
+    else {
+        const resolution = WranglerConfig.resolveD1Database(projectRoot);
+        if (resolution.status === 'resolved') {
+            dbName = WranglerConfig.getDefaultD1DatabaseName(projectRoot) ?? 'zintrust_db';
+        }
+        else if (resolution.status === 'ambiguous') {
+            throw ErrorFactory.createCliError('Multiple D1 targets are configured. Re-run with --database <database_name|binding> to choose the intended Wrangler D1 target.');
+        }
+    }
     const migrationsRelDir = WranglerConfig.getD1MigrationsDir(projectRoot, dbName);
     const outputDir = path.join(projectRoot, migrationsRelDir);
     cmd.info(`Generating D1 SQL migrations into ${migrationsRelDir}...`);

package/src/cli/d1/LocalD1Resolver.d.ts

@@ -1,7 +1,8 @@
-import { type WranglerD1DatabaseConfig } from '../d1/WranglerConfig';
+import { type WranglerD1DatabaseConfig, type WranglerD1ResolutionMatch } from '../d1/WranglerConfig';
 type ResolvedD1Target = {
     config: WranglerD1DatabaseConfig;
     databaseName: string;
+    matchedBy: WranglerD1ResolutionMatch;
 };
 export declare const LocalD1Resolver: Readonly<{
     resolveD1Binding(projectRoot: string, target?: string): ResolvedD1Target;

package/src/cli/d1/LocalD1Resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LocalD1Resolver.d.ts","sourceRoot":"","sources":["../../../../src/cli/d1/LocalD1Resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,KAAK,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAUvF,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,wBAAwB,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AA+EF,eAAO,MAAM,eAAe;kCACI,MAAM,WAAW,MAAM,GAAG,gBAAgB;oCAIxC,MAAM,WAAW,MAAM,GAAG,gBAAgB;0CAU9B,MAAM,WAAW,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;EAoCrF,CAAC"}
+{"version":3,"file":"LocalD1Resolver.d.ts","sourceRoot":"","sources":["../../../../src/cli/d1/LocalD1Resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,wBAAwB,EAE7B,KAAK,yBAAyB,EAC/B,MAAM,wBAAwB,CAAC;AAYhC,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,wBAAwB,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,yBAAyB,CAAC;CACtC,CAAC;AAyHF,eAAO,MAAM,eAAe;kCACI,MAAM,WAAW,MAAM,GAAG,gBAAgB;oCAIxC,MAAM,WAAW,MAAM,GAAG,gBAAgB;0CAoB9B,MAAM,WAAW,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;EAoCrF,CAAC"}

package/src/cli/d1/LocalD1Resolver.js

@@ -1,41 +1,70 @@
+import { WranglerConfig, } from '../d1/WranglerConfig.js';
+import { WranglerD1 } from '../d1/WranglerD1.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-import { WranglerConfig } from '../d1/WranglerConfig.js';
-import { WranglerD1 } from '../d1/WranglerD1.js';
 import { isNonEmptyString } from '../../helper/index.js';
 import { randomUUID } from '../../node-singletons/crypto.js';
 import fs from '../../node-singletons/fs.js';
 import * as path from '../../node-singletons/path.js';
 import { SQLiteAdapter } from '../../orm/adapters/SQLiteAdapter.js';
 const PROBE_TABLE = '__zintrust_d1_probe';
-const describeConfiguredTargets = (projectRoot) => {
-    const configured = WranglerConfig.getD1Databases(projectRoot)
+const describeTarget = (database) => {
+    const parts = [];
+    if (isNonEmptyString(database.database_name)) {
+        parts.push(`database_name=${database.database_name.trim()}`);
+    }
+    if (isNonEmptyString(database.binding)) {
+        parts.push(`binding=${database.binding.trim()}`);
+    }
+    return parts.length > 0 ? parts.join(', ') : 'unnamed-d1-entry';
+};
+const describeTargets = (configured) => {
+    const rendered = configured
         .map((database) => {
-        const parts = [];
-        if (isNonEmptyString(database.database_name)) {
-            parts.push(`database_name=${database.database_name.trim()}`);
-        }
-        if (isNonEmptyString(database.binding)) {
-            parts.push(`binding=${database.binding.trim()}`);
-        }
-        return parts.length > 0 ? parts.join(', ') : 'unnamed-d1-entry';
+        return describeTarget(database);
     })
         .filter((entry) => entry.length > 0);
-    return configured.length > 0 ? configured.join(' | ') : 'none';
+    return rendered.length > 0 ? rendered.join(' | ') : 'none';
+};
+const getSelectionHint = (matchedBy) => {
+    if (matchedBy === 'database_name')
+        return 'database_name';
+    if (matchedBy === 'binding')
+        return 'binding';
+    return 'configured D1 entry';
+};
+const createResolutionError = (resolution) => {
+    const configuredTargets = describeTargets(resolution.configured);
+    const targetLabel = resolution.target ?? '';
+    if (resolution.status === 'ambiguous') {
+        if (resolution.matchedBy === 'multiple-configured') {
+            return ErrorFactory.createConfigError(`Multiple D1 targets are configured in wrangler.jsonc. Specify a target by database_name or binding. Configured D1 targets: ${configuredTargets}`);
+        }
+        return ErrorFactory.createConfigError(`D1 target "${targetLabel}" is ambiguous by ${getSelectionHint(resolution.matchedBy)}. Matching entries: ${describeTargets(resolution.matches)}. Configured D1 targets: ${configuredTargets}`);
+    }
+    if (resolution.target === undefined) {
+        return ErrorFactory.createConfigError(`Unable to resolve a default D1 target from wrangler.jsonc. Configured D1 targets: ${configuredTargets}`);
+    }
+    return ErrorFactory.createConfigError(`Unable to resolve D1 target "${targetLabel}" from wrangler.jsonc. Tried database_name first, then binding. Configured D1 targets: ${configuredTargets}`);
 };
 const resolveTarget = (projectRoot, target) => {
-    const config = WranglerConfig.getD1Database(projectRoot, target);
+    const resolution = WranglerConfig.resolveD1Database(projectRoot, target);
+    if (resolution.status !== 'resolved') {
+        throw createResolutionError(resolution);
+    }
+    const config = resolution.config;
     const configuredDatabaseName = config?.database_name?.trim();
     const configuredBindingName = config?.binding?.trim();
     const databaseName = configuredDatabaseName ??
         (isNonEmptyString(configuredBindingName) ? configuredBindingName : undefined);
-    if (config === undefined || !isNonEmptyString(databaseName)) {
-        throw ErrorFactory.createConfigError(`Unable to resolve D1 target "${target ?? ''}" from wrangler.jsonc. Configured D1 targets: ${describeConfiguredTargets(projectRoot)}`);
+    if (!isNonEmptyString(databaseName)) {
+        throw ErrorFactory.createConfigError(`Resolved D1 target is missing both database_name and binding. Configured D1 targets: ${describeTargets(WranglerConfig.getD1Databases(projectRoot))}`);
     }
-    return { config, databaseName };
+    return { config, databaseName, matchedBy: resolution.matchedBy };
 };
+const getLocalStateDir = (projectRoot) => path.join(projectRoot, '.wrangler', 'state', 'v3', 'd1', 'miniflare-D1DatabaseObject');
 const listCandidateSqliteFiles = (projectRoot) => {
-    const candidateDir = path.join(projectRoot, '.wrangler', 'state', 'v3', 'd1', 'miniflare-D1DatabaseObject');
+    const candidateDir = getLocalStateDir(projectRoot);
     if (!fs.existsSync(candidateDir))
         return [];
     return fs
@@ -66,6 +95,10 @@ export const LocalD1Resolver = Object.freeze({
     },
     ensureLocalD1Ready(projectRoot, target) {
         const resolved = resolveTarget(projectRoot, target);
+        Logger.info(`[LocalD1Resolver] Resolved D1 target (${resolved.matchedBy}): ${describeTarget(resolved.config)}`);
+        if (listCandidateSqliteFiles(projectRoot).length === 0) {
+            Logger.info(`[LocalD1Resolver] Local D1 state missing, bootstrapping with Wrangler for ${resolved.databaseName}`);
+        }
         WranglerD1.executeSql({
             dbName: resolved.databaseName,
             isLocal: true,
@@ -103,6 +136,6 @@ export const LocalD1Resolver = Object.freeze({
                 Logger.warn(`[LocalD1Resolver] Failed to remove D1 probe token: ${String(error)}`);
             }
         }
-        throw ErrorFactory.createConfigError(`Unable to resolve actual local D1 SQLite file for target "${resolved.databaseName}" under .wrangler/state/v3/d1/miniflare-D1DatabaseObject`);
+        throw ErrorFactory.createConfigError(`Unable to resolve actual local D1 SQLite file for target "${resolved.databaseName}" under ${getLocalStateDir(projectRoot)}. Resolved D1 target: ${describeTarget(resolved.config)}`);
     },
 });

package/src/cli/d1/WranglerConfig.d.ts

@@ -4,9 +4,30 @@ export type WranglerD1DatabaseConfig = {
     database_id?: string;
     migrations_dir?: string;
 };
+export type WranglerD1ResolutionMatch = 'database_name' | 'binding' | 'single-configured';
+export type WranglerD1DatabaseResolution = {
+    status: 'resolved';
+    target?: string;
+    config: WranglerD1DatabaseConfig;
+    matchedBy: WranglerD1ResolutionMatch;
+    configured: WranglerD1DatabaseConfig[];
+    matches: WranglerD1DatabaseConfig[];
+} | {
+    status: 'ambiguous';
+    target?: string;
+    matchedBy: 'database_name' | 'binding' | 'multiple-configured';
+    configured: WranglerD1DatabaseConfig[];
+    matches: WranglerD1DatabaseConfig[];
+} | {
+    status: 'missing';
+    target?: string;
+    configured: WranglerD1DatabaseConfig[];
+    matches: WranglerD1DatabaseConfig[];
+};
 export declare const WranglerConfig: Readonly<{
     getD1Databases(projectRoot: string): WranglerD1DatabaseConfig[];
     getD1Database(projectRoot: string, target?: string): WranglerD1DatabaseConfig | undefined;
+    resolveD1Database(projectRoot: string, target?: string): WranglerD1DatabaseResolution;
     getDefaultD1Database(projectRoot: string): WranglerD1DatabaseConfig | undefined;
     getDefaultD1DatabaseName(projectRoot: string): string | undefined;
     getD1MigrationsDir(projectRoot: string, dbName?: string): string;

package/src/cli/d1/WranglerConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WranglerConfig.d.ts","sourceRoot":"","sources":["../../../../src/cli/d1/WranglerConfig.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAuNF,eAAO,MAAM,cAAc;gCACG,MAAM,GAAG,wBAAwB,EAAE;+BAIpC,MAAM,WAAW,MAAM,GAAG,wBAAwB,GAAG,SAAS;sCAIvD,MAAM,GAAG,wBAAwB,GAAG,SAAS;0CAIzC,MAAM,GAAG,MAAM,GAAG,SAAS;oCAIjC,MAAM,WAAW,MAAM,GAAG,MAAM;EAIhE,CAAC"}
+{"version":3,"file":"WranglerConfig.d.ts","sourceRoot":"","sources":["../../../../src/cli/d1/WranglerConfig.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,eAAe,GAAG,SAAS,GAAG,mBAAmB,CAAC;AAE1F,MAAM,MAAM,4BAA4B,GACpC;IACE,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,wBAAwB,CAAC;IACjC,SAAS,EAAE,yBAAyB,CAAC;IACrC,UAAU,EAAE,wBAAwB,EAAE,CAAC;IACvC,OAAO,EAAE,wBAAwB,EAAE,CAAC;CACrC,GACD;IACE,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,qBAAqB,CAAC;IAC/D,UAAU,EAAE,wBAAwB,EAAE,CAAC;IACvC,OAAO,EAAE,wBAAwB,EAAE,CAAC;CACrC,GACD;IACE,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,wBAAwB,EAAE,CAAC;IACvC,OAAO,EAAE,wBAAwB,EAAE,CAAC;CACrC,CAAC;AA8TN,eAAO,MAAM,cAAc;gCACG,MAAM,GAAG,wBAAwB,EAAE;+BAIpC,MAAM,WAAW,MAAM,GAAG,wBAAwB,GAAG,SAAS;mCAI1D,MAAM,WAAW,MAAM,GAAG,4BAA4B;sCAInD,MAAM,GAAG,wBAAwB,GAAG,SAAS;0CAIzC,MAAM,GAAG,MAAM,GAAG,SAAS;oCAIjC,MAAM,WAAW,MAAM,GAAG,MAAM;EAIhE,CAAC"}

package/src/cli/d1/WranglerConfig.js

@@ -158,19 +158,106 @@ const getResolvedD1Name = (config) => {
         return config.binding.trim();
     return undefined;
 };
+const getBindingName = (config) => {
+    if (config === undefined || !isNonEmptyString(config.binding))
+        return undefined;
+    return config.binding.trim();
+};
+const getDatabaseName = (config) => {
+    if (config === undefined || !isNonEmptyString(config.database_name))
+        return undefined;
+    return config.database_name.trim();
+};
 const getD1Databases = (projectRoot) => {
     const parsed = readWranglerConfig(projectRoot);
     return Array.isArray(parsed?.d1_databases) ? parsed.d1_databases : [];
 };
-const getD1Database = (projectRoot, target) => {
-    const list = getD1Databases(projectRoot);
-    if (list.length === 0)
-        return undefined;
+const resolveImplicitD1Database = (configured, target) => {
+    if (configured.length === 1 && configured[0] !== undefined) {
+        return {
+            status: 'resolved',
+            target,
+            config: configured[0],
+            matchedBy: 'single-configured',
+            configured,
+            matches: [configured[0]],
+        };
+    }
+    return {
+        status: 'ambiguous',
+        target,
+        matchedBy: 'multiple-configured',
+        configured,
+        matches: configured,
+    };
+};
+const resolveTargetedD1Database = (configured, target) => {
+    const databaseNameMatches = configured.filter((database) => getDatabaseName(database) === target);
+    if (databaseNameMatches.length === 1 && databaseNameMatches[0] !== undefined) {
+        return {
+            status: 'resolved',
+            target,
+            config: databaseNameMatches[0],
+            matchedBy: 'database_name',
+            configured,
+            matches: databaseNameMatches,
+        };
+    }
+    if (databaseNameMatches.length > 1) {
+        return {
+            status: 'ambiguous',
+            target,
+            matchedBy: 'database_name',
+            configured,
+            matches: databaseNameMatches,
+        };
+    }
+    const bindingMatches = configured.filter((database) => getBindingName(database) === target);
+    if (bindingMatches.length === 1 && bindingMatches[0] !== undefined) {
+        return {
+            status: 'resolved',
+            target,
+            config: bindingMatches[0],
+            matchedBy: 'binding',
+            configured,
+            matches: bindingMatches,
+        };
+    }
+    if (bindingMatches.length > 1) {
+        return {
+            status: 'ambiguous',
+            target,
+            matchedBy: 'binding',
+            configured,
+            matches: bindingMatches,
+        };
+    }
+    return {
+        status: 'missing',
+        target,
+        configured,
+        matches: [],
+    };
+};
+const resolveD1Database = (projectRoot, target) => {
+    const configured = getD1Databases(projectRoot);
     const normalizedTarget = normalizeTarget(target);
-    if (normalizedTarget === undefined)
-        return list[0] ?? undefined;
-    return list.find((database) => database.binding?.trim() === normalizedTarget ||
-        database.database_name?.trim() === normalizedTarget);
+    if (configured.length === 0) {
+        return {
+            status: 'missing',
+            target: normalizedTarget,
+            configured,
+            matches: [],
+        };
+    }
+    if (normalizedTarget === undefined) {
+        return resolveImplicitD1Database(configured, normalizedTarget);
+    }
+    return resolveTargetedD1Database(configured, normalizedTarget);
+};
+const getD1Database = (projectRoot, target) => {
+    const resolution = resolveD1Database(projectRoot, target);
+    return resolution.status === 'resolved' ? resolution.config : undefined;
 };
 export const WranglerConfig = Object.freeze({
     getD1Databases(projectRoot) {
@@ -179,6 +266,9 @@ export const WranglerConfig = Object.freeze({
     getD1Database(projectRoot, target) {
         return getD1Database(projectRoot, target);
     },
+    resolveD1Database(projectRoot, target) {
+        return resolveD1Database(projectRoot, target);
+    },
     getDefaultD1Database(projectRoot) {
         return getD1Database(projectRoot);
     },

package/src/index.js

@@ -1,11 +1,11 @@
 /**
- * @zintrust/core v0.4.5
+ * @zintrust/core v0.4.6
  *
  * ZinTrust Framework - Production-Grade TypeScript Backend
  * Built for performance, type safety, and exceptional developer experience
  *
  * Build Information:
- *   Built: 2026-03-21T11:25:25.434Z
+ *   Built: 2026-03-21T13:48:56.018Z
  *   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-03-21T11:25:25.402Z'; // Replaced during build
+export const ZINTRUST_BUILD_DATE = '2026-03-21T13:48:55.987Z'; // Replaced during build
 export { Application } from './boot/Application.js';
 export { AwsSigV4 } from './common/index.js';
 export { SignedRequest } from './security/SignedRequest.js';