@plumeria/utils 18.2.3 → 18.2.5

package/dist/create.js

@@ -6,7 +6,7 @@ function getStyleRecords(styleRule) {
     const flat = {};
     const nonFlat = {};
     const notNormalize = ':not(#\\#)';
-    (0, zss_engine_1.splitAtomicAndNested)((0, zss_engine_1.overrideLonghand)(styleRule), flat, nonFlat);
+    (0, zss_engine_1.splitAtomicAndNested)(styleRule, flat, nonFlat);
     const finalFlat = flat;
     const records = [];
     Object.entries(finalFlat).forEach(([prop, value]) => {

package/dist/index.d.ts

@@ -4,7 +4,7 @@ export type { StyleRecord } from './create';
 export { getStyleRecords } from './create';
 export { createTheme } from './createTheme';
 export { resolveImportPath } from './resolver';
-export { optimizer, orderMediaLast } from './optimizer';
+export { optimizer } from './optimizer';
 export { processVariants } from './variants';
 export { getLeadingCommentLength } from './ast';
 export type { ReferenceIdentifiers } from './references';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_STYLE_PROP = exports.timedAsync = exports.timed = exports.tally = exports.measure = exports.mark = exports.profiling = exports.collectReferenceIdentifiers = exports.getLeadingCommentLength = exports.processVariants = exports.orderMediaLast = exports.optimizer = exports.resolveImportPath = exports.createTheme = exports.getStyleRecords = exports.resolveComponentKey = exports.resolveExport = exports.getFileDependencies = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = exports.getRootIdentifier = exports.t = exports.traverse = exports.collectLocalConsts = exports.objectExpressionToObject = void 0;
+exports.DEFAULT_STYLE_PROP = exports.timedAsync = exports.timed = exports.tally = exports.measure = exports.mark = exports.profiling = exports.collectReferenceIdentifiers = exports.getLeadingCommentLength = exports.processVariants = exports.optimizer = exports.resolveImportPath = exports.createTheme = exports.getStyleRecords = exports.resolveComponentKey = exports.resolveExport = exports.getFileDependencies = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = exports.getRootIdentifier = exports.t = exports.traverse = exports.collectLocalConsts = exports.objectExpressionToObject = void 0;
 var parser_1 = require("./parser");
 Object.defineProperty(exports, "objectExpressionToObject", { enumerable: true, get: function () { return parser_1.objectExpressionToObject; } });
 Object.defineProperty(exports, "collectLocalConsts", { enumerable: true, get: function () { return parser_1.collectLocalConsts; } });
@@ -21,7 +21,6 @@ var resolver_1 = require("./resolver");
 Object.defineProperty(exports, "resolveImportPath", { enumerable: true, get: function () { return resolver_1.resolveImportPath; } });
 var optimizer_1 = require("./optimizer");
 Object.defineProperty(exports, "optimizer", { enumerable: true, get: function () { return optimizer_1.optimizer; } });
-Object.defineProperty(exports, "orderMediaLast", { enumerable: true, get: function () { return optimizer_1.orderMediaLast; } });
 var variants_1 = require("./variants");
 Object.defineProperty(exports, "processVariants", { enumerable: true, get: function () { return variants_1.processVariants; } });
 var ast_1 = require("./ast");

package/dist/mergeRules.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin } from 'postcss';
+export declare const mergeRules: () => Plugin;

package/dist/mergeRules.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeRules = void 0;
+function mergeContainer(container) {
+    if (!container.nodes)
+        return;
+    const rules = new Map();
+    const atRules = new Map();
+    for (const node of [...container.nodes]) {
+        if (node.type === 'rule') {
+            const previous = rules.get(node.selector);
+            if (previous) {
+                previous.append(...node.nodes);
+                node.remove();
+            }
+            else {
+                rules.set(node.selector, node);
+            }
+            continue;
+        }
+        if (node.type !== 'atrule' || !node.nodes)
+            continue;
+        const key = `${node.name}\0${node.params}`;
+        const previous = atRules.get(key);
+        if (previous) {
+            previous.append(...node.nodes);
+            node.remove();
+        }
+        else {
+            atRules.set(key, node);
+        }
+    }
+    for (const node of [...rules.values(), ...atRules.values()]) {
+        mergeContainer(node);
+    }
+}
+const mergeRules = () => ({
+    postcssPlugin: 'plumeria-merge-rules',
+    OnceExit(root) {
+        mergeContainer(root);
+    },
+});
+exports.mergeRules = mergeRules;

package/dist/optimizer.d.ts

@@ -1,2 +1 @@
-export declare function orderMediaLast(rules: string[]): string[];
 export declare function optimizer(cssCode: string): Promise<string>;

package/dist/optimizer.js

@@ -3,44 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.orderMediaLast = orderMediaLast;
 exports.optimizer = optimizer;
 const postcss_1 = __importDefault(require("postcss"));
-const postcss_combine_media_query_1 = __importDefault(require("postcss-combine-media-query"));
 const lightningcss_1 = require("lightningcss");
-function isMediaRule(rule) {
-    let i = 0;
-    while (i < rule.length) {
-        const char = rule[i];
-        if (char === '/' && rule[i + 1] === '*') {
-            const end = rule.indexOf('*/', i + 2);
-            if (end === -1)
-                return false;
-            i = end + 2;
-            continue;
-        }
-        if (char === ' ' ||
-            char === '\n' ||
-            char === '\t' ||
-            char === '\r' ||
-            char === '\f') {
-            i++;
-            continue;
-        }
-        break;
-    }
-    return rule.startsWith('@media', i);
-}
-function orderMediaLast(rules) {
-    const base = [];
-    const media = [];
-    for (const rule of rules) {
-        (isMediaRule(rule) ? media : base).push(rule);
-    }
-    return [...base, ...media];
-}
+const mergeRules_1 = require("./mergeRules");
 async function optimizer(cssCode) {
-    const merged = await (0, postcss_1.default)([(0, postcss_combine_media_query_1.default)()]).process(cssCode, {
+    const merged = await (0, postcss_1.default)([(0, mergeRules_1.mergeRules)()]).process(cssCode, {
         from: undefined,
     });
     const light = (0, lightningcss_1.transform)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "18.2.3",
+  "version": "18.2.5",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",
@@ -25,8 +25,7 @@
     "@swc/core": "1.15.47",
     "lightningcss": "^1.32.0",
     "postcss": "8.5.25",
-    "postcss-combine-media-query": "^2.1.0",
-    "zss-engine": "2.3.2"
+    "zss-engine": "2.4.1"
   },
   "publishConfig": {
     "access": "public",