@divriots/jampack 0.12.1 → 0.13.0

package/dist/cache.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
-export type Category = 'img' | 'img-ext';
+declare const listOfCategories: readonly ["img", "img-ext"];
+export type Category = (typeof listOfCategories)[number];
 export type CacheData = {
     buffer: Buffer;
     meta: any;

package/dist/cache.js

@@ -1,10 +1,13 @@
 import hasha from 'hasha';
 import path from 'path';
 import * as fs from 'fs/promises';
-import { VERSION } from './version.js';
 import $state from './state.js';
+const listOfCategories = ['img', 'img-ext'];
 const CACHE_FOLDER = '.jampack/cache';
-const CACHE_FOLDER_VERSION = CACHE_FOLDER + '/' + VERSION;
+const CACHE_VERSIONS = {
+    img: 'v1',
+    'img-ext': 'v1',
+};
 async function cleanCache(full) {
     if (full) {
         try {
@@ -15,19 +18,36 @@ async function cleanCache(full) {
         }
         return;
     }
-    // List versions in cache
-    let files;
+    // Delete old cache category
+    let catFolders = [];
     try {
-        files = await fs.readdir(CACHE_FOLDER);
+        catFolders = await fs.readdir(CACHE_FOLDER);
     }
     catch (e) {
-        // Nothing to do probably no cache available
-        return;
+        // No problem
+    }
+    for (const f of catFolders) {
+        // @ts-ignore
+        if (!listOfCategories.includes(f))
+            fs.rm(path.join(CACHE_FOLDER, f), { recursive: true });
+    }
+    // Loop cache folders
+    for (const cat of listOfCategories) {
+        const location = path.join(CACHE_FOLDER, cat);
+        // List versions in cache
+        let folders;
+        try {
+            folders = await fs.readdir(location);
+        }
+        catch (e) {
+            continue;
+        }
+        // Delete old cache versions
+        for (const f of folders) {
+            if (f !== CACHE_VERSIONS[cat])
+                fs.rm(path.join(location, f), { recursive: true });
+        }
     }
-    // Delete old cache versions
-    await files
-        .filter((f) => f !== VERSION)
-        .forEach(async (f) => fs.rm(path.join(CACHE_FOLDER, f), { recursive: true }));
 }
 function computeCacheHash(buffer, options) {
     if ($state.args.nocache) {
@@ -39,8 +59,11 @@ function computeCacheHash(buffer, options) {
     }
     return hash;
 }
+function getVersionOfCategory(category) {
+    return CACHE_VERSIONS[category];
+}
 function getLocation(hash, category) {
-    return path.join(CACHE_FOLDER_VERSION, category, hash);
+    return path.join(CACHE_FOLDER, category, getVersionOfCategory(category), hash);
 }
 async function getFromCache(category, hash) {
     if ($state.args.nocache) {

package/dist/index.js

@@ -11,8 +11,6 @@ import { exit } from 'process';
 import kleur from 'kleur';
 import { cleanCache } from './cache.js';
 import { VERSION } from './version.js';
-import { mkdirSync } from 'fs';
-import { join } from 'path';
 const logo = `     __                                    __    
     |__|____    _____ ___________    ____ |  | __
     |  \\__  \\  /     \\\\____ \\__  \\ _/ ___\\|  |/ /
@@ -55,15 +53,7 @@ program
         fast();
     }
     // Clean cache
-    cleanCache(options.cleancache);
-    // Create _jampack folder
-    try {
-        mkdirSync(join($state.dir, '_jampack'));
-    }
-    catch (e) {
-        console.error(e.message);
-        exit(1);
-    }
+    await cleanCache(options.cleancache);
     if (!options.onlycomp) {
         printTitle('PASS 1 - Optimizing');
         console.time('Done');

package/dist/optimize.js

@@ -194,7 +194,8 @@ async function processImage(htmlfile, $, imgElement, isAboveTheFold) {
                 return;
             case 'download': // Download external image for local processing
                 try {
-                    attrib_src = await downloadExternalImage(attrib_src);
+                    const htmlFolder = path.dirname(path.resolve(path.join($state.dir, htmlfile)));
+                    attrib_src = await downloadExternalImage(attrib_src, htmlFolder);
                     img.attr('src', attrib_src);
                 }
                 catch (e) {

package/dist/optimizers/img-external.d.ts

@@ -1 +1,2 @@
-export declare function downloadExternalImage(href: string): Promise<string>;
+import '../utils/polyfill-fetch.js';
+export declare function downloadExternalImage(href: string, dir: string): Promise<string>;

package/dist/optimizers/img-external.js

@@ -4,8 +4,8 @@ import hasha from 'hasha';
 import { fileTypeFromBuffer } from 'file-type';
 import { addToCache, getFromCache } from '../cache.js';
 import { parse } from '../utils/cache-control-parser.js';
-import $state from '../state.js';
-export async function downloadExternalImage(href) {
+import '../utils/polyfill-fetch.js';
+export async function downloadExternalImage(href, dir) {
     var _a, _b, _c, _d, _e;
     const hash = hasha(href, {
         algorithm: 'md5',
@@ -93,7 +93,13 @@ export async function downloadExternalImage(href) {
     // Construct local filename
     if (!ext)
         throw new Error('Unknown image format');
-    const filename = `/_jampack/${hash}.${ext}`;
-    fs.writeFile(path.join($state.dir, filename), buffer);
+    const filename = `./_jampack/${hash}.${ext}`;
+    try {
+        await fs.mkdir(path.join(dir, '_jampack'));
+    }
+    catch (e) {
+        // Nothing to do - folder is probably already present
+    }
+    fs.writeFile(path.join(dir, filename), buffer);
     return filename;
 }

package/dist/utils/polyfill-fetch.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/polyfill-fetch.js

@@ -0,0 +1,4 @@
+import { fetch } from 'undici';
+if (!Object.keys(global).includes('fetch')) {
+    Object.defineProperty(global, 'fetch', { value: fetch });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "Packer for static websites",
   "author": "Georges Gomes @georges-gomes",
   "bin": {
@@ -31,7 +31,8 @@
     "ora": "^6.3.0",
     "sharp": "^0.32.1",
     "svgo": "^3.0.2",
-    "table": "^6.8.1"
+    "table": "^6.8.1",
+    "undici": "^5.22.1"
   },
   "devDependencies": {
     "@types/html-minifier-terser": "^7.0.0",