Added ESM flag and parsed it in the neccessary functions

Author: BrigittaK307

packages/generator/src/complex-type/file.ts

@@ -6,18 +6,20 @@ import { complexTypeNamespace } from './namespace';
 import type { VdmComplexType } from '../vdm-types';
 import type { ODataVersion } from '@sap-cloud-sdk/util';
 import type { SourceFileStructure } from 'ts-morph';
+import type { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal';
 
 /**
  * @internal
  */
 export function complexTypeSourceFile(
   complexType: VdmComplexType,
-  oDataVersion: ODataVersion
+  oDataVersion: ODataVersion,
+  options?: CreateFileOptions
 ): SourceFileStructure {
   return {
     kind: StructureKind.SourceFile,
     statements: [
-      ...importDeclarations(complexType, oDataVersion),
+      ...importDeclarations(complexType, oDataVersion, options),
       complexTypeInterface(complexType),
       fieldTypeClass(complexType),
       complexTypeNamespace(complexType)

packages/generator/src/complex-type/imports.ts

@@ -6,17 +6,19 @@ import {
 import type { ImportDeclarationStructure } from 'ts-morph';
 import type { ODataVersion } from '@sap-cloud-sdk/util';
 import type { VdmComplexType } from '../vdm-types';
+import type { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal';
 
 /**
  * @internal
  */
 export function importDeclarations(
   complexType: VdmComplexType,
-  oDataVersion: ODataVersion
+  oDataVersion: ODataVersion,
+  options?: CreateFileOptions
 ): ImportDeclarationStructure[] {
   return [
-    ...complexTypeImportDeclarations(complexType.properties),
-    ...enumTypeImportDeclarations(complexType.properties),
+    ...complexTypeImportDeclarations(complexType.properties, options),
+    ...enumTypeImportDeclarations(complexType.properties, options),
     odataImportDeclarationTsMorph(
       [
         'DefaultDeSerializers',

packages/generator/src/entity/file.ts

@@ -5,19 +5,21 @@ import { entityImportDeclarations, otherEntityImports } from './imports';
 import { entityTypeInterface } from './interface';
 import type { VdmEntity, VdmServiceMetadata } from '../vdm-types';
 import type { SourceFileStructure } from 'ts-morph';
+import type { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal';
 
 /**
  * @internal
  */
 export function entitySourceFile(
   entity: VdmEntity,
-  service: VdmServiceMetadata
+  service: VdmServiceMetadata,
+  options?: CreateFileOptions
 ): SourceFileStructure {
   return {
     kind: StructureKind.SourceFile,
     statements: [
-      ...entityImportDeclarations(entity, service, service.oDataVersion),
-      ...otherEntityImports(entity, service),
+      ...entityImportDeclarations(entity, service, service.oDataVersion, options),
+      ...otherEntityImports(entity, service, options),
       entityClass(entity, service),
       entityTypeInterface(entity, service),
       ...entity.operations.map(operation => parametersInterface(operation))

packages/generator/src/entity/imports.ts

@@ -9,30 +9,34 @@ import { operationDeclarations } from '../operations';
 import type { ImportDeclarationStructure } from 'ts-morph';
 import type { ODataVersion } from '@sap-cloud-sdk/util';
 import type { VdmEntity, VdmServiceMetadata } from '../vdm-types';
+import type { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal';
 
 /**
  * @internal
  */
 export function entityImportDeclarations(
   entity: VdmEntity,
   service: VdmServiceMetadata,
-  oDataVersion: ODataVersion
+  oDataVersion: ODataVersion,
+  options?: CreateFileOptions
 ): ImportDeclarationStructure[] {
   if (oDataVersion === 'v4') {
     return mergeImportDeclarations([
       odataImportDeclarationTsMorph(
         ['Entity', 'DefaultDeSerializers', 'DeSerializers', 'DeserializedType'],
         oDataVersion
       ),
-      ...complexTypeImportDeclarations(entity.properties),
+      ...complexTypeImportDeclarations(entity.properties, options),
       {
         namedImports: [`${entity.className}Api`],
-        moduleSpecifier: `./${entity.className}Api`,
+        moduleSpecifier: options?.generateESM
+          ? `./${entity.className}Api.js`
+          : `./${entity.className}Api`,
         kind: StructureKind.ImportDeclaration,
         isTypeOnly: true
       },
       ...operationDeclarations(service, entity.operations),
-      ...enumTypeImportDeclarations(entity.properties)
+      ...enumTypeImportDeclarations(entity.properties, options)
     ]);
   }
 
@@ -41,22 +45,25 @@ export function entityImportDeclarations(
       ['Entity', 'DefaultDeSerializers', 'DeSerializers', 'DeserializedType'],
       oDataVersion
     ),
-    ...complexTypeImportDeclarations(entity.properties),
+    ...complexTypeImportDeclarations(entity.properties, options),
     {
       namedImports: [`${entity.className}Api`],
-      moduleSpecifier: `./${entity.className}Api`,
+      moduleSpecifier: options?.generateESM
+        ? `./${entity.className}Api.js`
+        : `./${entity.className}Api`,
       kind: StructureKind.ImportDeclaration,
       isTypeOnly: true
     },
-    ...enumTypeImportDeclarations(entity.properties)
+    ...enumTypeImportDeclarations(entity.properties, options)
   ];
 }
 /**
  * @internal
  */
 export function otherEntityImports(
   entity: VdmEntity,
-  service: VdmServiceMetadata
+  service: VdmServiceMetadata,
+  options?: CreateFileOptions
 ): ImportDeclarationStructure[] {
   return Array.from(new Set(entity.navigationProperties.map(n => n.to)))
     .map(to => {
@@ -71,13 +78,15 @@ export function otherEntityImports(
       return matchedEntity.className;
     })
     .filter(name => name !== entity.className)
-    .map(name => otherEntityImport(name));
+    .map(name => otherEntityImport(name, options));
 }
 
-function otherEntityImport(name: string): ImportDeclarationStructure {
+function otherEntityImport(name: string, options?: CreateFileOptions): ImportDeclarationStructure {
   return {
     kind: StructureKind.ImportDeclaration,
     namedImports: [name, `${name}Type`],
-    moduleSpecifier: `./${name}`
+    moduleSpecifier: options?.generateESM
+      ? `./${name}.js`
+      : `./${name}`
   };
 }

packages/generator/src/generator.ts

@@ -377,7 +377,7 @@ async function generateMandatorySources(
       sourceFile(
         serviceDir,
         entity.className,
-        entitySourceFile(entity, service),
+        entitySourceFile(entity, service, createFileOptions),
         createFileOptions
       )
     );
@@ -413,7 +413,7 @@ async function generateMandatorySources(
       sourceFile(
         serviceDir,
         complexType.typeName,
-        complexTypeSourceFile(complexType, service.oDataVersion),
+        complexTypeSourceFile(complexType, service.oDataVersion, createFileOptions),
         createFileOptions
       )
     );

packages/generator/src/imports.ts

@@ -8,6 +8,7 @@ import type {
   VdmNavigationProperty,
   VdmProperty
 } from './vdm-types';
+import type { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal';
 
 /**
  * @internal
@@ -107,25 +108,27 @@ export function navPropertyFieldTypeImportNames(
  * @internal
  */
 export function complexTypeImportDeclarations(
-  properties: VdmProperty[]
+  properties: VdmProperty[],
+  options?: CreateFileOptions
 ): ImportDeclarationStructure[] {
   return mergeImportDeclarations(
     properties
       .filter(prop => prop.isComplex)
-      .map(prop => complexTypeImportDeclaration(prop))
+      .map(prop => complexTypeImportDeclaration(prop, options))
   );
 }
 
 /**
  * @internal
  */
 export function enumTypeImportDeclarations(
-  properties: VdmProperty[]
+  properties: VdmProperty[],
+  options?: CreateFileOptions
 ): ImportDeclarationStructure[] {
   return mergeImportDeclarations(
     properties
       .filter(prop => prop.isEnum)
-      .map(prop => enumTypeImportDeclaration(prop))
+      .map(prop => enumTypeImportDeclaration(prop, options))
   );
 }
 
@@ -184,21 +187,49 @@ export function mergeImportDeclarations(
 }
 
 function complexTypeImportDeclaration(
-  prop: VdmProperty
+  prop: VdmProperty,
+  options?: CreateFileOptions
 ): ImportDeclarationStructure {
   return {
     kind: StructureKind.ImportDeclaration,
-    moduleSpecifier: `./${prop.jsType}`,
+    moduleSpecifier: options?.generateESM
+      ? `./${prop.jsType}.js`
+      : `./${prop.jsType}`,
     namedImports: [prop.jsType, ...(prop.isCollection ? [] : [prop.fieldType])]
   };
 }
 
 function enumTypeImportDeclaration(
-  prop: VdmProperty
+  prop: VdmProperty,
+  options?: CreateFileOptions
 ): ImportDeclarationStructure {
   return {
     kind: StructureKind.ImportDeclaration,
-    moduleSpecifier: `./${prop.jsType}`,
+    moduleSpecifier: options?.generateESM
+      ? `./${prop.jsType}.js`
+      : `./${prop.jsType}`,
     namedImports: [prop.jsType]
   };
 }
+
+/**
+ * @internal
+ */
+export function getImportsWithESM(
+  schemaName: string,
+  fileName: string,
+  properties: VdmProperty[],
+  options?: CreateFileOptions
+): ImportDeclarationStructure[] {
+  return mergeImportDeclarations(
+    properties
+      .filter(prop => prop.isComplex || prop.isEnum)
+      .map(prop => ({
+        kind: StructureKind.ImportDeclaration,
+        moduleSpecifier: options?.generateESM
+          ? `./${prop.jsType}.js`
+          : `./${prop.jsType}`,
+        namedImports: [prop.jsType, ...(prop.isCollection ? [] : [prop.fieldType])]
+      }))
+  );
+}