@cedarjs/cli-data-migrate 6.0.0-canary.2636 → 6.0.0-canary.2639

package/dist/commands/upHandlerEsm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upHandlerEsm.d.ts","sourceRoot":"","sources":["../../src/commands/upHandlerEsm.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,oBAAoB,EAAiB,MAAM,UAAU,CAAA;AAoBnE,wBAAsB,OAAO,CAAC,EAC5B,sBAAsB,EACtB,QAAQ,GACT,EAAE,oBAAoB,iBAsHtB;AAiFD,eAAO,MAAM,6BAA6B,wDACa,CAAA"}
+{"version":3,"file":"upHandlerEsm.d.ts","sourceRoot":"","sources":["../../src/commands/upHandlerEsm.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,oBAAoB,EAAiB,MAAM,UAAU,CAAA;AAsCnE,wBAAsB,OAAO,CAAC,EAC5B,sBAAsB,EACtB,QAAQ,GACT,EAAE,oBAAoB,iBAoMtB;AA6DD,eAAO,MAAM,6BAA6B,wDACa,CAAA"}

package/dist/commands/upHandlerEsm.js

@@ -34,15 +34,93 @@ __export(upHandlerEsm_exports, {
 module.exports = __toCommonJS(upHandlerEsm_exports);
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = __toESM(require("node:path"));
-var import_bundle_require = require("bundle-require");
 var import_listr2 = require("listr2");
+var import_vite = require("vite");
 var import_cli_helpers = require("@cedarjs/cli-helpers");
 var import_project_config = require("@cedarjs/project-config");
+function resolveId(id) {
+  if (import_node_fs.default.existsSync(id) && import_node_fs.default.statSync(id).isFile()) {
+    return id;
+  }
+  const withoutExt = /\.jsx?$/.test(id) ? id.replace(/\.jsx?$/, "") : id;
+  for (const ext of [".ts", ".tsx", ".js", ".jsx"]) {
+    if (import_node_fs.default.existsSync(withoutExt + ext)) {
+      return withoutExt + ext;
+    }
+  }
+  if (import_node_fs.default.existsSync(id) && import_node_fs.default.statSync(id).isDirectory()) {
+    for (const base of ["index", import_node_path.default.basename(id)]) {
+      for (const ext of [".ts", ".tsx", ".js", ".jsx"]) {
+        const candidate = import_node_path.default.join(id, base + ext);
+        if (import_node_fs.default.existsSync(candidate)) {
+          return candidate;
+        }
+      }
+    }
+  }
+  return id;
+}
 async function handler({
   importDbClientFromDist,
   distPath
 }) {
   let db;
+  let server = null;
+  let cedarPlugins;
+  async function getRunner() {
+    if (!server) {
+      if (!cedarPlugins) {
+        const mod = await import("@cedarjs/vite");
+        cedarPlugins = mod;
+      }
+      server = await (0, import_vite.createServer)({
+        mode: "production",
+        optimizeDeps: {
+          noDiscovery: true,
+          include: void 0
+        },
+        server: {
+          hmr: false,
+          watch: null
+        },
+        environments: {
+          nodeRunnerEnv: {}
+        },
+        resolve: {
+          alias: [
+            {
+              find: /^api\//,
+              replacement: (0, import_project_config.getPaths)().api.base + "/"
+            },
+            {
+              find: /^src\//,
+              replacement: "src/",
+              customResolver: (id, importer, _options) => {
+                const apiImportBase = (0, import_project_config.importStatementPath)((0, import_project_config.getPaths)().api.base);
+                if (importer?.startsWith(apiImportBase)) {
+                  const apiImportSrc = (0, import_project_config.importStatementPath)((0, import_project_config.getPaths)().api.src);
+                  const apiId = id.replace("src", apiImportSrc);
+                  return { id: resolveId(apiId) };
+                }
+                return null;
+              }
+            }
+          ]
+        },
+        plugins: [
+          cedarPlugins.cedarCjsCompatPlugin(),
+          cedarPlugins.cedarjsResolveCedarStyleImportsPlugin(),
+          cedarPlugins.cedarImportDirPlugin(),
+          cedarPlugins.cedarAutoImportsPlugin()
+        ]
+      });
+    }
+    const env = server.environments.nodeRunnerEnv;
+    if (!env || !(0, import_vite.isRunnableDevEnvironment)(env)) {
+      throw new Error("Vite environment is not runnable.");
+    }
+    return env.runner;
+  }
   if (importDbClientFromDist) {
     if (!import_node_fs.default.existsSync(distPath)) {
       console.warn(
@@ -68,11 +146,14 @@ async function handler({
       process.exitCode = 1;
       return;
     }
-    const { mod } = await (0, import_bundle_require.bundleRequire)({
-      filepath: dbPath
-      // TODO: Add plugins
-    });
-    db = mod.db;
+    try {
+      const runner = await getRunner();
+      const dbModule = await runner.import(dbPath);
+      db = dbModule.db;
+    } catch (e) {
+      await server?.close();
+      throw e;
+    }
   }
   const pendingDataMigrations = await getPendingDataMigrations(db);
   if (!pendingDataMigrations.length) {
@@ -80,6 +161,7 @@ async function handler({
 ${NO_PENDING_MIGRATIONS_MESSAGE}
 `));
     process.exitCode = 0;
+    await server?.close();
     return;
   }
   const counters = { run: 0, skipped: 0, error: 0 };
@@ -110,9 +192,8 @@ ${NO_PENDING_MIGRATIONS_MESSAGE}
           });
         } catch (e) {
           counters.error++;
-          console.error(
-            import_cli_helpers.colors.error(`Error in data migration: ${e.message}`)
-          );
+          const message = e instanceof Error ? e.message : String(e);
+          console.error(import_cli_helpers.colors.error(`Error in data migration: ${message}`));
         }
       }
     };
@@ -135,6 +216,19 @@ ${NO_PENDING_MIGRATIONS_MESSAGE}
     console.log();
     reportDataMigrations(counters);
     console.log();
+  } finally {
+    if (server) {
+      await server.close();
+    }
+  }
+  async function runDataMigration(db2, dataMigrationPath) {
+    const runner = await getRunner();
+    const dataMigrationModule = await runner.import(dataMigrationPath);
+    const dataMigration = dataMigrationModule.default;
+    const startedAt = /* @__PURE__ */ new Date();
+    await dataMigration({ db: db2 });
+    const finishedAt = /* @__PURE__ */ new Date();
+    return { startedAt, finishedAt };
   }
 }
 async function getPendingDataMigrations(db) {
@@ -179,17 +273,6 @@ function sortDataMigrationsByVersion(dataMigrationA, dataMigrationB) {
   }
   return 0;
 }
-async function runDataMigration(db, dataMigrationPath) {
-  const { mod } = await (0, import_bundle_require.bundleRequire)({
-    filepath: dataMigrationPath
-    // TODO: Add plugins
-  });
-  const dataMigration = mod.default;
-  const startedAt = /* @__PURE__ */ new Date();
-  await dataMigration({ db });
-  const finishedAt = /* @__PURE__ */ new Date();
-  return { startedAt, finishedAt };
-}
 const NO_PENDING_MIGRATIONS_MESSAGE = "No pending data migrations run, already up-to-date.";
 async function recordDataMigration(db, { version, name, startedAt, finishedAt }) {
   await db.rW_DataMigration.create({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli-data-migrate",
-  "version": "6.0.0-canary.2636",
+  "version": "6.0.0-canary.2639",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -26,18 +26,19 @@
     "test:unit": "vitest run src"
   },
   "dependencies": {
-    "@cedarjs/babel-config": "6.0.0-canary.2636",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2636",
-    "@cedarjs/project-config": "6.0.0-canary.2636",
-    "bundle-require": "^5.1.0",
+    "@cedarjs/babel-config": "6.0.0-canary.2639",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2639",
+    "@cedarjs/project-config": "6.0.0-canary.2639",
+    "@cedarjs/vite": "6.0.0-canary.2639",
     "dotenv-defaults": "5.0.2",
     "execa": "5.1.1",
     "listr2": "10.2.1",
     "termi-link": "1.1.0",
+    "vite": "7.3.5",
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-canary.2636",
+    "@cedarjs/framework-tools": "6.0.0-canary.2639",
     "@prisma/client": "7.8.0",
     "@types/yargs": "17.0.35",
     "memfs": "4.64.0",