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

package/dist/esm/generator/ServiceFnGenerator.js

@@ -1,262 +1,140 @@
 import { getEditableTypeName, getIdTypeName, getServiceClassName } from "./NamingHelper.js";
-const V2_CONFIG = {
-  odataNamespace: "OData",
-  buildEntityPath: "buildEntityPath",
-  queryOptionsType: "ODataQueryOptions",
-  clientConfigTag: "ODataClientConfig"
-};
-const V4_CONFIG = {
-  odataNamespace: "ODataV4",
-  buildEntityPath: "buildEntityPathV4",
-  queryOptionsType: "ODataV4QueryOptions",
-  clientConfigTag: "ODataV4ClientConfig"
-};
-const getVersionConfig = version => version === "V4" ? V4_CONFIG : V2_CONFIG;
 /**
- * Generate all tree-shakable service function files.
+ * Generate the Services.ts file using crud factory.
  *
  * @since 1.0.0
  * @category generation
  */
 export const generateServiceFns = dataModel => {
-  const entityServices = [];
-  // Generate individual entity service files
-  for (const entitySet of dataModel.entitySets.values()) {
-    const entityType = dataModel.entityTypes.get(entitySet.entityTypeFqName);
-    if (entityType) {
-      const serviceClassName = getServiceClassName(entitySet.name);
-      entityServices.push({
-        fileName: `${serviceClassName}.ts`,
-        content: generateEntityServiceFnFile(entitySet, entityType, dataModel)
-      });
-    }
-  }
+  const content = generateServicesFile(dataModel);
   return {
-    entityServices
+    servicesFile: {
+      fileName: "Services.ts",
+      content
+    }
   };
 };
 /**
- * Generate a single entity service function file.
+ * Generate the Services.ts file content.
  */
-const generateEntityServiceFnFile = (entitySet, entityType, dataModel) => {
+const generateServicesFile = dataModel => {
   const lines = [];
-  const versionConfig = getVersionConfig(dataModel.version);
-  const serviceClassName = getServiceClassName(entitySet.name);
-  const entityName = entityType.name;
-  const idTypeName = getIdTypeName(entityName);
-  const editableName = getEditableTypeName(entityName);
-  const hasKeys = entityType.keys.length > 0;
   const isV4 = dataModel.version === "V4";
-  // Header and imports
+  const crudImportPath = isV4 ? "@odata-effect/odata-effect/CrudV4" : "@odata-effect/odata-effect/Crud";
+  // Collect all entity sets with their types
+  const entitySets = [];
+  for (const entitySet of dataModel.entitySets.values()) {
+    const entityType = dataModel.entityTypes.get(entitySet.entityTypeFqName);
+    if (entityType) {
+      entitySets.push({
+        entitySet,
+        entityType
+      });
+    }
+  }
+  // Header
   lines.push(`/**`);
-  lines.push(` * Tree-shakable ${entityName} service functions for ${dataModel.serviceName} OData ${dataModel.version}.`);
+  lines.push(` * Entity services for ${dataModel.serviceName} OData ${dataModel.version}.`);
   lines.push(` * Generated by odata-effect-gen.`);
   lines.push(` *`);
-  lines.push(` * @example`);
-  lines.push(` * \`\`\`ts`);
-  lines.push(` * // Namespace import - nice autocomplete, tree-shakable`);
-  lines.push(` * import { ${serviceClassName} } from "@template/${dataModel.serviceName.toLowerCase()}-effect"`);
-  lines.push(` * const items = yield* ${serviceClassName}.getAll()`);
-  lines.push(` *`);
-  lines.push(` * // Direct import - maximum tree-shaking`);
-  lines.push(` * import { getAll } from "@template/${dataModel.serviceName.toLowerCase()}-effect/${serviceClassName}"`);
-  lines.push(` * const items = yield* getAll()`);
-  lines.push(` * \`\`\``);
+  lines.push(` * Uses the crud factory for minimal generated code.`);
   lines.push(` *`);
   lines.push(` * @since 1.0.0`);
   lines.push(` */`);
-  lines.push(`import type * as Effect from "effect/Effect"`);
-  lines.push(`import * as Schema from "effect/Schema"`);
-  lines.push(`import type { HttpClient } from "@effect/platform"`);
-  lines.push(`import type * as HttpClientError from "@effect/platform/HttpClientError"`);
-  lines.push(`import type * as HttpBody from "@effect/platform/HttpBody"`);
-  lines.push(``);
-  // Import models
-  lines.push(`import {`);
-  lines.push(`  ${entityName},`);
-  if (hasKeys) {
-    lines.push(`  type ${idTypeName},`);
-  }
-  lines.push(`  ${editableName}`);
-  lines.push(`} from "./Models"`);
+  lines.push(`import { crud } from "${crudImportPath}"`);
   lines.push(``);
-  // 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"`);
+  // Import all entity types
+  const modelImports = [];
+  for (const {
+    entityType
+  } of entitySets) {
+    modelImports.push(entityType.name);
+    if (entityType.keys.length > 0) {
+      modelImports.push(`type ${getIdTypeName(entityType.name)}`);
+    }
+    modelImports.push(getEditableTypeName(entityType.name));
   }
   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(``);
-  // Service error type
-  lines.push(`// ============================================================================`);
-  lines.push(`// Types`);
-  lines.push(`// ============================================================================`);
-  lines.push(``);
-  lines.push(`/**`);
-  lines.push(` * Error type for ${entityName} service operations.`);
-  lines.push(` *`);
-  lines.push(` * @since 1.0.0`);
-  lines.push(` * @category errors`);
-  lines.push(` */`);
-  lines.push(`export type ${serviceClassName}Error =`);
-  lines.push(`  | HttpClientError.HttpClientError`);
-  lines.push(`  | HttpBody.HttpBodyError`);
-  lines.push(`  | ParseError`);
-  if (!isV4) {
-    lines.push(`  | SapError`);
+  for (let i = 0; i < modelImports.length; i++) {
+    const isLast = i === modelImports.length - 1;
+    lines.push(`  ${modelImports[i]}${isLast ? "" : ","}`);
   }
-  lines.push(`  | ODataError`);
+  lines.push(`} from "./Models"`);
   lines.push(``);
-  // Dependencies type
-  lines.push(`/**`);
-  lines.push(` * Dependencies required for ${entityName} service operations.`);
-  lines.push(` *`);
-  lines.push(` * @since 1.0.0`);
-  lines.push(` * @category context`);
-  lines.push(` */`);
-  lines.push(`export type ${serviceClassName}Context = ${versionConfig.clientConfigTag} | HttpClient.HttpClient`);
+  // Re-export types from the crud module
+  lines.push(`// Re-export types for convenience`);
+  lines.push(`export type { CrudError, CrudContext, CrudService } from "${crudImportPath}"`);
   lines.push(``);
-  // ID normalizer (if entity has keys)
-  if (hasKeys) {
-    lines.push(`// ============================================================================`);
-    lines.push(`// Internal Helpers`);
-    lines.push(`// ============================================================================`);
-    lines.push(``);
-    const normalizeIdFn = `normalizeId`;
-    lines.push(`const ${normalizeIdFn} = (id: ${idTypeName}): string =>`);
-    if (entityType.keys.length === 1) {
-      const keyProp = entityType.keys[0];
-      const keyTsType = keyProp.typeMapping.tsType;
-      const primitiveCheck = keyTsType === "number" ? "number" : "string";
-      lines.push(`  typeof id === "${primitiveCheck}" ? String(id) : String(id.${keyProp.name})`);
-    } else {
-      const keyParts = entityType.keys.map(k => `${k.odataName}='\${String(id.${k.name})}'`).join(",");
-      lines.push(`  typeof id === "string" ? id : \`${keyParts}\``);
-    }
-    lines.push(``);
-  }
-  // Standalone functions
+  // Generate each service
   lines.push(`// ============================================================================`);
-  lines.push(`// Standalone Tree-Shakable Functions`);
+  lines.push(`// Entity Services`);
   lines.push(`// ============================================================================`);
   lines.push(``);
-  // getAll
-  lines.push(`/**`);
-  lines.push(` * Fetch all ${entityName} entities.`);
-  lines.push(` *`);
-  lines.push(` * @since 1.0.0`);
-  lines.push(` * @category operations`);
-  lines.push(` */`);
-  lines.push(`export const getAll = (`);
-  lines.push(`  options?: ${versionConfig.queryOptionsType}`);
-  lines.push(`): Effect.Effect<`);
-  lines.push(`  ReadonlyArray<${entityName}>,`);
-  lines.push(`  ${serviceClassName}Error,`);
-  lines.push(`  ${serviceClassName}Context`);
-  lines.push(`> =>`);
-  lines.push(`  ${versionConfig.odataNamespace}.getCollection("${entitySet.name}", ${entityName}, options)`);
-  lines.push(``);
-  // getById (if entity has keys)
-  if (hasKeys) {
-    const keyObj = entityType.keys.length === 1 ? `{ ${entityType.keys[0].odataName}: normalizeId(id) }` : `normalizeId(id)`;
-    lines.push(`/**`);
-    lines.push(` * Fetch a single ${entityName} by ID.`);
-    lines.push(` *`);
-    lines.push(` * @since 1.0.0`);
-    lines.push(` * @category operations`);
-    lines.push(` */`);
-    lines.push(`export const getById = (`);
-    lines.push(`  id: ${idTypeName}`);
-    lines.push(`): Effect.Effect<`);
-    lines.push(`  ${entityName},`);
-    lines.push(`  ${serviceClassName}Error,`);
-    lines.push(`  ${serviceClassName}Context`);
-    lines.push(`> =>`);
-    lines.push(`  ${versionConfig.odataNamespace}.get(`);
-    lines.push(`    ${versionConfig.buildEntityPath}("${entitySet.name}", ${keyObj}),`);
-    lines.push(`    ${entityName}`);
-    lines.push(`  )`);
-    lines.push(``);
-  }
-  // create
-  lines.push(`/**`);
-  lines.push(` * Create a new ${entityName} entity.`);
-  lines.push(` *`);
-  lines.push(` * @since 1.0.0`);
-  lines.push(` * @category operations`);
-  lines.push(` */`);
-  lines.push(`export const create = (`);
-  lines.push(`  entity: ${editableName}`);
-  lines.push(`): Effect.Effect<`);
-  lines.push(`  ${entityName},`);
-  lines.push(`  ${serviceClassName}Error,`);
-  lines.push(`  ${serviceClassName}Context`);
-  lines.push(`> =>`);
-  lines.push(`  ${versionConfig.odataNamespace}.post("${entitySet.name}", entity, ${editableName}, ${entityName})`);
-  lines.push(``);
-  // update (if entity has keys)
-  if (hasKeys) {
-    const keyObj = entityType.keys.length === 1 ? `{ ${entityType.keys[0].odataName}: normalizeId(id) }` : `normalizeId(id)`;
+  for (const {
+    entitySet,
+    entityType
+  } of entitySets) {
+    const serviceClassName = getServiceClassName(entitySet.name);
+    const entityName = entityType.name;
+    const editableName = getEditableTypeName(entityName);
+    const hasKeys = entityType.keys.length > 0;
     lines.push(`/**`);
-    lines.push(` * Update an existing ${entityName} entity.`);
+    lines.push(` * CRUD service for ${entityName} entities.`);
     lines.push(` *`);
     lines.push(` * @since 1.0.0`);
-    lines.push(` * @category operations`);
+    lines.push(` * @category services`);
     lines.push(` */`);
-    lines.push(`export const update = (`);
-    lines.push(`  id: ${idTypeName},`);
-    lines.push(`  entity: Partial<${editableName}>`);
-    lines.push(`): Effect.Effect<`);
-    lines.push(`  void,`);
-    lines.push(`  ${serviceClassName}Error,`);
-    lines.push(`  ${serviceClassName}Context`);
-    lines.push(`> =>`);
-    lines.push(`  ${versionConfig.odataNamespace}.patch(`);
-    lines.push(`    ${versionConfig.buildEntityPath}("${entitySet.name}", ${keyObj}),`);
-    lines.push(`    entity,`);
-    lines.push(`    Schema.partial(${editableName})`);
-    lines.push(`  )`);
-    lines.push(``);
-    // delete
-    lines.push(`/**`);
-    lines.push(` * Delete a ${entityName} entity.`);
-    lines.push(` *`);
-    lines.push(` * @since 1.0.0`);
-    lines.push(` * @category operations`);
-    lines.push(` */`);
-    lines.push(`export const del = (`);
-    lines.push(`  id: ${idTypeName}`);
-    lines.push(`): Effect.Effect<`);
-    lines.push(`  void,`);
-    lines.push(`  ${serviceClassName}Error,`);
-    lines.push(`  ${serviceClassName}Context`);
-    lines.push(`> =>`);
-    lines.push(`  ${versionConfig.odataNamespace}.del(`);
-    lines.push(`    ${versionConfig.buildEntityPath}("${entitySet.name}", ${keyObj})`);
-    lines.push(`  )`);
-    lines.push(``);
-    // Alias for nice naming
-    lines.push(`// Alias for nice naming`);
-    lines.push(`export { del as delete }`);
+    if (hasKeys) {
+      lines.push(`export const ${serviceClassName} = crud({`);
+      lines.push(`  path: "${entitySet.name}",`);
+      lines.push(`  schema: ${entityName},`);
+      lines.push(`  editableSchema: ${editableName},`);
+      lines.push(`  idToKey: ${generateIdToKeyFunction(entityType, dataModel.version)}`);
+      lines.push(`})`);
+    } else {
+      // Entity without keys - can only getAll and create
+      lines.push(`export const ${serviceClassName} = crud({`);
+      lines.push(`  path: "${entitySet.name}",`);
+      lines.push(`  schema: ${entityName},`);
+      lines.push(`  editableSchema: ${editableName},`);
+      lines.push(`  idToKey: (_id: never) => { throw new Error("Entity has no keys") }`);
+      lines.push(`})`);
+    }
     lines.push(``);
   }
   return lines.join("\n");
 };
+/**
+ * Generate the idToKey function for an entity type.
+ */
+const generateIdToKeyFunction = (entityType, version) => {
+  const idTypeName = getIdTypeName(entityType.name);
+  const isV4 = version === "V4";
+  if (entityType.keys.length === 1) {
+    const keyProp = entityType.keys[0];
+    const keyTsType = keyProp.typeMapping.tsType;
+    const primitiveCheck = keyTsType === "number" ? "number" : "string";
+    if (isV4) {
+      // V4 can use number keys directly
+      if (keyTsType === "number") {
+        return `(id: ${idTypeName}) => typeof id === "number" ? id : id.${keyProp.name}`;
+      } else {
+        return `(id: ${idTypeName}) => typeof id === "string" ? { ${keyProp.odataName}: id } : { ${keyProp.odataName}: id.${keyProp.name} }`;
+      }
+    } else {
+      // V2 needs string keys
+      return `(id: ${idTypeName}) => typeof id === "${primitiveCheck}" ? { ${keyProp.odataName}: String(id) } : { ${keyProp.odataName}: String(id.${keyProp.name}) }`;
+    }
+  } else {
+    // Composite key
+    const keyMapping = entityType.keys.map(k => {
+      if (isV4) {
+        return `${k.odataName}: id.${k.name}`;
+      } else {
+        return `${k.odataName}: String(id.${k.name})`;
+      }
+    }).join(", ");
+    return `(id: ${idTypeName}) => ({ ${keyMapping} })`;
+  }
+};
 //# sourceMappingURL=ServiceFnGenerator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ServiceFnGenerator.js","names":["getEditableTypeName","getIdTypeName","getServiceClassName","V2_CONFIG","odataNamespace","buildEntityPath","queryOptionsType","clientConfigTag","V4_CONFIG","getVersionConfig","version","generateServiceFns","dataModel","entityServices","entitySet","entitySets","values","entityType","entityTypes","get","entityTypeFqName","serviceClassName","name","push","fileName","content","generateEntityServiceFnFile","lines","versionConfig","entityName","idTypeName","editableName","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":["getEditableTypeName","getIdTypeName","getServiceClassName","generateServiceFns","dataModel","content","generateServicesFile","servicesFile","fileName","lines","isV4","version","crudImportPath","entitySets","entitySet","values","entityType","entityTypes","get","entityTypeFqName","push","serviceName","modelImports","name","keys","length","i","isLast","serviceClassName","entityName","editableName","hasKeys","generateIdToKeyFunction","join","idTypeName","keyProp","keyTsType","typeMapping","tsType","primitiveCheck","odataName","keyMapping","map","k"],"sources":["../../../src/generator/ServiceFnGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/index.js

@@ -70,14 +70,14 @@ export * as QueryModelsGenerator from "./generator/QueryModelsGenerator.js";
  */
 export * as ServiceFnGenerator from "./generator/ServiceFnGenerator.js";
 /**
- * Generator for Promise-based service functions.
+ * Generator for tree-shakable navigation path builders.
  *
- * This module generates Promise-based wrappers around the Effect-based
- * service functions, allowing usage in non-Effect environments.
+ * This module generates pipe-based navigation functions and the toPromise
+ * helper for Promise-based environments.
  *
  * @since 1.0.0
  */
-export * as ServiceFnPromiseGenerator from "./generator/ServiceFnPromiseGenerator.js";
+export * as NavigationGenerator from "./generator/NavigationGenerator.js";
 /**
  * Intermediate representation for OData metadata.
  * This is the central data model that digesters create and generators consume.

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["Cli","bin","Digester","TypeMapper","Generator","IndexGenerator","ModelsGenerator","NamingHelper","PackageGenerator","QueryModelsGenerator","ServiceFnGenerator","ServiceFnPromiseGenerator","DataModel","EdmxSchema","XmlParser"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;AAKA,OAAO,KAAKA,GAAG,MAAM,UAAU;AAE/B;;;;;AAKA,OAAO,KAAKC,GAAG,MAAM,UAAU;AAE/B;;;;;;AAMA,OAAO,KAAKC,QAAQ,MAAM,wBAAwB;AAElD;;;;;AAKA,OAAO,KAAKC,UAAU,MAAM,0BAA0B;AAEtD;;;;;AAKA,OAAO,KAAKC,SAAS,MAAM,0BAA0B;AAErD;;;;;AAKA,OAAO,KAAKC,cAAc,MAAM,+BAA+B;AAE/D;;;;;AAKA,OAAO,KAAKC,eAAe,MAAM,gCAAgC;AAEjE;;;;;AAKA,OAAO,KAAKC,YAAY,MAAM,6BAA6B;AAE3D;;;;;AAKA,OAAO,KAAKC,gBAAgB,MAAM,iCAAiC;AAEnE;;;;;AAKA,OAAO,KAAKC,oBAAoB,MAAM,qCAAqC;AAE3E;;;;;;;;;AASA,OAAO,KAAKC,kBAAkB,MAAM,mCAAmC;AAEvE;;;;;;;;AAQA,OAAO,KAAKC,yBAAyB,MAAM,0CAA0C;AAErF;;;;;;AAMA,OAAO,KAAKC,SAAS,MAAM,sBAAsB;AAEjD;;;;;;AAMA,OAAO,KAAKC,UAAU,MAAM,wBAAwB;AAEpD;;;;;AAKA,OAAO,KAAKC,SAAS,MAAM,uBAAuB","ignoreList":[]}
+{"version":3,"file":"index.js","names":["Cli","bin","Digester","TypeMapper","Generator","IndexGenerator","ModelsGenerator","NamingHelper","PackageGenerator","QueryModelsGenerator","ServiceFnGenerator","NavigationGenerator","DataModel","EdmxSchema","XmlParser"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;AAKA,OAAO,KAAKA,GAAG,MAAM,UAAU;AAE/B;;;;;AAKA,OAAO,KAAKC,GAAG,MAAM,UAAU;AAE/B;;;;;;AAMA,OAAO,KAAKC,QAAQ,MAAM,wBAAwB;AAElD;;;;;AAKA,OAAO,KAAKC,UAAU,MAAM,0BAA0B;AAEtD;;;;;AAKA,OAAO,KAAKC,SAAS,MAAM,0BAA0B;AAErD;;;;;AAKA,OAAO,KAAKC,cAAc,MAAM,+BAA+B;AAE/D;;;;;AAKA,OAAO,KAAKC,eAAe,MAAM,gCAAgC;AAEjE;;;;;AAKA,OAAO,KAAKC,YAAY,MAAM,6BAA6B;AAE3D;;;;;AAKA,OAAO,KAAKC,gBAAgB,MAAM,iCAAiC;AAEnE;;;;;AAKA,OAAO,KAAKC,oBAAoB,MAAM,qCAAqC;AAE3E;;;;;;;;;AASA,OAAO,KAAKC,kBAAkB,MAAM,mCAAmC;AAEvE;;;;;;;;AAQA,OAAO,KAAKC,mBAAmB,MAAM,oCAAoC;AAEzE;;;;;;AAMA,OAAO,KAAKC,SAAS,MAAM,sBAAsB;AAEjD;;;;;;AAMA,OAAO,KAAKC,UAAU,MAAM,wBAAwB;AAEpD;;;;;AAKA,OAAO,KAAKC,SAAS,MAAM,uBAAuB","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odata-effect/odata-effect-generator",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Effect-based OData service code generator",
   "license": "MIT",
   "repository": {
@@ -94,11 +94,6 @@
       "import": "./dist/esm/generator/ServiceFnGenerator.js",
       "default": "./dist/cjs/generator/ServiceFnGenerator.js"
     },
-    "./generator/ServiceFnPromiseGenerator": {
-      "types": "./dist/dts/generator/ServiceFnPromiseGenerator.d.ts",
-      "import": "./dist/esm/generator/ServiceFnPromiseGenerator.js",
-      "default": "./dist/cjs/generator/ServiceFnPromiseGenerator.js"
-    },
     "./model/DataModel": {
       "types": "./dist/dts/model/DataModel.d.ts",
       "import": "./dist/esm/model/DataModel.js",
@@ -156,9 +151,6 @@
       "generator/ServiceFnGenerator": [
         "./dist/dts/generator/ServiceFnGenerator.d.ts"
       ],
-      "generator/ServiceFnPromiseGenerator": [
-        "./dist/dts/generator/ServiceFnPromiseGenerator.d.ts"
-      ],
       "model/DataModel": [
         "./dist/dts/model/DataModel.d.ts"
       ],

package/src/Cli.ts

@@ -54,7 +54,14 @@ const generateCommand = Command.make(
 ).pipe(
   Command.withDescription("Generate Effect OData client from metadata"),
   Command.withHandler((
-    { force: forceOverwrite, metadataPath: metaPath, outputDir: outDir, packageName: pkgName, serviceName: svcName, filesOnly: onlyFiles }
+    {
+      filesOnly: onlyFiles,
+      force: forceOverwrite,
+      metadataPath: metaPath,
+      outputDir: outDir,
+      packageName: pkgName,
+      serviceName: svcName
+    }
   ) =>
     Effect.gen(function*() {
       const fs = yield* FileSystem.FileSystem

package/src/generator/Generator.ts

@@ -23,7 +23,6 @@ import {
 } from "./PackageGenerator.js"
 import { generateQueryModels } from "./QueryModelsGenerator.js"
 import { generateServiceFns } from "./ServiceFnGenerator.js"
-import { generatePromiseServiceFns } from "./ServiceFnPromiseGenerator.js"
 
 /**
  * Generator configuration.
@@ -92,9 +91,6 @@ export const generate = (
     // Generate tree-shakable service function files
     const serviceResult = generateServiceFns(dataModel)
 
-    // Generate Promise-based service function files
-    const promiseServiceResult = generatePromiseServiceFns(dataModel)
-
     // Generate operations file (FunctionImports, Functions, Actions)
     const operationsResult = generateOperations(dataModel)
 
@@ -111,22 +107,17 @@ export const generate = (
         path: path.join(sourceDir, "QueryModels.ts"),
         content: generateQueryModels(dataModel)
       },
-      // Individual entity service function files (tree-shakable)
-      ...serviceResult.entityServices.map((svc) => ({
-        path: path.join(sourceDir, svc.fileName),
-        content: svc.content
-      })),
-      // Promise-based entity service function files
-      ...promiseServiceResult.entityServices.map((svc) => ({
-        path: path.join(sourceDir, svc.fileName),
-        content: svc.content
-      })),
+      // Services file (all entity CRUD services in one file)
+      {
+        path: path.join(sourceDir, serviceResult.servicesFile.fileName),
+        content: serviceResult.servicesFile.content
+      },
       // Operations file (only if there are unbound operations)
       ...(operationsResult.operationsFile
         ? [{
-            path: path.join(sourceDir, operationsResult.operationsFile.fileName),
-            content: operationsResult.operationsFile.content
-          }]
+          path: path.join(sourceDir, operationsResult.operationsFile.fileName),
+          content: operationsResult.operationsFile.content
+        }]
         : []),
       // Navigation builder files
       ...navigationResult.navigationFiles.map((nav) => ({

package/src/generator/IndexGenerator.ts

@@ -14,7 +14,6 @@ import {
 } from "./NamingHelper.js"
 import { getPathBuildersModuleName } from "./NavigationGenerator.js"
 import { getOperationsModuleName } from "./OperationsGenerator.js"
-import { getPromiseServiceName } from "./ServiceFnPromiseGenerator.js"
 
 /**
  * Generate the index.ts file content.
@@ -68,20 +67,23 @@ export const generateIndex = (dataModel: DataModel): string => {
   lines.push(`} from "./Models"`)
   lines.push(``)
 
-  // Individual Entity Services (tree-shakable module namespace re-exports)
-  lines.push(`// Individual Entity Services (tree-shakable)`)
+  // Entity Services (all in one file using crud factory)
+  lines.push(`// Entity Services`)
+  lines.push(`// Use toPromise(runtime) from PathBuilders to convert Effect to Promise`)
+  lines.push(`export {`)
+  const serviceExports: Array<string> = []
   for (const entitySet of dataModel.entitySets.values()) {
-    const serviceClassName = getServiceClassName(entitySet.name)
-    lines.push(`export * as ${serviceClassName} from "./${serviceClassName}"`)
+    serviceExports.push(getServiceClassName(entitySet.name))
   }
-  lines.push(``)
-
-  // Promise-based Entity Services (for non-Effect environments)
-  lines.push(`// Promise-based Entity Services (for non-Effect environments)`)
-  for (const entitySet of dataModel.entitySets.values()) {
-    const promiseServiceName = getPromiseServiceName(entitySet.name)
-    lines.push(`export * as ${promiseServiceName} from "./${promiseServiceName}"`)
+  // Also export types
+  serviceExports.push(`type CrudError`)
+  serviceExports.push(`type CrudContext`)
+  serviceExports.push(`type CrudService`)
+  for (let i = 0; i < serviceExports.length; i++) {
+    const isLast = i === serviceExports.length - 1
+    lines.push(`  ${serviceExports[i]}${isLast ? "" : ","}`)
   }
+  lines.push(`} from "./Services"`)
   lines.push(``)
 
   // Operations (FunctionImports, Functions, Actions) - only if there are unbound operations

package/src/generator/ModelsGenerator.ts

@@ -243,15 +243,12 @@ const generateEntityType = (
       lines.push(`  Schema.Struct({ ${key.name}: ${keySchema} })`)
       lines.push(`)`)
     } else {
-      // Composite key
+      // Composite key - only struct form makes sense
       const keyFields = entityType.keys.map((k) => {
         const schema = getPropertySchemaType(k, false)
         return `${k.name}: ${schema}`
       })
-      lines.push(`export const ${idTypeName} = Schema.Union(`)
-      lines.push(`  Schema.String,`)
-      lines.push(`  Schema.Struct({ ${keyFields.join(", ")} })`)
-      lines.push(`)`)
+      lines.push(`export const ${idTypeName} = Schema.Struct({ ${keyFields.join(", ")} })`)
     }
     lines.push(`export type ${idTypeName} = Schema.Schema.Type<typeof ${idTypeName}>`)
   }

package/src/generator/NamingHelper.ts

@@ -86,9 +86,11 @@ export const getServiceClassName = (entitySetName: string): string => {
   if (singular.endsWith("ies")) {
     // "Categories" -> "Category"
     singular = singular.slice(0, -3) + "y"
-  } else if (singular.endsWith("xes") || singular.endsWith("ches") ||
-             singular.endsWith("shes") || singular.endsWith("sses") ||
-             singular.endsWith("zes")) {
+  } else if (
+    singular.endsWith("xes") || singular.endsWith("ches") ||
+    singular.endsWith("shes") || singular.endsWith("sses") ||
+    singular.endsWith("zes")
+  ) {
     // "Boxes" -> "Box", "Beaches" -> "Beach", etc.
     singular = singular.slice(0, -2)
   } else if (singular.endsWith("s") && !singular.endsWith("ss")) {