@colijnit/mainapi 262.1.22 → 262.1.24

package/build/main-public.d.ts

@@ -107,7 +107,7 @@ export declare class MainPublic extends MainApiConnection {
     getBranchesByWarehouseNumber(warehouseNo: number): Promise<DataServiceResponseData>;
     selectMultiple(moduleName: ModuleName, objectName: string, operationName?: string, parameterValues?: any, showLoader?: boolean): Promise<DataServiceResponseData>;
     getSingleImage(nodeId: number | string, publication?: number, includeMimetype?: boolean, thumb?: boolean, tableName?: TableName): Promise<DataServiceResponseData>;
-    getImage(key: number | string, publication?: number, includeMimetype?: boolean, thumb?: boolean): Promise<DataServiceResponseData>;
+    getImage(key: number | string, publication?: number, includeMimetype?: boolean, thumb?: boolean, tableName?: TableName): Promise<DataServiceResponseData>;
     getImageForCoDocument(document: CoDocument, thumb?: boolean): Promise<DataServiceResponseData>;
     createQRCode(width: number, height: number, value: string, showLoader?: boolean): Promise<DataServiceResponseData>;
     getWarehousesShort(): Promise<DataServiceResponseData>;

package/build/main-public.js

@@ -445,8 +445,8 @@ class MainPublic extends main_api_connection_1.MainApiConnection {
         return this._call(public_service_method_1.PublicServiceMethod.GetSingleImage, data);
     }
     getImage(key_1) {
-        return __awaiter(this, arguments, void 0, function* (key, publication = 4, includeMimetype = false, thumb = true) {
-            const getImageObject = yield this.getSingleImage(key, publication, includeMimetype, thumb, table_name_enum_1.TableName.Goods);
+        return __awaiter(this, arguments, void 0, function* (key, publication = 4, includeMimetype = false, thumb = true, tableName = table_name_enum_1.TableName.Goods) {
+            const getImageObject = yield this.getSingleImage(key, publication, includeMimetype, thumb, tableName);
             if (getImageObject && getImageObject.validationResult && getImageObject.validationResult.success) {
                 if (getImageObject.resultObject) {
                     const document = getImageObject.resultObject;

package/build/utils/file-utils.d.ts

@@ -22,6 +22,9 @@ export declare class FileUtils {
     static ReadAsText(file: File): Promise<string>;
     static readAsDataURL(file: File): Promise<string>;
     static ReadFileAsNewCoDocument(file: File, resize?: boolean, maxSizeInPixels?: number): Promise<CoDocument>;
+    static IsHeicFile(file: File): boolean;
+    static ConvertHeicToJpeg(file: File, jpegQuality?: number): Promise<File>;
+    private static _readFileAsNewCoDocument;
     static ResizeImage(src: string, fileType: string, maxSizeInPixels: number): Promise<string>;
     static CalculateSha256Hash(file: ArrayBuffer): Promise<string>;
     static ReadFileAsDataURL(file: File): Promise<string>;

package/build/utils/file-utils.js

@@ -79,6 +79,8 @@ class FileUtils {
             case "tiff":
             case "tga":
             case "dds":
+            case "heic":
+            case "heif":
                 return file_type_internal_enum_1.FileTypeInternal.Image;
             case "swf":
                 return file_type_internal_enum_1.FileTypeInternal.Swf;
@@ -290,7 +292,28 @@ class FileUtils {
             };
         });
     }
-    static ReadFileAsNewCoDocument(file, resize = false, maxSizeInPixels = 1200) {
+    static ReadFileAsNewCoDocument(file_1) {
+        return __awaiter(this, arguments, void 0, function* (file, resize = false, maxSizeInPixels = 1200) {
+            const readableFile = FileUtils.IsHeicFile(file) ? yield FileUtils.ConvertHeicToJpeg(file) : file;
+            return FileUtils._readFileAsNewCoDocument(readableFile, resize, maxSizeInPixels);
+        });
+    }
+    static IsHeicFile(file) {
+        if (!file) {
+            return false;
+        }
+        const mimeType = (file.type || "").toLowerCase();
+        return mimeType === "image/heic" || mimeType === "image/heif" || /\.(heic|heif)$/i.test(file.name);
+    }
+    static ConvertHeicToJpeg(file_1) {
+        return __awaiter(this, arguments, void 0, function* (file, jpegQuality = 0.9) {
+            const { heicTo } = yield Promise.resolve().then(() => __importStar(require("heic-to")));
+            const jpeg = yield heicTo({ blob: file, type: "image/jpeg", quality: jpegQuality });
+            const fileName = file.name.replace(/\.(heic|heif)$/i, ".jpg");
+            return new File([jpeg], fileName, { type: "image/jpeg", lastModified: file.lastModified });
+        });
+    }
+    static _readFileAsNewCoDocument(file, resize, maxSizeInPixels) {
         return new Promise((resolve) => {
             const reader = new FileReader();
             reader.readAsDataURL(file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/mainapi",
-  "version": "262.1.22",
+  "version": "262.1.24",
   "scripts": {
     "build": "grunt clean && tsc",
     "browserify": "browserify build/connector.js --s colijn -o dist/out-tsc/bundle.js",
@@ -19,6 +19,7 @@
   "license": "ISC",
   "private": false,
   "dependencies": {
+    "heic-to": "^1.6.7",
     "qrcode": "^1.4.4",
     "reflect-metadata": "^0.1.12",
     "rxjs": "6.6.3"
@@ -27,8 +28,8 @@
     "@colijnit/ioneconnector": ">=262.1.0"
   },
   "devDependencies": {
-    "@types/jest": "^24.0.13",
     "@colijnit/ioneconnector": "262.1.0",
+    "@types/jest": "^24.0.13",
     "grunt": "^1.0.3",
     "grunt-clean": "^0.4.0",
     "grunt-contrib-clean": "^1.1.0",