@chrisluyi/daas-cli 1.2.1 → 1.3.0

package/dist/index.js

@@ -2311,12 +2311,12 @@ async function runMain(cmd, opts = {}) {
   }
 }
 
-// src/commands/dev.ts
-import { createRsbuild } from "@rsbuild/core";
+// src/commands/build.ts
 import { createConfig } from "@chrisluyi/rsbuild-config";
+import { createRsbuild } from "@rsbuild/core";
 
 // src/daas-config.ts
-import { readFileSync, existsSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 import { resolve } from "path";
 
 class ConfigError extends Error {
@@ -2344,7 +2344,7 @@ function readDaasConfig(cwd = process.cwd()) {
 }
 
 // src/manifest.ts
-import { readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { resolve as resolve2 } from "path";
 
 class ManifestError extends Error {
@@ -2387,6 +2387,33 @@ function stripScope(name) {
   return name.replace(/^@[^/]+\//, "");
 }
 
+// src/output.ts
+function formatSuccess(command, data) {
+  return { ok: true, command, cliVersion: getCliVersion(), ...data };
+}
+function formatError(command, exitCode, error, suggestion) {
+  return {
+    ok: false,
+    command,
+    exitCode,
+    error,
+    suggestion,
+    cliVersion: getCliVersion()
+  };
+}
+function writeJsonSuccess(command, data) {
+  process.stdout.write(`${JSON.stringify(formatSuccess(command, data))}
+`);
+}
+function writeJsonError(command, exitCode, error, suggestion) {
+  process.stdout.write(`${JSON.stringify(formatError(command, exitCode, error, suggestion))}
+`);
+  process.exit(exitCode);
+}
+function getCliVersion() {
+  return process.env.DAAS_CLI_VERSION ?? "0.0.0";
+}
+
 // src/remote-config.ts
 import { SUPPORTED_CONFIG_VERSION } from "@chrisluyi/rsbuild-config";
 // src/fallback-config.json
@@ -2498,34 +2525,15 @@ function generateTsconfigDaas(cwd, target) {
     extends: "./tsconfig.json",
     compilerOptions: {
       paths: {
-        "@region-config": [`./src/config/regions/${target.region}`],
+        "@region-config": [`./src/config/regions/${target.region}/config`],
         "@platform-config": [`./src/config/platforms/${target.platform}`],
-        "@product-config": [`./src/config/products/${target.product}`]
+        "@product-config": [`./src/config/products/${target.product}`],
+        "@regional": [`./src/config/regions/${target.region}/index`]
       }
     }
   };
-  writeFileSync(resolve3(cwd, "tsconfig.daas.json"), JSON.stringify(content, null, 2) + `
-`);
-}
-
-// src/output.ts
-function formatSuccess(command, data) {
-  return { ok: true, command, cliVersion: getCliVersion(), ...data };
-}
-function formatError(command, exitCode, error, suggestion) {
-  return { ok: false, command, exitCode, error, suggestion, cliVersion: getCliVersion() };
-}
-function writeJsonSuccess(command, data) {
-  process.stdout.write(JSON.stringify(formatSuccess(command, data)) + `
-`);
-}
-function writeJsonError(command, exitCode, error, suggestion) {
-  process.stdout.write(JSON.stringify(formatError(command, exitCode, error, suggestion)) + `
+  writeFileSync(resolve3(cwd, "tsconfig.daas.json"), `${JSON.stringify(content, null, 2)}
 `);
-  process.exit(exitCode);
-}
-function getCliVersion() {
-  return process.env.DAAS_CLI_VERSION ?? "0.0.0";
 }
 
 // src/types.ts
@@ -2538,78 +2546,20 @@ var EXIT_CODES = {
   CONFIG_VERSION_MISMATCH: 5
 };
 
-// src/commands/dev.ts
-var devCommand = defineCommand({
-  meta: { name: "dev", description: "Start MFE dev server" },
-  args: {
-    target: { type: "positional", description: "Build target (e.g. sg-foo-mb-dev)", required: false },
-    port: { type: "string", description: "Override dev server port" },
-    json: { type: "boolean", default: false, description: "Machine-readable JSON output" }
-  },
-  async run({ args }) {
-    try {
-      const daasConfig = readDaasConfig();
-      const manifest = readManifest();
-      const remoteMeta = await fetchRemoteConfig(daasConfig.configUrl, false);
-      checkCliVersion(remoteMeta);
-      const versionOk = checkConfigVersion(remoteMeta, false);
-      if (!versionOk) {
-        consola.warn("Config version mismatch \u2014 update daas-cli for full compatibility");
-      }
-      const port = args.port ? Number(args.port) : daasConfig.port;
-      const target = args.target ? parseTarget(args.target) : undefined;
-      if (target) {
-        generateTsconfigDaas(process.cwd(), target);
-        consola.info(`Target: ${args.target} (region=${target.region}, product=${target.product}, platform=${target.platform}, env=${target.environment})`);
-      }
-      const config = createConfig(manifest, remoteMeta, { mode: "development", port, target });
-      consola.start(`Starting ${manifest.name} dev server...`);
-      const rsbuild = await createRsbuild({ rsbuildConfig: config });
-      const server = await rsbuild.createDevServer();
-      await server.listen();
-      consola.success(`Ready on http://localhost:${port}`);
-    } catch (e2) {
-      handleError("dev", e2, args.json);
-    }
-  }
-});
-function handleError(command, e2, json) {
-  if (e2 instanceof CliVersionError) {
-    if (json)
-      writeJsonError(command, EXIT_CODES.CLI_TOO_OLD, e2.message, "Update daas-cli to the required version.");
-    consola.fatal(e2.message);
-    process.exit(EXIT_CODES.CLI_TOO_OLD);
-  }
-  if (e2 instanceof FetchError) {
-    if (json)
-      writeJsonError(command, EXIT_CODES.REMOTE_FETCH_FAILED, e2.message, "Check network or VPN.");
-    consola.warn(`Remote config unavailable \u2014 using fallback. ${e2.message}`);
-    process.exit(EXIT_CODES.REMOTE_FETCH_FAILED);
-  }
-  if (e2 instanceof TargetParseError) {
-    if (json)
-      writeJsonError(command, EXIT_CODES.CONFIG_ERROR, e2.message, "Check target format: {region}-{product}-{platform}-{environment}");
-    consola.fatal(e2.message);
-    process.exit(EXIT_CODES.CONFIG_ERROR);
-  }
-  if (e2 instanceof ConfigError || e2 instanceof ManifestError) {
-    if (json)
-      writeJsonError(command, EXIT_CODES.CONFIG_ERROR, e2.message, "Run daas init first.");
-    consola.fatal(e2.message);
-    process.exit(EXIT_CODES.CONFIG_ERROR);
-  }
-  consola.fatal(e2);
-  process.exit(EXIT_CODES.GENERAL_ERROR);
-}
-
 // src/commands/build.ts
-import { createRsbuild as createRsbuild2 } from "@rsbuild/core";
-import { createConfig as createConfig2 } from "@chrisluyi/rsbuild-config";
 var buildCommand = defineCommand({
   meta: { name: "build", description: "Build MFE for production" },
   args: {
-    target: { type: "positional", description: "Build target (e.g. sg-foo-mb-prod)", required: false },
-    json: { type: "boolean", default: false, description: "Machine-readable JSON output" }
+    target: {
+      type: "positional",
+      description: "Build target (e.g. sg-foo-mb-prod)",
+      required: false
+    },
+    json: {
+      type: "boolean",
+      default: false,
+      description: "Machine-readable JSON output"
+    }
   },
   async run({ args }) {
     const json = args.json;
@@ -2624,8 +2574,11 @@ var buildCommand = defineCommand({
       const target = args.target ? parseTarget(args.target) : undefined;
       if (target)
         generateTsconfigDaas(process.cwd(), target);
-      const config = createConfig2(manifest, remoteMeta, { mode: "production", target });
-      const rsbuild = await createRsbuild2({ rsbuildConfig: config });
+      const config = createConfig(manifest, remoteMeta, {
+        mode: "production",
+        target
+      });
+      const rsbuild = await createRsbuild({ rsbuildConfig: config });
       await rsbuild.build();
       if (json)
         writeJsonSuccess("build", { appName: manifest.name, output: "./dist" });
@@ -2667,41 +2620,87 @@ var buildCommand = defineCommand({
   }
 });
 
-// src/commands/test.ts
-import { startVitest } from "vitest/node";
-import { createVitestConfig } from "@chrisluyi/rsbuild-config/vitest";
-var testCommand = defineCommand({
-  meta: { name: "test", description: "Run MFE tests" },
+// src/commands/dev.ts
+import { createConfig as createConfig2 } from "@chrisluyi/rsbuild-config";
+import { createRsbuild as createRsbuild2 } from "@rsbuild/core";
+var devCommand = defineCommand({
+  meta: { name: "dev", description: "Start MFE dev server" },
   args: {
-    json: { type: "boolean", default: false, description: "Machine-readable JSON output" }
+    target: {
+      type: "positional",
+      description: "Build target (e.g. sg-foo-mb-dev)",
+      required: false
+    },
+    port: { type: "string", description: "Override dev server port" },
+    json: {
+      type: "boolean",
+      default: false,
+      description: "Machine-readable JSON output"
+    }
   },
   async run({ args }) {
-    const json = args.json;
     try {
-      const manifest = readManifest();
       const daasConfig = readDaasConfig();
-      const config = createVitestConfig(manifest, { coverage: daasConfig.coverage, setupFiles: daasConfig.setupFiles });
-      const vitest = await startVitest("test", [], config);
-      const failed = vitest?.state.getFiles().some((f3) => f3.result?.state === "fail") ?? false;
-      if (json) {
-        if (failed)
-          writeJsonError("test", EXIT_CODES.GENERAL_ERROR, "Tests failed", "Check test output above");
-        writeJsonSuccess("test", { appName: manifest.name, passed: !failed });
+      const manifest = readManifest();
+      const remoteMeta = await fetchRemoteConfig(daasConfig.configUrl, false);
+      checkCliVersion(remoteMeta);
+      const versionOk = checkConfigVersion(remoteMeta, false);
+      if (!versionOk) {
+        consola.warn("Config version mismatch \u2014 update daas-cli for full compatibility");
       }
-      if (failed)
-        process.exit(EXIT_CODES.GENERAL_ERROR);
+      const port = args.port ? Number(args.port) : daasConfig.port;
+      const target = args.target ? parseTarget(args.target) : undefined;
+      if (target) {
+        generateTsconfigDaas(process.cwd(), target);
+        consola.info(`Target: ${args.target} (region=${target.region}, product=${target.product}, platform=${target.platform}, env=${target.environment})`);
+      }
+      const config = createConfig2(manifest, remoteMeta, {
+        mode: "development",
+        port,
+        target
+      });
+      consola.start(`Starting ${manifest.name} dev server...`);
+      const rsbuild = await createRsbuild2({ rsbuildConfig: config });
+      const server = await rsbuild.createDevServer();
+      await server.listen();
+      consola.success(`Ready on http://localhost:${port}`);
     } catch (e2) {
-      if (json)
-        writeJsonError("test", EXIT_CODES.GENERAL_ERROR, e2.message, "Check test configuration");
-      consola.fatal(e2);
-      process.exit(EXIT_CODES.GENERAL_ERROR);
+      handleError("dev", e2, args.json);
     }
   }
 });
+function handleError(command, e2, json) {
+  if (e2 instanceof CliVersionError) {
+    if (json)
+      writeJsonError(command, EXIT_CODES.CLI_TOO_OLD, e2.message, "Update daas-cli to the required version.");
+    consola.fatal(e2.message);
+    process.exit(EXIT_CODES.CLI_TOO_OLD);
+  }
+  if (e2 instanceof FetchError) {
+    if (json)
+      writeJsonError(command, EXIT_CODES.REMOTE_FETCH_FAILED, e2.message, "Check network or VPN.");
+    consola.warn(`Remote config unavailable \u2014 using fallback. ${e2.message}`);
+    process.exit(EXIT_CODES.REMOTE_FETCH_FAILED);
+  }
+  if (e2 instanceof TargetParseError) {
+    if (json)
+      writeJsonError(command, EXIT_CODES.CONFIG_ERROR, e2.message, "Check target format: {region}-{product}-{platform}-{environment}");
+    consola.fatal(e2.message);
+    process.exit(EXIT_CODES.CONFIG_ERROR);
+  }
+  if (e2 instanceof ConfigError || e2 instanceof ManifestError) {
+    if (json)
+      writeJsonError(command, EXIT_CODES.CONFIG_ERROR, e2.message, "Run daas init first.");
+    consola.fatal(e2.message);
+    process.exit(EXIT_CODES.CONFIG_ERROR);
+  }
+  consola.fatal(e2);
+  process.exit(EXIT_CODES.GENERAL_ERROR);
+}
 
 // src/init/monorepo.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
-import { resolve as resolve4, dirname } from "path";
+import { dirname, resolve as resolve4 } from "path";
 function detectMonorepo(startDir) {
   let dir = startDir;
   for (let i2 = 0;i2 < 10; i2++) {
@@ -2727,7 +2726,11 @@ function detectMonorepo(startDir) {
 var infoCommand = defineCommand({
   meta: { name: "info", description: "Show resolved MFE project state" },
   args: {
-    json: { type: "boolean", default: false, description: "Machine-readable JSON output" }
+    json: {
+      type: "boolean",
+      default: false,
+      description: "Machine-readable JSON output"
+    }
   },
   async run({ args }) {
     const json = args.json;
@@ -2766,6 +2769,9 @@ var infoCommand = defineCommand({
 });
 
 // src/commands/init.ts
+import { existsSync as existsSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
+import { createRequire } from "module";
+import { resolve as resolve6 } from "path";
 import { scaffold } from "@chrisluyi/template";
 
 // ../../node_modules/.bun/@clack+core@0.3.5/node_modules/@clack/core/dist/index.mjs
@@ -3258,12 +3264,8 @@ var de = () => {
   return process.on("uncaughtExceptionMonitor", () => $2(2)), process.on("unhandledRejection", () => $2(2)), process.on("SIGINT", () => $2(1)), process.on("SIGTERM", () => $2(1)), process.on("exit", $2), { start: l3, stop: u3, message: m3 };
 };
 
-// src/commands/init.ts
-import { existsSync as existsSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
-import { resolve as resolve6 } from "path";
-
 // src/init/copy-template.ts
-import { existsSync as existsSync4, copyFileSync, mkdirSync, readdirSync } from "fs";
+import { copyFileSync, existsSync as existsSync4, mkdirSync, readdirSync } from "fs";
 import { dirname as dirname2, join } from "path";
 import { fileURLToPath } from "url";
 var __dirname2 = dirname2(fileURLToPath(import.meta.url));
@@ -3280,7 +3282,9 @@ async function copyTemplate(destDir) {
       mkdirSync(join(destDir, "src"), { recursive: true });
     }
     if (existsSync4(dest)) {
-      const overwrite = await se({ message: `${destFile} already exists. Overwrite?` });
+      const overwrite = await se({
+        message: `${destFile} already exists. Overwrite?`
+      });
       if (!overwrite) {
         result.skipped.push(destFile);
         continue;
@@ -3293,7 +3297,7 @@ async function copyTemplate(destDir) {
 }
 
 // src/init/package-json.ts
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, existsSync as existsSync5 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
 import { resolve as resolve5 } from "path";
 function updatePackageJson(cwd, opts) {
   const pkgPath = resolve5(cwd, "package.json");
@@ -3304,6 +3308,17 @@ function updatePackageJson(cwd, opts) {
     build: "daas build",
     test: "daas test"
   };
+  pkg.dependencies = {
+    ...pkg.dependencies ?? {},
+    "@radix-ui/react-tabs": "^1.1.0",
+    ...opts.isFullTemplate ? {
+      "@chrisluyi/template": `^${opts.templateVersion ?? opts.cliVersion ?? "1.0.0"}`,
+      "@tanstack/react-query": "^5.0.0",
+      zustand: "^5.0.0",
+      immer: "^10.0.0",
+      zod: "^3.23.0"
+    } : {}
+  };
   if (!opts.isMonorepo) {
     pkg.devDependencies = {
       ...pkg.devDependencies ?? {},
@@ -3311,7 +3326,7 @@ function updatePackageJson(cwd, opts) {
     };
   }
   pkg.daas = { configUrl: opts.configUrl, port: opts.port };
-  writeFileSync2(pkgPath, JSON.stringify(pkg, null, 2) + `
+  writeFileSync2(pkgPath, `${JSON.stringify(pkg, null, 2)}
 `);
 }
 
@@ -3320,7 +3335,10 @@ var KNOWN_TEMPLATES = ["default"];
 var initCommand = defineCommand({
   meta: { name: "init", description: "Scaffold a new MFE app" },
   args: {
-    template: { type: "string", description: "Template name. Use 'default' for the full services/containers/components structure." }
+    template: {
+      type: "string",
+      description: "Template name. Use 'default' for the full services/containers/components structure."
+    }
   },
   async run({ args }) {
     if (!process.stdin.isTTY) {
@@ -3364,7 +3382,9 @@ var initCommand = defineCommand({
         appName,
         onConflict: async (relPath) => {
           s2.stop("");
-          const overwrite = await se({ message: `${relPath} already exists. Overwrite?` });
+          const overwrite = await se({
+            message: `${relPath} already exists. Overwrite?`
+          });
           s2.start(`Scaffolding ${appName}...`);
           return overwrite;
         }
@@ -3380,11 +3400,17 @@ var initCommand = defineCommand({
       s2.message(`\u2713 Created ${f4}`);
     for (const f4 of skipped)
       s2.message(`\u2014 Skipped ${f4} (kept existing)`);
-    updatePackageJson(cwd, { configUrl, port, isMonorepo });
+    updatePackageJson(cwd, {
+      configUrl,
+      port,
+      isMonorepo,
+      isFullTemplate: useFullTemplate,
+      templateVersion: getTemplateVersion()
+    });
     s2.message("\u2713 Updated package.json");
     if (hasExtraExposes) {
       const manifest = { name: appName, exposes: { "./App": "./src/App" } };
-      writeFileSync3(resolve6(cwd, "mf.manifest.json"), JSON.stringify(manifest, null, 2) + `
+      writeFileSync3(resolve6(cwd, "mf.manifest.json"), `${JSON.stringify(manifest, null, 2)}
 `);
       s2.message("\u2713 Created mf.manifest.json (add extra exposes as needed)");
     }
@@ -3392,6 +3418,15 @@ var initCommand = defineCommand({
     $e(isMonorepo ? "Run: daas dev" : "Run: bun install && daas dev");
   }
 });
+function getTemplateVersion() {
+  try {
+    const req = createRequire(import.meta.url);
+    const pkg = req("@chrisluyi/template/package.json");
+    return pkg.version ?? "1.0.0";
+  } catch {
+    return "1.0.0";
+  }
+}
 function getPackageName(cwd) {
   const pkgPath = resolve6(cwd, "package.json");
   if (!existsSync6(pkgPath))
@@ -3404,6 +3439,45 @@ function getPackageName(cwd) {
   }
 }
 
+// src/commands/test.ts
+import { createVitestConfig } from "@chrisluyi/rsbuild-config/vitest";
+import { startVitest } from "vitest/node";
+var testCommand = defineCommand({
+  meta: { name: "test", description: "Run MFE tests" },
+  args: {
+    json: {
+      type: "boolean",
+      default: false,
+      description: "Machine-readable JSON output"
+    }
+  },
+  async run({ args }) {
+    const json = args.json;
+    try {
+      const manifest = readManifest();
+      const daasConfig = readDaasConfig();
+      const config = createVitestConfig(manifest, {
+        coverage: daasConfig.coverage,
+        setupFiles: daasConfig.setupFiles
+      });
+      const vitest = await startVitest("test", [], config);
+      const failed = vitest?.state.getFiles().some((f4) => f4.result?.state === "fail") ?? false;
+      if (json) {
+        if (failed)
+          writeJsonError("test", EXIT_CODES.GENERAL_ERROR, "Tests failed", "Check test output above");
+        writeJsonSuccess("test", { appName: manifest.name, passed: !failed });
+      }
+      if (failed)
+        process.exit(EXIT_CODES.GENERAL_ERROR);
+    } catch (e3) {
+      if (json)
+        writeJsonError("test", EXIT_CODES.GENERAL_ERROR, e3.message, "Check test configuration");
+      consola.fatal(e3);
+      process.exit(EXIT_CODES.GENERAL_ERROR);
+    }
+  }
+});
+
 // src/index.ts
 var main = defineCommand({
   meta: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrisluyi/daas-cli",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "type": "module",
   "bin": {
     "daas": "./dist/index.js"
@@ -31,6 +31,11 @@
   "devDependencies": {
     "typescript": "^5.5.0"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Chris-LuYi/daas-cli",
+    "directory": "packages/cli"
+  },
   "publishConfig": {
     "access": "public"
   }