@odata-effect/odata-effect-generator 0.6.8 → 0.6.10

package/src/generator/OperationsGenerator.ts

@@ -82,9 +82,8 @@ export interface OperationsGenerationResult {
 export interface OperationsGeneratorOptions {
   /**
    * Add .js extensions to relative imports for ESM compatibility.
-   * @default true
    */
-  readonly esmExtensions?: boolean
+  readonly esmExtensions: boolean
 }
 
 /**
@@ -95,9 +94,9 @@ export interface OperationsGeneratorOptions {
  */
 export const generateOperations = (
   dataModel: DataModel,
-  options?: OperationsGeneratorOptions
+  options: OperationsGeneratorOptions
 ): OperationsGenerationResult => {
-  const esmExtensions = options?.esmExtensions ?? true
+  const { esmExtensions } = options
 
   // Get unbound operations only (bound operations are attached to entity services)
   const unboundOperations = Array.from(dataModel.operations.values()).filter((op) => !op.isBound)
@@ -151,6 +150,65 @@ const getReturnTypeName = (operation: OperationModel): string => {
   return isCollection ? `ReadonlyArray<${baseType}>` : baseType
 }
 
+/**
+ * Check if any operation uses Schema.* types for primitives.
+ */
+const needsSchemaImport = (operations: ReadonlyArray<OperationModel>, dataModel: DataModel): boolean => {
+  for (const operation of operations) {
+    // Check return type - only if it's not a model type
+    if (operation.returnType && !returnsModelType(operation, dataModel)) {
+      if (operation.returnType.typeMapping.effectSchema.startsWith("Schema.")) {
+        return true
+      }
+    }
+    // Check parameters - only if they're not model types
+    for (const param of operation.parameters) {
+      if (param.typeMapping.effectSchema.startsWith("Schema.")) {
+        // Check if it's not a model type
+        const typeName = param.typeMapping.tsType
+        let isModel = false
+        for (const [fqName] of dataModel.entityTypes) {
+          if (fqName.endsWith(`.${typeName}`) || fqName === typeName) {
+            isModel = true
+            break
+          }
+        }
+        if (!isModel) {
+          for (const [fqName] of dataModel.complexTypes) {
+            if (fqName.endsWith(`.${typeName}`) || fqName === typeName) {
+              isModel = true
+              break
+            }
+          }
+        }
+        if (!isModel) return true
+      }
+    }
+  }
+  return false
+}
+
+/**
+ * Check if any operation uses ODataSchema.* types.
+ */
+const needsODataSchemaImport = (operations: ReadonlyArray<OperationModel>, dataModel: DataModel): boolean => {
+  for (const operation of operations) {
+    // Check return type - only if it's not a model type
+    if (operation.returnType && !returnsModelType(operation, dataModel)) {
+      if (operation.returnType.typeMapping.effectSchema.startsWith("ODataSchema.")) {
+        return true
+      }
+    }
+    // Check parameters
+    for (const param of operation.parameters) {
+      if (param.typeMapping.effectSchema.startsWith("ODataSchema.")) {
+        return true
+      }
+    }
+  }
+  return false
+}
+
 /**
  * Collect all model types that need to be imported.
  */
@@ -200,6 +258,10 @@ const generateOperationsFile = (
   const versionConfig = getVersionConfig(dataModel.version)
   const isV4 = dataModel.version === "V4"
 
+  // Determine which imports are needed
+  const needsSchema = needsSchemaImport(operations, dataModel)
+  const needsODataSchema = needsODataSchemaImport(operations, dataModel)
+
   // Header and imports
   lines.push(`/**`)
   lines.push(` * OData operations for ${dataModel.serviceName} OData ${dataModel.version}.`)
@@ -208,6 +270,9 @@ const generateOperationsFile = (
   lines.push(` * @since 1.0.0`)
   lines.push(` */`)
   lines.push(`import * as Effect from "effect/Effect"`)
+  if (needsSchema) {
+    lines.push(`import * as Schema from "effect/Schema"`)
+  }
   lines.push(`import { HttpClient } from "@effect/platform"`)
   lines.push(`import type * as HttpClientError from "@effect/platform/HttpClientError"`)
   lines.push(``)
@@ -224,6 +289,9 @@ const generateOperationsFile = (
   lines.push(`  type ODataError,`)
   lines.push(`  type ParseError`)
   lines.push(`} from "@odata-effect/odata-effect/Errors"`)
+  if (needsODataSchema) {
+    lines.push(`import { ODataSchema } from "@odata-effect/odata-effect"`)
+  }
   lines.push(``)
 
   // Import model types if needed

package/src/generator/QueryModelsGenerator.ts

@@ -27,9 +27,8 @@ import {
 export interface QueryModelsGeneratorOptions {
   /**
    * Add .js extensions to relative imports for ESM compatibility.
-   * @default true
    */
-  readonly esmExtensions?: boolean
+  readonly esmExtensions: boolean
 }
 
 /**
@@ -40,9 +39,9 @@ export interface QueryModelsGeneratorOptions {
  */
 export const generateQueryModels = (
   dataModel: DataModel,
-  options?: QueryModelsGeneratorOptions
+  options: QueryModelsGeneratorOptions
 ): string => {
-  const esmExtensions = options?.esmExtensions ?? true
+  const { esmExtensions } = options
   const lines: Array<string> = []
 
   // Collect all query path types needed

package/src/generator/ServiceFnGenerator.ts

@@ -40,9 +40,8 @@ export interface ServiceGenerationResult {
 export interface ServiceGeneratorOptions {
   /**
    * Add .js extensions to relative imports for ESM compatibility.
-   * @default true
    */
-  readonly esmExtensions?: boolean
+  readonly esmExtensions: boolean
 }
 
 /**
@@ -53,10 +52,9 @@ export interface ServiceGeneratorOptions {
  */
 export const generateServiceFns = (
   dataModel: DataModel,
-  options?: ServiceGeneratorOptions
+  options: ServiceGeneratorOptions
 ): ServiceGenerationResult => {
-  const esmExtensions = options?.esmExtensions ?? true
-  const content = generateServicesFile(dataModel, esmExtensions)
+  const content = generateServicesFile(dataModel, options.esmExtensions)
   return {
     servicesFile: {
       fileName: "Services.ts",

package/src/model/GeneratorConfig.ts

@@ -14,9 +14,7 @@ export interface GeneratorOptions {
   /**
    * Add .js extensions to relative imports for ESM compatibility.
    * Required for moduleResolution: node16/nodenext.
-   * Default: true (recommended for ESM projects)
-   *
-   * @default true
+   * @default false
    */
   readonly esmExtensions?: boolean