@localnerve/sass-asset-functions 7.10.0 → 7.11.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Sass Asset Functions Change Log
 
+# 7.11.0
+  * standard URL processing, deprecate messages for old api if needed
+  * devdeps - remove jest, rimraf, new lint rules, bump gha
+
 # 7.10.0
   * sass 1.99.0
   * devdeps

package/cjs/lib/processor.cjs

@@ -62,14 +62,21 @@ class Processor {
     if (typeof buster !== 'function') {
       throw new Error('asset_cache_buster should be a function');
     }
-    const http_path_url = url.parse(http_path);
+    function preserveEmptyQS(originalUrl, query) {
+      let result = query;
+      if (!query && originalUrl.includes('?')) {
+        result = '?';
+      }
+      return result;
+    }
+    const http_path_url = this.parse_url(http_path);
     buster(http_path, real_path, value => {
       let new_url;
       if (typeof value == 'object') {
-        const parsed_path = url.parse(value.path);
+        const parsed_path = this.parse_url(value.path);
         new_url = {
           pathname: parsed_path.pathname,
-          search: value.query || http_path_url.search
+          search: value.query || preserveEmptyQS(http_path, http_path_url.search)
         };
       } else {
         new_url = {
@@ -88,9 +95,41 @@ class Processor {
       throw new Error('asset_host should be a function');
     }
     ahost(filepath, host => {
-      done(url.resolve(host, filepath));
+      done(this.resolve_url(host, filepath));
     });
   }
+  resolve_url(from, to) {
+    let result;
+    try {
+      const resolvedUrl = new URL(to, new URL(from, 'resolve://bogus.local'));
+      if (resolvedUrl.protocol === 'resolve:') {
+        // `from` is a relative URL.
+        const {
+          pathname,
+          search,
+          hash
+        } = resolvedUrl;
+        result = `${pathname}${search}${hash}`;
+      } else {
+        result = resolvedUrl.toString();
+      }
+    } catch {
+      result = url.resolve(from, to); // eslint-disable-line n/no-deprecated-api
+      console.warn(`DEPRECATION WARNING [sass-asset-functions]: Resolving '${from}' to '${to}' will not work in an upcoming version`);
+    }
+    return result;
+  }
+  parse_url(input) {
+    let result;
+    try {
+      const parsedUrl = new URL(input, 'parse://bogus.local'); // base used if relative was supplied
+      result = parsedUrl;
+    } catch {
+      result = url.parse(input); // eslint-disable-line n/no-deprecated-api
+      console.warn(`DEPRECATION WARNING [sass-asset-functions]: Parsing url '${input}' will not work in an upcoming version`);
+    }
+    return result;
+  }
   real_path(filepath, segment) {
     const sanitized_filepath = filepath.replace(/(#|\?).+$/, '');
     return path.resolve(this.paths[`${segment}_path`], sanitized_filepath);
@@ -190,11 +229,11 @@ class Processor {
     for (; i < files.length; ++i) {
       file = files[i];
       next = files[i + 1];
-      parts = url.parse(file);
       if (FONT_TYPES[next]) {
         type = files.splice(i + 1, 1);
       } else {
-        ext = path.extname(parts.path);
+        parts = this.parse_url(file);
+        ext = path.extname(parts.pathname);
         type = ext.substring(1);
       }
       type = FONT_TYPES[type];

package/lib/processor.js

@@ -49,16 +49,24 @@ export default class Processor {
       throw new Error('asset_cache_buster should be a function');
     }
 
-    const http_path_url = url.parse(http_path);
+    function preserveEmptyQS (originalUrl, query) {
+      let result = query;
+      if (!query && originalUrl.includes('?')) {
+        result = '?';
+      }
+      return result;
+    }
+
+    const http_path_url = this.parse_url(http_path);
 
     buster(http_path, real_path, value => {
       let new_url;
 
       if (typeof value == 'object') {
-        const parsed_path = url.parse(value.path);
+        const parsed_path = this.parse_url(value.path);
         new_url = {
           pathname: parsed_path.pathname,
-          search: value.query || http_path_url.search
+          search: value.query || preserveEmptyQS(http_path, http_path_url.search)
         };
       } else {
         new_url = {
@@ -79,10 +87,44 @@ export default class Processor {
     }
 
     ahost(filepath, host => {
-      done(url.resolve(host, filepath));
+      done(this.resolve_url(host, filepath));
     });
   }
 
+  resolve_url (from, to) {
+    let result;
+
+    try {
+      const resolvedUrl = new URL(to, new URL(from, 'resolve://bogus.local'));
+      if (resolvedUrl.protocol === 'resolve:') {
+        // `from` is a relative URL.
+        const { pathname, search, hash } = resolvedUrl;
+        result = `${pathname}${search}${hash}`;
+      } else {
+        result = resolvedUrl.toString();
+      }
+    } catch {
+      result = url.resolve(from, to); // eslint-disable-line n/no-deprecated-api
+      console.warn(`DEPRECATION WARNING [sass-asset-functions]: Resolving '${from}' to '${to}' will not work in an upcoming version`);
+    }
+
+    return result;
+  }
+
+  parse_url (input) {
+    let result;
+
+    try {
+      const parsedUrl = new URL(input, 'parse://bogus.local'); // base used if relative was supplied
+      result = parsedUrl;
+    } catch {
+      result = url.parse(input); // eslint-disable-line n/no-deprecated-api
+      console.warn(`DEPRECATION WARNING [sass-asset-functions]: Parsing url '${input}' will not work in an upcoming version`);
+    }
+
+    return result;
+  }
+
   real_path (filepath, segment) {
     const sanitized_filepath = filepath.replace(/(#|\?).+$/, '');
     return path.resolve(this.paths[`${segment}_path`], sanitized_filepath);
@@ -197,11 +239,11 @@ export default class Processor {
       file = files[i];
       next = files[i + 1];
   
-      parts = url.parse(file);
       if (FONT_TYPES[next]) {
         type = files.splice(i + 1, 1);
       } else {
-        ext = path.extname(parts.path);
+        parts = this.parse_url(file);
+        ext = path.extname(parts.pathname);
         type = ext.substring(1);
       }
       type = FONT_TYPES[type];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localnerve/sass-asset-functions",
-  "version": "7.10.0",
+  "version": "7.11.0",
   "description": "compass-style asset functions for dart-sass or other sass compilers",
   "main": "index.js",
   "exports": {
@@ -11,14 +11,14 @@
   "type": "module",
   "scripts": {
     "lint": "eslint .",
-    "posttranspile": "node posttranspile.js",
     "prepublishOnly": "npm run transpile",
-    "pretranspile": "rimraf ./cjs",
+    "pretranspile": "node -e 'require(\"fs\").rmSync(\"./cjs\",{recursive:true,force:true})'",
+    "transpile": "babel index.js -o ./cjs/index.cjs && babel ./lib --out-dir ./cjs/lib",
+    "posttranspile": "node posttranspile.js",
     "test": "npm run test:unit && npm run test:package",
     "test:package": "node ./__test-package__/index.js",
-    "test:unit": "node --experimental-vm-modules node_modules/.bin/jest",
-    "test:unit:debug": "node --inspect-brk --experimental-vm-modules node_modules/./bin/test",
-    "transpile": "babel index.js -o ./cjs/index.cjs && babel ./lib --out-dir ./cjs/lib"
+    "pretest:unit": "node -e 'require(\"fs\").rmSync(\"./coverage\",{recursive:true,force:true})' && node -e 'require(\"fs\").mkdirSync(\"./coverage\",{recursive:true})'",
+    "test:unit": "node --test --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=./coverage/lcov.info \"__tests__/test.js\""
   },
   "repository": {
     "type": "git",
@@ -60,12 +60,10 @@
     "@babel/cli": "^7.28.6",
     "@babel/preset-env": "^7.29.2",
     "@eslint/js": "^10.0.1",
-    "eslint": "^10.1.0",
-    "eslint-plugin-jest": "^29.15.1",
+    "eslint": "^10.2.1",
+    "eslint-plugin-n": "^17.24.0",
     "glob": "^13.0.6",
-    "globals": "^17.4.0",
-    "jest": "^30.3.0",
-    "rimraf": "^6.1.3",
+    "globals": "^17.5.0",
     "tar": "^7.5.13"
   },
   "engines": {

package/babel.config.json

@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env", {
-        "targets": {
-          "node": "20"
-        }
-      }
-    ]
-  ]
-}

package/eslint.config.js

@@ -1,38 +0,0 @@
-import js from '@eslint/js';
-import globals from 'globals';
-import jest from 'eslint-plugin-jest';
-
-export default [{
-  name: 'global',
-  ignores: [
-    'cjs/**',
-    'coverage/**',
-    'tmp/**',
-    'node_modules/**'
-  ]
-}, {
-  name: 'lib-test-package',
-  files: [
-    '*.js',
-    'lib/**',
-    '__test-package__/**'
-  ],
-  rules: js.configs.recommended.rules,
-  languageOptions: {
-    globals: {
-      ...globals.node
-    }
-  }
-}, {
-  name: 'tests',
-  files: [
-    '__tests__/**'
-  ],
-  ...jest.configs['flat/recommended'],
-  rules: {
-    ...jest.configs['flat/recommended'].rules,
-    'jest/no-done-callback': 'off',
-    'jest/expect-expect': 'off',
-    'jest/valid-title': 'off'
-  }
-}];

package/jest.config.js

@@ -1,10 +0,0 @@
-export default {
-  collectCoverage: true,
-  coverageDirectory: 'coverage',
-  verbose: true,
-  testEnvironment: 'node',
-  testPathIgnorePatterns: [
-    '/node_modules/',
-    '/tmp/'
-  ]
-};

package/posttranspile.js

@@ -1,29 +0,0 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-
-async function processFile (filename) {
-  const newname = filename.replace(/\.js$/, '.cjs');
-  await fs.rename(filename, newname);
-  const data = await fs.readFile(newname, 'utf8');
-  const newData = data.replaceAll('.js")', '.cjs")');
-  await fs.writeFile(newname, newData);
-}
-
-async function processDirectory (dir) {
-  try {
-    const files = await fs.readdir(dir);
-    for (const file of files) {
-      const name = `${dir}${path.sep}${file}`;
-      const stats = await fs.stat(name);
-      if (stats.isDirectory()) {
-        await processDirectory(name);
-      } else {
-        await processFile(name);
-      }
-    }
-  } catch (err) {
-    console.error('posttranspile error:\n\n', err);
-  }
-}
-
-await processDirectory('./cjs');