string-extract-sass-vars 3.0.3 → 3.0.7

package/CHANGELOG.md

@@ -3,26 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 3.0.3 (2021-11-02)
-
-### Bug Fixes
-
-- bump TS and separate ESLint plugins away from this monorepo ([b1ebce1](https://github.com/codsen/codsen/commit/b1ebce1637d8c41c2d848fc24b0ba4058865bd5d))
-
-### Features
-
-- migrate to ES Modules ([c579dff](https://github.com/codsen/codsen/commit/c579dff3b23205e383035ca10ddcec671e35d0fe))
-
-### BREAKING CHANGES
-
-- programs now are in ES Modules and won't work with Common JS require()
-
-## 3.0.1 (2021-09-13)
-
-### Bug Fixes
-
-- bump TS and separate ESLint plugins away from this monorepo ([2e07d42](https://github.com/codsen/codsen/commit/2e07d424222b6ffedf5fb45c83ad453627ec2904))
-
 ## 3.0.0 (2021-09-09)
 
 ### Features

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2010-%YEAR% Roy Revelt and other contributors
+Copyright (c) 2010-2021 Roy Revelt and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/dist/string-extract-sass-vars.esm.js

@@ -1,92 +1,111 @@
 /**
  * @name string-extract-sass-vars
  * @fileoverview Parse SASS variables file into a plain object of CSS key-value pairs
- * @version 3.0.3
+ * @version 3.0.7
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/string-extract-sass-vars/}
  */
 
-var version$1 = "3.0.3";
+var version$1 = "3.0.7";
 
 const version = version$1;
 const BACKSLASH = "\u005C";
 const defaults = {
-  throwIfEmpty: false,
-  cb: null
+    throwIfEmpty: false,
+    cb: null,
 };
 function extractVars(str, originalOpts) {
-  if (typeof str !== "string") {
-    return {};
-  }
-  if (originalOpts && typeof originalOpts !== "object") {
-    throw new Error(`string-extract-sass-vars: [THROW_ID_01] the second input argument should be a plain object but it was given as ${JSON.stringify(originalOpts, null, 4)} (type ${typeof originalOpts})`);
-  }
-  const opts = { ...defaults,
-    ...originalOpts
-  };
-  if (opts.cb && typeof opts.cb !== "function") {
-    throw new Error(`string-extract-sass-vars: [THROW_ID_02] opts.cb should be function! But it was given as ${JSON.stringify(originalOpts, null, 4)} (type ${typeof originalOpts})`);
-  }
-  const len = str.length;
-  let varNameStartsAt = null;
-  let varValueStartsAt = null;
-  let varName = null;
-  let varValue = null;
-  let withinQuotes = null;
-  let lastNonQuoteCharAt = null;
-  let withinComments = false;
-  let withinSlashSlashComment = false;
-  let withinSlashAsteriskComment = false;
-  const res = {};
-  for (let i = 0; i < len; i++) {
-    if (!withinComments && withinQuotes && str[i] === withinQuotes && str[i - 1] !== BACKSLASH) {
-      withinQuotes = null;
+    if (typeof str !== "string") {
+        return {};
     }
-    else if (!withinQuotes && !withinComments && str[i - 1] !== BACKSLASH && `'"`.includes(str[i])) {
-      withinQuotes = str[i];
+    if (originalOpts && typeof originalOpts !== "object") {
+        throw new Error(`string-extract-sass-vars: [THROW_ID_01] the second input argument should be a plain object but it was given as ${JSON.stringify(originalOpts, null, 4)} (type ${typeof originalOpts})`);
     }
-    if (withinSlashSlashComment && `\r\n`.includes(str[i])) {
-      withinSlashSlashComment = false;
+    const opts = { ...defaults, ...originalOpts };
+    if (opts.cb && typeof opts.cb !== "function") {
+        throw new Error(`string-extract-sass-vars: [THROW_ID_02] opts.cb should be function! But it was given as ${JSON.stringify(originalOpts, null, 4)} (type ${typeof originalOpts})`);
     }
-    if (!withinComments && str[i] === "/" && str[i + 1] === "/") {
-      withinSlashSlashComment = true;
+    const len = str.length;
+    let varNameStartsAt = null;
+    let varValueStartsAt = null;
+    let varName = null;
+    let varValue = null;
+    let withinQuotes = null;
+    let lastNonQuoteCharAt = null;
+    let withinComments = false;
+    let withinSlashSlashComment = false;
+    let withinSlashAsteriskComment = false;
+    const res = {};
+    for (let i = 0; i < len; i++) {
+        if (!withinComments &&
+            withinQuotes &&
+            str[i] === withinQuotes &&
+            str[i - 1] !== BACKSLASH) {
+            withinQuotes = null;
+        }
+        else if (!withinQuotes &&
+            !withinComments &&
+            str[i - 1] !== BACKSLASH &&
+            `'"`.includes(str[i])) {
+            withinQuotes = str[i];
+        }
+        if (withinSlashSlashComment && `\r\n`.includes(str[i])) {
+            withinSlashSlashComment = false;
+        }
+        if (!withinComments && str[i] === "/" && str[i + 1] === "/") {
+            withinSlashSlashComment = true;
+        }
+        if (withinSlashAsteriskComment &&
+            str[i - 2] === "*" &&
+            str[i - 1] === "/") {
+            withinSlashAsteriskComment = false;
+        }
+        if (!withinComments && str[i] === "/" && str[i + 1] === "*") {
+            withinSlashAsteriskComment = true;
+        }
+        withinComments = withinSlashSlashComment || withinSlashAsteriskComment;
+        if (!withinComments && str[i] === "$" && varNameStartsAt === null) {
+            varNameStartsAt = i + 1;
+        }
+        if (!withinComments &&
+            varValueStartsAt !== null &&
+            !withinQuotes &&
+            str[i] === ";") {
+            varValue = str.slice(!`"'`.includes(str[varValueStartsAt])
+                ? varValueStartsAt
+                : varValueStartsAt + 1, (lastNonQuoteCharAt || 0) + 1);
+            if (/^-?\d*\.?\d*$/.test(varValue)) {
+                varValue = +varValue;
+            }
+            res[varName] = opts.cb ? opts.cb(varValue) : varValue;
+            varNameStartsAt = null;
+            varValueStartsAt = null;
+            varName = null;
+            varValue = null;
+        }
+        if (!withinComments &&
+            varName !== null &&
+            str[i] &&
+            str[i].trim().length &&
+            varValueStartsAt === null) {
+            varValueStartsAt = i;
+        }
+        if (!withinComments &&
+            !varName &&
+            varNameStartsAt !== null &&
+            str[i] === ":" &&
+            !withinQuotes) {
+            varName = str.slice(varNameStartsAt, i);
+        }
+        if (!`'"`.includes(str[i])) {
+            lastNonQuoteCharAt = i;
+        }
     }
-    if (withinSlashAsteriskComment && str[i - 2] === "*" && str[i - 1] === "/") {
-      withinSlashAsteriskComment = false;
+    if (!Object.keys(res).length && opts.throwIfEmpty) {
+        throw new Error(`string-extract-sass-vars: [THROW_ID_03] no keys extracted! (setting opts.originalOpts)`);
     }
-    if (!withinComments && str[i] === "/" && str[i + 1] === "*") {
-      withinSlashAsteriskComment = true;
-    }
-    withinComments = withinSlashSlashComment || withinSlashAsteriskComment;
-    if (!withinComments && str[i] === "$" && varNameStartsAt === null) {
-      varNameStartsAt = i + 1;
-    }
-    if (!withinComments && varValueStartsAt !== null && !withinQuotes && str[i] === ";") {
-      varValue = str.slice(!`"'`.includes(str[varValueStartsAt]) ? varValueStartsAt : varValueStartsAt + 1, (lastNonQuoteCharAt || 0) + 1);
-      if (/^-?\d*\.?\d*$/.test(varValue)) {
-        varValue = +varValue;
-      }
-      res[varName] = opts.cb ? opts.cb(varValue) : varValue;
-      varNameStartsAt = null;
-      varValueStartsAt = null;
-      varName = null;
-      varValue = null;
-    }
-    if (!withinComments && varName !== null && str[i] && str[i].trim().length && varValueStartsAt === null) {
-      varValueStartsAt = i;
-    }
-    if (!withinComments && !varName && varNameStartsAt !== null && str[i] === ":" && !withinQuotes) {
-      varName = str.slice(varNameStartsAt, i);
-    }
-    if (!`'"`.includes(str[i])) {
-      lastNonQuoteCharAt = i;
-    }
-  }
-  if (!Object.keys(res).length && opts.throwIfEmpty) {
-    throw new Error(`string-extract-sass-vars: [THROW_ID_03] no keys extracted! (setting opts.originalOpts)`);
-  }
-  return res;
+    return res;
 }
 
 export { defaults, extractVars, version };

package/dist/string-extract-sass-vars.umd.js

@@ -1,10 +1,10 @@
 /**
  * @name string-extract-sass-vars
  * @fileoverview Parse SASS variables file into a plain object of CSS key-value pairs
- * @version 3.0.3
+ * @version 3.0.7
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/string-extract-sass-vars/}
  */
 
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).stringExtractSassVars={})}(this,(function(t){"use strict";const e={throwIfEmpty:!1,cb:null};t.defaults=e,t.extractVars=function(t,n){if("string"!=typeof t)return{};if(n&&"object"!=typeof n)throw new Error(`string-extract-sass-vars: [THROW_ID_01] the second input argument should be a plain object but it was given as ${JSON.stringify(n,null,4)} (type ${typeof n})`);const l={...e,...n};if(l.cb&&"function"!=typeof l.cb)throw new Error(`string-extract-sass-vars: [THROW_ID_02] opts.cb should be function! But it was given as ${JSON.stringify(n,null,4)} (type ${typeof n})`);const s=t.length;let r=null,o=null,i=null,u=null,c=null,f=null,a=!1,d=!1,p=!1;const y={};for(let e=0;e<s;e++)!a&&c&&t[e]===c&&"\\"!==t[e-1]?c=null:c||a||"\\"===t[e-1]||!"'\"".includes(t[e])||(c=t[e]),d&&"\r\n".includes(t[e])&&(d=!1),a||"/"!==t[e]||"/"!==t[e+1]||(d=!0),p&&"*"===t[e-2]&&"/"===t[e-1]&&(p=!1),a||"/"!==t[e]||"*"!==t[e+1]||(p=!0),a=d||p,a||"$"!==t[e]||null!==r||(r=e+1),a||null===o||c||";"!==t[e]||(u=t.slice("\"'".includes(t[o])?o+1:o,(f||0)+1),/^-?\d*\.?\d*$/.test(u)&&(u=+u),y[i]=l.cb?l.cb(u):u,r=null,o=null,i=null,u=null),!a&&null!==i&&t[e]&&t[e].trim().length&&null===o&&(o=e),a||i||null===r||":"!==t[e]||c||(i=t.slice(r,e)),"'\"".includes(t[e])||(f=e);if(!Object.keys(y).length&&l.throwIfEmpty)throw new Error("string-extract-sass-vars: [THROW_ID_03] no keys extracted! (setting opts.originalOpts)");return y},t.version="3.0.3",Object.defineProperty(t,"__esModule",{value:!0})}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).stringExtractSassVars={})}(this,(function(t){"use strict";const e={throwIfEmpty:!1,cb:null};t.defaults=e,t.extractVars=function(t,n){if("string"!=typeof t)return{};if(n&&"object"!=typeof n)throw new Error(`string-extract-sass-vars: [THROW_ID_01] the second input argument should be a plain object but it was given as ${JSON.stringify(n,null,4)} (type ${typeof n})`);const l={...e,...n};if(l.cb&&"function"!=typeof l.cb)throw new Error(`string-extract-sass-vars: [THROW_ID_02] opts.cb should be function! But it was given as ${JSON.stringify(n,null,4)} (type ${typeof n})`);const s=t.length;let r=null,o=null,i=null,u=null,c=null,f=null,a=!1,d=!1,p=!1;const y={};for(let e=0;e<s;e++)!a&&c&&t[e]===c&&"\\"!==t[e-1]?c=null:c||a||"\\"===t[e-1]||!"'\"".includes(t[e])||(c=t[e]),d&&"\r\n".includes(t[e])&&(d=!1),a||"/"!==t[e]||"/"!==t[e+1]||(d=!0),p&&"*"===t[e-2]&&"/"===t[e-1]&&(p=!1),a||"/"!==t[e]||"*"!==t[e+1]||(p=!0),a=d||p,a||"$"!==t[e]||null!==r||(r=e+1),a||null===o||c||";"!==t[e]||(u=t.slice("\"'".includes(t[o])?o+1:o,(f||0)+1),/^-?\d*\.?\d*$/.test(u)&&(u=+u),y[i]=l.cb?l.cb(u):u,r=null,o=null,i=null,u=null),!a&&null!==i&&t[e]&&t[e].trim().length&&null===o&&(o=e),a||i||null===r||":"!==t[e]||c||(i=t.slice(r,e)),"'\"".includes(t[e])||(f=e);if(!Object.keys(y).length&&l.throwIfEmpty)throw new Error("string-extract-sass-vars: [THROW_ID_03] no keys extracted! (setting opts.originalOpts)");return y},t.version="3.0.7",Object.defineProperty(t,"__esModule",{value:!0})}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "string-extract-sass-vars",
-  "version": "3.0.3",
+  "version": "3.0.7",
   "description": "Parse SASS variables file into a plain object of CSS key-value pairs",
   "keywords": [
     "css",
@@ -36,13 +36,12 @@
   "types": "types/index.d.ts",
   "scripts": {
     "build": "rollup -c",
-    "ci_test": "npm run build && npm run format && tap --no-only --reporter=silent --output-file=testStats.md && npm run clean_cov",
-    "clean_cov": "../../scripts/leaveCoverageTotalOnly.js",
+    "build:esbuild": "node '../../scripts/esbuild.js'",
+    "build:esbuild:dev": "cross-env MODE=dev node '../../scripts/esbuild.js'",
+    "ci_test": "npm run build && npm run format && tap --no-only --reporter=silent",
     "clean_types": "../../scripts/cleanTypes.js",
     "dev": "rollup -c --dev",
     "devunittest": "npm run dev && tap --only -R 'base'",
-    "esbuild": "node '../../scripts/esbuild.js'",
-    "esbuild_dev": "cross-env MODE=dev node '../../scripts/esbuild.js'",
     "format": "npm run lect && npm run prettier && npm run lint",
     "lect": "lect",
     "lint": "../../node_modules/eslint/bin/eslint.js . --ext .js --ext .ts --fix --config \"../../.eslintrc.json\" --quiet",
@@ -51,17 +50,14 @@
     "republish": "npm publish || :",
     "tap": "tap",
     "pretest": "npm run build",
-    "test": "npm run lint && npm run unittest && npm run test:examples && npm run clean_cov && npm run format",
+    "test": "npm run test:ci && npm run perf",
+    "test:ci": "npm run unittest && npm run test:examples && npm run format",
     "test:examples": "../../scripts/test-examples.js && npm run lect && npm run prettier",
     "tsc": "tsc",
-    "unittest": "tap --no-only --output-file=testStats.md --reporter=terse && tsc -p tsconfig.json --noEmit && npm run clean_cov && npm run perf"
+    "unittest": "tap --no-only --reporter=terse && tsc -p tsconfig.json --noEmit"
   },
   "tap": {
     "check-coverage": false,
-    "coverage-report": [
-      "json-summary",
-      "text"
-    ],
     "node-arg": [
       "--no-warnings",
       "--experimental-loader",
@@ -81,7 +77,7 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.16.0"
+    "@babel/runtime": "^7.16.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.16.0",
@@ -92,8 +88,8 @@
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.16.0",
     "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-    "@babel/plugin-transform-runtime": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
+    "@babel/plugin-transform-runtime": "^7.16.4",
+    "@babel/preset-env": "^7.16.4",
     "@babel/preset-typescript": "^7.16.0",
     "@babel/register": "^7.16.0",
     "@istanbuljs/esm-loader-hook": "^0.1.2",
@@ -103,25 +99,25 @@
     "@rollup/plugin-node-resolve": "^13.0.6",
     "@rollup/plugin-strip": "^2.1.0",
     "@rollup/plugin-typescript": "^8.3.0",
-    "@types/node": "^16.11.6",
+    "@types/node": "^16.11.10",
     "@types/tap": "^15.0.5",
-    "@typescript-eslint/eslint-plugin": "^5.2.0",
-    "@typescript-eslint/parser": "^5.2.0",
-    "core-js": "^3.19.0",
+    "@typescript-eslint/eslint-plugin": "^5.5.0",
+    "@typescript-eslint/parser": "^5.5.0",
+    "core-js": "^3.19.2",
     "cross-env": "^7.0.3",
-    "eslint": "^8.1.0",
-    "lect": "^0.18.3",
-    "rollup": "^2.59.0",
+    "eslint": "^8.3.0",
+    "lect": "^0.18.7",
+    "rollup": "^2.60.1",
     "rollup-plugin-ascii": "^0.0.3",
     "rollup-plugin-banner": "^0.2.1",
     "rollup-plugin-cleanup": "^3.2.1",
-    "rollup-plugin-dts": "^4.0.0",
+    "rollup-plugin-dts": "^4.0.1",
     "rollup-plugin-terser": "^7.0.2",
-    "tap": "^15.0.10",
+    "tap": "^15.1.5",
     "tslib": "^2.3.1",
-    "typescript": "^4.4.4"
+    "typescript": "^4.5.2"
   },
   "engines": {
-    "node": ">=12"
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
   }
 }