@vaadin/hilla-generator-utils 25.4.0-alpha2 → 25.4.0-alpha4

package/dependencies/DependencyManager.d.ts

@@ -1,9 +1,11 @@
 import ExportManager from "./ExportManager.js";
 import ImportManager from "./ImportManager.js";
+import NameRegistry from "./NameRegistry.js";
 import type PathManager from "./PathManager.js";
 export default class DependencyManager {
 	readonly exports: ExportManager;
 	readonly imports: ImportManager;
+	readonly names: NameRegistry;
 	readonly paths: PathManager;
 	constructor(paths: PathManager, collator?: Intl.Collator);
 }

package/dependencies/DependencyManager.js

@@ -1,12 +1,15 @@
 import ExportManager from "./ExportManager.js";
 import ImportManager from "./ImportManager.js";
+import NameRegistry from "./NameRegistry.js";
 export default class DependencyManager {
 	exports;
 	imports;
+	names;
 	paths;
 	constructor(paths, collator = new Intl.Collator("en", { sensitivity: "case" })) {
-		this.exports = new ExportManager(collator);
-		this.imports = new ImportManager(collator);
+		this.names = new NameRegistry();
+		this.exports = new ExportManager(collator, this.names);
+		this.imports = new ImportManager(collator, this.names);
 		this.paths = paths;
 	}
 }

package/dependencies/DependencyManager.js.map

@@ -1 +1 @@
-{"mappings":"AAAA,OAAO,uCAAwC;AAC/C,OAAO,uCAAwC;AAG/C,eAAe,MAAM,kBAAkB;CACrC,AAAS;CACT,AAAS;CACT,AAAS;CAET,YAAYA,OAAoBC,WAA0B,IAAI,KAAK,SAAS,MAAM,EAAE,aAAa,OAAQ,IAAG;AAC1G,OAAK,UAAU,IAAI,cAAc;AACjC,OAAK,UAAU,IAAI,cAAc;AACjC,OAAK,QAAQ;CACd;AACF","names":["paths: PathManager","collator: Intl.Collator"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/dependencies/DependencyManager.ts"],"sourcesContent":["import ExportManager from './ExportManager.js';\nimport ImportManager from './ImportManager.js';\nimport type PathManager from './PathManager.js';\n\nexport default class DependencyManager {\n  readonly exports: ExportManager;\n  readonly imports: ImportManager;\n  readonly paths: PathManager;\n\n  constructor(paths: PathManager, collator: Intl.Collator = new Intl.Collator('en', { sensitivity: 'case' })) {\n    this.exports = new ExportManager(collator);\n    this.imports = new ImportManager(collator);\n    this.paths = paths;\n  }\n}\n"],"version":3}
+{"mappings":"AAAA,OAAO,uCAAwC;AAC/C,OAAO,uCAAwC;AAC/C,OAAO,qCAAsC;AAG7C,eAAe,MAAM,kBAAkB;CACrC,AAAS;CACT,AAAS;CACT,AAAS;CACT,AAAS;CAET,YAAYA,OAAoBC,WAA0B,IAAI,KAAK,SAAS,MAAM,EAAE,aAAa,OAAQ,IAAG;AAC1G,OAAK,QAAQ,IAAI;AACjB,OAAK,UAAU,IAAI,cAAc,UAAU,KAAK;AAChD,OAAK,UAAU,IAAI,cAAc,UAAU,KAAK;AAChD,OAAK,QAAQ;CACd;AACF","names":["paths: PathManager","collator: Intl.Collator"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/dependencies/DependencyManager.ts"],"sourcesContent":["import ExportManager from './ExportManager.js';\nimport ImportManager from './ImportManager.js';\nimport NameRegistry from './NameRegistry.js';\nimport type PathManager from './PathManager.js';\n\nexport default class DependencyManager {\n  readonly exports: ExportManager;\n  readonly imports: ImportManager;\n  readonly names: NameRegistry;\n  readonly paths: PathManager;\n\n  constructor(paths: PathManager, collator: Intl.Collator = new Intl.Collator('en', { sensitivity: 'case' })) {\n    this.names = new NameRegistry();\n    this.exports = new ExportManager(collator, this.names);\n    this.imports = new ImportManager(collator, this.names);\n    this.paths = paths;\n  }\n}\n"],"version":3}

package/dependencies/ExportManager.d.ts

@@ -1,11 +1,12 @@
-import { type ExportAssignment, type ExportDeclaration, type Identifier, type Statement } from "@typescript/typescript6";
+import ts, { type ExportAssignment, type ExportDeclaration, type Identifier, type Statement } from "@typescript/typescript6";
 import type CodeConvertable from "./CodeConvertable.js";
+import NameRegistry from "./NameRegistry.js";
 import StatementRecordManager, { type StatementRecord } from "./StatementRecordManager.js";
 export declare class NamedExportManager implements CodeConvertable<ExportDeclaration | undefined> {
 	#private;
 	readonly collator: Intl.Collator;
 	get size(): number;
-	constructor(collator: Intl.Collator);
+	constructor(collator: Intl.Collator, names: NameRegistry);
 	add(name: string, isType?: boolean, uniqueId?: Identifier): Identifier;
 	getIdentifier(name: string): Identifier | undefined;
 	identifiers(): IterableIterator<readonly [id: Identifier, isType: boolean]>;
@@ -15,6 +16,7 @@ export declare class NamedExportManager implements CodeConvertable<ExportDeclara
 }
 export declare class NamespaceExportManager extends StatementRecordManager<ExportDeclaration> {
 	#private;
+	constructor(collator: Intl.Collator, names: NameRegistry);
 	get size(): number;
 	addCombined(path: string, name: string, uniqueId?: Identifier): Identifier;
 	addSpread(path: string): void;
@@ -28,15 +30,22 @@ export declare class NamespaceExportManager extends StatementRecordManager<Expor
 }
 export declare class DefaultExportManager implements CodeConvertable<ExportAssignment | undefined> {
 	#private;
+	constructor(names: NameRegistry);
 	get isEmpty(): boolean;
+	/**
+	* The name is taken as given rather than made unique: it belongs to a
+	* declaration the caller emits, so the caller decides how it is spelled.
+	*/
 	set(id: Identifier | string): Identifier;
 	toCode(): ExportAssignment | undefined;
 }
 export default class ExportManager implements CodeConvertable<readonly Statement[]> {
 	readonly default: DefaultExportManager;
 	readonly named: NamedExportManager;
+	readonly names: NameRegistry;
 	readonly namespace: NamespaceExportManager;
 	get size(): number;
-	constructor(collator: Intl.Collator);
+	constructor(collator: Intl.Collator, names?: NameRegistry);
 	toCode(): readonly Statement[];
+	fromCode(source: ts.SourceFile): void;
 }

package/dependencies/ExportManager.js

@@ -1,18 +1,23 @@
 import ts from "@typescript/typescript6";
-import createFullyUniqueIdentifier from "../createFullyUniqueIdentifier.js";
+import NameRegistry from "./NameRegistry.js";
 import StatementRecordManager from "./StatementRecordManager.js";
 import { createDependencyRecord } from "./utils.js";
 export class NamedExportManager {
 	collator;
 	#map = new Map();
+	#names;
 	get size() {
 		return this.#map.size;
 	}
-	constructor(collator) {
+	constructor(collator, names) {
 		this.collator = collator;
+		this.#names = names;
 	}
 	add(name, isType, uniqueId) {
-		const id = uniqueId ?? createFullyUniqueIdentifier(name);
+		if (uniqueId) {
+			this.#names.claim(uniqueId.text);
+		}
+		const id = uniqueId ?? this.getIdentifier(name) ?? this.#names.reserveIdentifier(name);
 		this.#map.set(name, createDependencyRecord(id, isType));
 		return id;
 	}
@@ -38,17 +43,25 @@ export class NamedExportManager {
 		names.sort(this.collator.compare);
 		return ts.factory.createExportDeclaration(undefined, false, ts.factory.createNamedExports(names.map((name) => {
 			const { id, isType } = this.#map.get(name);
-			return ts.factory.createExportSpecifier(isType, id, ts.factory.createIdentifier(name));
+			return ts.factory.createExportSpecifier(isType, id.text === name ? undefined : id, ts.factory.createIdentifier(name));
 		})), undefined);
 	}
 }
 export class NamespaceExportManager extends StatementRecordManager {
 	#map = new Map();
+	#names;
+	constructor(collator, names) {
+		super(collator);
+		this.#names = names;
+	}
 	get size() {
 		return this.#map.size;
 	}
 	addCombined(path, name, uniqueId) {
-		const id = uniqueId ?? createFullyUniqueIdentifier(name);
+		if (uniqueId) {
+			this.#names.claim(uniqueId.text);
+		}
+		const id = uniqueId ?? this.#map.get(path) ?? this.#names.reserveIdentifier(name);
 		this.#map.set(path, id);
 		return id;
 	}
@@ -80,12 +93,21 @@ export class NamespaceExportManager extends StatementRecordManager {
 	}
 }
 export class DefaultExportManager {
+	#names;
 	#id;
+	constructor(names) {
+		this.#names = names;
+	}
 	get isEmpty() {
 		return !this.#id;
 	}
+	/**
+	* The name is taken as given rather than made unique: it belongs to a
+	* declaration the caller emits, so the caller decides how it is spelled.
+	*/
 	set(id) {
 		this.#id = typeof id === "string" ? ts.factory.createIdentifier(id) : id;
+		this.#names.claim(this.#id.text);
 		return this.#id;
 	}
 	toCode() {
@@ -93,15 +115,18 @@ export class DefaultExportManager {
 	}
 }
 export default class ExportManager {
-	default = new DefaultExportManager();
+	default;
 	named;
+	names;
 	namespace;
 	get size() {
 		return (this.default.isEmpty ? 0 : 1) + this.named.size + this.namespace.size;
 	}
-	constructor(collator) {
-		this.named = new NamedExportManager(collator);
-		this.namespace = new NamespaceExportManager(collator);
+	constructor(collator, names = new NameRegistry()) {
+		this.default = new DefaultExportManager(names);
+		this.named = new NamedExportManager(collator, names);
+		this.namespace = new NamespaceExportManager(collator, names);
+		this.names = names;
 	}
 	toCode() {
 		const defaultStatement = this.default.toCode();
@@ -117,5 +142,17 @@ export default class ExportManager {
 		}
 		return result;
 	}
+	fromCode(source) {
+		for (const statement of source.statements) {
+			if (ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause)) {
+				for (const { isTypeOnly, name, propertyName } of statement.exportClause.elements) {
+					const local = propertyName ?? name;
+					if (ts.isIdentifier(local)) {
+						this.named.add(name.text, isTypeOnly, local);
+					}
+				}
+			}
+		}
+	}
 }
 //# sourceMappingURL=./ExportManager.js.map

package/dependencies/ExportManager.js.map

@@ -1 +1 @@
-{"mappings":"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","names":["#map","collator: Intl.Collator","name: string","isType?: boolean","uniqueId?: Identifier","path: string","#id","id: Identifier | string","result: Statement[]"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/dependencies/ExportManager.ts"],"sourcesContent":["import ts, {\n  type ExportAssignment,\n  type ExportDeclaration,\n  type Identifier,\n  type Statement,\n} from '@typescript/typescript6';\nimport createFullyUniqueIdentifier from '../createFullyUniqueIdentifier.js';\nimport type CodeConvertable from './CodeConvertable.js';\nimport StatementRecordManager, { type StatementRecord } from './StatementRecordManager.js';\nimport { createDependencyRecord, type DependencyRecord } from './utils.js';\n\nexport class NamedExportManager implements CodeConvertable<ExportDeclaration | undefined> {\n  readonly collator: Intl.Collator;\n  readonly #map = new Map<string, DependencyRecord>();\n\n  get size(): number {\n    return this.#map.size;\n  }\n\n  constructor(collator: Intl.Collator) {\n    this.collator = collator;\n  }\n\n  add(name: string, isType?: boolean, uniqueId?: Identifier): Identifier {\n    const id = uniqueId ?? createFullyUniqueIdentifier(name);\n    this.#map.set(name, createDependencyRecord(id, isType));\n    return id;\n  }\n\n  getIdentifier(name: string): Identifier | undefined {\n    return this.#map.get(name)?.id;\n  }\n\n  *identifiers(): IterableIterator<readonly [id: Identifier, isType: boolean]> {\n    for (const { id, isType } of this.#map.values()) {\n      yield [id, isType];\n    }\n  }\n\n  isType(name: string): boolean | undefined {\n    return this.#map.get(name)?.isType;\n  }\n\n  names(): IterableIterator<string> {\n    return this.#map.keys();\n  }\n\n  toCode(): ExportDeclaration | undefined {\n    if (this.#map.size === 0) {\n      return undefined;\n    }\n\n    const names = [...this.#map.keys()];\n    // eslint-disable-next-line @typescript-eslint/unbound-method\n    names.sort(this.collator.compare);\n\n    return ts.factory.createExportDeclaration(\n      undefined,\n      false,\n      ts.factory.createNamedExports(\n        names.map((name) => {\n          const { id, isType } = this.#map.get(name)!;\n          return ts.factory.createExportSpecifier(isType, id, ts.factory.createIdentifier(name));\n        }),\n      ),\n      undefined,\n    );\n  }\n}\n\nexport class NamespaceExportManager extends StatementRecordManager<ExportDeclaration> {\n  readonly #map = new Map<string, Identifier | null>();\n\n  get size(): number {\n    return this.#map.size;\n  }\n\n  addCombined(path: string, name: string, uniqueId?: Identifier): Identifier {\n    const id = uniqueId ?? createFullyUniqueIdentifier(name);\n    this.#map.set(path, id);\n    return id;\n  }\n\n  addSpread(path: string): void {\n    this.#map.set(path, null);\n  }\n\n  override clear(): void {\n    this.#map.clear();\n  }\n\n  getIdentifier(path: string): Identifier | null | undefined {\n    return this.#map.get(path);\n  }\n\n  identifiers(): IterableIterator<Identifier | null> {\n    return this.#map.values();\n  }\n\n  isCombined(path: string): boolean | undefined {\n    return this.#map.has(path) ? this.#map.get(path) !== null : undefined;\n  }\n\n  isSpread(path: string): boolean | undefined {\n    return this.#map.has(path) ? this.#map.get(path) === null : undefined;\n  }\n\n  paths(): IterableIterator<string> {\n    return this.#map.keys();\n  }\n\n  override *statementRecords(): IterableIterator<StatementRecord<ExportDeclaration>> {\n    for (const [path, id] of this.#map) {\n      yield [\n        path,\n        ts.factory.createExportDeclaration(\n          undefined,\n          false,\n          id !== null ? ts.factory.createNamespaceExport(id) : undefined,\n          ts.factory.createStringLiteral(path),\n        ),\n      ];\n    }\n  }\n}\n\nexport class DefaultExportManager implements CodeConvertable<ExportAssignment | undefined> {\n  #id?: Identifier;\n\n  get isEmpty(): boolean {\n    return !this.#id;\n  }\n\n  set(id: Identifier | string): Identifier {\n    this.#id = typeof id === 'string' ? ts.factory.createIdentifier(id) : id;\n    return this.#id;\n  }\n\n  toCode(): ExportAssignment | undefined {\n    return this.#id ? ts.factory.createExportAssignment(undefined, undefined, this.#id) : undefined;\n  }\n}\n\nexport default class ExportManager implements CodeConvertable<readonly Statement[]> {\n  readonly default: DefaultExportManager = new DefaultExportManager();\n  readonly named: NamedExportManager;\n  readonly namespace: NamespaceExportManager;\n\n  get size(): number {\n    return (this.default.isEmpty ? 0 : 1) + this.named.size + this.namespace.size;\n  }\n\n  constructor(collator: Intl.Collator) {\n    this.named = new NamedExportManager(collator);\n    this.namespace = new NamespaceExportManager(collator);\n  }\n\n  toCode(): readonly Statement[] {\n    const defaultStatement = this.default.toCode();\n    const namedStatement = this.named.toCode();\n    const namespaceStatements = this.namespace.toCode();\n\n    const result: Statement[] = [];\n\n    if (namedStatement) {\n      result.push(namedStatement);\n    }\n\n    result.push(...namespaceStatements);\n\n    if (defaultStatement) {\n      result.push(defaultStatement);\n    }\n\n    return result;\n  }\n}\n"],"version":3}
+{"mappings":"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","names":["#map","#names","collator: Intl.Collator","names: NameRegistry","name: string","isType?: boolean","uniqueId?: Identifier","path: string","#id","id: Identifier | string","result: Statement[]","source: ts.SourceFile"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/dependencies/ExportManager.ts"],"sourcesContent":["import ts, {\n  type ExportAssignment,\n  type ExportDeclaration,\n  type Identifier,\n  type Statement,\n} from '@typescript/typescript6';\nimport type CodeConvertable from './CodeConvertable.js';\nimport NameRegistry from './NameRegistry.js';\nimport StatementRecordManager, { type StatementRecord } from './StatementRecordManager.js';\nimport { createDependencyRecord, type DependencyRecord } from './utils.js';\n\nexport class NamedExportManager implements CodeConvertable<ExportDeclaration | undefined> {\n  readonly collator: Intl.Collator;\n  readonly #map = new Map<string, DependencyRecord>();\n  readonly #names: NameRegistry;\n\n  get size(): number {\n    return this.#map.size;\n  }\n\n  constructor(collator: Intl.Collator, names: NameRegistry) {\n    this.collator = collator;\n    this.#names = names;\n  }\n\n  add(name: string, isType?: boolean, uniqueId?: Identifier): Identifier {\n    if (uniqueId) {\n      this.#names.claim(uniqueId.text);\n    }\n\n    const id = uniqueId ?? this.getIdentifier(name) ?? this.#names.reserveIdentifier(name);\n    this.#map.set(name, createDependencyRecord(id, isType));\n    return id;\n  }\n\n  getIdentifier(name: string): Identifier | undefined {\n    return this.#map.get(name)?.id;\n  }\n\n  *identifiers(): IterableIterator<readonly [id: Identifier, isType: boolean]> {\n    for (const { id, isType } of this.#map.values()) {\n      yield [id, isType];\n    }\n  }\n\n  isType(name: string): boolean | undefined {\n    return this.#map.get(name)?.isType;\n  }\n\n  names(): IterableIterator<string> {\n    return this.#map.keys();\n  }\n\n  toCode(): ExportDeclaration | undefined {\n    if (this.#map.size === 0) {\n      return undefined;\n    }\n\n    const names = [...this.#map.keys()];\n    // eslint-disable-next-line @typescript-eslint/unbound-method\n    names.sort(this.collator.compare);\n\n    return ts.factory.createExportDeclaration(\n      undefined,\n      false,\n      ts.factory.createNamedExports(\n        names.map((name) => {\n          const { id, isType } = this.#map.get(name)!;\n          return ts.factory.createExportSpecifier(\n            isType,\n            id.text === name ? undefined : id,\n            ts.factory.createIdentifier(name),\n          );\n        }),\n      ),\n      undefined,\n    );\n  }\n}\n\nexport class NamespaceExportManager extends StatementRecordManager<ExportDeclaration> {\n  readonly #map = new Map<string, Identifier | null>();\n  readonly #names: NameRegistry;\n\n  constructor(collator: Intl.Collator, names: NameRegistry) {\n    super(collator);\n    this.#names = names;\n  }\n\n  get size(): number {\n    return this.#map.size;\n  }\n\n  addCombined(path: string, name: string, uniqueId?: Identifier): Identifier {\n    if (uniqueId) {\n      this.#names.claim(uniqueId.text);\n    }\n\n    const id = uniqueId ?? this.#map.get(path) ?? this.#names.reserveIdentifier(name);\n    this.#map.set(path, id);\n    return id;\n  }\n\n  addSpread(path: string): void {\n    this.#map.set(path, null);\n  }\n\n  override clear(): void {\n    this.#map.clear();\n  }\n\n  getIdentifier(path: string): Identifier | null | undefined {\n    return this.#map.get(path);\n  }\n\n  identifiers(): IterableIterator<Identifier | null> {\n    return this.#map.values();\n  }\n\n  isCombined(path: string): boolean | undefined {\n    return this.#map.has(path) ? this.#map.get(path) !== null : undefined;\n  }\n\n  isSpread(path: string): boolean | undefined {\n    return this.#map.has(path) ? this.#map.get(path) === null : undefined;\n  }\n\n  paths(): IterableIterator<string> {\n    return this.#map.keys();\n  }\n\n  override *statementRecords(): IterableIterator<StatementRecord<ExportDeclaration>> {\n    for (const [path, id] of this.#map) {\n      yield [\n        path,\n        ts.factory.createExportDeclaration(\n          undefined,\n          false,\n          id !== null ? ts.factory.createNamespaceExport(id) : undefined,\n          ts.factory.createStringLiteral(path),\n        ),\n      ];\n    }\n  }\n}\n\nexport class DefaultExportManager implements CodeConvertable<ExportAssignment | undefined> {\n  readonly #names: NameRegistry;\n  #id?: Identifier;\n\n  constructor(names: NameRegistry) {\n    this.#names = names;\n  }\n\n  get isEmpty(): boolean {\n    return !this.#id;\n  }\n\n  /**\n   * The name is taken as given rather than made unique: it belongs to a\n   * declaration the caller emits, so the caller decides how it is spelled.\n   */\n  set(id: Identifier | string): Identifier {\n    this.#id = typeof id === 'string' ? ts.factory.createIdentifier(id) : id;\n    this.#names.claim(this.#id.text);\n    return this.#id;\n  }\n\n  toCode(): ExportAssignment | undefined {\n    return this.#id ? ts.factory.createExportAssignment(undefined, undefined, this.#id) : undefined;\n  }\n}\n\nexport default class ExportManager implements CodeConvertable<readonly Statement[]> {\n  readonly default: DefaultExportManager;\n  readonly named: NamedExportManager;\n  readonly names: NameRegistry;\n  readonly namespace: NamespaceExportManager;\n\n  get size(): number {\n    return (this.default.isEmpty ? 0 : 1) + this.named.size + this.namespace.size;\n  }\n\n  constructor(collator: Intl.Collator, names: NameRegistry = new NameRegistry()) {\n    this.default = new DefaultExportManager(names);\n    this.named = new NamedExportManager(collator, names);\n    this.namespace = new NamespaceExportManager(collator, names);\n    this.names = names;\n  }\n\n  toCode(): readonly Statement[] {\n    const defaultStatement = this.default.toCode();\n    const namedStatement = this.named.toCode();\n    const namespaceStatements = this.namespace.toCode();\n\n    const result: Statement[] = [];\n\n    if (namedStatement) {\n      result.push(namedStatement);\n    }\n\n    result.push(...namespaceStatements);\n\n    if (defaultStatement) {\n      result.push(defaultStatement);\n    }\n\n    return result;\n  }\n\n  fromCode(source: ts.SourceFile): void {\n    for (const statement of source.statements) {\n      if (ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause)) {\n        for (const { isTypeOnly, name, propertyName } of statement.exportClause.elements) {\n          // in an export specifier `propertyName` holds the local binding and\n          // `name` the exported name, the other way around than in an import\n          const local = propertyName ?? name;\n\n          // a local binding is always an identifier, unlike an exported name,\n          // which a re-export may spell as a string literal\n          if (ts.isIdentifier(local)) {\n            this.named.add(name.text, isTypeOnly, local);\n          }\n        }\n      }\n    }\n  }\n}\n"],"version":3}

package/dependencies/ImportManager.d.ts

@@ -1,8 +1,10 @@
 import ts, { type Identifier, type ImportDeclaration, type Statement } from "@typescript/typescript6";
 import type CodeConvertable from "./CodeConvertable.js";
+import NameRegistry from "./NameRegistry.js";
 import StatementRecordManager, { type StatementRecord } from "./StatementRecordManager.js";
 export declare class NamedImportManager extends StatementRecordManager<ImportDeclaration> {
 	#private;
+	constructor(collator: Intl.Collator, names: NameRegistry);
 	get size(): number;
 	add(path: string, specifier: string, isType?: boolean, uniqueId?: Identifier): Identifier;
 	remove(path: string, specifier: string): void;
@@ -17,6 +19,7 @@ export declare class NamedImportManager extends StatementRecordManager<ImportDec
 }
 export declare class NamespaceImportManager extends StatementRecordManager<ImportDeclaration> {
 	#private;
+	constructor(collator: Intl.Collator, names: NameRegistry);
 	get size(): number;
 	add(path: string, name: string, uniqueId?: Identifier): Identifier;
 	clear(): void;
@@ -29,6 +32,7 @@ export declare class NamespaceImportManager extends StatementRecordManager<Impor
 }
 export declare class DefaultImportManager extends StatementRecordManager<ImportDeclaration> {
 	#private;
+	constructor(collator: Intl.Collator, names: NameRegistry);
 	get size(): number;
 	add(path: string, name: string, isType?: boolean, uniqueId?: Identifier): Identifier;
 	getIdentifier(path: string): Identifier | undefined;
@@ -44,8 +48,9 @@ export default class ImportManager implements CodeConvertable<readonly Statement
 	readonly collator: Intl.Collator;
 	readonly default: DefaultImportManager;
 	readonly named: NamedImportManager;
+	readonly names: NameRegistry;
 	readonly namespace: NamespaceImportManager;
-	constructor(collator: Intl.Collator);
+	constructor(collator: Intl.Collator, names?: NameRegistry);
 	get size(): number;
 	toCode(): readonly Statement[];
 	fromCode(source: ts.SourceFile): void;

package/dependencies/ImportManager.js

@@ -1,14 +1,23 @@
 import ts from "@typescript/typescript6";
-import createFullyUniqueIdentifier from "../createFullyUniqueIdentifier.js";
+import NameRegistry from "./NameRegistry.js";
 import StatementRecordManager, { createComparator } from "./StatementRecordManager.js";
 import { createDependencyRecord } from "./utils.js";
 export class NamedImportManager extends StatementRecordManager {
 	#map = new Map();
+	#names;
+	constructor(collator, names) {
+		super(collator);
+		this.#names = names;
+	}
 	get size() {
 		return this.#map.size;
 	}
 	add(path, specifier, isType, uniqueId) {
-		const record = createDependencyRecord(uniqueId ?? createFullyUniqueIdentifier(specifier), isType);
+		if (uniqueId) {
+			this.#names.claim(uniqueId.text);
+		}
+		const id = uniqueId ?? this.getIdentifier(path, specifier) ?? this.#names.reserveIdentifier(specifier);
+		const record = createDependencyRecord(id, isType);
 		if (this.#map.has(path)) {
 			this.#map.get(path).set(specifier, record);
 		} else {
@@ -54,7 +63,7 @@ export class NamedImportManager extends StatementRecordManager {
 			const isTypeOnly = names.every((name) => specifiers.get(name).isType);
 			yield [path, ts.factory.createImportDeclaration(undefined, ts.factory.createImportClause(isTypeOnly, undefined, ts.factory.createNamedImports(names.map((name) => {
 				const { id, isType } = specifiers.get(name);
-				return ts.factory.createImportSpecifier(isTypeOnly ? false : isType, ts.factory.createIdentifier(name), id);
+				return ts.factory.createImportSpecifier(isTypeOnly ? false : isType, id.text === name ? undefined : ts.factory.createIdentifier(name), id);
 			}))), ts.factory.createStringLiteral(path))];
 		}
 	}
@@ -73,11 +82,19 @@ export class NamedImportManager extends StatementRecordManager {
 }
 export class NamespaceImportManager extends StatementRecordManager {
 	#map = new Map();
+	#names;
+	constructor(collator, names) {
+		super(collator);
+		this.#names = names;
+	}
 	get size() {
 		return this.#map.size;
 	}
 	add(path, name, uniqueId) {
-		const id = uniqueId ?? createFullyUniqueIdentifier(name);
+		if (uniqueId) {
+			this.#names.claim(uniqueId.text);
+		}
+		const id = uniqueId ?? this.#map.get(path) ?? this.#names.reserveIdentifier(name);
 		this.#map.set(path, id);
 		return id;
 	}
@@ -109,11 +126,19 @@ export class NamespaceImportManager extends StatementRecordManager {
 }
 export class DefaultImportManager extends StatementRecordManager {
 	#map = new Map();
+	#names;
+	constructor(collator, names) {
+		super(collator);
+		this.#names = names;
+	}
 	get size() {
 		return this.#map.size;
 	}
 	add(path, name, isType, uniqueId) {
-		const id = uniqueId ?? createFullyUniqueIdentifier(name);
+		if (uniqueId) {
+			this.#names.claim(uniqueId.text);
+		}
+		const id = uniqueId ?? this.getIdentifier(path) ?? this.#names.reserveIdentifier(name);
 		this.#map.set(path, createDependencyRecord(id, isType));
 		return id;
 	}
@@ -152,26 +177,55 @@ export class DefaultImportManager extends StatementRecordManager {
 		}
 	}
 }
+/**
+* Combines a default and a named import of the same module into one
+* declaration, i.e. `import m, { StringModel } from "..."`.
+*
+* A type-only default import cannot take named bindings along, so those stay
+* apart. A named group that is entirely type-only can still be merged, by
+* marking its specifiers individually instead of the declaration.
+*/
+function mergeDefaultAndNamed(defaultDeclaration, namedDeclaration) {
+	const defaultClause = defaultDeclaration.importClause;
+	const namedClause = namedDeclaration.importClause;
+	if (!defaultClause?.name || defaultClause.isTypeOnly || !namedClause?.namedBindings) {
+		return undefined;
+	}
+	const bindings = namedClause.namedBindings;
+	if (!ts.isNamedImports(bindings)) {
+		return undefined;
+	}
+	const elements = namedClause.isTypeOnly ? bindings.elements.map((element) => ts.factory.createImportSpecifier(true, element.propertyName, element.name)) : bindings.elements;
+	return ts.factory.createImportDeclaration(defaultDeclaration.modifiers, ts.factory.createImportClause(false, defaultClause.name, ts.factory.createNamedImports(elements)), defaultDeclaration.moduleSpecifier);
+}
 export default class ImportManager {
 	collator;
 	default;
 	named;
+	names;
 	namespace;
-	constructor(collator) {
-		this.default = new DefaultImportManager(collator);
-		this.named = new NamedImportManager(collator);
-		this.namespace = new NamespaceImportManager(collator);
+	constructor(collator, names = new NameRegistry()) {
+		this.default = new DefaultImportManager(collator, names);
+		this.named = new NamedImportManager(collator, names);
+		this.namespace = new NamespaceImportManager(collator, names);
 		this.collator = collator;
+		this.names = names;
 	}
 	get size() {
 		return this.default.size + this.named.size + this.namespace.size;
 	}
 	toCode() {
-		const records = [
-			...this.default.statementRecords(),
-			...this.named.statementRecords(),
-			...this.namespace.statementRecords()
-		];
+		const named = new Map(this.named.statementRecords());
+		const records = [];
+		for (const [path, declaration] of this.default.statementRecords()) {
+			const namedDeclaration = named.get(path);
+			const merged = namedDeclaration && mergeDefaultAndNamed(declaration, namedDeclaration);
+			if (merged) {
+				named.delete(path);
+			}
+			records.push([path, merged ?? declaration]);
+		}
+		records.push(...named, ...this.namespace.statementRecords());
 		records.sort(createComparator(this.collator));
 		return records.map(([, statement]) => statement);
 	}
@@ -179,6 +233,13 @@ export default class ImportManager {
 		this.default.clear();
 		this.named.clear();
 		this.namespace.clear();
+		const claim = (node) => {
+			if (ts.isIdentifier(node)) {
+				this.names.claim(node.text);
+			}
+			ts.forEachChild(node, claim);
+		};
+		claim(source);
 		const imports = source.statements.filter((statement) => ts.isImportDeclaration(statement));
 		for (const { importClause, moduleSpecifier } of imports) {
 			if (!importClause) {
@@ -186,16 +247,17 @@ export default class ImportManager {
 			}
 			const { name, namedBindings } = importClause;
 			const path = moduleSpecifier.text;
+			if (name) {
+				this.default.add(path, name.text, importClause.isTypeOnly, name);
+			}
 			if (namedBindings) {
 				if (ts.isNamespaceImport(namedBindings)) {
 					this.namespace.add(path, namedBindings.name.text, namedBindings.name);
 				} else {
-					for (const { isTypeOnly, name: specifier } of namedBindings.elements) {
-						this.named.add(path, specifier.text, isTypeOnly, specifier);
+					for (const { isTypeOnly, name: local, propertyName } of namedBindings.elements) {
+						this.named.add(path, (propertyName ?? local).text, isTypeOnly, local);
 					}
 				}
-			} else if (name) {
-				this.default.add(path, name.text, importClause.isTypeOnly, name);
 			}
 		}
 	}

package/dependencies/ImportManager.js.map

@@ -1 +1 @@
-{"mappings":"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","names":["#map","path: string","specifier: string","isType?: boolean","uniqueId?: Identifier","name: string","collator: Intl.Collator","source: ts.SourceFile"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/dependencies/ImportManager.ts"],"sourcesContent":["import ts, { type Identifier, type ImportDeclaration, type Statement } from '@typescript/typescript6';\nimport createFullyUniqueIdentifier from '../createFullyUniqueIdentifier.js';\nimport type CodeConvertable from './CodeConvertable.js';\nimport StatementRecordManager, { createComparator, type StatementRecord } from './StatementRecordManager.js';\nimport { createDependencyRecord, type DependencyRecord } from './utils.js';\n\nexport class NamedImportManager extends StatementRecordManager<ImportDeclaration> {\n  readonly #map = new Map<string, Map<string, DependencyRecord>>();\n\n  get size(): number {\n    return this.#map.size;\n  }\n\n  add(path: string, specifier: string, isType?: boolean, uniqueId?: Identifier): Identifier {\n    const record = createDependencyRecord(uniqueId ?? createFullyUniqueIdentifier(specifier), isType);\n\n    if (this.#map.has(path)) {\n      this.#map.get(path)!.set(specifier, record);\n    } else {\n      this.#map.set(path, new Map([[specifier, record]]));\n    }\n\n    return record.id;\n  }\n\n  remove(path: string, specifier: string): void {\n    const specifiers = this.#map.get(path);\n\n    if (specifiers) {\n      specifiers.delete(specifier);\n\n      if (specifiers.size === 0) {\n        this.#map.delete(path);\n      }\n    }\n  }\n\n  override clear(): void {\n    this.#map.clear();\n  }\n\n  getIdentifier(path: string, specifier: string): Identifier | undefined {\n    return this.#map.get(path)?.get(specifier)?.id;\n  }\n\n  iter(): IterableIterator<readonly [path: string, specifier: string, id: Identifier, isType: boolean]> {\n    return this[Symbol.iterator]();\n  }\n\n  isType(path: string, specifier: string): boolean | undefined {\n    return this.#map.get(path)?.get(specifier)?.isType;\n  }\n\n  paths(): IterableIterator<string> {\n    return this.#map.keys();\n  }\n\n  *specifiers(): IterableIterator<readonly [path: string, specifier: string]> {\n    for (const [path, specifiers] of this.#map) {\n      for (const specifier of specifiers.keys()) {\n        yield [path, specifier];\n      }\n    }\n  }\n\n  override *statementRecords(): IterableIterator<StatementRecord<ImportDeclaration>> {\n    for (const [path, specifiers] of this.#map) {\n      const names = [...specifiers.keys()];\n      // eslint-disable-next-line @typescript-eslint/unbound-method\n      names.sort(this.collator.compare);\n\n      const isTypeOnly = names.every((name) => specifiers.get(name)!.isType);\n\n      yield [\n        path,\n        ts.factory.createImportDeclaration(\n          undefined,\n          ts.factory.createImportClause(\n            isTypeOnly,\n            undefined,\n            ts.factory.createNamedImports(\n              names.map((name) => {\n                const { id, isType } = specifiers.get(name)!;\n                return ts.factory.createImportSpecifier(\n                  isTypeOnly ? false : isType,\n                  ts.factory.createIdentifier(name),\n                  id,\n                );\n              }),\n            ),\n          ),\n          ts.factory.createStringLiteral(path),\n        ),\n      ];\n    }\n  }\n\n  *[Symbol.iterator](): IterableIterator<readonly [path: string, specifier: string, id: Identifier, isType: boolean]> {\n    for (const [path, specifiers] of this.#map) {\n      for (const [specifier, { id, isType }] of specifiers) {\n        yield [path, specifier, id, isType];\n      }\n    }\n  }\n}\n\nexport class NamespaceImportManager extends StatementRecordManager<ImportDeclaration> {\n  readonly #map = new Map<string, Identifier>();\n\n  get size(): number {\n    return this.#map.size;\n  }\n\n  add(path: string, name: string, uniqueId?: Identifier): Identifier {\n    const id = uniqueId ?? createFullyUniqueIdentifier(name);\n    this.#map.set(path, id);\n    return id;\n  }\n\n  override clear(): void {\n    this.#map.clear();\n  }\n\n  getIdentifier(path: string): Identifier | undefined {\n    return this.#map.get(path);\n  }\n\n  iter(): IterableIterator<readonly [path: string, id: Identifier]> {\n    return this[Symbol.iterator]();\n  }\n\n  paths(): IterableIterator<string> {\n    return this.#map.keys();\n  }\n\n  override *statementRecords(): IterableIterator<StatementRecord<ImportDeclaration>> {\n    for (const [path, id] of this.#map) {\n      yield [\n        path,\n        ts.factory.createImportDeclaration(\n          undefined,\n          ts.factory.createImportClause(false, undefined, ts.factory.createNamespaceImport(id)),\n          ts.factory.createStringLiteral(path),\n        ),\n      ];\n    }\n  }\n\n  remove(path: string): void {\n    this.#map.delete(path);\n  }\n\n  *[Symbol.iterator](): IterableIterator<readonly [path: string, id: Identifier]> {\n    for (const [path, id] of this.#map) {\n      yield [path, id];\n    }\n  }\n}\n\nexport class DefaultImportManager extends StatementRecordManager<ImportDeclaration> {\n  readonly #map = new Map<string, DependencyRecord>();\n\n  get size(): number {\n    return this.#map.size;\n  }\n\n  add(path: string, name: string, isType?: boolean, uniqueId?: Identifier): Identifier {\n    const id = uniqueId ?? createFullyUniqueIdentifier(name);\n    this.#map.set(path, createDependencyRecord(id, isType));\n    return id;\n  }\n\n  getIdentifier(path: string): Identifier | undefined {\n    return this.#map.get(path)?.id;\n  }\n\n  remove(path: string): void {\n    if (this.#map.has(path)) {\n      this.#map.delete(path);\n    }\n  }\n\n  override clear(): void {\n    this.#map.clear();\n  }\n\n  iter(): IterableIterator<readonly [path: string, id: Identifier, isType: boolean]> {\n    return this[Symbol.iterator]();\n  }\n\n  isType(path: string): boolean | undefined {\n    return this.#map.get(path)?.isType;\n  }\n\n  paths(): IterableIterator<string> {\n    return this.#map.keys();\n  }\n\n  override *statementRecords(): IterableIterator<StatementRecord<ImportDeclaration>> {\n    for (const [path, { id, isType }] of this.#map) {\n      yield [\n        path,\n        ts.factory.createImportDeclaration(\n          undefined,\n          ts.factory.createImportClause(isType, id, undefined),\n          ts.factory.createStringLiteral(path),\n        ),\n      ];\n    }\n  }\n\n  *[Symbol.iterator](): IterableIterator<readonly [path: string, id: Identifier, isType: boolean]> {\n    for (const [path, { id, isType }] of this.#map) {\n      yield [path, id, isType];\n    }\n  }\n}\n\nexport default class ImportManager implements CodeConvertable<readonly Statement[]> {\n  readonly collator: Intl.Collator;\n  readonly default: DefaultImportManager;\n  readonly named: NamedImportManager;\n  readonly namespace: NamespaceImportManager;\n\n  constructor(collator: Intl.Collator) {\n    this.default = new DefaultImportManager(collator);\n    this.named = new NamedImportManager(collator);\n    this.namespace = new NamespaceImportManager(collator);\n    this.collator = collator;\n  }\n\n  get size(): number {\n    return this.default.size + this.named.size + this.namespace.size;\n  }\n\n  toCode(): readonly Statement[] {\n    const records = [\n      ...this.default.statementRecords(),\n      ...this.named.statementRecords(),\n      ...this.namespace.statementRecords(),\n    ];\n    records.sort(createComparator(this.collator));\n\n    return records.map(([, statement]) => statement);\n  }\n\n  fromCode(source: ts.SourceFile): void {\n    this.default.clear();\n    this.named.clear();\n    this.namespace.clear();\n\n    const imports = source.statements.filter((statement): statement is ImportDeclaration =>\n      ts.isImportDeclaration(statement),\n    );\n\n    for (const { importClause, moduleSpecifier } of imports) {\n      if (!importClause) {\n        // eslint-disable-next-line no-continue\n        continue;\n      }\n\n      const { name, namedBindings } = importClause;\n      const path = (moduleSpecifier as ts.StringLiteral).text;\n\n      if (namedBindings) {\n        if (ts.isNamespaceImport(namedBindings)) {\n          this.namespace.add(path, namedBindings.name.text, namedBindings.name);\n        } else {\n          for (const { isTypeOnly, name: specifier } of namedBindings.elements) {\n            this.named.add(path, specifier.text, isTypeOnly, specifier);\n          }\n        }\n      } else if (name) {\n        this.default.add(path, name.text, importClause.isTypeOnly, name);\n      }\n    }\n  }\n}\n"],"version":3}
+{"mappings":"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","names":["#map","#names","collator: Intl.Collator","names: NameRegistry","path: string","specifier: string","isType?: boolean","uniqueId?: Identifier","name: string","defaultDeclaration: ImportDeclaration","namedDeclaration: ImportDeclaration","records: Array<StatementRecord<ImportDeclaration>>","source: ts.SourceFile","node: ts.Node"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/dependencies/ImportManager.ts"],"sourcesContent":["import ts, { type Identifier, type ImportDeclaration, type Statement } from '@typescript/typescript6';\nimport type CodeConvertable from './CodeConvertable.js';\nimport NameRegistry from './NameRegistry.js';\nimport StatementRecordManager, { createComparator, type StatementRecord } from './StatementRecordManager.js';\nimport { createDependencyRecord, type DependencyRecord } from './utils.js';\n\nexport class NamedImportManager extends StatementRecordManager<ImportDeclaration> {\n  readonly #map = new Map<string, Map<string, DependencyRecord>>();\n  readonly #names: NameRegistry;\n\n  constructor(collator: Intl.Collator, names: NameRegistry) {\n    super(collator);\n    this.#names = names;\n  }\n\n  get size(): number {\n    return this.#map.size;\n  }\n\n  add(path: string, specifier: string, isType?: boolean, uniqueId?: Identifier): Identifier {\n    if (uniqueId) {\n      this.#names.claim(uniqueId.text);\n    }\n\n    const id = uniqueId ?? this.getIdentifier(path, specifier) ?? this.#names.reserveIdentifier(specifier);\n    const record = createDependencyRecord(id, isType);\n\n    if (this.#map.has(path)) {\n      this.#map.get(path)!.set(specifier, record);\n    } else {\n      this.#map.set(path, new Map([[specifier, record]]));\n    }\n\n    return record.id;\n  }\n\n  remove(path: string, specifier: string): void {\n    const specifiers = this.#map.get(path);\n\n    if (specifiers) {\n      specifiers.delete(specifier);\n\n      if (specifiers.size === 0) {\n        this.#map.delete(path);\n      }\n    }\n  }\n\n  override clear(): void {\n    this.#map.clear();\n  }\n\n  getIdentifier(path: string, specifier: string): Identifier | undefined {\n    return this.#map.get(path)?.get(specifier)?.id;\n  }\n\n  iter(): IterableIterator<readonly [path: string, specifier: string, id: Identifier, isType: boolean]> {\n    return this[Symbol.iterator]();\n  }\n\n  isType(path: string, specifier: string): boolean | undefined {\n    return this.#map.get(path)?.get(specifier)?.isType;\n  }\n\n  paths(): IterableIterator<string> {\n    return this.#map.keys();\n  }\n\n  *specifiers(): IterableIterator<readonly [path: string, specifier: string]> {\n    for (const [path, specifiers] of this.#map) {\n      for (const specifier of specifiers.keys()) {\n        yield [path, specifier];\n      }\n    }\n  }\n\n  override *statementRecords(): IterableIterator<StatementRecord<ImportDeclaration>> {\n    for (const [path, specifiers] of this.#map) {\n      const names = [...specifiers.keys()];\n      // eslint-disable-next-line @typescript-eslint/unbound-method\n      names.sort(this.collator.compare);\n\n      const isTypeOnly = names.every((name) => specifiers.get(name)!.isType);\n\n      yield [\n        path,\n        ts.factory.createImportDeclaration(\n          undefined,\n          ts.factory.createImportClause(\n            isTypeOnly,\n            undefined,\n            ts.factory.createNamedImports(\n              names.map((name) => {\n                const { id, isType } = specifiers.get(name)!;\n                return ts.factory.createImportSpecifier(\n                  isTypeOnly ? false : isType,\n                  id.text === name ? undefined : ts.factory.createIdentifier(name),\n                  id,\n                );\n              }),\n            ),\n          ),\n          ts.factory.createStringLiteral(path),\n        ),\n      ];\n    }\n  }\n\n  *[Symbol.iterator](): IterableIterator<readonly [path: string, specifier: string, id: Identifier, isType: boolean]> {\n    for (const [path, specifiers] of this.#map) {\n      for (const [specifier, { id, isType }] of specifiers) {\n        yield [path, specifier, id, isType];\n      }\n    }\n  }\n}\n\nexport class NamespaceImportManager extends StatementRecordManager<ImportDeclaration> {\n  readonly #map = new Map<string, Identifier>();\n  readonly #names: NameRegistry;\n\n  constructor(collator: Intl.Collator, names: NameRegistry) {\n    super(collator);\n    this.#names = names;\n  }\n\n  get size(): number {\n    return this.#map.size;\n  }\n\n  add(path: string, name: string, uniqueId?: Identifier): Identifier {\n    if (uniqueId) {\n      this.#names.claim(uniqueId.text);\n    }\n\n    const id = uniqueId ?? this.#map.get(path) ?? this.#names.reserveIdentifier(name);\n    this.#map.set(path, id);\n    return id;\n  }\n\n  override clear(): void {\n    this.#map.clear();\n  }\n\n  getIdentifier(path: string): Identifier | undefined {\n    return this.#map.get(path);\n  }\n\n  iter(): IterableIterator<readonly [path: string, id: Identifier]> {\n    return this[Symbol.iterator]();\n  }\n\n  paths(): IterableIterator<string> {\n    return this.#map.keys();\n  }\n\n  override *statementRecords(): IterableIterator<StatementRecord<ImportDeclaration>> {\n    for (const [path, id] of this.#map) {\n      yield [\n        path,\n        ts.factory.createImportDeclaration(\n          undefined,\n          ts.factory.createImportClause(false, undefined, ts.factory.createNamespaceImport(id)),\n          ts.factory.createStringLiteral(path),\n        ),\n      ];\n    }\n  }\n\n  remove(path: string): void {\n    this.#map.delete(path);\n  }\n\n  *[Symbol.iterator](): IterableIterator<readonly [path: string, id: Identifier]> {\n    for (const [path, id] of this.#map) {\n      yield [path, id];\n    }\n  }\n}\n\nexport class DefaultImportManager extends StatementRecordManager<ImportDeclaration> {\n  readonly #map = new Map<string, DependencyRecord>();\n  readonly #names: NameRegistry;\n\n  constructor(collator: Intl.Collator, names: NameRegistry) {\n    super(collator);\n    this.#names = names;\n  }\n\n  get size(): number {\n    return this.#map.size;\n  }\n\n  add(path: string, name: string, isType?: boolean, uniqueId?: Identifier): Identifier {\n    if (uniqueId) {\n      this.#names.claim(uniqueId.text);\n    }\n\n    const id = uniqueId ?? this.getIdentifier(path) ?? this.#names.reserveIdentifier(name);\n    this.#map.set(path, createDependencyRecord(id, isType));\n    return id;\n  }\n\n  getIdentifier(path: string): Identifier | undefined {\n    return this.#map.get(path)?.id;\n  }\n\n  remove(path: string): void {\n    if (this.#map.has(path)) {\n      this.#map.delete(path);\n    }\n  }\n\n  override clear(): void {\n    this.#map.clear();\n  }\n\n  iter(): IterableIterator<readonly [path: string, id: Identifier, isType: boolean]> {\n    return this[Symbol.iterator]();\n  }\n\n  isType(path: string): boolean | undefined {\n    return this.#map.get(path)?.isType;\n  }\n\n  paths(): IterableIterator<string> {\n    return this.#map.keys();\n  }\n\n  override *statementRecords(): IterableIterator<StatementRecord<ImportDeclaration>> {\n    for (const [path, { id, isType }] of this.#map) {\n      yield [\n        path,\n        ts.factory.createImportDeclaration(\n          undefined,\n          ts.factory.createImportClause(isType, id, undefined),\n          ts.factory.createStringLiteral(path),\n        ),\n      ];\n    }\n  }\n\n  *[Symbol.iterator](): IterableIterator<readonly [path: string, id: Identifier, isType: boolean]> {\n    for (const [path, { id, isType }] of this.#map) {\n      yield [path, id, isType];\n    }\n  }\n}\n\n/**\n * Combines a default and a named import of the same module into one\n * declaration, i.e. `import m, { StringModel } from \"...\"`.\n *\n * A type-only default import cannot take named bindings along, so those stay\n * apart. A named group that is entirely type-only can still be merged, by\n * marking its specifiers individually instead of the declaration.\n */\nfunction mergeDefaultAndNamed(\n  defaultDeclaration: ImportDeclaration,\n  namedDeclaration: ImportDeclaration,\n): ImportDeclaration | undefined {\n  const defaultClause = defaultDeclaration.importClause;\n  const namedClause = namedDeclaration.importClause;\n\n  if (!defaultClause?.name || defaultClause.isTypeOnly || !namedClause?.namedBindings) {\n    return undefined;\n  }\n\n  const bindings = namedClause.namedBindings;\n\n  if (!ts.isNamedImports(bindings)) {\n    return undefined;\n  }\n\n  const elements = namedClause.isTypeOnly\n    ? bindings.elements.map((element) => ts.factory.createImportSpecifier(true, element.propertyName, element.name))\n    : bindings.elements;\n\n  return ts.factory.createImportDeclaration(\n    defaultDeclaration.modifiers,\n    ts.factory.createImportClause(false, defaultClause.name, ts.factory.createNamedImports(elements)),\n    defaultDeclaration.moduleSpecifier,\n  );\n}\n\nexport default class ImportManager implements CodeConvertable<readonly Statement[]> {\n  readonly collator: Intl.Collator;\n  readonly default: DefaultImportManager;\n  readonly named: NamedImportManager;\n  readonly names: NameRegistry;\n  readonly namespace: NamespaceImportManager;\n\n  constructor(collator: Intl.Collator, names: NameRegistry = new NameRegistry()) {\n    this.default = new DefaultImportManager(collator, names);\n    this.named = new NamedImportManager(collator, names);\n    this.namespace = new NamespaceImportManager(collator, names);\n    this.collator = collator;\n    this.names = names;\n  }\n\n  get size(): number {\n    return this.default.size + this.named.size + this.namespace.size;\n  }\n\n  toCode(): readonly Statement[] {\n    const named = new Map(this.named.statementRecords());\n    const records: Array<StatementRecord<ImportDeclaration>> = [];\n\n    for (const [path, declaration] of this.default.statementRecords()) {\n      const namedDeclaration = named.get(path);\n      const merged = namedDeclaration && mergeDefaultAndNamed(declaration, namedDeclaration);\n\n      if (merged) {\n        named.delete(path);\n      }\n\n      records.push([path, merged ?? declaration]);\n    }\n\n    records.push(...named, ...this.namespace.statementRecords());\n    records.sort(createComparator(this.collator));\n\n    return records.map(([, statement]) => statement);\n  }\n\n  fromCode(source: ts.SourceFile): void {\n    this.default.clear();\n    this.named.clear();\n    this.namespace.clear();\n\n    // Anything already spelled out in the source is off limits for names the\n    // registry hands out later.\n    const claim = (node: ts.Node): void => {\n      if (ts.isIdentifier(node)) {\n        this.names.claim(node.text);\n      }\n\n      ts.forEachChild(node, claim);\n    };\n    claim(source);\n\n    const imports = source.statements.filter((statement): statement is ImportDeclaration =>\n      ts.isImportDeclaration(statement),\n    );\n\n    for (const { importClause, moduleSpecifier } of imports) {\n      if (!importClause) {\n        // eslint-disable-next-line no-continue\n        continue;\n      }\n\n      const { name, namedBindings } = importClause;\n      const path = (moduleSpecifier as ts.StringLiteral).text;\n\n      // a default import may come along with named bindings in a single\n      // declaration, i.e. `import m, { StringModel } from \"...\"`\n      if (name) {\n        this.default.add(path, name.text, importClause.isTypeOnly, name);\n      }\n\n      if (namedBindings) {\n        if (ts.isNamespaceImport(namedBindings)) {\n          this.namespace.add(path, namedBindings.name.text, namedBindings.name);\n        } else {\n          for (const { isTypeOnly, name: local, propertyName } of namedBindings.elements) {\n            // `propertyName` holds the exported name whenever the import is\n            // aliased; the local binding alone would not survive the round trip.\n            this.named.add(path, (propertyName ?? local).text, isTypeOnly, local);\n          }\n        }\n      }\n    }\n  }\n}\n"],"version":3}

package/dependencies/NameRegistry.d.ts

@@ -0,0 +1,23 @@
+import { type Identifier } from "@typescript/typescript6";
+/**
+* Tracks the identifier names taken in a single generated file so that a name
+* is only suffixed when it actually collides.
+*
+* The TypeScript printer cannot do this for us: its own unique-name generator
+* only compares generated names against each other, so a generated import would
+* still collide with a plain declaration in the same file.
+*/
+export default class NameRegistry {
+	#private;
+	/**
+	* Marks a name as taken as-is. Used for names the registry does not get to
+	* choose, such as a declaration name or an identifier parsed from existing
+	* code.
+	*/
+	claim(name: string): void;
+	/**
+	* Takes the given name, appending a counter if it is taken already.
+	*/
+	reserve(name: string): string;
+	reserveIdentifier(name: string): Identifier;
+}

package/dependencies/NameRegistry.js

@@ -0,0 +1,108 @@
+import ts from "@typescript/typescript6";
+/**
+* Words that cannot serve as a binding name. Generated files are modules, hence
+* the strict mode ones are in as well, including `arguments` and `eval`, which
+* are not keywords but are equally illegal. Contextual keywords (`type`, `as`,
+* `get`, `string`, ...) are valid identifiers and thus are not listed.
+*/
+const reservedWords = [
+	"arguments",
+	"await",
+	"break",
+	"case",
+	"catch",
+	"class",
+	"const",
+	"continue",
+	"debugger",
+	"default",
+	"delete",
+	"do",
+	"else",
+	"enum",
+	"eval",
+	"export",
+	"extends",
+	"false",
+	"finally",
+	"for",
+	"function",
+	"if",
+	"implements",
+	"import",
+	"in",
+	"instanceof",
+	"interface",
+	"let",
+	"new",
+	"null",
+	"package",
+	"private",
+	"protected",
+	"public",
+	"return",
+	"static",
+	"super",
+	"switch",
+	"this",
+	"throw",
+	"true",
+	"try",
+	"typeof",
+	"var",
+	"void",
+	"while",
+	"with",
+	"yield"
+];
+/**
+* Globals the generated code refers to without importing them, so an import
+* taking one of these names would shadow the type it refers to.
+*/
+const globalNames = [
+	"Array",
+	"File",
+	"Promise",
+	"ReadonlyArray",
+	"Record"
+];
+/**
+* Tracks the identifier names taken in a single generated file so that a name
+* is only suffixed when it actually collides.
+*
+* The TypeScript printer cannot do this for us: its own unique-name generator
+* only compares generated names against each other, so a generated import would
+* still collide with a plain declaration in the same file.
+*/
+export default class NameRegistry {
+	#used = new Set([...reservedWords, ...globalNames]);
+	/**
+	* Marks a name as taken as-is. Used for names the registry does not get to
+	* choose, such as a declaration name or an identifier parsed from existing
+	* code.
+	*/
+	claim(name) {
+		this.#used.add(name);
+	}
+	/**
+	* Takes the given name, appending a counter if it is taken already.
+	*/
+	reserve(name) {
+		if (!this.#used.has(name)) {
+			this.#used.add(name);
+			return name;
+		}
+		let i = 1;
+		let candidate = `${name}_${i}`;
+		while (this.#used.has(candidate)) {
+			i += 1;
+			candidate = `${name}_${i}`;
+		}
+		this.#used.add(candidate);
+		return candidate;
+	}
+	reserveIdentifier(name) {
+		return ts.factory.createIdentifier(this.reserve(name));
+	}
+}
+//# sourceMappingURL=./NameRegistry.js.map

package/dependencies/NameRegistry.js.map

@@ -0,0 +1 @@
+{"mappings":"AAAA,OAAO,iCAAuD;;;;;;;AAQ9D,MAAM,gBAAgB;CACpB;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;AACD;;;;;AAMD,MAAM,cAAc;CAAC;CAAS;CAAQ;CAAW;CAAiB;AAAS;;;;;;;;;AAU3E,eAAe,MAAM,aAAa;CAGhC,AAASA,QAAQ,IAAI,IAAI,CAAC,GAAG,eAAe,GAAG,WAAY;;;;;;CAO3D,MAAMC,MAAoB;AACxB,OAAKD,MAAM,IAAI,KAAK;CACrB;;;;CAKD,QAAQC,MAAsB;AAC5B,OAAK,KAAKD,MAAM,IAAI,KAAK,EAAE;AACzB,QAAKA,MAAM,IAAI,KAAK;AACpB,UAAO;EACR;EAED,IAAI,IAAI;EACR,IAAI,aAAa,EAAE,KAAK,GAAG,EAAE;AAE7B,SAAO,KAAKA,MAAM,IAAI,UAAU,EAAE;AAChC,QAAK;AACL,gBAAa,EAAE,KAAK,GAAG,EAAE;EAC1B;AAED,OAAKA,MAAM,IAAI,UAAU;AACzB,SAAO;CACR;CAED,kBAAkBC,MAA0B;AAC1C,SAAO,GAAG,QAAQ,iBAAiB,KAAK,QAAQ,KAAK,CAAC;CACvD;AACF","names":["#used","name: string"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/dependencies/NameRegistry.ts"],"sourcesContent":["import ts, { type Identifier } from '@typescript/typescript6';\n\n/**\n * Words that cannot serve as a binding name. Generated files are modules, hence\n * the strict mode ones are in as well, including `arguments` and `eval`, which\n * are not keywords but are equally illegal. Contextual keywords (`type`, `as`,\n * `get`, `string`, ...) are valid identifiers and thus are not listed.\n */\nconst reservedWords = [\n  'arguments',\n  'await',\n  'break',\n  'case',\n  'catch',\n  'class',\n  'const',\n  'continue',\n  'debugger',\n  'default',\n  'delete',\n  'do',\n  'else',\n  'enum',\n  'eval',\n  'export',\n  'extends',\n  'false',\n  'finally',\n  'for',\n  'function',\n  'if',\n  'implements',\n  'import',\n  'in',\n  'instanceof',\n  'interface',\n  'let',\n  'new',\n  'null',\n  'package',\n  'private',\n  'protected',\n  'public',\n  'return',\n  'static',\n  'super',\n  'switch',\n  'this',\n  'throw',\n  'true',\n  'try',\n  'typeof',\n  'var',\n  'void',\n  'while',\n  'with',\n  'yield',\n];\n\n/**\n * Globals the generated code refers to without importing them, so an import\n * taking one of these names would shadow the type it refers to.\n */\nconst globalNames = ['Array', 'File', 'Promise', 'ReadonlyArray', 'Record'];\n\n/**\n * Tracks the identifier names taken in a single generated file so that a name\n * is only suffixed when it actually collides.\n *\n * The TypeScript printer cannot do this for us: its own unique-name generator\n * only compares generated names against each other, so a generated import would\n * still collide with a plain declaration in the same file.\n */\nexport default class NameRegistry {\n  // reserved words and shadowable globals count as taken, so that a name\n  // matching one is suffixed\n  readonly #used = new Set([...reservedWords, ...globalNames]);\n\n  /**\n   * Marks a name as taken as-is. Used for names the registry does not get to\n   * choose, such as a declaration name or an identifier parsed from existing\n   * code.\n   */\n  claim(name: string): void {\n    this.#used.add(name);\n  }\n\n  /**\n   * Takes the given name, appending a counter if it is taken already.\n   */\n  reserve(name: string): string {\n    if (!this.#used.has(name)) {\n      this.#used.add(name);\n      return name;\n    }\n\n    let i = 1;\n    let candidate = `${name}_${i}`;\n\n    while (this.#used.has(candidate)) {\n      i += 1;\n      candidate = `${name}_${i}`;\n    }\n\n    this.#used.add(candidate);\n    return candidate;\n  }\n\n  reserveIdentifier(name: string): Identifier {\n    return ts.factory.createIdentifier(this.reserve(name));\n  }\n}\n"],"version":3}

package/formatMemberChains.d.ts

@@ -0,0 +1,10 @@
+/**
+* Breaks long fluent chains over several lines, one call per line.
+*
+* The TypeScript printer emits a member chain on a single line and offers no
+* way to influence that: `setStartsOnNewLine` only applies to nodes in a list,
+* and no emit flag covers chains. So the text it produced is parsed back and
+* the line breaks are spliced in at the offsets the syntax tree reports, which
+* keeps string literals — a `Pattern` regexp may contain anything — untouched.
+*/
+export default function formatMemberChains(code: string, fileName?: string): string;

package/formatMemberChains.js

@@ -0,0 +1,73 @@
+import ts from "@typescript/typescript6";
+/**
+* The number of calls a chain needs before it is worth breaking up. Two links
+* cover `m.object(…).build()`, which reads better on one line; three is where
+* the builder starts declaring properties.
+*/
+const MIN_LINKS = 3;
+const INDENT = "  ";
+/**
+* The offset of the dot of a property access, which sits between the end of the
+* object expression and the start of the property name. Comments cannot appear
+* there in printed output, so the first dot found is the right one.
+*/
+function findDot(source, node) {
+	return source.text.indexOf(".", node.expression.end);
+}
+/**
+* Collects the calls of a chain, from its outermost link inwards, for as long
+* as every link is a call on a property access. A chain interrupted by anything
+* else, such as an element access or a bare property read, ends there.
+*/
+function collectChain(node) {
+	const links = [];
+	for (let current = node;;) {
+		if (!ts.isCallExpression(current) || !ts.isPropertyAccessExpression(current.expression)) {
+			return links;
+		}
+		links.push(current);
+		current = current.expression.expression;
+	}
+}
+/**
+* The column the statement starts at, so that the continuation lines line up
+* under it rather than at the left margin.
+*/
+function columnOf(source, position) {
+	const lineStart = source.text.lastIndexOf("\n", position - 1) + 1;
+	return position - lineStart;
+}
+/**
+* Breaks long fluent chains over several lines, one call per line.
+*
+* The TypeScript printer emits a member chain on a single line and offers no
+* way to influence that: `setStartsOnNewLine` only applies to nodes in a list,
+* and no emit flag covers chains. So the text it produced is parsed back and
+* the line breaks are spliced in at the offsets the syntax tree reports, which
+* keeps string literals — a `Pattern` regexp may contain anything — untouched.
+*/
+export default function formatMemberChains(code, fileName = "generated.ts") {
+	const source = ts.createSourceFile(fileName, code, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+	const breaks = [];
+	function visit(node) {
+		if (ts.isCallExpression(node)) {
+			const links = collectChain(node);
+			if (links.length >= MIN_LINKS) {
+				const statement = ts.findAncestor(node, ts.isStatement) ?? node;
+				const indent = " ".repeat(columnOf(source, statement.getStart(source))) + INDENT;
+				links.forEach((link) => {
+					breaks.push([findDot(source, link.expression), indent]);
+					link.arguments.forEach(visit);
+				});
+				return;
+			}
+		}
+		ts.forEachChild(node, visit);
+	}
+	visit(source);
+	if (breaks.length === 0) {
+		return code;
+	}
+	return breaks.toSorted(([a], [b]) => b - a).reduce((text, [offset, indent]) => `${text.slice(0, offset)}\n${indent}${text.slice(offset)}`, code);
+}
+//# sourceMappingURL=./formatMemberChains.js.map

package/formatMemberChains.js.map

@@ -0,0 +1 @@
+{"mappings":"AAAA,OAAO,iCAAuF;;;;;;AAO9F,MAAM,YAAY;AAElB,MAAM,SAAS;;;;;;AAOf,SAAS,QAAQA,QAAoBC,MAA2C;AAC9E,QAAO,OAAO,KAAK,QAAQ,KAAK,KAAK,WAAW,IAAI;AACrD;;;;;;AAOD,SAAS,aAAaC,MAAiD;CACrE,MAAMC,QAA0B,CAAE;AAElC,MAAK,IAAIC,UAAyB,QAAU;AAC1C,OAAK,GAAG,iBAAiB,QAAQ,KAAK,GAAG,2BAA2B,QAAQ,WAAW,EAAE;AAEvF,UAAO;EACR;AAED,QAAM,KAAK,QAAQ;AACnB,YAAU,QAAQ,WAAW;CAC9B;AACF;;;;;AAMD,SAAS,SAASJ,QAAoBK,UAA0B;CAC9D,MAAM,YAAY,OAAO,KAAK,YAAY,MAAM,WAAW,EAAE,GAAG;AAChE,QAAO,WAAW;AACnB;;;;;;;;;;AAWD,eAAe,SAAS,mBAAmBC,MAAc,WAAW,gBAAwB;CAC1F,MAAM,SAAS,GAAG,iBAAiB,UAAU,MAAM,GAAG,aAAa,QAAQ,MAAM,GAAG,WAAW,GAAG;CAClG,MAAMC,SAA2D,CAAE;CAEnE,SAAS,MAAMC,MAAkB;AAC/B,MAAI,GAAG,iBAAiB,KAAK,EAAE;GAC7B,MAAM,QAAQ,aAAa,KAAK;AAEhC,OAAI,MAAM,UAAU,WAAW;IAC7B,MAAM,YAAY,GAAG,aAAa,MAAM,GAAG,YAAY,IAAI;IAC3D,MAAM,SAAS,IAAI,OAAO,SAAS,QAAQ,UAAU,SAAS,OAAO,CAAC,CAAC,GAAG;AAE1E,UAAM,QAAQ,CAAC,SAAS;AACtB,YAAO,KAAK,CAAC,QAAQ,QAAQ,KAAK,WAA0C,EAAE,MAAO,EAAC;AAGtF,UAAK,UAAU,QAAQ,MAAM;IAC9B,EAAC;AAEF;GACD;EACF;AAED,KAAG,aAAa,MAAM,MAAM;CAC7B;AAED,OAAM,OAAO;AAEb,KAAI,OAAO,WAAW,GAAG;AACvB,SAAO;CACR;AAID,QAAO,OACJ,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE,CAC7B,OAAO,CAAC,MAAM,CAAC,QAAQ,OAAO,MAAM,EAAE,KAAK,MAAM,GAAG,OAAO,CAAC,IAAI,OAAO,EAAE,KAAK,MAAM,OAAO,CAAC,GAAG,KAAK;AACxG","names":["source: SourceFile","node: ts.PropertyAccessExpression","node: CallExpression","links: CallExpression[]","current: ts.Expression","position: number","code: string","breaks: Array<readonly [offset: number, indent: string]>","node: Node"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/formatMemberChains.ts"],"sourcesContent":["import ts, { type CallExpression, type Node, type SourceFile } from '@typescript/typescript6';\n\n/**\n * The number of calls a chain needs before it is worth breaking up. Two links\n * cover `m.object(…).build()`, which reads better on one line; three is where\n * the builder starts declaring properties.\n */\nconst MIN_LINKS = 3;\n\nconst INDENT = '  ';\n\n/**\n * The offset of the dot of a property access, which sits between the end of the\n * object expression and the start of the property name. Comments cannot appear\n * there in printed output, so the first dot found is the right one.\n */\nfunction findDot(source: SourceFile, node: ts.PropertyAccessExpression): number {\n  return source.text.indexOf('.', node.expression.end);\n}\n\n/**\n * Collects the calls of a chain, from its outermost link inwards, for as long\n * as every link is a call on a property access. A chain interrupted by anything\n * else, such as an element access or a bare property read, ends there.\n */\nfunction collectChain(node: CallExpression): readonly CallExpression[] {\n  const links: CallExpression[] = [];\n\n  for (let current: ts.Expression = node; ; ) {\n    if (!ts.isCallExpression(current) || !ts.isPropertyAccessExpression(current.expression)) {\n      // the head of the chain, e.g. the `m` of `m.object(…)`\n      return links;\n    }\n\n    links.push(current);\n    current = current.expression.expression;\n  }\n}\n\n/**\n * The column the statement starts at, so that the continuation lines line up\n * under it rather than at the left margin.\n */\nfunction columnOf(source: SourceFile, position: number): number {\n  const lineStart = source.text.lastIndexOf('\\n', position - 1) + 1;\n  return position - lineStart;\n}\n\n/**\n * Breaks long fluent chains over several lines, one call per line.\n *\n * The TypeScript printer emits a member chain on a single line and offers no\n * way to influence that: `setStartsOnNewLine` only applies to nodes in a list,\n * and no emit flag covers chains. So the text it produced is parsed back and\n * the line breaks are spliced in at the offsets the syntax tree reports, which\n * keeps string literals — a `Pattern` regexp may contain anything — untouched.\n */\nexport default function formatMemberChains(code: string, fileName = 'generated.ts'): string {\n  const source = ts.createSourceFile(fileName, code, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);\n  const breaks: Array<readonly [offset: number, indent: string]> = [];\n\n  function visit(node: Node): void {\n    if (ts.isCallExpression(node)) {\n      const links = collectChain(node);\n\n      if (links.length >= MIN_LINKS) {\n        const statement = ts.findAncestor(node, ts.isStatement) ?? node;\n        const indent = ' '.repeat(columnOf(source, statement.getStart(source))) + INDENT;\n\n        links.forEach((link) => {\n          breaks.push([findDot(source, link.expression as ts.PropertyAccessExpression), indent]);\n          // an argument may hold a chain of its own; the links themselves must\n          // not be walked again, or they would be broken twice\n          link.arguments.forEach(visit);\n        });\n\n        return;\n      }\n    }\n\n    ts.forEachChild(node, visit);\n  }\n\n  visit(source);\n\n  if (breaks.length === 0) {\n    return code;\n  }\n\n  // spliced from the end, so that an insertion does not shift the offsets of\n  // the breaks still to come\n  return breaks\n    .toSorted(([a], [b]) => b - a)\n    .reduce((text, [offset, indent]) => `${text.slice(0, offset)}\\n${indent}${text.slice(offset)}`, code);\n}\n"],"version":3}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-utils",
-  "version": "25.4.0-alpha2",
+  "version": "25.4.0-alpha4",
   "description": "A set of utils for developing Hilla generator plugins",
   "main": "index.js",
   "type": "module",
@@ -21,12 +21,14 @@
     "./dependencies/DependencyManager.js": "./dependencies/DependencyManager.js",
     "./dependencies/ExportManager.js": "./dependencies/ExportManager.js",
     "./dependencies/ImportManager.js": "./dependencies/ImportManager.js",
+    "./dependencies/NameRegistry.js": "./dependencies/NameRegistry.js",
     "./dependencies/PathManager.js": "./dependencies/PathManager.js",
     "./dependencies/StatementRecordManager.js": "./dependencies/StatementRecordManager.js",
     "./testing/snapshotMatcher.js": "./testing/snapshotMatcher.js",
+    "./testing/typeCheck.js": "./testing/typeCheck.js",
     "./ast.js": "./ast.js",
-    "./createFullyUniqueIdentifier.js": "./createFullyUniqueIdentifier.js",
     "./createSourceFile.js": "./createSourceFile.js",
+    "./formatMemberChains.js": "./formatMemberChains.js",
     "./memoize.js": "./memoize.js",
     "./LoggerFactory.js": "./LoggerFactory.js",
     "./PluginError.js": "./PluginError.js",

package/testing/typeCheck.d.ts

@@ -0,0 +1,13 @@
+/**
+* Type-checks the generated sources, together with the given extra sources,
+* which can be used to assert that the generated types are actually usable.
+* The sources are compiled from memory.
+*
+* @param root - the directory to compile the sources in. It has to be inside
+* the package under test, so that the imported Hilla packages resolve the way
+* they do for that package.
+* @param files - the generated sources
+* @param extraSources - additional sources, by file name relative to `root`
+* @returns the compiler diagnostics, as readable messages
+*/
+export declare function typeCheck(root: string, files: readonly File[], extraSources?: Readonly<Record<string, string>>): Promise<readonly string[]>;

package/testing/typeCheck.js

@@ -0,0 +1,62 @@
+import { dirname, join } from "node:path";
+import ts from "@typescript/typescript6";
+const TYPE_CHECK_OPTIONS = {
+	module: ts.ModuleKind.ESNext,
+	moduleResolution: ts.ModuleResolutionKind.Bundler,
+	noEmit: true,
+	noUnusedLocals: true,
+	skipLibCheck: true,
+	strict: true,
+	target: ts.ScriptTarget.ES2022
+};
+const CLIENT_STUB = [
+	"declare const client: {",
+	"  call(endpoint: string, method: string, params?: unknown, init?: unknown): Promise<never>;",
+	"};",
+	"export default client;"
+].join("\n");
+/**
+* Type-checks the generated sources, together with the given extra sources,
+* which can be used to assert that the generated types are actually usable.
+* The sources are compiled from memory.
+*
+* @param root - the directory to compile the sources in. It has to be inside
+* the package under test, so that the imported Hilla packages resolve the way
+* they do for that package.
+* @param files - the generated sources
+* @param extraSources - additional sources, by file name relative to `root`
+* @returns the compiler diagnostics, as readable messages
+*/
+export async function typeCheck(root, files, extraSources = {}) {
+	const sources = new Map([[join(root, "connect-client.default.ts"), CLIENT_STUB]]);
+	await Promise.all(files.map(async (file) => sources.set(join(root, file.name), await file.text())));
+	Object.entries(extraSources).forEach(([name, content]) => sources.set(join(root, name), content));
+	const directories = new Set();
+	sources.forEach((_, file) => {
+		for (let dir = dirname(file); !directories.has(dir); dir = dirname(dir)) {
+			directories.add(dir);
+		}
+	});
+	const host = ts.createCompilerHost(TYPE_CHECK_OPTIONS, true);
+	const directoryExists = host.directoryExists?.bind(host);
+	const fileExists = host.fileExists.bind(host);
+	const getSourceFile = host.getSourceFile.bind(host);
+	const hostReadFile = host.readFile.bind(host);
+	const realpath = host.realpath?.bind(host);
+	host.fileExists = (file) => sources.has(file) || fileExists(file);
+	host.readFile = (file) => sources.get(file) ?? hostReadFile(file);
+	host.directoryExists = (dir) => directories.has(dir) || (directoryExists?.(dir) ?? false);
+	host.realpath = (file) => sources.has(file) ? file : realpath?.(file) ?? file;
+	host.getSourceFile = (file, languageVersion, onError, shouldCreate) => {
+		const source = sources.get(file);
+		return source === undefined ? getSourceFile(file, languageVersion, onError, shouldCreate) : ts.createSourceFile(file, source, languageVersion, true);
+	};
+	const program = ts.createProgram([...sources.keys()], TYPE_CHECK_OPTIONS, host);
+	const prefix = `${root}/`;
+	return ts.getPreEmitDiagnostics(program).filter((diagnostic) => !diagnostic.file || sources.has(diagnostic.file.fileName)).map((diagnostic) => {
+		const name = diagnostic.file?.fileName.replace(prefix, "") ?? "";
+		const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, " ");
+		return `${name}: ${message}`;
+	});
+}
+//# sourceMappingURL=./typeCheck.js.map

package/testing/typeCheck.js.map

@@ -0,0 +1 @@
+{"mappings":"AAAA,SAAS,SAAS,uBAAwB;AAC1C,OAAO,iCAAkC;AAEzC,MAAMA,qBAAyC;CAC7C,QAAQ,GAAG,WAAW;CACtB,kBAAkB,GAAG,qBAAqB;CAC1C,QAAQ;CAER,gBAAgB;CAChB,cAAc;CACd,QAAQ;CACR,QAAQ,GAAG,aAAa;AACzB;AAID,MAAM,cAAc;CAClB;CACA;CACA;CACA;AACD,EAAC,KAAK,KAAK;;;;;;;;;;;;;AAcZ,OAAO,eAAe,UACpBC,MACAC,OACAC,eAAiD,CAAE,GACvB;CAC5B,MAAM,UAAU,IAAI,IAAoB,CAAC,CAAC,KAAK,MAAM,4BAA4B,EAAE,WAAY,CAAC;AAEhG,OAAM,QAAQ,IAAI,MAAM,IAAI,OAAO,SAAS,QAAQ,IAAI,KAAK,MAAM,KAAK,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC;AACnG,QAAO,QAAQ,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,QAAQ,KAAK,QAAQ,IAAI,KAAK,MAAM,KAAK,EAAE,QAAQ,CAAC;CAEjG,MAAM,cAAc,IAAI;AACxB,SAAQ,QAAQ,CAAC,GAAG,SAAS;AAC3B,OAAK,IAAI,MAAM,QAAQ,KAAK,GAAG,YAAY,IAAI,IAAI,EAAE,MAAM,QAAQ,IAAI,EAAE;AACvE,eAAY,IAAI,IAAI;EACrB;CACF,EAAC;CAEF,MAAM,OAAO,GAAG,mBAAmB,oBAAoB,KAAK;CAC5D,MAAM,kBAAkB,KAAK,iBAAiB,KAAK,KAAK;CACxD,MAAM,aAAa,KAAK,WAAW,KAAK,KAAK;CAC7C,MAAM,gBAAgB,KAAK,cAAc,KAAK,KAAK;CACnD,MAAM,eAAe,KAAK,SAAS,KAAK,KAAK;CAC7C,MAAM,WAAW,KAAK,UAAU,KAAK,KAAK;AAE1C,MAAK,aAAa,CAAC,SAAS,QAAQ,IAAI,KAAK,IAAI,WAAW,KAAK;AACjE,MAAK,WAAW,CAAC,SAAS,QAAQ,IAAI,KAAK,IAAI,aAAa,KAAK;AACjE,MAAK,kBAAkB,CAAC,QAAQ,YAAY,IAAI,IAAI,KAAK,kBAAkB,IAAI,IAAI;AACnF,MAAK,WAAW,CAAC,SAAU,QAAQ,IAAI,KAAK,GAAG,OAAQ,WAAW,KAAK,IAAI;AAC3E,MAAK,gBAAgB,CAAC,MAAM,iBAAiB,SAAS,iBAAiB;EACrE,MAAM,SAAS,QAAQ,IAAI,KAAK;AAChC,SAAO,WAAW,YACd,cAAc,MAAM,iBAAiB,SAAS,aAAa,GAC3D,GAAG,iBAAiB,MAAM,QAAQ,iBAAiB,KAAK;CAC7D;CAED,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,QAAQ,MAAM,AAAC,GAAE,oBAAoB,KAAK;CAC/E,MAAM,UAAU,EAAE,KAAK;AAEvB,QAAO,GACJ,sBAAsB,QAAQ,CAC9B,OAAO,CAAC,gBAAgB,WAAW,QAAQ,QAAQ,IAAI,WAAW,KAAK,SAAS,CAAC,CACjF,IAAI,CAAC,eAAe;EACnB,MAAM,OAAO,WAAW,MAAM,SAAS,QAAQ,QAAQ,GAAG,IAAI;EAC9D,MAAM,UAAU,GAAG,6BAA6B,WAAW,aAAa,IAAI;AAE5E,UAAQ,EAAE,KAAK,IAAI,QAAQ;CAC5B,EAAC;AACL","names":["TYPE_CHECK_OPTIONS: ts.CompilerOptions","root: string","files: readonly File[]","extraSources: Readonly<Record<string, string>>"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/testing/typeCheck.ts"],"sourcesContent":["import { dirname, join } from 'node:path';\nimport ts from '@typescript/typescript6';\n\nconst TYPE_CHECK_OPTIONS: ts.CompilerOptions = {\n  module: ts.ModuleKind.ESNext,\n  moduleResolution: ts.ModuleResolutionKind.Bundler,\n  noEmit: true,\n  // the generated sources must not leave imports behind\n  noUnusedLocals: true,\n  skipLibCheck: true,\n  strict: true,\n  target: ts.ScriptTarget.ES2022,\n};\n\n// the client module is generated by another plugin, which is not part of the\n// plugin tests\nconst CLIENT_STUB = [\n  'declare const client: {',\n  '  call(endpoint: string, method: string, params?: unknown, init?: unknown): Promise<never>;',\n  '};',\n  'export default client;',\n].join('\\n');\n\n/**\n * Type-checks the generated sources, together with the given extra sources,\n * which can be used to assert that the generated types are actually usable.\n * The sources are compiled from memory.\n *\n * @param root - the directory to compile the sources in. It has to be inside\n * the package under test, so that the imported Hilla packages resolve the way\n * they do for that package.\n * @param files - the generated sources\n * @param extraSources - additional sources, by file name relative to `root`\n * @returns the compiler diagnostics, as readable messages\n */\nexport async function typeCheck(\n  root: string,\n  files: readonly File[],\n  extraSources: Readonly<Record<string, string>> = {},\n): Promise<readonly string[]> {\n  const sources = new Map<string, string>([[join(root, 'connect-client.default.ts'), CLIENT_STUB]]);\n\n  await Promise.all(files.map(async (file) => sources.set(join(root, file.name), await file.text())));\n  Object.entries(extraSources).forEach(([name, content]) => sources.set(join(root, name), content));\n\n  const directories = new Set<string>();\n  sources.forEach((_, file) => {\n    for (let dir = dirname(file); !directories.has(dir); dir = dirname(dir)) {\n      directories.add(dir);\n    }\n  });\n\n  const host = ts.createCompilerHost(TYPE_CHECK_OPTIONS, true);\n  const directoryExists = host.directoryExists?.bind(host);\n  const fileExists = host.fileExists.bind(host);\n  const getSourceFile = host.getSourceFile.bind(host);\n  const hostReadFile = host.readFile.bind(host);\n  const realpath = host.realpath?.bind(host);\n\n  host.fileExists = (file) => sources.has(file) || fileExists(file);\n  host.readFile = (file) => sources.get(file) ?? hostReadFile(file);\n  host.directoryExists = (dir) => directories.has(dir) || (directoryExists?.(dir) ?? false);\n  host.realpath = (file) => (sources.has(file) ? file : (realpath?.(file) ?? file));\n  host.getSourceFile = (file, languageVersion, onError, shouldCreate) => {\n    const source = sources.get(file);\n    return source === undefined\n      ? getSourceFile(file, languageVersion, onError, shouldCreate)\n      : ts.createSourceFile(file, source, languageVersion, true);\n  };\n\n  const program = ts.createProgram([...sources.keys()], TYPE_CHECK_OPTIONS, host);\n  const prefix = `${root}/`;\n\n  return ts\n    .getPreEmitDiagnostics(program)\n    .filter((diagnostic) => !diagnostic.file || sources.has(diagnostic.file.fileName))\n    .map((diagnostic) => {\n      const name = diagnostic.file?.fileName.replace(prefix, '') ?? '';\n      const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, ' ');\n\n      return `${name}: ${message}`;\n    });\n}\n"],"version":3}

package/createFullyUniqueIdentifier.d.ts

@@ -1,2 +0,0 @@
-import { type GeneratedIdentifierFlags, type Identifier } from "@typescript/typescript6";
-export default function createFullyUniqueIdentifier(name: string, flags?: GeneratedIdentifierFlags): Identifier;

package/createFullyUniqueIdentifier.js

@@ -1,9 +0,0 @@
-import ts from "@typescript/typescript6";
-export default function createFullyUniqueIdentifier(name, flags) {
-	return ts.factory.createUniqueName(
-		name,
-		// eslint-disable-next-line no-bitwise
-		flags ?? ts.GeneratedIdentifierFlags.Optimistic & ts.GeneratedIdentifierFlags.FileLevel
-);
-}
-//# sourceMappingURL=./createFullyUniqueIdentifier.js.map

package/createFullyUniqueIdentifier.js.map

@@ -1 +0,0 @@
-{"mappings":"AAAA,OAAO,iCAAsF;AAE7F,eAAe,SAAS,4BAA4BA,MAAcC,OAA8C;AAC9G,QAAO,GAAG,QAAQ;EAChB;;EAEA,SAAS,GAAG,yBAAyB,aAAa,GAAG,yBAAyB;CAC/E;AACF","names":["name: string","flags?: GeneratedIdentifierFlags"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/createFullyUniqueIdentifier.ts"],"sourcesContent":["import ts, { type GeneratedIdentifierFlags, type Identifier } from '@typescript/typescript6';\n\nexport default function createFullyUniqueIdentifier(name: string, flags?: GeneratedIdentifierFlags): Identifier {\n  return ts.factory.createUniqueName(\n    name,\n    // eslint-disable-next-line no-bitwise\n    flags ?? ts.GeneratedIdentifierFlags.Optimistic & ts.GeneratedIdentifierFlags.FileLevel,\n  );\n}\n"],"version":3}