@divriots/jampack 0.26.0 → 0.27.1

package/dist/config-default.js

@@ -16,6 +16,7 @@ const default_options = {
         embed_size: 1500,
         srcset_min_width: 390 * 2, // HiDPI phone
         srcset_max_width: 1920 * 2, // 4K
+        srcset_step: 300,
         max_width: 99999,
         src_include: /^.*$/,
         src_exclude: /^\/vercel\/image\?/, // Ignore /vervel/image? URLs because not local and most likely already optimized,

package/dist/config-types.d.ts

@@ -23,11 +23,12 @@ export type Options = {
         embed_size: number;
         srcset_min_width: number;
         srcset_max_width: number;
+        srcset_step: number;
         max_width: number;
         src_include: RegExp;
         src_exclude: RegExp | null;
         external: {
-            process: 'off' | 'download';
+            process: 'off' | 'download' | ((attrib_src: string) => Promise<string>);
             src_include: RegExp;
             src_exclude: RegExp | null;
         };

package/dist/optimize.js

@@ -278,6 +278,30 @@ async function processImage(state, htmlfile, img, isAboveTheFold) {
     /*
      * Check for external images
      */
+    if (!isLocal(attrib_src) &&
+        isIncluded(attrib_src, config.image.external.src_include, config.image.external.src_exclude)) {
+        // Don't process external images
+        if (config.image.external.process === 'off')
+            return;
+        try {
+            if (config.image.external.process === 'download') {
+                // Download external image for local processing
+                attrib_src = await downloadExternalImage(state, htmlfile, attrib_src);
+            }
+            else if (typeof config.image.external.process === 'function') {
+                // Custom processing for external image
+                attrib_src = await config.image.external.process(attrib_src);
+            }
+            img.attr('src', attrib_src);
+        }
+        catch (e) {
+            state.reportIssue(htmlfile, {
+                type: 'warn',
+                msg: `Failed to process external image: ${attrib_src} - ${e.message}`,
+            });
+            return; // No more processing
+        }
+    }
     switch (config.image.cdn.process) {
         case 'off':
             break;
@@ -324,27 +348,6 @@ async function processImage(state, htmlfile, img, isAboveTheFold) {
             }
             return;
     }
-    if (!isLocal(attrib_src)) {
-        switch (config.image.external.process) {
-            case 'off': // Don't process external images
-                return;
-            case 'download': // Download external image for local processing
-                if (!isIncluded(attrib_src, config.image.external.src_include, config.image.external.src_exclude))
-                    break;
-                try {
-                    attrib_src = await downloadExternalImage(state, htmlfile, attrib_src);
-                    img.attr('src', attrib_src);
-                }
-                catch (e) {
-                    state.reportIssue(htmlfile, {
-                        type: 'warn',
-                        msg: `Failed to download image: ${attrib_src} - ${e.message}`,
-                    });
-                    return; // No more processing
-                }
-                break;
-        }
-    }
     /*
      * Loading image
      */
@@ -561,7 +564,7 @@ async function _generateSrcSet({ options }, startSrc, imageWidth, imageHeight, t
         return null;
     }
     // Start reduction
-    const step = 300; //px
+    const step = options.image.srcset_step; //px
     let valueW = !startSrc ? imageWidth : imageWidth - step;
     valueW = Math.min(valueW, options.image.srcset_max_width);
     while (valueW >= options.image.srcset_min_width) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.26.0",
+  "version": "0.27.1",
   "cache-version": {
     "img": "v1",
     "img-ext": "v1"
@@ -59,17 +59,18 @@
     "tslib": "^2.6.2",
     "typescript": "^5.4.5"
   },
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "bugs": "https://github.com/divriots/jampack/issues",
-  "keywords": [],
-  "types": "dist/index.d.ts",
   "scripts": {
     "watch": "pnpm build --watch",
     "try": "shx rm -fr demo && cp -R demo_drc demo && node ./dist/index.js ./demo --nocache",
     "build": "shx rm -rf dist && tsc -b",
     "lint": "eslint . --ext .ts --config .eslintrc",
+    "prepublishOnly": "pnpm build",
     "cleanAllDotJampack": "find -s . | grep '.jampack$' | xargs rm -fr"
-  }
-}
+  },
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "bugs": "https://github.com/divriots/jampack/issues",
+  "keywords": [],
+  "types": "dist/index.d.ts"
+}