@plumeria/webpack-plugin 6.3.0 → 6.3.2

package/dist/index.d.ts

@@ -1,2 +1,2 @@
 import type { LoaderContext } from 'webpack';
-export default function loader(this: LoaderContext<unknown>, source: string): void;
+export default function loader(this: LoaderContext<unknown>, source: string): Promise<void>;

package/dist/index.js

@@ -5,15 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = loader;
 const core_1 = require("@swc/core");
-const fs_1 = __importDefault(require("fs"));
+const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const zss_engine_1 = require("zss-engine");
 const utils_1 = require("@plumeria/utils");
 const VIRTUAL_FILE_PATH = path_1.default.resolve(__dirname, '..', 'zero-virtual.css');
 if (process.env.NODE_ENV === 'production') {
-    fs_1.default.writeFileSync(VIRTUAL_FILE_PATH, '/** Placeholder file */', 'utf-8');
+    (0, fs_1.writeFileSync)(VIRTUAL_FILE_PATH, '/** Placeholder file */\n', 'utf-8');
 }
-function loader(source) {
+async function loader(source) {
     const callback = this.async();
     const isProduction = process.env.NODE_ENV === 'production';
     if (this.resourcePath.includes('node_modules') ||
@@ -222,7 +222,7 @@ function loader(source) {
                 if (obj) {
                     const hashMap = {};
                     Object.entries(obj).forEach(([key, style]) => {
-                        const records = (0, utils_1.getStyleRecords)(key, style, 2);
+                        const records = (0, utils_1.getStyleRecords)(key, style);
                         if (!isProduction) {
                             (0, utils_1.extractOndemandStyles)(style, extractedSheets, scannedTables);
                             records.forEach((r) => {
@@ -372,6 +372,9 @@ function loader(source) {
                     const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
                     scannedTables.keyframesObjectTable[hash] = obj;
+                    if (!isProduction) {
+                        (0, utils_1.extractOndemandStyles)({ kf: `kf-${hash}` }, extractedSheets, scannedTables);
+                    }
                     replacements.push({
                         start: node.span.start - ast.span.start,
                         end: node.span.end - ast.span.start,
@@ -419,7 +422,7 @@ function loader(source) {
                     scannedTables.createObjectTable[hash] = obj;
                     Object.entries(obj).forEach(([key, style]) => {
                         if (typeof style === 'object' && style !== null) {
-                            const records = (0, utils_1.getStyleRecords)(key, style, 2);
+                            const records = (0, utils_1.getStyleRecords)(key, style);
                             if (!isProduction) {
                                 (0, utils_1.extractOndemandStyles)(style, extractedSheets, scannedTables);
                                 records.forEach((r) => addSheet(r.sheet));
@@ -770,7 +773,7 @@ function loader(source) {
                             (0, utils_1.extractOndemandStyles)(baseStyle, extractedSheets, scannedTables);
                         }
                         const hash = (0, zss_engine_1.genBase36Hash)(baseStyle, 1, 8);
-                        const records = (0, utils_1.getStyleRecords)(hash, baseStyle, 2);
+                        const records = (0, utils_1.getStyleRecords)(hash, baseStyle);
                         if (!isProduction) {
                             records.forEach((r) => addSheet(r.sheet));
                         }
@@ -783,35 +786,49 @@ function loader(source) {
                     }
                     else {
                         const table = {};
-                        const combinations = 1 << conditionals.length;
-                        for (let i = 0; i < combinations; i++) {
+                        const groups = {};
+                        let strayIdCounter = groupIdCounter + 1;
+                        conditionals.forEach((c) => {
+                            const gid = c.groupId !== undefined ? c.groupId : strayIdCounter++;
+                            if (!groups[gid]) {
+                                groups[gid] = [];
+                            }
+                            groups[gid].push(c);
+                        });
+                        const sortedGroupIds = Object.keys(groups)
+                            .map(Number)
+                            .sort((a, b) => a - b);
+                        let totalCombinations = 1;
+                        const groupMeta = sortedGroupIds.map((gid) => {
+                            const options = groups[gid];
+                            const isVariantGroup = options[0].groupId !== undefined;
+                            const size = isVariantGroup ? options.length : 2;
+                            const stride = totalCombinations;
+                            totalCombinations *= size;
+                            return { gid, options, size, stride, isVariantGroup };
+                        });
+                        for (let i = 0; i < totalCombinations; i++) {
                             let currentStyle = { ...baseStyle };
-                            const seenGroups = new Set();
-                            let impossible = false;
-                            for (let j = 0; j < conditionals.length; j++) {
-                                if ((i >> j) & 1) {
-                                    if (conditionals[j].groupId !== undefined) {
-                                        if (seenGroups.has(conditionals[j].groupId)) {
-                                            impossible = true;
-                                            break;
-                                        }
-                                        seenGroups.add(conditionals[j].groupId);
-                                    }
-                                    currentStyle = (0, utils_1.deepMerge)(currentStyle, conditionals[j].truthy);
+                            for (const meta of groupMeta) {
+                                const localIndex = Math.floor(i / meta.stride) % meta.size;
+                                if (meta.isVariantGroup) {
+                                    currentStyle = (0, utils_1.deepMerge)(currentStyle, meta.options[localIndex].truthy);
                                 }
                                 else {
-                                    currentStyle = (0, utils_1.deepMerge)(currentStyle, conditionals[j].falsy);
+                                    const cond = meta.options[0];
+                                    if (localIndex === 1) {
+                                        currentStyle = (0, utils_1.deepMerge)(currentStyle, cond.truthy);
+                                    }
+                                    else {
+                                        currentStyle = (0, utils_1.deepMerge)(currentStyle, cond.falsy);
+                                    }
                                 }
                             }
-                            if (impossible) {
-                                table[i] = '';
-                                continue;
-                            }
                             if (process.env.NODE_ENV !== 'production') {
                                 (0, utils_1.extractOndemandStyles)(currentStyle, extractedSheets, scannedTables);
                             }
                             const hash = (0, zss_engine_1.genBase36Hash)(currentStyle, 1, 8);
-                            const records = (0, utils_1.getStyleRecords)(hash, currentStyle, 2);
+                            const records = (0, utils_1.getStyleRecords)(hash, currentStyle);
                             if (process.env.NODE_ENV !== 'production') {
                                 records.forEach((r) => extractedSheets.push(r.sheet));
                             }
@@ -820,22 +837,50 @@ function loader(source) {
                                 .join(' ');
                             table[i] = className;
                         }
-                        let indexExpr = '';
-                        if (conditionals.length === 0) {
-                            indexExpr = '0';
-                        }
-                        else {
-                            const parts = conditionals.map((c, idx) => {
-                                if (c.testString) {
-                                    return `(!!(${c.testString}) << ${idx})`;
+                        const indexParts = [];
+                        for (const meta of groupMeta) {
+                            if (meta.isVariantGroup) {
+                                const exprs = meta.options
+                                    .map((opt, idx) => {
+                                    if (idx === 0)
+                                        return null;
+                                    let testStr = opt.testString;
+                                    if (!testStr && opt.test) {
+                                        const start = opt.test.span.start - ast.span.start;
+                                        const end = opt.test.span.end - ast.span.start;
+                                        testStr = source.substring(start, end);
+                                    }
+                                    return `(!!(${testStr}) * ${idx})`;
+                                })
+                                    .filter(Boolean);
+                                if (exprs.length > 0) {
+                                    const groupSum = `(${exprs.join(' + ')})`;
+                                    if (meta.stride > 1) {
+                                        indexParts.push(`(${groupSum} * ${meta.stride})`);
+                                    }
+                                    else {
+                                        indexParts.push(groupSum);
+                                    }
                                 }
-                                const start = c.test.span.start - ast.span.start;
-                                const end = c.test.span.end - ast.span.start;
-                                const testStr = source.substring(start, end);
-                                return `(!!(${testStr}) << ${idx})`;
-                            });
-                            indexExpr = parts.join(' | ');
+                            }
+                            else {
+                                const cond = meta.options[0];
+                                let testStr = cond.testString;
+                                if (!testStr && cond.test) {
+                                    const start = cond.test.span.start - ast.span.start;
+                                    const end = cond.test.span.end - ast.span.start;
+                                    testStr = source.substring(start, end);
+                                }
+                                const expr = `(!!(${testStr}))`;
+                                if (meta.stride > 1) {
+                                    indexParts.push(`(${expr} * ${meta.stride})`);
+                                }
+                                else {
+                                    indexParts.push(`(${expr} * 1)`);
+                                }
+                            }
                         }
+                        const indexExpr = indexParts.join(' + ') || '0';
                         const tableStr = JSON.stringify(table);
                         const replacement = `${tableStr}[${indexExpr}]`;
                         replacements.push({
@@ -849,7 +894,7 @@ function loader(source) {
         },
     });
     Object.values(localCreateStyles).forEach((info) => {
-        if (info.type === 'constant' || info.type === 'variant') {
+        if (info.type === 'constant') {
             return;
         }
         if (info.isExported) {
@@ -867,6 +912,7 @@ function loader(source) {
             });
         }
     });
+    const optInCSS = await (0, utils_1.optimizer)(extractedSheets.join(''));
     const buffer = Buffer.from(source);
     let offset = 0;
     const parts = [];
@@ -892,7 +938,7 @@ function loader(source) {
     }
     const virtualCssRequest = stringifyRequest(this, `${VIRTUAL_CSS_PATH}`);
     const postfix = `\nimport ${virtualCssRequest};`;
-    const css = fs_1.default.readFileSync(VIRTUAL_FILE_PATH, 'utf-8');
+    const css = (0, fs_1.readFileSync)(VIRTUAL_FILE_PATH, 'utf-8');
     function generateOrderedCSS(styles) {
         const sections = [];
         if (styles.keyframeStyles?.trim()) {
@@ -912,7 +958,7 @@ function loader(source) {
         }
         return sections.join('\n');
     }
-    const orderedCSS = generateOrderedCSS(fileStyles);
+    const orderedCSS = await (0, utils_1.optimizer)(generateOrderedCSS(fileStyles));
     const relativeId = path_1.default.relative(process.cwd(), this.resourcePath);
     const hmrCode = `
     if (module.hot) {
@@ -946,7 +992,7 @@ function loader(source) {
     }
   `;
     if (extractedSheets.length > 0 && process.env.NODE_ENV === 'development') {
-        fs_1.default.appendFileSync(VIRTUAL_FILE_PATH, extractedSheets.join(''), 'utf-8');
+        (0, fs_1.appendFileSync)(VIRTUAL_FILE_PATH, optInCSS, 'utf-8');
     }
     const useClientDirective = /^\s*['"]use client['"]/;
     if (process.env.NODE_ENV === 'production')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/webpack-plugin",
-  "version": "6.3.0",
+  "version": "6.3.2",
   "description": "Plumeria Webpack plugin",
   "author": "Refirst 11",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "zero-virtual.css"
   ],
   "dependencies": {
-    "@plumeria/utils": "^6.3.0"
+    "@plumeria/utils": "^6.3.2"
   },
   "devDependencies": {
     "@swc/core": "1.15.8",