ibm-cloud-sdk-core 5.4.8 → 5.4.9

package/es/lib/helper.js

@@ -25,8 +25,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { isReadable } from 'isstream';
 import { lookup } from 'mime-types';
 import { basename } from 'path';
+import { loadEsm } from 'load-esm';
 import logger from './logger';
-const FileType = require('file-type');
 // custom type guards
 function isFileObject(obj) {
     return Boolean(obj && obj.value);
@@ -58,7 +58,14 @@ export function getContentType(inputData) {
         }
         else if (Buffer.isBuffer(inputData)) {
             // if the inputData is a Buffer
-            contentType = yield FileType.fromBuffer(inputData);
+            try {
+                // Import a pure ESM package from a CommonJS TS project
+                const { fileTypeFromBuffer } = yield loadEsm('file-type');
+                contentType = yield fileTypeFromBuffer(inputData);
+            }
+            catch (error) {
+                logger.debug('Error importing module:', error);
+            }
         }
         return contentType ? contentType.mime : null;
     });

package/lib/helper.js

@@ -67,8 +67,8 @@ exports.isJsonMimeType = exports.constructServiceUrl = exports.toLowerKeys = exp
 var isstream_1 = require("isstream");
 var mime_types_1 = require("mime-types");
 var path_1 = require("path");
+var load_esm_1 = require("load-esm");
 var logger_1 = __importDefault(require("./logger"));
-var FileType = require('file-type');
 // custom type guards
 function isFileObject(obj) {
     return Boolean(obj && obj.value);
@@ -95,7 +95,7 @@ exports.isEmptyObject = isEmptyObject;
  */
 function getContentType(inputData) {
     return __awaiter(this, void 0, void 0, function () {
-        var contentType, mimeType;
+        var contentType, mimeType, fileTypeFromBuffer, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -103,15 +103,24 @@ function getContentType(inputData) {
                     if (!isFileStream(inputData)) return [3 /*break*/, 1];
                     mimeType = (0, mime_types_1.lookup)(inputData.path);
                     contentType = { mime: mimeType || null };
-                    return [3 /*break*/, 3];
+                    return [3 /*break*/, 6];
                 case 1:
-                    if (!Buffer.isBuffer(inputData)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, FileType.fromBuffer(inputData)];
+                    if (!Buffer.isBuffer(inputData)) return [3 /*break*/, 6];
+                    _a.label = 2;
                 case 2:
-                    // if the inputData is a Buffer
+                    _a.trys.push([2, 5, , 6]);
+                    return [4 /*yield*/, (0, load_esm_1.loadEsm)('file-type')];
+                case 3:
+                    fileTypeFromBuffer = (_a.sent()).fileTypeFromBuffer;
+                    return [4 /*yield*/, fileTypeFromBuffer(inputData)];
+                case 4:
                     contentType = _a.sent();
-                    _a.label = 3;
-                case 3: return [2 /*return*/, contentType ? contentType.mime : null];
+                    return [3 /*break*/, 6];
+                case 5:
+                    error_1 = _a.sent();
+                    logger_1.default.debug('Error importing module:', error_1);
+                    return [3 /*break*/, 6];
+                case 6: return [2 /*return*/, contentType ? contentType.mime : null];
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ibm-cloud-sdk-core",
-    "version": "5.4.8",
+    "version": "5.4.9",
     "description": "Core functionality to support SDKs generated with IBM's OpenAPI SDK Generator.",
     "main": "./index.js",
     "typings": "./es/index.d.ts",
@@ -42,10 +42,11 @@
         "debug": "^4.3.4",
         "dotenv": "^16.4.5",
         "extend": "3.0.2",
-        "file-type": "16.5.4",
+        "file-type": "^21.3.2",
         "form-data": "^4.0.4",
         "isstream": "0.1.2",
         "jsonwebtoken": "^9.0.3",
+        "load-esm": "^1.0.3",
         "mime-types": "2.1.35",
         "retry-axios": "^2.6.0",
         "tough-cookie": "^4.1.3"