@plumeria/compiler 8.0.2 → 9.0.0

package/dist/index.js

@@ -1,23 +1,55 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileCSS = compileCSS;
 const core_1 = require("@swc/core");
 const zss_engine_1 = require("zss-engine");
-const fs_1 = __importDefault(require("fs"));
+const fs = __importStar(require("fs"));
+const rs = __importStar(require("@rust-gear/glob"));
 const utils_1 = require("@plumeria/utils");
 const utils_2 = require("@plumeria/utils");
 function compileCSS(options) {
     const { include, exclude, cwd = process.cwd() } = options;
     const allSheets = new Set();
-    const files = fs_1.default.globSync(include, {
+    const files = rs.globSync(include, {
         cwd,
         exclude: exclude,
     });
+    const scannedTables = (0, utils_1.scanAll)();
     const processFile = (filePath) => {
-        const source = fs_1.default.readFileSync(filePath, 'utf-8');
+        const source = fs.readFileSync(filePath, 'utf-8');
         const extractedSheets = [];
         const ast = (0, core_1.parseSync)(source, {
             syntax: 'typescript',
@@ -28,7 +60,6 @@ function compileCSS(options) {
         const sourceBuffer = Buffer.from(source, 'utf-8');
         const leadingBytes = Buffer.byteLength(source.slice(0, leadingLen), 'utf-8');
         const baseByteOffset = ast.span.start - leadingBytes;
-        const scannedTables = (0, utils_1.scanAll)();
         const localConsts = (0, utils_1.collectLocalConsts)(ast);
         const resourcePath = filePath;
         const importMap = {};
@@ -157,7 +188,7 @@ function compileCSS(options) {
                 const objectName = callee.object.value;
                 const propertyName = callee.property.value;
                 const alias = plumeriaAliases[objectName];
-                if (alias === 'NAMESPACE' || objectName === 'css')
+                if (alias === 'NAMESPACE')
                     propName = propertyName;
             }
             else if (utils_1.t.isIdentifier(callee)) {
@@ -165,15 +196,6 @@ function compileCSS(options) {
                 if (originalName)
                     propName = originalName;
             }
-            let localVariantName;
-            if (!propName && utils_1.t.isIdentifier(callee)) {
-                const varName = callee.value;
-                if (localCreateStyles[varName] &&
-                    localCreateStyles[varName].type === 'variant') {
-                    localVariantName = varName;
-                    propName = 'props';
-                }
-            }
             if (propName) {
                 const args = node.arguments;
                 const extractStylesFromExpression = (expression) => {
@@ -240,9 +262,8 @@ function compileCSS(options) {
                     const records = (0, utils_1.getStyleRecords)(style);
                     records.forEach((r) => extractedSheets.push(r.sheet));
                 };
-                if (propName === 'props') {
+                if (propName === 'use') {
                     const conditionals = [];
-                    let groupIdCounter = 0;
                     let baseStyle = {};
                     const resolveStyleObject = (expression) => {
                         const styles = extractStylesFromExpression(expression);
@@ -252,57 +273,6 @@ function compileCSS(options) {
                     };
                     for (const arg of args) {
                         const expr = arg.expression;
-                        let handledAsObjectArg = false;
-                        if (localVariantName && utils_1.t.isObjectExpression(expr)) {
-                            const variantObj = localCreateStyles[localVariantName].obj;
-                            if (variantObj) {
-                                const props = expr.properties;
-                                if (variantObj.base && typeof variantObj.base === 'object') {
-                                    baseStyle = (0, utils_1.deepMerge)(baseStyle, variantObj.base);
-                                }
-                                const variantsMap = (variantObj.variants ||
-                                    variantObj);
-                                for (const prop of props) {
-                                    let groupName;
-                                    let valueExpression;
-                                    if (prop.type === 'KeyValueProperty' &&
-                                        prop.key.type === 'Identifier') {
-                                        groupName = prop.key.value;
-                                        valueExpression = prop.value;
-                                    }
-                                    else if (prop.type === 'Identifier') {
-                                        groupName = prop.value;
-                                        valueExpression = prop;
-                                    }
-                                    if (groupName && valueExpression && variantsMap[groupName]) {
-                                        const groupVariants = variantsMap[groupName];
-                                        if (!groupVariants || typeof groupVariants !== 'object')
-                                            continue;
-                                        const currentGroupId = ++groupIdCounter;
-                                        if (valueExpression.type === 'StringLiteral') {
-                                            if (groupVariants[valueExpression.value]) {
-                                                baseStyle = (0, utils_1.deepMerge)(baseStyle, groupVariants[valueExpression.value]);
-                                            }
-                                            continue;
-                                        }
-                                        Object.entries(groupVariants).forEach(([optionName, style]) => {
-                                            conditionals.push({
-                                                test: valueExpression,
-                                                truthy: style,
-                                                falsy: {},
-                                                groupId: currentGroupId,
-                                                groupName: groupName,
-                                                valueName: optionName,
-                                                varName: localVariantName,
-                                            });
-                                        });
-                                    }
-                                }
-                                handledAsObjectArg = true;
-                            }
-                        }
-                        if (handledAsObjectArg)
-                            continue;
                         const getSource = (node) => sourceBuffer
                             .subarray(node.span.start - baseByteOffset, node.span.end - baseByteOffset)
                             .toString('utf-8');
@@ -407,8 +377,7 @@ function compileCSS(options) {
                     if (utils_1.t.isMemberExpression(callee) &&
                         utils_1.t.isIdentifier(callee.object) &&
                         utils_1.t.isIdentifier(callee.property)) {
-                        if (callee.object.value === 'css' ||
-                            plumeriaAliases[callee.object.value] === 'NAMESPACE')
+                        if (plumeriaAliases[callee.object.value] === 'NAMESPACE')
                             pName = callee.property.value;
                     }
                     else if (utils_1.t.isIdentifier(callee) && plumeriaAliases[callee.value]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "8.0.2",
+  "version": "9.0.0",
   "description": "Plumeria swc based compiler for statically extracting css",
   "author": "Refirst 11",
   "license": "MIT",
@@ -21,10 +21,11 @@
     "dist/"
   ],
   "dependencies": {
-    "@plumeria/utils": "^8.0.2"
+    "@plumeria/utils": "^9.0.0"
   },
   "devDependencies": {
-    "@swc/core": "1.15.8",
+    "@rust-gear/glob": "0.2.8",
+    "@swc/core": "1.15.18",
     "zss-engine": "2.2.4"
   },
   "publishConfig": {