@vaadin/hilla-generator-cli 24.7.0-alpha9 → 24.7.0-beta2

package/GeneratorIO.d.ts

@@ -1,33 +1,31 @@
-import type File from '@vaadin/hilla-generator-core/File.js';
-import { type PluginConstructor } from '@vaadin/hilla-generator-core/Plugin.js';
-import type LoggerFactory from '@vaadin/hilla-generator-utils/LoggerFactory.js';
+import { type PluginConstructor } from "@vaadin/hilla-generator-core/Plugin.js";
+import type LoggerFactory from "@vaadin/hilla-generator-utils/LoggerFactory.js";
 export default class GeneratorIO {
-    #private;
-    static readonly INDEX_FILENAME = "generated-file-list.txt";
-    ['constructor']: typeof GeneratorIO;
-    readonly cwd: string;
-    constructor(outputDir: string, logger: LoggerFactory);
-    /**
-     * Gets the list of files generated the last time. The info is found in {@link INDEX_FILENAME}.
-     * @returns a list of files that have been generated by us
-     */
-    getGeneratedFiles(): Promise<Set<string>>;
-    /**
-     * Cleans the output directory by keeping the generated files and deleting the rest of the given files.
-     *
-     * @returns a set containing deleted filenames
-     */
-    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>;
-    loadPlugin(modulePath: string): Promise<PluginConstructor>;
-    resolveGeneratedFile(filename: string): string;
-    read(path: string): Promise<string>;
-    write(filename: string, content: string): Promise<void>;
+	#private;
+	static readonly INDEX_FILENAME = "generated-file-list.txt";
+	["constructor"]: typeof GeneratorIO;
+	readonly cwd: string;
+	constructor(outputDir: string, logger: LoggerFactory);
+	/**
+	* Gets the list of files generated the last time. The info is found in {@link INDEX_FILENAME}.
+	* @returns a list of files that have been generated by us
+	*/
+	getGeneratedFiles(): Promise<Set<string>>;
+	/**
+	* Cleans the output directory by keeping the generated files and deleting the rest of the given files.
+	*
+	* @returns a set containing deleted filenames
+	*/
+	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>;
+	loadPlugin(modulePath: string): Promise<PluginConstructor>;
+	resolveGeneratedFile(filename: string): string;
+	read(path: string): Promise<string>;
+	write(filename: string, content: string): Promise<void>;
 }
-//# sourceMappingURL=GeneratorIO.d.ts.map

package/GeneratorIO.js

@@ -3,124 +3,113 @@ 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 Plugin, {} from "@vaadin/hilla-generator-core/Plugin.js";
+import Plugin from "@vaadin/hilla-generator-core/Plugin.js";
 import GeneratorIOException from "./GeneratorIOException.js";
-const require2 = createRequire(import.meta.url);
-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.#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}.
-   * @returns a list of files that have been generated by us
-   */
-  async getGeneratedFiles() {
-    const files = /* @__PURE__ */ 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));
-    } catch (e) {
-      if (!(e instanceof Error && "code" in e && e.code === "ENOENT")) {
-        throw e;
-      }
-    }
-    return files;
-  }
-  /**
-   * Cleans the output directory by keeping the generated files and deleting the rest of the given files.
-   *
-   * @returns a set containing deleted filenames
-   */
-  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);
-          }
-          return filename;
-        })
-      )
-    );
-    return deletedFiles;
-  }
-  async createFileIndex(filenames) {
-    await this.write(this.constructor.INDEX_FILENAME, filenames.join("\n"));
-  }
-  async writeGeneratedFiles(files) {
-    await this.createFileIndex(files.map((file) => file.name));
-    this.#logger.global.debug(`created index`);
-    return Promise.all(
-      files.map(async (file) => {
-        const newFileContent = await file.text();
-        let oldFileContent;
-        try {
-          oldFileContent = await this.read(this.resolveGeneratedFile(file.name));
-        } catch (_e) {
-        }
-        if (newFileContent !== oldFileContent) {
-          this.#logger.global.debug(`writing file ${file.name}`);
-          await this.write(file.name, await file.text());
-        } else {
-          this.#logger.global.debug(`File ${file.name} stayed the same`);
-        }
-        return file.name;
-      })
-    );
-  }
-  /**
-   * Checks that a file exists (is visible)
-   * @param path - the file path to check
-   */
-  // eslint-disable-next-line class-methods-use-this
-  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(require2.resolve(modulePath)).toString());
-    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 write(filename, content) {
-    const filePath = join(this.#outputDir, filename);
-    this.#logger.global.debug(`Writing file ${filePath}.`);
-    const dir = dirname(filePath);
-    await mkdir(dir, { recursive: true });
-    return writeFile(filePath, content, "utf-8");
-  }
+const require = createRequire(import.meta.url);
+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.#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}.
+	* @returns a list of files that have been generated by us
+	*/
+	async getGeneratedFiles() {
+		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));
+		} catch (e) {
+			if (!(e instanceof Error && "code" in e && e.code === "ENOENT")) {
+				throw e;
+			}
+		}
+		return files;
+	}
+	/**
+	* Cleans the output directory by keeping the generated files and deleting the rest of the given files.
+	*
+	* @returns a set containing deleted filenames
+	*/
+	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);
+			}
+			return filename;
+		})));
+		return deletedFiles;
+	}
+	async createFileIndex(filenames) {
+		await this.write(this.constructor.INDEX_FILENAME, filenames.join("\n"));
+	}
+	async writeGeneratedFiles(files) {
+		await this.createFileIndex(files.map((file) => file.name));
+		this.#logger.global.debug(`created index`);
+		return Promise.all(files.map(async (file) => {
+			const newFileContent = await file.text();
+			let oldFileContent;
+			try {
+				oldFileContent = await this.read(this.resolveGeneratedFile(file.name));
+			} catch (_e) {}
+			if (newFileContent !== oldFileContent) {
+				this.#logger.global.debug(`writing file ${file.name}`);
+				await this.write(file.name, await file.text());
+			} else {
+				this.#logger.global.debug(`File ${file.name} 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 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 write(filename, content) {
+		const filePath = join(this.#outputDir, filename);
+		this.#logger.global.debug(`Writing file ${filePath}.`);
+		const dir = dirname(filePath);
+		await mkdir(dir, { recursive: true });
+		return writeFile(filePath, content, "utf-8");
+	}
 }
-export {
-  GeneratorIO as default
-};
-//# sourceMappingURL=GeneratorIO.js.map
+//# sourceMappingURL=./GeneratorIO.js.map

package/GeneratorIO.js.map

@@ -1,7 +1 @@
-{
-  "version": 3,
-  "sources": ["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 type File from '@vaadin/hilla-generator-core/File.js';\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"],
-  "mappings": "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",
-  "names": ["require"]
-}
+{"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}

package/GeneratorIOException.d.ts

@@ -1,4 +1,3 @@
 export default class GeneratorIOException extends Error {
-    constructor(message: string);
+	constructor(message: string);
 }
-//# sourceMappingURL=GeneratorIOException.d.ts.map

package/GeneratorIOException.js

@@ -1,9 +1,6 @@
-class GeneratorIOException extends Error {
-  constructor(message) {
-    super(`[GeneratorIOException]: ${message}`);
-  }
+export default class GeneratorIOException extends Error {
+	constructor(message) {
+		super(`[GeneratorIOException]: ${message}`);
+	}
 }
-export {
-  GeneratorIOException as default
-};
-//# sourceMappingURL=GeneratorIOException.js.map
+//# sourceMappingURL=./GeneratorIOException.js.map

package/GeneratorIOException.js.map

@@ -1,7 +1 @@
-{
-  "version": 3,
-  "sources": ["src/GeneratorIOException.ts"],
-  "sourcesContent": ["export default class GeneratorIOException extends Error {\n  constructor(message: string) {\n    super(`[GeneratorIOException]: ${message}`);\n  }\n}\n"],
-  "mappings": "AAAA,MAAO,6BAA2C,MAAM;AAAA,EACtD,YAAY,SAAiB;AAC3B,UAAM,2BAA2B,OAAO,EAAE;AAAA,EAC5C;AACF;",
-  "names": []
-}
+{"mappings":"AAAA,eAAe,MAAM,6BAA6B,MAAM;CACtD,YAAYA,SAAiB;AAC3B,SAAO,0BAA0B,QAAQ,EAAE;CAC5C;AACF","names":["message: string"],"sources":["/opt/agent/work/1af72d8adc613024/hilla/packages/ts/generator-cli/src/GeneratorIOException.ts"],"sourcesContent":["export default class GeneratorIOException extends Error {\n  constructor(message: string) {\n    super(`[GeneratorIOException]: ${message}`);\n  }\n}\n"],"version":3}

package/index.d.ts

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=index.d.ts.map

package/index.js

@@ -3,11 +3,7 @@ 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(
-  `
+const { flags: { outputDir, plugin: plugins, verbose }, input: [input] } = meow(`
 Usage:
   tsgen
     (will read JSON from stdin)
@@ -19,36 +15,35 @@ Options:
   -o, --output-dir       Output directory
   -p, --plugin <path>    Use the plugin loadable by <path>.
   --version              Show the app version
-`,
-  {
-    flags: {
-      outputDir: {
-        default: "frontend/generated",
-        shortFlag: "o",
-        type: "string"
-      },
-      plugin: {
-        default: [],
-        isMultiple: true,
-        shortFlag: "p",
-        type: "string"
-      },
-      verbose: {
-        shortFlag: "v",
-        type: "boolean"
-      }
-    },
-    importMeta: import.meta
-  }
-);
+`, {
+	flags: {
+		outputDir: {
+			default: "frontend/generated",
+			shortFlag: "o",
+			type: "string"
+		},
+		plugin: {
+			default: [],
+			isMultiple: true,
+			shortFlag: "p",
+			type: "string"
+		},
+		verbose: {
+			shortFlag: "v",
+			type: "boolean"
+		}
+	},
+	importMeta: import.meta
+});
 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 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);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=./index.js.map

package/index.js.map

@@ -1,7 +1 @@
-{
-  "version": 3,
-  "sources": ["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"],
-  "mappings": "AAAA,OAAO,eAAe;AACtB,OAAO,mBAAmB;AAC1B,OAAO,UAAU;AACjB,OAAO,iBAAiB;AACxB,SAAS,oBAAoB;AAE7B,MAAM;AAAA,EACJ,OAAO,EAAE,WAAW,QAAQ,SAAS,QAAQ;AAAA,EAC7C,OAAO,CAAC,KAAK;AACf,IAAI;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAaA;AAAA,IACE,OAAO;AAAA,MACL,WAAW;AAAA,QACT,SAAS;AAAA,QACT,WAAW;AAAA,QACX,MAAM;AAAA,MACR;AAAA,MACA,QAAQ;AAAA,QACN,SAAS,CAAC;AAAA,QACV,YAAY;AAAA,QACZ,WAAW;AAAA,QACX,MAAM;AAAA,MACR;AAAA,MACA,SAAS;AAAA,QACP,WAAW;AAAA,QACX,MAAM;AAAA,MACR;AAAA,IACF;AAAA,IACA,YAAY;AAAA,EACd;AACF;AAEA,MAAM,SAAS,IAAI,cAAc,EAAE,QAAQ,CAAC;AAE5C,MAAM,KAAK,IAAI,YAAY,WAAW,MAAM;AAE5C,MAAM,kBAAkB,MAAM,QAAQ;AAAA,EACpC,MAAM,KAAK,IAAI,IAAI,OAAO,GAAG,OAAO,eAAe,GAAG,WAAW,UAAU,CAAC;AAC9E;AACA,MAAM,YAAY,IAAI,UAAU,iBAAiB,EAAE,QAAQ,UAAU,CAAC;AAEtE,MAAM,QAAQ,MAAM,UAAU,QAAQ,MAAM,aAAa,IAAI,KAAK,CAAC;AACnE,MAAM,gBAAgB,MAAM,GAAG,kBAAkB;AACjD,MAAM,iBAAiB,MAAM,GAAG,oBAAoB,KAAK;AAEzD,MAAM,GAAG,eAAe,gBAAgB,aAAa;",
-  "names": []
-}
+{"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}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-cli",
-  "version": "24.7.0-alpha9",
+  "version": "24.7.0-beta2",
   "description": "A Hilla tool to generate TypeScript code from the OpenAPI document",
   "main": "index.js",
   "type": "module",
@@ -9,14 +9,12 @@
   },
   "scripts": {
     "clean:build": "git clean -fx . -e .vite -e node_modules",
-    "build": "concurrently npm:build:*",
-    "build:esbuild": "tsx ../../../scripts/build.ts",
-    "build:dts": "tsc --isolatedModules -p tsconfig.build.json",
-    "build:copy": "cd src && copyfiles **/*.d.ts ..",
+    "build": "tsx ../../../scripts/fast-build.ts",
     "lint": "eslint src test",
     "lint:fix": "eslint src test --fix",
-    "test": "mocha test/**/*.spec.ts --config ../../../.mocharc.cjs",
-    "test:coverage": "c8 --experimental-monocart -c ../../../.c8rc.json npm test",
+    "test": "vitest --run",
+    "test:coverage": "vitest --run --coverage",
+    "test:watch": "vitest",
     "typecheck": "tsc --noEmit"
   },
   "repository": {
@@ -45,29 +43,9 @@
     "tsgen": "bin/index.js"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.7.0-alpha9",
-    "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
-    "get-stdin": "^9.0.0",
-    "meow": "^13.2.0"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.20",
-    "@types/chai-as-promised": "^7.1.8",
-    "@types/mocha": "^10.0.10",
-    "@types/node": "^20.17.12",
-    "@types/sinon": "^10.0.20",
-    "@types/sinon-chai": "^3.2.12",
-    "@vaadin/hilla-generator-core": "24.7.0-alpha9",
-    "c8": "^10.1.3",
-    "chai": "^4.5.0",
-    "chai-as-promised": "^7.1.2",
-    "concurrently": "^9.1.2",
-    "copyfiles": "^2.4.1",
-    "mocha": "^11.1.0",
-    "monocart-coverage-reports": "^2.11.5",
-    "pino": "^9.6.0",
-    "sinon": "^16.1.3",
-    "sinon-chai": "^3.7.0",
-    "type-fest": "^4.32.0"
+    "@vaadin/hilla-generator-core": "24.7.0-beta2",
+    "@vaadin/hilla-generator-utils": "24.7.0-beta2",
+    "get-stdin": "9.0.0",
+    "meow": "13.2.0"
   }
 }

package/utils.d.ts

@@ -1,3 +1,2 @@
-import type GeneratorIO from './GeneratorIO.js';
+import type GeneratorIO from "./GeneratorIO.js";
 export declare function processInput(io: GeneratorIO, raw?: string): Promise<string>;
-//# sourceMappingURL=utils.d.ts.map

package/utils.js

@@ -1,19 +1,16 @@
 import { isAbsolute, resolve } from "path";
 import getStdin from "get-stdin";
-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();
+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();
 }
-export {
-  processInput
-};
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=./utils.js.map

package/utils.js.map

@@ -1,7 +1 @@
-{
-  "version": 3,
-  "sources": ["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"],
-  "mappings": "AAAA,SAAS,YAAY,eAAe;AACpC,OAAO,cAAc;AAGrB,eAAsB,aAAa,IAAiB,KAA+B;AACjF,MAAI,KAAK;AACP,QAAI,SAAS;AAEb,QAAI,OAAO,WAAW,GAAG,KAAK,OAAO,WAAW,GAAG,GAAG;AACpD,eAAS,IAAI,UAAU,GAAG,IAAI,SAAS,CAAC;AAAA,IAC1C;AAEA,QAAI,OAAO,WAAW,GAAG,GAAG;AAC1B,aAAO;AAAA,IACT;AAEA,WAAO,GAAG,KAAK,WAAW,MAAM,IAAI,SAAS,QAAQ,GAAG,KAAK,MAAM,CAAC;AAAA,EACtE;AAEA,SAAO,SAAS;AAClB;",
-  "names": []
-}
+{"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}

package/GeneratorIO.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"GeneratorIO.d.ts","sourceRoot":"","sources":["src/GeneratorIO.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,IAAI,MAAM,sCAAsC,CAAC;AAC7D,OAAe,EAAE,KAAK,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,aAAa,MAAM,gDAAgD,CAAC;AAShF,MAAM,CAAC,OAAO,OAAO,WAAW;;IAC9B,MAAM,CAAC,QAAQ,CAAC,cAAc,6BAA6B;IACnD,CAAC,aAAa,CAAC,EAAE,OAAO,WAAW,CAAC;IAC5C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;gBAIT,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa;IAQpD;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAiB/C;;;;OAIG;IACG,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAyB1F,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD,mBAAmB,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAuBpE;;;OAGG;WAEU,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAS7C,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAYhE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKnC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAO9D"}

package/GeneratorIOException.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"GeneratorIOException.d.ts","sourceRoot":"","sources":["src/GeneratorIOException.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,KAAK;gBACzC,OAAO,EAAE,MAAM;CAG5B"}

package/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":""}

package/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAEhD,wBAAsB,YAAY,CAAC,EAAE,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgBjF"}