@zintrust/d1-migrator 0.4.6 → 0.4.27

package/dist/build-manifest.json

@@ -1,15 +1,15 @@
 {
   "name": "@zintrust/d1-migrator",
-  "version": "0.1.0",
-  "buildDate": "2026-03-20T13:11:40.471Z",
+  "version": "0.4.6",
+  "buildDate": "2026-03-26T14:37:09.731Z",
   "buildEnvironment": {
     "node": "v22.22.1",
     "platform": "darwin",
     "arch": "arm64"
   },
   "git": {
-    "commit": "e0e7e31c",
-    "branch": "release"
+    "commit": "94caf69e",
+    "branch": "dev"
   },
   "package": {
     "engines": {
@@ -29,7 +29,7 @@
   "files": {
     "build-manifest.json": {
       "size": 5804,
-      "sha256": "d093f50bf4b90acf6721932a0c2a3eb6a27a3790a38947e80b653ea5a3e67726"
+      "sha256": "1a153aa3e004070aed4f7808720ef934e5c668a128cb293efe8fc6998156b4a1"
     },
     "cli/DataMigrator.d.ts": {
       "size": 3355,
@@ -37,23 +37,23 @@
     },
     "cli/DataMigrator.d.ts.map": {
       "size": 2120,
-      "sha256": "a5014c02e70e462fd5729418e1bf1b3d4823105bb37512f43b82c609cc4970a0"
+      "sha256": "6fb9eade2112a8985f9a86ecf5bd3c4a5cc9504fabb55b75ee43ad000e27226d"
     },
     "cli/DataMigrator.js": {
-      "size": 17563,
-      "sha256": "ea88b7ee3d2f2696a6b55d420fb90cb87cf2a27bc98efd495b286f2f31ace69b"
+      "size": 18347,
+      "sha256": "7325cdb942ee70b1cdfa584f386c9b1081178ef07ad937779dfae87979b627f8"
     },
     "cli/MigrateToD1Command.d.ts": {
       "size": 1589,
       "sha256": "c1bffb405e91cc1ff61507a51bf80baaeb89ce5a1a98ae591ecaa8e35450a8d2"
     },
     "cli/MigrateToD1Command.d.ts.map": {
-      "size": 1232,
-      "sha256": "3101b87c31658e34a9e25b703e40b6918b293e7310fbd57bddee3f48e9390fab"
+      "size": 1233,
+      "sha256": "884676d4ce94415255ec848e8466efa2d69265c3ad015b4b287fea7f4fc16a37"
     },
     "cli/MigrateToD1Command.js": {
-      "size": 25636,
-      "sha256": "8a9c816b014648a0afd0a2a7fde150a00c124b240e08fdf51023753249793f73"
+      "size": 28588,
+      "sha256": "07dce8e69a7a328bcf058fd002d468998593d46ae09cc00913cbb512486f4cfd"
     },
     "cli/ProgressTracker.d.ts": {
       "size": 942,
@@ -88,8 +88,8 @@
       "sha256": "685c4e8b49c8a86f53feacb7c42e3b8268b9402ae3ae7e47cb46e7b78a9bf78b"
     },
     "index.js": {
-      "size": 1204,
-      "sha256": "a4c5cc454b6a6ebd61ec92822d3147b75a39c588f518bb2bb4c9c6f824d73bf9"
+      "size": 1262,
+      "sha256": "d6350a9e6bff776ea2eb44370180a29cee46c2951ca3077fe21d0728ef41c48c"
     },
     "register.d.ts": {
       "size": 159,

package/dist/cli/MigrateToD1Command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrateToD1Command.d.ts","sourceRoot":"","sources":["../../src/cli/MigrateToD1Command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAOhD,KAAK,iBAAiB,GAAG;IACvB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,IAAI,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACxC,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;CAC/B,CAAC;AAubF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,iBAgG/B,CAAC;AAEH;;GAEG;AACH,iBAAe,gBAAgB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CActE;AAED;;GAEG;AACH,iBAAe,kBAAkB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAkGxE;AAED;;GAEG;AACH,iBAAe,gBAAgB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAiGtE;AAED;;GAEG;AACH,iBAAS,cAAc,CAAC,MAAM,EAAE,eAAe,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CA2BrF;AAGD,eAAO,MAAM,iBAAiB;;;;;EAK5B,CAAC"}
+{"version":3,"file":"MigrateToD1Command.d.ts","sourceRoot":"","sources":["../../src/cli/MigrateToD1Command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAOhD,KAAK,iBAAiB,GAAG;IACvB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,IAAI,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACxC,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;CAC/B,CAAC;AAkgBF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,iBAgG/B,CAAC;AAEH;;GAEG;AACH,iBAAe,gBAAgB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CActE;AAED;;GAEG;AACH,iBAAe,kBAAkB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAkGxE;AAED;;GAEG;AACH,iBAAe,gBAAgB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAiGtE;AAED;;GAEG;AACH,iBAAS,cAAc,CAAC,MAAM,EAAE,eAAe,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CA2BrF;AAGD,eAAO,MAAM,iBAAiB;;;;;EAK5B,CAAC"}

package/dist/cli/MigrateToD1Command.js

@@ -2,7 +2,7 @@
  * Migrate to D1 Command
  * CLI command for migrating databases to Cloudflare D1
  */
-import { ErrorFactory, Logger } from '@zintrust/core';
+import { ErrorFactory, Logger, WranglerConfig } from '@zintrust/core';
 import { BaseCommand } from '@zintrust/core/cli';
 import { SchemaBuilder } from '../schema/SchemaBuilder.js';
 import { SchemaValidator } from '../schema/Validator.js';
@@ -47,8 +47,43 @@ const TARGET_DATABASE_ENV_KEYS = Object.freeze([
     'D1_TARGET_DB',
     'D1_DATABASE',
     'D1_DATABASE_ID',
-    'DB_DATABASE',
 ]);
+const describeConfiguredD1Target = (config) => {
+    const parts = [];
+    if (typeof config.database_name === 'string' && config.database_name.trim() !== '') {
+        parts.push(`database_name=${config.database_name.trim()}`);
+    }
+    if (typeof config.binding === 'string' && config.binding.trim() !== '') {
+        parts.push(`binding=${config.binding.trim()}`);
+    }
+    return parts.length > 0 ? parts.join(', ') : 'unnamed-d1-entry';
+};
+const describeConfiguredD1Targets = (configured) => {
+    const rendered = configured
+        .map((config) => describeConfiguredD1Target(config))
+        .filter((entry) => entry.length > 0);
+    return rendered.length > 0 ? rendered.join(' | ') : 'none';
+};
+const getResolvedDefaultTargetName = (projectRoot) => {
+    const resolvedName = WranglerConfig.getDefaultD1DatabaseName(projectRoot);
+    if (typeof resolvedName === 'string' && resolvedName.trim() !== '') {
+        return resolvedName.trim();
+    }
+    throw ErrorFactory.createValidationError('Resolved Wrangler D1 target is missing both database_name and binding');
+};
+const createTargetDatabaseResolutionError = (target, resolution) => {
+    const configuredTargets = describeConfiguredD1Targets(resolution.configured);
+    if (resolution.status === 'ambiguous') {
+        if (target === undefined || resolution.matchedBy === 'multiple-configured') {
+            return ErrorFactory.createValidationError(`Target D1 database is required because multiple Wrangler D1 targets are configured. Re-run with --target-database <database_name|binding> or set D1_TARGET_DB. Configured D1 targets: ${configuredTargets}`);
+        }
+        return ErrorFactory.createValidationError(`Target D1 database "${target}" is ambiguous by ${resolution.matchedBy}. Matching entries: ${describeConfiguredD1Targets(resolution.matches)}. Re-run with a unique binding via --target-database <binding> or set D1_TARGET_DB. Configured D1 targets: ${configuredTargets}`);
+    }
+    if (target === undefined) {
+        return ErrorFactory.createValidationError(`Target D1 database could not be inferred because no default Wrangler D1 target could be resolved. Re-run with --target-database <database_name|binding> or set D1_TARGET_DB. Configured D1 targets: ${configuredTargets}`);
+    }
+    return ErrorFactory.createValidationError(`Unable to resolve target D1 database "${target}". Tried database_name first, then binding. Configured D1 targets: ${configuredTargets}`);
+};
 const readOptionString = (options, keys) => {
     for (const key of keys) {
         const optionValue = options[key];
@@ -255,15 +290,22 @@ const resolveTargetType = (options) => {
     return targetType ?? 'd1';
 };
 const resolveTargetDatabase = (options) => {
+    const projectRoot = process.cwd();
     const fromOption = readOptionString(options, ['target-database', 'targetDatabase']);
-    if (fromOption !== undefined) {
-        return fromOption;
-    }
     const fromEnv = readEnvString(TARGET_DATABASE_ENV_KEYS);
-    if (fromEnv !== undefined) {
-        return fromEnv;
+    const explicitTarget = fromOption ?? fromEnv;
+    if (explicitTarget !== undefined) {
+        const resolution = WranglerConfig.resolveD1Database(projectRoot, explicitTarget);
+        if (resolution.status !== 'resolved') {
+            throw createTargetDatabaseResolutionError(explicitTarget, resolution);
+        }
+        return explicitTarget;
+    }
+    const resolution = WranglerConfig.resolveD1Database(projectRoot);
+    if (resolution.status === 'resolved') {
+        return getResolvedDefaultTargetName(projectRoot);
     }
-    return 'd1';
+    throw createTargetDatabaseResolutionError(undefined, resolution);
 };
 const resolveMigrationConfig = (options) => {
     const sourceDriver = resolveSourceDriver(options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/d1-migrator",
-  "version": "0.4.6",
+  "version": "0.4.27",
   "description": "Resumable database migration toolkit for moving data to Cloudflare D1 with ZinTrust.",
   "private": false,
   "type": "module",
@@ -23,7 +23,7 @@
     "node": ">=20.0.0"
   },
   "peerDependencies": {
-    "@zintrust/core": "^0.4.6"
+    "@zintrust/core": "^0.4.27"
   },
   "publishConfig": {
     "access": "public"