@localnerve/sass-asset-functions 4.6.2 → 4.7.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Sass Asset Functions Change Log
 
+## 4.7.1
+  * sass 1.69.6
+
+## 4.7.0
+  * sass 1.69.5
+  * dependency change: mime => mime-types@2.1.35
+  * image-size@1.1.0
+  * Increase coverage, inline-image synchronous readFile to fix error reporting
+  * Development dependency updates
+
+## 4.6.2
+  * sass 1.69.5
+  * Development dependency updates
+
+## 4.6.1
+  * sass 1.69.4
+  * Development dependency updates
+
+## 4.6.0
+  * sass 1.69.3
+  * Development dependency updates
+
+## 4.5.0
+  * sass 1.68.0
+  * Development dependency updates
+
 ## 4.4.0
   * sass 1.67.0
   * Development dependency updates

package/cjs/index.cjs

@@ -7,8 +7,8 @@ exports.default = sassFunctions;
 var defaultSass = _interopRequireWildcard(require("sass"));
 var _processor = _interopRequireDefault(require("./lib/processor.cjs"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Sass asset function suite.
  * 

package/cjs/lib/processor.cjs

@@ -4,12 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _nodeFs = _interopRequireDefault(require("node:fs"));
-var _nodePath = _interopRequireDefault(require("node:path"));
-var _nodeUrl = _interopRequireDefault(require("node:url"));
-var _mime = _interopRequireDefault(require("mime"));
+var fs = _interopRequireWildcard(require("node:fs"));
+var path = _interopRequireWildcard(require("node:path"));
+var url = _interopRequireWildcard(require("node:url"));
+var _mimeTypes = _interopRequireDefault(require("mime-types"));
 var _imageSize = _interopRequireDefault(require("image-size"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Internal processor for the asset function suite.
  * 
@@ -56,11 +58,11 @@ class Processor {
     if (typeof buster !== 'function') {
       throw new Error('asset_cache_buster should be a function');
     }
-    const http_path_url = _nodeUrl.default.parse(http_path);
+    const http_path_url = url.parse(http_path);
     buster(http_path, real_path, value => {
       let new_url;
       if (typeof value == 'object') {
-        const parsed_path = _nodeUrl.default.parse(value.path);
+        const parsed_path = url.parse(value.path);
         new_url = {
           pathname: parsed_path.pathname,
           search: value.query || http_path_url.search
@@ -71,7 +73,7 @@ class Processor {
           search: value
         };
       }
-      done(_nodeUrl.default.format(new_url));
+      done(url.format(new_url));
     });
   }
   asset_host(filepath, done) {
@@ -82,15 +84,15 @@ class Processor {
       throw new Error('asset_host should be a function');
     }
     ahost(filepath, host => {
-      done(_nodeUrl.default.resolve(host, filepath));
+      done(url.resolve(host, filepath));
     });
   }
   real_path(filepath, segment) {
     const sanitized_filepath = filepath.replace(/(#|\?).+$/, '');
-    return _nodePath.default.resolve(this.paths[`${segment}_path`], sanitized_filepath);
+    return path.resolve(this.paths[`${segment}_path`], sanitized_filepath);
   }
   http_path(filepath, segment) {
-    return _nodePath.default.join(this.paths[`http_${segment}_path`], filepath).replace(/\\/g, '/');
+    return path.join(this.paths[`http_${segment}_path`], filepath).replace(/\\/g, '/');
   }
   image_width(filepath, done) {
     done((0, _imageSize.default)(this.real_path(filepath, 'images')).width);
@@ -100,13 +102,17 @@ class Processor {
   }
   inline_image(filepath, mime_type, done) {
     const src = this.real_path(filepath, 'images');
-    mime_type = mime_type || _mime.default.getType(src);
-    _nodeFs.default.readFile(src, (err, data) => {
-      if (err) {
-        throw new Error(`inline_image failed to read ${src}: ${err}`);
-      }
-      done(`data:${mime_type};base64,${data.toString('base64')}`);
-    });
+    mime_type = mime_type || _mimeTypes.default.lookup(src);
+    if (!mime_type) {
+      throw new Error(`Could not find mime type for filepath '${filepath}'`);
+    }
+    let data;
+    try {
+      data = fs.readFileSync(src);
+    } catch (err) {
+      throw new Error(`inline_image failed to read '${src}': ${err}`);
+    }
+    done(`data:${mime_type};base64,${data.toString('base64')}`);
   }
   asset_url(filepath, segment, done) {
     let fragment = '';
@@ -160,11 +166,11 @@ class Processor {
     for (; i < files.length; ++i) {
       file = files[i];
       next = files[i + 1];
-      parts = _nodeUrl.default.parse(file);
+      parts = url.parse(file);
       if (FONT_TYPES[next]) {
         type = files.splice(i + 1, 1);
       } else {
-        ext = _nodePath.default.extname(parts.path);
+        ext = path.extname(parts.path);
         type = ext.substring(1);
       }
       type = FONT_TYPES[type];

package/lib/processor.js

@@ -4,10 +4,10 @@
  * Copyright (c) 2023 Alex Grant (@localnerve), LocalNerve LLC
  * Licensed under the MIT license.
  */
-import fs from 'node:fs';
-import path from 'node:path';
-import url from 'node:url';
-import mime from 'mime';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as url from 'node:url';
+import mime from 'mime-types';
 import sizeOf from 'image-size';
 
 const defaultPaths = {
@@ -103,14 +103,21 @@ export default class Processor {
   inline_image (filepath, mime_type, done) {
     const src = this.real_path(filepath, 'images');
   
-    mime_type = mime_type || mime.getType(src);
+    mime_type = mime_type || mime.lookup(src);
 
-    fs.readFile(src, (err, data) => {
-      if (err) {
-        throw new Error(`inline_image failed to read ${src}: ${err}`);
-      }
-      done(`data:${mime_type};base64,${data.toString('base64')}`);
-    });
+    if (!mime_type) {
+      throw new Error(`Could not find mime type for filepath '${filepath}'`);
+    }
+
+    let data;
+
+    try {
+      data = fs.readFileSync(src);
+    } catch (err) {
+      throw new Error(`inline_image failed to read '${src}': ${err}`);
+    }
+
+    done(`data:${mime_type};base64,${data.toString('base64')}`);
   }
   
   asset_url (filepath, segment, done) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localnerve/sass-asset-functions",
-  "version": "4.6.2",
+  "version": "4.7.1",
   "description": "compass-style asset functions for dart-sass or other sass compilers",
   "main": "index.js",
   "exports": {
@@ -11,7 +11,9 @@
   "type": "module",
   "scripts": {
     "test-package": "node ./__test-package__/index.js",
-    "test": "jest && npm run test-package",
+    "test-unit": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "test-unit:debug": "node --inspect-brk --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "test": "npm run test-unit && npm run test-package",
     "lint": "eslint .",
     "pretranspile": "rimraf ./cjs",
     "transpile": "babel index.js -o ./cjs/index.cjs && babel ./lib/processor.js -o ./cjs/lib/processor.cjs",
@@ -48,16 +50,16 @@
   },
   "homepage": "https://github.com/localnerve/sass-asset-functions",
   "dependencies": {
-    "image-size": "^1.0.2",
-    "mime": "^3.0.0",
-    "sass": "^1.69.5"
+    "image-size": "^1.1.0",
+    "mime-types": "^2.1.35",
+    "sass": "^1.69.6"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.0",
-    "@babel/preset-env": "^7.23.2",
+    "@babel/cli": "^7.23.4",
+    "@babel/preset-env": "^7.23.6",
     "rimraf": "^5.0.5",
     "jest": "^29.7.0",
-    "eslint": "^8.52.0",
+    "eslint": "^8.56.0",
     "node-sass": "^9.0.0",
     "tar": "^6.2.0",
     "glob": "^10.3.10"