@odata-effect/odata-effect-generator 0.5.0 → 0.6.1

package/src/generator/ServiceFnGenerator.ts

@@ -8,7 +8,7 @@
  */
 import type { DataModel, EntitySetModel, EntityTypeModel } from "../model/DataModel.js"
 import type { ODataVersion } from "../parser/EdmxSchema.js"
-import { getEditableTypeName, getIdTypeName, getServiceClassName } from "./NamingHelper.js"
+import { formatRelativeImport, getEditableTypeName, getIdTypeName, getServiceClassName } from "./NamingHelper.js"
 
 /**
  * Generated service file.
@@ -31,14 +31,32 @@ export interface ServiceGenerationResult {
   readonly servicesFile: GeneratedServiceFile
 }
 
+/**
+ * Options for service generation.
+ *
+ * @since 1.0.0
+ * @category types
+ */
+export interface ServiceGeneratorOptions {
+  /**
+   * Add .js extensions to relative imports for ESM compatibility.
+   * @default true
+   */
+  readonly esmExtensions?: boolean
+}
+
 /**
  * Generate the Services.ts file using crud factory.
  *
  * @since 1.0.0
  * @category generation
  */
-export const generateServiceFns = (dataModel: DataModel): ServiceGenerationResult => {
-  const content = generateServicesFile(dataModel)
+export const generateServiceFns = (
+  dataModel: DataModel,
+  options?: ServiceGeneratorOptions
+): ServiceGenerationResult => {
+  const esmExtensions = options?.esmExtensions ?? true
+  const content = generateServicesFile(dataModel, esmExtensions)
   return {
     servicesFile: {
       fileName: "Services.ts",
@@ -50,7 +68,7 @@ export const generateServiceFns = (dataModel: DataModel): ServiceGenerationResul
 /**
  * Generate the Services.ts file content.
  */
-const generateServicesFile = (dataModel: DataModel): string => {
+const generateServicesFile = (dataModel: DataModel, esmExtensions: boolean): string => {
   const lines: Array<string> = []
   const isV4 = dataModel.version === "V4"
   const crudImportPath = isV4
@@ -97,7 +115,7 @@ const generateServicesFile = (dataModel: DataModel): string => {
     const isLast = i === modelImports.length - 1
     lines.push(`  ${modelImports[i]}${isLast ? "" : ","}`)
   }
-  lines.push(`} from "./Models"`)
+  lines.push(`} from "${formatRelativeImport("Models", esmExtensions)}"`)
   lines.push(``)
 
   // Re-export types from the crud module
@@ -159,7 +177,6 @@ const generateIdToKeyFunction = (
   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
@@ -169,19 +186,16 @@ const generateIdToKeyFunction = (
         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}`
+      // V2 supports both numeric and string keys
+      if (keyTsType === "number") {
+        return `(id: ${idTypeName}) => typeof id === "number" ? { ${keyProp.odataName}: id } : { ${keyProp.odataName}: id.${keyProp.name} }`
       } else {
-        return `${k.odataName}: String(id.${k.name})`
+        return `(id: ${idTypeName}) => typeof id === "string" ? { ${keyProp.odataName}: id } : { ${keyProp.odataName}: id.${keyProp.name} }`
       }
-    }).join(", ")
-
+    }
+  } else {
+    // Composite key - both V2 and V4 can use native types
+    const keyMapping = entityType.keys.map((k) => `${k.odataName}: id.${k.name}`).join(", ")
     return `(id: ${idTypeName}) => ({ ${keyMapping} })`
   }
 }

package/src/model/GeneratorConfig.ts

@@ -4,6 +4,28 @@
  * @since 1.0.0
  */
 
+/**
+ * Generator options for code generation.
+ *
+ * @since 1.0.0
+ * @category config
+ */
+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
+   */
+  readonly esmExtensions?: boolean
+
+  /**
+   * Naming overrides for customizing generated type and property names.
+   */
+  readonly overrides?: NamingOverrides
+}
+
 /**
  * Override configuration for property names.
  * Maps OData property names to TypeScript property names.