@vaadin/hilla-generator-plugin-backbone 24.7.0-alpha9 → 24.8.0-alpha1

package/EndpointProcessor.js

@@ -3,61 +3,40 @@ import createSourceFile from "@vaadin/hilla-generator-utils/createSourceFile.js"
 import DependencyManager from "@vaadin/hilla-generator-utils/dependencies/DependencyManager.js";
 import PathManager from "@vaadin/hilla-generator-utils/dependencies/PathManager.js";
 import { OpenAPIV3 } from "openapi-types";
-import EndpointMethodOperationProcessor, {
-  HILLA_FRONTEND_NAME,
-  INIT_TYPE_NAME
-} from "./EndpointMethodOperationProcessor.js";
-class EndpointProcessor {
-  static async create(name, owner, methods, outputDir) {
-    const endpoint = new EndpointProcessor(name, owner, methods, outputDir);
-    endpoint.#dependencies.imports.default.add(
-      endpoint.#dependencies.paths.createRelativePath(await ClientPlugin.getClientFileName(outputDir)),
-      "client"
-    );
-    endpoint.#dependencies.imports.named.add(
-      endpoint.#dependencies.paths.createBareModulePath(HILLA_FRONTEND_NAME),
-      INIT_TYPE_NAME
-    );
-    return endpoint;
-  }
-  #createdFilePaths = new PathManager({ extension: "ts" });
-  #dependencies = new DependencyManager(new PathManager({ extension: ".js" }));
-  #methods;
-  #name;
-  #outputDir;
-  #owner;
-  constructor(name, owner, methods, outputDir) {
-    this.#name = name;
-    this.#owner = owner;
-    this.#methods = methods;
-    this.#outputDir = outputDir;
-  }
-  async process() {
-    this.#owner.logger.debug(`Processing endpoint: ${this.#name}`);
-    const statements = (await Promise.all(Array.from(this.#methods, async ([method, pathItem]) => this.#processMethod(method, pathItem)))).flatMap((item) => item);
-    const { exports, imports } = this.#dependencies;
-    return createSourceFile(
-      [...imports.toCode(), ...statements, ...exports.toCode()],
-      this.#createdFilePaths.createRelativePath(this.#name)
-    );
-  }
-  async #processMethod(method, pathItem) {
-    this.#owner.logger.debug(`Processing endpoint method: ${this.#name}.${method}`);
-    return (await Promise.all(
-      Object.values(OpenAPIV3.HttpMethods).filter((httpMethod) => pathItem[httpMethod]).map(
-        async (httpMethod) => EndpointMethodOperationProcessor.createProcessor(
-          httpMethod,
-          this.#name,
-          method,
-          pathItem[httpMethod],
-          this.#dependencies,
-          this.#owner
-        )?.process(this.#outputDir)
-      )
-    )).filter(Boolean);
-  }
+import EndpointMethodOperationProcessor from "./EndpointMethodOperationProcessor.js";
+export default class EndpointProcessor {
+	static async create(name, methods, storage, owner) {
+		const endpoint = new EndpointProcessor(name, methods, storage, owner);
+		endpoint.#dependencies.imports.default.add(endpoint.#dependencies.paths.createRelativePath(await ClientPlugin.getClientFileName(storage.outputDir)), "client");
+		return endpoint;
+	}
+	#createdFilePaths = new PathManager({ extension: "ts" });
+	#dependencies = new DependencyManager(new PathManager({ extension: ".js" }));
+	#methods;
+	#name;
+	#outputDir;
+	#transferTypes;
+	#owner;
+	constructor(name, methods, storage, owner) {
+		this.#name = name;
+		this.#owner = owner;
+		this.#methods = methods;
+		this.#outputDir = storage.outputDir;
+		this.#transferTypes = storage.transferTypes;
+	}
+	async process() {
+		this.#owner.logger.debug(`Processing endpoint: ${this.#name}`);
+		const statements = (await Promise.all(Array.from(this.#methods, async ([method, pathItem]) => this.#processMethod(method, pathItem)))).flatMap((item) => item);
+		const { exports, imports } = this.#dependencies;
+		return createSourceFile([
+			...imports.toCode(),
+			...statements,
+			...exports.toCode()
+		], this.#createdFilePaths.createRelativePath(this.#name));
+	}
+	async #processMethod(method, pathItem) {
+		this.#owner.logger.debug(`Processing endpoint method: ${this.#name}.${method}`);
+		return (await Promise.all(Object.values(OpenAPIV3.HttpMethods).filter((httpMethod) => pathItem[httpMethod]).map(async (httpMethod) => EndpointMethodOperationProcessor.createProcessor(httpMethod, this.#name, method, pathItem[httpMethod], this.#dependencies, this.#transferTypes, this.#owner)?.process(this.#outputDir)))).filter(Boolean);
+	}
 }
-export {
-  EndpointProcessor as default
-};
-//# sourceMappingURL=EndpointProcessor.js.map
+//# sourceMappingURL=./EndpointProcessor.js.map

package/EndpointProcessor.js.map

@@ -1,7 +1 @@
-{
-  "version": 3,
-  "sources": ["src/EndpointProcessor.ts"],
-  "sourcesContent": ["import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport ClientPlugin from '@vaadin/hilla-generator-plugin-client';\nimport createSourceFile from '@vaadin/hilla-generator-utils/createSourceFile.js';\nimport DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport PathManager from '@vaadin/hilla-generator-utils/dependencies/PathManager.js';\nimport { OpenAPIV3 } from 'openapi-types';\nimport type { ReadonlyDeep } from 'type-fest';\nimport type { SourceFile, Statement } from 'typescript';\nimport EndpointMethodOperationProcessor, {\n  HILLA_FRONTEND_NAME,\n  INIT_TYPE_NAME,\n} from './EndpointMethodOperationProcessor.js';\n\nexport default class EndpointProcessor {\n  static async create(\n    name: string,\n    owner: Plugin,\n    methods: Map<string, ReadonlyDeep<OpenAPIV3.PathItemObject>>,\n    outputDir?: string,\n  ): Promise<EndpointProcessor> {\n    const endpoint = new EndpointProcessor(name, owner, methods, outputDir);\n    endpoint.#dependencies.imports.default.add(\n      endpoint.#dependencies.paths.createRelativePath(await ClientPlugin.getClientFileName(outputDir)),\n      'client',\n    );\n    endpoint.#dependencies.imports.named.add(\n      endpoint.#dependencies.paths.createBareModulePath(HILLA_FRONTEND_NAME),\n      INIT_TYPE_NAME,\n    );\n    return endpoint;\n  }\n\n  readonly #createdFilePaths = new PathManager({ extension: 'ts' });\n  readonly #dependencies = new DependencyManager(new PathManager({ extension: '.js' }));\n  readonly #methods: Map<string, ReadonlyDeep<OpenAPIV3.PathItemObject>>;\n  readonly #name: string;\n  readonly #outputDir: string | undefined;\n  readonly #owner: Plugin;\n\n  private constructor(\n    name: string,\n    owner: Plugin,\n    methods: Map<string, ReadonlyDeep<OpenAPIV3.PathItemObject>>,\n    outputDir?: string,\n  ) {\n    this.#name = name;\n    this.#owner = owner;\n    this.#methods = methods;\n    this.#outputDir = outputDir;\n  }\n\n  async process(): Promise<SourceFile> {\n    this.#owner.logger.debug(`Processing endpoint: ${this.#name}`);\n\n    const statements = (\n      await Promise.all(Array.from(this.#methods, async ([method, pathItem]) => this.#processMethod(method, pathItem)))\n    ).flatMap((item) => item);\n\n    const { exports, imports } = this.#dependencies;\n\n    return createSourceFile(\n      [...imports.toCode(), ...statements, ...exports.toCode()],\n      this.#createdFilePaths.createRelativePath(this.#name),\n    );\n  }\n\n  async #processMethod(\n    method: string,\n    pathItem: ReadonlyDeep<OpenAPIV3.PathItemObject>,\n  ): Promise<readonly Statement[]> {\n    this.#owner.logger.debug(`Processing endpoint method: ${this.#name}.${method}`);\n\n    return (\n      await Promise.all(\n        Object.values(OpenAPIV3.HttpMethods)\n          .filter((httpMethod) => pathItem[httpMethod])\n          .map(async (httpMethod) =>\n            EndpointMethodOperationProcessor.createProcessor(\n              httpMethod,\n              this.#name,\n              method,\n              pathItem[httpMethod]!,\n              this.#dependencies,\n              this.#owner,\n            )?.process(this.#outputDir),\n          ),\n      )\n    ).filter(Boolean) as readonly Statement[];\n  }\n}\n"],
-  "mappings": "AACA,OAAO,kBAAkB;AACzB,OAAO,sBAAsB;AAC7B,OAAO,uBAAuB;AAC9B,OAAO,iBAAiB;AACxB,SAAS,iBAAiB;AAG1B,OAAO;AAAA,EACL;AAAA,EACA;AAAA,OACK;AAEP,MAAO,kBAAgC;AAAA,EACrC,aAAa,OACX,MACA,OACA,SACA,WAC4B;AAC5B,UAAM,WAAW,IAAI,kBAAkB,MAAM,OAAO,SAAS,SAAS;AACtE,aAAS,cAAc,QAAQ,QAAQ;AAAA,MACrC,SAAS,cAAc,MAAM,mBAAmB,MAAM,aAAa,kBAAkB,SAAS,CAAC;AAAA,MAC/F;AAAA,IACF;AACA,aAAS,cAAc,QAAQ,MAAM;AAAA,MACnC,SAAS,cAAc,MAAM,qBAAqB,mBAAmB;AAAA,MACrE;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAAA,EAES,oBAAoB,IAAI,YAAY,EAAE,WAAW,KAAK,CAAC;AAAA,EACvD,gBAAgB,IAAI,kBAAkB,IAAI,YAAY,EAAE,WAAW,MAAM,CAAC,CAAC;AAAA,EAC3E;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAED,YACN,MACA,OACA,SACA,WACA;AACA,SAAK,QAAQ;AACb,SAAK,SAAS;AACd,SAAK,WAAW;AAChB,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,MAAM,UAA+B;AACnC,SAAK,OAAO,OAAO,MAAM,wBAAwB,KAAK,KAAK,EAAE;AAE7D,UAAM,cACJ,MAAM,QAAQ,IAAI,MAAM,KAAK,KAAK,UAAU,OAAO,CAAC,QAAQ,QAAQ,MAAM,KAAK,eAAe,QAAQ,QAAQ,CAAC,CAAC,GAChH,QAAQ,CAAC,SAAS,IAAI;AAExB,UAAM,EAAE,SAAS,QAAQ,IAAI,KAAK;AAElC,WAAO;AAAA,MACL,CAAC,GAAG,QAAQ,OAAO,GAAG,GAAG,YAAY,GAAG,QAAQ,OAAO,CAAC;AAAA,MACxD,KAAK,kBAAkB,mBAAmB,KAAK,KAAK;AAAA,IACtD;AAAA,EACF;AAAA,EAEA,MAAM,eACJ,QACA,UAC+B;AAC/B,SAAK,OAAO,OAAO,MAAM,+BAA+B,KAAK,KAAK,IAAI,MAAM,EAAE;AAE9E,YACE,MAAM,QAAQ;AAAA,MACZ,OAAO,OAAO,UAAU,WAAW,EAChC,OAAO,CAAC,eAAe,SAAS,UAAU,CAAC,EAC3C;AAAA,QAAI,OAAO,eACV,iCAAiC;AAAA,UAC/B;AAAA,UACA,KAAK;AAAA,UACL;AAAA,UACA,SAAS,UAAU;AAAA,UACnB,KAAK;AAAA,UACL,KAAK;AAAA,QACP,GAAG,QAAQ,KAAK,UAAU;AAAA,MAC5B;AAAA,IACJ,GACA,OAAO,OAAO;AAAA,EAClB;AACF;",
-  "names": []
-}
+{"mappings":"AAEA,OAAO,yDAA0D;AACjE,OAAO,yEAA0E;AACjF,OAAO,wFAAyF;AAChG,OAAO,4EAA6E;AACpF,SAAS,gCAAiC;AAE1C,OAAO,6EAA8E;AAErF,eAAe,MAAM,kBAAkB;CACrC,aAAa,OACXA,MACAC,SACAC,SACAC,OAC4B;EAC5B,MAAM,WAAW,IAAI,kBAAkB,MAAM,SAAS,SAAS;AAC/D,WAASC,cAAc,QAAQ,QAAQ,IACrC,SAASA,cAAc,MAAM,mBAAmB,MAAM,aAAa,kBAAkB,QAAQ,UAAU,CAAC,EACxG,SACD;AACD,SAAO;CACR;CAED,AAASC,oBAAoB,IAAI,YAAY,EAAE,WAAW,KAAM;CAChE,AAASD,gBAAgB,IAAI,kBAAkB,IAAI,YAAY,EAAE,WAAW,MAAO;CACnF,AAASE;CACT,AAASC;CACT,AAASC;CACT,AAASC;CACT,AAASC;CAET,AAAQ,YACNV,MACAC,SACAC,SACAC,OACA;AACA,OAAKI,QAAQ;AACb,OAAKG,SAAS;AACd,OAAKJ,WAAW;AAChB,OAAKE,aAAa,QAAQ;AAC1B,OAAKC,iBAAiB,QAAQ;CAC/B;CAED,MAAM,UAA+B;AACnC,OAAKC,OAAO,OAAO,OAAO,uBAAuB,KAAKH,MAAM,EAAE;EAE9D,MAAM,aAAa,CACjB,MAAM,QAAQ,IAAI,MAAM,KAAK,KAAKD,UAAU,OAAO,CAAC,QAAQ,SAAS,KAAK,KAAKK,eAAe,QAAQ,SAAS,CAAC,CAAC,EACjH,QAAQ,CAAC,SAAS,KAAK;EAEzB,MAAM,EAAE,SAAS,SAAS,GAAG,KAAKP;AAElC,SAAO,iBACL;GAAC,GAAG,QAAQ,QAAQ;GAAE,GAAG;GAAY,GAAG,QAAQ,QAAQ;EAAC,GACzD,KAAKC,kBAAkB,mBAAmB,KAAKE,MAAM,CACtD;CACF;CAED,MAAMI,eAAeC,QAAgBC,UAAmE;AACtG,OAAKH,OAAO,OAAO,OAAO,8BAA8B,KAAKH,MAAM,GAAG,OAAO,EAAE;AAE/E,SAAO,CACL,MAAM,QAAQ,IACZ,OAAO,OAAO,UAAU,YAAY,CACjC,OAAO,CAAC,eAAe,SAAS,YAAY,CAC5C,IAAI,OAAO,eACV,iCAAiC,gBAC/B,YACA,KAAKA,OACL,QACA,SAAS,aACT,KAAKH,eACL,KAAKK,gBACL,KAAKC,OACN,EAAE,QAAQ,KAAKF,WAAW,CAC5B,CACJ,EACD,OAAO,QAAQ;CAClB;AACF","names":["name: string","methods: Map<string, OpenAPIV3.PathItemObject>","storage: SharedStorage","owner: Plugin","#dependencies","#createdFilePaths","#methods","#name","#outputDir","#transferTypes","#owner","#processMethod","method: string","pathItem: OpenAPIV3.PathItemObject"],"sources":["/opt/agent/work/1af72d8adc613024/hilla/packages/ts/generator-plugin-backbone/src/EndpointProcessor.ts"],"sourcesContent":["import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport type { SharedStorage, TransferTypes } from '@vaadin/hilla-generator-core/SharedStorage.js';\nimport ClientPlugin from '@vaadin/hilla-generator-plugin-client';\nimport createSourceFile from '@vaadin/hilla-generator-utils/createSourceFile.js';\nimport DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport PathManager from '@vaadin/hilla-generator-utils/dependencies/PathManager.js';\nimport { OpenAPIV3 } from 'openapi-types';\nimport type { SourceFile, Statement } from 'typescript';\nimport EndpointMethodOperationProcessor from './EndpointMethodOperationProcessor.js';\n\nexport default class EndpointProcessor {\n  static async create(\n    name: string,\n    methods: Map<string, OpenAPIV3.PathItemObject>,\n    storage: SharedStorage,\n    owner: Plugin,\n  ): Promise<EndpointProcessor> {\n    const endpoint = new EndpointProcessor(name, methods, storage, owner);\n    endpoint.#dependencies.imports.default.add(\n      endpoint.#dependencies.paths.createRelativePath(await ClientPlugin.getClientFileName(storage.outputDir)),\n      'client',\n    );\n    return endpoint;\n  }\n\n  readonly #createdFilePaths = new PathManager({ extension: 'ts' });\n  readonly #dependencies = new DependencyManager(new PathManager({ extension: '.js' }));\n  readonly #methods: Map<string, OpenAPIV3.PathItemObject>;\n  readonly #name: string;\n  readonly #outputDir: string | undefined;\n  readonly #transferTypes: TransferTypes;\n  readonly #owner: Plugin;\n\n  private constructor(\n    name: string,\n    methods: Map<string, OpenAPIV3.PathItemObject>,\n    storage: SharedStorage,\n    owner: Plugin,\n  ) {\n    this.#name = name;\n    this.#owner = owner;\n    this.#methods = methods;\n    this.#outputDir = storage.outputDir;\n    this.#transferTypes = storage.transferTypes;\n  }\n\n  async process(): Promise<SourceFile> {\n    this.#owner.logger.debug(`Processing endpoint: ${this.#name}`);\n\n    const statements = (\n      await Promise.all(Array.from(this.#methods, async ([method, pathItem]) => this.#processMethod(method, pathItem)))\n    ).flatMap((item) => item);\n\n    const { exports, imports } = this.#dependencies;\n\n    return createSourceFile(\n      [...imports.toCode(), ...statements, ...exports.toCode()],\n      this.#createdFilePaths.createRelativePath(this.#name),\n    );\n  }\n\n  async #processMethod(method: string, pathItem: OpenAPIV3.PathItemObject): Promise<readonly Statement[]> {\n    this.#owner.logger.debug(`Processing endpoint method: ${this.#name}.${method}`);\n\n    return (\n      await Promise.all(\n        Object.values(OpenAPIV3.HttpMethods)\n          .filter((httpMethod) => pathItem[httpMethod])\n          .map(async (httpMethod) =>\n            EndpointMethodOperationProcessor.createProcessor(\n              httpMethod,\n              this.#name,\n              method,\n              pathItem[httpMethod]!,\n              this.#dependencies,\n              this.#transferTypes,\n              this.#owner,\n            )?.process(this.#outputDir),\n          ),\n      )\n    ).filter(Boolean) as readonly Statement[];\n  }\n}\n"],"version":3}

package/EntityProcessor.d.ts

@@ -1,9 +1,9 @@
-import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';
-import { type Schema } from '@vaadin/hilla-generator-core/Schema.js';
-import { type SourceFile } from 'typescript';
+import type Plugin from "@vaadin/hilla-generator-core/Plugin.js";
+import { type Schema } from "@vaadin/hilla-generator-core/Schema.js";
+import type { SharedStorage } from "@vaadin/hilla-generator-core/SharedStorage.js";
+import { type SourceFile } from "typescript";
 export declare class EntityProcessor {
-    #private;
-    constructor(name: string, component: Schema, owner: Plugin);
-    process(): SourceFile;
+	#private;
+	constructor(name: string, component: Schema, storage: SharedStorage, owner: Plugin);
+	process(): SourceFile;
 }
-//# sourceMappingURL=EntityProcessor.d.ts.map

package/EntityProcessor.js

@@ -1,143 +1,95 @@
 import { dirname } from "path/posix";
-import {
-  convertReferenceSchemaToPath,
-  convertReferenceSchemaToSpecifier,
-  decomposeSchema,
-  isComposedSchema,
-  isEmptyObject,
-  isEnumSchema,
-  isNullableSchema,
-  isObjectSchema,
-  isReferenceSchema
-} from "@vaadin/hilla-generator-core/Schema.js";
-import {
-  convertFullyQualifiedNameToRelativePath,
-  simplifyFullyQualifiedName
-} from "@vaadin/hilla-generator-core/utils.js";
+import { convertReferenceSchemaToPath, convertReferenceSchemaToSpecifier, decomposeSchema, isComposedSchema, isEmptyObject, isEnumSchema, isNullableSchema, isObjectSchema, isReferenceSchema, convertFullyQualifiedNameToRelativePath, simplifyFullyQualifiedName } from "@vaadin/hilla-generator-core/Schema.js";
 import createSourceFile from "@vaadin/hilla-generator-utils/createSourceFile.js";
 import DependencyManager from "@vaadin/hilla-generator-utils/dependencies/DependencyManager.js";
 import PathManager from "@vaadin/hilla-generator-utils/dependencies/PathManager.js";
-import ts, {
-} from "typescript";
+import ts from "typescript";
 import TypeSchemaProcessor from "./TypeSchemaProcessor.js";
 import { findTypeParameters } from "./utils.js";
-class EntityProcessor {
-  #component;
-  #dependencies;
-  #fullyQualifiedName;
-  #name;
-  #outputPathManager = new PathManager({ extension: "ts" });
-  #owner;
-  #path;
-  constructor(name, component, owner) {
-    this.#component = component;
-    this.#owner = owner;
-    this.#fullyQualifiedName = name;
-    this.#name = simplifyFullyQualifiedName(name);
-    this.#path = convertFullyQualifiedNameToRelativePath(name);
-    this.#dependencies = new DependencyManager(new PathManager({ extension: ".js", relativeTo: dirname(this.#path) }));
-  }
-  get #id() {
-    const id = ts.factory.createIdentifier(this.#name);
-    this.#dependencies.exports.default.set(id);
-    return id;
-  }
-  process() {
-    this.#owner.logger.debug(`Processing entity: ${this.#name}`);
-    const declaration = isEnumSchema(this.#component) ? this.#processEnum(this.#component) : this.#processExtendedClass(this.#component);
-    const statements = declaration ? [declaration] : [];
-    const { exports, imports } = this.#dependencies;
-    return createSourceFile(
-      [...imports.toCode(), ...statements, ...exports.toCode()],
-      this.#outputPathManager.createRelativePath(this.#path)
-    );
-  }
-  #processClass(schema) {
-    const { logger } = this.#owner;
-    if (!isObjectSchema(schema)) {
-      logger.debug(schema, `Component is not an object: '${this.#fullyQualifiedName}'`);
-      return void 0;
-    }
-    if (isEmptyObject(schema)) {
-      logger.debug(`Component has no properties:' ${this.#fullyQualifiedName}'`);
-    }
-    return ts.factory.createInterfaceDeclaration(
-      void 0,
-      this.#id,
-      EntityProcessor.#processTypeParameters(schema),
-      void 0,
-      this.#processTypeElements(schema)
-    );
-  }
-  #processEnum({ enum: members }) {
-    return ts.factory.createEnumDeclaration(
-      void 0,
-      this.#id,
-      members.map((member) => ts.factory.createEnumMember(member, ts.factory.createStringLiteral(member)))
-    );
-  }
-  #processExtendedClass(schema) {
-    const { logger } = this.#owner;
-    if (isComposedSchema(schema)) {
-      const decomposed = decomposeSchema(schema);
-      if (decomposed.length > 2) {
-        logger.debug(
-          schema,
-          `Schema for '${this.#fullyQualifiedName}' has more than two components. This plugin will ignore it.`
-        );
-        return void 0;
-      }
-      const [parent, child] = decomposed;
-      if (!isReferenceSchema(parent)) {
-        logger.debug(parent, "Only reference schema allowed for parent class");
-        return void 0;
-      }
-      const declaration = this.#processClass(child);
-      const identifier = this.#processParentClass(parent);
-      return declaration && ts.factory.updateInterfaceDeclaration(
-        declaration,
-        declaration.modifiers,
-        declaration.name,
-        declaration.typeParameters,
-        [
-          ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [
-            ts.factory.createExpressionWithTypeArguments(identifier, void 0)
-          ])
-        ],
-        declaration.members
-      );
-    }
-    return this.#processClass(schema);
-  }
-  #processParentClass(schema) {
-    const { imports, paths } = this.#dependencies;
-    const specifier = convertReferenceSchemaToSpecifier(schema);
-    const path = paths.createRelativePath(convertReferenceSchemaToPath(schema));
-    return imports.default.getIdentifier(path) ?? imports.default.add(path, specifier, true);
-  }
-  #processTypeElements({ properties }) {
-    return Object.entries(properties ?? {}).map(([name, schema]) => {
-      const [type] = new TypeSchemaProcessor(schema, this.#dependencies).process();
-      return ts.factory.createPropertySignature(
-        void 0,
-        name,
-        isNullableSchema(schema) ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) : void 0,
-        type
-      );
-    });
-  }
-  static #processTypeParameters(schema) {
-    return findTypeParameters(schema)?.map(String).map(
-      (name) => ts.factory.createTypeParameterDeclaration(
-        void 0,
-        name,
-        void 0,
-        ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)
-      )
-    );
-  }
+export class EntityProcessor {
+	#component;
+	#dependencies;
+	#fullyQualifiedName;
+	#name;
+	#outputPathManager = new PathManager({ extension: "ts" });
+	#transferTypes;
+	#owner;
+	#path;
+	constructor(name, component, storage, owner) {
+		this.#component = component;
+		this.#owner = owner;
+		this.#fullyQualifiedName = name;
+		this.#name = simplifyFullyQualifiedName(name);
+		this.#path = convertFullyQualifiedNameToRelativePath(name);
+		this.#dependencies = new DependencyManager(new PathManager({
+			extension: ".js",
+			relativeTo: dirname(this.#path)
+		}));
+		this.#transferTypes = storage.transferTypes;
+	}
+	get #id() {
+		const id = ts.factory.createIdentifier(this.#name);
+		this.#dependencies.exports.default.set(id);
+		return id;
+	}
+	process() {
+		this.#owner.logger.debug(`Processing entity: ${this.#name}`);
+		const declaration = isEnumSchema(this.#component) ? this.#processEnum(this.#component) : this.#processExtendedClass(this.#component);
+		const statements = declaration ? [declaration] : [];
+		const { exports, imports } = this.#dependencies;
+		return createSourceFile([
+			...imports.toCode(),
+			...statements,
+			...exports.toCode()
+		], this.#outputPathManager.createRelativePath(this.#path));
+	}
+	#processClass(schema) {
+		const { logger } = this.#owner;
+		if (!isObjectSchema(schema)) {
+			logger.debug(schema, `Component is not an object: '${this.#fullyQualifiedName}'`);
+			return undefined;
+		}
+		if (isEmptyObject(schema)) {
+			logger.debug(`Component has no properties:' ${this.#fullyQualifiedName}'`);
+		}
+		return ts.factory.createInterfaceDeclaration(undefined, this.#id, EntityProcessor.#processTypeParameters(schema), undefined, this.#processTypeElements(schema));
+	}
+	#processEnum({ enum: members }) {
+		return ts.factory.createEnumDeclaration(undefined, this.#id, members.map((member) => ts.factory.createEnumMember(member, ts.factory.createStringLiteral(member))));
+	}
+	#processExtendedClass(schema) {
+		const { logger } = this.#owner;
+		if (isComposedSchema(schema)) {
+			const decomposed = decomposeSchema(schema);
+			if (decomposed.length > 2) {
+				logger.debug(schema, `Schema for '${this.#fullyQualifiedName}' has more than two components. This plugin will ignore it.`);
+				return undefined;
+			}
+			const [parent, child] = decomposed;
+			if (!isReferenceSchema(parent)) {
+				logger.debug(parent, "Only reference schema allowed for parent class");
+				return undefined;
+			}
+			const declaration = this.#processClass(child);
+			const identifier = this.#processParentClass(parent);
+			return declaration && ts.factory.updateInterfaceDeclaration(declaration, declaration.modifiers, declaration.name, declaration.typeParameters, [ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [ts.factory.createExpressionWithTypeArguments(identifier, undefined)])], declaration.members);
+		}
+		return this.#processClass(schema);
+	}
+	#processParentClass(schema) {
+		const { imports, paths } = this.#dependencies;
+		const specifier = convertReferenceSchemaToSpecifier(schema);
+		const path = paths.createRelativePath(convertReferenceSchemaToPath(schema));
+		return imports.default.getIdentifier(path) ?? imports.default.add(path, specifier, true);
+	}
+	#processTypeElements({ properties }) {
+		return Object.entries(properties ?? {}).map(([name, schema]) => {
+			const [type] = new TypeSchemaProcessor(schema, this.#dependencies, this.#transferTypes).process();
+			return ts.factory.createPropertySignature(undefined, name, isNullableSchema(schema) ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) : undefined, type);
+		});
+	}
+	static #processTypeParameters(schema) {
+		return findTypeParameters(schema)?.map(String).map((name) => ts.factory.createTypeParameterDeclaration(undefined, name, undefined, ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)));
+	}
 }
-export {
-  EntityProcessor
-};
-//# sourceMappingURL=EntityProcessor.js.map
+//# sourceMappingURL=./EntityProcessor.js.map

package/EntityProcessor.js.map

@@ -1,7 +1 @@
-{
-  "version": 3,
-  "sources": ["src/EntityProcessor.ts"],
-  "sourcesContent": ["import { dirname } from 'path/posix';\nimport type Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport {\n  type EnumSchema,\n  type ReferenceSchema,\n  type Schema,\n  convertReferenceSchemaToPath,\n  convertReferenceSchemaToSpecifier,\n  decomposeSchema,\n  isComposedSchema,\n  isEmptyObject,\n  isEnumSchema,\n  isNullableSchema,\n  isObjectSchema,\n  isReferenceSchema,\n  type ObjectSchema,\n} from '@vaadin/hilla-generator-core/Schema.js';\nimport {\n  convertFullyQualifiedNameToRelativePath,\n  simplifyFullyQualifiedName,\n} from '@vaadin/hilla-generator-core/utils.js';\nimport createSourceFile from '@vaadin/hilla-generator-utils/createSourceFile.js';\nimport DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport PathManager from '@vaadin/hilla-generator-utils/dependencies/PathManager.js';\nimport ts, {\n  type Identifier,\n  type InterfaceDeclaration,\n  type SourceFile,\n  type Statement,\n  type TypeElement,\n} from 'typescript';\nimport TypeSchemaProcessor from './TypeSchemaProcessor.js';\nimport { findTypeParameters } from './utils.js';\n\nexport class EntityProcessor {\n  readonly #component: Schema;\n  readonly #dependencies;\n  readonly #fullyQualifiedName: string;\n  readonly #name: string;\n  readonly #outputPathManager = new PathManager({ extension: 'ts' });\n  readonly #owner: Plugin;\n  readonly #path: string;\n\n  constructor(name: string, component: Schema, owner: Plugin) {\n    this.#component = component;\n    this.#owner = owner;\n    this.#fullyQualifiedName = name;\n    this.#name = simplifyFullyQualifiedName(name);\n    this.#path = convertFullyQualifiedNameToRelativePath(name);\n    this.#dependencies = new DependencyManager(new PathManager({ extension: '.js', relativeTo: dirname(this.#path) }));\n  }\n\n  get #id(): Identifier {\n    const id = ts.factory.createIdentifier(this.#name);\n\n    this.#dependencies.exports.default.set(id);\n\n    return id;\n  }\n\n  process(): SourceFile {\n    this.#owner.logger.debug(`Processing entity: ${this.#name}`);\n\n    const declaration = isEnumSchema(this.#component)\n      ? this.#processEnum(this.#component)\n      : this.#processExtendedClass(this.#component);\n\n    const statements = declaration ? [declaration] : [];\n\n    const { exports, imports } = this.#dependencies;\n\n    return createSourceFile(\n      [...imports.toCode(), ...statements, ...exports.toCode()],\n      this.#outputPathManager.createRelativePath(this.#path),\n    );\n  }\n\n  #processClass(schema: Schema): InterfaceDeclaration | undefined {\n    const { logger } = this.#owner;\n\n    if (!isObjectSchema(schema)) {\n      logger.debug(schema, `Component is not an object: '${this.#fullyQualifiedName}'`);\n      return undefined;\n    }\n\n    if (isEmptyObject(schema)) {\n      logger.debug(`Component has no properties:' ${this.#fullyQualifiedName}'`);\n    }\n\n    return ts.factory.createInterfaceDeclaration(\n      undefined,\n      this.#id,\n      EntityProcessor.#processTypeParameters(schema),\n      undefined,\n      this.#processTypeElements(schema as ObjectSchema),\n    );\n  }\n\n  #processEnum({ enum: members }: EnumSchema): Statement {\n    return ts.factory.createEnumDeclaration(\n      undefined,\n      this.#id,\n      members.map((member) => ts.factory.createEnumMember(member, ts.factory.createStringLiteral(member))),\n    );\n  }\n\n  #processExtendedClass(schema: Schema): Statement | undefined {\n    const { logger } = this.#owner;\n\n    if (isComposedSchema(schema)) {\n      const decomposed = decomposeSchema(schema);\n\n      if (decomposed.length > 2) {\n        logger.debug(\n          schema,\n          `Schema for '${this.#fullyQualifiedName}' has more than two components. This plugin will ignore it.`,\n        );\n        return undefined;\n      }\n\n      const [parent, child] = decomposed;\n\n      if (!isReferenceSchema(parent)) {\n        logger.debug(parent, 'Only reference schema allowed for parent class');\n        return undefined;\n      }\n\n      const declaration = this.#processClass(child);\n      const identifier = this.#processParentClass(parent);\n\n      return (\n        declaration &&\n        ts.factory.updateInterfaceDeclaration(\n          declaration,\n          declaration.modifiers,\n          declaration.name,\n          declaration.typeParameters,\n          [\n            ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [\n              ts.factory.createExpressionWithTypeArguments(identifier, undefined),\n            ]),\n          ],\n          declaration.members,\n        )\n      );\n    }\n\n    return this.#processClass(schema);\n  }\n\n  #processParentClass(schema: ReferenceSchema): Identifier {\n    const { imports, paths } = this.#dependencies;\n\n    const specifier = convertReferenceSchemaToSpecifier(schema);\n    const path = paths.createRelativePath(convertReferenceSchemaToPath(schema));\n\n    return imports.default.getIdentifier(path) ?? imports.default.add(path, specifier, true);\n  }\n\n  #processTypeElements({ properties }: ObjectSchema): readonly TypeElement[] {\n    return Object.entries(properties ?? {}).map(([name, schema]) => {\n      const [type] = new TypeSchemaProcessor(schema, this.#dependencies).process();\n\n      return ts.factory.createPropertySignature(\n        undefined,\n        name,\n        isNullableSchema(schema) ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) : undefined,\n        type,\n      );\n    });\n  }\n\n  static #processTypeParameters(schema: Schema): readonly ts.TypeParameterDeclaration[] | undefined {\n    return findTypeParameters(schema)\n      ?.map(String)\n      .map((name) =>\n        ts.factory.createTypeParameterDeclaration(\n          undefined,\n          name,\n          undefined,\n          ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),\n        ),\n      );\n  }\n}\n"],
-  "mappings": "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",
-  "names": []
-}
+{"mappings":"AAAA,SAAS,2BAA4B;AAErC,SAIE,8BACA,mCACA,iBACA,kBACA,eACA,cACA,kBACA,gBACA,mBAEA,yCACA,0EAC8C;AAEhD,OAAO,yEAA0E;AACjF,OAAO,wFAAyF;AAChG,OAAO,4EAA6E;AACpF,OAAO,oBAOa;AACpB,OAAO,mDAAoD;AAC3D,SAAS,sCAAuC;AAEhD,OAAO,MAAM,gBAAgB;CAC3B,AAASA;CACT,AAASC;CACT,AAASC;CACT,AAASC;CACT,AAASC,qBAAqB,IAAI,YAAY,EAAE,WAAW,KAAM;CACjE,AAASC;CACT,AAASC;CACT,AAASC;CAET,YAAYC,MAAcC,WAAmBC,SAAwBC,OAAe;AAClF,OAAKX,aAAa;AAClB,OAAKM,SAAS;AACd,OAAKJ,sBAAsB;AAC3B,OAAKC,QAAQ,2BAA2B,KAAK;AAC7C,OAAKI,QAAQ,wCAAwC,KAAK;AAC1D,OAAKN,gBAAgB,IAAI,kBAAkB,IAAI,YAAY;GAAE,WAAW;GAAO,YAAY,QAAQ,KAAKM,MAAM;EAAE;AAChH,OAAKF,iBAAiB,QAAQ;CAC/B;CAED,IAAIO,MAAkB;EACpB,MAAM,KAAK,GAAG,QAAQ,iBAAiB,KAAKT,MAAM;AAElD,OAAKF,cAAc,QAAQ,QAAQ,IAAI,GAAG;AAE1C,SAAO;CACR;CAED,UAAsB;AACpB,OAAKK,OAAO,OAAO,OAAO,qBAAqB,KAAKH,MAAM,EAAE;EAE5D,MAAM,cAAc,aAAa,KAAKH,WAAW,GAC7C,KAAKa,aAAa,KAAKb,WAAW,GAClC,KAAKc,sBAAsB,KAAKd,WAAW;EAE/C,MAAM,aAAa,cAAc,CAAC,WAAY,IAAG,CAAE;EAEnD,MAAM,EAAE,SAAS,SAAS,GAAG,KAAKC;AAElC,SAAO,iBACL;GAAC,GAAG,QAAQ,QAAQ;GAAE,GAAG;GAAY,GAAG,QAAQ,QAAQ;EAAC,GACzD,KAAKG,mBAAmB,mBAAmB,KAAKG,MAAM,CACvD;CACF;CAED,cAAcQ,QAAkD;EAC9D,MAAM,EAAE,QAAQ,GAAG,KAAKT;AAExB,OAAK,eAAe,OAAO,EAAE;AAC3B,UAAO,MAAM,SAAS,+BAA+B,KAAKJ,oBAAoB,GAAG;AACjF,UAAO;EACR;AAED,MAAI,cAAc,OAAO,EAAE;AACzB,UAAO,OAAO,gCAAgC,KAAKA,oBAAoB,GAAG;EAC3E;AAED,SAAO,GAAG,QAAQ,2BAChB,WACA,KAAKU,KACL,gBAAgBI,uBAAuB,OAAO,EAC9C,WACA,KAAKC,qBAAqB,OAAuB,CAClD;CACF;CAED,aAAa,EAAE,MAAM,SAAqB,EAAa;AACrD,SAAO,GAAG,QAAQ,sBAChB,WACA,KAAKL,KACL,QAAQ,IAAI,CAAC,WAAW,GAAG,QAAQ,iBAAiB,QAAQ,GAAG,QAAQ,oBAAoB,OAAO,CAAC,CAAC,CACrG;CACF;CAED,sBAAsBG,QAAuC;EAC3D,MAAM,EAAE,QAAQ,GAAG,KAAKT;AAExB,MAAI,iBAAiB,OAAO,EAAE;GAC5B,MAAM,aAAa,gBAAgB,OAAO;AAE1C,OAAI,WAAW,SAAS,GAAG;AACzB,WAAO,MACL,SACC,cAAc,KAAKJ,oBAAoB,6DACzC;AACD,WAAO;GACR;GAED,MAAM,CAAC,QAAQ,MAAM,GAAG;AAExB,QAAK,kBAAkB,OAAO,EAAE;AAC9B,WAAO,MAAM,QAAQ,iDAAiD;AACtE,WAAO;GACR;GAED,MAAM,cAAc,KAAKgB,cAAc,MAAM;GAC7C,MAAM,aAAa,KAAKC,oBAAoB,OAAO;AAEnD,UACE,eACA,GAAG,QAAQ,2BACT,aACA,YAAY,WACZ,YAAY,MACZ,YAAY,gBACZ,CACE,GAAG,QAAQ,qBAAqB,GAAG,WAAW,gBAAgB,CAC5D,GAAG,QAAQ,kCAAkC,YAAY,UAAU,AACpE,EAAC,AACH,GACD,YAAY,QACb;EAEJ;AAED,SAAO,KAAKD,cAAc,OAAO;CAClC;CAED,oBAAoBE,QAAqC;EACvD,MAAM,EAAE,SAAS,OAAO,GAAG,KAAKnB;EAEhC,MAAM,YAAY,kCAAkC,OAAO;EAC3D,MAAM,OAAO,MAAM,mBAAmB,6BAA6B,OAAO,CAAC;AAE3E,SAAO,QAAQ,QAAQ,cAAc,KAAK,IAAI,QAAQ,QAAQ,IAAI,MAAM,WAAW,KAAK;CACzF;CAED,qBAAqB,EAAE,YAA0B,EAA0B;AACzE,SAAO,OAAO,QAAQ,cAAc,CAAE,EAAC,CAAC,IAAI,CAAC,CAAC,MAAM,OAAO,KAAK;GAC9D,MAAM,CAAC,KAAK,GAAG,IAAI,oBAAoB,QAAQ,KAAKA,eAAe,KAAKI,gBAAgB,SAAS;AAEjG,UAAO,GAAG,QAAQ,wBAChB,WACA,MACA,iBAAiB,OAAO,GAAG,GAAG,QAAQ,YAAY,GAAG,WAAW,cAAc,GAAG,WACjF,KACD;EACF,EAAC;CACH;CAED,OAAOW,uBAAuBD,QAAiE;AAC7F,SAAO,mBAAmB,OAAO,EAC7B,IAAI,OAAO,CACZ,IAAI,CAAC,SACJ,GAAG,QAAQ,+BACT,WACA,MACA,WACA,GAAG,QAAQ,sBAAsB,GAAG,WAAW,eAAe,CAC/D,CACF;CACJ;AACF","names":["#component","#dependencies","#fullyQualifiedName","#name","#outputPathManager","#transferTypes","#owner","#path","name: string","component: Schema","storage: SharedStorage","owner: Plugin","#id","#processEnum","#processExtendedClass","schema: Schema","#processTypeParameters","#processTypeElements","#processClass","#processParentClass","schema: ReferenceSchema"],"sources":["/opt/agent/work/1af72d8adc613024/hilla/packages/ts/generator-plugin-backbone/src/EntityProcessor.ts"],"sourcesContent":["import { dirname } from 'path/posix';\nimport type Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport {\n  type EnumSchema,\n  type ReferenceSchema,\n  type Schema,\n  convertReferenceSchemaToPath,\n  convertReferenceSchemaToSpecifier,\n  decomposeSchema,\n  isComposedSchema,\n  isEmptyObject,\n  isEnumSchema,\n  isNullableSchema,\n  isObjectSchema,\n  isReferenceSchema,\n  type ObjectSchema,\n  convertFullyQualifiedNameToRelativePath,\n  simplifyFullyQualifiedName,\n} from '@vaadin/hilla-generator-core/Schema.js';\nimport type { SharedStorage, TransferTypes } from '@vaadin/hilla-generator-core/SharedStorage.js';\nimport createSourceFile from '@vaadin/hilla-generator-utils/createSourceFile.js';\nimport DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport PathManager from '@vaadin/hilla-generator-utils/dependencies/PathManager.js';\nimport ts, {\n  type Identifier,\n  type InterfaceDeclaration,\n  type SourceFile,\n  type Statement,\n  type TypeElement,\n  type TypeParameterDeclaration,\n} from 'typescript';\nimport TypeSchemaProcessor from './TypeSchemaProcessor.js';\nimport { findTypeParameters } from './utils.js';\n\nexport class EntityProcessor {\n  readonly #component: Schema;\n  readonly #dependencies;\n  readonly #fullyQualifiedName: string;\n  readonly #name: string;\n  readonly #outputPathManager = new PathManager({ extension: 'ts' });\n  readonly #transferTypes: TransferTypes;\n  readonly #owner: Plugin;\n  readonly #path: string;\n\n  constructor(name: string, component: Schema, storage: SharedStorage, owner: Plugin) {\n    this.#component = component;\n    this.#owner = owner;\n    this.#fullyQualifiedName = name;\n    this.#name = simplifyFullyQualifiedName(name);\n    this.#path = convertFullyQualifiedNameToRelativePath(name);\n    this.#dependencies = new DependencyManager(new PathManager({ extension: '.js', relativeTo: dirname(this.#path) }));\n    this.#transferTypes = storage.transferTypes;\n  }\n\n  get #id(): Identifier {\n    const id = ts.factory.createIdentifier(this.#name);\n\n    this.#dependencies.exports.default.set(id);\n\n    return id;\n  }\n\n  process(): SourceFile {\n    this.#owner.logger.debug(`Processing entity: ${this.#name}`);\n\n    const declaration = isEnumSchema(this.#component)\n      ? this.#processEnum(this.#component)\n      : this.#processExtendedClass(this.#component);\n\n    const statements = declaration ? [declaration] : [];\n\n    const { exports, imports } = this.#dependencies;\n\n    return createSourceFile(\n      [...imports.toCode(), ...statements, ...exports.toCode()],\n      this.#outputPathManager.createRelativePath(this.#path),\n    );\n  }\n\n  #processClass(schema: Schema): InterfaceDeclaration | undefined {\n    const { logger } = this.#owner;\n\n    if (!isObjectSchema(schema)) {\n      logger.debug(schema, `Component is not an object: '${this.#fullyQualifiedName}'`);\n      return undefined;\n    }\n\n    if (isEmptyObject(schema)) {\n      logger.debug(`Component has no properties:' ${this.#fullyQualifiedName}'`);\n    }\n\n    return ts.factory.createInterfaceDeclaration(\n      undefined,\n      this.#id,\n      EntityProcessor.#processTypeParameters(schema),\n      undefined,\n      this.#processTypeElements(schema as ObjectSchema),\n    );\n  }\n\n  #processEnum({ enum: members }: EnumSchema): Statement {\n    return ts.factory.createEnumDeclaration(\n      undefined,\n      this.#id,\n      members.map((member) => ts.factory.createEnumMember(member, ts.factory.createStringLiteral(member))),\n    );\n  }\n\n  #processExtendedClass(schema: Schema): Statement | undefined {\n    const { logger } = this.#owner;\n\n    if (isComposedSchema(schema)) {\n      const decomposed = decomposeSchema(schema);\n\n      if (decomposed.length > 2) {\n        logger.debug(\n          schema,\n          `Schema for '${this.#fullyQualifiedName}' has more than two components. This plugin will ignore it.`,\n        );\n        return undefined;\n      }\n\n      const [parent, child] = decomposed;\n\n      if (!isReferenceSchema(parent)) {\n        logger.debug(parent, 'Only reference schema allowed for parent class');\n        return undefined;\n      }\n\n      const declaration = this.#processClass(child);\n      const identifier = this.#processParentClass(parent);\n\n      return (\n        declaration &&\n        ts.factory.updateInterfaceDeclaration(\n          declaration,\n          declaration.modifiers,\n          declaration.name,\n          declaration.typeParameters,\n          [\n            ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [\n              ts.factory.createExpressionWithTypeArguments(identifier, undefined),\n            ]),\n          ],\n          declaration.members,\n        )\n      );\n    }\n\n    return this.#processClass(schema);\n  }\n\n  #processParentClass(schema: ReferenceSchema): Identifier {\n    const { imports, paths } = this.#dependencies;\n\n    const specifier = convertReferenceSchemaToSpecifier(schema);\n    const path = paths.createRelativePath(convertReferenceSchemaToPath(schema));\n\n    return imports.default.getIdentifier(path) ?? imports.default.add(path, specifier, true);\n  }\n\n  #processTypeElements({ properties }: ObjectSchema): readonly TypeElement[] {\n    return Object.entries(properties ?? {}).map(([name, schema]) => {\n      const [type] = new TypeSchemaProcessor(schema, this.#dependencies, this.#transferTypes).process();\n\n      return ts.factory.createPropertySignature(\n        undefined,\n        name,\n        isNullableSchema(schema) ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) : undefined,\n        type,\n      );\n    });\n  }\n\n  static #processTypeParameters(schema: Schema): readonly TypeParameterDeclaration[] | undefined {\n    return findTypeParameters(schema)\n      ?.map(String)\n      .map((name) =>\n        ts.factory.createTypeParameterDeclaration(\n          undefined,\n          name,\n          undefined,\n          ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),\n        ),\n      );\n  }\n}\n"],"version":3}

package/TypeSchemaProcessor.d.ts

@@ -1,10 +1,10 @@
-import { type Schema } from '@vaadin/hilla-generator-core/Schema.js';
-import type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';
-import { type TypeNode } from 'typescript';
+import { type Schema } from "@vaadin/hilla-generator-core/Schema.js";
+import type { TransferTypeMaker } from "@vaadin/hilla-generator-core/SharedStorage.js";
+import type DependencyManager from "@vaadin/hilla-generator-utils/dependencies/DependencyManager.js";
+import { type TypeNode } from "typescript";
 export default class TypeSchemaProcessor {
-    #private;
-    ['constructor']: typeof TypeSchemaProcessor;
-    constructor(schema: Schema, dependencies: DependencyManager);
-    process(): readonly TypeNode[];
+	#private;
+	["constructor"]: typeof TypeSchemaProcessor;
+	constructor(schema: Schema, dependencies: DependencyManager, transferTypes: Map<string, TransferTypeMaker>);
+	process(): readonly TypeNode[];
 }
-//# sourceMappingURL=TypeSchemaProcessor.d.ts.map

package/TypeSchemaProcessor.js

@@ -1,102 +1,89 @@
-import {
-  convertReferenceSchemaToPath,
-  convertReferenceSchemaToSpecifier,
-  decomposeSchema,
-  isArraySchema,
-  isBooleanSchema,
-  isComposedSchema,
-  isIntegerSchema,
-  isMapSchema,
-  isNullableSchema,
-  isNumberSchema,
-  isReferenceSchema,
-  isStringSchema
-} from "@vaadin/hilla-generator-core/Schema.js";
-import ts, {} from "typescript";
+import { convertFullyQualifiedNameToRelativePath, convertReferenceSchemaToFullyQualifiedName, convertReferenceSchemaToSpecifier, decomposeSchema, isArraySchema, isBooleanSchema, isComposedSchema, isIntegerSchema, isMapSchema, isNullableSchema, isNumberSchema, isReferenceSchema, isStringSchema } from "@vaadin/hilla-generator-core/Schema.js";
+import ts from "typescript";
 import { findTypeArguments, findTypeVariable } from "./utils.js";
 function createBoolean() {
-  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
+	return ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
 }
 function createNumber() {
-  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
+	return ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
 }
 function createString() {
-  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+	return ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
 }
 function createUndefined() {
-  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword);
+	return ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword);
 }
 function createUnknown() {
-  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
+	return ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
 }
 function unwrapPossiblyNullableSchema(schema) {
-  if (isComposedSchema(schema)) {
-    const [result] = decomposeSchema(schema);
-    return result;
-  }
-  return schema;
+	if (isComposedSchema(schema)) {
+		const [result] = decomposeSchema(schema);
+		return result;
+	}
+	return schema;
 }
-class TypeSchemaProcessor {
-  #dependencies;
-  #schema;
-  constructor(schema, dependencies) {
-    this.#schema = schema;
-    this.#dependencies = dependencies;
-  }
-  process() {
-    let node;
-    const unwrappedSchema = unwrapPossiblyNullableSchema(this.#schema);
-    const typeVariable = findTypeVariable(this.#schema);
-    if (typeVariable) {
-      return [ts.factory.createTypeReferenceNode(typeVariable)];
-    }
-    if (isReferenceSchema(unwrappedSchema)) {
-      const typeArguments = this.#processTypeArguments(this.#schema);
-      node = this.#processReference(unwrappedSchema, typeArguments);
-    } else if (isArraySchema(unwrappedSchema)) {
-      node = this.#processArray(unwrappedSchema);
-    } else if (isMapSchema(unwrappedSchema)) {
-      node = this.#processMap(unwrappedSchema);
-    } else if (isBooleanSchema(unwrappedSchema)) {
-      node = createBoolean();
-    } else if (isIntegerSchema(unwrappedSchema) || isNumberSchema(unwrappedSchema)) {
-      node = createNumber();
-    } else if (isStringSchema(unwrappedSchema)) {
-      node = createString();
-    } else {
-      node = createUnknown();
-    }
-    return isNullableSchema(this.#schema) ? [node, createUndefined()] : [node];
-  }
-  #processArray(schema) {
-    const nodes = new TypeSchemaProcessor(schema.items, this.#dependencies).process();
-    return ts.factory.createTypeReferenceNode("Array", [ts.factory.createUnionTypeNode(nodes)]);
-  }
-  #processMap({ additionalProperties: valuesType }) {
-    let valuesTypeNode;
-    if (typeof valuesType !== "boolean") {
-      const nodes = new TypeSchemaProcessor(valuesType, this.#dependencies).process();
-      valuesTypeNode = ts.factory.createUnionTypeNode(nodes);
-    } else {
-      valuesTypeNode = ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
-    }
-    return ts.factory.createTypeReferenceNode("Record", [
-      ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-      valuesTypeNode
-    ]);
-  }
-  #processTypeArguments(schema) {
-    return findTypeArguments(schema)?.allOf.map((s) => new TypeSchemaProcessor(s, this.#dependencies).process()).map((t) => ts.factory.createUnionTypeNode(t));
-  }
-  #processReference(schema, typeArguments) {
-    const { imports, paths } = this.#dependencies;
-    const specifier = convertReferenceSchemaToSpecifier(schema);
-    const path = paths.createRelativePath(convertReferenceSchemaToPath(schema));
-    const identifier = imports.default.getIdentifier(path) ?? imports.default.add(path, specifier, true);
-    return ts.factory.createTypeReferenceNode(identifier, typeArguments);
-  }
+export default class TypeSchemaProcessor {
+	#dependencies;
+	#schema;
+	#transferTypes;
+	constructor(schema, dependencies, transferTypes) {
+		this.#schema = schema;
+		this.#dependencies = dependencies;
+		this.#transferTypes = transferTypes;
+	}
+	process() {
+		let node;
+		const unwrappedSchema = unwrapPossiblyNullableSchema(this.#schema);
+		const typeVariable = findTypeVariable(this.#schema);
+		if (typeVariable) {
+			return [ts.factory.createTypeReferenceNode(typeVariable)];
+		}
+		if (isReferenceSchema(unwrappedSchema)) {
+			const typeArguments = this.#processTypeArguments(this.#schema);
+			node = this.#processReference(unwrappedSchema, typeArguments);
+		} else if (isArraySchema(unwrappedSchema)) {
+			node = this.#processArray(unwrappedSchema);
+		} else if (isMapSchema(unwrappedSchema)) {
+			node = this.#processMap(unwrappedSchema);
+		} else if (isBooleanSchema(unwrappedSchema)) {
+			node = createBoolean();
+		} else if (isIntegerSchema(unwrappedSchema) || isNumberSchema(unwrappedSchema)) {
+			node = createNumber();
+		} else if (isStringSchema(unwrappedSchema)) {
+			node = createString();
+		} else {
+			node = createUnknown();
+		}
+		return isNullableSchema(this.#schema) ? [node, createUndefined()] : [node];
+	}
+	#processArray(schema) {
+		const nodes = new TypeSchemaProcessor(schema.items, this.#dependencies, this.#transferTypes).process();
+		return ts.factory.createTypeReferenceNode("Array", [ts.factory.createUnionTypeNode(nodes)]);
+	}
+	#processMap({ additionalProperties: valuesType }) {
+		let valuesTypeNode;
+		if (typeof valuesType !== "boolean") {
+			const nodes = new TypeSchemaProcessor(valuesType, this.#dependencies, this.#transferTypes).process();
+			valuesTypeNode = ts.factory.createUnionTypeNode(nodes);
+		} else {
+			valuesTypeNode = ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
+		}
+		return ts.factory.createTypeReferenceNode("Record", [ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), valuesTypeNode]);
+	}
+	#processTypeArguments(schema) {
+		return findTypeArguments(schema)?.allOf.map((s) => new TypeSchemaProcessor(s, this.#dependencies, this.#transferTypes).process()).map((t) => ts.factory.createUnionTypeNode(t));
+	}
+	#processReference(schema, typeArguments) {
+		const { imports, paths } = this.#dependencies;
+		const fullyQualifiedName = convertReferenceSchemaToFullyQualifiedName(schema);
+		if (this.#transferTypes.has(fullyQualifiedName)) {
+			return this.#transferTypes.get(fullyQualifiedName)(typeArguments);
+		}
+		const specifier = convertReferenceSchemaToSpecifier(schema);
+		const path = paths.createRelativePath(convertFullyQualifiedNameToRelativePath(fullyQualifiedName));
+		const identifier = imports.default.getIdentifier(path) ?? imports.default.add(path, specifier, true);
+		return ts.factory.createTypeReferenceNode(identifier, typeArguments);
+	}
 }
-export {
-  TypeSchemaProcessor as default
-};
-//# sourceMappingURL=TypeSchemaProcessor.js.map
+//# sourceMappingURL=./TypeSchemaProcessor.js.map