@plumeria/unplugin 18.4.2 → 18.5.1

package/dist/core.js

@@ -87,6 +87,26 @@ const destructuredPropAliases = (fn) => {
     }
     return aliases;
 };
+const spreadStyleMessage = (source) => `Plumeria: Spread elements in a style array are not supported: "...${source}". ` +
+    `List each style explicitly.`;
+const resolveLocalStyleAlias = (aliases, expression) => {
+    let current = expression;
+    const seen = new Set();
+    while (utils_1.t.isIdentifier(current)) {
+        const name = current.value;
+        if (seen.has(name))
+            break;
+        seen.add(name);
+        const candidates = aliases[name];
+        if (!candidates || candidates.length === 0)
+            break;
+        const candidate = candidates.find((candidate) => candidate.context === current.ctxt);
+        if (!candidate)
+            break;
+        current = candidate.expression;
+    }
+    return current;
+};
 const isStaticArgValue = (node) => node.type === 'StringLiteral' ||
     node.type === 'NumericLiteral' ||
     node.type === 'BooleanLiteral' ||
@@ -273,11 +293,32 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
             }
             const components = [];
             const propAliases = new Map();
+            const propDefaults = new Map();
+            const declaredProps = new Map();
             const addComponent = (name, fn) => {
                 components.push({ name, node: fn });
+                const first = fn.params[0];
+                const pattern = unwrapPatternDefault(first?.pat ?? first);
+                const defaults = new Map();
+                for (const item of pattern?.properties ?? []) {
+                    if (item.type === 'AssignmentPatternProperty' && item.value)
+                        defaults.set(item.key.value, item.value);
+                    if (item.type === 'KeyValuePatternProperty' &&
+                        item.value?.type === 'AssignmentPattern')
+                        defaults.set(item.key.value, item.value.right);
+                }
+                propDefaults.set(name, defaults);
                 const aliases = destructuredPropAliases(fn);
                 if (aliases.size > 0)
                     propAliases.set(name, aliases);
+                const declared = new Set();
+                for (const item of pattern?.properties ?? []) {
+                    const key = item.key;
+                    if (utils_1.t.isIdentifier(key) || utils_1.t.isStringLiteral(key))
+                        declared.add(String(key.value));
+                }
+                if (declared.size > 0)
+                    declaredProps.set(name, declared);
             };
             for (const node of ast.body) {
                 const statement = unwrapExport(node);
@@ -510,12 +551,15 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
             const checkStyleAliasAssignment = (decl) => {
                 if (!utils_1.t.isIdentifier(decl.id) || !decl.init)
                     return;
-                const init = decl.init;
+                const init = (0, utils_1.unwrapExpression)(decl.init);
                 if (utils_1.t.isMemberExpression(init) && utils_1.t.isIdentifier(init.object)) {
                     const objName = init.object.value;
                     if (localCreateStyles[objName] !== undefined ||
                         mergedCreateTable[objName] !== undefined) {
-                        localStyleAliases[decl.id.value] = init;
+                        (localStyleAliases[decl.id.value] ??= []).push({
+                            expression: init,
+                            context: decl.id.ctxt,
+                        });
                     }
                 }
             };
@@ -525,9 +569,43 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
             const idSpans = new Set();
             const excludedSpans = new Set();
             const referenceIdents = (0, utils_1.collectReferenceIdentifiers)(ast);
+            const topLevelDeclarators = new Set();
+            for (const statement of ast.body) {
+                const declaration = unwrapExport(statement);
+                if (utils_1.t.isVariableDeclaration(declaration)) {
+                    declaration.declarations.forEach((decl) => topLevelDeclarators.add(decl));
+                }
+            }
+            const unwrapStyleExpression = (node) => {
+                while (node &&
+                    [
+                        'ParenthesisExpression',
+                        'TsAsExpression',
+                        'TsSatisfiesExpression',
+                        'TsNonNullExpression',
+                        'TsConstAssertion',
+                        'TsTypeAssertion',
+                    ].includes(node.type))
+                    node = node.expression;
+                return node;
+            };
+            const literalObjectArgument = (node, seen = new Set()) => {
+                node = unwrapStyleExpression(node);
+                if (utils_1.t.isObjectExpression(node))
+                    return node;
+                if (!utils_1.t.isIdentifier(node) || seen.has(node.value))
+                    return null;
+                seen.add(node.value);
+                const declaration = [...topLevelDeclarators].find((decl) => utils_1.t.isIdentifier(decl.id) &&
+                    decl.id.value === node.value);
+                return declaration?.init
+                    ? literalObjectArgument(declaration.init, seen)
+                    : null;
+            };
+            const registeredStyleCalls = new Set();
             const registerStyle = (node, declSpan, isExported) => {
                 let propName;
-                const init = node.init;
+                const init = unwrapStyleExpression(node.init);
                 if (utils_1.t.isIdentifier(node.id) &&
                     init &&
                     utils_1.t.isCallExpression(init) &&
@@ -552,6 +630,19 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                     }
                 }
                 if (propName && init && utils_1.t.isCallExpression(init)) {
+                    if (['create', 'createTheme', 'createStatic'].includes(propName) &&
+                        !topLevelDeclarators.has(node)) {
+                        throwCompilationError(`Plumeria: css.${propName} must be assigned to a top-level variable so its styles can be resolved across files. Move this declaration outside the function or block.`, node);
+                    }
+                    if (['create', 'createTheme', 'createStatic'].includes(propName)) {
+                        const argumentIndex = propName === 'createTheme' ? 1 : 0;
+                        const argument = init.arguments[argumentIndex];
+                        const object = argument && literalObjectArgument(argument.expression);
+                        if (!object)
+                            throwCompilationError(`Plumeria: css.${propName} needs a style object it can read at build time. Pass an object literal or a top-level constant containing one.`, init);
+                        argument.expression = object;
+                        registeredStyleCalls.add(init.span.start);
+                    }
                     if (propName === 'create' &&
                         utils_1.t.isObjectExpression(init.arguments[0].expression)) {
                         const obj = (0, utils_1.objectExpressionToObject)(init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
@@ -749,6 +840,10 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                         }
                     }
                     if (propName) {
+                        if (['create', 'createTheme', 'createStatic'].includes(propName) &&
+                            !registeredStyleCalls.has(node.span.start)) {
+                            throwCompilationError(`Plumeria: css.${propName} must be assigned to a named top-level variable. Destructuring, assignment statements, and default-exported calls cannot be compiled.`, node);
+                        }
                         const args = node.arguments;
                         if (propName === 'keyframes' && args.length > 0) {
                             const expr = args[0].expression;
@@ -814,12 +909,17 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
             const jsxOpeningElementMap = new Map();
             const componentParamNames = new Set();
             const addFirstParamName = (fn) => {
-                const p = fn.params[0];
+                const first = fn.params[0];
+                const p = unwrapPatternDefault(first?.pat ?? first);
                 if (utils_1.t.isIdentifier(p)) {
                     componentParamNames.add(p.value);
                 }
-                else if (p?.pat && utils_1.t.isIdentifier(p.pat)) {
-                    componentParamNames.add(p.pat.value);
+                else if (p?.type === 'ObjectPattern') {
+                    for (const item of p.properties) {
+                        if (item.type === 'RestElement' && utils_1.t.isIdentifier(item.argument)) {
+                            componentParamNames.add(item.argument.value);
+                        }
+                    }
                 }
             };
             for (const node of ast.body) {
@@ -856,6 +956,22 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                 return sourceBuffer.subarray(start, end).toString('utf-8');
             };
             const resolveStyleObject = (expr) => {
+                expr = (0, utils_1.unwrapExpression)(expr);
+                expr = resolveLocalStyleAlias(localStyleAliases, expr);
+                if (expr.type === 'ArrayExpression') {
+                    let merged = {};
+                    for (const element of expr.elements ?? []) {
+                        if (!element)
+                            continue;
+                        if (element.spread)
+                            throwCompilationError(spreadStyleMessage(getSource(element.expression)), element.expression);
+                        const style = resolveStyleObject(element.expression);
+                        if (!style)
+                            return null;
+                        merged = (0, utils_1.deepMerge)(merged, style);
+                    }
+                    return merged;
+                }
                 if (utils_1.t.isObjectExpression(expr)) {
                     return (0, utils_1.objectExpressionToObject)(expr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
                 }
@@ -915,6 +1031,26 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                 return Boolean(localCreateStyles[callee.object.value]?.functions?.[callee.property.value] ??
                     createFunctionImportMap[callee.object.value]?.[callee.property.value]);
             };
+            const carriesStyleReference = (expression) => {
+                const node = (0, utils_1.unwrapExpression)(expression);
+                if (node.type === 'ArrayExpression')
+                    return node.elements.some((element) => !!element && carriesStyleReference(element.expression));
+                if (isStyleFunctionCall(node))
+                    return true;
+                if (utils_1.t.isObjectExpression(node))
+                    return false;
+                return resolveStyleObject(node) !== null;
+            };
+            const assertNoStyleArraySpread = (expression) => {
+                const node = (0, utils_1.unwrapExpression)(expression);
+                if (node.type !== 'ArrayExpression')
+                    return;
+                const spread = node.elements.find((element) => element?.spread);
+                if (!spread)
+                    return;
+                if (carriesStyleReference(node))
+                    throwCompilationError(spreadStyleMessage(getSource(spread.expression)), spread.expression);
+            };
             const resolveDynamicCall = (expr, forceRuntime = false) => {
                 if (!utils_1.t.isCallExpression(expr) || !utils_1.t.isMemberExpression(expr.callee))
                     return null;
@@ -930,8 +1066,14 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                 if (callArgs.some((a) => a.spread))
                     return null;
                 const tempStaticTable = { ...mergedStaticTable };
+                const providedParams = new Set();
                 const runtime = [];
-                const resolveObjectArg = (argExpr) => (0, utils_1.objectExpressionToObject)(argExpr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
+                const resolveObjectArg = (argExpr) => (0, utils_1.objectExpressionToObject)({
+                    ...argExpr,
+                    properties: argExpr.properties.filter((prop) => prop.type === 'Identifier' ||
+                        (prop.type === 'KeyValueProperty' &&
+                            isStaticArgValue(prop.value))),
+                }, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
                 if (func.named) {
                     const argExpr = callArgs[0]?.expression;
                     if (callArgs.length > 1 ||
@@ -961,8 +1103,10 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                         }
                         if (!forceRuntime &&
                             isStaticArgValue(source) &&
-                            argObj[key] !== undefined)
+                            argObj[key] !== undefined) {
                             tempStaticTable[local] = argObj[key];
+                            providedParams.add(local);
+                        }
                         else
                             runtime.push({ param: local, source });
                     });
@@ -973,8 +1117,10 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                         return null;
                     const argObj = resolveObjectArg(callArgs[0].expression) ?? {};
                     func.params.forEach((p) => {
-                        if (argObj[p] !== undefined)
+                        if (argObj[p] !== undefined) {
                             tempStaticTable[p] = argObj[p];
+                            providedParams.add(p);
+                        }
                     });
                 }
                 else {
@@ -985,7 +1131,7 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                         runtime.push({ param: p, source: callArg.expression });
                     });
                 }
-                const resolved = (0, utils_1.resolveDynamicStyle)(func, runtime.map(({ param }) => param), tempStaticTable, dynamicStyleTables);
+                const resolved = (0, utils_1.resolveDynamicStyle)(func, runtime.map(({ param }) => param), tempStaticTable, dynamicStyleTables, providedParams);
                 if (!resolved)
                     return null;
                 const { style, varGroups } = resolved;
@@ -1023,10 +1169,7 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
             };
             const buildClassParts = (args, dynamicClassParts = [], existingClass = '', isStyleProp = false) => {
                 args.forEach((arg) => {
-                    const expr = arg.expression;
-                    if (utils_1.t.isIdentifier(expr) && localStyleAliases[expr.value]) {
-                        arg.expression = localStyleAliases[expr.value];
-                    }
+                    arg.expression = resolveLocalStyleAlias(localStyleAliases, arg.expression);
                 });
                 const conditionals = [];
                 const dynamicVars = [];
@@ -1150,6 +1293,8 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                     return buildDecision(node, prefix, off, { n: 0 }, scoped);
                 };
                 const collectConditions = (node, currentTestStrings = [], argOrder) => {
+                    node = (0, utils_1.unwrapExpression)(node);
+                    node = resolveLocalStyleAlias(localStyleAliases, node);
                     if (isNoOpStyle(node))
                         return true;
                     let branchStyle = resolveStyleObject(node);
@@ -1228,6 +1373,12 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                         utils_1.t.isIdentifier(expr.property);
                     if (!utils_1.t.isIdentifier(expr) && !isParamMember)
                         return false;
+                    const paramObject = isParamMember
+                        ? expr.object.value
+                        : undefined;
+                    const isPropsMember = Boolean(paramObject &&
+                        localCreateStyles[paramObject] === undefined &&
+                        mergedCreateTable[paramObject] === undefined);
                     const varName = utils_1.t.isIdentifier(expr)
                         ? expr.value
                         : expr.property.value;
@@ -1252,8 +1403,43 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                         if (candidates.length > 0)
                             possibilities = candidates;
                     }
-                    if (!possibilities || possibilities.length === 0)
-                        return false;
+                    const fallback = owner && propDefaults.get(owner)?.get(propName);
+                    if (fallback) {
+                        const style = resolveStyleObject(fallback);
+                        if (style) {
+                            const atoms = {};
+                            (0, utils_1.getStyleRecords)(style).forEach((record) => {
+                                atoms[record.key] = record.hash;
+                            });
+                            const key = (0, zss_engine_1.genBase36Hash)(Object.values(atoms).join(' '), 1, 8);
+                            possibilities = [
+                                ...(possibilities ?? []),
+                                { key, styleObj: style },
+                            ];
+                            const span = fallback.span;
+                            {
+                                for (let i = replacements.length - 1; i >= 0; i--) {
+                                    const replacement = replacements[i];
+                                    if (replacement.start >= span.start - baseByteOffset &&
+                                        replacement.end <= span.end - baseByteOffset)
+                                        replacements.splice(i, 1);
+                                }
+                                excludeSubtreeSpans(fallback);
+                                replacements.push({
+                                    start: span.start - baseByteOffset,
+                                    end: span.end - baseByteOffset,
+                                    content: JSON.stringify(key),
+                                });
+                            }
+                        }
+                        else {
+                            assertResolvable(fallback);
+                        }
+                    }
+                    if (!possibilities || possibilities.length === 0) {
+                        return Boolean(isPropsMember ||
+                            (owner && declaredProps.get(owner)?.has(propName)));
+                    }
                     const carriesVars = possibilities.some((entry) => entry.hasVars);
                     if (carriesVars && !isStyleProp) {
                         throwCompilationError(`Plumeria: "${varName}" carries a dynamic function key, and css.use() returns only a class name. ` +
@@ -1969,50 +2155,61 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                             }
                         }
                         if (compKey) {
+                            if (node.value?.type === 'JSXExpressionContainer')
+                                assertNoStyleArraySpread(node.value.expression);
                             const list = scannedTables.componentPropsTable?.[compKey]?.[attrName];
                             if (list &&
                                 node.value &&
                                 node.value.type === 'JSXExpressionContainer') {
                                 const expr = node.value.expression;
-                                const carrierFor = (subNode) => {
+                                const carrierFor = (subNode, calls) => {
                                     const vars = [];
                                     let unresolved = false;
-                                    (0, utils_1.traverse)(subNode, {
-                                        CallExpression({ node: call }) {
-                                            if (!isStyleFunctionCall(call))
-                                                return;
-                                            const resolved = resolveDynamicCall(call, true);
-                                            if (!resolved) {
-                                                unresolved = true;
-                                                return;
-                                            }
-                                            vars.push(...resolved.vars);
-                                        },
-                                    });
+                                    for (const expression of calls ?? [subNode])
+                                        (0, utils_1.traverse)(expression, {
+                                            CallExpression({ node: call }) {
+                                                if (!isStyleFunctionCall(call))
+                                                    return;
+                                                const resolved = resolveDynamicCall(call, true);
+                                                if (!resolved) {
+                                                    unresolved = true;
+                                                    return;
+                                                }
+                                                vars.push(...resolved.vars);
+                                            },
+                                        });
                                     if (unresolved)
                                         return null;
                                     return `{ ${foldDynamicVars(vars).join(', ')} }`;
                                 };
                                 const replaceWithKey = (subNode) => {
-                                    const entry = list.find((x) => x.spanStart === subNode.span.start &&
-                                        x.filePath === resourcePath);
-                                    if (entry) {
-                                        let content = JSON.stringify(entry.key);
+                                    const entries = list.filter((entry) => entry.spanStart === subNode.span.start &&
+                                        entry.filePath === resourcePath);
+                                    if (!entries.length)
+                                        return false;
+                                    let content = '""';
+                                    for (const entry of [...entries].reverse()) {
+                                        let value = JSON.stringify(entry.key);
                                         if (entry.hasVars) {
-                                            const carrier = carrierFor(subNode);
+                                            const carrier = carrierFor(subNode, entry.dynamicCalls);
                                             if (!carrier)
                                                 return false;
-                                            content = `{ key: ${content}, vars: ${carrier} }`;
+                                            value = `{ key: ${value}, vars: ${carrier} }`;
                                         }
-                                        replacements.push({
-                                            start: subNode.span.start - baseByteOffset,
-                                            end: subNode.span.end - baseByteOffset,
-                                            content,
-                                        });
+                                        const condition = entry.conditions
+                                            ?.map(({ test, truthy }) => `${truthy ? '' : '!'}(${getSource(test)})`)
+                                            .join(' && ');
+                                        content = condition
+                                            ? `((${condition}) ? ${value} : ${content})`
+                                            : value;
                                         processStyleRecords(entry.styleObj);
-                                        return true;
                                     }
-                                    return false;
+                                    replacements.push({
+                                        start: subNode.span.start - baseByteOffset,
+                                        end: subNode.span.end - baseByteOffset,
+                                        content,
+                                    });
+                                    return true;
                                 };
                                 (0, utils_1.traverse)(expr, {
                                     MemberExpression({ node: subNode }) {
@@ -2041,7 +2238,11 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                     const args = expr.type === 'ArrayExpression'
                         ? expr.elements
                             .filter((el) => el !== undefined)
-                            .map((el) => ({ expression: el.expression }))
+                            .map((el) => {
+                            if (el.spread)
+                                throwCompilationError(spreadStyleMessage(getSource(el.expression)), el.expression);
+                            return { expression: el.expression };
+                        })
                         : [{ expression: expr }];
                     const dynamicClassParts = [];
                     const existingStyleParts = [];

package/dist/core.mjs

@@ -2,7 +2,7 @@ import { createFilter } from '@rollup/pluginutils';
 import { parseSync } from '@swc/core';
 import * as path from 'path';
 import { applyCssValue, genBase36Hash, camelToKebabCase, isAtRule, } from 'zss-engine';
-import { traverse, resolvePropertyPolicy, assertPropertyPolicy, collectReferenceIdentifiers, getStyleRecords, getStateWeights, collectLocalConsts, objectExpressionToObject, t, getRootIdentifier, extractOndemandStyles, deepMerge, scanAll, resolveFileError, resolveImportPath, getLeadingCommentLength, optimizer, styleFunctionsOf, isUnitlessProp, resolveDynamicStyle, themeHashOf, getFileDependencies, resolveExport, resolveComponentKey, resolveThemeSelector, DEFAULT_STYLE_PROP, } from '@plumeria/utils';
+import { traverse, resolvePropertyPolicy, assertPropertyPolicy, collectReferenceIdentifiers, getStyleRecords, getStateWeights, collectLocalConsts, objectExpressionToObject, t, getRootIdentifier, unwrapExpression, extractOndemandStyles, deepMerge, scanAll, resolveFileError, resolveImportPath, getLeadingCommentLength, optimizer, styleFunctionsOf, isUnitlessProp, resolveDynamicStyle, themeHashOf, getFileDependencies, resolveExport, resolveComponentKey, resolveThemeSelector, DEFAULT_STYLE_PROP, } from '@plumeria/utils';
 export const TARGET_EXTENSIONS = ['ts', 'tsx', 'js', 'jsx'];
 export const EXTENSION_PATTERN = /\.(ts|tsx|js|jsx)$/;
 const unwrapExport = (node) => {
@@ -51,6 +51,26 @@ const destructuredPropAliases = (fn) => {
     }
     return aliases;
 };
+const spreadStyleMessage = (source) => `Plumeria: Spread elements in a style array are not supported: "...${source}". ` +
+    `List each style explicitly.`;
+const resolveLocalStyleAlias = (aliases, expression) => {
+    let current = expression;
+    const seen = new Set();
+    while (t.isIdentifier(current)) {
+        const name = current.value;
+        if (seen.has(name))
+            break;
+        seen.add(name);
+        const candidates = aliases[name];
+        if (!candidates || candidates.length === 0)
+            break;
+        const candidate = candidates.find((candidate) => candidate.context === current.ctxt);
+        if (!candidate)
+            break;
+        current = candidate.expression;
+    }
+    return current;
+};
 const isStaticArgValue = (node) => node.type === 'StringLiteral' ||
     node.type === 'NumericLiteral' ||
     node.type === 'BooleanLiteral' ||
@@ -237,11 +257,32 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
             }
             const components = [];
             const propAliases = new Map();
+            const propDefaults = new Map();
+            const declaredProps = new Map();
             const addComponent = (name, fn) => {
                 components.push({ name, node: fn });
+                const first = fn.params[0];
+                const pattern = unwrapPatternDefault(first?.pat ?? first);
+                const defaults = new Map();
+                for (const item of pattern?.properties ?? []) {
+                    if (item.type === 'AssignmentPatternProperty' && item.value)
+                        defaults.set(item.key.value, item.value);
+                    if (item.type === 'KeyValuePatternProperty' &&
+                        item.value?.type === 'AssignmentPattern')
+                        defaults.set(item.key.value, item.value.right);
+                }
+                propDefaults.set(name, defaults);
                 const aliases = destructuredPropAliases(fn);
                 if (aliases.size > 0)
                     propAliases.set(name, aliases);
+                const declared = new Set();
+                for (const item of pattern?.properties ?? []) {
+                    const key = item.key;
+                    if (t.isIdentifier(key) || t.isStringLiteral(key))
+                        declared.add(String(key.value));
+                }
+                if (declared.size > 0)
+                    declaredProps.set(name, declared);
             };
             for (const node of ast.body) {
                 const statement = unwrapExport(node);
@@ -474,12 +515,15 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
             const checkStyleAliasAssignment = (decl) => {
                 if (!t.isIdentifier(decl.id) || !decl.init)
                     return;
-                const init = decl.init;
+                const init = unwrapExpression(decl.init);
                 if (t.isMemberExpression(init) && t.isIdentifier(init.object)) {
                     const objName = init.object.value;
                     if (localCreateStyles[objName] !== undefined ||
                         mergedCreateTable[objName] !== undefined) {
-                        localStyleAliases[decl.id.value] = init;
+                        (localStyleAliases[decl.id.value] ??= []).push({
+                            expression: init,
+                            context: decl.id.ctxt,
+                        });
                     }
                 }
             };
@@ -489,9 +533,43 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
             const idSpans = new Set();
             const excludedSpans = new Set();
             const referenceIdents = collectReferenceIdentifiers(ast);
+            const topLevelDeclarators = new Set();
+            for (const statement of ast.body) {
+                const declaration = unwrapExport(statement);
+                if (t.isVariableDeclaration(declaration)) {
+                    declaration.declarations.forEach((decl) => topLevelDeclarators.add(decl));
+                }
+            }
+            const unwrapStyleExpression = (node) => {
+                while (node &&
+                    [
+                        'ParenthesisExpression',
+                        'TsAsExpression',
+                        'TsSatisfiesExpression',
+                        'TsNonNullExpression',
+                        'TsConstAssertion',
+                        'TsTypeAssertion',
+                    ].includes(node.type))
+                    node = node.expression;
+                return node;
+            };
+            const literalObjectArgument = (node, seen = new Set()) => {
+                node = unwrapStyleExpression(node);
+                if (t.isObjectExpression(node))
+                    return node;
+                if (!t.isIdentifier(node) || seen.has(node.value))
+                    return null;
+                seen.add(node.value);
+                const declaration = [...topLevelDeclarators].find((decl) => t.isIdentifier(decl.id) &&
+                    decl.id.value === node.value);
+                return declaration?.init
+                    ? literalObjectArgument(declaration.init, seen)
+                    : null;
+            };
+            const registeredStyleCalls = new Set();
             const registerStyle = (node, declSpan, isExported) => {
                 let propName;
-                const init = node.init;
+                const init = unwrapStyleExpression(node.init);
                 if (t.isIdentifier(node.id) &&
                     init &&
                     t.isCallExpression(init) &&
@@ -516,6 +594,19 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                     }
                 }
                 if (propName && init && t.isCallExpression(init)) {
+                    if (['create', 'createTheme', 'createStatic'].includes(propName) &&
+                        !topLevelDeclarators.has(node)) {
+                        throwCompilationError(`Plumeria: css.${propName} must be assigned to a top-level variable so its styles can be resolved across files. Move this declaration outside the function or block.`, node);
+                    }
+                    if (['create', 'createTheme', 'createStatic'].includes(propName)) {
+                        const argumentIndex = propName === 'createTheme' ? 1 : 0;
+                        const argument = init.arguments[argumentIndex];
+                        const object = argument && literalObjectArgument(argument.expression);
+                        if (!object)
+                            throwCompilationError(`Plumeria: css.${propName} needs a style object it can read at build time. Pass an object literal or a top-level constant containing one.`, init);
+                        argument.expression = object;
+                        registeredStyleCalls.add(init.span.start);
+                    }
                     if (propName === 'create' &&
                         t.isObjectExpression(init.arguments[0].expression)) {
                         const obj = objectExpressionToObject(init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
@@ -713,6 +804,10 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                         }
                     }
                     if (propName) {
+                        if (['create', 'createTheme', 'createStatic'].includes(propName) &&
+                            !registeredStyleCalls.has(node.span.start)) {
+                            throwCompilationError(`Plumeria: css.${propName} must be assigned to a named top-level variable. Destructuring, assignment statements, and default-exported calls cannot be compiled.`, node);
+                        }
                         const args = node.arguments;
                         if (propName === 'keyframes' && args.length > 0) {
                             const expr = args[0].expression;
@@ -778,12 +873,17 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
             const jsxOpeningElementMap = new Map();
             const componentParamNames = new Set();
             const addFirstParamName = (fn) => {
-                const p = fn.params[0];
+                const first = fn.params[0];
+                const p = unwrapPatternDefault(first?.pat ?? first);
                 if (t.isIdentifier(p)) {
                     componentParamNames.add(p.value);
                 }
-                else if (p?.pat && t.isIdentifier(p.pat)) {
-                    componentParamNames.add(p.pat.value);
+                else if (p?.type === 'ObjectPattern') {
+                    for (const item of p.properties) {
+                        if (item.type === 'RestElement' && t.isIdentifier(item.argument)) {
+                            componentParamNames.add(item.argument.value);
+                        }
+                    }
                 }
             };
             for (const node of ast.body) {
@@ -820,6 +920,22 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                 return sourceBuffer.subarray(start, end).toString('utf-8');
             };
             const resolveStyleObject = (expr) => {
+                expr = unwrapExpression(expr);
+                expr = resolveLocalStyleAlias(localStyleAliases, expr);
+                if (expr.type === 'ArrayExpression') {
+                    let merged = {};
+                    for (const element of expr.elements ?? []) {
+                        if (!element)
+                            continue;
+                        if (element.spread)
+                            throwCompilationError(spreadStyleMessage(getSource(element.expression)), element.expression);
+                        const style = resolveStyleObject(element.expression);
+                        if (!style)
+                            return null;
+                        merged = deepMerge(merged, style);
+                    }
+                    return merged;
+                }
                 if (t.isObjectExpression(expr)) {
                     return objectExpressionToObject(expr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
                 }
@@ -879,6 +995,26 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                 return Boolean(localCreateStyles[callee.object.value]?.functions?.[callee.property.value] ??
                     createFunctionImportMap[callee.object.value]?.[callee.property.value]);
             };
+            const carriesStyleReference = (expression) => {
+                const node = unwrapExpression(expression);
+                if (node.type === 'ArrayExpression')
+                    return node.elements.some((element) => !!element && carriesStyleReference(element.expression));
+                if (isStyleFunctionCall(node))
+                    return true;
+                if (t.isObjectExpression(node))
+                    return false;
+                return resolveStyleObject(node) !== null;
+            };
+            const assertNoStyleArraySpread = (expression) => {
+                const node = unwrapExpression(expression);
+                if (node.type !== 'ArrayExpression')
+                    return;
+                const spread = node.elements.find((element) => element?.spread);
+                if (!spread)
+                    return;
+                if (carriesStyleReference(node))
+                    throwCompilationError(spreadStyleMessage(getSource(spread.expression)), spread.expression);
+            };
             const resolveDynamicCall = (expr, forceRuntime = false) => {
                 if (!t.isCallExpression(expr) || !t.isMemberExpression(expr.callee))
                     return null;
@@ -894,8 +1030,14 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                 if (callArgs.some((a) => a.spread))
                     return null;
                 const tempStaticTable = { ...mergedStaticTable };
+                const providedParams = new Set();
                 const runtime = [];
-                const resolveObjectArg = (argExpr) => objectExpressionToObject(argExpr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
+                const resolveObjectArg = (argExpr) => objectExpressionToObject({
+                    ...argExpr,
+                    properties: argExpr.properties.filter((prop) => prop.type === 'Identifier' ||
+                        (prop.type === 'KeyValueProperty' &&
+                            isStaticArgValue(prop.value))),
+                }, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
                 if (func.named) {
                     const argExpr = callArgs[0]?.expression;
                     if (callArgs.length > 1 ||
@@ -925,8 +1067,10 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                         }
                         if (!forceRuntime &&
                             isStaticArgValue(source) &&
-                            argObj[key] !== undefined)
+                            argObj[key] !== undefined) {
                             tempStaticTable[local] = argObj[key];
+                            providedParams.add(local);
+                        }
                         else
                             runtime.push({ param: local, source });
                     });
@@ -937,8 +1081,10 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                         return null;
                     const argObj = resolveObjectArg(callArgs[0].expression) ?? {};
                     func.params.forEach((p) => {
-                        if (argObj[p] !== undefined)
+                        if (argObj[p] !== undefined) {
                             tempStaticTable[p] = argObj[p];
+                            providedParams.add(p);
+                        }
                     });
                 }
                 else {
@@ -949,7 +1095,7 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                         runtime.push({ param: p, source: callArg.expression });
                     });
                 }
-                const resolved = resolveDynamicStyle(func, runtime.map(({ param }) => param), tempStaticTable, dynamicStyleTables);
+                const resolved = resolveDynamicStyle(func, runtime.map(({ param }) => param), tempStaticTable, dynamicStyleTables, providedParams);
                 if (!resolved)
                     return null;
                 const { style, varGroups } = resolved;
@@ -987,10 +1133,7 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
             };
             const buildClassParts = (args, dynamicClassParts = [], existingClass = '', isStyleProp = false) => {
                 args.forEach((arg) => {
-                    const expr = arg.expression;
-                    if (t.isIdentifier(expr) && localStyleAliases[expr.value]) {
-                        arg.expression = localStyleAliases[expr.value];
-                    }
+                    arg.expression = resolveLocalStyleAlias(localStyleAliases, arg.expression);
                 });
                 const conditionals = [];
                 const dynamicVars = [];
@@ -1114,6 +1257,8 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                     return buildDecision(node, prefix, off, { n: 0 }, scoped);
                 };
                 const collectConditions = (node, currentTestStrings = [], argOrder) => {
+                    node = unwrapExpression(node);
+                    node = resolveLocalStyleAlias(localStyleAliases, node);
                     if (isNoOpStyle(node))
                         return true;
                     let branchStyle = resolveStyleObject(node);
@@ -1192,6 +1337,12 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                         t.isIdentifier(expr.property);
                     if (!t.isIdentifier(expr) && !isParamMember)
                         return false;
+                    const paramObject = isParamMember
+                        ? expr.object.value
+                        : undefined;
+                    const isPropsMember = Boolean(paramObject &&
+                        localCreateStyles[paramObject] === undefined &&
+                        mergedCreateTable[paramObject] === undefined);
                     const varName = t.isIdentifier(expr)
                         ? expr.value
                         : expr.property.value;
@@ -1216,8 +1367,43 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                         if (candidates.length > 0)
                             possibilities = candidates;
                     }
-                    if (!possibilities || possibilities.length === 0)
-                        return false;
+                    const fallback = owner && propDefaults.get(owner)?.get(propName);
+                    if (fallback) {
+                        const style = resolveStyleObject(fallback);
+                        if (style) {
+                            const atoms = {};
+                            getStyleRecords(style).forEach((record) => {
+                                atoms[record.key] = record.hash;
+                            });
+                            const key = genBase36Hash(Object.values(atoms).join(' '), 1, 8);
+                            possibilities = [
+                                ...(possibilities ?? []),
+                                { key, styleObj: style },
+                            ];
+                            const span = fallback.span;
+                            {
+                                for (let i = replacements.length - 1; i >= 0; i--) {
+                                    const replacement = replacements[i];
+                                    if (replacement.start >= span.start - baseByteOffset &&
+                                        replacement.end <= span.end - baseByteOffset)
+                                        replacements.splice(i, 1);
+                                }
+                                excludeSubtreeSpans(fallback);
+                                replacements.push({
+                                    start: span.start - baseByteOffset,
+                                    end: span.end - baseByteOffset,
+                                    content: JSON.stringify(key),
+                                });
+                            }
+                        }
+                        else {
+                            assertResolvable(fallback);
+                        }
+                    }
+                    if (!possibilities || possibilities.length === 0) {
+                        return Boolean(isPropsMember ||
+                            (owner && declaredProps.get(owner)?.has(propName)));
+                    }
                     const carriesVars = possibilities.some((entry) => entry.hasVars);
                     if (carriesVars && !isStyleProp) {
                         throwCompilationError(`Plumeria: "${varName}" carries a dynamic function key, and css.use() returns only a class name. ` +
@@ -1933,50 +2119,61 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                             }
                         }
                         if (compKey) {
+                            if (node.value?.type === 'JSXExpressionContainer')
+                                assertNoStyleArraySpread(node.value.expression);
                             const list = scannedTables.componentPropsTable?.[compKey]?.[attrName];
                             if (list &&
                                 node.value &&
                                 node.value.type === 'JSXExpressionContainer') {
                                 const expr = node.value.expression;
-                                const carrierFor = (subNode) => {
+                                const carrierFor = (subNode, calls) => {
                                     const vars = [];
                                     let unresolved = false;
-                                    traverse(subNode, {
-                                        CallExpression({ node: call }) {
-                                            if (!isStyleFunctionCall(call))
-                                                return;
-                                            const resolved = resolveDynamicCall(call, true);
-                                            if (!resolved) {
-                                                unresolved = true;
-                                                return;
-                                            }
-                                            vars.push(...resolved.vars);
-                                        },
-                                    });
+                                    for (const expression of calls ?? [subNode])
+                                        traverse(expression, {
+                                            CallExpression({ node: call }) {
+                                                if (!isStyleFunctionCall(call))
+                                                    return;
+                                                const resolved = resolveDynamicCall(call, true);
+                                                if (!resolved) {
+                                                    unresolved = true;
+                                                    return;
+                                                }
+                                                vars.push(...resolved.vars);
+                                            },
+                                        });
                                     if (unresolved)
                                         return null;
                                     return `{ ${foldDynamicVars(vars).join(', ')} }`;
                                 };
                                 const replaceWithKey = (subNode) => {
-                                    const entry = list.find((x) => x.spanStart === subNode.span.start &&
-                                        x.filePath === resourcePath);
-                                    if (entry) {
-                                        let content = JSON.stringify(entry.key);
+                                    const entries = list.filter((entry) => entry.spanStart === subNode.span.start &&
+                                        entry.filePath === resourcePath);
+                                    if (!entries.length)
+                                        return false;
+                                    let content = '""';
+                                    for (const entry of [...entries].reverse()) {
+                                        let value = JSON.stringify(entry.key);
                                         if (entry.hasVars) {
-                                            const carrier = carrierFor(subNode);
+                                            const carrier = carrierFor(subNode, entry.dynamicCalls);
                                             if (!carrier)
                                                 return false;
-                                            content = `{ key: ${content}, vars: ${carrier} }`;
+                                            value = `{ key: ${value}, vars: ${carrier} }`;
                                         }
-                                        replacements.push({
-                                            start: subNode.span.start - baseByteOffset,
-                                            end: subNode.span.end - baseByteOffset,
-                                            content,
-                                        });
+                                        const condition = entry.conditions
+                                            ?.map(({ test, truthy }) => `${truthy ? '' : '!'}(${getSource(test)})`)
+                                            .join(' && ');
+                                        content = condition
+                                            ? `((${condition}) ? ${value} : ${content})`
+                                            : value;
                                         processStyleRecords(entry.styleObj);
-                                        return true;
                                     }
-                                    return false;
+                                    replacements.push({
+                                        start: subNode.span.start - baseByteOffset,
+                                        end: subNode.span.end - baseByteOffset,
+                                        content,
+                                    });
+                                    return true;
                                 };
                                 traverse(expr, {
                                     MemberExpression({ node: subNode }) {
@@ -2005,7 +2202,11 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                     const args = expr.type === 'ArrayExpression'
                         ? expr.elements
                             .filter((el) => el !== undefined)
-                            .map((el) => ({ expression: el.expression }))
+                            .map((el) => {
+                            if (el.spread)
+                                throwCompilationError(spreadStyleMessage(getSource(el.expression)), el.expression);
+                            return { expression: el.expression };
+                        })
                         : [{ expression: expr }];
                     const dynamicClassParts = [];
                     const existingStyleParts = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/unplugin",
-  "version": "18.4.2",
+  "version": "18.5.1",
   "description": "Universal Plumeria plugin for various build tools",
   "author": "Refirst 11",
   "license": "MIT",
@@ -94,7 +94,7 @@
   "dependencies": {
     "@rollup/pluginutils": "^5.4.0",
     "unplugin": "^3.0.0",
-    "@plumeria/utils": "^18.4.2"
+    "@plumeria/utils": "^18.5.1"
   },
   "devDependencies": {
     "@swc/core": "1.15.47",