@fragno-dev/cli 0.2.1 → 0.2.3

package/dist/serve-eh3Tpjhc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serve-eh3Tpjhc.js","names":["allFragments: FragnoInstantiatedFragment<\n      [],\n      unknown,\n      Record<string, unknown>,\n      Record<string, unknown>,\n      Record<string, unknown>,\n      unknown,\n      Record<string, unknown>\n    >[]"],"sources":["../src/commands/serve.ts"],"sourcesContent":["import { createServer, type Server } from \"node:http\";\nimport { resolve, relative } from \"node:path\";\n\nimport { define } from \"gunshi\";\n\nimport type { FragnoInstantiatedFragment } from \"@fragno-dev/core\";\nimport { toNodeHandler } from \"@fragno-dev/node\";\n\nimport { findFragnoFragments } from \"../utils/find-fragno-databases\";\nimport { loadConfig } from \"../utils/load-config\";\n\nexport const serveCommand = define({\n  name: \"serve\",\n  description: \"Start a local HTTP server to serve one or more Fragno fragments\",\n  args: {\n    port: {\n      type: \"number\",\n      short: \"p\",\n      description: \"Port to listen on\",\n      default: 8080,\n    },\n    host: {\n      type: \"string\",\n      short: \"H\",\n      description: \"Host to bind to\",\n      default: \"localhost\",\n    },\n  },\n  run: async (ctx) => {\n    const targets = ctx.positionals;\n    const port = ctx.values.port ?? 8080;\n    const host = ctx.values.host ?? \"localhost\";\n    const cwd = process.cwd();\n\n    if (targets.length === 0) {\n      throw new Error(\n        \"No fragment files specified.\\n\\n\" +\n          \"Usage: fragno-cli serve <fragment-file> [fragment-file...]\\n\\n\" +\n          \"Example: fragno-cli serve ./src/my-fragment.ts\",\n      );\n    }\n\n    const targetPaths = targets.map((target) => resolve(cwd, target));\n\n    // Import all fragment files and find instantiated fragments\n    const allFragments: FragnoInstantiatedFragment<\n      [],\n      unknown,\n      Record<string, unknown>,\n      Record<string, unknown>,\n      Record<string, unknown>,\n      unknown,\n      Record<string, unknown>\n    >[] = [];\n\n    for (const targetPath of targetPaths) {\n      const relativePath = relative(cwd, targetPath);\n      const config = await loadConfig(targetPath);\n      const fragments = findFragnoFragments(config);\n\n      if (fragments.length === 0) {\n        console.warn(\n          `Warning: No instantiated fragments found in ${relativePath}.\\n` +\n            `Make sure you export an instantiated fragment (e.g., the return value of createMyFragment()).\\n`,\n        );\n        continue;\n      }\n\n      allFragments.push(...fragments);\n      console.log(\n        `  Found ${fragments.length} fragment(s) in ${relativePath}: ${fragments.map((f) => f.name).join(\", \")}`,\n      );\n    }\n\n    if (allFragments.length === 0) {\n      throw new Error(\n        \"No instantiated fragments found in any of the specified files.\\n\" +\n          \"Make sure your files export instantiated fragments.\",\n      );\n    }\n\n    // Build handlers mapped by mountRoute\n    const handlers = allFragments.map((fragment) => ({\n      mountRoute: fragment.mountRoute,\n      handler: toNodeHandler(fragment.handler.bind(fragment)),\n      fragment,\n    }));\n\n    const server = createServer((req, res) => {\n      const url = req.url ?? \"\";\n\n      for (const { mountRoute, handler } of handlers) {\n        if (url.startsWith(mountRoute)) {\n          return handler(req, res);\n        }\n      }\n\n      res.statusCode = 404;\n      res.setHeader(\"Content-Type\", \"application/json\");\n      res.end(\n        JSON.stringify({\n          error: \"Not Found\",\n          availableRoutes: handlers.map((h) => h.mountRoute),\n        }),\n      );\n    });\n\n    server.listen(port, host, () => {\n      const hostStr = addressToString(server);\n      console.log(`\\nFragno server is running on: ${hostStr}\\n`);\n\n      for (const { fragment } of handlers) {\n        console.log(`Fragment: ${fragment.name}`);\n        console.log(`  Mount: ${hostStr}${fragment.mountRoute}`);\n\n        const routes = fragment.routes as unknown as { method: string; path: string }[];\n        if (routes.length > 0) {\n          console.log(\"  Routes:\");\n          for (const route of routes) {\n            console.log(`    ${route.method} ${fragment.mountRoute}${route.path}`);\n          }\n        }\n\n        console.log(\"\");\n      }\n    });\n  },\n});\n\nfunction addressToString(server: Server, protocol: \"http\" | \"https\" = \"http\"): string {\n  const addr = server.address();\n  if (!addr) {\n    throw new Error(\"Address invalid\");\n  }\n\n  if (typeof addr === \"string\") {\n    return addr;\n  }\n\n  let host = addr.address;\n\n  if (host === \"::\" || host === \"0.0.0.0\") {\n    host = \"localhost\";\n  }\n\n  if (addr.family === \"IPv6\" && host !== \"localhost\") {\n    host = `[${host}]`;\n  }\n\n  return `${protocol}://${host}:${addr.port}`;\n}\n"],"mappings":";;;;;;;AAWA,MAAa,eAAe,OAAO;CACjC,MAAM;CACN,aAAa;CACb,MAAM;EACJ,MAAM;GACJ,MAAM;GACN,OAAO;GACP,aAAa;GACb,SAAS;GACV;EACD,MAAM;GACJ,MAAM;GACN,OAAO;GACP,aAAa;GACb,SAAS;GACV;EACF;CACD,KAAK,OAAO,QAAQ;EAClB,MAAM,UAAU,IAAI;EACpB,MAAM,OAAO,IAAI,OAAO,QAAQ;EAChC,MAAM,OAAO,IAAI,OAAO,QAAQ;EAChC,MAAM,MAAM,QAAQ,KAAK;AAEzB,MAAI,QAAQ,WAAW,EACrB,OAAM,IAAI,MACR,+IAGD;EAGH,MAAM,cAAc,QAAQ,KAAK,WAAW,QAAQ,KAAK,OAAO,CAAC;EAGjE,MAAMA,eAQA,EAAE;AAER,OAAK,MAAM,cAAc,aAAa;GACpC,MAAM,eAAe,SAAS,KAAK,WAAW;GAE9C,MAAM,YAAY,oBADH,MAAM,WAAW,WAAW,CACE;AAE7C,OAAI,UAAU,WAAW,GAAG;AAC1B,YAAQ,KACN,+CAA+C,aAAa,oGAE7D;AACD;;AAGF,gBAAa,KAAK,GAAG,UAAU;AAC/B,WAAQ,IACN,WAAW,UAAU,OAAO,kBAAkB,aAAa,IAAI,UAAU,KAAK,MAAM,EAAE,KAAK,CAAC,KAAK,KAAK,GACvG;;AAGH,MAAI,aAAa,WAAW,EAC1B,OAAM,IAAI,MACR,sHAED;EAIH,MAAM,WAAW,aAAa,KAAK,cAAc;GAC/C,YAAY,SAAS;GACrB,SAAS,cAAc,SAAS,QAAQ,KAAK,SAAS,CAAC;GACvD;GACD,EAAE;EAEH,MAAM,SAAS,cAAc,KAAK,QAAQ;GACxC,MAAM,MAAM,IAAI,OAAO;AAEvB,QAAK,MAAM,EAAE,YAAY,aAAa,SACpC,KAAI,IAAI,WAAW,WAAW,CAC5B,QAAO,QAAQ,KAAK,IAAI;AAI5B,OAAI,aAAa;AACjB,OAAI,UAAU,gBAAgB,mBAAmB;AACjD,OAAI,IACF,KAAK,UAAU;IACb,OAAO;IACP,iBAAiB,SAAS,KAAK,MAAM,EAAE,WAAW;IACnD,CAAC,CACH;IACD;AAEF,SAAO,OAAO,MAAM,YAAY;GAC9B,MAAM,UAAU,gBAAgB,OAAO;AACvC,WAAQ,IAAI,kCAAkC,QAAQ,IAAI;AAE1D,QAAK,MAAM,EAAE,cAAc,UAAU;AACnC,YAAQ,IAAI,aAAa,SAAS,OAAO;AACzC,YAAQ,IAAI,YAAY,UAAU,SAAS,aAAa;IAExD,MAAM,SAAS,SAAS;AACxB,QAAI,OAAO,SAAS,GAAG;AACrB,aAAQ,IAAI,YAAY;AACxB,UAAK,MAAM,SAAS,OAClB,SAAQ,IAAI,OAAO,MAAM,OAAO,GAAG,SAAS,aAAa,MAAM,OAAO;;AAI1E,YAAQ,IAAI,GAAG;;IAEjB;;CAEL,CAAC;AAEF,SAAS,gBAAgB,QAAgB,WAA6B,QAAgB;CACpF,MAAM,OAAO,OAAO,SAAS;AAC7B,KAAI,CAAC,KACH,OAAM,IAAI,MAAM,kBAAkB;AAGpC,KAAI,OAAO,SAAS,SAClB,QAAO;CAGT,IAAI,OAAO,KAAK;AAEhB,KAAI,SAAS,QAAQ,SAAS,UAC5B,QAAO;AAGT,KAAI,KAAK,WAAW,UAAU,SAAS,YACrC,QAAO,IAAI,KAAK;AAGlB,QAAO,GAAG,SAAS,KAAK,KAAK,GAAG,KAAK"}

package/package.json

@@ -1,50 +1,48 @@
 {
   "name": "@fragno-dev/cli",
-  "version": "0.2.1",
+  "version": "0.2.3",
+  "homepage": "https://fragno.dev",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rejot-dev/fragno.git",
+    "directory": "apps/fragno-cli"
+  },
+  "bin": {
+    "fragno-cli": "./bin/run.js"
+  },
+  "type": "module",
+  "main": "./dist/cli.js",
+  "module": "./dist/cli.js",
+  "types": "./dist/cli.d.ts",
   "exports": {
     ".": {
-      "development": "./src/cli.ts",
       "types": "./dist/cli.d.ts",
       "default": "./dist/cli.js"
     }
   },
-  "type": "module",
-  "bin": {
-    "fragno-cli": "./bin/run.js"
-  },
-  "engines": {
-    "node": ">=22"
+  "dependencies": {
+    "@clack/prompts": "^0.11.0",
+    "c12": "^3.3.3",
+    "gunshi": "^0.26.3",
+    "jsonc-parser": "^3.3.1",
+    "@fragno-dev/core": "0.2.2",
+    "@fragno-dev/db": "0.4.1",
+    "@fragno-dev/node": "0.0.9"
   },
   "devDependencies": {
     "@types/node": "^22.19.7",
-    "@vitest/coverage-istanbul": "^3.2.4",
+    "@vitest/coverage-istanbul": "^4.1.0",
     "@fragno-private/typescript-config": "0.0.1",
     "@fragno-private/vitest-config": "0.0.0"
   },
-  "dependencies": {
-    "@clack/prompts": "^0.11.0",
-    "c12": "^3.3.3",
-    "gunshi": "^0.26.3",
-    "marked": "^15.0.12",
-    "marked-terminal": "^7.3.0",
-    "@fragno-dev/core": "0.2.0",
-    "@fragno-dev/corpus": "0.0.7",
-    "@fragno-dev/db": "0.3.0",
-    "@fragno-dev/node": "0.0.8"
-  },
-  "main": "./dist/cli.js",
-  "module": "./dist/cli.js",
-  "types": "./dist/cli.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rejot-dev/fragno.git",
-    "directory": "apps/fragno-cli"
+  "engines": {
+    "node": ">=22"
   },
-  "homepage": "https://fragno.dev",
-  "license": "MIT",
   "scripts": {
     "build": "tsdown",
     "build:watch": "tsdown --watch",
-    "types:check": "tsc --noEmit"
+    "types:check": "tsc --noEmit",
+    "test": "vitest run"
   }
 }

package/src/cli.ts

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
 import { cli, define } from "gunshi";
+
 import { generateCommand } from "./commands/db/generate.js";
-import { migrateCommand } from "./commands/db/migrate.js";
 import { infoCommand } from "./commands/db/info.js";
+import { migrateCommand } from "./commands/db/migrate.js";
 import { searchCommand } from "./commands/search.js";
-import { corpusCommand } from "./commands/corpus.js";
-import { serveCommand } from "./commands/serve.js";
-import { readFileSync } from "node:fs";
-import { fileURLToPath } from "node:url";
-import { dirname, join } from "node:path";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const packageJson = JSON.parse(readFileSync(join(__dirname, "../package.json"), "utf-8"));
@@ -44,14 +44,9 @@ export async function run() {
         name: "fragno-cli search",
         version,
       });
-    } else if (args[0] === "corpus") {
-      // Run corpus command directly
-      await cli(args.slice(1), corpusCommand, {
-        name: "fragno-cli corpus",
-        version,
-      });
     } else if (args[0] === "serve") {
       // Run serve command directly
+      const { serveCommand } = await import("./commands/serve.js");
       await cli(args.slice(1), serveCommand, {
         name: "fragno-cli serve",
         version,
@@ -112,13 +107,11 @@ export async function run() {
       console.log("  serve                 Start a local HTTP server to serve fragments");
       console.log("  db                    Database management commands");
       console.log("  search                Search the Fragno documentation");
-      console.log("  corpus                View code examples and documentation for Fragno");
       console.log("");
       console.log("For more info, run any command with the `--help` flag:");
       console.log("  fragno-cli serve --help");
       console.log("  fragno-cli db --help");
       console.log("  fragno-cli search --help");
-      console.log("  fragno-cli corpus --help");
       console.log("");
       console.log("OPTIONS:");
       console.log("  -h, --help             Display this help message");
@@ -142,4 +135,4 @@ if (import.meta.main) {
   await run();
 }
 
-export { generateCommand, migrateCommand, infoCommand, searchCommand, corpusCommand, serveCommand };
+export { generateCommand, migrateCommand, infoCommand, searchCommand };

package/src/commands/db/generate.ts

@@ -1,7 +1,9 @@
 import { writeFile, mkdir } from "node:fs/promises";
 import { resolve, dirname } from "node:path";
-import { define } from "gunshi";
+
 import { generateSchemaArtifacts } from "@fragno-dev/db/generation-engine";
+import { define } from "gunshi";
+
 import { importFragmentFiles } from "../../utils/find-fragno-databases";
 
 // Define the db generate command with type safety

package/src/commands/db/info.ts

@@ -1,5 +1,7 @@
 import { resolve } from "node:path";
+
 import { define } from "gunshi";
+
 import { importFragmentFiles } from "../../utils/find-fragno-databases";
 
 export const infoCommand = define({

package/src/commands/db/migrate.ts

@@ -1,7 +1,9 @@
 import { resolve } from "node:path";
+
+import { executeMigrations, type ExecuteMigrationResult } from "@fragno-dev/db/generation-engine";
 import { define } from "gunshi";
+
 import { importFragmentFiles } from "../../utils/find-fragno-databases";
-import { executeMigrations, type ExecuteMigrationResult } from "@fragno-dev/db/generation-engine";
 
 export const migrateCommand = define({
   name: "migrate",

package/src/commands/search.ts

@@ -1,4 +1,5 @@
 import { define } from "gunshi";
+
 import {
   mergeResultsByUrl,
   formatAsMarkdown,

package/src/commands/serve.ts

@@ -1,10 +1,13 @@
 import { createServer, type Server } from "node:http";
 import { resolve, relative } from "node:path";
+
 import { define } from "gunshi";
-import { toNodeHandler } from "@fragno-dev/node";
+
 import type { FragnoInstantiatedFragment } from "@fragno-dev/core";
-import { loadConfig } from "../utils/load-config";
+import { toNodeHandler } from "@fragno-dev/node";
+
 import { findFragnoFragments } from "../utils/find-fragno-databases";
+import { loadConfig } from "../utils/load-config";
 
 export const serveCommand = define({
   name: "serve",

package/src/utils/find-fragno-databases.ts

@@ -1,13 +1,16 @@
-import { isFragnoDatabase, type DatabaseAdapter, FragnoDatabase } from "@fragno-dev/db";
+import { relative } from "node:path";
+
+import { instantiatedFragmentFakeSymbol } from "@fragno-dev/core/internal/symbols";
 import {
   fragnoDatabaseAdapterNameFakeSymbol,
   fragnoDatabaseAdapterVersionFakeSymbol,
 } from "@fragno-dev/db/adapters";
 import type { AnySchema } from "@fragno-dev/db/schema";
-import { instantiatedFragmentFakeSymbol } from "@fragno-dev/core/internal/symbols";
+
 import { type FragnoInstantiatedFragment } from "@fragno-dev/core";
+import { isFragnoDatabase, type DatabaseAdapter, FragnoDatabase } from "@fragno-dev/db";
+
 import { loadConfig } from "./load-config";
-import { relative } from "node:path";
 
 export async function importFragmentFile(path: string): Promise<Record<string, unknown>> {
   // Enable dry run mode for database schema extraction
@@ -201,13 +204,15 @@ export function findFragnoDatabases(
       const options = internal.options as Record<string, unknown>;
 
       // Check if this is a database fragment by looking for implicit database dependencies
-      if (!deps["db"] || !deps["schema"]) {
+      if (!deps["schema"]) {
         continue;
       }
 
       const schema = deps["schema"] as AnySchema;
-      const namespace = deps["namespace"] as string;
-      const databaseAdapter = options["databaseAdapter"] as DatabaseAdapter | undefined;
+      const namespace = deps["namespace"] as string | null;
+      const databaseAdapter =
+        (deps["databaseAdapter"] as DatabaseAdapter | undefined) ??
+        (options["databaseAdapter"] as DatabaseAdapter | undefined);
 
       if (!databaseAdapter) {
         console.warn(

package/src/utils/load-config.test.ts

@@ -1,18 +1,26 @@
 import { describe, it, expect } from "vitest";
-import { stripJsonComments, convertTsconfigPathsToJitiAlias } from "./load-config";
+
 import { resolve } from "node:path";
 
+import { stripJsonComments, convertTsconfigPathsToJitiAlias } from "./load-config";
+
 describe("stripJsonComments", () => {
   it("should strip single-line comments", () => {
     const input = `{
   // This is a comment
   "key": "value"
 }`;
-    const expected = `{
-  
-  "key": "value"
+    const result = stripJsonComments(input);
+    expect(() => JSON.parse(result)).not.toThrow();
+    expect(JSON.parse(result)).toEqual({ key: "value" });
+  });
+
+  it("does not strip double slashes in strings", () => {
+    const input = `{
+  "key": "https://example.com/foo",
+  "another": "value"
 }`;
-    expect(stripJsonComments(input)).toBe(expected);
+    expect(stripJsonComments(input)).toBe(input);
   });
 
   it("should strip multiple single-line comments", () => {
@@ -22,13 +30,21 @@ describe("stripJsonComments", () => {
   // Second comment
   "key2": "value2"
 }`;
-    const expected = `{
-  
-  "key1": "value1", 
-  
-  "key2": "value2"
-}`;
-    expect(stripJsonComments(input)).toBe(expected);
+    const result = stripJsonComments(input);
+    expect(() => JSON.parse(result)).not.toThrow();
+    expect(JSON.parse(result)).toEqual({ key1: "value1", key2: "value2" });
+  });
+
+  it("does not strip multi line comments chars in strings", () => {
+    const input = `{
+      "compilerOptions": {
+        "paths": {
+          "~/*": ["./src/*"]
+        }
+      },
+      "include": ["**/*.ts", "**/*.tsx"],
+    }`;
+    expect(stripJsonComments(input)).toBe(input);
   });
 
   it("should strip multi-line comments", () => {
@@ -37,11 +53,9 @@ describe("stripJsonComments", () => {
      multi-line comment */
   "key": "value"
 }`;
-    const expected = `{
-  
-  "key": "value"
-}`;
-    expect(stripJsonComments(input)).toBe(expected);
+    const result = stripJsonComments(input);
+    expect(() => JSON.parse(result)).not.toThrow();
+    expect(JSON.parse(result)).toEqual({ key: "value" });
   });
 
   it("should strip multiple multi-line comments", () => {
@@ -52,13 +66,9 @@ describe("stripJsonComments", () => {
      spanning lines */
   "key2": "value2"
 }`;
-    const expected = `{
-  
-  "key1": "value1",
-  
-  "key2": "value2"
-}`;
-    expect(stripJsonComments(input)).toBe(expected);
+    const result = stripJsonComments(input);
+    expect(() => JSON.parse(result)).not.toThrow();
+    expect(JSON.parse(result)).toEqual({ key1: "value1", key2: "value2" });
   });
 
   it("should strip both single-line and multi-line comments", () => {
@@ -69,13 +79,9 @@ describe("stripJsonComments", () => {
      comment */
   "key2": "value2" // Another single line
 }`;
-    const expected = `{
-  
-  "key1": "value1",
-  
-  "key2": "value2" 
-}`;
-    expect(stripJsonComments(input)).toBe(expected);
+    const result = stripJsonComments(input);
+    expect(() => JSON.parse(result)).not.toThrow();
+    expect(JSON.parse(result)).toEqual({ key1: "value1", key2: "value2" });
   });
 
   it("should handle strings with comment-like content", () => {
@@ -83,12 +89,12 @@ describe("stripJsonComments", () => {
   "url": "https://example.com",
   "comment": "This // is not a comment"
 }`;
-    // Note: This is a known limitation - the simple regex approach
-    // will strip what looks like comments even inside strings
-    // For tsconfig.json files this is typically fine since URLs/strings
-    // with comment syntax are rare
     const result = stripJsonComments(input);
-    expect(result).toContain('"url": "https:');
+    expect(() => JSON.parse(result)).not.toThrow();
+    expect(JSON.parse(result)).toEqual({
+      url: "https://example.com",
+      comment: "This // is not a comment",
+    });
   });
 
   it("should handle empty input", () => {

package/src/utils/load-config.ts

@@ -1,7 +1,9 @@
-import { loadConfig as c12LoadConfig } from "c12";
+import { constants } from "node:fs";
 import { readFile, access } from "node:fs/promises";
 import { dirname, resolve, join } from "node:path";
-import { constants } from "node:fs";
+
+import { loadConfig as c12LoadConfig } from "c12";
+import { stripComments } from "jsonc-parser";
 
 /**
  * Checks if a file exists using async API.
@@ -37,13 +39,7 @@ async function findTsconfig(startPath: string): Promise<string | null> {
  * Strips comments from JSONC (JSON with Comments) content.
  */
 export function stripJsonComments(jsonc: string): string {
-  // Remove single-line comments (// ...)
-  let result = jsonc.replace(/\/\/[^\n]*/g, "");
-
-  // Remove multi-line comments (/* ... */)
-  result = result.replace(/\/\*[\s\S]*?\*\//g, "");
-
-  return result;
+  return stripComments(jsonc);
 }
 
 /**

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@fragno-private/typescript-config/tsconfig.base.json",
+  "extends": "@fragno-private/typescript-config/tsconfig.node.json",
   "compilerOptions": {
     "outDir": "./dist",
     "rootDir": ".",

package/vitest.config.ts

@@ -1,4 +1,5 @@
 import { defineConfig, mergeConfig } from "vitest/config";
+
 import { baseConfig } from "@fragno-private/vitest-config";
 
 export default defineConfig(