@plumeria/compiler 15.1.3 → 16.1.0

package/dist/index.js

@@ -130,6 +130,7 @@ function compileCSS(options) {
         const createThemeImportMap = {};
         const createStaticImportMap = {};
         const plumeriaAliases = {};
+        const localImports = {};
         (0, utils_1.traverse)(ast, {
             ImportDeclaration({ node }) {
                 const sourcePath = node.source.value;
@@ -158,6 +159,7 @@ function compileCSS(options) {
                                 : specifier.local.value;
                             const localName = specifier.local.value;
                             const uniqueKey = `${actualPath}-${importedName}`;
+                            localImports[localName] = { actualPath, importedName };
                             if (scannedTables.staticTable[uniqueKey])
                                 importMap[localName] = scannedTables.staticTable[uniqueKey];
                             if (scannedTables.keyframesHashTable[uniqueKey])
@@ -277,6 +279,37 @@ function compileCSS(options) {
             sourceBuffer,
             baseByteOffset,
         };
+        const componentParamNames = new Set();
+        for (const node of ast.body) {
+            let declarations = [];
+            if (node.type === 'VariableDeclaration') {
+                declarations = node.declarations;
+            }
+            else if (node.type === 'ExportDeclaration' &&
+                node.declaration.type === 'VariableDeclaration') {
+                declarations = node.declaration.declarations;
+            }
+            for (const decl of declarations) {
+                if (!utils_1.t.isIdentifier(decl.id) || !decl.init)
+                    continue;
+                const init = decl.init;
+                if (init.type !== 'ArrowFunctionExpression' &&
+                    init.type !== 'FunctionExpression')
+                    continue;
+                if (init.params.length > 0) {
+                    const p = init.params[0];
+                    if (utils_1.t.isIdentifier(p)) {
+                        componentParamNames.add(p.value);
+                    }
+                    else if (typeof p === 'object' &&
+                        p !== null &&
+                        'pat' in p &&
+                        utils_1.t.isIdentifier(p.pat)) {
+                        componentParamNames.add(p.pat.value);
+                    }
+                }
+            }
+        }
         const processStyle = (style) => {
             (0, utils_1.extractOndemandStyles)(style, extractedSheets, scannedTables);
             const records = (0, utils_1.getStyleRecords)(style);
@@ -423,6 +456,39 @@ function compileCSS(options) {
             for (const arg of args) {
                 checkFunctionKey(arg.expression);
                 const expr = arg.expression;
+                if (utils_1.t.isIdentifier(expr) ||
+                    (utils_1.t.isMemberExpression(expr) &&
+                        utils_1.t.isIdentifier(expr.object) &&
+                        componentParamNames.has(expr.object.value) &&
+                        utils_1.t.isIdentifier(expr.property))) {
+                    const varName = utils_1.t.isIdentifier(expr)
+                        ? expr.value
+                        : expr.property.value;
+                    let propPossibilities;
+                    for (const key of Object.keys(ctx.scannedTables.componentPropsTable || {})) {
+                        if (key.startsWith(`${resourcePath}-`)) {
+                            if (ctx.scannedTables.componentPropsTable?.[key]?.[varName]) {
+                                propPossibilities =
+                                    ctx.scannedTables.componentPropsTable?.[key]?.[varName];
+                                break;
+                            }
+                        }
+                    }
+                    if (propPossibilities && propPossibilities.length > 0) {
+                        const uniqueEntries = [];
+                        propPossibilities.forEach((entry) => {
+                            if (!uniqueEntries.some((x) => x.index === entry.index)) {
+                                uniqueEntries.push(entry);
+                            }
+                        });
+                        uniqueEntries.forEach((entry) => {
+                            if (entry.styleObj && Object.keys(entry.styleObj).length > 0) {
+                                processStyle(entry.styleObj);
+                            }
+                        });
+                        continue;
+                    }
+                }
                 if (utils_1.t.isCallExpression(expr)) {
                     if (utils_1.t.isIdentifier(expr.callee)) {
                         const varName = expr.callee.value;
@@ -766,8 +832,19 @@ function compileCSS(options) {
                     processCall(path.node);
             },
             JSXAttribute({ node }) {
-                if (node.name.value !== 'styleName')
+                if (node.name.type !== 'Identifier')
                     return;
+                const attrName = node.name.value;
+                if (attrName !== 'styleName') {
+                    if (node.value &&
+                        node.value.type === 'JSXExpressionContainer' &&
+                        node.value.expression.type !== 'JSXEmptyExpression') {
+                        const expr = node.value.expression;
+                        const styles = extractStylesFromExpression(expr, ctx);
+                        styles.forEach(processStyle);
+                    }
+                    return;
+                }
                 if (!node.value || node.value.type !== 'JSXExpressionContainer')
                     return;
                 if (node.value.expression.type === 'JSXEmptyExpression')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "15.1.3",
+  "version": "16.1.0",
   "description": "Plumeria swc based compiler for statically extracting css",
   "author": "Refirst 11",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@plumeria/utils": "^15.1.3"
+    "@plumeria/utils": "^16.1.0"
   },
   "devDependencies": {
     "@rust-gear/glob": "1.0.0",