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

package/README.md

@@ -26,16 +26,243 @@ odata-effect-gen generate ./metadata.xml ./generated
 - `--service-name`: Override service name (defaults to EntityContainer name)
 - `--package-name`: NPM package name (defaults to @template/<service-name>-effect)
 - `--force`: Overwrite existing files
+- `--files-only`: Generate only source files directly in output-dir (no package.json, tsconfig, src/ subdirectory)
 
 ## Generated Code
 
 The generator produces:
 
-- `Models.ts` - Schema classes for entities and complex types
-- `QueryModels.ts` - Type-safe query paths for filtering and ordering
-- `*Service.ts` - Effect-based service functions for each entity set
-- `*ServicePromise.ts` - Promise-based service functions
-- `index.ts` - Re-exports all generated code
+| File | Description |
+|------|-------------|
+| `Models.ts` | Schema classes for entities and complex types |
+| `QueryModels.ts` | Type-safe query paths for filtering and ordering |
+| `Services.ts` | CRUD services for all entity sets (using crud factory) |
+| `PathBuilders.ts` | Tree-shakable navigation path builders with `toPromise` |
+| `Operations.ts` | Functions/Actions (if present in metadata) |
+| `index.ts` | Re-exports all generated code |
+
+## Two Ways to Query Data
+
+The generator provides two complementary approaches for querying OData services:
+
+### 1. Service Functions (Direct Operations)
+
+Best for simple CRUD operations on a single entity set:
+
+```typescript
+import { ProductService } from "./generated"
+
+// Get all products
+const products = yield* ProductService.getAll()
+
+// Get by ID
+const product = yield* ProductService.getById(123)
+
+// Create
+const newProduct = yield* ProductService.create({ name: "Widget", price: 9.99 })
+
+// Update
+yield* ProductService.update(123, { price: 12.99 })
+
+// Delete
+yield* ProductService.delete(123)
+```
+
+### 2. Path Builders (Pipe-based Navigation)
+
+Best for navigating relationships with full type safety. Uses branded types to ensure you can only navigate to valid properties:
+
+```typescript
+import { pipe } from "effect"
+import {
+  People, byKey, trips, planItems, asFlight, bestFriend,
+  fetchCollection, fetchOne
+} from "./generated"
+import { Person, Trip, Flight } from "./generated"
+
+// Navigate through relationships with pipe()
+const flights = yield* pipe(
+  People,                    // Path<PersonModel, true>  - collection
+  byKey("russellwhyte"),     // Path<PersonModel, false> - single entity
+  trips,                     // Path<TripModel, true>    - collection
+  byKey(0),                  // Path<TripModel, false>   - single entity
+  planItems,                 // Path<PlanItemModel, true>
+  asFlight,                  // Path<FlightModel, true>  - type cast
+  fetchCollection(Flight)    // Execute the query
+)
+
+// Get a single entity
+const person = yield* pipe(
+  People,
+  byKey("russellwhyte"),
+  fetchOne(Person)
+)
+
+// Navigate to a single related entity
+const friend = yield* pipe(
+  People,
+  byKey("russellwhyte"),
+  bestFriend,
+  fetchOne(Person)
+)
+```
+
+### Type Safety with Branded Types
+
+The path builders use branded types to ensure type-safe navigation at compile time:
+
+```typescript
+// Path<TEntity, IsCollection> tracks what entity type you're "at"
+type Path<TEntity, IsCollection extends boolean = false> = string & {
+  readonly _entity: TEntity
+  readonly _collection: IsCollection
+}
+
+// TypeScript prevents invalid navigation:
+
+// ✅ Valid - trips is a navigation property on Person
+pipe(People, byKey("russell"), trips)
+
+// ❌ Compile error - planItems is on Trip, not Person
+pipe(People, byKey("russell"), planItems)
+
+// ❌ Compile error - can't byKey on a single entity (not a collection)
+pipe(People, byKey("russell"), byKey("other"))
+```
+
+### Path Builder Features
+
+| Feature | Example |
+|---------|---------|
+| Entity set root | `People` → `Path<PersonModel, true>` |
+| Key access | `byKey("id")` → converts collection to single |
+| Navigation | `trips` → type-safe navigation to related entity |
+| Type casting | `asFlight` → filter to derived type |
+| Terminal ops | `fetchCollection(Schema)`, `fetchOne(Schema)` |
+
+### Tree-Shaking
+
+Path builders are fully tree-shakable. Each navigation function is a separate export:
+
+```typescript
+// Only import what you use - unused navigation functions are removed by bundler
+import { People, byKey, trips } from "./generated"
+```
+
+### Comparison with odata2ts
+
+If you're familiar with odata2ts, here's how the APIs compare:
+
+```typescript
+// odata2ts (method chaining)
+const response = await trippinService
+  .people("russellwhyte")
+  .trips(0)
+  .planItems()
+  .asFlightCollectionService()
+  .query()
+
+// odata-effect (pipe composition)
+const flights = yield* pipe(
+  People,
+  byKey("russellwhyte"),
+  trips,
+  byKey(0),
+  planItems,
+  asFlight,
+  fetchCollection(Flight)
+)
+```
+
+## Query Options
+
+Both service functions and path builders support OData query options:
+
+```typescript
+// With service functions
+const products = yield* ProductService.getAll({
+  $filter: "price gt 10",
+  $orderby: "name",
+  $top: 10,
+  $select: "id,name,price"
+})
+
+// With path builders (via fetchCollection/fetchOne)
+const myTrips = yield* pipe(
+  People,
+  byKey("russellwhyte"),
+  trips,
+  (path) => fetchCollection(Trip)(path, {
+    $filter: "budget gt 1000",
+    $orderby: "startsAt desc"
+  })
+)
+```
+
+## Type-Safe Query Building
+
+Use the generated `QueryModels` for type-safe filter and orderby construction:
+
+```typescript
+import { productQuery } from "./generated"
+
+const query = productQuery()
+  .filter(q => q.price.gt(10).and(q.name.contains("Widget")))
+  .orderBy(q => q.name.asc())
+  .select("id", "name", "price")
+  .top(10)
+  .build()
+
+const products = yield* ProductService.getAll(query)
+```
+
+## Promise-Based Usage
+
+For non-Effect environments, use the `toPromise` function to convert any Effect to a Promise:
+
+```typescript
+import { pipe } from "effect"
+import { createODataRuntime } from "@odata-effect/odata-effect-promise"
+import { ProductService, toPromise, People, byKey, trips, fetchCollection, Trip } from "./generated"
+
+const runtime = createODataRuntime({
+  baseUrl: "https://api.example.com",
+  servicePath: "/odata/v4/"
+})
+
+// Service functions - pipe through toPromise
+const products = await ProductService.getAll().pipe(toPromise(runtime))
+const product = await ProductService.getById(123).pipe(toPromise(runtime))
+
+// Path builders - add toPromise at the end of the pipe
+const myTrips = await pipe(
+  People,
+  byKey("russellwhyte"),
+  trips,
+  fetchCollection(Trip),
+  toPromise(runtime)
+)
+
+// Don't forget to dispose when done
+await runtime.dispose()
+```
+
+## Operations (Functions & Actions)
+
+If your OData service defines FunctionImports (V2) or Functions/Actions (V4), they are generated in `Operations.ts`:
+
+```typescript
+import { Operations } from "./generated"
+
+// V2 FunctionImport
+const result = yield* Operations.getProductsByRating({ rating: 5 })
+
+// V4 Function (no side effects)
+const airport = yield* Operations.getNearestAirport({ lat: 51.5, lon: -0.1 })
+
+// V4 Action (may have side effects)
+yield* Operations.resetDataSource()
+```
 
 ## License
 

package/dist/cjs/Cli.js

@@ -30,6 +30,7 @@ const outputDir = /*#__PURE__*/_cli.Args.path({
 const serviceName = /*#__PURE__*/_cli.Options.text("service-name").pipe(_cli.Options.optional, /*#__PURE__*/_cli.Options.withDescription("Override service name (defaults to EntityContainer name)"));
 const packageName = /*#__PURE__*/_cli.Options.text("package-name").pipe(_cli.Options.optional, /*#__PURE__*/_cli.Options.withDescription("NPM package name (defaults to @template/<service-name>-effect)"));
 const force = /*#__PURE__*/_cli.Options.boolean("force").pipe(/*#__PURE__*/_cli.Options.withDefault(false), /*#__PURE__*/_cli.Options.withDescription("Overwrite existing files"));
+const filesOnly = /*#__PURE__*/_cli.Options.boolean("files-only").pipe(/*#__PURE__*/_cli.Options.withDefault(false), /*#__PURE__*/_cli.Options.withDescription("Generate only source files (no package.json, tsconfig, etc.) directly in output-dir"));
 // ============================================================================
 // Generate Command
 // ============================================================================
@@ -38,8 +39,10 @@ const generateCommand = /*#__PURE__*/_cli.Command.make("generate", {
   outputDir,
   serviceName,
   packageName,
-  force
+  force,
+  filesOnly
 }).pipe(/*#__PURE__*/_cli.Command.withDescription("Generate Effect OData client from metadata"), /*#__PURE__*/_cli.Command.withHandler(({
+  filesOnly: onlyFiles,
   force: forceOverwrite,
   metadataPath: metaPath,
   outputDir: outDir,
@@ -68,6 +71,7 @@ const generateCommand = /*#__PURE__*/_cli.Command.make("generate", {
   const config = {
     outputDir: outDir,
     force: forceOverwrite,
+    filesOnly: onlyFiles,
     ...(svcName._tag === "Some" ? {
       serviceName: svcName.value
     } : {}),

package/dist/cjs/Cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cli.js","names":["_cli","require","FileSystem","_interopRequireWildcard","Console","Effect","_Digester","_Generator","_XmlParser","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","metadataPath","Args","path","name","pipe","withDescription","outputDir","serviceName","Options","text","optional","packageName","force","boolean","withDefault","generateCommand","Command","make","withHandler","forceOverwrite","metaPath","outDir","pkgName","svcName","gen","fs","log","metadataContent","readFileString","mapError","error","Error","edmx","parseODataMetadata","dataModel","digestMetadata","version","namespace","entityTypes","size","complexTypes","enumTypes","entitySets","config","_tag","value","generate","rootCommand","withSubcommands","cli","exports","run"],"sources":["../../src/Cli.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Cli.js","names":["_cli","require","FileSystem","_interopRequireWildcard","Console","Effect","_Digester","_Generator","_XmlParser","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","metadataPath","Args","path","name","pipe","withDescription","outputDir","serviceName","Options","text","optional","packageName","force","boolean","withDefault","filesOnly","generateCommand","Command","make","withHandler","onlyFiles","forceOverwrite","metaPath","outDir","pkgName","svcName","gen","fs","log","metadataContent","readFileString","mapError","error","Error","edmx","parseODataMetadata","dataModel","digestMetadata","version","namespace","entityTypes","size","complexTypes","enumTypes","entitySets","config","_tag","value","generate","rootCommand","withSubcommands","cli","exports","run"],"sources":["../../src/Cli.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/generator/Generator.js

@@ -10,10 +10,11 @@ var Effect = _interopRequireWildcard(require("effect/Effect"));
 var Schema = _interopRequireWildcard(require("effect/Schema"));
 var _IndexGenerator = require("./IndexGenerator.js");
 var _ModelsGenerator = require("./ModelsGenerator.js");
+var _NavigationGenerator = require("./NavigationGenerator.js");
+var _OperationsGenerator = require("./OperationsGenerator.js");
 var _PackageGenerator = require("./PackageGenerator.js");
 var _QueryModelsGenerator = require("./QueryModelsGenerator.js");
 var _ServiceFnGenerator = require("./ServiceFnGenerator.js");
-var _ServiceFnPromiseGenerator = require("./ServiceFnPromiseGenerator.js");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
  * Main generator that orchestrates all code generation.
@@ -44,39 +45,47 @@ const generate = (dataModel, config) => Effect.gen(function* () {
   const outputDir = config.outputDir;
   const serviceName = config.serviceName ?? dataModel.serviceName;
   const packageName = config.packageName ?? `@template/${serviceName.toLowerCase()}-effect`;
+  const filesOnly = config.filesOnly ?? false;
+  // When filesOnly is true, output directly to outputDir; otherwise use outputDir/src
+  const sourceDir = filesOnly ? outputDir : path.join(outputDir, "src");
   const packageConfig = {
     packageName,
     serviceName
   };
   // Generate tree-shakable service function files
   const serviceResult = (0, _ServiceFnGenerator.generateServiceFns)(dataModel);
-  // Generate Promise-based service function files
-  const promiseServiceResult = (0, _ServiceFnPromiseGenerator.generatePromiseServiceFns)(dataModel);
-  // Generate all files
-  const files = [
-  // Source files
-  {
-    path: path.join(outputDir, "src", "Models.ts"),
+  // Generate operations file (FunctionImports, Functions, Actions)
+  const operationsResult = (0, _OperationsGenerator.generateOperations)(dataModel);
+  // Generate navigation builders
+  const navigationResult = (0, _NavigationGenerator.generateNavigations)(dataModel);
+  // Generate source files
+  const sourceFiles = [{
+    path: path.join(sourceDir, "Models.ts"),
     content: (0, _ModelsGenerator.generateModels)(dataModel)
   }, {
-    path: path.join(outputDir, "src", "QueryModels.ts"),
+    path: path.join(sourceDir, "QueryModels.ts"),
     content: (0, _QueryModelsGenerator.generateQueryModels)(dataModel)
   },
-  // Individual entity service function files (tree-shakable)
-  ...serviceResult.entityServices.map(svc => ({
-    path: path.join(outputDir, "src", svc.fileName),
-    content: svc.content
-  })),
-  // Promise-based entity service function files
-  ...promiseServiceResult.entityServices.map(svc => ({
-    path: path.join(outputDir, "src", 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
+  }] : []),
+  // Navigation builder files
+  ...navigationResult.navigationFiles.map(nav => ({
+    path: path.join(sourceDir, nav.fileName),
+    content: nav.content
   })), {
-    path: path.join(outputDir, "src", "index.ts"),
+    path: path.join(sourceDir, "index.ts"),
     content: (0, _IndexGenerator.generateIndex)(dataModel)
-  },
-  // Package configuration files
-  {
+  }];
+  // Package configuration files (only when not filesOnly)
+  const packageFiles = filesOnly ? [] : [{
     path: path.join(outputDir, "package.json"),
     content: (0, _PackageGenerator.generatePackageJson)(dataModel, packageConfig)
   }, {
@@ -95,11 +104,12 @@ const generate = (dataModel, config) => Effect.gen(function* () {
     path: path.join(outputDir, "vitest.config.ts"),
     content: (0, _PackageGenerator.generateVitestConfig)()
   }];
-  // Create output directories
-  yield* fs.makeDirectory(path.join(outputDir, "src"), {
+  const files = [...sourceFiles, ...packageFiles];
+  // Create output directory
+  yield* fs.makeDirectory(sourceDir, {
     recursive: true
   }).pipe(Effect.mapError(error => new GeneratorError({
-    message: `Failed to create output directory: ${outputDir}/src`,
+    message: `Failed to create output directory: ${sourceDir}`,
     cause: error
   })));
   // Write all files

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

@@ -1 +1 @@
-{"version":3,"file":"Generator.js","names":["FileSystem","_interopRequireWildcard","require","Path","Effect","Schema","_IndexGenerator","_ModelsGenerator","_PackageGenerator","_QueryModelsGenerator","_ServiceFnGenerator","_ServiceFnPromiseGenerator","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","GeneratorError","TaggedError","message","String","cause","optional","Unknown","exports","generate","dataModel","config","gen","fs","path","outputDir","serviceName","packageName","toLowerCase","packageConfig","serviceResult","generateServiceFns","promiseServiceResult","generatePromiseServiceFns","files","join","content","generateModels","generateQueryModels","entityServices","map","svc","fileName","generateIndex","generatePackageJson","generateTsconfig","generateTsconfigSrc","generateTsconfigTest","generateTsconfigBuild","generateVitestConfig","makeDirectory","recursive","pipe","mapError","error","file","force","exists","logWarning","writeFileString","logInfo"],"sources":["../../../src/generator/Generator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Generator.js","names":["FileSystem","_interopRequireWildcard","require","Path","Effect","Schema","_IndexGenerator","_ModelsGenerator","_NavigationGenerator","_OperationsGenerator","_PackageGenerator","_QueryModelsGenerator","_ServiceFnGenerator","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","GeneratorError","TaggedError","message","String","cause","optional","Unknown","exports","generate","dataModel","config","gen","fs","path","outputDir","serviceName","packageName","toLowerCase","filesOnly","sourceDir","join","packageConfig","serviceResult","generateServiceFns","operationsResult","generateOperations","navigationResult","generateNavigations","sourceFiles","content","generateModels","generateQueryModels","servicesFile","fileName","operationsFile","navigationFiles","map","nav","generateIndex","packageFiles","generatePackageJson","generateTsconfig","generateTsconfigSrc","generateTsconfigTest","generateTsconfigBuild","generateVitestConfig","files","makeDirectory","recursive","pipe","mapError","error","file","force","exists","logWarning","writeFileString","logInfo"],"sources":["../../../src/generator/Generator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/generator/IndexGenerator.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.generateIndex = void 0;
 var _NamingHelper = require("./NamingHelper.js");
-var _ServiceFnPromiseGenerator = require("./ServiceFnPromiseGenerator.js");
+var _NavigationGenerator = require("./NavigationGenerator.js");
+var _OperationsGenerator = require("./OperationsGenerator.js");
 /**
  * Generate the index.ts file content.
  *
@@ -47,90 +48,38 @@ const generateIndex = dataModel => {
     const isLast = i === modelExports.length - 1;
     lines.push(`  ${modelExports[i]}${isLast ? "" : ","}`);
   }
-  lines.push(`} from "./Models.js"`);
+  lines.push(`} from "./Models"`);
   lines.push(``);
-  // Re-export OData infrastructure
-  const isV4 = dataModel.version === "V4";
-  lines.push(`// Re-export OData infrastructure from @odata-effect/odata-effect`);
+  // 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 {`);
-  lines.push(`  // Errors`);
-  if (!isV4) {
-    lines.push(`  SapErrorDetail,`);
-    lines.push(`  SapErrorResolution,`);
-    lines.push(`  SapApplication,`);
-    lines.push(`  SapInnerError,`);
-    lines.push(`  SapErrorMessage,`);
-    lines.push(`  SapErrorBody,`);
-    lines.push(`  SapErrorResponse,`);
-    lines.push(`  SapError,`);
-  }
-  lines.push(`  ODataError,`);
-  lines.push(`  EntityNotFoundError,`);
-  lines.push(`  ParseError,`);
-  if (isV4) {
-    // V4 exports
-    lines.push(`  // OData V4`);
-    lines.push(`  ODataV4,`);
-    lines.push(`  ODataV4CollectionResponse,`);
-    lines.push(`  ODataV4ValueResponse,`);
-    lines.push(`  ODataV4Annotations,`);
-    lines.push(`  ODataV4ClientConfig,`);
-    lines.push(`  buildEntityPathV4,`);
-    lines.push(`  type ODataV4QueryOptions,`);
-    lines.push(`  type ODataV4RequestOptions,`);
-    lines.push(`  type ODataV4ClientConfigService,`);
-    lines.push(`  type PagedResultV4,`);
-  } else {
-    // V2 exports
-    lines.push(`  // OData V2`);
-    lines.push(`  OData,`);
-    lines.push(`  ODataSingleResponse,`);
-    lines.push(`  ODataCollectionResponse,`);
-    lines.push(`  ODataCollectionResponseWithMeta,`);
-    lines.push(`  ODataValueResponse,`);
-    lines.push(`  EntityMetadata,`);
-    lines.push(`  MediaMetadata,`);
-    lines.push(`  DeferredContent,`);
-    lines.push(`  ODataClientConfig,`);
-    lines.push(`  buildEntityPath,`);
-    lines.push(`  DEFAULT_HEADERS,`);
-    lines.push(`  MERGE_HEADERS,`);
-    lines.push(`  type ODataQueryOptions,`);
-    lines.push(`  type ODataRequestOptions,`);
-    lines.push(`  type ODataClientConfigService,`);
-    lines.push(`  type PagedResult,`);
-  }
-  lines.push(`  // Query Builder`);
-  lines.push(`  FilterExpression,`);
-  lines.push(`  StringPath,`);
-  lines.push(`  NumberPath,`);
-  lines.push(`  BooleanPath,`);
-  lines.push(`  DateTimePath,`);
-  lines.push(`  EntityPath,`);
-  lines.push(`  CollectionPath,`);
-  lines.push(`  QueryBuilder,`);
-  lines.push(`  createQueryPaths,`);
-  lines.push(`  createQueryBuilder,`);
-  lines.push(`  type FieldToPath,`);
-  lines.push(`  type QueryPaths,`);
-  lines.push(`  type SelectableKeys,`);
-  lines.push(`  type ExpandableKeys,`);
-  lines.push(`  type BuiltQuery`);
-  lines.push(`} from "@odata-effect/odata-effect"`);
-  lines.push(``);
-  // Individual Entity Services (tree-shakable module namespace re-exports)
-  lines.push(`// Individual Entity Services (tree-shakable)`);
+  const serviceExports = [];
   for (const entitySet of dataModel.entitySets.values()) {
-    const serviceClassName = (0, _NamingHelper.getServiceClassName)(entitySet.name);
-    lines.push(`export * as ${serviceClassName} from "./${serviceClassName}.js"`);
+    serviceExports.push((0, _NamingHelper.getServiceClassName)(entitySet.name));
   }
+  // 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(``);
-  // 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 = (0, _ServiceFnPromiseGenerator.getPromiseServiceName)(entitySet.name);
-    lines.push(`export * as ${promiseServiceName} from "./${promiseServiceName}.js"`);
+  // Operations (FunctionImports, Functions, Actions) - only if there are unbound operations
+  const hasUnboundOperations = Array.from(dataModel.operations.values()).some(op => !op.isBound);
+  if (hasUnboundOperations) {
+    lines.push(`// Operations (FunctionImports, Functions, Actions)`);
+    const operationsModuleName = (0, _OperationsGenerator.getOperationsModuleName)();
+    lines.push(`export * as ${operationsModuleName} from "./${operationsModuleName}"`);
+    lines.push(``);
   }
+  // Path Builders (tree-shakable navigation)
+  lines.push(`// Path Builders (tree-shakable navigation)`);
+  const pathBuildersModuleName = (0, _NavigationGenerator.getPathBuildersModuleName)();
+  lines.push(`export * from "./${pathBuildersModuleName}"`);
   lines.push(``);
   // Query Models
   lines.push(`// Query Models`);
@@ -157,7 +106,7 @@ const generateIndex = dataModel => {
     const isLast = i === queryExports.length - 1;
     lines.push(`  ${queryExports[i]}${isLast ? "" : ","}`);
   }
-  lines.push(`} from "./QueryModels.js"`);
+  lines.push(`} from "./QueryModels"`);
   return lines.join("\n");
 };
 exports.generateIndex = generateIndex;

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

@@ -1 +1 @@
-{"version":3,"file":"IndexGenerator.js","names":["_NamingHelper","require","_ServiceFnPromiseGenerator","generateIndex","dataModel","lines","push","serviceName","modelExports","enumType","enumTypes","values","name","complexType","complexTypes","getEditableTypeName","entityType","entityTypes","keys","length","getIdTypeName","i","isLast","isV4","version","entitySet","entitySets","serviceClassName","getServiceClassName","promiseServiceName","getPromiseServiceName","queryExports","getQueryInstanceName","getQueryInterfaceName","get","entityTypeFqName","getQueryFactoryName","join","exports"],"sources":["../../../src/generator/IndexGenerator.ts"],"sourcesContent":[null],"mappings":";;;;;;AAMA,IAAAA,aAAA,GAAAC,OAAA;AAQA,IAAAC,0BAAA,GAAAD,OAAA;AAEA;;;;;;AAMO,MAAME,aAAa,GAAIC,SAAoB,IAAY;EAC5D,MAAMC,KAAK,GAAkB,EAAE;EAE/B;EACAA,KAAK,CAACC,IAAI,CAAC,KAAK,CAAC;EACjBD,KAAK,CAACC,IAAI,CAAC,oCAAoCF,SAAS,CAACG,WAAW,WAAW,CAAC;EAChFF,KAAK,CAACC,IAAI,CAAC,mCAAmC,CAAC;EAC/CD,KAAK,CAACC,IAAI,CAAC,IAAI,CAAC;EAChBD,KAAK,CAACC,IAAI,CAAC,iBAAiB,CAAC;EAC7BD,KAAK,CAACC,IAAI,CAAC,KAAK,CAAC;EACjBD,KAAK,CAACC,IAAI,CAAC,EAAE,CAAC;EAEd;EACAD,KAAK,CAACC,IAAI,CAAC,WAAW,CAAC;EACvBD,KAAK,CAACC,IAAI,CAAC,UAAU,CAAC;EAEtB,MAAME,YAAY,GAAkB,EAAE;EAEtC;EACA,KAAK,MAAMC,QAAQ,IAAIL,SAAS,CAACM,SAAS,CAACC,MAAM,EAAE,EAAE;IACnDH,YAAY,CAACF,IAAI,CAACG,QAAQ,CAACG,IAAI,CAAC;EAClC;EAEA;EACA,KAAK,MAAMC,WAAW,IAAIT,SAAS,CAACU,YAAY,CAACH,MAAM,EAAE,EAAE;IACzDH,YAAY,CAACF,IAAI,CAACO,WAAW,CAACD,IAAI,CAAC;IACnCJ,YAAY,CAACF,IAAI,CAAC,IAAAS,iCAAmB,EAACF,WAAW,CAACD,IAAI,CAAC,CAAC;EAC1D;EAEA;EACA,KAAK,MAAMI,UAAU,IAAIZ,SAAS,CAACa,WAAW,CAACN,MAAM,EAAE,EAAE;IACvDH,YAAY,CAACF,IAAI,CAACU,UAAU,CAACJ,IAAI,CAAC;IAClC,IAAII,UAAU,CAACE,IAAI,CAACC,MAAM,GAAG,CAAC,EAAE;MAC9BX,YAAY,CAACF,IAAI,CAAC,IAAAc,2BAAa,EAACJ,UAAU,CAACJ,IAAI,CAAC,CAAC;IACnD;IACAJ,YAAY,CAACF,IAAI,CAAC,IAAAS,iCAAmB,EAACC,UAAU,CAACJ,IAAI,CAAC,CAAC;EACzD;EAEA,KAAK,IAAIS,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGb,YAAY,CAACW,MAAM,EAAEE,CAAC,EAAE,EAAE;IAC5C,MAAMC,MAAM,GAAGD,CAAC,KAAKb,YAAY,CAACW,MAAM,GAAG,CAAC;IAC5Cd,KAAK,CAACC,IAAI,CAAC,KAAKE,YAAY,CAACa,CAAC,CAAC,GAAGC,MAAM,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;EACxD;EAEAjB,KAAK,CAACC,IAAI,CAAC,sBAAsB,CAAC;EAClCD,KAAK,CAACC,IAAI,CAAC,EAAE,CAAC;EAEd;EACA,MAAMiB,IAAI,GAAGnB,SAAS,CAACoB,OAAO,KAAK,IAAI;EACvCnB,KAAK,CAACC,IAAI,CAAC,mEAAmE,CAAC;EAC/ED,KAAK,CAACC,IAAI,CAAC,UAAU,CAAC;EACtBD,KAAK,CAACC,IAAI,CAAC,aAAa,CAAC;EACzB,IAAI,CAACiB,IAAI,EAAE;IACTlB,KAAK,CAACC,IAAI,CAAC,mBAAmB,CAAC;IAC/BD,KAAK,CAACC,IAAI,CAAC,uBAAuB,CAAC;IACnCD,KAAK,CAACC,IAAI,CAAC,mBAAmB,CAAC;IAC/BD,KAAK,CAACC,IAAI,CAAC,kBAAkB,CAAC;IAC9BD,KAAK,CAACC,IAAI,CAAC,oBAAoB,CAAC;IAChCD,KAAK,CAACC,IAAI,CAAC,iBAAiB,CAAC;IAC7BD,KAAK,CAACC,IAAI,CAAC,qBAAqB,CAAC;IACjCD,KAAK,CAACC,IAAI,CAAC,aAAa,CAAC;EAC3B;EACAD,KAAK,CAACC,IAAI,CAAC,eAAe,CAAC;EAC3BD,KAAK,CAACC,IAAI,CAAC,wBAAwB,CAAC;EACpCD,KAAK,CAACC,IAAI,CAAC,eAAe,CAAC;EAC3B,IAAIiB,IAAI,EAAE;IACR;IACAlB,KAAK,CAACC,IAAI,CAAC,eAAe,CAAC;IAC3BD,KAAK,CAACC,IAAI,CAAC,YAAY,CAAC;IACxBD,KAAK,CAACC,IAAI,CAAC,8BAA8B,CAAC;IAC1CD,KAAK,CAACC,IAAI,CAAC,yBAAyB,CAAC;IACrCD,KAAK,CAACC,IAAI,CAAC,uBAAuB,CAAC;IACnCD,KAAK,CAACC,IAAI,CAAC,wBAAwB,CAAC;IACpCD,KAAK,CAACC,IAAI,CAAC,sBAAsB,CAAC;IAClCD,KAAK,CAACC,IAAI,CAAC,6BAA6B,CAAC;IACzCD,KAAK,CAACC,IAAI,CAAC,+BAA+B,CAAC;IAC3CD,KAAK,CAACC,IAAI,CAAC,oCAAoC,CAAC;IAChDD,KAAK,CAACC,IAAI,CAAC,uBAAuB,CAAC;EACrC,CAAC,MAAM;IACL;IACAD,KAAK,CAACC,IAAI,CAAC,eAAe,CAAC;IAC3BD,KAAK,CAACC,IAAI,CAAC,UAAU,CAAC;IACtBD,KAAK,CAACC,IAAI,CAAC,wBAAwB,CAAC;IACpCD,KAAK,CAACC,IAAI,CAAC,4BAA4B,CAAC;IACxCD,KAAK,CAACC,IAAI,CAAC,oCAAoC,CAAC;IAChDD,KAAK,CAACC,IAAI,CAAC,uBAAuB,CAAC;IACnCD,KAAK,CAACC,IAAI,CAAC,mBAAmB,CAAC;IAC/BD,KAAK,CAACC,IAAI,CAAC,kBAAkB,CAAC;IAC9BD,KAAK,CAACC,IAAI,CAAC,oBAAoB,CAAC;IAChCD,KAAK,CAACC,IAAI,CAAC,sBAAsB,CAAC;IAClCD,KAAK,CAACC,IAAI,CAAC,oBAAoB,CAAC;IAChCD,KAAK,CAACC,IAAI,CAAC,oBAAoB,CAAC;IAChCD,KAAK,CAACC,IAAI,CAAC,kBAAkB,CAAC;IAC9BD,KAAK,CAACC,IAAI,CAAC,2BAA2B,CAAC;IACvCD,KAAK,CAACC,IAAI,CAAC,6BAA6B,CAAC;IACzCD,KAAK,CAACC,IAAI,CAAC,kCAAkC,CAAC;IAC9CD,KAAK,CAACC,IAAI,CAAC,qBAAqB,CAAC;EACnC;EACAD,KAAK,CAACC,IAAI,CAAC,oBAAoB,CAAC;EAChCD,KAAK,CAACC,IAAI,CAAC,qBAAqB,CAAC;EACjCD,KAAK,CAACC,IAAI,CAAC,eAAe,CAAC;EAC3BD,KAAK,CAACC,IAAI,CAAC,eAAe,CAAC;EAC3BD,KAAK,CAACC,IAAI,CAAC,gBAAgB,CAAC;EAC5BD,KAAK,CAACC,IAAI,CAAC,iBAAiB,CAAC;EAC7BD,KAAK,CAACC,IAAI,CAAC,eAAe,CAAC;EAC3BD,KAAK,CAACC,IAAI,CAAC,mBAAmB,CAAC;EAC/BD,KAAK,CAACC,IAAI,CAAC,iBAAiB,CAAC;EAC7BD,KAAK,CAACC,IAAI,CAAC,qBAAqB,CAAC;EACjCD,KAAK,CAACC,IAAI,CAAC,uBAAuB,CAAC;EACnCD,KAAK,CAACC,IAAI,CAAC,qBAAqB,CAAC;EACjCD,KAAK,CAACC,IAAI,CAAC,oBAAoB,CAAC;EAChCD,KAAK,CAACC,IAAI,CAAC,wBAAwB,CAAC;EACpCD,KAAK,CAACC,IAAI,CAAC,wBAAwB,CAAC;EACpCD,KAAK,CAACC,IAAI,CAAC,mBAAmB,CAAC;EAC/BD,KAAK,CAACC,IAAI,CAAC,qCAAqC,CAAC;EACjDD,KAAK,CAACC,IAAI,CAAC,EAAE,CAAC;EAEd;EACAD,KAAK,CAACC,IAAI,CAAC,+CAA+C,CAAC;EAC3D,KAAK,MAAMmB,SAAS,IAAIrB,SAAS,CAACsB,UAAU,CAACf,MAAM,EAAE,EAAE;IACrD,MAAMgB,gBAAgB,GAAG,IAAAC,iCAAmB,EAACH,SAAS,CAACb,IAAI,CAAC;IAC5DP,KAAK,CAACC,IAAI,CAAC,eAAeqB,gBAAgB,YAAYA,gBAAgB,MAAM,CAAC;EAC/E;EACAtB,KAAK,CAACC,IAAI,CAAC,EAAE,CAAC;EAEd;EACAD,KAAK,CAACC,IAAI,CAAC,gEAAgE,CAAC;EAC5E,KAAK,MAAMmB,SAAS,IAAIrB,SAAS,CAACsB,UAAU,CAACf,MAAM,EAAE,EAAE;IACrD,MAAMkB,kBAAkB,GAAG,IAAAC,gDAAqB,EAACL,SAAS,CAACb,IAAI,CAAC;IAChEP,KAAK,CAACC,IAAI,CAAC,eAAeuB,kBAAkB,YAAYA,kBAAkB,MAAM,CAAC;EACnF;EACAxB,KAAK,CAACC,IAAI,CAAC,EAAE,CAAC;EAEd;EACAD,KAAK,CAACC,IAAI,CAAC,iBAAiB,CAAC;EAC7BD,KAAK,CAACC,IAAI,CAAC,UAAU,CAAC;EAEtB,MAAMyB,YAAY,GAAkB,EAAE;EAEtC;EACA,KAAK,MAAMlB,WAAW,IAAIT,SAAS,CAACU,YAAY,CAACH,MAAM,EAAE,EAAE;IACzDoB,YAAY,CAACzB,IAAI,CAAC,IAAA0B,kCAAoB,EAACnB,WAAW,CAACD,IAAI,CAAC,CAAC;IACzDmB,YAAY,CAACzB,IAAI,CAAC,QAAQ,IAAA2B,mCAAqB,EAACpB,WAAW,CAACD,IAAI,CAAC,EAAE,CAAC;EACtE;EAEA;EACA,KAAK,MAAMI,UAAU,IAAIZ,SAAS,CAACa,WAAW,CAACN,MAAM,EAAE,EAAE;IACvDoB,YAAY,CAACzB,IAAI,CAAC,IAAA0B,kCAAoB,EAAChB,UAAU,CAACJ,IAAI,CAAC,CAAC;IACxDmB,YAAY,CAACzB,IAAI,CAAC,QAAQ,IAAA2B,mCAAqB,EAACjB,UAAU,CAACJ,IAAI,CAAC,EAAE,CAAC;EACrE;EAEA;EACA,KAAK,MAAMa,SAAS,IAAIrB,SAAS,CAACsB,UAAU,CAACf,MAAM,EAAE,EAAE;IACrD,MAAMK,UAAU,GAAGZ,SAAS,CAACa,WAAW,CAACiB,GAAG,CAACT,SAAS,CAACU,gBAAgB,CAAC;IACxE,IAAInB,UAAU,EAAE;MACde,YAAY,CAACzB,IAAI,CAAC,IAAA8B,iCAAmB,EAACpB,UAAU,CAACJ,IAAI,CAAC,CAAC;IACzD;EACF;EAEA,KAAK,IAAIS,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGU,YAAY,CAACZ,MAAM,EAAEE,CAAC,EAAE,EAAE;IAC5C,MAAMC,MAAM,GAAGD,CAAC,KAAKU,YAAY,CAACZ,MAAM,GAAG,CAAC;IAC5Cd,KAAK,CAACC,IAAI,CAAC,KAAKyB,YAAY,CAACV,CAAC,CAAC,GAAGC,MAAM,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;EACxD;EAEAjB,KAAK,CAACC,IAAI,CAAC,2BAA2B,CAAC;EAEvC,OAAOD,KAAK,CAACgC,IAAI,CAAC,IAAI,CAAC;AACzB,CAAC;AAAAC,OAAA,CAAAnC,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"file":"IndexGenerator.js","names":["_NamingHelper","require","_NavigationGenerator","_OperationsGenerator","generateIndex","dataModel","lines","push","serviceName","modelExports","enumType","enumTypes","values","name","complexType","complexTypes","getEditableTypeName","entityType","entityTypes","keys","length","getIdTypeName","i","isLast","serviceExports","entitySet","entitySets","getServiceClassName","hasUnboundOperations","Array","from","operations","some","op","isBound","operationsModuleName","getOperationsModuleName","pathBuildersModuleName","getPathBuildersModuleName","queryExports","getQueryInstanceName","getQueryInterfaceName","get","entityTypeFqName","getQueryFactoryName","join","exports"],"sources":["../../../src/generator/IndexGenerator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/generator/ModelsGenerator.js

@@ -179,15 +179,12 @@ const generateEntityType = (entityType, dataModel) => {
       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}>`);
   }