@open-mercato/cli 0.4.9-develop-94fb251ed3 → 0.4.9-develop-8d8db18714

package/dist/mercato.js

@@ -5,6 +5,7 @@ import { parseBooleanToken } from "@open-mercato/shared/lib/boolean";
 import { getSslConfig } from "@open-mercato/shared/lib/db/ssl";
 import { getRedisUrl } from "@open-mercato/shared/lib/redis/connection";
 import { resolveInitDerivedSecrets } from "./lib/init-secrets.js";
+import { parseModuleInstallArgs } from "./lib/module-install-args.js";
 const lazyIntegration = () => import("./lib/testing/integration.js");
 import path from "node:path";
 import fs from "node:fs";
@@ -34,6 +35,49 @@ async function ensureEnvLoaded() {
   } catch {
   }
 }
+function resolveInstalledBinary(baseDirs, relativeBinPath) {
+  const checked = /* @__PURE__ */ new Set();
+  for (const baseDir of baseDirs) {
+    const candidate = path.join(baseDir, "node_modules", relativeBinPath);
+    checked.add(candidate);
+    if (fs.existsSync(candidate)) return candidate;
+  }
+  throw new Error(
+    `Could not find installed binary "${relativeBinPath}". Checked: ${Array.from(checked).join(", ")}`
+  );
+}
+async function handleDirectEjectCommand(args) {
+  const { createResolver } = await import("./lib/resolver.js");
+  const { listEjectableModules, ejectModule } = await import("./lib/eject.js");
+  const resolver = createResolver();
+  const commandArgs = args.filter(Boolean);
+  const isList = commandArgs.includes("--list") || commandArgs.includes("-l");
+  const moduleId = isList ? void 0 : commandArgs.find((arg) => !arg.startsWith("-"));
+  if (isList || !moduleId) {
+    const ejectable = listEjectableModules(resolver);
+    if (ejectable.length === 0) {
+      console.log("No ejectable modules found.");
+    } else {
+      console.log("Ejectable modules:\n");
+      for (const mod of ejectable) {
+        const desc = mod.description ? ` \u2014 ${mod.description}` : "";
+        console.log(`  ${mod.id} (from: ${mod.from})${desc}`);
+      }
+      console.log("\nUsage: yarn mercato eject <moduleId>");
+    }
+    return 0;
+  }
+  console.log(`Ejecting module "${moduleId}"...`);
+  ejectModule(resolver, moduleId);
+  console.log(`
+\u2705 Module "${moduleId}" ejected successfully!
+`);
+  console.log("Next steps:");
+  console.log("  1. Run generators:  yarn mercato generate all");
+  console.log(`  2. Customize:       edit src/modules/${moduleId}/`);
+  console.log("  3. Start dev:       yarn dev");
+  return 0;
+}
 async function runModuleCommand(allModules, moduleName, commandName, args = [], options = {}) {
   const mod = allModules.find((m) => m.id === moduleName);
   if (!mod) {
@@ -226,13 +270,14 @@ async function run(argv = process.argv) {
       }
       console.log("\u{1F527} Preparing modules (registry, entities, DI)...");
       const { createResolver } = await import("./lib/resolver.js");
-      const { generateEntityIds, generateModuleRegistry, generateModuleRegistryCli, generateModuleEntities, generateModuleDi, generateOpenApi } = await import("./lib/generators/index.js");
+      const { generateEntityIds, generateModuleRegistry, generateModuleRegistryCli, generateModuleEntities, generateModuleDi, generateModulePackageSources, generateOpenApi } = await import("./lib/generators/index.js");
       const resolver = createResolver();
       await generateEntityIds({ resolver, quiet: true });
       await generateModuleRegistry({ resolver, quiet: true });
       await generateModuleRegistryCli({ resolver, quiet: true });
       await generateModuleEntities({ resolver, quiet: true });
       await generateModuleDi({ resolver, quiet: true });
+      await generateModulePackageSources({ resolver, quiet: true });
       await generateOpenApi({ resolver, quiet: true });
       console.log("\u2705 Modules prepared\n");
       console.log("\u{1F4CA} Applying database migrations...");
@@ -439,37 +484,66 @@ async function run(argv = process.argv) {
     const exitCode = await runAgenticInit(parts.slice(1));
     return exitCode;
   }
-  if (first === "eject") {
+  if (first === "module") {
     try {
-      const { createResolver } = await import("./lib/resolver.js");
-      const { listEjectableModules, ejectModule } = await import("./lib/eject.js");
-      const resolver = createResolver();
-      const isList = second === "--list" || second === "-l";
-      const moduleId = !isList ? second : void 0;
-      if (isList || !moduleId) {
-        const ejectable = listEjectableModules(resolver);
-        if (ejectable.length === 0) {
-          console.log("No ejectable modules found.");
-        } else {
-          console.log("Ejectable modules:\n");
-          for (const mod2 of ejectable) {
-            const desc = mod2.description ? ` \u2014 ${mod2.description}` : "";
-            console.log(`  ${mod2.id} (from: ${mod2.from})${desc}`);
-          }
-          console.log("\nUsage: yarn mercato eject <moduleId>");
+      const subcommand = second;
+      const commandArgs = remaining.filter(Boolean);
+      if (!subcommand || subcommand === "help" || subcommand === "--help" || subcommand === "-h") {
+        console.log("Usage: yarn mercato module <add|enable|eject> ...");
+        console.log("  yarn mercato module add <packageSpec> [--module <moduleId>] [--eject]");
+        console.log("  yarn mercato module enable <packageName> [--module <moduleId>] [--eject]");
+        console.log("  yarn mercato module eject <moduleId>");
+        return 0;
+      }
+      if (subcommand === "add") {
+        const { createResolver } = await import("./lib/resolver.js");
+        const { addOfficialModule } = await import("./lib/module-install.js");
+        const { packageSpec, eject, moduleId } = parseModuleInstallArgs(commandArgs);
+        if (!packageSpec) {
+          console.error("Usage: yarn mercato module add <packageSpec> [--module <moduleId>] [--eject]");
+          return 1;
         }
+        const result = await addOfficialModule(createResolver(), packageSpec, eject, moduleId ?? void 0);
+        console.log(`
+\u2705 Module "${result.moduleId}" enabled from ${result.from}.
+`);
+        console.log("Next steps:");
+        console.log("  1. Review generated files if needed: .mercato/generated/");
+        console.log("  2. Start dev:                         yarn dev");
         return 0;
       }
-      console.log(`Ejecting module "${moduleId}"...`);
-      ejectModule(resolver, moduleId);
-      console.log(`
-\u2705 Module "${moduleId}" ejected successfully!
+      if (subcommand === "enable") {
+        const packageName = commandArgs.find((arg) => !arg.startsWith("-"));
+        if (!packageName) {
+          console.error("Usage: yarn mercato module enable <packageName> [--module <moduleId>] [--eject]");
+          return 1;
+        }
+        const { createResolver } = await import("./lib/resolver.js");
+        const { enableOfficialModule } = await import("./lib/module-install.js");
+        const { moduleId, eject } = parseModuleInstallArgs(commandArgs);
+        const result = await enableOfficialModule(createResolver(), packageName, moduleId ?? void 0, eject);
+        console.log(`
+\u2705 Module "${result.moduleId}" enabled from ${result.from}.
 `);
-      console.log("Next steps:");
-      console.log("  1. Run generators:  yarn mercato generate all");
-      console.log(`  2. Customize:       edit src/modules/${moduleId}/`);
-      console.log("  3. Start dev:       yarn dev");
-      return 0;
+        console.log("Next steps:");
+        console.log("  1. Review generated files if needed: .mercato/generated/");
+        console.log("  2. Start dev:                         yarn dev");
+        return 0;
+      }
+      if (subcommand === "eject") {
+        return handleDirectEjectCommand(commandArgs);
+      }
+      console.error(`Unknown module subcommand "${subcommand}".`);
+      return 1;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(`\u274C Module command failed: ${message}`);
+      return 1;
+    }
+  }
+  if (first === "eject") {
+    try {
+      return handleDirectEjectCommand(parts.slice(1));
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       console.error(`\u274C Eject failed: ${message}`);
@@ -735,7 +809,7 @@ async function run(argv = process.argv) {
         command: "all",
         run: async (args) => {
           const { createResolver } = await import("./lib/resolver.js");
-          const { generateEntityIds, generateModuleRegistry, generateModuleRegistryCli, generateModuleEntities, generateModuleDi, generateOpenApi } = await import("./lib/generators/index.js");
+          const { generateEntityIds, generateModuleRegistry, generateModuleRegistryCli, generateModuleEntities, generateModuleDi, generateModulePackageSources, generateOpenApi } = await import("./lib/generators/index.js");
           const resolver = createResolver();
           const quiet = args.includes("--quiet") || args.includes("-q");
           console.log("Running all generators...");
@@ -744,6 +818,7 @@ async function run(argv = process.argv) {
           await generateModuleRegistryCli({ resolver, quiet });
           await generateModuleEntities({ resolver, quiet });
           await generateModuleDi({ resolver, quiet });
+          await generateModulePackageSources({ resolver, quiet });
           await generateOpenApi({ resolver, quiet });
           console.log("All generators completed.");
         }
@@ -761,9 +836,10 @@ async function run(argv = process.argv) {
         command: "registry",
         run: async (args) => {
           const { createResolver } = await import("./lib/resolver.js");
-          const { generateModuleRegistry } = await import("./lib/generators/index.js");
+          const { generateModulePackageSources, generateModuleRegistry } = await import("./lib/generators/index.js");
           const resolver = createResolver();
           await generateModuleRegistry({ resolver, quiet: args.includes("--quiet") });
+          await generateModulePackageSources({ resolver, quiet: args.includes("--quiet") });
         }
       },
       {
@@ -826,11 +902,10 @@ async function run(argv = process.argv) {
         command: "dev",
         run: async () => {
           const { spawn } = await import("child_process");
-          const path2 = await import("path");
-          const { createResolver } = await import("./lib/resolver.js");
-          const resolver = createResolver();
-          const appDir = resolver.getAppDir();
-          const nodeModulesBase = resolver.isMonorepo() ? resolver.getRootDir() : appDir;
+          const { resolveEnvironment } = await import("./lib/resolver.js");
+          const env = resolveEnvironment();
+          const appDir = env.appDir;
+          const nodeModulesBases = Array.from(/* @__PURE__ */ new Set([env.rootDir, appDir]));
           const processes = [];
           const autoSpawnWorkers = process.env.AUTO_SPAWN_WORKERS !== "false";
           const autoSpawnScheduler = process.env.AUTO_SPAWN_SCHEDULER !== "false";
@@ -846,8 +921,11 @@ async function run(argv = process.argv) {
           process.on("SIGTERM", cleanup);
           process.on("SIGINT", cleanup);
           console.log("[server] Starting Open Mercato in dev mode...");
-          const nextBin = path2.join(nodeModulesBase, "node_modules/next/dist/bin/next");
-          const mercatoBin = path2.join(nodeModulesBase, "node_modules/@open-mercato/cli/bin/mercato");
+          const { createResolver: createResolverForSources } = await import("./lib/resolver.js");
+          const { generateModulePackageSources } = await import("./lib/generators/index.js");
+          await generateModulePackageSources({ resolver: createResolverForSources(), quiet: true });
+          const nextBin = resolveInstalledBinary(nodeModulesBases, "next/dist/bin/next");
+          const mercatoBin = resolveInstalledBinary(nodeModulesBases, "@open-mercato/cli/bin/mercato");
           const nextProcess = spawn("node", [nextBin, "dev", "--turbopack"], {
             stdio: "inherit",
             env: process.env,
@@ -886,11 +964,10 @@ async function run(argv = process.argv) {
         command: "start",
         run: async () => {
           const { spawn } = await import("child_process");
-          const path2 = await import("path");
-          const { createResolver } = await import("./lib/resolver.js");
-          const resolver = createResolver();
-          const appDir = resolver.getAppDir();
-          const nodeModulesBase = resolver.isMonorepo() ? resolver.getRootDir() : appDir;
+          const { resolveEnvironment } = await import("./lib/resolver.js");
+          const env = resolveEnvironment();
+          const appDir = env.appDir;
+          const nodeModulesBases = Array.from(/* @__PURE__ */ new Set([env.rootDir, appDir]));
           const processes = [];
           const autoSpawnWorkers = process.env.AUTO_SPAWN_WORKERS !== "false";
           const autoSpawnScheduler = process.env.AUTO_SPAWN_SCHEDULER !== "false";
@@ -906,8 +983,8 @@ async function run(argv = process.argv) {
           process.on("SIGTERM", cleanup);
           process.on("SIGINT", cleanup);
           console.log("[server] Starting Open Mercato in production mode...");
-          const nextBin = path2.join(nodeModulesBase, "node_modules/next/dist/bin/next");
-          const mercatoBin = path2.join(nodeModulesBase, "node_modules/@open-mercato/cli/bin/mercato");
+          const nextBin = resolveInstalledBinary(nodeModulesBases, "next/dist/bin/next");
+          const mercatoBin = resolveInstalledBinary(nodeModulesBases, "@open-mercato/cli/bin/mercato");
           const nextProcess = spawn("node", [nextBin, "start"], {
             stdio: "inherit",
             env: process.env,