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

package/src/generator/Generator.ts

@@ -10,6 +10,8 @@ import * as Schema from "effect/Schema"
 import type { DataModel } from "../model/DataModel.js"
 import { generateIndex } from "./IndexGenerator.js"
 import { generateModels } from "./ModelsGenerator.js"
+import { generateNavigations } from "./NavigationGenerator.js"
+import { generateOperations } from "./OperationsGenerator.js"
 import {
   generatePackageJson,
   generateTsconfig,
@@ -21,7 +23,6 @@ import {
 } from "./PackageGenerator.js"
 import { generateQueryModels } from "./QueryModelsGenerator.js"
 import { generateServiceFns } from "./ServiceFnGenerator.js"
-import { generatePromiseServiceFns } from "./ServiceFnPromiseGenerator.js"
 
 /**
  * Generator configuration.
@@ -34,6 +35,8 @@ export interface GeneratorConfig {
   readonly packageName?: string
   readonly serviceName?: string
   readonly force?: boolean
+  /** Generate only source files directly in outputDir (no package.json, tsconfig, src/ subdirectory) */
+  readonly filesOnly?: boolean
 }
 
 /**
@@ -75,6 +78,10 @@ export const generate = (
     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: PackageConfig = {
       packageName,
@@ -84,35 +91,47 @@ 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)
+
+    // Generate navigation builders
+    const navigationResult = generateNavigations(dataModel)
 
-    // Generate all files
-    const files: Array<GeneratedFile> = [
-      // Source files
+    // Generate source files
+    const sourceFiles: Array<GeneratedFile> = [
       {
-        path: path.join(outputDir, "src", "Models.ts"),
+        path: path.join(sourceDir, "Models.ts"),
         content: generateModels(dataModel)
       },
       {
-        path: path.join(outputDir, "src", "QueryModels.ts"),
+        path: path.join(sourceDir, "QueryModels.ts"),
         content: 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: generateIndex(dataModel)
-      },
-      // Package configuration files
+      }
+    ]
+
+    // Package configuration files (only when not filesOnly)
+    const packageFiles: Array<GeneratedFile> = filesOnly ? [] : [
       {
         path: path.join(outputDir, "package.json"),
         content: generatePackageJson(dataModel, packageConfig)
@@ -139,11 +158,13 @@ export const generate = (
       }
     ]
 
-    // Create output directories
-    yield* fs.makeDirectory(path.join(outputDir, "src"), { recursive: true }).pipe(
+    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
         })
       )

package/src/generator/IndexGenerator.ts

@@ -12,7 +12,8 @@ import {
   getQueryInterfaceName,
   getServiceClassName
 } from "./NamingHelper.js"
-import { getPromiseServiceName } from "./ServiceFnPromiseGenerator.js"
+import { getPathBuildersModuleName } from "./NavigationGenerator.js"
+import { getOperationsModuleName } from "./OperationsGenerator.js"
 
 /**
  * Generate the index.ts file content.
@@ -63,93 +64,41 @@ export const generateIndex = (dataModel: DataModel): string => {
     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,`)
+  const serviceExports: Array<string> = []
+  for (const entitySet of dataModel.entitySets.values()) {
+    serviceExports.push(getServiceClassName(entitySet.name))
   }
-  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,`)
+  // 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(`  // 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(`} from "./Services"`)
   lines.push(``)
 
-  // Individual Entity Services (tree-shakable module namespace re-exports)
-  lines.push(`// Individual Entity Services (tree-shakable)`)
-  for (const entitySet of dataModel.entitySets.values()) {
-    const serviceClassName = getServiceClassName(entitySet.name)
-    lines.push(`export * as ${serviceClassName} from "./${serviceClassName}.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 = getOperationsModuleName()
+    lines.push(`export * as ${operationsModuleName} from "./${operationsModuleName}"`)
+    lines.push(``)
   }
-  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}.js"`)
-  }
+  // Path Builders (tree-shakable navigation)
+  lines.push(`// Path Builders (tree-shakable navigation)`)
+  const pathBuildersModuleName = getPathBuildersModuleName()
+  lines.push(`export * from "./${pathBuildersModuleName}"`)
   lines.push(``)
 
   // Query Models
@@ -183,7 +132,7 @@ export const generateIndex = (dataModel: DataModel): string => {
     lines.push(`  ${queryExports[i]}${isLast ? "" : ","}`)
   }
 
-  lines.push(`} from "./QueryModels.js"`)
+  lines.push(`} from "./QueryModels"`)
 
   return lines.join("\n")
 }

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

@@ -84,10 +84,17 @@ export const getServiceClassName = (entitySetName: string): string => {
   // Remove trailing 's' if present to singularize
   let singular = entitySetName
   if (singular.endsWith("ies")) {
+    // "Categories" -> "Category"
     singular = singular.slice(0, -3) + "y"
-  } else if (singular.endsWith("es") && !singular.endsWith("ses")) {
+  } 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")) {
+    // "Products" -> "Product", "Airlines" -> "Airline"
     singular = singular.slice(0, -1)
   }
   return `${toPascalCase(singular)}Service`