@forge-ts/cli 0.15.0 → 0.16.0

package/dist/index.js

@@ -2,14 +2,15 @@
 import {
   initProjectCommand,
   runInitProject
-} from "./chunk-CINQWGH7.js";
+} from "./chunk-DV33Y4E2.js";
+import {
+  configureLogger,
+  forgeLogger
+} from "./chunk-CNINN7IQ.js";
 import {
   emitResult,
   resolveExitCode
 } from "./chunk-ZFFY4AQX.js";
-import {
-  createLogger
-} from "./chunk-7UPSAG3L.js";
 
 // src/index.ts
 import { createRequire } from "module";
@@ -96,8 +97,8 @@ var auditCommand = defineCommand({
   run({ args }) {
     const eventType = args.type;
     if (eventType && !VALID_EVENT_TYPES.includes(eventType)) {
-      console.error(
-        `Error: invalid event type "${eventType}". Valid types: ${VALID_EVENT_TYPES.join(", ")}`
+      forgeLogger.error(
+        `Invalid event type "${eventType}". Valid types: ${VALID_EVENT_TYPES.join(", ")}`
       );
       process.exit(1);
     }
@@ -283,15 +284,15 @@ var buildCommand = defineCommand2({
       mvi: args.mvi
     };
     emitResult(output, flags, (data) => {
-      const logger = createLogger();
       for (const step of data.steps) {
         if (step.status === "failed") {
           for (const err of step.errors ?? []) {
-            logger.error(`[${step.name}] ${err.message}`);
+            forgeLogger.error(`[${step.name}] ${err.message}`);
           }
         } else if (step.status === "success") {
           const detail = step.name === "api" && step.outputPath != null ? `Generated OpenAPI spec \u2192 ${step.outputPath}` : `Step complete`;
-          logger.step(step.name.toUpperCase(), detail, step.duration);
+          const durationStr = step.duration !== void 0 ? ` (${step.duration}ms)` : "";
+          forgeLogger.success(`${step.name.toUpperCase()}: ${detail}${durationStr}`);
         }
       }
       if (output.success) {
@@ -458,9 +459,7 @@ var bypassCommand = defineCommand3({
       return;
     }
     if (!args.reason) {
-      console.error(
-        "[forge-ts] error: --reason is required. Provide a justification for the bypass."
-      );
+      forgeLogger.error("--reason is required. Provide a justification for the bypass.");
       process.exit(1);
     }
     const output = await runBypassCreate({
@@ -820,11 +819,71 @@ var checkCommand = defineCommand4({
   }
 });
 
+// src/commands/docs-dev.ts
+import { spawn } from "child_process";
+import { resolve } from "path";
+import { loadConfig as loadConfig4 } from "@forge-ts/core";
+import { DEFAULT_TARGET, getAdapter } from "@forge-ts/gen";
+import { defineCommand as defineCommand5 } from "citty";
+async function runDocsDev(args) {
+  const config = await loadConfig4(args.cwd);
+  const target = args.target ?? config.gen.ssgTarget ?? DEFAULT_TARGET;
+  const adapter = getAdapter(target);
+  const outDir = resolve(config.outDir);
+  const devCmd = adapter.getDevCommand(outDir);
+  forgeLogger.info(`Starting ${devCmd.label}...`);
+  forgeLogger.info(`  Target: ${target}`);
+  forgeLogger.info(`  Directory: ${outDir}`);
+  forgeLogger.info(`  URL: ${devCmd.url}`);
+  const spawnArgs = [...devCmd.args];
+  if (args.port) {
+    spawnArgs.push("--port", args.port);
+  }
+  const proc = spawn(devCmd.bin, spawnArgs, {
+    cwd: devCmd.cwd,
+    stdio: "inherit",
+    shell: true
+  });
+  return new Promise((_resolve, reject) => {
+    proc.on("close", (code) => {
+      if (code === 0) {
+        _resolve();
+      } else {
+        reject(new Error(`${devCmd.label} exited with code ${code}`));
+      }
+    });
+    proc.on("error", reject);
+  });
+}
+var docsDevCommand = defineCommand5({
+  meta: {
+    name: "dev",
+    description: "Start a local doc preview server"
+  },
+  args: {
+    cwd: {
+      type: "string",
+      description: "Project root directory"
+    },
+    target: {
+      type: "string",
+      description: "SSG target override (reads from config by default)"
+    },
+    port: {
+      type: "string",
+      description: "Port for the dev server"
+    }
+  },
+  async run({ args }) {
+    await runDocsDev(args);
+  }
+});
+
 // src/commands/doctor.ts
 import { existsSync, readFileSync } from "fs";
 import { mkdir, writeFile } from "fs/promises";
 import { join } from "path";
-import { defineCommand as defineCommand5 } from "citty";
+import { defineCommand as defineCommand6 } from "citty";
 function readJsonSafe(filePath) {
   if (!existsSync(filePath)) {
     return null;
@@ -859,7 +918,7 @@ export default defineConfig({
 var DEFAULT_TSDOC_CONTENT = JSON.stringify(
   {
     $schema: "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
-    extends: ["@forge-ts/tsdoc-config/tsdoc.json"]
+    extends: ["@forge-ts/core/tsdoc-preset/tsdoc.json"]
   },
   null,
   "	"
@@ -901,18 +960,18 @@ async function runDoctor(args) {
   const tsdocPath = join(rootDir, "tsdoc.json");
   if (existsSync(tsdocPath)) {
     const tsdoc = readJsonSafe(tsdocPath);
-    if (tsdoc?.extends && tsdoc.extends.includes("@forge-ts/tsdoc-config/tsdoc.json")) {
+    if (tsdoc?.extends?.includes("@forge-ts/core/tsdoc-preset/tsdoc.json")) {
       checks.push({
         name: "tsdoc.json",
         status: "pass",
-        message: "tsdoc.json \u2014 extends @forge-ts/tsdoc-config",
+        message: "tsdoc.json \u2014 extends @forge-ts/core/tsdoc-preset",
         fixable: false
       });
     } else {
       checks.push({
         name: "tsdoc.json",
         status: "warn",
-        message: "tsdoc.json \u2014 does not extend @forge-ts/tsdoc-config",
+        message: "tsdoc.json \u2014 does not extend @forge-ts/core/tsdoc-preset",
         fixable: false
       });
     }
@@ -934,38 +993,25 @@ async function runDoctor(args) {
       fixable: true
     });
   }
-  const tsdocConfigModulePath = join(
-    rootDir,
-    "node_modules",
-    "@forge-ts",
-    "tsdoc-config",
-    "package.json"
-  );
-  if (existsSync(tsdocConfigModulePath)) {
-    const tsdocPkg = readJsonSafe(
-      tsdocConfigModulePath
-    );
-    const version = tsdocPkg?.version ?? "unknown";
+  const coreModulePath = join(rootDir, "node_modules", "@forge-ts", "core", "package.json");
+  if (existsSync(coreModulePath)) {
+    const corePkg = readJsonSafe(coreModulePath);
+    const version = corePkg?.version ?? "unknown";
     checks.push({
-      name: "@forge-ts/tsdoc-config",
+      name: "@forge-ts/core",
       status: "pass",
-      message: `@forge-ts/tsdoc-config \u2014 installed (${version})`,
+      message: `@forge-ts/core \u2014 installed (${version})`,
       fixable: false
     });
   } else {
     checks.push({
-      name: "@forge-ts/tsdoc-config",
+      name: "@forge-ts/core",
       status: "warn",
-      message: "@forge-ts/tsdoc-config \u2014 MISSING (run npm install @forge-ts/tsdoc-config)",
+      message: "@forge-ts/core \u2014 MISSING (run npm install @forge-ts/core)",
       fixable: false
     });
   }
-  const tsPkgPath = join(
-    rootDir,
-    "node_modules",
-    "typescript",
-    "package.json"
-  );
+  const tsPkgPath = join(rootDir, "node_modules", "typescript", "package.json");
   if (existsSync(tsPkgPath)) {
     const tsPkg = readJsonSafe(tsPkgPath);
     const version = tsPkg?.version ?? "unknown";
@@ -1106,9 +1152,7 @@ async function runDoctor(args) {
     const records = readJsonSafe(bypassPath);
     if (records && Array.isArray(records)) {
       const now = /* @__PURE__ */ new Date();
-      const active = records.filter(
-        (r) => r.expiresAt && new Date(r.expiresAt) > now
-      );
+      const active = records.filter((r) => r.expiresAt && new Date(r.expiresAt) > now);
       const expired = records.length - active.length;
       if (active.length > 0) {
         checks.push({
@@ -1231,13 +1275,11 @@ function formatDoctorHuman(result) {
     `  Summary: ${result.summary.passed} passed, ${result.summary.warnings} warning${result.summary.warnings !== 1 ? "s" : ""}, ${result.summary.errors} error${result.summary.errors !== 1 ? "s" : ""}`
   );
   if (result.summary.errors > 0 || result.summary.warnings > 0) {
-    lines.push(
-      "  Run: forge-ts doctor --fix   to auto-fix resolvable issues"
-    );
+    lines.push("  Run: forge-ts doctor --fix   to auto-fix resolvable issues");
   }
   return lines.join("\n");
 }
-var doctorCommand = defineCommand5({
+var doctorCommand = defineCommand6({
   meta: {
     name: "doctor",
     description: "Project integrity check and repair"
@@ -1294,68 +1336,6 @@ var doctorCommand = defineCommand5({
   }
 });
 
-// src/commands/docs-dev.ts
-import { spawn } from "child_process";
-import { resolve } from "path";
-import { loadConfig as loadConfig4 } from "@forge-ts/core";
-import { DEFAULT_TARGET, getAdapter } from "@forge-ts/gen";
-import { defineCommand as defineCommand6 } from "citty";
-async function runDocsDev(args) {
-  const logger = createLogger();
-  const config = await loadConfig4(args.cwd);
-  const target = args.target ?? config.gen.ssgTarget ?? DEFAULT_TARGET;
-  const adapter = getAdapter(target);
-  const outDir = resolve(config.outDir);
-  const devCmd = adapter.getDevCommand(outDir);
-  logger.info(`Starting ${devCmd.label}...`);
-  logger.info(`  Target: ${target}`);
-  logger.info(`  Directory: ${outDir}`);
-  logger.info(`  URL: ${devCmd.url}`);
-  logger.info("");
-  const spawnArgs = [...devCmd.args];
-  if (args.port) {
-    spawnArgs.push("--port", args.port);
-  }
-  const proc = spawn(devCmd.bin, spawnArgs, {
-    cwd: devCmd.cwd,
-    stdio: "inherit",
-    shell: true
-  });
-  return new Promise((_resolve, reject) => {
-    proc.on("close", (code) => {
-      if (code === 0) {
-        _resolve();
-      } else {
-        reject(new Error(`${devCmd.label} exited with code ${code}`));
-      }
-    });
-    proc.on("error", reject);
-  });
-}
-var docsDevCommand = defineCommand6({
-  meta: {
-    name: "dev",
-    description: "Start a local doc preview server"
-  },
-  args: {
-    cwd: {
-      type: "string",
-      description: "Project root directory"
-    },
-    target: {
-      type: "string",
-      description: "SSG target override (reads from config by default)"
-    },
-    port: {
-      type: "string",
-      description: "Port for the dev server"
-    }
-  },
-  async run({ args }) {
-    await runDocsDev(args);
-  }
-});
-
 // src/commands/init-docs.ts
 import { existsSync as existsSync2 } from "fs";
 import { mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
@@ -1454,7 +1434,7 @@ async function runInitDocs(args) {
       const tsdocContent = JSON.stringify(
         {
           $schema: "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
-          extends: ["@forge-ts/tsdoc-config/tsdoc.json"]
+          extends: ["@forge-ts/core/tsdoc-preset/tsdoc.json"]
         },
         null,
         "	"
@@ -1581,9 +1561,8 @@ var initDocsCommand = defineCommand7({
     };
     emitResult(output, flags, (data, cmd) => {
       if (!cmd.success) {
-        const logger = createLogger();
         const msg = cmd.errors?.[0]?.message ?? "Scaffold failed";
-        logger.error(msg);
+        forgeLogger.error(msg);
         return "";
       }
       return formatInitDocsHuman(data);
@@ -1799,9 +1778,8 @@ var initHooksCommand = defineCommand8({
     };
     emitResult(output, flags, (data, cmd) => {
       if (!cmd.success) {
-        const logger = createLogger();
         const msg = cmd.errors?.[0]?.message ?? "Hook scaffolding failed";
-        logger.error(msg);
+        forgeLogger.error(msg);
         return "";
       }
       return formatInitHooksHuman(data);
@@ -2069,8 +2047,7 @@ var prepublishCommand = defineCommand10({
     };
     emitResult(output, flags, (data, cmd) => {
       if (!cmd.success) {
-        const logger = createLogger();
-        logger.error("Prepublish gate failed");
+        forgeLogger.error("Prepublish gate failed");
       }
       return formatPrepublishHuman(data);
     });
@@ -2303,9 +2280,7 @@ var unlockCommand = defineCommand12({
   },
   async run({ args }) {
     if (!args.reason) {
-      console.error(
-        "[forge-ts] error: --reason is required. Provide a reason for unlocking the config."
-      );
+      forgeLogger.error("--reason is required. Provide a reason for unlocking the config.");
       process.exit(1);
     }
     const output = await runUnlock({
@@ -2376,9 +2351,9 @@ var initCommand2 = defineCommand13({
     if (hasSubCommand) {
       return;
     }
-    const { runInitProject: runInitProject2 } = await import("./init-project-5DESIZ73.js");
+    const { runInitProject: runInitProject2 } = await import("./init-project-5AWZ2LAI.js");
     const { emitResult: emitResult2, resolveExitCode: resolveExitCode2 } = await import("./output-OSCHMPOX.js");
-    const { createLogger: createLogger3 } = await import("./logger-MMBBZG6U.js");
+    const { forgeLogger: forgeLogger2 } = await import("./forge-logger-RTOBEKWH.js");
     const output = await runInitProject2({
       cwd: args.cwd,
       mvi: args.mvi
@@ -2391,9 +2366,8 @@ var initCommand2 = defineCommand13({
     };
     emitResult2(output, flags, (data, cmd) => {
       if (!cmd.success) {
-        const logger = createLogger3();
         const msg = cmd.errors?.[0]?.message ?? "Init failed";
-        logger.error(msg);
+        forgeLogger2.error(msg);
         return "";
       }
       const lines = [];
@@ -2474,10 +2448,11 @@ export {
   buildCommand,
   bypassCommand,
   checkCommand,
-  createLogger,
+  configureLogger,
   docsDevCommand,
   doctorCommand,
   emitResult,
+  forgeLogger,
   initDocsCommand,
   initHooksCommand,
   initProjectCommand,