@vaadin/hilla-generator-cli 24.8.0-alpha1 → 24.8.0-alpha3

package/GeneratorIO.d.ts

@@ -1,31 +1,22 @@
 import { type PluginConstructor } from "@vaadin/hilla-generator-core/Plugin.js";
 import type LoggerFactory from "@vaadin/hilla-generator-utils/LoggerFactory.js";
+export declare const GENERATED_LIST_FILENAME = "generated-file-list.txt";
 export default class GeneratorIO {
 	#private;
-	static readonly INDEX_FILENAME = "generated-file-list.txt";
-	["constructor"]: typeof GeneratorIO;
-	readonly cwd: string;
-	constructor(outputDir: string, logger: LoggerFactory);
+	constructor(outputDir: URL, logger: LoggerFactory);
 	/**
-	* Gets the list of files generated the last time. The info is found in {@link INDEX_FILENAME}.
+	* Gets the list of files generated the last time. The info is found in {@link GENERATED_LIST_FILENAME}.
 	* @returns a list of files that have been generated by us
 	*/
-	getGeneratedFiles(): Promise<Set<string>>;
+	getExistingGeneratedFiles(): Promise<readonly string[]>;
 	/**
 	* Cleans the output directory by keeping the generated files and deleting the rest of the given files.
 	*
-	* @returns a set containing deleted filenames
+	* @returns a list with names of deleted files
 	*/
-	cleanOutputDir(generatedFiles: string[], filesToDelete: Set<string>): Promise<Set<string>>;
-	createFileIndex(filenames: string[]): Promise<void>;
-	writeGeneratedFiles(files: readonly File[]): Promise<string[]>;
-	/**
-	* Checks that a file exists (is visible)
-	* @param path - the file path to check
-	*/
-	static exists(path: string): Promise<boolean>;
+	cleanOutputDir(generatedFiles: readonly string[], filesToDelete: readonly string[]): Promise<readonly string[]>;
+	writeGeneratedFiles(files: readonly File[]): Promise<readonly string[]>;
 	loadPlugin(modulePath: string): Promise<PluginConstructor>;
-	resolveGeneratedFile(filename: string): string;
-	read(path: string): Promise<string>;
-	write(filename: string, content: string): Promise<void>;
+	read(filename: string): Promise<string>;
+	write(file: File): Promise<void>;
 }

package/GeneratorIO.js

@@ -1,115 +1,88 @@
-import { constants } from "node:fs";
-import { access, mkdir, readFile, rm, writeFile } from "node:fs/promises";
-import { createRequire } from "node:module";
-import { dirname, isAbsolute, join, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
+import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import Plugin from "@vaadin/hilla-generator-core/Plugin.js";
 import GeneratorIOException from "./GeneratorIOException.js";
-const require = createRequire(import.meta.url);
+export const GENERATED_LIST_FILENAME = "generated-file-list.txt";
 export default class GeneratorIO {
-	static INDEX_FILENAME = "generated-file-list.txt";
-	cwd;
 	#logger;
 	#outputDir;
 	constructor(outputDir, logger) {
-		this.cwd = process.cwd();
-		this.#outputDir = isAbsolute(outputDir) ? outputDir : resolve(this.cwd, outputDir);
+		this.#outputDir = outputDir;
 		this.#logger = logger;
 		logger.global.debug(`Output directory: ${this.#outputDir}`);
 	}
 	/**
-	* Gets the list of files generated the last time. The info is found in {@link INDEX_FILENAME}.
+	* Gets the list of files generated the last time. The info is found in {@link GENERATED_LIST_FILENAME}.
 	* @returns a list of files that have been generated by us
 	*/
-	async getGeneratedFiles() {
+	async getExistingGeneratedFiles() {
 		const files = new Set();
 		try {
-			const indexFileContents = await this.read(this.resolveGeneratedFile(this.constructor.INDEX_FILENAME));
-			indexFileContents.split("\n").filter((n) => n.length).forEach((fileName) => files.add(fileName));
+			const contents = await this.read(GENERATED_LIST_FILENAME);
+			contents.split("\n").filter((n) => n.length).forEach((fileName) => files.add(fileName));
 		} catch (e) {
 			if (!(e instanceof Error && "code" in e && e.code === "ENOENT")) {
 				throw e;
 			}
 		}
-		return files;
+		return Array.from(files);
 	}
 	/**
 	* Cleans the output directory by keeping the generated files and deleting the rest of the given files.
 	*
-	* @returns a set containing deleted filenames
+	* @returns a list with names of deleted files
 	*/
 	async cleanOutputDir(generatedFiles, filesToDelete) {
 		this.#logger.global.debug(`Cleaning ${this.#outputDir}`);
 		await mkdir(this.#outputDir, { recursive: true });
-		generatedFiles.forEach((filename) => {
-			this.#logger.global.debug(`File ${filename} was re-written, should not delete it`);
-			filesToDelete.delete(filename);
-		});
-		const deletedFiles = new Set(await Promise.all([...filesToDelete].map(async (filename) => {
-			const resolved = this.resolveGeneratedFile(filename);
-			if (await GeneratorIO.exists(resolved)) {
-				this.#logger.global.debug(`Deleting file ${filename}.`);
-				await rm(resolved);
+		const filtered = filesToDelete.filter((item) => !generatedFiles.includes(item));
+		return Array.from(new Set(await Promise.all(filtered.map(async (filename) => {
+			const url = new URL(filename, this.#outputDir);
+			try {
+				await rm(url);
+				this.#logger.global.debug(`Deleted file ${url}.`);
+				return filename;
+			} catch (e) {
+				this.#logger.global.debug(`Cannot delete file ${url}: ${e instanceof Error ? e.message : String(e)}`);
+				return undefined;
 			}
-			return filename;
-		})));
-		return deletedFiles;
-	}
-	async createFileIndex(filenames) {
-		await this.write(this.constructor.INDEX_FILENAME, filenames.join("\n"));
+		})).then((files) => files.filter((filename) => filename != null))));
 	}
 	async writeGeneratedFiles(files) {
-		await this.createFileIndex(files.map((file) => file.name));
-		this.#logger.global.debug(`created index`);
+		await this.write(new File(files.map((file) => `${file.name}\n`), GENERATED_LIST_FILENAME));
 		return Promise.all(files.map(async (file) => {
 			const newFileContent = await file.text();
 			let oldFileContent;
 			try {
-				oldFileContent = await this.read(this.resolveGeneratedFile(file.name));
+				oldFileContent = await this.read(file.name);
 			} catch (_e) {}
 			if (newFileContent !== oldFileContent) {
-				this.#logger.global.debug(`writing file ${file.name}`);
-				await this.write(file.name, await file.text());
+				await this.write(file);
 			} else {
-				this.#logger.global.debug(`File ${file.name} stayed the same`);
+				this.#logger.global.debug(`File ${new URL(file.name, this.#outputDir)} stayed the same`);
 			}
 			return file.name;
 		}));
 	}
-	/**
-	* Checks that a file exists (is visible)
-	* @param path - the file path to check
-	*/
-	static async exists(path) {
-		try {
-			await access(path, constants.F_OK);
-			return true;
-		} catch {
-			return false;
-		}
-	}
 	async loadPlugin(modulePath) {
 		this.#logger.global.debug(`Loading plugin: ${modulePath}`);
-		const module = await import(pathToFileURL(require.resolve(modulePath)).toString());
+		const module = await import(modulePath);
 		const ctr = module.default;
 		if (!Object.prototype.isPrototypeOf.call(Plugin, ctr)) {
 			throw new GeneratorIOException(`Plugin '${modulePath}' is not an instance of a Plugin class`);
 		}
 		return ctr;
 	}
-	resolveGeneratedFile(filename) {
-		return resolve(this.#outputDir, filename);
-	}
-	async read(path) {
-		this.#logger.global.debug(`Reading file: ${path}`);
-		return readFile(path, "utf8");
+	async read(filename) {
+		const url = new URL(filename, this.#outputDir);
+		this.#logger.global.debug(`Reading file: ${url}`);
+		return await readFile(url, "utf8");
 	}
-	async write(filename, content) {
-		const filePath = join(this.#outputDir, filename);
+	async write(file) {
+		const filePath = new URL(file.name, this.#outputDir);
 		this.#logger.global.debug(`Writing file ${filePath}.`);
-		const dir = dirname(filePath);
+		const dir = new URL("./", filePath);
 		await mkdir(dir, { recursive: true });
-		return writeFile(filePath, content, "utf-8");
+		return await writeFile(filePath, await file.text(), "utf-8");
 	}
 }
 //# sourceMappingURL=./GeneratorIO.js.map

package/GeneratorIO.js.map

@@ -1 +1 @@
-{"mappings":"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","names":["#logger","#outputDir","outputDir: string","logger: LoggerFactory","generatedFiles: string[]","filesToDelete: Set<string>","filenames: string[]","files: readonly File[]","path: string","modulePath: string","module: PluginConstructorModule","ctr: PluginConstructor","filename: string","content: string"],"sources":["/opt/agent/work/1af72d8adc613024/hilla/packages/ts/generator-cli/src/GeneratorIO.ts"],"sourcesContent":["import { constants } from 'node:fs';\nimport { access, mkdir, readFile, rm, writeFile } from 'node:fs/promises';\nimport { createRequire } from 'node:module';\nimport { dirname, isAbsolute, join, resolve } from 'node:path';\nimport { pathToFileURL } from 'node:url';\nimport Plugin, { type PluginConstructor } from '@vaadin/hilla-generator-core/Plugin.js';\nimport type LoggerFactory from '@vaadin/hilla-generator-utils/LoggerFactory.js';\nimport GeneratorIOException from './GeneratorIOException.js';\n\nconst require = createRequire(import.meta.url);\n\ntype PluginConstructorModule = Readonly<{\n  default: PluginConstructor;\n}>;\n\nexport default class GeneratorIO {\n  static readonly INDEX_FILENAME = 'generated-file-list.txt';\n  declare ['constructor']: typeof GeneratorIO;\n  readonly cwd: string;\n  readonly #logger: LoggerFactory;\n  readonly #outputDir: string;\n\n  constructor(outputDir: string, logger: LoggerFactory) {\n    this.cwd = process.cwd();\n    this.#outputDir = isAbsolute(outputDir) ? outputDir : resolve(this.cwd, outputDir);\n    this.#logger = logger;\n\n    logger.global.debug(`Output directory: ${this.#outputDir}`);\n  }\n\n  /**\n   * Gets the list of files generated the last time. The info is found in {@link INDEX_FILENAME}.\n   * @returns a list of files that have been generated by us\n   */\n  async getGeneratedFiles(): Promise<Set<string>> {\n    const files = new Set<string>();\n    try {\n      const indexFileContents = await this.read(this.resolveGeneratedFile(this.constructor.INDEX_FILENAME));\n      indexFileContents\n        .split('\\n')\n        .filter((n) => n.length)\n        .forEach((fileName) => files.add(fileName));\n    } catch (e) {\n      // non-existing file is OK, all other errors must be rethrown\n      if (!(e instanceof Error && 'code' in e && e.code === 'ENOENT')) {\n        throw e;\n      }\n    }\n    return files;\n  }\n\n  /**\n   * Cleans the output directory by keeping the generated files and deleting the rest of the given files.\n   *\n   * @returns a set containing deleted filenames\n   */\n  async cleanOutputDir(generatedFiles: string[], filesToDelete: Set<string>): Promise<Set<string>> {\n    this.#logger.global.debug(`Cleaning ${this.#outputDir}`);\n    await mkdir(this.#outputDir, { recursive: true });\n\n    generatedFiles.forEach((filename) => {\n      this.#logger.global.debug(`File ${filename} was re-written, should not delete it`);\n      filesToDelete.delete(filename);\n    });\n\n    const deletedFiles = new Set(\n      await Promise.all(\n        [...filesToDelete].map(async (filename) => {\n          const resolved = this.resolveGeneratedFile(filename);\n          if (await GeneratorIO.exists(resolved)) {\n            this.#logger.global.debug(`Deleting file ${filename}.`);\n            await rm(resolved);\n          }\n          return filename;\n        }),\n      ),\n    );\n\n    return deletedFiles;\n  }\n\n  async createFileIndex(filenames: string[]): Promise<void> {\n    await this.write(this.constructor.INDEX_FILENAME, filenames.join('\\n'));\n  }\n\n  async writeGeneratedFiles(files: readonly File[]): Promise<string[]> {\n    await this.createFileIndex(files.map((file) => file.name));\n    this.#logger.global.debug(`created index`);\n\n    return Promise.all(\n      files.map(async (file) => {\n        const newFileContent = await file.text();\n        let oldFileContent;\n        try {\n          oldFileContent = await this.read(this.resolveGeneratedFile(file.name));\n        } catch (_e) {}\n\n        if (newFileContent !== oldFileContent) {\n          this.#logger.global.debug(`writing file ${file.name}`);\n          await this.write(file.name, await file.text());\n        } else {\n          this.#logger.global.debug(`File ${file.name} stayed the same`);\n        }\n        return file.name;\n      }),\n    );\n  }\n\n  /**\n   * Checks that a file exists (is visible)\n   * @param path - the file path to check\n   */\n  // eslint-disable-next-line class-methods-use-this\n  static async exists(path: string): Promise<boolean> {\n    try {\n      await access(path, constants.F_OK);\n      return true;\n    } catch {\n      return false;\n    }\n  }\n\n  async loadPlugin(modulePath: string): Promise<PluginConstructor> {\n    this.#logger.global.debug(`Loading plugin: ${modulePath}`);\n    const module: PluginConstructorModule = await import(pathToFileURL(require.resolve(modulePath)).toString());\n    const ctr: PluginConstructor = module.default;\n\n    if (!Object.prototype.isPrototypeOf.call(Plugin, ctr)) {\n      throw new GeneratorIOException(`Plugin '${modulePath}' is not an instance of a Plugin class`);\n    }\n\n    return ctr;\n  }\n\n  resolveGeneratedFile(filename: string): string {\n    return resolve(this.#outputDir, filename);\n  }\n\n  async read(path: string): Promise<string> {\n    this.#logger.global.debug(`Reading file: ${path}`);\n    return readFile(path, 'utf8');\n  }\n\n  async write(filename: string, content: string): Promise<void> {\n    const filePath = join(this.#outputDir, filename);\n    this.#logger.global.debug(`Writing file ${filePath}.`);\n    const dir = dirname(filePath);\n    await mkdir(dir, { recursive: true });\n    return writeFile(filePath, content, 'utf-8');\n  }\n}\n"],"version":3}
+{"mappings":"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","names":["#logger","#outputDir","outputDir: URL","logger: LoggerFactory","generatedFiles: readonly string[]","filesToDelete: readonly string[]","e: unknown","files: readonly File[]","modulePath: string","module: PluginConstructorModule","ctr: PluginConstructor","filename: string","file: File"],"sources":["/opt/agent/work/1af72d8adc613024/hilla/packages/ts/generator-cli/src/GeneratorIO.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/restrict-template-expressions */\nimport { mkdir, readFile, rm, writeFile } from 'node:fs/promises';\nimport Plugin, { type PluginConstructor } from '@vaadin/hilla-generator-core/Plugin.js';\nimport type LoggerFactory from '@vaadin/hilla-generator-utils/LoggerFactory.js';\nimport GeneratorIOException from './GeneratorIOException.js';\n\ntype PluginConstructorModule = Readonly<{\n  default: PluginConstructor;\n}>;\n\nexport const GENERATED_LIST_FILENAME = 'generated-file-list.txt';\n\nexport default class GeneratorIO {\n  readonly #logger: LoggerFactory;\n  readonly #outputDir: URL;\n\n  constructor(outputDir: URL, logger: LoggerFactory) {\n    this.#outputDir = outputDir;\n    this.#logger = logger;\n\n    logger.global.debug(`Output directory: ${this.#outputDir}`);\n  }\n\n  /**\n   * Gets the list of files generated the last time. The info is found in {@link GENERATED_LIST_FILENAME}.\n   * @returns a list of files that have been generated by us\n   */\n  async getExistingGeneratedFiles(): Promise<readonly string[]> {\n    const files = new Set<string>();\n    try {\n      const contents = await this.read(GENERATED_LIST_FILENAME);\n      contents\n        .split('\\n')\n        .filter((n) => n.length)\n        .forEach((fileName) => files.add(fileName));\n    } catch (e) {\n      // non-existing file is OK, all other errors must be rethrown\n      if (!(e instanceof Error && 'code' in e && e.code === 'ENOENT')) {\n        throw e;\n      }\n    }\n    return Array.from(files);\n  }\n\n  /**\n   * Cleans the output directory by keeping the generated files and deleting the rest of the given files.\n   *\n   * @returns a list with names of deleted files\n   */\n  async cleanOutputDir(\n    generatedFiles: readonly string[],\n    filesToDelete: readonly string[],\n  ): Promise<readonly string[]> {\n    this.#logger.global.debug(`Cleaning ${this.#outputDir}`);\n    await mkdir(this.#outputDir, { recursive: true });\n\n    const filtered = filesToDelete.filter((item) => !generatedFiles.includes(item));\n\n    return Array.from(\n      new Set(\n        await Promise.all(\n          filtered.map(async (filename) => {\n            const url = new URL(filename, this.#outputDir);\n            try {\n              await rm(url);\n              this.#logger.global.debug(`Deleted file ${url}.`);\n              return filename;\n            } catch (e: unknown) {\n              this.#logger.global.debug(`Cannot delete file ${url}: ${e instanceof Error ? e.message : String(e)}`);\n              return undefined;\n            }\n          }),\n        ).then((files) => files.filter((filename) => filename != null)),\n      ),\n    );\n  }\n\n  async writeGeneratedFiles(files: readonly File[]): Promise<readonly string[]> {\n    await this.write(\n      new File(\n        files.map((file) => `${file.name}\\n`),\n        GENERATED_LIST_FILENAME,\n      ),\n    );\n\n    return Promise.all(\n      files.map(async (file) => {\n        const newFileContent = await file.text();\n        let oldFileContent;\n        try {\n          oldFileContent = await this.read(file.name);\n        } catch (_e) {}\n\n        if (newFileContent !== oldFileContent) {\n          await this.write(file);\n        } else {\n          this.#logger.global.debug(`File ${new URL(file.name, this.#outputDir)} stayed the same`);\n        }\n        return file.name;\n      }),\n    );\n  }\n\n  async loadPlugin(modulePath: string): Promise<PluginConstructor> {\n    this.#logger.global.debug(`Loading plugin: ${modulePath}`);\n    const module: PluginConstructorModule = await import(modulePath);\n    const ctr: PluginConstructor = module.default;\n\n    if (!Object.prototype.isPrototypeOf.call(Plugin, ctr)) {\n      throw new GeneratorIOException(`Plugin '${modulePath}' is not an instance of a Plugin class`);\n    }\n\n    return ctr;\n  }\n\n  async read(filename: string): Promise<string> {\n    const url = new URL(filename, this.#outputDir);\n    this.#logger.global.debug(`Reading file: ${url}`);\n    return await readFile(url, 'utf8');\n  }\n\n  async write(file: File): Promise<void> {\n    const filePath = new URL(file.name, this.#outputDir);\n    this.#logger.global.debug(`Writing file ${filePath}.`);\n    const dir = new URL('./', filePath);\n    await mkdir(dir, { recursive: true });\n    return await writeFile(filePath, await file.text(), 'utf-8');\n  }\n}\n"],"version":3}

package/index.js

@@ -1,49 +1,68 @@
+import { readFile } from "node:fs/promises";
+import { isAbsolute, join, sep } from "node:path";
+import { pathToFileURL } from "node:url";
+import { parseArgs } from "node:util";
 import Generator from "@vaadin/hilla-generator-core/Generator.js";
 import LoggerFactory from "@vaadin/hilla-generator-utils/LoggerFactory.js";
-import meow from "meow";
 import GeneratorIO from "./GeneratorIO.js";
-import { processInput } from "./utils.js";
-const { flags: { outputDir, plugin: plugins, verbose }, input: [input] } = meow(`
-Usage:
-  tsgen
-    (will read JSON from stdin)
-  tsgen <OpenAPI JSON string>
-  tsgen <OpenAPI file path>
-
-Options:
-  -h, --help             Show this screen
-  -o, --output-dir       Output directory
-  -p, --plugin <path>    Use the plugin loadable by <path>.
-  --version              Show the app version
-`, {
-	flags: {
+const { positionals: [file], values: { help, outputDir, plugin: plugins, verbose, version } } = parseArgs({
+	options: {
+		inputFile: {
+			type: "string",
+			short: "i"
+		},
+		help: { type: "boolean" },
 		outputDir: {
 			default: "frontend/generated",
-			shortFlag: "o",
+			short: "o",
 			type: "string"
 		},
 		plugin: {
 			default: [],
-			isMultiple: true,
-			shortFlag: "p",
+			multiple: true,
+			short: "p",
 			type: "string"
 		},
 		verbose: {
-			shortFlag: "v",
+			short: "v",
 			type: "boolean"
-		}
+		},
+		version: { type: "boolean" }
 	},
-	importMeta: import.meta
+	allowPositionals: true
 });
-const logger = new LoggerFactory({ verbose });
-const io = new GeneratorIO(outputDir, logger);
-const resolvedPlugins = await Promise.all(Array.from(new Set(plugins), async (pluginPath) => io.loadPlugin(pluginPath)));
-const generator = new Generator(resolvedPlugins, {
-	logger,
-	outputDir
-});
-const files = await generator.process(await processInput(io, input));
-const filesToDelete = await io.getGeneratedFiles();
-const generatedFiles = await io.writeGeneratedFiles(files);
-await io.cleanOutputDir(generatedFiles, filesToDelete);
+if (help) {
+	console.log(`Usage:
+tsgen <file> [OPTIONS]
+
+Arguments:
+  file                   OpenAPI JSON schema file (required)
+
+Options:
+  -h, --help             Show this screen
+  -o, --output-dir       Output directory
+  -p, --plugin <path>    Use the plugin loadable by <path>.
+  -v, --verbose          Enable verbose logging
+  --version              Show the app version
+`);
+} else if (version) {
+	const packageJson = JSON.parse(await readFile(new URL("../package.json", import.meta.url), "utf8"));
+	console.log(packageJson.version);
+} else {
+	if (!file) {
+		throw new Error("OpenAPI file is required");
+	}
+	const logger = new LoggerFactory({ verbose });
+	const outputDirPath = isAbsolute(outputDir) ? outputDir : join(process.cwd(), outputDir);
+	const io = new GeneratorIO(pathToFileURL(outputDirPath.endsWith(sep) ? outputDirPath : `${outputDirPath}${sep}`), logger);
+	const resolvedPlugins = await Promise.all(Array.from(new Set(plugins), async (pluginPath) => io.loadPlugin(pluginPath)));
+	const generator = new Generator(resolvedPlugins, {
+		logger,
+		outputDir
+	});
+	const files = await generator.process(await readFile(file, "utf8"));
+	const filesToDelete = await io.getExistingGeneratedFiles();
+	const generatedFiles = await io.writeGeneratedFiles(files);
+	await io.cleanOutputDir(generatedFiles, filesToDelete);
+}
 //# sourceMappingURL=./index.js.map

package/index.js.map

@@ -1 +1 @@
-{"mappings":"AAAA,OAAO,0DAA2D;AAClE,OAAO,mEAAoE;AAC3E,OAAO,gBAAiB;AACxB,OAAO,mCAAoC;AAC3C,SAAS,gCAAiC;AAE1C,MAAM,EACJ,OAAO,EAAE,WAAW,QAAQ,SAAS,SAAS,EAC9C,OAAO,CAAC,MAAM,EACf,GAAG,MACD;;;;;;;;;;;;GAaD;CACE,OAAO;EACL,WAAW;GACT,SAAS;GACT,WAAW;GACX,MAAM;EACP;EACD,QAAQ;GACN,SAAS,CAAE;GACX,YAAY;GACZ,WAAW;GACX,MAAM;EACP;EACD,SAAS;GACP,WAAW;GACX,MAAM;EACP;CACF;CACD,YAAY,OAAO;AACpB,EACF;AAED,MAAM,SAAS,IAAI,cAAc,EAAE,QAAS;AAE5C,MAAM,KAAK,IAAI,YAAY,WAAW;AAEtC,MAAM,kBAAkB,MAAM,QAAQ,IACpC,MAAM,KAAK,IAAI,IAAI,UAAU,OAAO,eAAe,GAAG,WAAW,WAAW,CAAC,CAC9E;AACD,MAAM,YAAY,IAAI,UAAU,iBAAiB;CAAE;CAAQ;AAAW;AAEtE,MAAM,QAAQ,MAAM,UAAU,QAAQ,MAAM,aAAa,IAAI,MAAM,CAAC;AACpE,MAAM,gBAAgB,MAAM,GAAG,mBAAmB;AAClD,MAAM,iBAAiB,MAAM,GAAG,oBAAoB,MAAM;AAE1D,MAAM,GAAG,eAAe,gBAAgB,cAAc","names":[],"sources":["/opt/agent/work/1af72d8adc613024/hilla/packages/ts/generator-cli/src/index.ts"],"sourcesContent":["import Generator from '@vaadin/hilla-generator-core/Generator.js';\nimport LoggerFactory from '@vaadin/hilla-generator-utils/LoggerFactory.js';\nimport meow from 'meow';\nimport GeneratorIO from './GeneratorIO.js';\nimport { processInput } from './utils.js';\n\nconst {\n  flags: { outputDir, plugin: plugins, verbose },\n  input: [input],\n} = meow(\n  `\nUsage:\n  tsgen\n    (will read JSON from stdin)\n  tsgen <OpenAPI JSON string>\n  tsgen <OpenAPI file path>\n\nOptions:\n  -h, --help             Show this screen\n  -o, --output-dir       Output directory\n  -p, --plugin <path>    Use the plugin loadable by <path>.\n  --version              Show the app version\n`,\n  {\n    flags: {\n      outputDir: {\n        default: 'frontend/generated',\n        shortFlag: 'o',\n        type: 'string',\n      },\n      plugin: {\n        default: [],\n        isMultiple: true,\n        shortFlag: 'p',\n        type: 'string',\n      },\n      verbose: {\n        shortFlag: 'v',\n        type: 'boolean',\n      },\n    },\n    importMeta: import.meta,\n  },\n);\n\nconst logger = new LoggerFactory({ verbose });\n\nconst io = new GeneratorIO(outputDir, logger);\n\nconst resolvedPlugins = await Promise.all(\n  Array.from(new Set(plugins), async (pluginPath) => io.loadPlugin(pluginPath)),\n);\nconst generator = new Generator(resolvedPlugins, { logger, outputDir });\n\nconst files = await generator.process(await processInput(io, input));\nconst filesToDelete = await io.getGeneratedFiles();\nconst generatedFiles = await io.writeGeneratedFiles(files);\n\nawait io.cleanOutputDir(generatedFiles, filesToDelete);\n"],"version":3}
+{"mappings":"AAAA,SAAS,kCAAmC;AAC5C,SAAS,YAAY,MAAM,sBAAuB;AAClD,SAAS,+BAAgC;AACzC,SAAS,4BAA6B;AACtC,OAAO,0DAA2D;AAClE,OAAO,mEAAoE;AAE3E,OAAO,mCAAoC;AAE3C,MAAM,EACJ,aAAa,CAAC,KAAK,EACnB,QAAQ,EAAE,MAAM,WAAW,QAAQ,SAAS,SAAS,SAAS,EAC/D,GAAG,UAAU;CACZ,SAAS;EACP,WAAW;GACT,MAAM;GACN,OAAO;EACR;EACD,MAAM,EACJ,MAAM,UACP;EACD,WAAW;GACT,SAAS;GACT,OAAO;GACP,MAAM;EACP;EACD,QAAQ;GACN,SAAS,CAAE;GACX,UAAU;GACV,OAAO;GACP,MAAM;EACP;EACD,SAAS;GACP,OAAO;GACP,MAAM;EACP;EACD,SAAS,EACP,MAAM,UACP;CACF;CACD,kBAAkB;AACnB,EAAC;AAEF,IAAI,MAAM;AAER,SAAQ,KAAK;;;;;;;;;;;;EAYb;AACD,WAAU,SAAS;CAClB,MAAMA,cAA2B,KAAK,MAAM,MAAM,SAAS,IAAI,IAAI,mBAAmB,OAAO,KAAK,MAAM,OAAO,CAAC;AAEhH,SAAQ,IAAI,YAAY,QAAQ;AACjC,OAAM;AACL,MAAK,MAAM;AACT,QAAM,IAAI,MAAM;CACjB;CAED,MAAM,SAAS,IAAI,cAAc,EAAE,QAAS;CAE5C,MAAM,gBAAgB,WAAW,UAAU,GAAG,YAAY,KAAK,QAAQ,KAAK,EAAE,UAAU;CAExF,MAAM,KAAK,IAAI,YACb,cAAc,cAAc,SAAS,IAAI,GAAG,iBAAiB,EAAE,cAAc,EAAE,IAAI,EAAE,EACrF;CAGF,MAAM,kBAAkB,MAAM,QAAQ,IACpC,MAAM,KAAK,IAAI,IAAI,UAAU,OAAO,eAAe,GAAG,WAAW,WAAW,CAAC,CAC9E;CACD,MAAM,YAAY,IAAI,UAAU,iBAAiB;EAAE;EAAQ;CAAW;CAEtE,MAAM,QAAQ,MAAM,UAAU,QAAQ,MAAM,SAAS,MAAM,OAAO,CAAC;CACnE,MAAM,gBAAgB,MAAM,GAAG,2BAA2B;CAC1D,MAAM,iBAAiB,MAAM,GAAG,oBAAoB,MAAM;AAE1D,OAAM,GAAG,eAAe,gBAAgB,cAAc;AACvD","names":["packageJson: PackageJson"],"sources":["/opt/agent/work/1af72d8adc613024/hilla/packages/ts/generator-cli/src/index.ts"],"sourcesContent":["import { readFile } from 'node:fs/promises';\nimport { isAbsolute, join, sep } from 'node:path';\nimport { pathToFileURL } from 'node:url';\nimport { parseArgs } from 'node:util';\nimport Generator from '@vaadin/hilla-generator-core/Generator.js';\nimport LoggerFactory from '@vaadin/hilla-generator-utils/LoggerFactory.js';\nimport type { PackageJson } from 'type-fest';\nimport GeneratorIO from './GeneratorIO.js';\n\nconst {\n  positionals: [file],\n  values: { help, outputDir, plugin: plugins, verbose, version },\n} = parseArgs({\n  options: {\n    inputFile: {\n      type: 'string',\n      short: 'i',\n    },\n    help: {\n      type: 'boolean',\n    },\n    outputDir: {\n      default: 'frontend/generated',\n      short: 'o',\n      type: 'string',\n    },\n    plugin: {\n      default: [],\n      multiple: true,\n      short: 'p',\n      type: 'string',\n    },\n    verbose: {\n      short: 'v',\n      type: 'boolean',\n    },\n    version: {\n      type: 'boolean',\n    },\n  },\n  allowPositionals: true,\n});\n\nif (help) {\n  // eslint-disable-next-line no-console\n  console.log(`Usage:\ntsgen <file> [OPTIONS]\n\nArguments:\n  file                   OpenAPI JSON schema file (required)\n\nOptions:\n  -h, --help             Show this screen\n  -o, --output-dir       Output directory\n  -p, --plugin <path>    Use the plugin loadable by <path>.\n  -v, --verbose          Enable verbose logging\n  --version              Show the app version\n`);\n} else if (version) {\n  const packageJson: PackageJson = JSON.parse(await readFile(new URL('../package.json', import.meta.url), 'utf8'));\n  // eslint-disable-next-line no-console\n  console.log(packageJson.version);\n} else {\n  if (!file) {\n    throw new Error('OpenAPI file is required');\n  }\n\n  const logger = new LoggerFactory({ verbose });\n\n  const outputDirPath = isAbsolute(outputDir) ? outputDir : join(process.cwd(), outputDir);\n\n  const io = new GeneratorIO(\n    pathToFileURL(outputDirPath.endsWith(sep) ? outputDirPath : `${outputDirPath}${sep}`),\n    logger,\n  );\n\n  const resolvedPlugins = await Promise.all(\n    Array.from(new Set(plugins), async (pluginPath) => io.loadPlugin(pluginPath)),\n  );\n  const generator = new Generator(resolvedPlugins, { logger, outputDir });\n\n  const files = await generator.process(await readFile(file, 'utf8'));\n  const filesToDelete = await io.getExistingGeneratedFiles();\n  const generatedFiles = await io.writeGeneratedFiles(files);\n\n  await io.cleanOutputDir(generatedFiles, filesToDelete);\n}\n"],"version":3}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-cli",
-  "version": "24.8.0-alpha1",
+  "version": "24.8.0-alpha3",
   "description": "A Hilla tool to generate TypeScript code from the OpenAPI document",
   "main": "index.js",
   "type": "module",
@@ -43,9 +43,7 @@
     "tsgen": "bin/index.js"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.8.0-alpha1",
-    "@vaadin/hilla-generator-utils": "24.8.0-alpha1",
-    "get-stdin": "9.0.0",
-    "meow": "13.2.0"
+    "@vaadin/hilla-generator-core": "24.8.0-alpha3",
+    "@vaadin/hilla-generator-utils": "24.8.0-alpha3"
   }
 }

package/utils.d.ts

@@ -1,2 +0,0 @@
-import type GeneratorIO from "./GeneratorIO.js";
-export declare function processInput(io: GeneratorIO, raw?: string): Promise<string>;

package/utils.js

@@ -1,16 +0,0 @@
-import { isAbsolute, resolve } from "path";
-import getStdin from "get-stdin";
-export async function processInput(io, raw) {
-	if (raw) {
-		let result = raw;
-		if (result.startsWith("'") || result.startsWith("\"")) {
-			result = raw.substring(1, raw.length - 1);
-		}
-		if (result.startsWith("{")) {
-			return result;
-		}
-		return io.read(isAbsolute(result) ? result : resolve(io.cwd, result));
-	}
-	return getStdin();
-}
-//# sourceMappingURL=./utils.js.map

package/utils.js.map

@@ -1 +0,0 @@
-{"mappings":"AAAA,SAAS,YAAY,qBAAsB;AAC3C,OAAO,yBAA0B;AAGjC,OAAO,eAAe,aAAaA,IAAiBC,KAA+B;AACjF,KAAI,KAAK;EACP,IAAI,SAAS;AAEb,MAAI,OAAO,WAAW,IAAI,IAAI,OAAO,WAAW,KAAI,EAAE;AACpD,YAAS,IAAI,UAAU,GAAG,IAAI,SAAS,EAAE;EAC1C;AAED,MAAI,OAAO,WAAW,IAAI,EAAE;AAC1B,UAAO;EACR;AAED,SAAO,GAAG,KAAK,WAAW,OAAO,GAAG,SAAS,QAAQ,GAAG,KAAK,OAAO,CAAC;CACtE;AAED,QAAO,UAAU;AAClB","names":["io: GeneratorIO","raw?: string"],"sources":["/opt/agent/work/1af72d8adc613024/hilla/packages/ts/generator-cli/src/utils.ts"],"sourcesContent":["import { isAbsolute, resolve } from 'path';\nimport getStdin from 'get-stdin';\nimport type GeneratorIO from './GeneratorIO.js';\n\nexport async function processInput(io: GeneratorIO, raw?: string): Promise<string> {\n  if (raw) {\n    let result = raw;\n\n    if (result.startsWith(\"'\") || result.startsWith('\"')) {\n      result = raw.substring(1, raw.length - 1);\n    }\n\n    if (result.startsWith('{')) {\n      return result;\n    }\n\n    return io.read(isAbsolute(result) ? result : resolve(io.cwd, result));\n  }\n\n  return getStdin();\n}\n"],"version":3}