@fragno-dev/cli 0.1.17 → 0.1.19

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @fragno-dev/cli@0.1.17 build /home/runner/work/fragno/fragno/apps/fragno-cli
+> @fragno-dev/cli@0.1.19 build /home/runner/work/fragno/fragno/apps/fragno-cli
 > tsdown
 
 ℹ tsdown v0.15.12 powered by rolldown v1.0.0-beta.45
@@ -10,9 +10,9 @@
 ℹ Build start
 ℹ Granting execute permission to dist/cli.d.ts
 ℹ Granting execute permission to dist/cli.js
-ℹ dist/cli.js        33.97 kB │ gzip:  8.15 kB
-ℹ dist/cli.js.map    69.21 kB │ gzip: 16.57 kB
-ℹ dist/cli.d.ts.map   0.82 kB │ gzip:  0.34 kB
-ℹ dist/cli.d.ts       1.88 kB │ gzip:  0.44 kB
-ℹ 4 files, total: 105.88 kB
-✔ Build complete in 8921ms
+ℹ dist/cli.js        35.38 kB │ gzip:  8.58 kB
+ℹ dist/cli.js.map    71.83 kB │ gzip: 17.26 kB
+ℹ dist/cli.d.ts.map   0.83 kB │ gzip:  0.39 kB
+ℹ dist/cli.d.ts       2.01 kB │ gzip:  0.49 kB
+ℹ 4 files, total: 110.06 kB
+✔ Build complete in 8194ms

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @fragno-dev/cli
 
+## 0.1.19
+
+### Patch Changes
+
+- 5ea24d2: refactor: improve Fragment builder and instatiator
+- Updated dependencies [d6a7ff5]
+- Updated dependencies [e848208]
+- Updated dependencies [e9b2e7d]
+- Updated dependencies [5e185bc]
+- Updated dependencies [ec622bc]
+- Updated dependencies [219ce35]
+- Updated dependencies [b34917f]
+- Updated dependencies [7276378]
+- Updated dependencies [462004f]
+- Updated dependencies [5ea24d2]
+- Updated dependencies [f22c503]
+- Updated dependencies [3474006]
+  - @fragno-dev/db@0.1.15
+  - @fragno-dev/core@0.1.9
+  - @fragno-dev/corpus@0.0.6
+
+## 0.1.18
+
+### Patch Changes
+
+- efb6428: Fix corpus command failing when run outside monorepo due to missing subjects directory in
+  published package
+- be14041: feat: allow arbitrary nesting in corpus tree
+- 4eaedb3: feat: reorganize corpus subject tree
+- Updated dependencies [2e4be36]
+- Updated dependencies [efb6428]
+- Updated dependencies [be14041]
+- Updated dependencies [4eaedb3]
+  - @fragno-dev/corpus@0.0.5
+
 ## 0.1.17
 
 ### Patch Changes

package/bin/dev.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env bun
+
+import { run } from "../src/index.ts";
+
+await run();

package/bin/run.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import { run } from "../dist/cli.js";
+
+await run();

package/dist/cli.d.ts

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
-import * as gunshi4 from "gunshi";
+import * as gunshi3 from "gunshi";
+import "@fragno-dev/corpus";
 
 //#region src/commands/db/generate.d.ts
-declare const generateCommand: gunshi4.Command<{
+declare const generateCommand: gunshi3.Command<{
   output: {
     type: "string";
     short: string;
@@ -26,13 +27,13 @@ declare const generateCommand: gunshi4.Command<{
 }>;
 //#endregion
 //#region src/commands/db/migrate.d.ts
-declare const migrateCommand: gunshi4.Command<{}>;
+declare const migrateCommand: gunshi3.Command<{}>;
 //#endregion
 //#region src/commands/db/info.d.ts
-declare const infoCommand: gunshi4.Command<{}>;
+declare const infoCommand: gunshi3.Command<{}>;
 //#endregion
 //#region src/commands/search.d.ts
-declare const searchCommand: gunshi4.Command<{
+declare const searchCommand: gunshi3.Command<{
   limit: {
     type: "number";
     description: string;
@@ -56,7 +57,7 @@ declare const searchCommand: gunshi4.Command<{
 }>;
 //#endregion
 //#region src/commands/corpus.d.ts
-declare const corpusCommand: gunshi4.Command<{
+declare const corpusCommand: gunshi3.Command<{
   "no-line-numbers": {
     type: "boolean";
     short: string;
@@ -80,11 +81,16 @@ declare const corpusCommand: gunshi4.Command<{
     type: "string";
     description: string;
   };
+  tree: {
+    type: "boolean";
+    description: string;
+  };
 }>;
 //#endregion
 //#region src/cli.d.ts
-declare const dbCommand: gunshi4.Command<gunshi4.Args>;
-declare const mainCommand: gunshi4.Command<gunshi4.Args>;
+declare const dbCommand: gunshi3.Command<gunshi3.Args>;
+declare const mainCommand: gunshi3.Command<gunshi3.Args>;
+declare function run(): Promise<void>;
 //#endregion
-export { corpusCommand, dbCommand, generateCommand, infoCommand, mainCommand, migrateCommand, searchCommand };
+export { corpusCommand, dbCommand, generateCommand, infoCommand, mainCommand, migrateCommand, run, searchCommand };
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","names":[],"sources":["../src/commands/db/generate.ts","../src/commands/db/migrate.ts","../src/commands/db/info.ts","../src/commands/search.ts","../src/commands/corpus.ts","../src/cli.ts"],"sourcesContent":[],"mappings":";;;;cAOa,iBAyGX,OAAA,CAzG0B;;;;IAAf,WAAA,EAAA,MAyGX;;;;IC3GW,KAAA,EAAA,MAqEX;;;;ICtEW,IAAA,EAAA,QA4HX;;;;EC5GW,MAAA,EAAA;;;;EC0eA,CAAA;;;;cHzfA,gBAqEX,OAAA,CArEyB;;;cCDd,aA4HX,OAAA,CA5HsB;;;cCgBX,eAoFX,OAAA,CApFwB;;;;IHbb,OAAA,EAAA,MAyGX;;;;IC3GW,WAAA,EAqEX,MAAA;;;;ICtEW,IAAA,EAAA,SA4HX;;;;EC5GW,UAAA,EAAA;;;;EC0eA,CAAA;;;;cAAA,eAsEX,OAAA,CAtEwB;;;;IJvfb,WAAA,EAAA,MAyGX;;;;IC3GW,KAAA,EAAA,MAqEX;;;;ICtEW,IAAA,EAAA,QA4HX;;;;EC5GW,QAAA,EAAA;;;;EC0eA,EAAA,EAAA;;;;ACveb,CAAA,CAAA;;;cAAa,WAAS,OAAA,CAAA,QAGpB,OAAA,CAHoB,IAAA;cAMT,aAAW,OAAA,CAAA,QAGtB,OAAA,CAHsB,IAAA"}
+{"version":3,"file":"cli.d.ts","names":[],"sources":["../src/commands/db/generate.ts","../src/commands/db/migrate.ts","../src/commands/db/info.ts","../src/commands/search.ts","../src/commands/corpus.ts","../src/cli.ts"],"sourcesContent":[],"mappings":";;;;;cAOa,iBAyGX,OAAA,CAzG0B;;;;;EAAf,CAAA;;;;ICFA,WAAA,EAqEX,MAAA;;;;ICtEW,KAAA,EAAA,MA4HX;;;;IC5GW,IAAA,EAAA,QAoFX;;;;ACsaF,CAAA,CAAA;;;cHzgBa,gBAqEX,OAAA,CArEyB;;;cCDd,aA4HX,OAAA,CA5HsB;;;cCgBX,eAoFX,OAAA,CApFwB;;;;;EHbb,CAAA;;;;ICFA,OAAA,EAAA,KAqEX;;;;ICtEW,WA4HX,EAAA,MAAA;;;;IC5GW,IAAA,EAAA,QAoFX;;;;ACsaF,CAAA,CAAA;;;AD1fa,cC0fA,aDtaX,EC+gBA,OAAA,CAzGwB,OD1fA,CAAA;;;;IC0fb,WAAA,EAyGX,MAAA;;;;IChmBW,KAAA,EAAA,MAGX;IAGW,WAGX,EAAA,MAAA;EAEoB,CAAA;;;;;;;;;;;;;;;;;;;;;cAXT,WAAS,OAAA,CAAA,QAGpB,OAAA,CAHoB,IAAA;cAMT,aAAW,OAAA,CAAA,QAGtB,OAAA,CAHsB,IAAA;iBAKF,GAAA,CAAA,GAAG"}

package/dist/cli.js

@@ -5,9 +5,10 @@ import { dirname, join, relative, resolve } from "node:path";
 import { executeMigrations, generateMigrationsOrSchema } from "@fragno-dev/db/generation-engine";
 import { FragnoDatabase, isFragnoDatabase } from "@fragno-dev/db";
 import { fragnoDatabaseAdapterNameFakeSymbol, fragnoDatabaseAdapterVersionFakeSymbol } from "@fragno-dev/db/adapters";
-import { instantiatedFragmentFakeSymbol } from "@fragno-dev/core/api/fragment-instantiation";
+import { instantiatedFragmentFakeSymbol } from "@fragno-dev/core/internal/symbols";
+import "@fragno-dev/core";
 import { loadConfig } from "c12";
-import { getAllSubjects, getSubject, getSubjectChildren, getSubjectParent, getSubjects } from "@fragno-dev/corpus";
+import { getAllSubjectIdsInOrder, getAllSubjects, getCategoryTitle, getSubject, getSubjectChildren, getSubjectParent, getSubjects, isCategory } from "@fragno-dev/corpus";
 import { marked } from "marked";
 import { markedTerminal } from "marked-terminal";
 import { stripVTControlCharacters } from "node:util";
@@ -72,12 +73,9 @@ async function importFragmentFiles(paths) {
 		databases: allDatabases
 	};
 }
-function isFragnoInstantiatedFragment(value) {
+function isNewFragnoInstantiatedFragment(value) {
 	return typeof value === "object" && value !== null && instantiatedFragmentFakeSymbol in value && value[instantiatedFragmentFakeSymbol] === instantiatedFragmentFakeSymbol;
 }
-function additionalContextIsDatabaseContext(additionalContext) {
-	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.
@@ -85,13 +83,21 @@ function additionalContextIsDatabaseContext(additionalContext) {
 function findFragnoDatabases(targetModule) {
 	const fragnoDatabases = [];
 	for (const [_key, value] of Object.entries(targetModule)) if (isFragnoDatabase(value)) fragnoDatabases.push(value);
-	else if (isFragnoInstantiatedFragment(value)) {
-		const additionalContext = value.additionalContext;
-		if (!additionalContext || !additionalContextIsDatabaseContext(additionalContext)) continue;
-		const { databaseSchema, databaseNamespace, databaseAdapter } = additionalContext;
+	else if (isNewFragnoInstantiatedFragment(value)) {
+		const internal = value.$internal;
+		const deps = internal.deps;
+		const options = internal.options;
+		if (!deps["db"] || !deps["schema"]) continue;
+		const schema = deps["schema"];
+		const databaseAdapter = options["databaseAdapter"];
+		if (!databaseAdapter) {
+			console.warn(`Warning: Fragment '${value.name}' appears to be a database fragment but no databaseAdapter found in options.`);
+			continue;
+		}
+		const namespace = value.name + "-db";
 		fragnoDatabases.push(new FragnoDatabase({
-			namespace: databaseNamespace,
-			schema: databaseSchema,
+			namespace,
+			schema,
 			adapter: databaseAdapter
 		}));
 	}
@@ -647,6 +653,33 @@ async function printCodeBlockById(id, topics, showLineNumbers) {
 	}
 }
 /**
+* Print only the topic tree
+*/
+function printTopicTree() {
+	const subjects = getSubjects();
+	const subjectMap = new Map(subjects.map((s) => [s.id, s]));
+	function getTitle(subjectId) {
+		if (isCategory(subjectId)) return getCategoryTitle(subjectId);
+		const subject = subjectMap.get(subjectId);
+		return subject ? subject.title : subjectId;
+	}
+	function displayNode(subjectId, indent, isLast, isRoot) {
+		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);
+		}
+	}
+	const rootIds = getAllSubjectIdsInOrder().filter((id) => !getSubjectParent(id));
+	for (const subjectId of rootIds) displayNode(subjectId, "", false, true);
+}
+/**
 * Print information about the corpus command
 */
 function printCorpusHelp() {
@@ -660,9 +693,11 @@ function printCorpusHelp() {
 	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");
@@ -673,28 +708,7 @@ function printCorpusHelp() {
 	console.log("                                              # Show multiple topics");
 	console.log("");
 	console.log("Available topics:");
-	const subjects = getSubjects();
-	const rootSubjects = [];
-	const subjectMap = new Map(subjects.map((s) => [s.id, s]));
-	for (const subject of subjects) if (!getSubjectParent(subject.id)) {
-		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
-			}))
-		});
-	}
-	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 connector = i === root.children.length - 1 ? "└─" : "├─";
-			console.log(`    ${connector} ${child.id.padEnd(26)} ${child.title}`);
-		}
-	}
+	printTopicTree();
 }
 const corpusCommand = define({
 	name: "corpus",
@@ -722,6 +736,10 @@ const corpusCommand = define({
 		id: {
 			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) => {
@@ -731,10 +749,15 @@ 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;
 		if (codeBlockId) {
 			await printCodeBlockById(codeBlockId, topics, showLineNumbers);
 			return;
 		}
+		if (treeOnly) {
+			printTopicTree();
+			return;
+		}
 		if (topics.length === 0) {
 			printCorpusHelp();
 			return;
@@ -751,8 +774,24 @@ 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")) {
+				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);
 		}
 	}
@@ -774,82 +813,85 @@ const mainCommand = define({
 	name: "fragno-cli",
 	description: "Tools for working with Fragno fragments"
 });
-if (import.meta.main) try {
-	const args = process.argv.slice(2);
-	if (args[0] === "search") await cli(args.slice(1), searchCommand, {
-		name: "fragno-cli search",
-		version
-	});
-	else if (args[0] === "corpus") await cli(args.slice(1), corpusCommand, {
-		name: "fragno-cli corpus",
-		version
-	});
-	else if (args[0] === "db") {
-		const subCommandName = args[1];
-		if (!subCommandName || subCommandName === "--help" || subCommandName === "-h") {
-			console.log("Database management commands");
+async function run() {
+	try {
+		const args = process.argv.slice(2);
+		if (args[0] === "search") await cli(args.slice(1), searchCommand, {
+			name: "fragno-cli search",
+			version
+		});
+		else if (args[0] === "corpus") await cli(args.slice(1), corpusCommand, {
+			name: "fragno-cli corpus",
+			version
+		});
+		else if (args[0] === "db") {
+			const subCommandName = args[1];
+			if (!subCommandName || subCommandName === "--help" || subCommandName === "-h") {
+				console.log("Database management commands");
+				console.log("");
+				console.log("USAGE:");
+				console.log("  fragno-cli db <COMMAND>");
+				console.log("");
+				console.log("COMMANDS:");
+				console.log("  generate              Generate schema files from FragnoDatabase definitions");
+				console.log("  migrate               Run database migrations");
+				console.log("  info                  Display database information and migration status");
+				console.log("");
+				console.log("For more info, run any command with the `--help` flag:");
+				console.log("  fragno-cli db generate --help");
+				console.log("  fragno-cli db migrate --help");
+				console.log("  fragno-cli db info --help");
+				console.log("");
+				console.log("OPTIONS:");
+				console.log("  -h, --help             Display this help message");
+				console.log("  -v, --version          Display this version");
+			} else if (subCommandName === "--version" || subCommandName === "-v") console.log(version);
+			else {
+				const subCommand = dbSubCommands.get(subCommandName);
+				if (!subCommand) {
+					console.error(`Unknown command: ${subCommandName}`);
+					console.log("");
+					console.log("Run 'fragno-cli db --help' for available commands.");
+					process.exit(1);
+				}
+				await cli(args.slice(2), subCommand, {
+					name: `fragno-cli db ${subCommandName}`,
+					version
+				});
+			}
+		} else if (!args.length || args[0] === "--help" || args[0] === "-h") {
+			console.log("Tools for working with Fragno");
 			console.log("");
 			console.log("USAGE:");
-			console.log("  fragno-cli db <COMMAND>");
+			console.log("  fragno-cli <COMMAND>");
 			console.log("");
 			console.log("COMMANDS:");
-			console.log("  generate              Generate schema files from FragnoDatabase definitions");
-			console.log("  migrate               Run database migrations");
-			console.log("  info                  Display database information and migration status");
+			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 db generate --help");
-			console.log("  fragno-cli db migrate --help");
-			console.log("  fragno-cli db info --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");
 			console.log("  -v, --version          Display this version");
-		} else if (subCommandName === "--version" || subCommandName === "-v") console.log(version);
+		} else if (args[0] === "--version" || args[0] === "-v") console.log(version);
 		else {
-			const subCommand = dbSubCommands.get(subCommandName);
-			if (!subCommand) {
-				console.error(`Unknown command: ${subCommandName}`);
-				console.log("");
-				console.log("Run 'fragno-cli db --help' for available commands.");
-				process.exit(1);
-			}
-			await cli(args.slice(2), subCommand, {
-				name: `fragno-cli db ${subCommandName}`,
-				version
-			});
+			console.error(`Unknown command: ${args[0]}`);
+			console.log("");
+			console.log("Run 'fragno-cli --help' for available commands.");
+			process.exit(1);
 		}
-	} else if (!args.length || args[0] === "--help" || args[0] === "-h") {
-		console.log("Tools for working with Fragno");
-		console.log("");
-		console.log("USAGE:");
-		console.log("  fragno-cli <COMMAND>");
-		console.log("");
-		console.log("COMMANDS:");
-		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 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");
-		console.log("  -v, --version          Display this version");
-	} else if (args[0] === "--version" || args[0] === "-v") console.log(version);
-	else {
-		console.error(`Unknown command: ${args[0]}`);
-		console.log("");
-		console.log("Run 'fragno-cli --help' for available commands.");
+	} catch (error) {
+		console.error("Error:", error instanceof Error ? error.message : error);
 		process.exit(1);
 	}
-} catch (error) {
-	console.error("Error:", error instanceof Error ? error.message : error);
-	process.exit(1);
 }
+if (import.meta.main) await run();
 
 //#endregion
-export { corpusCommand, dbCommand, generateCommand, infoCommand, mainCommand, migrateCommand, searchCommand };
+export { corpusCommand, dbCommand, generateCommand, infoCommand, mainCommand, migrateCommand, run, searchCommand };
 //# sourceMappingURL=cli.js.map