@ucdjs/cli 0.1.2 → 0.1.3

package/dist/{cli-utils-DyOk9RI0.js → cli-utils-CtO_eQb6.js}

@@ -4,7 +4,7 @@ import yargs from "yargs-parser";
 
 //#region package.json
 var name = "@ucdjs/cli";
-var version = "0.1.2";
+var version = "0.1.3";
 var type = "module";
 var author = {
 	"name": "Lucas Nørgård",
@@ -144,7 +144,7 @@ async function runCommand(cmd, flags) {
 			console.log(`  ${bgGreen(black(` ucd `))} ${green(`v${package_default.version ?? "x.y.z"}`)}`);
 			break;
 		case "generate": {
-			const { runGenerate } = await import("./generate-Z7bYnm_v.js");
+			const { runGenerate } = await import("./generate-DBhAloii.js");
 			const versions = flags._.slice(3);
 			await runGenerate({
 				versions,
@@ -153,7 +153,7 @@ async function runCommand(cmd, flags) {
 			break;
 		}
 		case "codegen": {
-			const { runCodegenRoot } = await import("./root-BT7DL0Ms.js");
+			const { runCodegenRoot } = await import("./root-DAq3Tcji.js");
 			const subcommand = flags._[3]?.toString() ?? "";
 			await runCodegenRoot(subcommand, { flags });
 			break;

package/dist/cli.js

@@ -1,4 +1,4 @@
-import { runCLI } from "./cli-utils-DyOk9RI0.js";
+import { runCLI } from "./cli-utils-CtO_eQb6.js";
 import process from "node:process";
 
 //#region src/cli.ts

package/dist/fields-DDyAQa-S.js

@@ -0,0 +1,123 @@
+import { printHelp } from "./cli-utils-CtO_eQb6.js";
+import process from "node:process";
+import { existsSync } from "node:fs";
+import { mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { RawDataFile } from "@luxass/unicode-utils/data-files";
+import { toKebabCase } from "@luxass/utils";
+import { generateFields } from "@ucdjs/schema-gen";
+
+//#region src/cmd/codegen/fields.ts
+function flattenVersion(version) {
+	const parts = version.split(".");
+	while (parts.length > 1 && parts[parts.length - 1] === "0") parts.pop();
+	return parts.join(".");
+}
+async function runFieldCodegen({ inputPath, flags }) {
+	if (flags?.help || flags?.h) {
+		printHelp({
+			headline: "Generate Unicode Data Files",
+			commandName: "ucd codegen fields",
+			usage: "<input> [...flags]",
+			tables: { Flags: [
+				["--openai-key (-k)", "The OpenAI API key to use. (can also be set using OPENAI_API_KEY env var)"],
+				["--output-dir", "Specify the output directory for generated files (defaults to .codegen)"],
+				["--bundle <filename>", "Combine generated files into a single file per version. Use {version} placeholder for version-specific naming"],
+				["--help (-h)", "See all available flags."]
+			] }
+		});
+		return;
+	}
+	const openaiKey = flags.openaiKey || process.env.OPENAI_API_KEY;
+	if (!openaiKey) {
+		console.error("No OpenAI API key provided. Please provide an OpenAI API key.");
+		return;
+	}
+	if (inputPath == null) {
+		console.error("No input path provided. Please provide an input path.");
+		return;
+	}
+	const resolvedInputPath = path.resolve(inputPath);
+	if (!existsSync(resolvedInputPath)) {
+		console.error(`invalid input path: ${inputPath}. Please provide a valid input path.`);
+		return;
+	}
+	const shouldBundle = typeof flags.bundle === "string" || flags.bundle === true;
+	const bundleTemplate = typeof flags.bundle === "string" ? flags.bundle : "index.ts";
+	let outputDir = flags.outputDir;
+	if (!outputDir) if (shouldBundle && (path.isAbsolute(bundleTemplate) || bundleTemplate.startsWith("./") || bundleTemplate.startsWith("../"))) outputDir = path.dirname(bundleTemplate);
+	else outputDir = path.join(path.dirname(resolvedInputPath), ".codegen");
+	if (outputDir) await mkdir(outputDir, { recursive: true });
+	const isDirectory = (await stat(resolvedInputPath)).isDirectory();
+	const filesByVersion = new Map();
+	if (isDirectory) {
+		const dir = await readdir(resolvedInputPath, {
+			withFileTypes: true,
+			recursive: true
+		});
+		for (const file of dir) if (file.isFile() && file.name.endsWith(".txt")) {
+			const filePath = path.join(file.parentPath, file.name);
+			const versionMatch = filePath.match(/v(\d+\.\d+\.\d+)/);
+			const version = versionMatch ? flattenVersion(versionMatch[1]) : "unknown";
+			const files = filesByVersion.get(version) ?? [];
+			files.push(filePath);
+			filesByVersion.set(version, files);
+		}
+	} else {
+		const parentDir = path.dirname(resolvedInputPath);
+		const versionMatch = parentDir.match(/v(\d+\.\d+\.\d+)/);
+		const version = versionMatch ? flattenVersion(versionMatch[1]) : "unknown";
+		filesByVersion.set(version, [resolvedInputPath]);
+	}
+	for (const [version, files] of filesByVersion) {
+		const promises = files.map(async (filePath) => {
+			const content = await readFile(filePath, "utf-8");
+			const datafile = new RawDataFile(content);
+			if (datafile.heading == null) {
+				console.error(`heading for file ${filePath} is null. Skipping file.`);
+				return null;
+			}
+			const code = await generateFields({
+				datafile,
+				apiKey: openaiKey
+			});
+			if (code == null) {
+				console.error(`Error generating fields for file: ${filePath}`);
+				return null;
+			}
+			if (!shouldBundle) {
+				const fileName = toKebabCase(path.basename(filePath).replace(/\.txt$/, "")).toLowerCase();
+				await writeFile(path.join(outputDir, `${fileName}.ts`), code, "utf-8");
+			}
+			return {
+				code,
+				fileName: filePath
+			};
+		});
+		const generatedCode = await Promise.all(promises);
+		if (shouldBundle) {
+			let bundledCode = `// This file is generated by ucd codegen. Do not edit this file directly.\n`;
+			bundledCode += `// Unicode Version: ${version}\n\n`;
+			for (const result of generatedCode.filter(Boolean)) {
+				if (!result) continue;
+				const relativePath = path.relative(process.cwd(), result.fileName);
+				bundledCode += `// #region ${relativePath}\n`;
+				bundledCode += result.code;
+				bundledCode += `\n// #endregion\n`;
+			}
+			const bundleFileName = bundleTemplate.replace("{version}", version);
+			let bundlePath;
+			if (path.isAbsolute(bundleFileName) || bundleFileName.startsWith("./") || bundleFileName.startsWith("../")) bundlePath = path.resolve(bundleFileName);
+			else if (outputDir) bundlePath = path.resolve(path.join(outputDir, bundleFileName));
+			else bundlePath = path.resolve(bundleFileName);
+			if (!bundlePath.endsWith(".ts")) bundlePath += ".ts";
+			await mkdir(path.dirname(bundlePath), { recursive: true });
+			await writeFile(bundlePath, bundledCode, "utf-8");
+			console.log(`Generated bundled fields for Unicode ${version} in ${bundlePath}`);
+		}
+	}
+	if (!shouldBundle) console.log(`Generated fields for ${Array.from(filesByVersion.values()).flat().length} files in ${outputDir}`);
+}
+
+//#endregion
+export { runFieldCodegen };

package/dist/{generate-Z7bYnm_v.js → generate-DBhAloii.js}

@@ -1,4 +1,4 @@
-import { printHelp } from "./cli-utils-DyOk9RI0.js";
+import { printHelp } from "./cli-utils-CtO_eQb6.js";
 import { green, yellow } from "farver/fast";
 import { mkdir, writeFile } from "node:fs/promises";
 import path, { dirname, join } from "node:path";

package/dist/{root-BT7DL0Ms.js → root-DAq3Tcji.js}

@@ -1,4 +1,4 @@
-import { printHelp } from "./cli-utils-DyOk9RI0.js";
+import { printHelp } from "./cli-utils-CtO_eQb6.js";
 
 //#region src/cmd/codegen/root.ts
 const CODEGEN_SUBCOMMANDS = ["fields"];
@@ -18,7 +18,7 @@ async function runCodegenRoot(subcommand, { flags }) {
 		return;
 	}
 	if (subcommand === "fields") {
-		const { runFieldCodegen } = await import("./fields-BqikCPbE.js");
+		const { runFieldCodegen } = await import("./fields-DDyAQa-S.js");
 		const inputPath = flags._.slice(4)?.toString() ?? "";
 		await runFieldCodegen({
 			inputPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucdjs/cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "type": "module",
   "author": {
     "name": "Lucas Nørgård",
@@ -29,7 +29,7 @@
     "@luxass/utils": "^1.4.0",
     "farver": "^0.4.2",
     "yargs-parser": "^21.1.1",
-    "@ucdjs/schema-gen": "0.1.0"
+    "@ucdjs/schema-gen": "0.2.0"
   },
   "devDependencies": {
     "@luxass/eslint-config": "^4.18.1",

package/dist/fields-BqikCPbE.js

@@ -1,98 +0,0 @@
-import { printHelp } from "./cli-utils-DyOk9RI0.js";
-import { existsSync } from "node:fs";
-import { mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises";
-import path from "node:path";
-import { RawDataFile } from "@luxass/unicode-utils/data-files";
-import { toKebabCase } from "@luxass/utils";
-import { generateFields } from "@ucdjs/schema-gen";
-
-//#region src/cmd/codegen/fields.ts
-async function runFieldCodegen({ inputPath, flags }) {
-	if (flags?.help || flags?.h) {
-		printHelp({
-			headline: "Generate Unicode Data Files",
-			commandName: "ucd codegen fields",
-			usage: "<input> [...flags]",
-			tables: { Flags: [
-				["--openai-key (-k)", "The OpenAI API key to use. (can also be set using OPENAI_API_KEY env var)"],
-				["--output-dir", "Specify the output directory for generated files (defaults to .codegen)"],
-				["--bundle <filename>", "Combine all generated files into a single file, if no filename is provided, the default is index.ts"],
-				["--help (-h)", "See all available flags."]
-			] }
-		});
-		return;
-	}
-	const openaiKey = flags.openaiKey || process.env.OPENAI_API_KEY;
-	if (!openaiKey) {
-		console.error("No OpenAI API key provided. Please provide an OpenAI API key.");
-		return;
-	}
-	if (inputPath == null) {
-		console.error("No input path provided. Please provide an input path.");
-		return;
-	}
-	const resolvedInputPath = path.resolve(inputPath);
-	if (!existsSync(resolvedInputPath)) {
-		console.error(`invalid input path: ${inputPath}. Please provide a valid input path.`);
-		return;
-	}
-	const outputDir = flags.outputDir || process.cwd();
-	await mkdir(outputDir, { recursive: true });
-	const shouldBundle = typeof flags.bundle === "string" || flags.bundle === true;
-	const bundleFileName = typeof flags.bundle === "string" ? flags.bundle : "index.ts";
-	const isDirectory = (await stat(resolvedInputPath)).isDirectory();
-	const files = [];
-	if (isDirectory) {
-		const dir = await readdir(resolvedInputPath, {
-			withFileTypes: true,
-			recursive: true
-		});
-		for (const file of dir) if (file.isFile()) {
-			if (!file.name.endsWith(".txt")) continue;
-			files.push(path.join(file.parentPath, file.name));
-		}
-	} else files.push(resolvedInputPath);
-	const promises = files.map(async (filePath) => {
-		const content = await readFile(filePath, "utf-8");
-		const datafile = new RawDataFile(content);
-		if (datafile.heading == null) {
-			console.error(`heading for file ${filePath} is null. Skipping file.`);
-			return null;
-		}
-		const code = await generateFields({
-			datafile,
-			apiKey: openaiKey
-		});
-		if (code == null) {
-			console.error(`Error generating fields for file: ${filePath}`);
-			return null;
-		}
-		if (!shouldBundle) {
-			const fileName = toKebabCase(path.basename(filePath).replace(/\.txt$/, "")).toLowerCase();
-			await writeFile(path.join(outputDir, `${fileName}.ts`), code, "utf-8");
-		}
-		return {
-			code,
-			fileName: filePath.replace(`${process.cwd()}/`, "")
-		};
-	});
-	const generatedCode = await Promise.all(promises);
-	if (!shouldBundle) {
-		console.log(`Generated fields for ${files.length} files in ${outputDir}`);
-		return;
-	}
-	let bundledCode = `// This file is generated by ucd codegen. Do not edit this file directly.\n\n`;
-	for (const { fileName, code } of generatedCode.filter((obj) => obj != null)) {
-		bundledCode += `//#region ${fileName}\n`;
-		bundledCode += code;
-		bundledCode += `\n//#endregion\n`;
-		bundledCode += "\n\n";
-	}
-	let bundlePath = path.resolve(path.join(outputDir, bundleFileName));
-	if (path.extname(bundleFileName) === "") bundlePath = path.join(outputDir, `${bundleFileName}.ts`);
-	await writeFile(bundlePath, bundledCode, "utf-8");
-	console.log(`Generated bundled fields in ${bundlePath}`);
-}
-
-//#endregion
-export { runFieldCodegen };