@plumeria/utils 19.1.5 → 19.1.7

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export type { CSSObject, StaticTable, KeyframesHashTable, ViewTransitionHashTable, CreateHashTable, CreateFunctionTable, CreateThemeHashTable, CreateStaticHashTable, } from './types';
-export { objectExpressionToObject, collectLocalConsts, traverse, t, getRootIdentifier, unwrapExpression, extractOndemandStyles, deepMerge, scanAll, resolveFileError, getFileDependencies, resolveExport, resolveComponentKey, resolveThemeSelector, } from './parser';
+export { objectExpressionToObject, collectLocalConsts, traverse, t, getRootIdentifier, resolveOriginError, unwrapExpression, extractOndemandStyles, deepMerge, scanAll, resolveFileError, getFileDependencies, resolveExport, resolveComponentKey, resolveThemeSelector, } from './parser';
 export type { StyleRecord } from './create';
 export { getStyleRecords } from './create';
 export type { NamedParam, StyleFunction, StyleFunctions, DynamicStyleTables, DynamicStyleResult, } from './dynamicKey';

package/dist/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformSource = exports.assertPropertyPolicy = exports.resolvePropertyPolicy = exports.DEFAULT_STYLE_PROP = exports.timedAsync = exports.timed = exports.tally = exports.measure = exports.mark = exports.profiling = exports.collectReferenceIdentifiers = exports.getLeadingCommentLength = exports.optimizer = exports.resolveImportPath = exports.themeHashOf = exports.getStateWeights = exports.getPseudoElement = exports.getSpecificity = exports.resolveDynamicStyle = exports.applyVarFallback = exports.splitVarByUnit = exports.isUnitlessProp = exports.styleFunctionsOf = exports.getStyleRecords = exports.resolveThemeSelector = exports.resolveComponentKey = exports.resolveExport = exports.getFileDependencies = exports.resolveFileError = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = exports.unwrapExpression = exports.getRootIdentifier = exports.t = exports.traverse = exports.collectLocalConsts = exports.objectExpressionToObject = void 0;
+exports.transformSource = exports.assertPropertyPolicy = exports.resolvePropertyPolicy = exports.DEFAULT_STYLE_PROP = exports.timedAsync = exports.timed = exports.tally = exports.measure = exports.mark = exports.profiling = exports.collectReferenceIdentifiers = exports.getLeadingCommentLength = exports.optimizer = exports.resolveImportPath = exports.themeHashOf = exports.getStateWeights = exports.getPseudoElement = exports.getSpecificity = exports.resolveDynamicStyle = exports.applyVarFallback = exports.splitVarByUnit = exports.isUnitlessProp = exports.styleFunctionsOf = exports.getStyleRecords = exports.resolveThemeSelector = exports.resolveComponentKey = exports.resolveExport = exports.getFileDependencies = exports.resolveFileError = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = exports.unwrapExpression = exports.resolveOriginError = 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; } });
 Object.defineProperty(exports, "traverse", { enumerable: true, get: function () { return parser_1.traverse; } });
 Object.defineProperty(exports, "t", { enumerable: true, get: function () { return parser_1.t; } });
 Object.defineProperty(exports, "getRootIdentifier", { enumerable: true, get: function () { return parser_1.getRootIdentifier; } });
+Object.defineProperty(exports, "resolveOriginError", { enumerable: true, get: function () { return parser_1.resolveOriginError; } });
 Object.defineProperty(exports, "unwrapExpression", { enumerable: true, get: function () { return parser_1.unwrapExpression; } });
 Object.defineProperty(exports, "extractOndemandStyles", { enumerable: true, get: function () { return parser_1.extractOndemandStyles; } });
 Object.defineProperty(exports, "deepMerge", { enumerable: true, get: function () { return parser_1.deepMerge; } });

package/dist/parser.d.ts

@@ -2,6 +2,13 @@ import type { CSSObject, Tables, StaticTable, KeyframesHashTable, ViewTransition
 import type { Module, Expression, CallExpression, Identifier, KeyValueProperty, StringLiteral, NumericLiteral, BooleanLiteral, ObjectExpression, MemberExpression, TemplateLiteral, BinaryExpression, UnaryExpression, ParenthesisExpression, VariableDeclaration, VariableDeclarator, ExportDeclaration, ConditionalExpression, JSXExpression, ArrowFunctionExpression, FunctionExpression } from '@swc/core';
 export declare function unwrapExpression(node: any): any;
 export declare const getRootIdentifier: (node: Expression) => string | null;
+export declare function resolveOriginError(node: Expression, rootName: string | null, localImports: Record<string, {
+    actualPath: string;
+    importedName: string;
+}>): {
+    filePath: string;
+    message: string;
+} | undefined;
 export declare function resolveComponentKey(nameNode: any, filePath: string, localImports: Record<string, {
     actualPath: string;
     importedName: string;

package/dist/parser.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.t = exports.getRootIdentifier = void 0;
 exports.unwrapExpression = unwrapExpression;
+exports.resolveOriginError = resolveOriginError;
 exports.resolveComponentKey = resolveComponentKey;
 exports.traverse = traverse;
 exports.objectExpressionToObject = objectExpressionToObject;
@@ -98,6 +99,32 @@ const getRootIdentifier = (node) => {
     return null;
 };
 exports.getRootIdentifier = getRootIdentifier;
+const getNamespaceMember = (node, rootName) => {
+    node = unwrapExpression(node);
+    if (exports.t.isCallExpression(node)) {
+        const callee = node.callee;
+        if (callee.type === 'Super' || callee.type === 'Import')
+            return null;
+        return getNamespaceMember(callee, rootName);
+    }
+    if (exports.t.isMemberExpression(node)) {
+        const object = unwrapExpression(node.object);
+        if (exports.t.isIdentifier(object) && object.value === rootName) {
+            return exports.t.isIdentifier(node.property) ? node.property.value : null;
+        }
+        return getNamespaceMember(object, rootName);
+    }
+    return null;
+};
+function resolveOriginError(node, rootName, localImports) {
+    const origin = rootName ? localImports[rootName] : undefined;
+    if (!origin)
+        return undefined;
+    const exportName = origin.importedName === '*' && rootName
+        ? (getNamespaceMember(node, rootName) ?? '*')
+        : origin.importedName;
+    return resolveFileError(origin.actualPath, exportName);
+}
 function resolveComponentKey(nameNode, filePath, localImports) {
     if (nameNode?.type === 'Identifier') {
         const name = nameNode.value;

package/dist/transform.js

@@ -193,10 +193,7 @@ const transformSource = async (env) => {
                     localCreateStyles[rootId].type !== 'constant') ||
                     mergedCreateTable[rootId] !== undefined);
             if (!isPlumeriaStyle) {
-                const origin = rootId ? localImports[rootId] : undefined;
-                const failure = origin
-                    ? (0, parser_1.resolveFileError)(origin.actualPath, origin.importedName)
-                    : undefined;
+                const failure = (0, parser_1.resolveOriginError)(node, rootId, localImports);
                 if (failure) {
                     throwCompilationError(`Plumeria: ${failure.message} (${path.basename(failure.filePath)})`);
                 }
@@ -1702,11 +1699,13 @@ const transformSource = async (env) => {
             Object.keys(conflictVarGroups).forEach((id) => {
                 const groupId = Number(id);
                 const opts = conflictVarGroups[groupId];
-                if (opts.some((c) => c.valueName === ''))
-                    return;
-                const off = conditionals.find((c) => c.groupId === groupId && c.valueName === '');
-                if (off)
-                    opts.push({ ...off, truthy: {}, falsy: {} });
+                const present = new Set(opts.map((c) => c.valueName));
+                conditionals.forEach((c) => {
+                    if (c.groupId !== groupId || present.has(c.valueName))
+                        return;
+                    present.add(c.valueName);
+                    opts.push({ ...c, truthy: {}, falsy: {} });
+                });
             });
             Object.entries(conflictVarGroups).forEach(([, opts]) => {
                 ordered.push({
@@ -1725,45 +1724,98 @@ const transformSource = async (env) => {
             });
             ordered.sort((a, b) => a.order - b.order);
             const dimensions = ordered.map((o) => o.dimension);
-            const joined = dimensions.filter((dim) => dim.type !== 'const').length > 1;
-            dimensions.forEach((dim) => {
-                if (!joined || dim.type !== 'var' || !dim.ownKeys)
-                    return;
-                const numbers = {};
-                dim.options.forEach((opt, index) => {
-                    numbers[String(opt.value)] = String(index);
-                    opt.value = String(index);
+            const keysOf = (dim) => {
+                const keys = new Set();
+                dim.options.forEach((opt) => Object.keys(opt.style).forEach((key) => {
+                    if (conflictingKeys.has(key))
+                        keys.add(key);
+                }));
+                return keys;
+            };
+            const dimensionKeys = dimensions.map(keysOf);
+            const parent = dimensions.map((_, index) => index);
+            const find = (index) => parent[index] === index ? index : (parent[index] = find(parent[index]));
+            const ownerByKey = new Map();
+            dimensionKeys.forEach((keys, index) => {
+                keys.forEach((key) => {
+                    const owner = ownerByKey.get(key);
+                    if (owner === undefined) {
+                        ownerByKey.set(key, index);
+                        return;
+                    }
+                    const a = find(owner);
+                    const b = find(index);
+                    if (a !== b)
+                        parent[b] = a;
                 });
-                dim.testExpr = `(${JSON.stringify(numbers)}[${dim.testExpr}] || "")`;
             });
-            const results = {};
-            const recurse = (dimIndex, currentStyle, keyParts) => {
-                if (dimIndex >= dimensions.length) {
-                    const className = processStyleRecords(currentStyle, stateWeights)
-                        .map((r) => r.hash)
-                        .join(' ');
-                    if (className)
-                        results[keyParts.join('__')] = className;
+            const components = new Map();
+            dimensions.forEach((_, index) => {
+                const root = find(index);
+                const group = components.get(root);
+                if (group)
+                    group.push(index);
+                else
+                    components.set(root, [index]);
+            });
+            const emitComponent = (indexes) => {
+                const dims = indexes.map((index) => dimensions[index]);
+                const variables = dims.filter((dim) => dim.type !== 'const');
+                const joined = variables.length > 1;
+                dims.forEach((dim) => {
+                    if (!joined || dim.type !== 'var' || !dim.ownKeys)
+                        return;
+                    const numbers = {};
+                    dim.options.forEach((opt, index) => {
+                        numbers[String(opt.value)] = String(index);
+                        opt.value = String(index);
+                    });
+                    dim.testExpr = `(${JSON.stringify(numbers)}[${dim.testExpr}] || "")`;
+                });
+                const results = {};
+                const recurse = (dimIndex, currentStyle, keyParts) => {
+                    if (dimIndex >= dims.length) {
+                        const className = processStyleRecords(currentStyle, stateWeights)
+                            .map((r) => r.hash)
+                            .join(' ');
+                        if (className)
+                            results[keyParts.join('__')] = className;
+                        return;
+                    }
+                    const dimension = dims[dimIndex];
+                    dimension.options.forEach((opt) => recurse(dimIndex + 1, (0, parser_1.deepMerge)(currentStyle, opt.style), dimension.type === 'const'
+                        ? keyParts
+                        : [...keyParts, String(opt.value)]));
+                };
+                recurse(0, {}, []);
+                if (variables.length === 0) {
+                    const only = results[''];
+                    if (only)
+                        classParts.push(JSON.stringify(only));
                     return;
                 }
-                const dimension = dimensions[dimIndex];
-                dimension.options.forEach((opt) => recurse(dimIndex + 1, (0, parser_1.deepMerge)(currentStyle, opt.style), dimension.type === 'const'
-                    ? keyParts
-                    : [...keyParts, String(opt.value)]));
+                const componentKeys = new Set();
+                indexes.forEach((index) => dimensionKeys[index].forEach((key) => componentKeys.add(key)));
+                const componentBase = {};
+                Object.entries(baseConflict).forEach(([key, value]) => {
+                    if (componentKeys.has(key))
+                        componentBase[key] = value;
+                });
+                const baseConflictClass = Object.keys(componentBase).length > 0
+                    ? processStyleRecords(componentBase, stateWeights)
+                        .map((r) => r.hash)
+                        .join(' ')
+                    : '';
+                const masterKeyExpr = variables
+                    .map((dim) => dim.type === 'std'
+                    ? `(${dim.testExpr} ? "1" : "0")`
+                    : dim.testExpr || '""')
+                    .join(' + "__" + ');
+                classParts.push(`(${JSON.stringify(results)}[${masterKeyExpr}] || ${baseConflictClass ? JSON.stringify(baseConflictClass) : '""'})`);
             };
-            recurse(0, {}, []);
-            const baseConflictClass = Object.keys(baseConflict).length > 0
-                ? processStyleRecords(baseConflict, stateWeights)
-                    .map((r) => r.hash)
-                    .join(' ')
-                : '';
-            const masterKeyExpr = dimensions
-                .filter((dim) => dim.type !== 'const')
-                .map((dim) => dim.type === 'std'
-                ? `(${dim.testExpr} ? "1" : "0")`
-                : dim.testExpr || '""')
-                .join(' + "__" + ');
-            classParts.push(`(${JSON.stringify(results)}[${masterKeyExpr || '""'}] || ${baseConflictClass ? JSON.stringify(baseConflictClass) : '""'})`);
+            [...components.values()]
+                .sort((a, b) => a[0] - b[0])
+                .forEach(emitComponent);
         }
         classParts.push(...dynamicClassParts);
         return {
@@ -1958,21 +2010,24 @@ const transformSource = async (env) => {
             if (node.name.type !== 'Identifier')
                 return;
             const attrName = node.name.value;
-            if (attrName !== styleProp) {
-                let compKey = null;
-                for (const [, val] of jsxOpeningElementMap) {
-                    const found = val.attributes
-                        .filter((a) => a.type === 'JSXAttribute')
-                        .find((a) => a.span.start === node.span.start);
-                    if (found) {
-                        compKey = val.compKey;
-                        break;
-                    }
+            let compKey = null;
+            for (const [, val] of jsxOpeningElementMap) {
+                const found = val.attributes
+                    .filter((a) => a.type === 'JSXAttribute')
+                    .find((a) => a.span.start === node.span.start);
+                if (found) {
+                    compKey = val.compKey;
+                    break;
                 }
+            }
+            const relayed = compKey
+                ? scannedTables.componentPropsTable?.[compKey]?.[attrName]
+                : undefined;
+            if (attrName !== styleProp || relayed) {
                 if (compKey) {
                     if (node.value?.type === 'JSXExpressionContainer')
                         assertNoStyleArraySpread(node.value.expression);
-                    const list = scannedTables.componentPropsTable?.[compKey]?.[attrName];
+                    const list = relayed;
                     if (list &&
                         node.value &&
                         node.value.type === 'JSXExpressionContainer') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "19.1.5",
+  "version": "19.1.7",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",