@odata-effect/odata-effect-generator 0.1.1 → 0.2.0

package/dist/cjs/generator/OperationsGenerator.js

@@ -0,0 +1,384 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getOperationsModuleName = exports.getOperationFunctionName = exports.generateOperations = void 0;
+var _NamingHelper = require("./NamingHelper.js");
+const V2_CONFIG = {
+  clientConfigTag: "ODataClientConfig",
+  clientConfigImport: "ODataClientConfig",
+  clientModule: "ODataClient"
+};
+const V4_CONFIG = {
+  clientConfigTag: "ODataV4ClientConfig",
+  clientConfigImport: "ODataV4ClientConfig",
+  clientModule: "ODataV4Client"
+};
+const getVersionConfig = version => version === "V4" ? V4_CONFIG : V2_CONFIG;
+/**
+ * Get the function name for an operation.
+ *
+ * @since 1.0.0
+ * @category naming
+ */
+const getOperationFunctionName = operation => {
+  return (0, _NamingHelper.toCamelCase)(operation.name);
+};
+/**
+ * Get the operations module name.
+ *
+ * @since 1.0.0
+ * @category naming
+ */
+exports.getOperationFunctionName = getOperationFunctionName;
+const getOperationsModuleName = () => "Operations";
+/**
+ * Generate the operations file.
+ *
+ * @since 1.0.0
+ * @category generation
+ */
+exports.getOperationsModuleName = getOperationsModuleName;
+const generateOperations = dataModel => {
+  // Get unbound operations only (bound operations are attached to entity services)
+  const unboundOperations = Array.from(dataModel.operations.values()).filter(op => !op.isBound);
+  if (unboundOperations.length === 0) {
+    return {
+      operationsFile: null
+    };
+  }
+  const content = generateOperationsFile(unboundOperations, dataModel);
+  return {
+    operationsFile: {
+      fileName: `${getOperationsModuleName()}.ts`,
+      content
+    }
+  };
+};
+/**
+ * Determine if an operation returns an entity or complex type that needs a schema.
+ */
+exports.generateOperations = generateOperations;
+const returnsModelType = (operation, dataModel) => {
+  if (!operation.returnType) return false;
+  const {
+    odataType
+  } = operation.returnType;
+  // Remove Collection() wrapper if present
+  const baseType = odataType.replace(/^Collection\(|\)$/g, "");
+  // Get the type name (may be fully qualified)
+  const typeName = baseType.includes(".") ? baseType.split(".").pop() ?? baseType : baseType;
+  // Check if it's an entity or complex type
+  for (const [fqName] of dataModel.entityTypes) {
+    if (fqName.endsWith(`.${typeName}`) || fqName === typeName) return true;
+  }
+  for (const [fqName] of dataModel.complexTypes) {
+    if (fqName.endsWith(`.${typeName}`) || fqName === typeName) return true;
+  }
+  return false;
+};
+/**
+ * Get the return type's TypeScript type name.
+ */
+const getReturnTypeName = operation => {
+  if (!operation.returnType) return "void";
+  const {
+    typeMapping,
+    isCollection
+  } = operation.returnType;
+  const baseType = typeMapping.tsType;
+  return isCollection ? `ReadonlyArray<${baseType}>` : baseType;
+};
+/**
+ * Collect all model types that need to be imported.
+ */
+const collectModelImports = (operations, dataModel) => {
+  const imports = new Set();
+  const isModelType = typeName => {
+    for (const [fqName] of dataModel.entityTypes) {
+      if (fqName.endsWith(`.${typeName}`) || fqName === typeName) return true;
+    }
+    for (const [fqName] of dataModel.complexTypes) {
+      if (fqName.endsWith(`.${typeName}`) || fqName === typeName) return true;
+    }
+    return false;
+  };
+  for (const operation of operations) {
+    // Check return type
+    if (operation.returnType) {
+      const typeName = operation.returnType.typeMapping.tsType;
+      if (isModelType(typeName)) {
+        imports.add(typeName);
+      }
+    }
+    // Check parameter types
+    for (const param of operation.parameters) {
+      const typeName = param.typeMapping.tsType;
+      if (isModelType(typeName)) {
+        imports.add(typeName);
+      }
+    }
+  }
+  return imports;
+};
+/**
+ * Generate the operations file content.
+ */
+const generateOperationsFile = (operations, dataModel) => {
+  const lines = [];
+  const versionConfig = getVersionConfig(dataModel.version);
+  const isV4 = dataModel.version === "V4";
+  // Header and imports
+  lines.push(`/**`);
+  lines.push(` * OData operations for ${dataModel.serviceName} OData ${dataModel.version}.`);
+  lines.push(` * Generated by odata-effect-gen.`);
+  lines.push(` *`);
+  lines.push(` * @since 1.0.0`);
+  lines.push(` */`);
+  lines.push(`import * as Effect from "effect/Effect"`);
+  lines.push(`import { HttpClient } from "@effect/platform"`);
+  lines.push(`import type * as HttpClientError from "@effect/platform/HttpClientError"`);
+  lines.push(``);
+  // Import Operations module
+  lines.push(`import * as ODataOps from "@odata-effect/odata-effect/Operations"`);
+  lines.push(`import {`);
+  lines.push(`  ${versionConfig.clientConfigImport}`);
+  lines.push(`} from "@odata-effect/odata-effect/${versionConfig.clientModule}"`);
+  lines.push(`import {`);
+  if (!isV4) {
+    lines.push(`  type SapError,`);
+  }
+  lines.push(`  type ODataError,`);
+  lines.push(`  type ParseError`);
+  lines.push(`} from "@odata-effect/odata-effect/Errors"`);
+  lines.push(``);
+  // Import model types if needed
+  const modelImports = collectModelImports(operations, dataModel);
+  if (modelImports.size > 0) {
+    lines.push(`import {`);
+    const importsList = Array.from(modelImports);
+    for (let i = 0; i < importsList.length; i++) {
+      const isLast = i === importsList.length - 1;
+      lines.push(`  ${importsList[i]}${isLast ? "" : ","}`);
+    }
+    lines.push(`} from "./Models"`);
+    lines.push(``);
+  }
+  // Error type
+  lines.push(`// ============================================================================`);
+  lines.push(`// Types`);
+  lines.push(`// ============================================================================`);
+  lines.push(``);
+  lines.push(`/**`);
+  lines.push(` * Error type for operation calls.`);
+  lines.push(` *`);
+  lines.push(` * @since 1.0.0`);
+  lines.push(` * @category errors`);
+  lines.push(` */`);
+  lines.push(`export type OperationsError =`);
+  lines.push(`  | HttpClientError.HttpClientError`);
+  lines.push(`  | ParseError`);
+  if (!isV4) {
+    lines.push(`  | SapError`);
+  }
+  lines.push(`  | ODataError`);
+  lines.push(``);
+  // Dependencies type
+  lines.push(`/**`);
+  lines.push(` * Dependencies required for operation calls.`);
+  lines.push(` *`);
+  lines.push(` * @since 1.0.0`);
+  lines.push(` * @category context`);
+  lines.push(` */`);
+  lines.push(`export type OperationsContext = ${versionConfig.clientConfigTag} | HttpClient.HttpClient`);
+  lines.push(``);
+  // Generate each operation
+  lines.push(`// ============================================================================`);
+  lines.push(`// Operations`);
+  lines.push(`// ============================================================================`);
+  lines.push(``);
+  for (const operation of operations) {
+    if (isV4) {
+      generateV4Operation(lines, operation, dataModel);
+    } else {
+      generateV2FunctionImport(lines, operation, dataModel);
+    }
+    lines.push(``);
+  }
+  return lines.join("\n");
+};
+/**
+ * Generate parameter interface for an operation.
+ */
+const generateParameterType = operation => {
+  if (operation.parameters.length === 0) return null;
+  const typeName = `${(0, _NamingHelper.toPascalCase)(operation.name)}Params`;
+  return typeName;
+};
+/**
+ * Generate parameter interface definition.
+ */
+const generateParameterInterface = (lines, operation) => {
+  if (operation.parameters.length === 0) return;
+  const typeName = `${(0, _NamingHelper.toPascalCase)(operation.name)}Params`;
+  lines.push(`/**`);
+  lines.push(` * Parameters for ${operation.odataName} operation.`);
+  lines.push(` *`);
+  lines.push(` * @since 1.0.0`);
+  lines.push(` * @category params`);
+  lines.push(` */`);
+  lines.push(`export interface ${typeName} {`);
+  for (const param of operation.parameters) {
+    const optionalMark = param.isNullable ? "?" : "";
+    const tsType = param.isCollection ? `ReadonlyArray<${param.typeMapping.tsType}>` : param.typeMapping.tsType;
+    lines.push(`  readonly ${param.name}${optionalMark}: ${tsType}`);
+  }
+  lines.push(`}`);
+  lines.push(``);
+};
+/**
+ * Generate V2 FunctionImport function.
+ */
+const generateV2FunctionImport = (lines, operation, dataModel) => {
+  const fnName = getOperationFunctionName(operation);
+  const paramsType = generateParameterType(operation);
+  const returnType = getReturnTypeName(operation);
+  const returnsModel = returnsModelType(operation, dataModel);
+  // Generate parameter interface if needed
+  generateParameterInterface(lines, operation);
+  lines.push(`/**`);
+  lines.push(` * Execute the ${operation.odataName} function import.`);
+  lines.push(` *`);
+  lines.push(` * @since 1.0.0`);
+  lines.push(` * @category operations`);
+  lines.push(` */`);
+  // Function signature
+  if (paramsType) {
+    lines.push(`export const ${fnName} = (`);
+    lines.push(`  params: ${paramsType}`);
+    lines.push(`): Effect.Effect<`);
+  } else {
+    lines.push(`export const ${fnName} = (): Effect.Effect<`);
+  }
+  lines.push(`  ${returnType},`);
+  lines.push(`  OperationsError,`);
+  lines.push(`  OperationsContext`);
+  lines.push(`> =>`);
+  lines.push(`  Effect.gen(function*() {`);
+  lines.push(`    const config = yield* ${V2_CONFIG.clientConfigImport}`);
+  lines.push(`    const client = yield* HttpClient.HttpClient`);
+  lines.push(``);
+  // Build parameters object for the function import URL
+  if (paramsType) {
+    lines.push(`    const parameters: ODataOps.OperationParameters = {`);
+    for (const param of operation.parameters) {
+      lines.push(`      ${param.name}: params.${param.name},`);
+    }
+    lines.push(`    }`);
+    lines.push(``);
+  }
+  const paramsArg = paramsType ? "parameters" : "undefined";
+  // Determine the execute function to use
+  if (!operation.returnType) {
+    lines.push(`    return yield* ODataOps.executeFunctionImportVoid(client, config, "${operation.odataName}", ${paramsArg})`);
+  } else if (operation.returnType.isCollection) {
+    if (returnsModel) {
+      lines.push(`    return yield* ODataOps.executeFunctionImportCollection(client, config, "${operation.odataName}", ${operation.returnType.typeMapping.tsType}, ${paramsArg})`);
+    } else {
+      lines.push(`    return yield* ODataOps.executeFunctionImportCollection(client, config, "${operation.odataName}", ${operation.returnType.typeMapping.effectSchema}, ${paramsArg})`);
+    }
+  } else if (returnsModel) {
+    lines.push(`    return yield* ODataOps.executeFunctionImportEntity(client, config, "${operation.odataName}", ${operation.returnType.typeMapping.tsType}, ${paramsArg})`);
+  } else {
+    // Primitive return
+    const propertyName = operation.odataName;
+    lines.push(`    return yield* ODataOps.executeFunctionImportPrimitive(client, config, "${operation.odataName}", "${propertyName}", ${operation.returnType.typeMapping.effectSchema}, ${paramsArg})`);
+  }
+  lines.push(`  })`);
+};
+/**
+ * Generate V4 Function or Action.
+ */
+const generateV4Operation = (lines, operation, dataModel) => {
+  const fnName = getOperationFunctionName(operation);
+  const paramsType = generateParameterType(operation);
+  const returnType = getReturnTypeName(operation);
+  const returnsModel = returnsModelType(operation, dataModel);
+  const isAction = operation.type === "Action";
+  // Generate parameter interface if needed
+  generateParameterInterface(lines, operation);
+  lines.push(`/**`);
+  lines.push(` * Execute the ${operation.odataName} ${operation.type.toLowerCase()}.`);
+  lines.push(` *`);
+  lines.push(` * @since 1.0.0`);
+  lines.push(` * @category operations`);
+  lines.push(` */`);
+  // Function signature
+  if (paramsType) {
+    lines.push(`export const ${fnName} = (`);
+    lines.push(`  params: ${paramsType}`);
+    lines.push(`): Effect.Effect<`);
+  } else {
+    lines.push(`export const ${fnName} = (): Effect.Effect<`);
+  }
+  lines.push(`  ${returnType},`);
+  lines.push(`  OperationsError,`);
+  lines.push(`  OperationsContext`);
+  lines.push(`> =>`);
+  lines.push(`  Effect.gen(function*() {`);
+  lines.push(`    const config = yield* ${V4_CONFIG.clientConfigImport}`);
+  lines.push(`    const client = yield* HttpClient.HttpClient`);
+  lines.push(``);
+  // Build URL for functions or action
+  if (!isAction) {
+    // V4 Functions use GET with parameters in URL
+    if (paramsType) {
+      lines.push(`    const parameters: ODataOps.OperationParameters = {`);
+      for (const param of operation.parameters) {
+        lines.push(`      ${param.name}: params.${param.name},`);
+      }
+      lines.push(`    }`);
+      lines.push(`    const url = ODataOps.buildV4FunctionUrl("${operation.odataName}", parameters)`);
+    } else {
+      lines.push(`    const url = ODataOps.buildV4FunctionUrl("${operation.odataName}")`);
+    }
+    lines.push(``);
+    // Determine the execute function to use
+    if (!operation.returnType) {
+      lines.push(`    return yield* ODataOps.executeV4FunctionVoid(client, config, url)`);
+    } else if (operation.returnType.isCollection) {
+      if (returnsModel) {
+        lines.push(`    return yield* ODataOps.executeV4FunctionCollection(client, config, url, ${operation.returnType.typeMapping.tsType})`);
+      } else {
+        lines.push(`    return yield* ODataOps.executeV4FunctionCollection(client, config, url, ${operation.returnType.typeMapping.effectSchema})`);
+      }
+    } else if (returnsModel) {
+      lines.push(`    return yield* ODataOps.executeV4FunctionEntity(client, config, url, ${operation.returnType.typeMapping.tsType})`);
+    } else {
+      // Primitive return
+      lines.push(`    return yield* ODataOps.executeV4FunctionPrimitive(client, config, url, ${operation.returnType.typeMapping.effectSchema})`);
+    }
+  } else {
+    // V4 Actions use POST with body
+    lines.push(`    const url = "${operation.odataName}"`);
+    lines.push(``);
+    const bodyArg = paramsType ? "params" : "undefined";
+    if (!operation.returnType) {
+      lines.push(`    return yield* ODataOps.executeV4ActionVoid(client, config, url, ${bodyArg})`);
+    } else if (operation.returnType.isCollection) {
+      if (returnsModel) {
+        lines.push(`    return yield* ODataOps.executeV4ActionCollection(client, config, url, ${operation.returnType.typeMapping.tsType}, ${bodyArg})`);
+      } else {
+        lines.push(`    return yield* ODataOps.executeV4ActionCollection(client, config, url, ${operation.returnType.typeMapping.effectSchema}, ${bodyArg})`);
+      }
+    } else if (returnsModel) {
+      lines.push(`    return yield* ODataOps.executeV4ActionEntity(client, config, url, ${operation.returnType.typeMapping.tsType}, ${bodyArg})`);
+    } else {
+      // Primitive return - use entity with schema
+      lines.push(`    return yield* ODataOps.executeV4FunctionPrimitive(client, config, url, ${operation.returnType.typeMapping.effectSchema})`);
+    }
+  }
+  lines.push(`  })`);
+};
+//# sourceMappingURL=OperationsGenerator.js.map

package/dist/cjs/generator/OperationsGenerator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OperationsGenerator.js","names":["_NamingHelper","require","V2_CONFIG","clientConfigTag","clientConfigImport","clientModule","V4_CONFIG","getVersionConfig","version","getOperationFunctionName","operation","toCamelCase","name","exports","getOperationsModuleName","generateOperations","dataModel","unboundOperations","Array","from","operations","values","filter","op","isBound","length","operationsFile","content","generateOperationsFile","fileName","returnsModelType","returnType","odataType","baseType","replace","typeName","includes","split","pop","fqName","entityTypes","endsWith","complexTypes","getReturnTypeName","typeMapping","isCollection","tsType","collectModelImports","imports","Set","isModelType","add","param","parameters","lines","versionConfig","isV4","push","serviceName","modelImports","size","importsList","i","isLast","generateV4Operation","generateV2FunctionImport","join","generateParameterType","toPascalCase","generateParameterInterface","odataName","optionalMark","isNullable","fnName","paramsType","returnsModel","paramsArg","effectSchema","propertyName","isAction","type","toLowerCase","bodyArg"],"sources":["../../../src/generator/OperationsGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/generator/QueryModelsGenerator.js

@@ -26,7 +26,7 @@ const generateQueryModels = dataModel => {
   lines.push(`  ${Array.from(queryPathTypes).join(",\n  ")},`);
   lines.push(`  createQueryBuilder,`);
   lines.push(`  type QueryBuilder`);
-  lines.push(`} from "@odata-effect/odata-effect"`);
+  lines.push(`} from "@odata-effect/odata-effect/QueryBuilder"`);
   // Import entity types that have entity sets (for QueryBuilder generics)
   const usedEntityNames = [];
   for (const entitySet of dataModel.entitySets.values()) {
@@ -38,7 +38,7 @@ const generateQueryModels = dataModel => {
   if (usedEntityNames.length > 0) {
     lines.push(`import type {`);
     lines.push(`  ${usedEntityNames.join(",\n  ")}`);
-    lines.push(`} from "./Models.js"`);
+    lines.push(`} from "./Models"`);
   }
   lines.push(``);
   // Generate complex type query paths

package/dist/cjs/generator/QueryModelsGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryModelsGenerator.js","names":["_NamingHelper","require","generateQueryModels","dataModel","lines","queryPathTypes","collectQueryPathTypes","push","serviceName","Array","from","join","usedEntityNames","entitySet","entitySets","values","entityType","entityTypes","get","entityTypeFqName","name","length","complexType","complexTypes","line","generateQueryInterface","generateQueryInstance","generateQueryFactory","exports","types","Set","addPropertyTypes","props","prop","add","typeMapping","queryPath","split","addNavPropertyTypes","navProps","navProp","isCollection","properties","navigationProperties","type","interfaceName","getQueryInterfaceName","odataName","basePathType","pathType","startsWith","replace","targetQName","getClassName","targetType","instanceName","getQueryInstanceName","allFields","i","pathClass","isLast","targetMatch","match","targetInstanceName","factoryName","getQueryFactoryName"],"sources":["../../../src/generator/QueryModelsGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"QueryModelsGenerator.js","names":["_NamingHelper","require","generateQueryModels","dataModel","lines","queryPathTypes","collectQueryPathTypes","push","serviceName","Array","from","join","usedEntityNames","entitySet","entitySets","values","entityType","entityTypes","get","entityTypeFqName","name","length","complexType","complexTypes","line","generateQueryInterface","generateQueryInstance","generateQueryFactory","exports","types","Set","addPropertyTypes","props","prop","add","typeMapping","queryPath","split","addNavPropertyTypes","navProps","navProp","isCollection","properties","navigationProperties","type","interfaceName","getQueryInterfaceName","odataName","basePathType","pathType","startsWith","replace","targetQName","getClassName","targetType","instanceName","getQueryInstanceName","allFields","i","pathClass","isLast","targetMatch","match","targetInstanceName","factoryName","getQueryFactoryName"],"sources":["../../../src/generator/QueryModelsGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/generator/ServiceFnGenerator.js

@@ -85,20 +85,31 @@ const generateEntityServiceFnFile = (entitySet, entityType, dataModel) => {
     lines.push(`  type ${idTypeName},`);
   }
   lines.push(`  ${editableName}`);
-  lines.push(`} from "./Models.js"`);
+  lines.push(`} from "./Models"`);
   lines.push(``);
-  // Import OData infrastructure (version-specific)
+  // Import OData infrastructure (version-specific) using subpath imports for tree-shaking
+  if (isV4) {
+    lines.push(`import * as ${versionConfig.odataNamespace} from "@odata-effect/odata-effect/ODataV4"`);
+    lines.push(`import {`);
+    lines.push(`  type ${versionConfig.clientConfigTag},`);
+    lines.push(`  ${versionConfig.buildEntityPath},`);
+    lines.push(`  type ${versionConfig.queryOptionsType}`);
+    lines.push(`} from "@odata-effect/odata-effect/ODataV4Client"`);
+  } else {
+    lines.push(`import * as ${versionConfig.odataNamespace} from "@odata-effect/odata-effect/OData"`);
+    lines.push(`import {`);
+    lines.push(`  type ${versionConfig.clientConfigTag},`);
+    lines.push(`  ${versionConfig.buildEntityPath},`);
+    lines.push(`  type ${versionConfig.queryOptionsType}`);
+    lines.push(`} from "@odata-effect/odata-effect/ODataClient"`);
+  }
   lines.push(`import {`);
-  lines.push(`  ${versionConfig.odataNamespace},`);
-  lines.push(`  ${versionConfig.buildEntityPath},`);
-  lines.push(`  ${versionConfig.clientConfigTag},`);
-  lines.push(`  type ${versionConfig.queryOptionsType},`);
   if (!isV4) {
     lines.push(`  type SapError,`);
   }
   lines.push(`  type ODataError,`);
   lines.push(`  type ParseError`);
-  lines.push(`} from "@odata-effect/odata-effect"`);
+  lines.push(`} from "@odata-effect/odata-effect/Errors"`);
   lines.push(``);
   // Service error type
   lines.push(`// ============================================================================`);

package/dist/cjs/generator/ServiceFnGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceFnGenerator.js","names":["_NamingHelper","require","V2_CONFIG","odataNamespace","buildEntityPath","queryOptionsType","clientConfigTag","V4_CONFIG","getVersionConfig","version","generateServiceFns","dataModel","entityServices","entitySet","entitySets","values","entityType","entityTypes","get","entityTypeFqName","serviceClassName","getServiceClassName","name","push","fileName","content","generateEntityServiceFnFile","exports","lines","versionConfig","entityName","idTypeName","getIdTypeName","editableName","getEditableTypeName","hasKeys","keys","length","isV4","serviceName","toLowerCase","normalizeIdFn","keyProp","keyTsType","typeMapping","tsType","primitiveCheck","keyParts","map","k","odataName","join","keyObj"],"sources":["../../../src/generator/ServiceFnGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ServiceFnGenerator.js","names":["_NamingHelper","require","V2_CONFIG","odataNamespace","buildEntityPath","queryOptionsType","clientConfigTag","V4_CONFIG","getVersionConfig","version","generateServiceFns","dataModel","entityServices","entitySet","entitySets","values","entityType","entityTypes","get","entityTypeFqName","serviceClassName","getServiceClassName","name","push","fileName","content","generateEntityServiceFnFile","exports","lines","versionConfig","entityName","idTypeName","getIdTypeName","editableName","getEditableTypeName","hasKeys","keys","length","isV4","serviceName","toLowerCase","normalizeIdFn","keyProp","keyTsType","typeMapping","tsType","primitiveCheck","keyParts","map","k","odataName","join","keyObj"],"sources":["../../../src/generator/ServiceFnGenerator.ts"],"sourcesContent":[null],"mappings":";;;;;;AAWA,IAAAA,aAAA,GAAAC,OAAA;AAYA,MAAMC,SAAS,GAAkB;EAC/BC,cAAc,EAAE,OAAO;EACvBC,eAAe,EAAE,iBAAiB;EAClCC,gBAAgB,EAAE,mBAAmB;EACrCC,eAAe,EAAE;CAClB;AAED,MAAMC,SAAS,GAAkB;EAC/BJ,cAAc,EAAE,SAAS;EACzBC,eAAe,EAAE,mBAAmB;EACpCC,gBAAgB,EAAE,qBAAqB;EACvCC,eAAe,EAAE;CAClB;AAED,MAAME,gBAAgB,GAAIC,OAAqB,IAAoBA,OAAO,KAAK,IAAI,GAAGF,SAAS,GAAGL,SAAS;AAuB3G;;;;;;AAMO,MAAMQ,kBAAkB,GAAIC,SAAoB,IAA+B;EACpF,MAAMC,cAAc,GAAkC,EAAE;EAExD;EACA,KAAK,MAAMC,SAAS,IAAIF,SAAS,CAACG,UAAU,CAACC,MAAM,EAAE,EAAE;IACrD,MAAMC,UAAU,GAAGL,SAAS,CAACM,WAAW,CAACC,GAAG,CAACL,SAAS,CAACM,gBAAgB,CAAC;IACxE,IAAIH,UAAU,EAAE;MACd,MAAMI,gBAAgB,GAAG,IAAAC,iCAAmB,EAACR,SAAS,CAACS,IAAI,CAAC;MAC5DV,cAAc,CAACW,IAAI,CAAC;QAClBC,QAAQ,EAAE,GAAGJ,gBAAgB,KAAK;QAClCK,OAAO,EAAEC,2BAA2B,CAACb,SAAS,EAAEG,UAAU,EAAEL,SAAS;OACtE,CAAC;IACJ;EACF;EAEA,OAAO;IAAEC;EAAc,CAAE;AAC3B,CAAC;AAED;;;AAAAe,OAAA,CAAAjB,kBAAA,GAAAA,kBAAA;AAGA,MAAMgB,2BAA2B,GAAGA,CAClCb,SAAyB,EACzBG,UAA2B,EAC3BL,SAAoB,KACV;EACV,MAAMiB,KAAK,GAAkB,EAAE;EAC/B,MAAMC,aAAa,GAAGrB,gBAAgB,CAACG,SAAS,CAACF,OAAO,CAAC;EACzD,MAAMW,gBAAgB,GAAG,IAAAC,iCAAmB,EAACR,SAAS,CAACS,IAAI,CAAC;EAC5D,MAAMQ,UAAU,GAAGd,UAAU,CAACM,IAAI;EAClC,MAAMS,UAAU,GAAG,IAAAC,2BAAa,EAACF,UAAU,CAAC;EAC5C,MAAMG,YAAY,GAAG,IAAAC,iCAAmB,EAACJ,UAAU,CAAC;EACpD,MAAMK,OAAO,GAAGnB,UAAU,CAACoB,IAAI,CAACC,MAAM,GAAG,CAAC;EAC1C,MAAMC,IAAI,GAAG3B,SAAS,CAACF,OAAO,KAAK,IAAI;EAEvC;EACAmB,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;EACjBK,KAAK,CAACL,IAAI,CACR,oBAAoBO,UAAU,0BAA0BnB,SAAS,CAAC4B,WAAW,UAAU5B,SAAS,CAACF,OAAO,GAAG,CAC5G;EACDmB,KAAK,CAACL,IAAI,CAAC,mCAAmC,CAAC;EAC/CK,KAAK,CAACL,IAAI,CAAC,IAAI,CAAC;EAChBK,KAAK,CAACL,IAAI,CAAC,aAAa,CAAC;EACzBK,KAAK,CAACL,IAAI,CAAC,aAAa,CAAC;EACzBK,KAAK,CAACL,IAAI,CAAC,2DAA2D,CAAC;EACvEK,KAAK,CAACL,IAAI,CAAC,eAAeH,gBAAgB,sBAAsBT,SAAS,CAAC4B,WAAW,CAACC,WAAW,EAAE,UAAU,CAAC;EAC9GZ,KAAK,CAACL,IAAI,CAAC,2BAA2BH,gBAAgB,WAAW,CAAC;EAClEQ,KAAK,CAACL,IAAI,CAAC,IAAI,CAAC;EAChBK,KAAK,CAACL,IAAI,CAAC,4CAA4C,CAAC;EACxDK,KAAK,CAACL,IAAI,CAAC,wCAAwCZ,SAAS,CAAC4B,WAAW,CAACC,WAAW,EAAE,WAAWpB,gBAAgB,GAAG,CAAC;EACrHQ,KAAK,CAACL,IAAI,CAAC,kCAAkC,CAAC;EAC9CK,KAAK,CAACL,IAAI,CAAC,WAAW,CAAC;EACvBK,KAAK,CAACL,IAAI,CAAC,IAAI,CAAC;EAChBK,KAAK,CAACL,IAAI,CAAC,iBAAiB,CAAC;EAC7BK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;EACjBK,KAAK,CAACL,IAAI,CAAC,8CAA8C,CAAC;EAC1DK,KAAK,CAACL,IAAI,CAAC,yCAAyC,CAAC;EACrDK,KAAK,CAACL,IAAI,CAAC,oDAAoD,CAAC;EAChEK,KAAK,CAACL,IAAI,CAAC,0EAA0E,CAAC;EACtFK,KAAK,CAACL,IAAI,CAAC,4DAA4D,CAAC;EACxEK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAEd;EACAK,KAAK,CAACL,IAAI,CAAC,UAAU,CAAC;EACtBK,KAAK,CAACL,IAAI,CAAC,KAAKO,UAAU,GAAG,CAAC;EAC9B,IAAIK,OAAO,EAAE;IACXP,KAAK,CAACL,IAAI,CAAC,UAAUQ,UAAU,GAAG,CAAC;EACrC;EACAH,KAAK,CAACL,IAAI,CAAC,KAAKU,YAAY,EAAE,CAAC;EAC/BL,KAAK,CAACL,IAAI,CAAC,mBAAmB,CAAC;EAC/BK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAEd;EACA,IAAIe,IAAI,EAAE;IACRV,KAAK,CAACL,IAAI,CAAC,eAAeM,aAAa,CAAC1B,cAAc,4CAA4C,CAAC;IACnGyB,KAAK,CAACL,IAAI,CAAC,UAAU,CAAC;IACtBK,KAAK,CAACL,IAAI,CAAC,UAAUM,aAAa,CAACvB,eAAe,GAAG,CAAC;IACtDsB,KAAK,CAACL,IAAI,CAAC,KAAKM,aAAa,CAACzB,eAAe,GAAG,CAAC;IACjDwB,KAAK,CAACL,IAAI,CAAC,UAAUM,aAAa,CAACxB,gBAAgB,EAAE,CAAC;IACtDuB,KAAK,CAACL,IAAI,CAAC,mDAAmD,CAAC;EACjE,CAAC,MAAM;IACLK,KAAK,CAACL,IAAI,CAAC,eAAeM,aAAa,CAAC1B,cAAc,0CAA0C,CAAC;IACjGyB,KAAK,CAACL,IAAI,CAAC,UAAU,CAAC;IACtBK,KAAK,CAACL,IAAI,CAAC,UAAUM,aAAa,CAACvB,eAAe,GAAG,CAAC;IACtDsB,KAAK,CAACL,IAAI,CAAC,KAAKM,aAAa,CAACzB,eAAe,GAAG,CAAC;IACjDwB,KAAK,CAACL,IAAI,CAAC,UAAUM,aAAa,CAACxB,gBAAgB,EAAE,CAAC;IACtDuB,KAAK,CAACL,IAAI,CAAC,iDAAiD,CAAC;EAC/D;EACAK,KAAK,CAACL,IAAI,CAAC,UAAU,CAAC;EACtB,IAAI,CAACe,IAAI,EAAE;IACTV,KAAK,CAACL,IAAI,CAAC,kBAAkB,CAAC;EAChC;EACAK,KAAK,CAACL,IAAI,CAAC,oBAAoB,CAAC;EAChCK,KAAK,CAACL,IAAI,CAAC,mBAAmB,CAAC;EAC/BK,KAAK,CAACL,IAAI,CAAC,4CAA4C,CAAC;EACxDK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAEd;EACAK,KAAK,CAACL,IAAI,CAAC,iFAAiF,CAAC;EAC7FK,KAAK,CAACL,IAAI,CAAC,UAAU,CAAC;EACtBK,KAAK,CAACL,IAAI,CAAC,iFAAiF,CAAC;EAC7FK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EACdK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;EACjBK,KAAK,CAACL,IAAI,CAAC,qBAAqBO,UAAU,sBAAsB,CAAC;EACjEF,KAAK,CAACL,IAAI,CAAC,IAAI,CAAC;EAChBK,KAAK,CAACL,IAAI,CAAC,iBAAiB,CAAC;EAC7BK,KAAK,CAACL,IAAI,CAAC,qBAAqB,CAAC;EACjCK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;EACjBK,KAAK,CAACL,IAAI,CAAC,eAAeH,gBAAgB,SAAS,CAAC;EACpDQ,KAAK,CAACL,IAAI,CAAC,qCAAqC,CAAC;EACjDK,KAAK,CAACL,IAAI,CAAC,4BAA4B,CAAC;EACxCK,KAAK,CAACL,IAAI,CAAC,gBAAgB,CAAC;EAC5B,IAAI,CAACe,IAAI,EAAE;IACTV,KAAK,CAACL,IAAI,CAAC,cAAc,CAAC;EAC5B;EACAK,KAAK,CAACL,IAAI,CAAC,gBAAgB,CAAC;EAC5BK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAEd;EACAK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;EACjBK,KAAK,CAACL,IAAI,CAAC,gCAAgCO,UAAU,sBAAsB,CAAC;EAC5EF,KAAK,CAACL,IAAI,CAAC,IAAI,CAAC;EAChBK,KAAK,CAACL,IAAI,CAAC,iBAAiB,CAAC;EAC7BK,KAAK,CAACL,IAAI,CAAC,sBAAsB,CAAC;EAClCK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;EACjBK,KAAK,CAACL,IAAI,CAAC,eAAeH,gBAAgB,aAAaS,aAAa,CAACvB,eAAe,0BAA0B,CAAC;EAC/GsB,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAEd;EACA,IAAIY,OAAO,EAAE;IACXP,KAAK,CAACL,IAAI,CAAC,iFAAiF,CAAC;IAC7FK,KAAK,CAACL,IAAI,CAAC,qBAAqB,CAAC;IACjCK,KAAK,CAACL,IAAI,CAAC,iFAAiF,CAAC;IAC7FK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;IACd,MAAMkB,aAAa,GAAG,aAAa;IACnCb,KAAK,CAACL,IAAI,CAAC,SAASkB,aAAa,WAAWV,UAAU,cAAc,CAAC;IAErE,IAAIf,UAAU,CAACoB,IAAI,CAACC,MAAM,KAAK,CAAC,EAAE;MAChC,MAAMK,OAAO,GAAG1B,UAAU,CAACoB,IAAI,CAAC,CAAC,CAAC;MAClC,MAAMO,SAAS,GAAGD,OAAO,CAACE,WAAW,CAACC,MAAM;MAC5C,MAAMC,cAAc,GAAGH,SAAS,KAAK,QAAQ,GAAG,QAAQ,GAAG,QAAQ;MACnEf,KAAK,CAACL,IAAI,CAAC,oBAAoBuB,cAAc,8BAA8BJ,OAAO,CAACpB,IAAI,GAAG,CAAC;IAC7F,CAAC,MAAM;MACL,MAAMyB,QAAQ,GAAG/B,UAAU,CAACoB,IAAI,CAACY,GAAG,CAAEC,CAAC,IAAK,GAAGA,CAAC,CAACC,SAAS,kBAAkBD,CAAC,CAAC3B,IAAI,KAAK,CAAC,CAAC6B,IAAI,CAAC,GAAG,CAAC;MAClGvB,KAAK,CAACL,IAAI,CAAC,qCAAqCwB,QAAQ,IAAI,CAAC;IAC/D;IACAnB,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAChB;EAEA;EACAK,KAAK,CAACL,IAAI,CAAC,iFAAiF,CAAC;EAC7FK,KAAK,CAACL,IAAI,CAAC,uCAAuC,CAAC;EACnDK,KAAK,CAACL,IAAI,CAAC,iFAAiF,CAAC;EAC7FK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAEd;EACAK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;EACjBK,KAAK,CAACL,IAAI,CAAC,gBAAgBO,UAAU,YAAY,CAAC;EAClDF,KAAK,CAACL,IAAI,CAAC,IAAI,CAAC;EAChBK,KAAK,CAACL,IAAI,CAAC,iBAAiB,CAAC;EAC7BK,KAAK,CAACL,IAAI,CAAC,yBAAyB,CAAC;EACrCK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;EACjBK,KAAK,CAACL,IAAI,CAAC,yBAAyB,CAAC;EACrCK,KAAK,CAACL,IAAI,CAAC,eAAeM,aAAa,CAACxB,gBAAgB,EAAE,CAAC;EAC3DuB,KAAK,CAACL,IAAI,CAAC,mBAAmB,CAAC;EAC/BK,KAAK,CAACL,IAAI,CAAC,mBAAmBO,UAAU,IAAI,CAAC;EAC7CF,KAAK,CAACL,IAAI,CAAC,KAAKH,gBAAgB,QAAQ,CAAC;EACzCQ,KAAK,CAACL,IAAI,CAAC,KAAKH,gBAAgB,SAAS,CAAC;EAC1CQ,KAAK,CAACL,IAAI,CAAC,MAAM,CAAC;EAClBK,KAAK,CAACL,IAAI,CAAC,KAAKM,aAAa,CAAC1B,cAAc,mBAAmBU,SAAS,CAACS,IAAI,MAAMQ,UAAU,YAAY,CAAC;EAC1GF,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAEd;EACA,IAAIY,OAAO,EAAE;IACX,MAAMiB,MAAM,GAAGpC,UAAU,CAACoB,IAAI,CAACC,MAAM,KAAK,CAAC,GACvC,KAAKrB,UAAU,CAACoB,IAAI,CAAC,CAAC,CAAC,CAACc,SAAS,qBAAqB,GACtD,iBAAiB;IAErBtB,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;IACjBK,KAAK,CAACL,IAAI,CAAC,qBAAqBO,UAAU,SAAS,CAAC;IACpDF,KAAK,CAACL,IAAI,CAAC,IAAI,CAAC;IAChBK,KAAK,CAACL,IAAI,CAAC,iBAAiB,CAAC;IAC7BK,KAAK,CAACL,IAAI,CAAC,yBAAyB,CAAC;IACrCK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;IACjBK,KAAK,CAACL,IAAI,CAAC,0BAA0B,CAAC;IACtCK,KAAK,CAACL,IAAI,CAAC,SAASQ,UAAU,EAAE,CAAC;IACjCH,KAAK,CAACL,IAAI,CAAC,mBAAmB,CAAC;IAC/BK,KAAK,CAACL,IAAI,CAAC,KAAKO,UAAU,GAAG,CAAC;IAC9BF,KAAK,CAACL,IAAI,CAAC,KAAKH,gBAAgB,QAAQ,CAAC;IACzCQ,KAAK,CAACL,IAAI,CAAC,KAAKH,gBAAgB,SAAS,CAAC;IAC1CQ,KAAK,CAACL,IAAI,CAAC,MAAM,CAAC;IAClBK,KAAK,CAACL,IAAI,CAAC,KAAKM,aAAa,CAAC1B,cAAc,OAAO,CAAC;IACpDyB,KAAK,CAACL,IAAI,CAAC,OAAOM,aAAa,CAACzB,eAAe,KAAKS,SAAS,CAACS,IAAI,MAAM8B,MAAM,IAAI,CAAC;IACnFxB,KAAK,CAACL,IAAI,CAAC,OAAOO,UAAU,EAAE,CAAC;IAC/BF,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;IACjBK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAChB;EAEA;EACAK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;EACjBK,KAAK,CAACL,IAAI,CAAC,mBAAmBO,UAAU,UAAU,CAAC;EACnDF,KAAK,CAACL,IAAI,CAAC,IAAI,CAAC;EAChBK,KAAK,CAACL,IAAI,CAAC,iBAAiB,CAAC;EAC7BK,KAAK,CAACL,IAAI,CAAC,yBAAyB,CAAC;EACrCK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;EACjBK,KAAK,CAACL,IAAI,CAAC,yBAAyB,CAAC;EACrCK,KAAK,CAACL,IAAI,CAAC,aAAaU,YAAY,EAAE,CAAC;EACvCL,KAAK,CAACL,IAAI,CAAC,mBAAmB,CAAC;EAC/BK,KAAK,CAACL,IAAI,CAAC,KAAKO,UAAU,GAAG,CAAC;EAC9BF,KAAK,CAACL,IAAI,CAAC,KAAKH,gBAAgB,QAAQ,CAAC;EACzCQ,KAAK,CAACL,IAAI,CAAC,KAAKH,gBAAgB,SAAS,CAAC;EAC1CQ,KAAK,CAACL,IAAI,CAAC,MAAM,CAAC;EAClBK,KAAK,CAACL,IAAI,CAAC,KAAKM,aAAa,CAAC1B,cAAc,UAAUU,SAAS,CAACS,IAAI,cAAcW,YAAY,KAAKH,UAAU,GAAG,CAAC;EACjHF,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAEd;EACA,IAAIY,OAAO,EAAE;IACX,MAAMiB,MAAM,GAAGpC,UAAU,CAACoB,IAAI,CAACC,MAAM,KAAK,CAAC,GACvC,KAAKrB,UAAU,CAACoB,IAAI,CAAC,CAAC,CAAC,CAACc,SAAS,qBAAqB,GACtD,iBAAiB;IAErBtB,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;IACjBK,KAAK,CAACL,IAAI,CAAC,yBAAyBO,UAAU,UAAU,CAAC;IACzDF,KAAK,CAACL,IAAI,CAAC,IAAI,CAAC;IAChBK,KAAK,CAACL,IAAI,CAAC,iBAAiB,CAAC;IAC7BK,KAAK,CAACL,IAAI,CAAC,yBAAyB,CAAC;IACrCK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;IACjBK,KAAK,CAACL,IAAI,CAAC,yBAAyB,CAAC;IACrCK,KAAK,CAACL,IAAI,CAAC,SAASQ,UAAU,GAAG,CAAC;IAClCH,KAAK,CAACL,IAAI,CAAC,qBAAqBU,YAAY,GAAG,CAAC;IAChDL,KAAK,CAACL,IAAI,CAAC,mBAAmB,CAAC;IAC/BK,KAAK,CAACL,IAAI,CAAC,SAAS,CAAC;IACrBK,KAAK,CAACL,IAAI,CAAC,KAAKH,gBAAgB,QAAQ,CAAC;IACzCQ,KAAK,CAACL,IAAI,CAAC,KAAKH,gBAAgB,SAAS,CAAC;IAC1CQ,KAAK,CAACL,IAAI,CAAC,MAAM,CAAC;IAClBK,KAAK,CAACL,IAAI,CAAC,KAAKM,aAAa,CAAC1B,cAAc,SAAS,CAAC;IACtDyB,KAAK,CAACL,IAAI,CAAC,OAAOM,aAAa,CAACzB,eAAe,KAAKS,SAAS,CAACS,IAAI,MAAM8B,MAAM,IAAI,CAAC;IACnFxB,KAAK,CAACL,IAAI,CAAC,aAAa,CAAC;IACzBK,KAAK,CAACL,IAAI,CAAC,sBAAsBU,YAAY,GAAG,CAAC;IACjDL,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;IACjBK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;IAEd;IACAK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;IACjBK,KAAK,CAACL,IAAI,CAAC,eAAeO,UAAU,UAAU,CAAC;IAC/CF,KAAK,CAACL,IAAI,CAAC,IAAI,CAAC;IAChBK,KAAK,CAACL,IAAI,CAAC,iBAAiB,CAAC;IAC7BK,KAAK,CAACL,IAAI,CAAC,yBAAyB,CAAC;IACrCK,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;IACjBK,KAAK,CAACL,IAAI,CAAC,sBAAsB,CAAC;IAClCK,KAAK,CAACL,IAAI,CAAC,SAASQ,UAAU,EAAE,CAAC;IACjCH,KAAK,CAACL,IAAI,CAAC,mBAAmB,CAAC;IAC/BK,KAAK,CAACL,IAAI,CAAC,SAAS,CAAC;IACrBK,KAAK,CAACL,IAAI,CAAC,KAAKH,gBAAgB,QAAQ,CAAC;IACzCQ,KAAK,CAACL,IAAI,CAAC,KAAKH,gBAAgB,SAAS,CAAC;IAC1CQ,KAAK,CAACL,IAAI,CAAC,MAAM,CAAC;IAClBK,KAAK,CAACL,IAAI,CAAC,KAAKM,aAAa,CAAC1B,cAAc,OAAO,CAAC;IACpDyB,KAAK,CAACL,IAAI,CAAC,OAAOM,aAAa,CAACzB,eAAe,KAAKS,SAAS,CAACS,IAAI,MAAM8B,MAAM,GAAG,CAAC;IAClFxB,KAAK,CAACL,IAAI,CAAC,KAAK,CAAC;IACjBK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;IAEd;IACAK,KAAK,CAACL,IAAI,CAAC,0BAA0B,CAAC;IACtCK,KAAK,CAACL,IAAI,CAAC,0BAA0B,CAAC;IACtCK,KAAK,CAACL,IAAI,CAAC,EAAE,CAAC;EAChB;EAEA,OAAOK,KAAK,CAACuB,IAAI,CAAC,IAAI,CAAC;AACzB,CAAC","ignoreList":[]}

package/dist/cjs/generator/ServiceFnPromiseGenerator.js

@@ -79,25 +79,26 @@ const generatePromiseServiceFile = (entitySet, entityType, dataModel) => {
   lines.push(` *`);
   lines.push(` * @since 1.0.0`);
   lines.push(` */`);
-  lines.push(`import { ${versionConfig.runtimeImport} } from "@odata-effect/odata-effect-promise"`);
-  lines.push(`import * as ${serviceClassName} from "./${serviceClassName}.js"`);
+  lines.push(`import { ${versionConfig.runtimeImport} } from "@odata-effect/odata-effect-promise/Runtime"`);
+  lines.push(`import * as ${serviceClassName} from "./${serviceClassName}"`);
   lines.push(``);
-  // Import models
-  lines.push(`import {`);
+  // Import models (type-only since they're only used in type annotations)
+  lines.push(`import type {`);
   lines.push(`  ${entityName},`);
   if (hasKeys) {
-    lines.push(`  type ${idTypeName},`);
+    lines.push(`  ${idTypeName},`);
   }
   lines.push(`  ${editableName}`);
-  lines.push(`} from "./Models.js"`);
+  lines.push(`} from "./Models"`);
   lines.push(``);
-  // Query options import
+  // Query options import (using subpath imports for tree-shaking)
   const queryOptionsType = dataModel.version === "V4" ? "ODataV4QueryOptions" : "ODataQueryOptions";
-  lines.push(`import type { ${queryOptionsType} } from "@odata-effect/odata-effect"`);
+  const queryOptionsModule = dataModel.version === "V4" ? "ODataV4Client" : "ODataClient";
+  lines.push(`import type { ${queryOptionsType} } from "@odata-effect/odata-effect/${queryOptionsModule}"`);
   lines.push(``);
   // Re-export runtime type for convenience
   lines.push(`// Re-export runtime type for convenience`);
-  lines.push(`export type { ${versionConfig.runtimeType} } from "@odata-effect/odata-effect-promise"`);
+  lines.push(`export type { ${versionConfig.runtimeType} } from "@odata-effect/odata-effect-promise/Runtime"`);
   lines.push(``);
   lines.push(`// ============================================================================`);
   lines.push(`// Promise-based Functions`);

package/dist/cjs/generator/ServiceFnPromiseGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceFnPromiseGenerator.js","names":["_NamingHelper","require","V2_CONFIG","runtimeType","runtimeImport","V4_CONFIG","getVersionConfig","version","getPromiseServiceName","entitySetName","getServiceClassName","exports","generatePromiseServiceFns","dataModel","entityServices","entitySet","entitySets","values","entityType","entityTypes","get","entityTypeFqName","promiseServiceName","name","push","fileName","content","generatePromiseServiceFile","lines","versionConfig","serviceClassName","entityName","idTypeName","getIdTypeName","editableName","getEditableTypeName","hasKeys","keys","length","serviceName","replace","toLowerCase","queryOptionsType","join"],"sources":["../../../src/generator/ServiceFnPromiseGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ServiceFnPromiseGenerator.js","names":["_NamingHelper","require","V2_CONFIG","runtimeType","runtimeImport","V4_CONFIG","getVersionConfig","version","getPromiseServiceName","entitySetName","getServiceClassName","exports","generatePromiseServiceFns","dataModel","entityServices","entitySet","entitySets","values","entityType","entityTypes","get","entityTypeFqName","promiseServiceName","name","push","fileName","content","generatePromiseServiceFile","lines","versionConfig","serviceClassName","entityName","idTypeName","getIdTypeName","editableName","getEditableTypeName","hasKeys","keys","length","serviceName","replace","toLowerCase","queryOptionsType","queryOptionsModule","join"],"sources":["../../../src/generator/ServiceFnPromiseGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}