aberlaas-compress 2.18.1 → 2.20.1

package/lib/main.js

@@ -1,41 +1,48 @@
 import { _, pMap } from 'golgoth';
 import { consoleError, firostError } from 'firost';
-import compressPng from './png.js';
 import compressDummy from './dummy.js';
+import compressPng from './png.js';
 
-export default {
+export let __;
+
+/**
+ * Wrapper to compress all supported formats
+ * @param {object} cliArgs CLI Argument object, as created by minimist
+ * @returns {boolean} True on success
+ */
+export async function run(cliArgs) {
+  const allTypesKeys = _.keys(__.types);
+  const userTypes = _.intersection(_.keys(cliArgs), allTypesKeys);
+  const typesToCompress = _.isEmpty(userTypes) ? allTypesKeys : userTypes;
+
+  let hasErrors = false;
+  await pMap(typesToCompress, async (type) => {
+    try {
+      const userPatterns = _.get(cliArgs, '_');
+      const compresser = __.types[type];
+
+      await compresser.run(userPatterns);
+    } catch (error) {
+      __.consoleError(error.message);
+      hasErrors = true;
+    }
+  });
+
+  if (hasErrors) {
+    throw firostError('ABERLAAS_COMPRESS', 'Error while compressing files');
+  }
+
+  return true;
+}
+
+__ = {
   types: {
     png: compressPng,
     dummy: compressDummy,
   },
-  /**
-   * Wrapper to compress all supported formats
-   * @param {object} cliArgs CLI Argument object, as created by minimist
-   * @returns {boolean} True on success
-   */
-  async run(cliArgs) {
-    const allTypesKeys = _.keys(this.types);
-    const userTypes = _.intersection(_.keys(cliArgs), allTypesKeys);
-    const typesToCompress = _.isEmpty(userTypes) ? allTypesKeys : userTypes;
-
-    let hasErrors = false;
-    await pMap(typesToCompress, async (type) => {
-      try {
-        const userPatterns = _.get(cliArgs, '_');
-        const compresser = this.types[type];
-
-        await compresser.run(userPatterns);
-      } catch (error) {
-        this.__consoleError(error.message);
-        hasErrors = true;
-      }
-    });
-
-    if (hasErrors) {
-      throw firostError('ERROR_COMPRESS', 'Error while compressing files');
-    }
+  consoleError,
+};
 
-    return true;
-  },
-  __consoleError: consoleError,
+export default {
+  run,
 };

package/lib/png.js

@@ -1,8 +1,36 @@
 import { _ } from 'golgoth';
-import { firostError, run, which } from 'firost';
-import helper from 'aberlaas-helper';
+import { firostError, run as firostRun, which } from 'firost';
+import { findHostPackageFiles } from 'aberlaas-helper';
 
-export default {
+export let __;
+
+/**
+ * Compress files
+ * @param {Array} userPatterns Patterns to narrow the search down
+ * @returns {boolean} True on success
+ */
+export async function run(userPatterns) {
+  // Stop early if no bin
+  const binaryPath = await __.getBinaryPath();
+  if (!binaryPath) {
+    return true;
+  }
+
+  try {
+    const files = await __.getInputFiles(userPatterns);
+    if (_.isEmpty(files)) {
+      return true;
+    }
+    const command = `${binaryPath} ${files.join(' ')}`;
+    await firostRun(command, { stdout: false });
+  } catch (error) {
+    throw firostError('ABERLAAS_COMPRESS_PNG', error.message);
+  }
+
+  return true;
+}
+
+__ = {
   /**
    * Find the png files to compress
    * @param {Array} userPatterns Patterns to narrow the search down
@@ -12,7 +40,7 @@ export default {
     const filePatterns = _.isEmpty(userPatterns)
       ? ['./**/*.png']
       : userPatterns;
-    return await helper.findHostFiles(filePatterns, ['.png']);
+    return await findHostPackageFiles(filePatterns, ['.png']);
   },
 
   /**
@@ -20,29 +48,11 @@ export default {
    * @returns {string|boolean} Path to the binary, or false if not found
    */
   async getBinaryPath() {
-    return await this.__which('pngmin');
+    return await __.which('pngmin');
   },
-  /**
-   * Compress files
-   * @param {Array} userPatterns Patterns to narrow the search down
-   * @returns {boolean} True on success
-   */
-  async run(userPatterns) {
-    // Stop early if no bin
-    const binaryPath = await this.getBinaryPath();
-    if (!binaryPath) {
-      return true;
-    }
-
-    try {
-      const files = await this.getInputFiles(userPatterns);
-      const command = `${binaryPath} ${files.join(' ')}`;
-      await run(command, { stdout: false });
-    } catch (error) {
-      throw firostError('PngCompressError', error.message);
-    }
+  which,
+};
 
-    return true;
-  },
-  __which: which,
+export default {
+  run,
 };

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "aberlaas-compress",
   "type": "module",
+  "sideEffects": false,
   "description": "aberlaas compress command: Reduce image filesize",
-  "version": "2.18.1",
+  "version": "2.20.1",
   "repository": "pixelastic/aberlaas",
   "homepage": "https://projects.pixelastic.com/aberlaas/",
   "author": "Tim Carry (@pixelastic)",
@@ -17,25 +18,22 @@
   "engines": {
     "node": ">=18.18.0"
   },
-  "scripts": {
-    "build": "../../scripts/local/build",
-    "build:prod": "../../scripts/local/build-prod",
-    "cms": "../../scripts/local/cms",
-    "serve": "../../scripts/local/serve",
-    "ci": "../../scripts/local/ci",
-    "release": "../../scripts/local/release",
-    "update-dependencies": "node ../../scripts/meta/update-dependencies.js",
-    "test:meta": "../../scripts/local/test-meta",
-    "test": "../../scripts/local/test",
-    "test:watch": "../../scripts/local/test-watch",
-    "compress": "../../scripts/local/compress",
-    "lint": "../../scripts/local/lint",
-    "lint:fix": "../../scripts/local/lint-fix"
-  },
   "dependencies": {
-    "aberlaas-helper": "^2.18.1",
-    "firost": "5.2.1",
+    "aberlaas-helper": "workspace:*",
+    "firost": "5.5.1",
     "golgoth": "3.0.0"
   },
-  "gitHead": "00b60dcf9aebab442a809ccc81942005d87d1b5c"
+  "scripts": {
+    "build": "cd ../docs && yarn run build",
+    "build:prod": "cd ../docs && yarn run build:prod",
+    "cms": "cd ../docs && yarn run cms",
+    "serve": "cd ../docs && yarn run serve",
+    "release": "cd ../.. && ./scripts/release",
+    "test:meta": "cd ../.. && ./scripts/test-meta",
+    "test": "cd ../.. && ./scripts/test",
+    "test:watch": "cd ../.. && ./scripts/test-watch",
+    "compress": "cd ../.. && ./scripts/compress",
+    "lint": "cd ../.. && ./scripts/lint",
+    "lint:fix": "cd ../.. && ./scripts/lint-fix"
+  }
 }