@vaadin/hilla-generator-plugin-backbone 24.6.5 → 24.7.0-alpha11

package/EndpointMethodOperationProcessor.d.ts

@@ -1,13 +1,11 @@
 import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';
+import type { TransferTypes } from '@vaadin/hilla-generator-core/SharedStorage.js';
 import type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';
 import { OpenAPIV3 } from 'openapi-types';
-import type { ReadonlyDeep } from 'type-fest';
 import { type Statement } from 'typescript';
-export type EndpointMethodOperation = ReadonlyDeep<OpenAPIV3.OperationObject>;
-export declare const INIT_TYPE_NAME = "EndpointRequestInit";
-export declare const HILLA_FRONTEND_NAME = "@vaadin/hilla-frontend";
+export type EndpointMethodOperation = OpenAPIV3.OperationObject;
 export default abstract class EndpointMethodOperationProcessor {
-    static createProcessor(httpMethod: OpenAPIV3.HttpMethods, endpointName: string, endpointMethodName: string, operation: EndpointMethodOperation, dependencies: DependencyManager, owner: Plugin): EndpointMethodOperationProcessor | undefined;
+    static createProcessor(httpMethod: OpenAPIV3.HttpMethods, endpointName: string, endpointMethodName: string, operation: EndpointMethodOperation, dependencies: DependencyManager, transferTypes: TransferTypes, owner: Plugin): EndpointMethodOperationProcessor | undefined;
     abstract process(outputDir?: string): Promise<Statement | undefined>;
 }
 //# sourceMappingURL=EndpointMethodOperationProcessor.d.ts.map

package/EndpointMethodOperationProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EndpointMethodOperationProcessor.d.ts","sourceRoot":"","sources":["src/EndpointMethodOperationProcessor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AAEjE,OAAO,KAAK,iBAAiB,MAAM,iEAAiE,CAAC;AAErG,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAW,EAAmB,KAAK,SAAS,EAAiB,MAAM,YAAY,CAAC;AAIhF,MAAM,MAAM,uBAAuB,GAAG,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AAE9E,eAAO,MAAM,cAAc,wBAAwB,CAAC;AACpD,eAAO,MAAM,mBAAmB,2BAA2B,CAAC;AAE5D,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gCAAgC;IAC5D,MAAM,CAAC,eAAe,CACpB,UAAU,EAAE,SAAS,CAAC,WAAW,EACjC,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,uBAAuB,EAClC,YAAY,EAAE,iBAAiB,EAC/B,KAAK,EAAE,MAAM,GACZ,gCAAgC,GAAG,SAAS;IAiB/C,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CACrE"}
+{"version":3,"file":"EndpointMethodOperationProcessor.d.ts","sourceRoot":"","sources":["src/EndpointMethodOperationProcessor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAEnF,OAAO,KAAK,iBAAiB,MAAM,iEAAiE,CAAC;AAErG,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAW,EAAmB,KAAK,SAAS,EAAiB,MAAM,YAAY,CAAC;AAIhF,MAAM,MAAM,uBAAuB,GAAG,SAAS,CAAC,eAAe,CAAC;AAEhE,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gCAAgC;IAE5D,MAAM,CAAC,eAAe,CACpB,UAAU,EAAE,SAAS,CAAC,WAAW,EACjC,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,uBAAuB,EAClC,YAAY,EAAE,iBAAiB,EAC/B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,MAAM,GACZ,gCAAgC,GAAG,SAAS;IAmB/C,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CACrE"}

package/EndpointMethodOperationProcessor.js

@@ -4,19 +4,20 @@ import { OpenAPIV3 } from "openapi-types";
 import ts, {} from "typescript";
 import EndpointMethodRequestBodyProcessor from "./EndpointMethodRequestBodyProcessor.js";
 import EndpointMethodResponseProcessor from "./EndpointMethodResponseProcessor.js";
-const INIT_TYPE_NAME = "EndpointRequestInit";
-const HILLA_FRONTEND_NAME = "@vaadin/hilla-frontend";
 class EndpointMethodOperationProcessor {
-  static createProcessor(httpMethod, endpointName, endpointMethodName, operation, dependencies, owner) {
+  // eslint-disable-next-line @typescript-eslint/max-params
+  static createProcessor(httpMethod, endpointName, endpointMethodName, operation, dependencies, transferTypes, owner) {
     switch (httpMethod) {
-      case OpenAPIV3.HttpMethods.POST:
+      case OpenAPIV3.HttpMethods.POST: {
         return new EndpointMethodOperationPOSTProcessor(
           endpointName,
           endpointMethodName,
           operation,
           dependencies,
+          transferTypes,
           owner
         );
+      }
       default:
         owner.logger.warn(`Processing ${httpMethod.toUpperCase()} currently is not supported`);
         return void 0;
@@ -25,30 +26,29 @@ class EndpointMethodOperationProcessor {
 }
 class EndpointMethodOperationPOSTProcessor extends EndpointMethodOperationProcessor {
   #dependencies;
+  #transferTypes;
   #endpointMethodName;
   #endpointName;
   #operation;
   #owner;
-  constructor(endpointName, endpointMethodName, operation, dependencies, owner) {
+  // eslint-disable-next-line @typescript-eslint/max-params
+  constructor(endpointName, endpointMethodName, operation, dependencies, transferTypes, owner) {
     super();
     this.#owner = owner;
     this.#dependencies = dependencies;
     this.#endpointName = endpointName;
     this.#endpointMethodName = endpointMethodName;
     this.#operation = operation;
+    this.#transferTypes = transferTypes;
   }
   async process(outputDir) {
     const { exports, imports, paths } = this.#dependencies;
     this.#owner.logger.debug(`${this.#endpointName}.${this.#endpointMethodName} - processing POST method`);
-    const initTypeIdentifier = imports.named.getIdentifier(
-      paths.createBareModulePath(HILLA_FRONTEND_NAME),
-      INIT_TYPE_NAME
-    );
     const { initParam, packedParameters, parameters } = new EndpointMethodRequestBodyProcessor(
       this.#operation.requestBody,
       this.#dependencies,
-      this.#owner,
-      initTypeIdentifier
+      this.#transferTypes,
+      this.#owner
     ).process();
     const methodIdentifier = exports.named.add(this.#endpointMethodName);
     const clientLibIdentifier = imports.default.getIdentifier(
@@ -78,7 +78,13 @@ class EndpointMethodOperationPOSTProcessor extends EndpointMethodOperationProces
   #prepareResponseType() {
     this.#owner.logger.debug(`${this.#endpointName}.${this.#endpointMethodName} POST - processing response type`);
     const responseTypes = Object.entries(this.#operation.responses).flatMap(
-      ([code, response]) => new EndpointMethodResponseProcessor(code, response, this.#dependencies, this.#owner).process()
+      ([code, response]) => new EndpointMethodResponseProcessor(
+        code,
+        response,
+        this.#dependencies,
+        this.#transferTypes,
+        this.#owner
+      ).process()
     ).filter((value, index, arr) => arr.findIndex((v) => equal(v, value)) === index);
     if (responseTypes.length === 0) {
       return ts.factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
@@ -87,8 +93,6 @@ class EndpointMethodOperationPOSTProcessor extends EndpointMethodOperationProces
   }
 }
 export {
-  HILLA_FRONTEND_NAME,
-  INIT_TYPE_NAME,
   EndpointMethodOperationProcessor as default
 };
 //# sourceMappingURL=EndpointMethodOperationProcessor.js.map

package/EndpointMethodOperationProcessor.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["src/EndpointMethodOperationProcessor.ts"],
-  "sourcesContent": ["/* eslint-disable max-params */\nimport type Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport ClientPlugin from '@vaadin/hilla-generator-plugin-client';\nimport type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport equal from 'fast-deep-equal';\nimport { OpenAPIV3 } from 'openapi-types';\nimport type { ReadonlyDeep } from 'type-fest';\nimport ts, { type Expression, type Statement, type TypeNode } from 'typescript';\nimport EndpointMethodRequestBodyProcessor from './EndpointMethodRequestBodyProcessor.js';\nimport EndpointMethodResponseProcessor from './EndpointMethodResponseProcessor.js';\n\nexport type EndpointMethodOperation = ReadonlyDeep<OpenAPIV3.OperationObject>;\n\nexport const INIT_TYPE_NAME = 'EndpointRequestInit';\nexport const HILLA_FRONTEND_NAME = '@vaadin/hilla-frontend';\n\nexport default abstract class EndpointMethodOperationProcessor {\n  static createProcessor(\n    httpMethod: OpenAPIV3.HttpMethods,\n    endpointName: string,\n    endpointMethodName: string,\n    operation: EndpointMethodOperation,\n    dependencies: DependencyManager,\n    owner: Plugin,\n  ): EndpointMethodOperationProcessor | undefined {\n    switch (httpMethod) {\n      case OpenAPIV3.HttpMethods.POST:\n        // eslint-disable-next-line @typescript-eslint/no-use-before-define\n        return new EndpointMethodOperationPOSTProcessor(\n          endpointName,\n          endpointMethodName,\n          operation,\n          dependencies,\n          owner,\n        );\n      default:\n        owner.logger.warn(`Processing ${httpMethod.toUpperCase()} currently is not supported`);\n        return undefined;\n    }\n  }\n\n  abstract process(outputDir?: string): Promise<Statement | undefined>;\n}\n\nclass EndpointMethodOperationPOSTProcessor extends EndpointMethodOperationProcessor {\n  readonly #dependencies: DependencyManager;\n  readonly #endpointMethodName: string;\n  readonly #endpointName: string;\n  readonly #operation: EndpointMethodOperation;\n  readonly #owner: Plugin;\n\n  constructor(\n    endpointName: string,\n    endpointMethodName: string,\n    operation: EndpointMethodOperation,\n    dependencies: DependencyManager,\n    owner: Plugin,\n  ) {\n    super();\n    this.#owner = owner;\n    this.#dependencies = dependencies;\n    this.#endpointName = endpointName;\n    this.#endpointMethodName = endpointMethodName;\n    this.#operation = operation;\n  }\n\n  async process(outputDir?: string): Promise<Statement | undefined> {\n    const { exports, imports, paths } = this.#dependencies;\n    this.#owner.logger.debug(`${this.#endpointName}.${this.#endpointMethodName} - processing POST method`);\n    const initTypeIdentifier = imports.named.getIdentifier(\n      paths.createBareModulePath(HILLA_FRONTEND_NAME),\n      INIT_TYPE_NAME,\n    )!;\n\n    const { initParam, packedParameters, parameters } = new EndpointMethodRequestBodyProcessor(\n      this.#operation.requestBody,\n      this.#dependencies,\n      this.#owner,\n      initTypeIdentifier,\n    ).process();\n\n    const methodIdentifier = exports.named.add(this.#endpointMethodName);\n    const clientLibIdentifier = imports.default.getIdentifier(\n      paths.createRelativePath(await ClientPlugin.getClientFileName(outputDir)),\n    )!;\n\n    const callExpression = ts.factory.createCallExpression(\n      ts.factory.createPropertyAccessExpression(clientLibIdentifier, ts.factory.createIdentifier('call')),\n      undefined,\n      [\n        ts.factory.createStringLiteral(this.#endpointName),\n        ts.factory.createStringLiteral(this.#endpointMethodName),\n        packedParameters,\n        initParam,\n      ].filter(Boolean) as readonly Expression[],\n    );\n\n    const responseType = this.#prepareResponseType();\n\n    return ts.factory.createFunctionDeclaration(\n      [ts.factory.createToken(ts.SyntaxKind.AsyncKeyword)],\n      undefined,\n      methodIdentifier,\n      undefined,\n      parameters,\n      ts.factory.createTypeReferenceNode('Promise', [responseType]),\n      ts.factory.createBlock([ts.factory.createReturnStatement(callExpression)]),\n    );\n  }\n\n  #prepareResponseType(): TypeNode {\n    this.#owner.logger.debug(`${this.#endpointName}.${this.#endpointMethodName} POST - processing response type`);\n\n    const responseTypes = Object.entries(this.#operation.responses)\n      .flatMap(([code, response]) =>\n        new EndpointMethodResponseProcessor(code, response, this.#dependencies, this.#owner).process(),\n      )\n      .filter((value, index, arr) => arr.findIndex((v) => equal(v, value)) === index);\n\n    if (responseTypes.length === 0) {\n      return ts.factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);\n    }\n\n    return ts.factory.createUnionTypeNode(responseTypes);\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable max-params */\nimport type Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport type { TransferTypes } from '@vaadin/hilla-generator-core/SharedStorage.js';\nimport ClientPlugin from '@vaadin/hilla-generator-plugin-client';\nimport type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport equal from 'fast-deep-equal';\nimport { OpenAPIV3 } from 'openapi-types';\nimport ts, { type Expression, type Statement, type TypeNode } from 'typescript';\nimport EndpointMethodRequestBodyProcessor from './EndpointMethodRequestBodyProcessor.js';\nimport EndpointMethodResponseProcessor from './EndpointMethodResponseProcessor.js';\n\nexport type EndpointMethodOperation = OpenAPIV3.OperationObject;\n\nexport default abstract class EndpointMethodOperationProcessor {\n  // eslint-disable-next-line @typescript-eslint/max-params\n  static createProcessor(\n    httpMethod: OpenAPIV3.HttpMethods,\n    endpointName: string,\n    endpointMethodName: string,\n    operation: EndpointMethodOperation,\n    dependencies: DependencyManager,\n    transferTypes: TransferTypes,\n    owner: Plugin,\n  ): EndpointMethodOperationProcessor | undefined {\n    switch (httpMethod) {\n      case OpenAPIV3.HttpMethods.POST: {\n        // eslint-disable-next-line @typescript-eslint/no-use-before-define\n        return new EndpointMethodOperationPOSTProcessor(\n          endpointName,\n          endpointMethodName,\n          operation,\n          dependencies,\n          transferTypes,\n          owner,\n        );\n      }\n      default:\n        owner.logger.warn(`Processing ${httpMethod.toUpperCase()} currently is not supported`);\n        return undefined;\n    }\n  }\n\n  abstract process(outputDir?: string): Promise<Statement | undefined>;\n}\n\nclass EndpointMethodOperationPOSTProcessor extends EndpointMethodOperationProcessor {\n  readonly #dependencies: DependencyManager;\n  readonly #transferTypes: TransferTypes;\n  readonly #endpointMethodName: string;\n  readonly #endpointName: string;\n  readonly #operation: EndpointMethodOperation;\n  readonly #owner: Plugin;\n\n  // eslint-disable-next-line @typescript-eslint/max-params\n  constructor(\n    endpointName: string,\n    endpointMethodName: string,\n    operation: EndpointMethodOperation,\n    dependencies: DependencyManager,\n    transferTypes: TransferTypes,\n    owner: Plugin,\n  ) {\n    super();\n    this.#owner = owner;\n    this.#dependencies = dependencies;\n    this.#endpointName = endpointName;\n    this.#endpointMethodName = endpointMethodName;\n    this.#operation = operation;\n    this.#transferTypes = transferTypes;\n  }\n\n  async process(outputDir?: string): Promise<Statement | undefined> {\n    const { exports, imports, paths } = this.#dependencies;\n    this.#owner.logger.debug(`${this.#endpointName}.${this.#endpointMethodName} - processing POST method`);\n\n    const { initParam, packedParameters, parameters } = new EndpointMethodRequestBodyProcessor(\n      this.#operation.requestBody,\n      this.#dependencies,\n      this.#transferTypes,\n      this.#owner,\n    ).process();\n\n    const methodIdentifier = exports.named.add(this.#endpointMethodName);\n    const clientLibIdentifier = imports.default.getIdentifier(\n      paths.createRelativePath(await ClientPlugin.getClientFileName(outputDir)),\n    )!;\n\n    const callExpression = ts.factory.createCallExpression(\n      ts.factory.createPropertyAccessExpression(clientLibIdentifier, ts.factory.createIdentifier('call')),\n      undefined,\n      [\n        ts.factory.createStringLiteral(this.#endpointName),\n        ts.factory.createStringLiteral(this.#endpointMethodName),\n        packedParameters,\n        initParam,\n      ].filter(Boolean) as readonly Expression[],\n    );\n\n    const responseType = this.#prepareResponseType();\n\n    return ts.factory.createFunctionDeclaration(\n      [ts.factory.createToken(ts.SyntaxKind.AsyncKeyword)],\n      undefined,\n      methodIdentifier,\n      undefined,\n      parameters,\n      ts.factory.createTypeReferenceNode('Promise', [responseType]),\n      ts.factory.createBlock([ts.factory.createReturnStatement(callExpression)]),\n    );\n  }\n\n  #prepareResponseType(): TypeNode {\n    this.#owner.logger.debug(`${this.#endpointName}.${this.#endpointMethodName} POST - processing response type`);\n\n    const responseTypes = Object.entries(this.#operation.responses)\n      .flatMap(([code, response]) =>\n        new EndpointMethodResponseProcessor(\n          code,\n          response,\n          this.#dependencies,\n          this.#transferTypes,\n          this.#owner,\n        ).process(),\n      )\n      .filter((value, index, arr) => arr.findIndex((v) => equal(v, value)) === index);\n\n    if (responseTypes.length === 0) {\n      return ts.factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);\n    }\n\n    return ts.factory.createUnionTypeNode(responseTypes);\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/EndpointMethodRequestBodyProcessor.d.ts

@@ -1,17 +1,17 @@
 import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';
+import type { TransferTypes } from '@vaadin/hilla-generator-core/SharedStorage.js';
 import type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';
 import type { OpenAPIV3 } from 'openapi-types';
-import type { ReadonlyDeep } from 'type-fest';
-import ts, { type ObjectLiteralExpression, type ParameterDeclaration } from 'typescript';
-export type EndpointMethodRequestBody = ReadonlyDeep<OpenAPIV3.RequestBodyObject>;
+import { type Identifier, type ObjectLiteralExpression, type ParameterDeclaration } from 'typescript';
+export type EndpointMethodRequestBody = OpenAPIV3.RequestBodyObject;
 export type EndpointMethodRequestBodyProcessingResult = Readonly<{
     parameters: readonly ParameterDeclaration[];
     packedParameters?: ObjectLiteralExpression;
-    initParam: ts.Identifier;
+    initParam: Identifier;
 }>;
 export default class EndpointMethodRequestBodyProcessor {
     #private;
-    constructor(requestBody: ReadonlyDeep<OpenAPIV3.ReferenceObject | OpenAPIV3.RequestBodyObject> | undefined, dependencies: DependencyManager, owner: Plugin, initTypeIdentifier: ts.Identifier);
+    constructor(requestBody: OpenAPIV3.ReferenceObject | OpenAPIV3.RequestBodyObject | undefined, dependencies: DependencyManager, transferTypes: TransferTypes, owner: Plugin);
     process(): EndpointMethodRequestBodyProcessingResult;
 }
 //# sourceMappingURL=EndpointMethodRequestBodyProcessor.d.ts.map

package/EndpointMethodRequestBodyProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EndpointMethodRequestBodyProcessor.d.ts","sourceRoot":"","sources":["src/EndpointMethodRequestBodyProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AAOjE,OAAO,KAAK,iBAAiB,MAAM,iEAAiE,CAAC;AACrG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,EAAE,EAAE,KAAK,uBAAuB,EAAE,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAIzF,MAAM,MAAM,yBAAyB,GAAG,YAAY,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;AAElF,MAAM,MAAM,yCAAyC,GAAG,QAAQ,CAAC;IAC/D,UAAU,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAC5C,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;IAC3C,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC;CAC1B,CAAC,CAAC;AAEH,MAAM,CAAC,OAAO,OAAO,kCAAkC;;gBASnD,WAAW,EAAE,YAAY,CAAC,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,iBAAiB,CAAC,GAAG,SAAS,EAC9F,YAAY,EAAE,iBAAiB,EAC/B,KAAK,EAAE,MAAM,EACb,kBAAkB,EAAE,EAAE,CAAC,UAAU;IAQnC,OAAO,IAAI,yCAAyC;CAuErD"}
+{"version":3,"file":"EndpointMethodRequestBodyProcessor.d.ts","sourceRoot":"","sources":["src/EndpointMethodRequestBodyProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AAOjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,KAAK,iBAAiB,MAAM,iEAAiE,CAAC;AACrG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAW,EAAE,KAAK,UAAU,EAAE,KAAK,uBAAuB,EAAE,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAI1G,MAAM,MAAM,yBAAyB,GAAG,SAAS,CAAC,iBAAiB,CAAC;AAEpE,MAAM,MAAM,yCAAyC,GAAG,QAAQ,CAAC;IAC/D,UAAU,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAC5C,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;IAC3C,SAAS,EAAE,UAAU,CAAC;CACvB,CAAC,CAAC;AAMH,MAAM,CAAC,OAAO,OAAO,kCAAkC;;gBAOnD,WAAW,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,iBAAiB,GAAG,SAAS,EAChF,YAAY,EAAE,iBAAiB,EAC/B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,MAAM;IAQf,OAAO,IAAI,yCAAyC;CA4ErD"}

package/EndpointMethodRequestBodyProcessor.js

@@ -5,37 +5,42 @@ import {
 import ts, {} from "typescript";
 import TypeSchemaProcessor from "./TypeSchemaProcessor.js";
 import { defaultMediaType } from "./utils.js";
+const DEFAULT_INIT_PARAM_NAME = "init";
+const INIT_TYPE_NAME = "EndpointRequestInit";
+const HILLA_FRONTEND_NAME = "@vaadin/hilla-frontend";
 class EndpointMethodRequestBodyProcessor {
-  static #defaultInitParamName = "init";
   #dependencies;
+  #transferTypes;
   #owner;
   #requestBody;
-  #initTypeIdentifier;
-  constructor(requestBody, dependencies, owner, initTypeIdentifier) {
+  constructor(requestBody, dependencies, transferTypes, owner) {
     this.#owner = owner;
     this.#dependencies = dependencies;
     this.#requestBody = requestBody ? owner.resolver.resolve(requestBody) : void 0;
-    this.#initTypeIdentifier = initTypeIdentifier;
+    this.#transferTypes = transferTypes;
   }
   process() {
+    const { imports, paths } = this.#dependencies;
+    const path = paths.createBareModulePath(HILLA_FRONTEND_NAME);
+    const initTypeIdentifier = imports.named.getIdentifier(path, INIT_TYPE_NAME) ?? imports.named.add(path, INIT_TYPE_NAME);
     if (!this.#requestBody) {
       return {
-        initParam: ts.factory.createIdentifier(EndpointMethodRequestBodyProcessor.#defaultInitParamName),
+        initParam: ts.factory.createIdentifier(DEFAULT_INIT_PARAM_NAME),
         packedParameters: ts.factory.createObjectLiteralExpression(),
         parameters: [
           ts.factory.createParameterDeclaration(
             void 0,
             void 0,
-            EndpointMethodRequestBodyProcessor.#defaultInitParamName,
+            DEFAULT_INIT_PARAM_NAME,
             ts.factory.createToken(ts.SyntaxKind.QuestionToken),
-            ts.factory.createTypeReferenceNode(this.#initTypeIdentifier)
+            ts.factory.createTypeReferenceNode(initTypeIdentifier)
           )
         ]
       };
     }
     const parameterData = this.#extractParameterData(this.#requestBody.content[defaultMediaType].schema);
     const parameterNames = parameterData.map(([name]) => name);
-    let initParamName = EndpointMethodRequestBodyProcessor.#defaultInitParamName;
+    let initParamName = DEFAULT_INIT_PARAM_NAME;
     while (parameterNames.includes(initParamName)) {
       initParamName = `_${initParamName}`;
     }
@@ -46,7 +51,7 @@ class EndpointMethodRequestBodyProcessor {
       ),
       parameters: [
         ...parameterData.map(([name, schema]) => {
-          const nodes = new TypeSchemaProcessor(schema, this.#dependencies).process();
+          const nodes = new TypeSchemaProcessor(schema, this.#dependencies, this.#transferTypes).process();
           return ts.factory.createParameterDeclaration(
             void 0,
             void 0,
@@ -60,7 +65,7 @@ class EndpointMethodRequestBodyProcessor {
           void 0,
           initParamName,
           ts.factory.createToken(ts.SyntaxKind.QuestionToken),
-          ts.factory.createTypeReferenceNode(this.#initTypeIdentifier)
+          ts.factory.createTypeReferenceNode(initTypeIdentifier)
         )
       ]
     };

package/EndpointMethodRequestBodyProcessor.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["src/EndpointMethodRequestBodyProcessor.ts"],
-  "sourcesContent": ["import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport {\n  isEmptyObject,\n  isObjectSchema,\n  type NonEmptyObjectSchema,\n  type Schema,\n} from '@vaadin/hilla-generator-core/Schema.js';\nimport type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport type { OpenAPIV3 } from 'openapi-types';\nimport type { ReadonlyDeep } from 'type-fest';\nimport ts, { type ObjectLiteralExpression, type ParameterDeclaration } from 'typescript';\nimport TypeSchemaProcessor from './TypeSchemaProcessor.js';\nimport { defaultMediaType } from './utils.js';\n\nexport type EndpointMethodRequestBody = ReadonlyDeep<OpenAPIV3.RequestBodyObject>;\n\nexport type EndpointMethodRequestBodyProcessingResult = Readonly<{\n  parameters: readonly ParameterDeclaration[];\n  packedParameters?: ObjectLiteralExpression;\n  initParam: ts.Identifier;\n}>;\n\nexport default class EndpointMethodRequestBodyProcessor {\n  static readonly #defaultInitParamName = 'init';\n\n  readonly #dependencies: DependencyManager;\n  readonly #owner: Plugin;\n  readonly #requestBody?: EndpointMethodRequestBody;\n  readonly #initTypeIdentifier: ts.Identifier;\n\n  constructor(\n    requestBody: ReadonlyDeep<OpenAPIV3.ReferenceObject | OpenAPIV3.RequestBodyObject> | undefined,\n    dependencies: DependencyManager,\n    owner: Plugin,\n    initTypeIdentifier: ts.Identifier,\n  ) {\n    this.#owner = owner;\n    this.#dependencies = dependencies;\n    this.#requestBody = requestBody ? owner.resolver.resolve(requestBody) : undefined;\n    this.#initTypeIdentifier = initTypeIdentifier;\n  }\n\n  process(): EndpointMethodRequestBodyProcessingResult {\n    if (!this.#requestBody) {\n      return {\n        initParam: ts.factory.createIdentifier(EndpointMethodRequestBodyProcessor.#defaultInitParamName),\n        packedParameters: ts.factory.createObjectLiteralExpression(),\n        parameters: [\n          ts.factory.createParameterDeclaration(\n            undefined,\n            undefined,\n            EndpointMethodRequestBodyProcessor.#defaultInitParamName,\n            ts.factory.createToken(ts.SyntaxKind.QuestionToken),\n            ts.factory.createTypeReferenceNode(this.#initTypeIdentifier),\n          ),\n        ],\n      };\n    }\n\n    const parameterData = this.#extractParameterData(this.#requestBody.content[defaultMediaType].schema);\n    const parameterNames = parameterData.map(([name]) => name);\n    let initParamName = EndpointMethodRequestBodyProcessor.#defaultInitParamName;\n\n    while (parameterNames.includes(initParamName)) {\n      initParamName = `_${initParamName}`;\n    }\n\n    return {\n      initParam: ts.factory.createIdentifier(initParamName),\n      packedParameters: ts.factory.createObjectLiteralExpression(\n        parameterData.map(([name]) => ts.factory.createShorthandPropertyAssignment(name)),\n      ),\n      parameters: [\n        ...parameterData.map(([name, schema]) => {\n          const nodes = new TypeSchemaProcessor(schema, this.#dependencies).process();\n\n          return ts.factory.createParameterDeclaration(\n            undefined,\n            undefined,\n            name,\n            undefined,\n            ts.factory.createUnionTypeNode(nodes),\n          );\n        }),\n        ts.factory.createParameterDeclaration(\n          undefined,\n          undefined,\n          initParamName,\n          ts.factory.createToken(ts.SyntaxKind.QuestionToken),\n          ts.factory.createTypeReferenceNode(this.#initTypeIdentifier),\n        ),\n      ],\n    };\n  }\n\n  #extractParameterData(\n    basicSchema?: ReadonlyDeep<OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject>,\n  ): Array<readonly [string, Schema]> {\n    if (!basicSchema) {\n      return [];\n    }\n\n    const { logger, resolver } = this.#owner;\n\n    const resolvedSchema = resolver.resolve(basicSchema);\n\n    if (isObjectSchema(resolvedSchema) && !isEmptyObject(resolvedSchema)) {\n      return Object.entries((resolvedSchema as NonEmptyObjectSchema).properties);\n    }\n\n    logger.warn(\"A schema provided for endpoint method's 'requestBody' is not supported\");\n    return [];\n  }\n}\n"],
-  "mappings": "AACA;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AAIP,OAAO,YAAqE;AAC5E,OAAO,yBAAyB;AAChC,SAAS,wBAAwB;AAUjC,MAAO,mCAAiD;AAAA,EACtD,OAAgB,wBAAwB;AAAA,EAE/B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAET,YACE,aACA,cACA,OACA,oBACA;AACA,SAAK,SAAS;AACd,SAAK,gBAAgB;AACrB,SAAK,eAAe,cAAc,MAAM,SAAS,QAAQ,WAAW,IAAI;AACxE,SAAK,sBAAsB;AAAA,EAC7B;AAAA,EAEA,UAAqD;AACnD,QAAI,CAAC,KAAK,cAAc;AACtB,aAAO;AAAA,QACL,WAAW,GAAG,QAAQ,iBAAiB,mCAAmC,qBAAqB;AAAA,QAC/F,kBAAkB,GAAG,QAAQ,8BAA8B;AAAA,QAC3D,YAAY;AAAA,UACV,GAAG,QAAQ;AAAA,YACT;AAAA,YACA;AAAA,YACA,mCAAmC;AAAA,YACnC,GAAG,QAAQ,YAAY,GAAG,WAAW,aAAa;AAAA,YAClD,GAAG,QAAQ,wBAAwB,KAAK,mBAAmB;AAAA,UAC7D;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,UAAM,gBAAgB,KAAK,sBAAsB,KAAK,aAAa,QAAQ,gBAAgB,EAAE,MAAM;AACnG,UAAM,iBAAiB,cAAc,IAAI,CAAC,CAAC,IAAI,MAAM,IAAI;AACzD,QAAI,gBAAgB,mCAAmC;AAEvD,WAAO,eAAe,SAAS,aAAa,GAAG;AAC7C,sBAAgB,IAAI,aAAa;AAAA,IACnC;AAEA,WAAO;AAAA,MACL,WAAW,GAAG,QAAQ,iBAAiB,aAAa;AAAA,MACpD,kBAAkB,GAAG,QAAQ;AAAA,QAC3B,cAAc,IAAI,CAAC,CAAC,IAAI,MAAM,GAAG,QAAQ,kCAAkC,IAAI,CAAC;AAAA,MAClF;AAAA,MACA,YAAY;AAAA,QACV,GAAG,cAAc,IAAI,CAAC,CAAC,MAAM,MAAM,MAAM;AACvC,gBAAM,QAAQ,IAAI,oBAAoB,QAAQ,KAAK,aAAa,EAAE,QAAQ;AAE1E,iBAAO,GAAG,QAAQ;AAAA,YAChB;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA,GAAG,QAAQ,oBAAoB,KAAK;AAAA,UACtC;AAAA,QACF,CAAC;AAAA,QACD,GAAG,QAAQ;AAAA,UACT;AAAA,UACA;AAAA,UACA;AAAA,UACA,GAAG,QAAQ,YAAY,GAAG,WAAW,aAAa;AAAA,UAClD,GAAG,QAAQ,wBAAwB,KAAK,mBAAmB;AAAA,QAC7D;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,sBACE,aACkC;AAClC,QAAI,CAAC,aAAa;AAChB,aAAO,CAAC;AAAA,IACV;AAEA,UAAM,EAAE,QAAQ,SAAS,IAAI,KAAK;AAElC,UAAM,iBAAiB,SAAS,QAAQ,WAAW;AAEnD,QAAI,eAAe,cAAc,KAAK,CAAC,cAAc,cAAc,GAAG;AACpE,aAAO,OAAO,QAAS,eAAwC,UAAU;AAAA,IAC3E;AAEA,WAAO,KAAK,wEAAwE;AACpF,WAAO,CAAC;AAAA,EACV;AACF;",
+  "sourcesContent": ["import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport {\n  isEmptyObject,\n  isObjectSchema,\n  type NonEmptyObjectSchema,\n  type Schema,\n} from '@vaadin/hilla-generator-core/Schema.js';\nimport type { TransferTypes } from '@vaadin/hilla-generator-core/SharedStorage.js';\nimport type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport type { OpenAPIV3 } from 'openapi-types';\nimport ts, { type Identifier, type ObjectLiteralExpression, type ParameterDeclaration } from 'typescript';\nimport TypeSchemaProcessor from './TypeSchemaProcessor.js';\nimport { defaultMediaType } from './utils.js';\n\nexport type EndpointMethodRequestBody = OpenAPIV3.RequestBodyObject;\n\nexport type EndpointMethodRequestBodyProcessingResult = Readonly<{\n  parameters: readonly ParameterDeclaration[];\n  packedParameters?: ObjectLiteralExpression;\n  initParam: Identifier;\n}>;\n\nconst DEFAULT_INIT_PARAM_NAME = 'init';\nconst INIT_TYPE_NAME = 'EndpointRequestInit';\nconst HILLA_FRONTEND_NAME = '@vaadin/hilla-frontend';\n\nexport default class EndpointMethodRequestBodyProcessor {\n  readonly #dependencies: DependencyManager;\n  readonly #transferTypes: TransferTypes;\n  readonly #owner: Plugin;\n  readonly #requestBody?: EndpointMethodRequestBody;\n\n  constructor(\n    requestBody: OpenAPIV3.ReferenceObject | OpenAPIV3.RequestBodyObject | undefined,\n    dependencies: DependencyManager,\n    transferTypes: TransferTypes,\n    owner: Plugin,\n  ) {\n    this.#owner = owner;\n    this.#dependencies = dependencies;\n    this.#requestBody = requestBody ? owner.resolver.resolve(requestBody) : undefined;\n    this.#transferTypes = transferTypes;\n  }\n\n  process(): EndpointMethodRequestBodyProcessingResult {\n    const { imports, paths } = this.#dependencies;\n    const path = paths.createBareModulePath(HILLA_FRONTEND_NAME);\n    const initTypeIdentifier =\n      imports.named.getIdentifier(path, INIT_TYPE_NAME) ?? imports.named.add(path, INIT_TYPE_NAME);\n\n    if (!this.#requestBody) {\n      return {\n        initParam: ts.factory.createIdentifier(DEFAULT_INIT_PARAM_NAME),\n        packedParameters: ts.factory.createObjectLiteralExpression(),\n        parameters: [\n          ts.factory.createParameterDeclaration(\n            undefined,\n            undefined,\n            DEFAULT_INIT_PARAM_NAME,\n            ts.factory.createToken(ts.SyntaxKind.QuestionToken),\n            ts.factory.createTypeReferenceNode(initTypeIdentifier),\n          ),\n        ],\n      };\n    }\n\n    const parameterData = this.#extractParameterData(this.#requestBody.content[defaultMediaType].schema);\n    const parameterNames = parameterData.map(([name]) => name);\n    let initParamName = DEFAULT_INIT_PARAM_NAME;\n\n    while (parameterNames.includes(initParamName)) {\n      initParamName = `_${initParamName}`;\n    }\n\n    return {\n      initParam: ts.factory.createIdentifier(initParamName),\n      packedParameters: ts.factory.createObjectLiteralExpression(\n        parameterData.map(([name]) => ts.factory.createShorthandPropertyAssignment(name)),\n      ),\n      parameters: [\n        ...parameterData.map(([name, schema]) => {\n          const nodes = new TypeSchemaProcessor(schema, this.#dependencies, this.#transferTypes).process();\n\n          return ts.factory.createParameterDeclaration(\n            undefined,\n            undefined,\n            name,\n            undefined,\n            ts.factory.createUnionTypeNode(nodes),\n          );\n        }),\n        ts.factory.createParameterDeclaration(\n          undefined,\n          undefined,\n          initParamName,\n          ts.factory.createToken(ts.SyntaxKind.QuestionToken),\n          ts.factory.createTypeReferenceNode(initTypeIdentifier),\n        ),\n      ],\n    };\n  }\n\n  #extractParameterData(\n    basicSchema?: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject,\n  ): Array<readonly [string, Schema]> {\n    if (!basicSchema) {\n      return [];\n    }\n\n    const { logger, resolver } = this.#owner;\n\n    const resolvedSchema = resolver.resolve(basicSchema);\n\n    if (isObjectSchema(resolvedSchema) && !isEmptyObject(resolvedSchema)) {\n      return Object.entries((resolvedSchema as NonEmptyObjectSchema).properties);\n    }\n\n    logger.warn(\"A schema provided for endpoint method's 'requestBody' is not supported\");\n    return [];\n  }\n}\n"],
+  "mappings": "AACA;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AAIP,OAAO,YAAsF;AAC7F,OAAO,yBAAyB;AAChC,SAAS,wBAAwB;AAUjC,MAAM,0BAA0B;AAChC,MAAM,iBAAiB;AACvB,MAAM,sBAAsB;AAE5B,MAAO,mCAAiD;AAAA,EAC7C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAET,YACE,aACA,cACA,eACA,OACA;AACA,SAAK,SAAS;AACd,SAAK,gBAAgB;AACrB,SAAK,eAAe,cAAc,MAAM,SAAS,QAAQ,WAAW,IAAI;AACxE,SAAK,iBAAiB;AAAA,EACxB;AAAA,EAEA,UAAqD;AACnD,UAAM,EAAE,SAAS,MAAM,IAAI,KAAK;AAChC,UAAM,OAAO,MAAM,qBAAqB,mBAAmB;AAC3D,UAAM,qBACJ,QAAQ,MAAM,cAAc,MAAM,cAAc,KAAK,QAAQ,MAAM,IAAI,MAAM,cAAc;AAE7F,QAAI,CAAC,KAAK,cAAc;AACtB,aAAO;AAAA,QACL,WAAW,GAAG,QAAQ,iBAAiB,uBAAuB;AAAA,QAC9D,kBAAkB,GAAG,QAAQ,8BAA8B;AAAA,QAC3D,YAAY;AAAA,UACV,GAAG,QAAQ;AAAA,YACT;AAAA,YACA;AAAA,YACA;AAAA,YACA,GAAG,QAAQ,YAAY,GAAG,WAAW,aAAa;AAAA,YAClD,GAAG,QAAQ,wBAAwB,kBAAkB;AAAA,UACvD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,UAAM,gBAAgB,KAAK,sBAAsB,KAAK,aAAa,QAAQ,gBAAgB,EAAE,MAAM;AACnG,UAAM,iBAAiB,cAAc,IAAI,CAAC,CAAC,IAAI,MAAM,IAAI;AACzD,QAAI,gBAAgB;AAEpB,WAAO,eAAe,SAAS,aAAa,GAAG;AAC7C,sBAAgB,IAAI,aAAa;AAAA,IACnC;AAEA,WAAO;AAAA,MACL,WAAW,GAAG,QAAQ,iBAAiB,aAAa;AAAA,MACpD,kBAAkB,GAAG,QAAQ;AAAA,QAC3B,cAAc,IAAI,CAAC,CAAC,IAAI,MAAM,GAAG,QAAQ,kCAAkC,IAAI,CAAC;AAAA,MAClF;AAAA,MACA,YAAY;AAAA,QACV,GAAG,cAAc,IAAI,CAAC,CAAC,MAAM,MAAM,MAAM;AACvC,gBAAM,QAAQ,IAAI,oBAAoB,QAAQ,KAAK,eAAe,KAAK,cAAc,EAAE,QAAQ;AAE/F,iBAAO,GAAG,QAAQ;AAAA,YAChB;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA,GAAG,QAAQ,oBAAoB,KAAK;AAAA,UACtC;AAAA,QACF,CAAC;AAAA,QACD,GAAG,QAAQ;AAAA,UACT;AAAA,UACA;AAAA,UACA;AAAA,UACA,GAAG,QAAQ,YAAY,GAAG,WAAW,aAAa;AAAA,UAClD,GAAG,QAAQ,wBAAwB,kBAAkB;AAAA,QACvD;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,sBACE,aACkC;AAClC,QAAI,CAAC,aAAa;AAChB,aAAO,CAAC;AAAA,IACV;AAEA,UAAM,EAAE,QAAQ,SAAS,IAAI,KAAK;AAElC,UAAM,iBAAiB,SAAS,QAAQ,WAAW;AAEnD,QAAI,eAAe,cAAc,KAAK,CAAC,cAAc,cAAc,GAAG;AACpE,aAAO,OAAO,QAAS,eAAwC,UAAU;AAAA,IAC3E;AAEA,WAAO,KAAK,wEAAwE;AACpF,WAAO,CAAC;AAAA,EACV;AACF;",
   "names": []
 }

package/EndpointMethodResponseProcessor.d.ts

@@ -1,13 +1,13 @@
 import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';
+import type { TransferTypes } from '@vaadin/hilla-generator-core/SharedStorage.js';
 import type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';
 import type { OpenAPIV3 } from 'openapi-types';
-import type { ReadonlyDeep } from 'type-fest';
 import type { TypeNode } from 'typescript';
-export type EndpointMethodResponses = ReadonlyDeep<OpenAPIV3.ResponsesObject>;
-export type EndpointMethodResponse = ReadonlyDeep<OpenAPIV3.ResponseObject>;
+export type EndpointMethodResponses = OpenAPIV3.ResponsesObject;
+export type EndpointMethodResponse = OpenAPIV3.ResponseObject;
 export default class EndpointMethodResponseProcessor {
     #private;
-    constructor(code: string, response: EndpointMethodResponses[string], dependencyManager: DependencyManager, owner: Plugin);
+    constructor(code: string, response: EndpointMethodResponses[string], dependencyManager: DependencyManager, transferTypes: TransferTypes, owner: Plugin);
     process(): readonly TypeNode[];
 }
 //# sourceMappingURL=EndpointMethodResponseProcessor.d.ts.map

package/EndpointMethodResponseProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EndpointMethodResponseProcessor.d.ts","sourceRoot":"","sources":["src/EndpointMethodResponseProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AACjE,OAAO,KAAK,iBAAiB,MAAM,iEAAiE,CAAC;AACrG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C,MAAM,MAAM,uBAAuB,GAAG,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AAC9E,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;AAE5E,MAAM,CAAC,OAAO,OAAO,+BAA+B;;gBAOhD,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,uBAAuB,CAAC,MAAM,CAAC,EACzC,iBAAiB,EAAE,iBAAiB,EACpC,KAAK,EAAE,MAAM;IAQf,OAAO,IAAI,SAAS,QAAQ,EAAE;CAe/B"}
+{"version":3,"file":"EndpointMethodResponseProcessor.d.ts","sourceRoot":"","sources":["src/EndpointMethodResponseProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,KAAK,iBAAiB,MAAM,iEAAiE,CAAC;AACrG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C,MAAM,MAAM,uBAAuB,GAAG,SAAS,CAAC,eAAe,CAAC;AAChE,MAAM,MAAM,sBAAsB,GAAG,SAAS,CAAC,cAAc,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,+BAA+B;;gBAShD,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,uBAAuB,CAAC,MAAM,CAAC,EACzC,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,MAAM;IASf,OAAO,IAAI,SAAS,QAAQ,EAAE;CAe/B"}

package/EndpointMethodResponseProcessor.js

@@ -3,13 +3,16 @@ import { defaultMediaType } from "./utils.js";
 class EndpointMethodResponseProcessor {
   #code;
   #dependencies;
+  #transferTypes;
   #owner;
   #response;
-  constructor(code, response, dependencyManager, owner) {
+  // eslint-disable-next-line @typescript-eslint/max-params
+  constructor(code, response, dependencyManager, transferTypes, owner) {
     this.#code = code;
     this.#owner = owner;
     this.#dependencies = dependencyManager;
     this.#response = owner.resolver.resolve(response);
+    this.#transferTypes = transferTypes;
   }
   process() {
     switch (this.#code) {
@@ -22,7 +25,7 @@ class EndpointMethodResponseProcessor {
   }
   #processOk() {
     const rawSchema = this.#response.content?.[defaultMediaType]?.schema;
-    return rawSchema ? new TypeSchemaProcessor(rawSchema, this.#dependencies).process() : [];
+    return rawSchema ? new TypeSchemaProcessor(rawSchema, this.#dependencies, this.#transferTypes).process() : [];
   }
 }
 export {

package/EndpointMethodResponseProcessor.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["src/EndpointMethodResponseProcessor.ts"],
-  "sourcesContent": ["import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport type { OpenAPIV3 } from 'openapi-types';\nimport type { ReadonlyDeep } from 'type-fest';\nimport type { TypeNode } from 'typescript';\nimport TypeSchemaProcessor from './TypeSchemaProcessor.js';\nimport { defaultMediaType } from './utils.js';\n\nexport type EndpointMethodResponses = ReadonlyDeep<OpenAPIV3.ResponsesObject>;\nexport type EndpointMethodResponse = ReadonlyDeep<OpenAPIV3.ResponseObject>;\n\nexport default class EndpointMethodResponseProcessor {\n  readonly #code: string;\n  readonly #dependencies: DependencyManager;\n  readonly #owner: Plugin;\n  readonly #response: EndpointMethodResponse;\n\n  constructor(\n    code: string,\n    response: EndpointMethodResponses[string],\n    dependencyManager: DependencyManager,\n    owner: Plugin,\n  ) {\n    this.#code = code;\n    this.#owner = owner;\n    this.#dependencies = dependencyManager;\n    this.#response = owner.resolver.resolve(response);\n  }\n\n  process(): readonly TypeNode[] {\n    switch (this.#code) {\n      case '200':\n        return this.#processOk();\n      default:\n        this.#owner.logger.warn(`Response code '${this.#code} is not supported'`);\n        return [];\n    }\n  }\n\n  #processOk(): readonly TypeNode[] {\n    const rawSchema = this.#response.content?.[defaultMediaType]?.schema;\n\n    return rawSchema ? new TypeSchemaProcessor(rawSchema, this.#dependencies).process() : [];\n  }\n}\n"],
-  "mappings": "AAKA,OAAO,yBAAyB;AAChC,SAAS,wBAAwB;AAKjC,MAAO,gCAA8C;AAAA,EAC1C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAET,YACE,MACA,UACA,mBACA,OACA;AACA,SAAK,QAAQ;AACb,SAAK,SAAS;AACd,SAAK,gBAAgB;AACrB,SAAK,YAAY,MAAM,SAAS,QAAQ,QAAQ;AAAA,EAClD;AAAA,EAEA,UAA+B;AAC7B,YAAQ,KAAK,OAAO;AAAA,MAClB,KAAK;AACH,eAAO,KAAK,WAAW;AAAA,MACzB;AACE,aAAK,OAAO,OAAO,KAAK,kBAAkB,KAAK,KAAK,oBAAoB;AACxE,eAAO,CAAC;AAAA,IACZ;AAAA,EACF;AAAA,EAEA,aAAkC;AAChC,UAAM,YAAY,KAAK,UAAU,UAAU,gBAAgB,GAAG;AAE9D,WAAO,YAAY,IAAI,oBAAoB,WAAW,KAAK,aAAa,EAAE,QAAQ,IAAI,CAAC;AAAA,EACzF;AACF;",
+  "sourcesContent": ["import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport type { TransferTypes } from '@vaadin/hilla-generator-core/SharedStorage.js';\nimport type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport type { OpenAPIV3 } from 'openapi-types';\nimport type { TypeNode } from 'typescript';\nimport TypeSchemaProcessor from './TypeSchemaProcessor.js';\nimport { defaultMediaType } from './utils.js';\n\nexport type EndpointMethodResponses = OpenAPIV3.ResponsesObject;\nexport type EndpointMethodResponse = OpenAPIV3.ResponseObject;\n\nexport default class EndpointMethodResponseProcessor {\n  readonly #code: string;\n  readonly #dependencies: DependencyManager;\n  readonly #transferTypes: TransferTypes;\n  readonly #owner: Plugin;\n  readonly #response: EndpointMethodResponse;\n\n  // eslint-disable-next-line @typescript-eslint/max-params\n  constructor(\n    code: string,\n    response: EndpointMethodResponses[string],\n    dependencyManager: DependencyManager,\n    transferTypes: TransferTypes,\n    owner: Plugin,\n  ) {\n    this.#code = code;\n    this.#owner = owner;\n    this.#dependencies = dependencyManager;\n    this.#response = owner.resolver.resolve(response);\n    this.#transferTypes = transferTypes;\n  }\n\n  process(): readonly TypeNode[] {\n    switch (this.#code) {\n      case '200':\n        return this.#processOk();\n      default:\n        this.#owner.logger.warn(`Response code '${this.#code} is not supported'`);\n        return [];\n    }\n  }\n\n  #processOk(): readonly TypeNode[] {\n    const rawSchema = this.#response.content?.[defaultMediaType]?.schema;\n\n    return rawSchema ? new TypeSchemaProcessor(rawSchema, this.#dependencies, this.#transferTypes).process() : [];\n  }\n}\n"],
+  "mappings": "AAKA,OAAO,yBAAyB;AAChC,SAAS,wBAAwB;AAKjC,MAAO,gCAA8C;AAAA,EAC1C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA;AAAA,EAGT,YACE,MACA,UACA,mBACA,eACA,OACA;AACA,SAAK,QAAQ;AACb,SAAK,SAAS;AACd,SAAK,gBAAgB;AACrB,SAAK,YAAY,MAAM,SAAS,QAAQ,QAAQ;AAChD,SAAK,iBAAiB;AAAA,EACxB;AAAA,EAEA,UAA+B;AAC7B,YAAQ,KAAK,OAAO;AAAA,MAClB,KAAK;AACH,eAAO,KAAK,WAAW;AAAA,MACzB;AACE,aAAK,OAAO,OAAO,KAAK,kBAAkB,KAAK,KAAK,oBAAoB;AACxE,eAAO,CAAC;AAAA,IACZ;AAAA,EACF;AAAA,EAEA,aAAkC;AAChC,UAAM,YAAY,KAAK,UAAU,UAAU,gBAAgB,GAAG;AAE9D,WAAO,YAAY,IAAI,oBAAoB,WAAW,KAAK,eAAe,KAAK,cAAc,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC9G;AACF;",
   "names": []
 }

package/EndpointProcessor.d.ts

@@ -1,10 +1,10 @@
 import type Plugin from '@vaadin/hilla-generator-core/Plugin.js';
+import type { SharedStorage } from '@vaadin/hilla-generator-core/SharedStorage.js';
 import { OpenAPIV3 } from 'openapi-types';
-import type { ReadonlyDeep } from 'type-fest';
 import type { SourceFile } from 'typescript';
 export default class EndpointProcessor {
     #private;
-    static create(name: string, owner: Plugin, methods: Map<string, ReadonlyDeep<OpenAPIV3.PathItemObject>>, outputDir?: string): Promise<EndpointProcessor>;
+    static create(name: string, methods: Map<string, OpenAPIV3.PathItemObject>, storage: SharedStorage, owner: Plugin): Promise<EndpointProcessor>;
     private constructor();
     process(): Promise<SourceFile>;
 }

package/EndpointProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EndpointProcessor.d.ts","sourceRoot":"","sources":["src/EndpointProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AAKjE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAMxD,MAAM,CAAC,OAAO,OAAO,iBAAiB;;WACvB,MAAM,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,EAC5D,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,CAAC;IAoB7B,OAAO;IAYD,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;CAsCrC"}
+{"version":3,"file":"EndpointProcessor.d.ts","sourceRoot":"","sources":["src/EndpointProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,+CAA+C,CAAC;AAKlG,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAGxD,MAAM,CAAC,OAAO,OAAO,iBAAiB;;WACvB,MAAM,CACjB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,cAAc,CAAC,EAC9C,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,iBAAiB,CAAC;IAiB7B,OAAO;IAaD,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;CAoCrC"}

package/EndpointProcessor.js

@@ -3,21 +3,14 @@ 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";
+import EndpointMethodOperationProcessor from "./EndpointMethodOperationProcessor.js";
 class EndpointProcessor {
-  static async create(name, owner, methods, outputDir) {
-    const endpoint = new EndpointProcessor(name, owner, methods, outputDir);
+  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(outputDir)),
+      endpoint.#dependencies.paths.createRelativePath(await ClientPlugin.getClientFileName(storage.outputDir)),
       "client"
     );
-    endpoint.#dependencies.imports.named.add(
-      endpoint.#dependencies.paths.createBareModulePath(HILLA_FRONTEND_NAME),
-      INIT_TYPE_NAME
-    );
     return endpoint;
   }
   #createdFilePaths = new PathManager({ extension: "ts" });
@@ -25,12 +18,14 @@ class EndpointProcessor {
   #methods;
   #name;
   #outputDir;
+  #transferTypes;
   #owner;
-  constructor(name, owner, methods, outputDir) {
+  constructor(name, methods, storage, owner) {
     this.#name = name;
     this.#owner = owner;
     this.#methods = methods;
-    this.#outputDir = outputDir;
+    this.#outputDir = storage.outputDir;
+    this.#transferTypes = storage.transferTypes;
   }
   async process() {
     this.#owner.logger.debug(`Processing endpoint: ${this.#name}`);
@@ -51,6 +46,7 @@ class EndpointProcessor {
           method,
           pathItem[httpMethod],
           this.#dependencies,
+          this.#transferTypes,
           this.#owner
         )?.process(this.#outputDir)
       )

package/EndpointProcessor.js.map

@@ -1,7 +1,7 @@
 {
   "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;",
+  "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"],
+  "mappings": "AAEA,OAAO,kBAAkB;AACzB,OAAO,sBAAsB;AAC7B,OAAO,uBAAuB;AAC9B,OAAO,iBAAiB;AACxB,SAAS,iBAAiB;AAE1B,OAAO,sCAAsC;AAE7C,MAAO,kBAAgC;AAAA,EACrC,aAAa,OACX,MACA,SACA,SACA,OAC4B;AAC5B,UAAM,WAAW,IAAI,kBAAkB,MAAM,SAAS,SAAS,KAAK;AACpE,aAAS,cAAc,QAAQ,QAAQ;AAAA,MACrC,SAAS,cAAc,MAAM,mBAAmB,MAAM,aAAa,kBAAkB,QAAQ,SAAS,CAAC;AAAA,MACvG;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,EACA;AAAA,EAED,YACN,MACA,SACA,SACA,OACA;AACA,SAAK,QAAQ;AACb,SAAK,SAAS;AACd,SAAK,WAAW;AAChB,SAAK,aAAa,QAAQ;AAC1B,SAAK,iBAAiB,QAAQ;AAAA,EAChC;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,eAAe,QAAgB,UAAmE;AACtG,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,UACL,KAAK;AAAA,QACP,GAAG,QAAQ,KAAK,UAAU;AAAA,MAC5B;AAAA,IACJ,GACA,OAAO,OAAO;AAAA,EAClB;AACF;",
   "names": []
 }

package/EntityProcessor.d.ts

@@ -1,9 +1,10 @@
 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);
+    constructor(name: string, component: Schema, storage: SharedStorage, owner: Plugin);
     process(): SourceFile;
 }
 //# sourceMappingURL=EntityProcessor.d.ts.map

package/EntityProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityProcessor.d.ts","sourceRoot":"","sources":["src/EntityProcessor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AACjE,OAAO,EAGL,KAAK,MAAM,EAWZ,MAAM,wCAAwC,CAAC;AAQhD,OAAW,EAGT,KAAK,UAAU,EAGhB,MAAM,YAAY,CAAC;AAIpB,qBAAa,eAAe;;gBASd,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAiB1D,OAAO,IAAI,UAAU;CA4HtB"}
+{"version":3,"file":"EntityProcessor.d.ts","sourceRoot":"","sources":["src/EntityProcessor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AACjE,OAAO,EAGL,KAAK,MAAM,EAaZ,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,+CAA+C,CAAC;AAIlG,OAAW,EAGT,KAAK,UAAU,EAIhB,MAAM,YAAY,CAAC;AAIpB,qBAAa,eAAe;;gBAUd,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM;IAkBlF,OAAO,IAAI,UAAU;CA4HtB"}

package/EntityProcessor.js

@@ -8,12 +8,10 @@ import {
   isEnumSchema,
   isNullableSchema,
   isObjectSchema,
-  isReferenceSchema
-} from "@vaadin/hilla-generator-core/Schema.js";
-import {
+  isReferenceSchema,
   convertFullyQualifiedNameToRelativePath,
   simplifyFullyQualifiedName
-} from "@vaadin/hilla-generator-core/utils.js";
+} 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";
@@ -27,15 +25,17 @@ class EntityProcessor {
   #fullyQualifiedName;
   #name;
   #outputPathManager = new PathManager({ extension: "ts" });
+  #transferTypes;
   #owner;
   #path;
-  constructor(name, component, owner) {
+  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);
@@ -117,7 +117,7 @@ class EntityProcessor {
   }
   #processTypeElements({ properties }) {
     return Object.entries(properties ?? {}).map(([name, schema]) => {
-      const [type] = new TypeSchemaProcessor(schema, this.#dependencies).process();
+      const [type] = new TypeSchemaProcessor(schema, this.#dependencies, this.#transferTypes).process();
       return ts.factory.createPropertySignature(
         void 0,
         name,

package/EntityProcessor.js.map

@@ -1,7 +1,7 @@
 {
   "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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",
+  "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"],
+  "mappings": "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",
   "names": []
 }

package/TypeSchemaProcessor.d.ts

@@ -1,10 +1,11 @@
 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);
+    constructor(schema: Schema, dependencies: DependencyManager, transferTypes: Map<string, TransferTypeMaker>);
     process(): readonly TypeNode[];
 }
 //# sourceMappingURL=TypeSchemaProcessor.d.ts.map

package/TypeSchemaProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeSchemaProcessor.d.ts","sourceRoot":"","sources":["src/TypeSchemaProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAiBL,KAAK,MAAM,EACZ,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,iBAAiB,MAAM,iEAAiE,CAAC;AACrG,OAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAiC/C,MAAM,CAAC,OAAO,OAAO,mBAAmB;;IAC9B,CAAC,aAAa,CAAC,EAAE,OAAO,mBAAmB,CAAC;gBAIxC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,iBAAiB;IAK3D,OAAO,IAAI,SAAS,QAAQ,EAAE;CAsE/B"}
+{"version":3,"file":"TypeSchemaProcessor.d.ts","sourceRoot":"","sources":["src/TypeSchemaProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAkBL,KAAK,MAAM,EACZ,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,KAAK,iBAAiB,MAAM,iEAAiE,CAAC;AACrG,OAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAiC/C,MAAM,CAAC,OAAO,OAAO,mBAAmB;;IAC9B,CAAC,aAAa,CAAC,EAAE,OAAO,mBAAmB,CAAC;gBAKxC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAM1G,OAAO,IAAI,SAAS,QAAQ,EAAE;CA4E/B"}

package/TypeSchemaProcessor.js

@@ -1,5 +1,6 @@
 import {
-  convertReferenceSchemaToPath,
+  convertFullyQualifiedNameToRelativePath,
+  convertReferenceSchemaToFullyQualifiedName,
   convertReferenceSchemaToSpecifier,
   decomposeSchema,
   isArraySchema,
@@ -39,9 +40,11 @@ function unwrapPossiblyNullableSchema(schema) {
 class TypeSchemaProcessor {
   #dependencies;
   #schema;
-  constructor(schema, dependencies) {
+  #transferTypes;
+  constructor(schema, dependencies, transferTypes) {
     this.#schema = schema;
     this.#dependencies = dependencies;
+    this.#transferTypes = transferTypes;
   }
   process() {
     let node;
@@ -69,13 +72,13 @@ class TypeSchemaProcessor {
     return isNullableSchema(this.#schema) ? [node, createUndefined()] : [node];
   }
   #processArray(schema) {
-    const nodes = new TypeSchemaProcessor(schema.items, this.#dependencies).process();
+    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).process();
+      const nodes = new TypeSchemaProcessor(valuesType, this.#dependencies, this.#transferTypes).process();
       valuesTypeNode = ts.factory.createUnionTypeNode(nodes);
     } else {
       valuesTypeNode = ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
@@ -86,12 +89,16 @@ class TypeSchemaProcessor {
     ]);
   }
   #processTypeArguments(schema) {
-    return findTypeArguments(schema)?.allOf.map((s) => new TypeSchemaProcessor(s, this.#dependencies).process()).map((t) => ts.factory.createUnionTypeNode(t));
+    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(convertReferenceSchemaToPath(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);
   }

package/TypeSchemaProcessor.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["src/TypeSchemaProcessor.ts"],
-  "sourcesContent": ["import {\n  type ArraySchema,\n  convertReferenceSchemaToPath,\n  convertReferenceSchemaToSpecifier,\n  decomposeSchema,\n  isArraySchema,\n  isBooleanSchema,\n  isComposedSchema,\n  isIntegerSchema,\n  isMapSchema,\n  isNullableSchema,\n  isNumberSchema,\n  isReferenceSchema,\n  isStringSchema,\n  type MapSchema,\n  type NonComposedSchema,\n  type ReferenceSchema,\n  type Schema,\n} from '@vaadin/hilla-generator-core/Schema.js';\nimport type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport ts, { type TypeNode } from 'typescript';\nimport { findTypeArguments, findTypeVariable } from './utils.js';\n\nfunction createBoolean(): TypeNode {\n  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);\n}\n\nfunction createNumber(): TypeNode {\n  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);\n}\n\nfunction createString(): TypeNode {\n  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);\n}\n\nfunction createUndefined(): TypeNode {\n  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword);\n}\n\nfunction createUnknown(): TypeNode {\n  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);\n}\n\nfunction unwrapPossiblyNullableSchema(schema: Schema): NonComposedSchema {\n  if (isComposedSchema(schema)) {\n    const [result] = decomposeSchema(schema);\n\n    return result as NonComposedSchema;\n  }\n\n  return schema as NonComposedSchema;\n}\n\nexport default class TypeSchemaProcessor {\n  declare ['constructor']: typeof TypeSchemaProcessor;\n  readonly #dependencies: DependencyManager;\n  readonly #schema: Schema;\n\n  constructor(schema: Schema, dependencies: DependencyManager) {\n    this.#schema = schema;\n    this.#dependencies = dependencies;\n  }\n\n  process(): readonly TypeNode[] {\n    let node: TypeNode;\n\n    const unwrappedSchema = unwrapPossiblyNullableSchema(this.#schema);\n\n    const typeVariable = findTypeVariable(this.#schema);\n    if (typeVariable) {\n      // Type variables are returned directly as they are, no further processing is needed\n      return [ts.factory.createTypeReferenceNode(typeVariable)];\n    }\n\n    if (isReferenceSchema(unwrappedSchema)) {\n      const typeArguments = this.#processTypeArguments(this.#schema);\n      node = this.#processReference(unwrappedSchema, typeArguments);\n    } else if (isArraySchema(unwrappedSchema)) {\n      node = this.#processArray(unwrappedSchema);\n    } else if (isMapSchema(unwrappedSchema)) {\n      node = this.#processMap(unwrappedSchema);\n    } else if (isBooleanSchema(unwrappedSchema)) {\n      node = createBoolean();\n    } else if (isIntegerSchema(unwrappedSchema) || isNumberSchema(unwrappedSchema)) {\n      node = createNumber();\n    } else if (isStringSchema(unwrappedSchema)) {\n      node = createString();\n    } else {\n      node = createUnknown();\n    }\n\n    return isNullableSchema(this.#schema) ? [node, createUndefined()] : [node];\n  }\n\n  #processArray(schema: ArraySchema): TypeNode {\n    const nodes = new TypeSchemaProcessor(schema.items, this.#dependencies).process();\n\n    return ts.factory.createTypeReferenceNode('Array', [ts.factory.createUnionTypeNode(nodes)]);\n  }\n\n  #processMap({ additionalProperties: valuesType }: MapSchema): TypeNode {\n    let valuesTypeNode: TypeNode;\n\n    if (typeof valuesType !== 'boolean') {\n      const nodes = new TypeSchemaProcessor(valuesType, this.#dependencies).process();\n      valuesTypeNode = ts.factory.createUnionTypeNode(nodes);\n    } else {\n      valuesTypeNode = ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);\n    }\n\n    return ts.factory.createTypeReferenceNode('Record', [\n      ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),\n      valuesTypeNode,\n    ]);\n  }\n\n  #processTypeArguments(schema: Schema): readonly ts.TypeNode[] | undefined {\n    // Type arguments are processed recursively\n    return findTypeArguments(schema)\n      ?.allOf.map((s) => new TypeSchemaProcessor(s, this.#dependencies).process())\n      .map((t) => ts.factory.createUnionTypeNode(t));\n  }\n\n  #processReference(schema: ReferenceSchema, typeArguments: readonly ts.TypeNode[] | undefined): TypeNode {\n    const { imports, paths } = this.#dependencies;\n\n    const specifier = convertReferenceSchemaToSpecifier(schema);\n    const path = paths.createRelativePath(convertReferenceSchemaToPath(schema));\n\n    const identifier = imports.default.getIdentifier(path) ?? imports.default.add(path, specifier, true);\n\n    return ts.factory.createTypeReferenceNode(identifier, typeArguments);\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import {\n  type ArraySchema,\n  convertFullyQualifiedNameToRelativePath,\n  convertReferenceSchemaToFullyQualifiedName,\n  convertReferenceSchemaToSpecifier,\n  decomposeSchema,\n  isArraySchema,\n  isBooleanSchema,\n  isComposedSchema,\n  isIntegerSchema,\n  isMapSchema,\n  isNullableSchema,\n  isNumberSchema,\n  isReferenceSchema,\n  isStringSchema,\n  type MapSchema,\n  type NonComposedSchema,\n  type ReferenceSchema,\n  type Schema,\n} from '@vaadin/hilla-generator-core/Schema.js';\nimport type { TransferTypeMaker } from '@vaadin/hilla-generator-core/SharedStorage.js';\nimport type DependencyManager from '@vaadin/hilla-generator-utils/dependencies/DependencyManager.js';\nimport ts, { type TypeNode } from 'typescript';\nimport { findTypeArguments, findTypeVariable } from './utils.js';\n\nfunction createBoolean(): TypeNode {\n  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);\n}\n\nfunction createNumber(): TypeNode {\n  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);\n}\n\nfunction createString(): TypeNode {\n  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);\n}\n\nfunction createUndefined(): TypeNode {\n  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword);\n}\n\nfunction createUnknown(): TypeNode {\n  return ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);\n}\n\nfunction unwrapPossiblyNullableSchema(schema: Schema): NonComposedSchema {\n  if (isComposedSchema(schema)) {\n    const [result] = decomposeSchema(schema);\n\n    return result as NonComposedSchema;\n  }\n\n  return schema as NonComposedSchema;\n}\n\nexport default class TypeSchemaProcessor {\n  declare ['constructor']: typeof TypeSchemaProcessor;\n  readonly #dependencies: DependencyManager;\n  readonly #schema: Schema;\n  readonly #transferTypes: Map<string, TransferTypeMaker>;\n\n  constructor(schema: Schema, dependencies: DependencyManager, transferTypes: Map<string, TransferTypeMaker>) {\n    this.#schema = schema;\n    this.#dependencies = dependencies;\n    this.#transferTypes = transferTypes;\n  }\n\n  process(): readonly TypeNode[] {\n    let node: TypeNode;\n\n    const unwrappedSchema = unwrapPossiblyNullableSchema(this.#schema);\n\n    const typeVariable = findTypeVariable(this.#schema);\n    if (typeVariable) {\n      // Type variables are returned directly as they are, no further processing is needed\n      return [ts.factory.createTypeReferenceNode(typeVariable)];\n    }\n\n    if (isReferenceSchema(unwrappedSchema)) {\n      const typeArguments = this.#processTypeArguments(this.#schema);\n      node = this.#processReference(unwrappedSchema, typeArguments);\n    } else if (isArraySchema(unwrappedSchema)) {\n      node = this.#processArray(unwrappedSchema);\n    } else if (isMapSchema(unwrappedSchema)) {\n      node = this.#processMap(unwrappedSchema);\n    } else if (isBooleanSchema(unwrappedSchema)) {\n      node = createBoolean();\n    } else if (isIntegerSchema(unwrappedSchema) || isNumberSchema(unwrappedSchema)) {\n      node = createNumber();\n    } else if (isStringSchema(unwrappedSchema)) {\n      node = createString();\n    } else {\n      node = createUnknown();\n    }\n\n    return isNullableSchema(this.#schema) ? [node, createUndefined()] : [node];\n  }\n\n  #processArray(schema: ArraySchema): TypeNode {\n    const nodes = new TypeSchemaProcessor(schema.items, this.#dependencies, this.#transferTypes).process();\n\n    return ts.factory.createTypeReferenceNode('Array', [ts.factory.createUnionTypeNode(nodes)]);\n  }\n\n  #processMap({ additionalProperties: valuesType }: MapSchema): TypeNode {\n    let valuesTypeNode: TypeNode;\n\n    if (typeof valuesType !== 'boolean') {\n      const nodes = new TypeSchemaProcessor(valuesType, this.#dependencies, this.#transferTypes).process();\n      valuesTypeNode = ts.factory.createUnionTypeNode(nodes);\n    } else {\n      valuesTypeNode = ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);\n    }\n\n    return ts.factory.createTypeReferenceNode('Record', [\n      ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),\n      valuesTypeNode,\n    ]);\n  }\n\n  #processTypeArguments(schema: Schema): readonly TypeNode[] | undefined {\n    // Type arguments are processed recursively\n    return findTypeArguments(schema)\n      ?.allOf.map((s) => new TypeSchemaProcessor(s, this.#dependencies, this.#transferTypes).process())\n      .map((t) => ts.factory.createUnionTypeNode(t));\n  }\n\n  #processReference(schema: ReferenceSchema, typeArguments: readonly TypeNode[] | undefined): TypeNode {\n    const { imports, paths } = this.#dependencies;\n\n    const fullyQualifiedName = convertReferenceSchemaToFullyQualifiedName(schema);\n\n    if (this.#transferTypes.has(fullyQualifiedName)) {\n      return this.#transferTypes.get(fullyQualifiedName)!(typeArguments);\n    }\n\n    const specifier = convertReferenceSchemaToSpecifier(schema);\n    const path = paths.createRelativePath(convertFullyQualifiedNameToRelativePath(fullyQualifiedName));\n\n    const identifier = imports.default.getIdentifier(path) ?? imports.default.add(path, specifier, true);\n\n    return ts.factory.createTypeReferenceNode(identifier, typeArguments);\n  }\n}\n"],
+  "mappings": "AAAA;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAKK;AAGP,OAAO,YAA2B;AAClC,SAAS,mBAAmB,wBAAwB;AAEpD,SAAS,gBAA0B;AACjC,SAAO,GAAG,QAAQ,sBAAsB,GAAG,WAAW,cAAc;AACtE;AAEA,SAAS,eAAyB;AAChC,SAAO,GAAG,QAAQ,sBAAsB,GAAG,WAAW,aAAa;AACrE;AAEA,SAAS,eAAyB;AAChC,SAAO,GAAG,QAAQ,sBAAsB,GAAG,WAAW,aAAa;AACrE;AAEA,SAAS,kBAA4B;AACnC,SAAO,GAAG,QAAQ,sBAAsB,GAAG,WAAW,gBAAgB;AACxE;AAEA,SAAS,gBAA0B;AACjC,SAAO,GAAG,QAAQ,sBAAsB,GAAG,WAAW,cAAc;AACtE;AAEA,SAAS,6BAA6B,QAAmC;AACvE,MAAI,iBAAiB,MAAM,GAAG;AAC5B,UAAM,CAAC,MAAM,IAAI,gBAAgB,MAAM;AAEvC,WAAO;AAAA,EACT;AAEA,SAAO;AACT;AAEA,MAAO,oBAAkC;AAAA,EAE9B;AAAA,EACA;AAAA,EACA;AAAA,EAET,YAAY,QAAgB,cAAiC,eAA+C;AAC1G,SAAK,UAAU;AACf,SAAK,gBAAgB;AACrB,SAAK,iBAAiB;AAAA,EACxB;AAAA,EAEA,UAA+B;AAC7B,QAAI;AAEJ,UAAM,kBAAkB,6BAA6B,KAAK,OAAO;AAEjE,UAAM,eAAe,iBAAiB,KAAK,OAAO;AAClD,QAAI,cAAc;AAEhB,aAAO,CAAC,GAAG,QAAQ,wBAAwB,YAAY,CAAC;AAAA,IAC1D;AAEA,QAAI,kBAAkB,eAAe,GAAG;AACtC,YAAM,gBAAgB,KAAK,sBAAsB,KAAK,OAAO;AAC7D,aAAO,KAAK,kBAAkB,iBAAiB,aAAa;AAAA,IAC9D,WAAW,cAAc,eAAe,GAAG;AACzC,aAAO,KAAK,cAAc,eAAe;AAAA,IAC3C,WAAW,YAAY,eAAe,GAAG;AACvC,aAAO,KAAK,YAAY,eAAe;AAAA,IACzC,WAAW,gBAAgB,eAAe,GAAG;AAC3C,aAAO,cAAc;AAAA,IACvB,WAAW,gBAAgB,eAAe,KAAK,eAAe,eAAe,GAAG;AAC9E,aAAO,aAAa;AAAA,IACtB,WAAW,eAAe,eAAe,GAAG;AAC1C,aAAO,aAAa;AAAA,IACtB,OAAO;AACL,aAAO,cAAc;AAAA,IACvB;AAEA,WAAO,iBAAiB,KAAK,OAAO,IAAI,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,IAAI;AAAA,EAC3E;AAAA,EAEA,cAAc,QAA+B;AAC3C,UAAM,QAAQ,IAAI,oBAAoB,OAAO,OAAO,KAAK,eAAe,KAAK,cAAc,EAAE,QAAQ;AAErG,WAAO,GAAG,QAAQ,wBAAwB,SAAS,CAAC,GAAG,QAAQ,oBAAoB,KAAK,CAAC,CAAC;AAAA,EAC5F;AAAA,EAEA,YAAY,EAAE,sBAAsB,WAAW,GAAwB;AACrE,QAAI;AAEJ,QAAI,OAAO,eAAe,WAAW;AACnC,YAAM,QAAQ,IAAI,oBAAoB,YAAY,KAAK,eAAe,KAAK,cAAc,EAAE,QAAQ;AACnG,uBAAiB,GAAG,QAAQ,oBAAoB,KAAK;AAAA,IACvD,OAAO;AACL,uBAAiB,GAAG,QAAQ,sBAAsB,GAAG,WAAW,cAAc;AAAA,IAChF;AAEA,WAAO,GAAG,QAAQ,wBAAwB,UAAU;AAAA,MAClD,GAAG,QAAQ,sBAAsB,GAAG,WAAW,aAAa;AAAA,MAC5D;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,sBAAsB,QAAiD;AAErE,WAAO,kBAAkB,MAAM,GAC3B,MAAM,IAAI,CAAC,MAAM,IAAI,oBAAoB,GAAG,KAAK,eAAe,KAAK,cAAc,EAAE,QAAQ,CAAC,EAC/F,IAAI,CAAC,MAAM,GAAG,QAAQ,oBAAoB,CAAC,CAAC;AAAA,EACjD;AAAA,EAEA,kBAAkB,QAAyB,eAA0D;AACnG,UAAM,EAAE,SAAS,MAAM,IAAI,KAAK;AAEhC,UAAM,qBAAqB,2CAA2C,MAAM;AAE5E,QAAI,KAAK,eAAe,IAAI,kBAAkB,GAAG;AAC/C,aAAO,KAAK,eAAe,IAAI,kBAAkB,EAAG,aAAa;AAAA,IACnE;AAEA,UAAM,YAAY,kCAAkC,MAAM;AAC1D,UAAM,OAAO,MAAM,mBAAmB,wCAAwC,kBAAkB,CAAC;AAEjG,UAAM,aAAa,QAAQ,QAAQ,cAAc,IAAI,KAAK,QAAQ,QAAQ,IAAI,MAAM,WAAW,IAAI;AAEnG,WAAO,GAAG,QAAQ,wBAAwB,YAAY,aAAa;AAAA,EACrE;AACF;",
   "names": []
 }

package/index.d.ts

@@ -1,5 +1,5 @@
 import Plugin from '@vaadin/hilla-generator-core/Plugin.js';
-import type SharedStorage from '@vaadin/hilla-generator-core/SharedStorage.js';
+import type { SharedStorage } from '@vaadin/hilla-generator-core/SharedStorage.js';
 export declare enum BackbonePluginSourceType {
     Endpoint = "endpoint",
     Entity = "entity"

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,wCAAwC,CAAC;AAC5D,OAAO,KAAK,aAAa,MAAM,+CAA+C,CAAC;AAO/E,oBAAY,wBAAwB;IAClC,QAAQ,aAAa;IACrB,MAAM,WAAW;CAClB;AAED,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,MAAM;;IAChD,MAAM,CAAC,QAAQ,CAAC,yBAAyB,+BAA+B;IAChE,CAAC,aAAa,CAAC,EAAE,OAAO,cAAc,CAAC;IAG/C,IAAa,IAAI,IAAI,MAAM,CAE1B;IAEc,OAAO,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAkD9D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,wCAAwC,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAMnF,oBAAY,wBAAwB;IAClC,QAAQ,aAAa;IACrB,MAAM,WAAW;CAClB;AAED,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,MAAM;;IAChD,MAAM,CAAC,QAAQ,CAAC,yBAAyB,+BAA+B;IAChE,CAAC,aAAa,CAAC,EAAE,OAAO,cAAc,CAAC;IAG/C,IAAa,IAAI,IAAI,MAAM,CAE1B;IAEc,OAAO,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAkD9D"}

package/index.js

@@ -35,8 +35,9 @@ class BackbonePlugin extends Plugin {
       methods.set(endpointMethodName, pathItem);
     });
     const processors = await Promise.all(
-      [...endpoints.entries()].map(
-        async ([endpointName, methods]) => EndpointProcessor.create(endpointName, this, methods, storage.outputDir)
+      Array.from(
+        endpoints.entries(),
+        async ([endpointName, methods]) => EndpointProcessor.create(endpointName, methods, storage, this)
       )
     );
     return Promise.all(processors.map(async (processor) => processor.process()));
@@ -44,7 +45,7 @@ class BackbonePlugin extends Plugin {
   #processEntities(storage) {
     this.logger.debug("Processing entities");
     return storage.api.components?.schemas ? Object.entries(storage.api.components.schemas).map(
-      ([name, component]) => new EntityProcessor(name, component, this).process()
+      ([name, component]) => new EntityProcessor(name, component, storage, this).process()
     ) : [];
   }
 }

package/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["src/index.ts"],
-  "sourcesContent": ["import Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport type SharedStorage from '@vaadin/hilla-generator-core/SharedStorage.js';\nimport type { OpenAPIV3 } from 'openapi-types';\nimport type { ReadonlyDeep } from 'type-fest';\nimport type { SourceFile } from 'typescript';\nimport EndpointProcessor from './EndpointProcessor.js';\nimport { EntityProcessor } from './EntityProcessor.js';\n\nexport enum BackbonePluginSourceType {\n  Endpoint = 'endpoint',\n  Entity = 'entity',\n}\n\nexport default class BackbonePlugin extends Plugin {\n  static readonly BACKBONE_PLUGIN_FILE_TAGS = 'BACKBONE_PLUGIN_FILE_TAGS';\n  declare ['constructor']: typeof BackbonePlugin;\n  readonly #tags = new WeakMap<SourceFile, BackbonePluginSourceType>();\n\n  override get path(): string {\n    return import.meta.url;\n  }\n\n  override async execute(storage: SharedStorage): Promise<void> {\n    const endpointSourceFiles = await this.#processEndpoints(storage);\n    const entitySourceFiles = this.#processEntities(storage);\n\n    endpointSourceFiles.forEach((file) => this.#tags.set(file, BackbonePluginSourceType.Endpoint));\n    entitySourceFiles.forEach((file) => this.#tags.set(file, BackbonePluginSourceType.Entity));\n\n    storage.sources.push(...endpointSourceFiles, ...entitySourceFiles);\n    storage.pluginStorage.set(this.constructor.BACKBONE_PLUGIN_FILE_TAGS, this.#tags);\n  }\n\n  async #processEndpoints(storage: SharedStorage): Promise<readonly SourceFile[]> {\n    this.logger.debug('Processing endpoints');\n    const endpoints = new Map<string, Map<string, ReadonlyDeep<OpenAPIV3.PathItemObject>>>();\n\n    Object.entries(storage.api.paths)\n      .filter(([, pathItem]) => !!pathItem)\n      .forEach(([path, pathItem]) => {\n        const [, endpointName, endpointMethodName] = path.split('/');\n\n        let methods: Map<string, ReadonlyDeep<OpenAPIV3.PathItemObject>>;\n\n        if (endpoints.has(endpointName)) {\n          methods = endpoints.get(endpointName)!;\n        } else {\n          methods = new Map();\n          endpoints.set(endpointName, methods);\n        }\n\n        methods.set(endpointMethodName, pathItem!);\n      });\n\n    const processors = await Promise.all(\n      [...endpoints.entries()].map(async ([endpointName, methods]) =>\n        EndpointProcessor.create(endpointName, this, methods, storage.outputDir),\n      ),\n    );\n\n    return Promise.all(processors.map(async (processor) => processor.process()));\n  }\n\n  #processEntities(storage: SharedStorage): readonly SourceFile[] {\n    this.logger.debug('Processing entities');\n\n    return storage.api.components?.schemas\n      ? Object.entries(storage.api.components.schemas).map(([name, component]) =>\n          new EntityProcessor(name, component, this).process(),\n        )\n      : [];\n  }\n}\n"],
-  "mappings": "AAAA,OAAO,YAAY;AAKnB,OAAO,uBAAuB;AAC9B,SAAS,uBAAuB;AAEzB,IAAK,2BAAL,kBAAKA,8BAAL;AACL,EAAAA,0BAAA,cAAW;AACX,EAAAA,0BAAA,YAAS;AAFC,SAAAA;AAAA,GAAA;AAKZ,MAAO,uBAAqC,OAAO;AAAA,EACjD,OAAgB,4BAA4B;AAAA,EAEnC,QAAQ,oBAAI,QAA8C;AAAA,EAEnE,IAAa,OAAe;AAC1B,WAAO,YAAY;AAAA,EACrB;AAAA,EAEA,MAAe,QAAQ,SAAuC;AAC5D,UAAM,sBAAsB,MAAM,KAAK,kBAAkB,OAAO;AAChE,UAAM,oBAAoB,KAAK,iBAAiB,OAAO;AAEvD,wBAAoB,QAAQ,CAAC,SAAS,KAAK,MAAM,IAAI,MAAM,yBAAiC,CAAC;AAC7F,sBAAkB,QAAQ,CAAC,SAAS,KAAK,MAAM,IAAI,MAAM,qBAA+B,CAAC;AAEzF,YAAQ,QAAQ,KAAK,GAAG,qBAAqB,GAAG,iBAAiB;AACjE,YAAQ,cAAc,IAAI,KAAK,YAAY,2BAA2B,KAAK,KAAK;AAAA,EAClF;AAAA,EAEA,MAAM,kBAAkB,SAAwD;AAC9E,SAAK,OAAO,MAAM,sBAAsB;AACxC,UAAM,YAAY,oBAAI,IAAiE;AAEvF,WAAO,QAAQ,QAAQ,IAAI,KAAK,EAC7B,OAAO,CAAC,CAAC,EAAE,QAAQ,MAAM,CAAC,CAAC,QAAQ,EACnC,QAAQ,CAAC,CAAC,MAAM,QAAQ,MAAM;AAC7B,YAAM,CAAC,EAAE,cAAc,kBAAkB,IAAI,KAAK,MAAM,GAAG;AAE3D,UAAI;AAEJ,UAAI,UAAU,IAAI,YAAY,GAAG;AAC/B,kBAAU,UAAU,IAAI,YAAY;AAAA,MACtC,OAAO;AACL,kBAAU,oBAAI,IAAI;AAClB,kBAAU,IAAI,cAAc,OAAO;AAAA,MACrC;AAEA,cAAQ,IAAI,oBAAoB,QAAS;AAAA,IAC3C,CAAC;AAEH,UAAM,aAAa,MAAM,QAAQ;AAAA,MAC/B,CAAC,GAAG,UAAU,QAAQ,CAAC,EAAE;AAAA,QAAI,OAAO,CAAC,cAAc,OAAO,MACxD,kBAAkB,OAAO,cAAc,MAAM,SAAS,QAAQ,SAAS;AAAA,MACzE;AAAA,IACF;AAEA,WAAO,QAAQ,IAAI,WAAW,IAAI,OAAO,cAAc,UAAU,QAAQ,CAAC,CAAC;AAAA,EAC7E;AAAA,EAEA,iBAAiB,SAA+C;AAC9D,SAAK,OAAO,MAAM,qBAAqB;AAEvC,WAAO,QAAQ,IAAI,YAAY,UAC3B,OAAO,QAAQ,QAAQ,IAAI,WAAW,OAAO,EAAE;AAAA,MAAI,CAAC,CAAC,MAAM,SAAS,MAClE,IAAI,gBAAgB,MAAM,WAAW,IAAI,EAAE,QAAQ;AAAA,IACrD,IACA,CAAC;AAAA,EACP;AACF;",
+  "sourcesContent": ["import Plugin from '@vaadin/hilla-generator-core/Plugin.js';\nimport type { SharedStorage } from '@vaadin/hilla-generator-core/SharedStorage.js';\nimport type { OpenAPIV3 } from 'openapi-types';\nimport type { SourceFile } from 'typescript';\nimport EndpointProcessor from './EndpointProcessor.js';\nimport { EntityProcessor } from './EntityProcessor.js';\n\nexport enum BackbonePluginSourceType {\n  Endpoint = 'endpoint',\n  Entity = 'entity',\n}\n\nexport default class BackbonePlugin extends Plugin {\n  static readonly BACKBONE_PLUGIN_FILE_TAGS = 'BACKBONE_PLUGIN_FILE_TAGS';\n  declare ['constructor']: typeof BackbonePlugin;\n  readonly #tags = new WeakMap<SourceFile, BackbonePluginSourceType>();\n\n  override get path(): string {\n    return import.meta.url;\n  }\n\n  override async execute(storage: SharedStorage): Promise<void> {\n    const endpointSourceFiles = await this.#processEndpoints(storage);\n    const entitySourceFiles = this.#processEntities(storage);\n\n    endpointSourceFiles.forEach((file) => this.#tags.set(file, BackbonePluginSourceType.Endpoint));\n    entitySourceFiles.forEach((file) => this.#tags.set(file, BackbonePluginSourceType.Entity));\n\n    storage.sources.push(...endpointSourceFiles, ...entitySourceFiles);\n    storage.pluginStorage.set(this.constructor.BACKBONE_PLUGIN_FILE_TAGS, this.#tags);\n  }\n\n  async #processEndpoints(storage: SharedStorage): Promise<readonly SourceFile[]> {\n    this.logger.debug('Processing endpoints');\n    const endpoints = new Map<string, Map<string, OpenAPIV3.PathItemObject>>();\n\n    Object.entries(storage.api.paths)\n      .filter(([, pathItem]) => !!pathItem)\n      .forEach(([path, pathItem]) => {\n        const [, endpointName, endpointMethodName] = path.split('/');\n\n        let methods: Map<string, OpenAPIV3.PathItemObject>;\n\n        if (endpoints.has(endpointName)) {\n          methods = endpoints.get(endpointName)!;\n        } else {\n          methods = new Map();\n          endpoints.set(endpointName, methods);\n        }\n\n        methods.set(endpointMethodName, pathItem!);\n      });\n\n    const processors = await Promise.all(\n      Array.from(endpoints.entries(), async ([endpointName, methods]) =>\n        EndpointProcessor.create(endpointName, methods, storage, this),\n      ),\n    );\n\n    return Promise.all(processors.map(async (processor) => processor.process()));\n  }\n\n  #processEntities(storage: SharedStorage): readonly SourceFile[] {\n    this.logger.debug('Processing entities');\n\n    return storage.api.components?.schemas\n      ? Object.entries(storage.api.components.schemas).map(([name, component]) =>\n          new EntityProcessor(name, component, storage, this).process(),\n        )\n      : [];\n  }\n}\n"],
+  "mappings": "AAAA,OAAO,YAAY;AAInB,OAAO,uBAAuB;AAC9B,SAAS,uBAAuB;AAEzB,IAAK,2BAAL,kBAAKA,8BAAL;AACL,EAAAA,0BAAA,cAAW;AACX,EAAAA,0BAAA,YAAS;AAFC,SAAAA;AAAA,GAAA;AAKZ,MAAO,uBAAqC,OAAO;AAAA,EACjD,OAAgB,4BAA4B;AAAA,EAEnC,QAAQ,oBAAI,QAA8C;AAAA,EAEnE,IAAa,OAAe;AAC1B,WAAO,YAAY;AAAA,EACrB;AAAA,EAEA,MAAe,QAAQ,SAAuC;AAC5D,UAAM,sBAAsB,MAAM,KAAK,kBAAkB,OAAO;AAChE,UAAM,oBAAoB,KAAK,iBAAiB,OAAO;AAEvD,wBAAoB,QAAQ,CAAC,SAAS,KAAK,MAAM,IAAI,MAAM,yBAAiC,CAAC;AAC7F,sBAAkB,QAAQ,CAAC,SAAS,KAAK,MAAM,IAAI,MAAM,qBAA+B,CAAC;AAEzF,YAAQ,QAAQ,KAAK,GAAG,qBAAqB,GAAG,iBAAiB;AACjE,YAAQ,cAAc,IAAI,KAAK,YAAY,2BAA2B,KAAK,KAAK;AAAA,EAClF;AAAA,EAEA,MAAM,kBAAkB,SAAwD;AAC9E,SAAK,OAAO,MAAM,sBAAsB;AACxC,UAAM,YAAY,oBAAI,IAAmD;AAEzE,WAAO,QAAQ,QAAQ,IAAI,KAAK,EAC7B,OAAO,CAAC,CAAC,EAAE,QAAQ,MAAM,CAAC,CAAC,QAAQ,EACnC,QAAQ,CAAC,CAAC,MAAM,QAAQ,MAAM;AAC7B,YAAM,CAAC,EAAE,cAAc,kBAAkB,IAAI,KAAK,MAAM,GAAG;AAE3D,UAAI;AAEJ,UAAI,UAAU,IAAI,YAAY,GAAG;AAC/B,kBAAU,UAAU,IAAI,YAAY;AAAA,MACtC,OAAO;AACL,kBAAU,oBAAI,IAAI;AAClB,kBAAU,IAAI,cAAc,OAAO;AAAA,MACrC;AAEA,cAAQ,IAAI,oBAAoB,QAAS;AAAA,IAC3C,CAAC;AAEH,UAAM,aAAa,MAAM,QAAQ;AAAA,MAC/B,MAAM;AAAA,QAAK,UAAU,QAAQ;AAAA,QAAG,OAAO,CAAC,cAAc,OAAO,MAC3D,kBAAkB,OAAO,cAAc,SAAS,SAAS,IAAI;AAAA,MAC/D;AAAA,IACF;AAEA,WAAO,QAAQ,IAAI,WAAW,IAAI,OAAO,cAAc,UAAU,QAAQ,CAAC,CAAC;AAAA,EAC7E;AAAA,EAEA,iBAAiB,SAA+C;AAC9D,SAAK,OAAO,MAAM,qBAAqB;AAEvC,WAAO,QAAQ,IAAI,YAAY,UAC3B,OAAO,QAAQ,QAAQ,IAAI,WAAW,OAAO,EAAE;AAAA,MAAI,CAAC,CAAC,MAAM,SAAS,MAClE,IAAI,gBAAgB,MAAM,WAAW,SAAS,IAAI,EAAE,QAAQ;AAAA,IAC9D,IACA,CAAC;AAAA,EACP;AACF;",
   "names": ["BackbonePluginSourceType"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-backbone",
-  "version": "24.6.5",
+  "version": "24.7.0-alpha11",
   "description": "A Hilla TypeScript Generator plugin to generate basic code",
   "main": "index.js",
   "type": "module",
@@ -15,9 +15,10 @@
     "build:copy": "cd src && copyfiles **/*.d.ts ..",
     "lint": "eslint src test",
     "lint:fix": "eslint src test --fix",
-    "test": "mocha test/**/*.spec.ts --config ../../../.mocharc.cjs",
-    "test:update": "npm run test -- --update",
-    "test:coverage": "c8 --experimental-monocart -c ../../../.c8rc.json npm test",
+    "test": "vitest --run",
+    "test:coverage": "vitest --run --coverage",
+    "test:update": "vitest --run --update",
+    "test:watch": "vitest",
     "typecheck": "tsc --noEmit"
   },
   "exports": {
@@ -51,30 +52,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.5",
-    "@vaadin/hilla-generator-utils": "24.6.5",
-    "fast-deep-equal": "^3.1.3",
-    "openapi-types": "^12.1.3",
-    "typescript": "5.7.2"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.6",
-    "@types/mocha": "^10.0.2",
-    "@types/node": "^20.7.1",
-    "@types/sinon": "^10.0.17",
-    "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.5",
-    "c8": "^10.1.2",
-    "chai": "^4.3.10",
-    "concurrently": "^8.2.1",
-    "copyfiles": "^2.4.1",
-    "mocha": "^10.8.2",
-    "monocart-coverage-reports": "^2.11.5",
-    "pino": "^8.21.0",
-    "sinon": "^16.1.3",
-    "sinon-chai": "^3.7.0",
-    "type-fest": "^4.3.2"
+    "@vaadin/hilla-generator-core": "24.7.0-alpha11",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha11",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha11",
+    "fast-deep-equal": "3.1.3",
+    "openapi-types": "12.1.3",
+    "typescript": "5.7.3"
   }
 }