@zenstackhq/cli 3.0.0-beta.32 → 3.0.0-beta.34

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @zenstackhq/cli@3.0.0-beta.32 build /home/runner/work/zenstack-v3/zenstack-v3/packages/cli
+> @zenstackhq/cli@3.0.0-beta.34 build /home/runner/work/zenstack-v3/zenstack-v3/packages/cli
 > tsc --noEmit && tsup-node
 
 CLI Building entry: {"index":"src/index.ts"}
@@ -10,13 +10,13 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-CJS dist/index.cjs     42.17 KB
-CJS dist/index.cjs.map 80.63 KB
-CJS ⚡️ Build success in 144ms
-ESM dist/index.js     38.10 KB
-ESM dist/index.js.map 80.04 KB
-ESM ⚡️ Build success in 144ms
+ESM dist/index.js     39.83 KB
+ESM dist/index.js.map 83.71 KB
+ESM ⚡️ Build success in 134ms
+CJS dist/index.cjs     44.12 KB
+CJS dist/index.cjs.map 84.34 KB
+CJS ⚡️ Build success in 134ms
 DTS Build start
-DTS ⚡️ Build success in 2530ms
+DTS ⚡️ Build success in 2541ms
 DTS dist/index.d.ts  13.00 B
 DTS dist/index.d.cts 13.00 B

package/dist/index.cjs

@@ -292,7 +292,10 @@ var import_common_helpers = require("@zenstackhq/common-helpers");
 var import_ast2 = require("@zenstackhq/language/ast");
 var import_utils = require("@zenstackhq/language/utils");
 var import_colors4 = __toESM(require("colors"), 1);
+var import_jiti = require("jiti");
+var import_node_fs6 = __toESM(require("fs"), 1);
 var import_node_path4 = __toESM(require("path"), 1);
+var import_node_url = require("url");
 var import_ora = __toESM(require("ora"), 1);
 
 // src/plugins/index.ts
@@ -407,14 +410,7 @@ async function runPlugins(schemaFile, model, outputPath, options) {
         throw new CliError(`Unknown core plugin: ${provider}`);
       }
     } else {
-      let moduleSpec = provider;
-      if (moduleSpec.startsWith(".")) {
-        moduleSpec = import_node_path4.default.resolve(import_node_path4.default.dirname(schemaFile), moduleSpec);
-      }
-      try {
-        cliPlugin = (await import(moduleSpec)).default;
-      } catch {
-      }
+      cliPlugin = await loadPluginModule(provider, import_node_path4.default.dirname(schemaFile));
     }
     if (cliPlugin) {
       const pluginOptions = getPluginOptions(plugin3);
@@ -443,7 +439,7 @@ async function runPlugins(schemaFile, model, outputPath, options) {
   ];
   defaultPlugins.forEach(({ plugin: plugin3, options: options2 }) => {
     if (!processedPlugins.some((p) => p.cliPlugin === plugin3)) {
-      processedPlugins.push({
+      processedPlugins.unshift({
         cliPlugin: plugin3,
         pluginOptions: options2
       });
@@ -493,6 +489,65 @@ function getPluginOptions(plugin3) {
   return result;
 }
 __name(getPluginOptions, "getPluginOptions");
+async function loadPluginModule(provider, basePath) {
+  let moduleSpec = provider;
+  if (moduleSpec.startsWith(".")) {
+    moduleSpec = import_node_path4.default.resolve(basePath, moduleSpec);
+  }
+  const importAsEsm = /* @__PURE__ */ __name(async (spec) => {
+    try {
+      const result = (await import(spec)).default;
+      return result;
+    } catch (err) {
+      throw new CliError(`Failed to load plugin module from ${spec}: ${err.message}`);
+    }
+  }, "importAsEsm");
+  const jiti = (0, import_jiti.createJiti)((0, import_node_url.pathToFileURL)(basePath).toString());
+  const importAsTs = /* @__PURE__ */ __name(async (spec) => {
+    try {
+      const result = await jiti.import(spec, {
+        default: true
+      });
+      return result;
+    } catch (err) {
+      throw new CliError(`Failed to load plugin module from ${spec}: ${err.message}`);
+    }
+  }, "importAsTs");
+  const esmSuffixes = [
+    ".js",
+    ".mjs"
+  ];
+  const tsSuffixes = [
+    ".ts",
+    ".mts"
+  ];
+  if (import_node_fs6.default.existsSync(moduleSpec) && import_node_fs6.default.statSync(moduleSpec).isFile()) {
+    if (esmSuffixes.some((suffix) => moduleSpec.endsWith(suffix))) {
+      return await importAsEsm((0, import_node_url.pathToFileURL)(moduleSpec).toString());
+    }
+    if (tsSuffixes.some((suffix) => moduleSpec.endsWith(suffix))) {
+      return await importAsTs(moduleSpec);
+    }
+  }
+  for (const suffix of esmSuffixes) {
+    const indexPath = import_node_path4.default.join(moduleSpec, `index${suffix}`);
+    if (import_node_fs6.default.existsSync(indexPath)) {
+      return await importAsEsm((0, import_node_url.pathToFileURL)(indexPath).toString());
+    }
+  }
+  for (const suffix of tsSuffixes) {
+    const indexPath = import_node_path4.default.join(moduleSpec, `index${suffix}`);
+    if (import_node_fs6.default.existsSync(indexPath)) {
+      return await importAsTs(indexPath);
+    }
+  }
+  try {
+    return (await import(moduleSpec)).default;
+  } catch {
+    return void 0;
+  }
+}
+__name(loadPluginModule, "loadPluginModule");
 
 // src/actions/info.ts
 var import_colors5 = __toESM(require("colors"), 1);
@@ -559,7 +614,7 @@ __name(getZenStackPackages, "getZenStackPackages");
 
 // src/actions/init.ts
 var import_colors6 = __toESM(require("colors"), 1);
-var import_node_fs6 = __toESM(require("fs"), 1);
+var import_node_fs7 = __toESM(require("fs"), 1);
 var import_node_path6 = __toESM(require("path"), 1);
 var import_ora2 = __toESM(require("ora"), 1);
 var import_package_manager_detector = require("package-manager-detector");
@@ -614,10 +669,10 @@ async function run6(projectPath) {
   }
   console.log(import_colors6.default.gray(`Using package manager: ${pm.agent}`));
   for (const pkg of packages) {
-    const resolved = (0, import_package_manager_detector.resolveCommand)(pm.agent, "install", [
+    const resolved = (0, import_package_manager_detector.resolveCommand)(pm.agent, "add", [
       pkg.name,
       ...pkg.dev ? [
-        pm.agent === "yarn" ? "--dev" : "--save-dev"
+        pm.agent.startsWith("yarn") || pm.agent === "bun" ? "--dev" : "--save-dev"
       ] : []
     ]);
     if (!resolved) {
@@ -635,11 +690,11 @@ async function run6(projectPath) {
     }
   }
   const generationFolder = "zenstack";
-  if (!import_node_fs6.default.existsSync(import_node_path6.default.join(projectPath, generationFolder))) {
-    import_node_fs6.default.mkdirSync(import_node_path6.default.join(projectPath, generationFolder));
+  if (!import_node_fs7.default.existsSync(import_node_path6.default.join(projectPath, generationFolder))) {
+    import_node_fs7.default.mkdirSync(import_node_path6.default.join(projectPath, generationFolder));
   }
-  if (!import_node_fs6.default.existsSync(import_node_path6.default.join(projectPath, generationFolder, "schema.zmodel"))) {
-    import_node_fs6.default.writeFileSync(import_node_path6.default.join(projectPath, generationFolder, "schema.zmodel"), STARTER_ZMODEL);
+  if (!import_node_fs7.default.existsSync(import_node_path6.default.join(projectPath, generationFolder, "schema.zmodel"))) {
+    import_node_fs7.default.writeFileSync(import_node_path6.default.join(projectPath, generationFolder, "schema.zmodel"), STARTER_ZMODEL);
   } else {
     console.log(import_colors6.default.yellow("Schema file already exists. Skipping generation of sample."));
   }
@@ -650,7 +705,7 @@ async function run6(projectPath) {
 __name(run6, "run");
 
 // src/actions/migrate.ts
-var import_node_fs7 = __toESM(require("fs"), 1);
+var import_node_fs8 = __toESM(require("fs"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
 
 // src/actions/seed.ts
@@ -705,8 +760,8 @@ async function run8(command, options) {
         break;
     }
   } finally {
-    if (import_node_fs7.default.existsSync(prismaSchemaFile)) {
-      import_node_fs7.default.unlinkSync(prismaSchemaFile);
+    if (import_node_fs8.default.existsSync(prismaSchemaFile)) {
+      import_node_fs8.default.unlinkSync(prismaSchemaFile);
     }
   }
 }
@@ -797,7 +852,7 @@ __name(handleSubProcessError2, "handleSubProcessError");
 // src/telemetry.ts
 var import_mixpanel = require("mixpanel");
 var import_node_crypto2 = require("crypto");
-var import_node_fs12 = __toESM(require("fs"), 1);
+var import_node_fs13 = __toESM(require("fs"), 1);
 var os2 = __toESM(require("os"), 1);
 
 // src/constants.ts
@@ -808,14 +863,14 @@ var import_node_process = require("process");
 var isInCi = import_node_process.env["CI"] !== "0" && import_node_process.env["CI"] !== "false" && ("CI" in import_node_process.env || "CONTINUOUS_INTEGRATION" in import_node_process.env || Object.keys(import_node_process.env).some((key) => key.startsWith("CI_")));
 
 // src/utils/is-container.ts
-var import_node_fs9 = __toESM(require("fs"), 1);
+var import_node_fs10 = __toESM(require("fs"), 1);
 
 // src/utils/is-docker.ts
-var import_node_fs8 = __toESM(require("fs"), 1);
+var import_node_fs9 = __toESM(require("fs"), 1);
 var isDockerCached;
 function hasDockerEnv() {
   try {
-    import_node_fs8.default.statSync("/.dockerenv");
+    import_node_fs9.default.statSync("/.dockerenv");
     return true;
   } catch {
     return false;
@@ -824,7 +879,7 @@ function hasDockerEnv() {
 __name(hasDockerEnv, "hasDockerEnv");
 function hasDockerCGroup() {
   try {
-    return import_node_fs8.default.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
+    return import_node_fs9.default.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
   } catch {
     return false;
   }
@@ -842,7 +897,7 @@ __name(isDocker, "isDocker");
 var cachedResult;
 var hasContainerEnv = /* @__PURE__ */ __name(() => {
   try {
-    import_node_fs9.default.statSync("/run/.containerenv");
+    import_node_fs10.default.statSync("/run/.containerenv");
     return true;
   } catch {
     return false;
@@ -859,7 +914,7 @@ __name(isInContainer, "isInContainer");
 // src/utils/is-wsl.ts
 var import_node_process2 = __toESM(require("process"), 1);
 var import_node_os = __toESM(require("os"), 1);
-var import_node_fs10 = __toESM(require("fs"), 1);
+var import_node_fs11 = __toESM(require("fs"), 1);
 var isWsl = /* @__PURE__ */ __name(() => {
   if (import_node_process2.default.platform !== "linux") {
     return false;
@@ -868,7 +923,7 @@ var isWsl = /* @__PURE__ */ __name(() => {
     return true;
   }
   try {
-    return import_node_fs10.default.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft");
+    return import_node_fs11.default.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft");
   } catch {
     return false;
   }
@@ -933,17 +988,17 @@ __name(getMachineId, "getMachineId");
 
 // src/utils/version-utils.ts
 var import_colors8 = __toESM(require("colors"), 1);
-var import_node_fs11 = __toESM(require("fs"), 1);
+var import_node_fs12 = __toESM(require("fs"), 1);
 var import_node_path8 = __toESM(require("path"), 1);
-var import_node_url = require("url");
+var import_node_url2 = require("url");
 var import_semver = __toESM(require("semver"), 1);
 var import_meta2 = {};
 var CHECK_VERSION_TIMEOUT = 2e3;
 var VERSION_CHECK_TAG = "next";
 function getVersion() {
   try {
-    const _dirname = typeof __dirname !== "undefined" ? __dirname : import_node_path8.default.dirname((0, import_node_url.fileURLToPath)(import_meta2.url));
-    return JSON.parse(import_node_fs11.default.readFileSync(import_node_path8.default.join(_dirname, "../package.json"), "utf8")).version;
+    const _dirname = typeof __dirname !== "undefined" ? __dirname : import_node_path8.default.dirname((0, import_node_url2.fileURLToPath)(import_meta2.url));
+    return JSON.parse(import_node_fs12.default.readFileSync(import_node_path8.default.join(_dirname, "../package.json"), "utf8")).version;
   } catch {
     return void 0;
   }
@@ -1074,7 +1129,7 @@ var Telemetry = class {
     try {
       const packageJsonPath = import_meta3.resolve("prisma/package.json");
       const packageJsonUrl = new URL(packageJsonPath);
-      const packageJson = JSON.parse(import_node_fs12.default.readFileSync(packageJsonUrl, "utf8"));
+      const packageJson = JSON.parse(import_node_fs13.default.readFileSync(packageJsonUrl, "utf8"));
       return packageJson.version;
     } catch {
       return void 0;