@fragno-dev/cli 0.1.17 → 0.1.19

package/src/commands/corpus.ts

@@ -5,6 +5,9 @@ import {
   getAllSubjects,
   getSubjectParent,
   getSubjectChildren,
+  getAllSubjectIdsInOrder,
+  isCategory,
+  getCategoryTitle,
 } from "@fragno-dev/corpus";
 import type { Subject, Example } from "@fragno-dev/corpus";
 import { marked } from "marked";
@@ -25,7 +28,7 @@ interface PrintOptions {
 /**
  * Build markdown content for multiple subjects
  */
-function buildSubjectsMarkdown(subjects: Subject[]): string {
+export function buildSubjectsMarkdown(subjects: Subject[]): string {
   let fullMarkdown = "";
 
   for (const subject of subjects) {
@@ -61,7 +64,7 @@ function buildSubjectsMarkdown(subjects: Subject[]): string {
 /**
  * Add line numbers to content
  */
-function addLineNumbers(content: string, startFrom: number = 1): string {
+export function addLineNumbers(content: string, startFrom: number = 1): string {
   const lines = content.split("\n");
   const maxDigits = String(startFrom + lines.length - 1).length;
 
@@ -77,7 +80,7 @@ function addLineNumbers(content: string, startFrom: number = 1): string {
 /**
  * Filter content by line range
  */
-function filterByLineRange(content: string, startLine: number, endLine: number): string {
+export function filterByLineRange(content: string, startLine: number, endLine: number): string {
   const lines = content.split("\n");
   // Convert to 0-based index
   const start = Math.max(0, startLine - 1);
@@ -88,7 +91,7 @@ function filterByLineRange(content: string, startLine: number, endLine: number):
 /**
  * Extract headings and code block information with line numbers
  */
-function extractHeadingsAndBlocks(subjects: Subject[]): string {
+export function extractHeadingsAndBlocks(subjects: Subject[]): string {
   let output = "";
   let currentLine = 1;
   let lastOutputLine = 0;
@@ -442,6 +445,52 @@ async function printCodeBlockById(
   }
 }
 
+/**
+ * Print only the topic tree
+ */
+function printTopicTree(): void {
+  const subjects = getSubjects();
+  const subjectMap = new Map(subjects.map((s) => [s.id, s]));
+
+  // Helper function to get title for any subject ID (including categories)
+  function getTitle(subjectId: string): string {
+    if (isCategory(subjectId)) {
+      return getCategoryTitle(subjectId);
+    }
+    const subject = subjectMap.get(subjectId);
+    return subject ? subject.title : subjectId;
+  }
+
+  // Helper function to recursively display tree
+  function displayNode(subjectId: string, indent: string, isLast: boolean, isRoot: boolean): void {
+    const title = getTitle(subjectId);
+
+    if (isRoot) {
+      console.log(`  ${subjectId.padEnd(30)} ${title}`);
+    } else {
+      const connector = isLast ? "└─" : "├─";
+      console.log(`${indent}${connector} ${subjectId.padEnd(26)} ${title}`);
+    }
+
+    const children = getSubjectChildren(subjectId);
+    if (children.length > 0) {
+      const childIndent = isRoot ? "    " : indent + (isLast ? "   " : "│  ");
+      for (let i = 0; i < children.length; i++) {
+        displayNode(children[i], childIndent, i === children.length - 1, false);
+      }
+    }
+  }
+
+  // Get all root subject IDs (including categories)
+  const allIds = getAllSubjectIdsInOrder();
+  const rootIds = allIds.filter((id) => !getSubjectParent(id));
+
+  // Display root subjects
+  for (const subjectId of rootIds) {
+    displayNode(subjectId, "", false, true);
+  }
+}
+
 /**
  * Print information about the corpus command
  */
@@ -456,9 +505,11 @@ function printCorpusHelp(): void {
   console.log("  -e, --end N                Ending line number to display to");
   console.log("  --headings                 Show only headings and code block IDs");
   console.log("  --id <id>                  Retrieve a specific code block by ID");
+  console.log("  --tree                     Show only the topic tree");
   console.log("");
   console.log("Examples:");
   console.log("  fragno-cli corpus                           # List all available topics");
+  console.log("  fragno-cli corpus --tree                    # Show only the topic tree");
   console.log("  fragno-cli corpus defining-routes           # Show route definition examples");
   console.log("  fragno-cli corpus --headings database-querying");
   console.log("                                              # Show structure overview");
@@ -470,42 +521,7 @@ function printCorpusHelp(): void {
   console.log("");
   console.log("Available topics:");
 
-  const subjects = getSubjects();
-
-  // Group subjects by their tree structure
-  const rootSubjects: Array<{
-    id: string;
-    title: string;
-    children: Array<{ id: string; title: string }>;
-  }> = [];
-  const subjectMap = new Map(subjects.map((s) => [s.id, s]));
-
-  for (const subject of subjects) {
-    const parent = getSubjectParent(subject.id);
-    if (!parent) {
-      // This is a root subject
-      const children = getSubjectChildren(subject.id);
-      rootSubjects.push({
-        id: subject.id,
-        title: subject.title,
-        children: children.map((childId) => ({
-          id: childId,
-          title: subjectMap.get(childId)?.title || childId,
-        })),
-      });
-    }
-  }
-
-  // Display in tree format
-  for (const root of rootSubjects) {
-    console.log(`  ${root.id.padEnd(30)} ${root.title}`);
-    for (let i = 0; i < root.children.length; i++) {
-      const child = root.children[i];
-      const isLast = i === root.children.length - 1;
-      const connector = isLast ? "└─" : "├─";
-      console.log(`    ${connector} ${child.id.padEnd(26)} ${child.title}`);
-    }
-  }
+  printTopicTree();
 }
 
 export const corpusCommand = define({
@@ -535,6 +551,10 @@ export const corpusCommand = define({
       type: "string",
       description: "Retrieve a specific code block by ID",
     },
+    tree: {
+      type: "boolean",
+      description: "Show only the topic tree (without help text)",
+    },
   },
   run: async (ctx) => {
     const topics = ctx.positionals;
@@ -543,6 +563,7 @@ export const corpusCommand = define({
     const endLine = ctx.values.end;
     const headingsOnly = ctx.values.headings ?? false;
     const codeBlockId = ctx.values.id;
+    const treeOnly = ctx.values.tree ?? false;
 
     // Handle --id flag
     if (codeBlockId) {
@@ -550,6 +571,12 @@ export const corpusCommand = define({
       return;
     }
 
+    // Handle --tree flag
+    if (treeOnly) {
+      printTopicTree();
+      return;
+    }
+
     // No topics provided - show help
     if (topics.length === 0) {
       printCorpusHelp();
@@ -573,8 +600,32 @@ export const corpusCommand = define({
         headingsOnly,
       });
     } catch (error) {
-      console.error("Error loading topics:", error instanceof Error ? error.message : error);
-      console.log("\nRun 'fragno-cli corpus' to see available topics.");
+      if (error instanceof Error && error.message.includes("ENOENT")) {
+        // Extract the subject name from the error message or use the topics array
+        const missingTopics = topics.filter((topic) => {
+          try {
+            getSubject(topic);
+            return false;
+          } catch {
+            return true;
+          }
+        });
+
+        if (missingTopics.length === 1) {
+          console.error(`Error: Subject '${missingTopics[0]}' not found.`);
+        } else if (missingTopics.length > 1) {
+          console.error(
+            `Error: Subjects not found: ${missingTopics.map((t) => `'${t}'`).join(", ")}`,
+          );
+        } else {
+          console.error("Error: One or more subjects not found.");
+        }
+        console.log("\nAvailable topics:");
+        printTopicTree();
+      } else {
+        console.error("Error loading topics:", error instanceof Error ? error.message : error);
+        console.log("\nRun 'fragno-cli corpus' to see available topics.");
+      }
       process.exit(1);
     }
   },

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

@@ -4,10 +4,8 @@ import {
   fragnoDatabaseAdapterVersionFakeSymbol,
 } from "@fragno-dev/db/adapters";
 import type { AnySchema } from "@fragno-dev/db/schema";
-import {
-  instantiatedFragmentFakeSymbol,
-  type FragnoInstantiatedFragment,
-} from "@fragno-dev/core/api/fragment-instantiation";
+import { instantiatedFragmentFakeSymbol } from "@fragno-dev/core/internal/symbols";
+import { type FragnoInstantiatedFragment } from "@fragno-dev/core";
 import { loadConfig } from "c12";
 import { relative } from "node:path";
 
@@ -126,9 +124,17 @@ export async function importFragmentFiles(paths: string[]): Promise<{
   };
 }
 
-function isFragnoInstantiatedFragment(
+function isNewFragnoInstantiatedFragment(
   value: unknown,
-): value is FragnoInstantiatedFragment<[], {}, {}, {}> {
+): value is FragnoInstantiatedFragment<
+  [],
+  unknown,
+  Record<string, unknown>,
+  Record<string, unknown>,
+  Record<string, unknown>,
+  unknown,
+  Record<string, unknown>
+> {
   return (
     typeof value === "object" &&
     value !== null &&
@@ -137,20 +143,6 @@ function isFragnoInstantiatedFragment(
   );
 }
 
-function additionalContextIsDatabaseContext(additionalContext: unknown): additionalContext is {
-  databaseSchema: AnySchema;
-  databaseNamespace: string;
-  databaseAdapter: DatabaseAdapter;
-} {
-  return (
-    typeof additionalContext === "object" &&
-    additionalContext !== null &&
-    "databaseSchema" in additionalContext &&
-    "databaseNamespace" in additionalContext &&
-    "databaseAdapter" in additionalContext
-  );
-}
-
 /**
  * Finds all FragnoDatabase instances in a module, including those embedded
  * in instantiated fragments.
@@ -163,20 +155,34 @@ export function findFragnoDatabases(
   for (const [_key, value] of Object.entries(targetModule)) {
     if (isFragnoDatabase(value)) {
       fragnoDatabases.push(value);
-    } else if (isFragnoInstantiatedFragment(value)) {
-      const additionalContext = value.additionalContext;
+    } else if (isNewFragnoInstantiatedFragment(value)) {
+      // Handle new fragment API
+      const internal = value.$internal;
+      const deps = internal.deps as Record<string, unknown>;
+      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"]) {
+        continue;
+      }
+
+      const schema = deps["schema"] as AnySchema;
+      const databaseAdapter = options["databaseAdapter"] as DatabaseAdapter | undefined;
 
-      if (!additionalContext || !additionalContextIsDatabaseContext(additionalContext)) {
+      if (!databaseAdapter) {
+        console.warn(
+          `Warning: Fragment '${value.name}' appears to be a database fragment but no databaseAdapter found in options.`,
+        );
         continue;
       }
 
-      // Extract database schema, namespace, and adapter from instantiated fragment's additionalContext
-      const { databaseSchema, databaseNamespace, databaseAdapter } = additionalContext;
+      // Derive namespace from fragment name (follows convention: fragmentName + "-db")
+      const namespace = value.name + "-db";
 
       fragnoDatabases.push(
         new FragnoDatabase({
-          namespace: databaseNamespace,
-          schema: databaseSchema,
+          namespace,
+          schema,
           adapter: databaseAdapter,
         }),
       );