chore(deps): bump bignumber.js from 9.3.1 to 10.0.2 (#6359)

* chore(deps): bump bignumber.js from 9.3.1 to 10.0.2

Bumps [bignumber.js](https://github.com/MikeMcl/bignumber.js) from 9.3.1 to 10.0.2.
- [Release notes](https://github.com/MikeMcl/bignumber.js/releases)
- [Changelog](https://github.com/MikeMcl/bignumber.js/blob/main/CHANGELOG.md)
- [Commits](MikeMcl/bignumber.js@v9.3.1...v10.0.2)

---
updated-dependencies:
- dependency-name: bignumber.js
  dependency-version: 10.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Add default imports

* fix some tests

* Changes from lint:fix

* regenerate

* fix common generation

* remove unnecessary dependency

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marika Marszalkowski <[email protected]>
Co-authored-by: cloud-sdk-js <[email protected]>

Author: 3 people

.github/actions/check-public-api/index.js

@@ -7,6 +7,10 @@ export interface Import {
    * Names of the exports that are to be imported.
    */
   names: string[];
+  /**
+   * The default export to import.
+   */
+  defaultImport?: string | undefined;
   /**
    * The module to import from.
    */
@@ -21,11 +25,13 @@ export interface Import {
  * @internal
  */
 export function serializeImports(imports: Import[]): string {
-  const relevantImports = imports.filter(({ names }) => names.length);
+  const relevantImports = imports.filter(
+    ({ names, defaultImport }) => names.length || defaultImport
+  );
   return relevantImports
     .map(
-      ({ names, moduleIdentifier, typeOnly }) =>
-        codeBlock`import ${typeOnly ? 'type ' : ''}{ ${names.join(
+      ({ names, defaultImport, moduleIdentifier, typeOnly }) =>
+        codeBlock`import ${typeOnly ? 'type ' : ''}${defaultImport ? `${defaultImport},` : ''}{ ${names.join(
           ', '
         )} } from '${moduleIdentifier}';`
     )

packages/generator-common/src/file-writer/imports.ts

@@ -56,22 +56,24 @@ function complexTypeImport(
  */
 export function externalImports(properties: VdmMappedEdmType[]): Import[] {
   return potentialExternalImportDeclarations
-    .map(([moduleIdentifier, ...names]) =>
-      externalImport(properties, moduleIdentifier, names)
+    .map(({ moduleSpecifier, namedImports = [], defaultImport }) =>
+      externalImport(properties, moduleSpecifier, namedImports, defaultImport)
     )
     .filter(anImport => anImport.names && anImport.names.length);
 }
 
 function externalImport(
   properties: VdmMappedEdmType[],
   moduleIdentifier: string,
-  names: string[]
+  names: string[] = [],
+  defaultImport: string | undefined
 ): Import {
   return {
     moduleIdentifier,
     names: names.filter(name =>
       properties.map(prop => prop.jsType).includes(name)
-    )
+    ),
+    defaultImport
   };
 }
 

packages/generator/src/generator-without-ts-morph/entity-api/imports.ts

@@ -11,10 +11,19 @@ export function externalImportDeclarations(
   properties: VdmMappedEdmType[]
 ): Import[] {
   return potentialExternalImportDeclarations
-    .map(([moduleIdentifier, ...names]) =>
-      externalImportDeclaration(properties, moduleIdentifier, names)
+    .map(({ moduleSpecifier, namedImports, defaultImport }) =>
+      externalImportDeclaration(
+        properties,
+        moduleSpecifier,
+        namedImports,
+        defaultImport
+      )
     )
-    .filter(declaration => declaration.names && declaration.names.length);
+    .filter(
+      declaration =>
+        (declaration.names && declaration.names.length) ||
+        declaration.defaultImport
+    );
 }
 
 /**
@@ -23,13 +32,19 @@ export function externalImportDeclarations(
 export function externalImportDeclaration(
   properties: VdmMappedEdmType[],
   moduleIdentifier: string,
-  names: string[]
+  names: string[] = [],
+  defaultImport: string | undefined
 ): Import {
   return {
     moduleIdentifier,
     names: names.filter(namedImport =>
       properties.map(prop => prop.jsType).includes(namedImport)
-    )
+    ),
+    defaultImport: properties
+      .map(prop => prop.jsType)
+      .includes(defaultImport || '')
+      ? defaultImport
+      : undefined
   };
 }
 

packages/generator/src/generator-without-ts-morph/imports.ts

@@ -63,7 +63,8 @@ export function imports(
     })),
     ...operations,
     {
-      names: ['BigNumber'],
+      names: [],
+      defaultImport: 'BigNumber',
       moduleIdentifier: 'bignumber.js'
     },
     {

packages/generator/src/generator-without-ts-morph/service/file.ts

@@ -174,7 +174,7 @@ describe('imports', () => {
       namedImports: ['2']
     } as ImportDeclarationStructure;
 
-    it('merges named imports', () => {
+    it('merges imports', () => {
       const merged = {
         kind: StructureKind.ImportDeclaration,
         moduleSpecifier: './module',
@@ -195,7 +195,7 @@ describe('imports', () => {
       ).toEqual([merged, momentImport, bigNumberImport]);
     });
 
-    it('merges named imports including type imports', () => {
+    it('merges imports including type imports', () => {
       const declarations = [
         { ...declaration1FromModule, isTypeOnly: true },
         declaration2FromModule

packages/generator/src/imports.spec.ts

@@ -14,8 +14,14 @@ import type { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal
  * @internal
  */
 export const potentialExternalImportDeclarations = [
-  ['moment', 'Moment', 'Duration'],
-  ['bignumber.js', 'BigNumber']
+  {
+    moduleSpecifier: 'moment',
+    namedImports: ['Moment', 'Duration']
+  },
+  {
+    moduleSpecifier: 'bignumber.js',
+    defaultImport: 'BigNumber'
+  }
 ];
 
 /**
@@ -25,32 +31,35 @@ export function externalImportDeclarationsTsMorph(
   properties: VdmMappedEdmType[]
 ): ImportDeclarationStructure[] {
   return potentialExternalImportDeclarations
-    .map(([moduleSpecifier, ...namedImports]) =>
-      externalImportDeclarationTsMorph(
-        properties,
-        moduleSpecifier,
-        namedImports
-      )
+    .map(importDeclaration =>
+      externalImportDeclarationTsMorph(properties, importDeclaration)
     )
     .filter(
-      declaration => declaration.namedImports && declaration.namedImports.length
+      declaration =>
+        (declaration.namedImports && declaration.namedImports.length) ||
+        declaration.defaultImport
     );
 }
 
-/**
- * @internal
- */
-export function externalImportDeclarationTsMorph(
+function externalImportDeclarationTsMorph(
   properties: VdmMappedEdmType[],
-  moduleSpecifier: string,
-  namedImports: string[]
+  {
+    moduleSpecifier,
+    namedImports = [],
+    defaultImport
+  }: (typeof potentialExternalImportDeclarations)[number]
 ): ImportDeclarationStructure {
   return {
     kind: StructureKind.ImportDeclaration,
     moduleSpecifier,
     namedImports: namedImports.filter(namedImport =>
       properties.map(prop => prop.jsType).includes(namedImport)
-    )
+    ),
+    defaultImport:
+      defaultImport &&
+      properties
+        .map(prop => prop.jsType)
+        .find(jsType => jsType === defaultImport)
   };
 }
 
@@ -132,7 +141,7 @@ export function enumTypeImportDeclarations(
   );
 }
 
-// Only supports named imports
+// Does not support writer functions or strings as named imports
 /**
  * @internal
  */
@@ -142,47 +151,41 @@ export function mergeImportDeclarations(
   return importDeclarations
     .reduce(
       (mergedDeclarations: ImportDeclarationStructure[], importDeclaration) => {
-        const sameModuleSpecifier = mergedDeclarations.find(
+        const mergedDeclaration = mergedDeclarations.find(
           declaration =>
             declaration.moduleSpecifier === importDeclaration.moduleSpecifier &&
             declaration.isTypeOnly === importDeclaration.isTypeOnly
         );
-        if (sameModuleSpecifier) {
-          if (!sameModuleSpecifier.namedImports) {
-            sameModuleSpecifier.namedImports = [
-              ...(importDeclaration.namedImports as string[])
-            ];
-          } else if (sameModuleSpecifier.namedImports instanceof Array) {
-            sameModuleSpecifier.namedImports = [
-              ...sameModuleSpecifier.namedImports,
-              ...(importDeclaration.namedImports as string[])
-            ];
-          } else {
-            sameModuleSpecifier.namedImports = [
-              sameModuleSpecifier.namedImports,
-              ...(importDeclaration.namedImports as string[])
-            ];
+        if (mergedDeclaration) {
+          const mergedNamedImports = mergedDeclaration.namedImports || [];
+          const newNamedImports = importDeclaration.namedImports || [];
+          if (
+            !Array.isArray(mergedNamedImports) ||
+            !Array.isArray(newNamedImports)
+          ) {
+            throw new Error(
+              'mergeImportDeclarations only supports array or undefined named imports. This should never happen.'
+            );
           }
+          mergedDeclaration.namedImports = unique([
+            ...mergedNamedImports,
+            ...newNamedImports
+          ]);
+
+          mergedDeclaration.defaultImport =
+            mergedDeclaration.defaultImport || importDeclaration.defaultImport;
         } else {
           mergedDeclarations.push(importDeclaration);
         }
         return mergedDeclarations;
       },
       []
     )
-    .map(importDeclaration => {
-      if (!importDeclaration.namedImports) {
-        importDeclaration.namedImports = undefined;
-      } else if (importDeclaration.namedImports instanceof Array) {
-        importDeclaration.namedImports = unique(importDeclaration.namedImports);
-      } else {
-        importDeclaration.namedImports = [importDeclaration.namedImports];
-      }
-      return importDeclaration;
-    })
     .filter(
       importDeclaration =>
-        importDeclaration.namedImports && importDeclaration.namedImports.length
+        (importDeclaration.namedImports &&
+          importDeclaration.namedImports.length) ||
+        importDeclaration.defaultImport
     );
 }
 

packages/generator/src/imports.ts

@@ -10,5 +10,6 @@ export const momentImport = {
 export const bigNumberImport = {
   kind: StructureKind.ImportDeclaration,
   moduleSpecifier: 'bignumber.js',
-  namedImports: ['BigNumber']
+  defaultImport: 'BigNumber',
+  namedImports: []
 } as ImportDeclarationStructure;

packages/generator/test/test-util/import-declaration-structures.ts

@@ -43,7 +43,7 @@
     "@sap-cloud-sdk/connectivity": "^4.5.1",
     "@sap-cloud-sdk/http-client": "^4.5.1",
     "@sap-cloud-sdk/util": "^4.5.1",
-    "bignumber.js": "^9.3.1",
+    "bignumber.js": "^10.0.2",
     "moment": "^2.30.1",
     "voca": "^1.4.1"
   },

packages/odata-common/package.json

@@ -44,7 +44,7 @@
     "@sap-cloud-sdk/http-client": "^4.5.1",
     "@sap-cloud-sdk/odata-common": "^4.5.1",
     "@sap-cloud-sdk/util": "^4.5.1",
-    "bignumber.js": "^9.3.1",
+    "bignumber.js": "^10.0.2",
     "moment": "^2.30.1"
   },
   "devDependencies": {