postcss-merge-idents 5.0.1 → 5.1.0

package/package.json

@@ -1,17 +1,14 @@
 {
   "name": "postcss-merge-idents",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "description": "Merge keyframe and counter style identifiers.",
-  "main": "dist/index.js",
+  "main": "src/index.js",
+  "types": "types/index.d.ts",
   "files": [
-    "dist",
-    "LICENSE-MIT"
+    "src",
+    "LICENSE-MIT",
+    "types"
   ],
-  "scripts": {
-    "prebuild": "del-cli dist",
-    "build": "cross-env BABEL_ENV=publish babel src --config-file ../../babel.config.json --out-dir dist --ignore \"**/__tests__/\"",
-    "prepublish": "yarn build"
-  },
   "keywords": [
     "css",
     "merge",
@@ -27,8 +24,8 @@
   },
   "repository": "cssnano/cssnano",
   "dependencies": {
-    "cssnano-utils": "^2.0.1",
-    "postcss-value-parser": "^4.1.0"
+    "cssnano-utils": "^3.1.0",
+    "postcss-value-parser": "^4.2.0"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
@@ -42,5 +39,5 @@
   "peerDependencies": {
     "postcss": "^8.2.15"
   },
-  "gitHead": "28c247175032fa03f04911cde56ad82d74d211cc"
-}
+  "readme": "# [postcss][postcss]-merge-idents\n\n> Merge keyframe and counter style identifiers.\n\n\n## Install\n\nWith [npm](https://npmjs.org/package/postcss-merge-idents) do:\n\n```\nnpm install postcss-merge-idents --save\n```\n\n\n## Example\n\nThis module will merge identifiers such as `@keyframes` and `@counter-style`,\nif their properties are identical. Then, it will update those declarations that\ndepend on the duplicated property.\n\n### Input\n\n```css\n@keyframes rotate {\n    from { transform: rotate(0) }\n    to { transform: rotate(360deg) }\n}\n\n@keyframes flip {\n    from { transform: rotate(0) }\n    to { transform: rotate(360deg) }\n}\n\n.rotate {\n    animation-name: rotate\n}\n\n.flip {\n    animation-name: flip\n}\n```\n\n### Output\n\n```css\n@keyframes flip {\n    from { transform: rotate(0) }\n    to { transform: rotate(360deg) }\n}\n\n.rotate {\n    animation-name: flip\n}\n\n.flip {\n    animation-name: flip\n}\n```\n\n\n## Usage\n\nSee the [PostCSS documentation](https://github.com/postcss/postcss#usage) for\nexamples for your environment.\n\n\n## Contributors\n\nSee [CONTRIBUTORS.md](https://github.com/cssnano/cssnano/blob/master/CONTRIBUTORS.md).\n\n\n## License\n\nMIT © [Ben Briggs](http://beneb.info)\n\n\n[postcss]: https://github.com/postcss/postcss\n"
+}

package/src/index.js

@@ -0,0 +1,146 @@
+'use strict';
+const valueParser = require('postcss-value-parser');
+const { sameParent } = require('cssnano-utils');
+
+/**
+ * @param {Record<string, string>} obj
+ * @return {(key: string) => string}
+ */
+function canonical(obj) {
+  // Prevent potential infinite loops
+  let stack = 50;
+
+  /**
+   * @param {string} key
+   * @return {string}
+   */
+  return function recurse(key) {
+    if (
+      Object.prototype.hasOwnProperty.call(obj, key) &&
+      obj[key] !== key &&
+      stack
+    ) {
+      stack--;
+
+      return recurse(obj[key]);
+    }
+
+    stack = 50;
+
+    return key;
+  };
+}
+
+/**
+ * @param {import('postcss').Root} css
+ * @return {void}
+ */
+function mergeAtRules(css) {
+  const pairs = [
+    {
+      atrule: /keyframes/i,
+      decl: /animation/i,
+      /** @type {import('postcss').AtRule[]} */
+      cache: [],
+      replacements: {},
+      /** @type {import('postcss').Declaration[]} */
+      decls: [],
+      /** @type {import('postcss').AtRule[]} */
+      removals: [],
+    },
+    {
+      atrule: /counter-style/i,
+      decl: /(list-style|system)/i,
+      cache: [],
+      replacements: {},
+      decls: [],
+      removals: [],
+    },
+  ];
+
+  /**
+   * @type {{atrule: RegExp, decl: RegExp, replacements: Record<string, string>, removals: import('postcss').AtRule[], cache: import('postcss').AtRule[], decls: import('postcss').Declaration[]}}
+   */
+  let relevant;
+
+  css.walk((node) => {
+    if (node.type === 'atrule') {
+      relevant = pairs.filter((pair) =>
+        pair.atrule.test(node.name.toLowerCase())
+      )[0];
+
+      if (!relevant) {
+        return;
+      }
+
+      if (relevant.cache.length < 1) {
+        relevant.cache.push(node);
+        return;
+      } else {
+        let toString = node.nodes.toString();
+
+        relevant.cache.forEach((cached) => {
+          if (
+            cached.name.toLowerCase() === node.name.toLowerCase() &&
+            sameParent(
+              /** @type {any} */ (cached),
+              /** @type {any} */ (node)
+            ) &&
+            cached.nodes.toString() === toString
+          ) {
+            relevant.removals.push(cached);
+            relevant.replacements[cached.params] = node.params;
+          }
+        });
+
+        relevant.cache.push(node);
+
+        return;
+      }
+    }
+
+    if (node.type === 'decl') {
+      relevant = pairs.filter((pair) =>
+        pair.decl.test(node.prop.toLowerCase())
+      )[0];
+
+      if (!relevant) {
+        return;
+      }
+
+      relevant.decls.push(node);
+    }
+  });
+
+  pairs.forEach((pair) => {
+    let canon = canonical(pair.replacements);
+
+    pair.decls.forEach((decl) => {
+      decl.value = valueParser(decl.value)
+        .walk((node) => {
+          if (node.type === 'word') {
+            node.value = canon(node.value);
+          }
+        })
+        .toString();
+    });
+    pair.removals.forEach((cached) => cached.remove());
+  });
+}
+
+/**
+ * @type {import('postcss').PluginCreator<void>}
+ * @return {import('postcss').Plugin}
+ */
+function pluginCreator() {
+  return {
+    postcssPlugin: 'postcss-merge-idents',
+
+    OnceExit(css) {
+      mergeAtRules(css);
+    },
+  };
+}
+
+pluginCreator.postcss = true;
+module.exports = pluginCreator;

package/types/index.d.ts

@@ -0,0 +1,9 @@
+export = pluginCreator;
+/**
+ * @type {import('postcss').PluginCreator<void>}
+ * @return {import('postcss').Plugin}
+ */
+declare function pluginCreator(): import('postcss').Plugin;
+declare namespace pluginCreator {
+    const postcss: true;
+}

package/CHANGELOG.md

@@ -1,69 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [5.0.1](https://github.com/cssnano/cssnano/compare/postcss-merge-idents@5.0.0...postcss-merge-idents@5.0.1) (2021-05-19)
-
-**Note:** Version bump only for package postcss-merge-idents
-
-
-
-
-
-# [5.0.0](https://github.com/cssnano/cssnano/compare/postcss-merge-idents@5.0.0-rc.2...postcss-merge-idents@5.0.0) (2021-04-06)
-
-**Note:** Version bump only for package postcss-merge-idents
-
-
-
-
-
-# [5.0.0-rc.2](https://github.com/cssnano/cssnano/compare/postcss-merge-idents@5.0.0-rc.1...postcss-merge-idents@5.0.0-rc.2) (2021-03-15)
-
-**Note:** Version bump only for package postcss-merge-idents
-
-
-
-
-
-# [5.0.0-rc.1](https://github.com/cssnano/cssnano/compare/postcss-merge-idents@5.0.0-rc.0...postcss-merge-idents@5.0.0-rc.1) (2021-03-04)
-
-**Note:** Version bump only for package postcss-merge-idents
-
-
-
-
-
-# 5.0.0-rc.0 (2021-02-19)
-
-
-### Bug Fixes
-
-* **merge-rules, merge-idents:** add support for nested at-rules ([#719](https://github.com/cssnano/cssnano/issues/719)) ([cdedda7](https://github.com/cssnano/cssnano/commit/cdedda7f9d67873d872add044ad34c91616579f3))
-
-
-### chore
-
-* minimum require version of node is 10.13 ([#871](https://github.com/cssnano/cssnano/issues/871)) ([28bda24](https://github.com/cssnano/cssnano/commit/28bda243e32ce3ba89b3c358a5f78727b3732f11))
-
-
-### Features
-
-* migarete to PostCSS 8 ([#975](https://github.com/cssnano/cssnano/issues/975)) ([40b82dc](https://github.com/cssnano/cssnano/commit/40b82dca7f53ac02cd4fe62846dec79b898ccb49))
-
-
-### BREAKING CHANGES
-
-* minimum supported `postcss` version is `8.2.1`
-* minimum require version of node is 10.13
-
-
-
-## 4.1.1 (2018-09-24)
-
-
-### Bug Fixes
-
-* better handle uppercase atrule and properties in `postcss-merge-idents` ([#610](https://github.com/cssnano/cssnano/issues/610)) ([d177936](https://github.com/cssnano/cssnano/commit/d177936b2656ad286490bedc3c4ab9773a63e5bc))
-* **postcss-merge-longhand:** not mangle border output ([#555](https://github.com/cssnano/cssnano/issues/555)) ([9a70605](https://github.com/cssnano/cssnano/commit/9a706050b621e7795a9bf74eb7110b5c81804ffe)), closes [#553](https://github.com/cssnano/cssnano/issues/553) [#554](https://github.com/cssnano/cssnano/issues/554)

package/dist/index.js

@@ -1,103 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _postcssValueParser = _interopRequireDefault(require("postcss-value-parser"));
-
-var _cssnanoUtils = require("cssnano-utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function canonical(obj) {
-  // Prevent potential infinite loops
-  let stack = 50;
-  return function recurse(key) {
-    if (Object.prototype.hasOwnProperty.call(obj, key) && obj[key] !== key && stack) {
-      stack--;
-      return recurse(obj[key]);
-    }
-
-    stack = 50;
-    return key;
-  };
-}
-
-function mergeAtRules(css, pairs) {
-  pairs.forEach(pair => {
-    pair.cache = [];
-    pair.replacements = [];
-    pair.decls = [];
-    pair.removals = [];
-  });
-  let relevant;
-  css.walk(node => {
-    if (node.type === 'atrule') {
-      relevant = pairs.filter(pair => pair.atrule.test(node.name.toLowerCase()))[0];
-
-      if (!relevant) {
-        return;
-      }
-
-      if (relevant.cache.length < 1) {
-        relevant.cache.push(node);
-        return;
-      } else {
-        let toString = node.nodes.toString();
-        relevant.cache.forEach(cached => {
-          if (cached.name.toLowerCase() === node.name.toLowerCase() && (0, _cssnanoUtils.sameParent)(cached, node) && cached.nodes.toString() === toString) {
-            relevant.removals.push(cached);
-            relevant.replacements[cached.params] = node.params;
-          }
-        });
-        relevant.cache.push(node);
-        return;
-      }
-    }
-
-    if (node.type === 'decl') {
-      relevant = pairs.filter(pair => pair.decl.test(node.prop.toLowerCase()))[0];
-
-      if (!relevant) {
-        return;
-      }
-
-      relevant.decls.push(node);
-    }
-  });
-  pairs.forEach(pair => {
-    let canon = canonical(pair.replacements);
-    pair.decls.forEach(decl => {
-      decl.value = (0, _postcssValueParser.default)(decl.value).walk(node => {
-        if (node.type === 'word') {
-          node.value = canon(node.value);
-        }
-      }).toString();
-    });
-    pair.removals.forEach(cached => cached.remove());
-  });
-}
-
-function pluginCreator() {
-  return {
-    postcssPlugin: 'postcss-merge-idents',
-
-    OnceExit(css) {
-      mergeAtRules(css, [{
-        atrule: /keyframes/i,
-        decl: /animation/i
-      }, {
-        atrule: /counter-style/i,
-        decl: /(list-style|system)/i
-      }]);
-    }
-
-  };
-}
-
-pluginCreator.postcss = true;
-var _default = pluginCreator;
-exports.default = _default;
-module.exports = exports.default;