@plumeria/utils 19.2.9 → 19.2.11

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, resolveOriginError, unwrapExpression, extractOndemandStyles, deepMerge, scanAll, resolveFileError, getFileDependencies, resolveExport, resolveComponentKey, resolveThemeSelector, } from './parser';
+export { objectExpressionToObject, collectLocalConsts, traverse, t, getRootIdentifier, resolveOriginError, unwrapExpression, extractOndemandStyles, appendSheet, 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,6 +1,6 @@
 "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.resolveOriginError = 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.appendSheet = 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; } });
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "getRootIdentifier", { enumerable: true, get: fun
 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, "appendSheet", { enumerable: true, get: function () { return parser_1.appendSheet; } });
 Object.defineProperty(exports, "deepMerge", { enumerable: true, get: function () { return parser_1.deepMerge; } });
 Object.defineProperty(exports, "scanAll", { enumerable: true, get: function () { return parser_1.scanAll; } });
 Object.defineProperty(exports, "resolveFileError", { enumerable: true, get: function () { return parser_1.resolveFileError; } });

package/dist/parser.d.ts

@@ -1,4 +1,4 @@
-import type { CSSObject, Tables, StaticTable, KeyframesHashTable, ViewTransitionHashTable, CreateHashTable, CreateThemeHashTable, CreateThemeObjectTable, CreateStaticHashTable, CreateStaticObjectTable } from './types';
+import type { CSSObject, Tables, StaticTable, KeyframesHashTable, ViewTransitionHashTable, CreateHashTable, CreateThemeHashTable, CreateThemeObjectTable, CreateStaticHashTable, CreateStaticObjectTable, SheetSink } from './types';
 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;
@@ -55,5 +55,6 @@ export declare function resolveExport(filePath: string, exportName: string, visi
     filePath: string;
     localName: string;
 } | null;
-export declare function extractOndemandStyles(obj: any, extractedSheets: string[], t: Tables): void;
+export declare const appendSheet: (sheets: string[]) => SheetSink;
+export declare function extractOndemandStyles(obj: any, addSheet: SheetSink, t: Tables): void;
 export declare function deepMerge(target: Record<string, any>, source: Record<string, any>): Record<string, any>;

package/dist/parser.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.t = exports.getRootIdentifier = void 0;
+exports.appendSheet = exports.t = exports.getRootIdentifier = void 0;
 exports.unwrapExpression = unwrapExpression;
 exports.resolveOriginError = resolveOriginError;
 exports.resolveComponentKey = resolveComponentKey;
@@ -2421,7 +2421,17 @@ function resolveExport(filePath, exportName, visited = new Set()) {
 }
 const REFERENCE_MARKER = /(kf|vt|cr)-([0-9a-z]+)/g;
 const CUSTOM_PROPERTY = /var\(\s*(--[^\s,)]+)/g;
-function extractOndemandStyles(obj, extractedSheets, t) {
+const appendSheet = (sheets) => {
+    const existingSheets = new Set(sheets);
+    return (sheet) => {
+        if (existingSheets.has(sheet))
+            return;
+        existingSheets.add(sheet);
+        sheets.push(sheet);
+    };
+};
+exports.appendSheet = appendSheet;
+function extractOndemandStyles(obj, addSheet, t) {
     if (!obj || typeof obj !== 'object')
         return;
     const visited = new Set();
@@ -2468,13 +2478,6 @@ function extractOndemandStyles(obj, extractedSheets, t) {
         });
     }
     walk(obj);
-    const existingSheets = new Set(extractedSheets);
-    const addSheet = (sheet) => {
-        if (!existingSheets.has(sheet)) {
-            existingSheets.add(sheet);
-            extractedSheets.push(sheet);
-        }
-    };
     if (keyframesHashes.size > 0) {
         for (const hash of keyframesHashes) {
             const definition = t.keyframesObjectTable[hash];

package/dist/transform.js

@@ -293,16 +293,14 @@ const transformSource = async (env) => {
             appliedStyleProps.add(`${owner}:${name}`);
         }
     };
-    const extractedSheets = [];
+    const extractedSheets = new Set();
     const addSheet = (sheet) => {
-        if (!extractedSheets.includes(sheet)) {
-            extractedSheets.push(sheet);
-        }
+        extractedSheets.add(sheet);
     };
     const processStyleRecords = (style, weights) => {
         const records = (0, create_1.getStyleRecords)(style, weights);
         if (collectOndemandSheets) {
-            (0, parser_1.extractOndemandStyles)(style, extractedSheets, scannedTables);
+            (0, parser_1.extractOndemandStyles)(style, addSheet, scannedTables);
             records.forEach((r) => {
                 addSheet(r.sheet);
             });
@@ -404,9 +402,8 @@ const transformSource = async (env) => {
     for (const key of Object.keys(importMap)) {
         mergedStaticTable[key] = importMap[key];
     }
-    const mergedKeyframesTable = {};
+    const mergedKeyframesTable = Object.create(scannedTables.keyframesHashTable);
     for (const key of Object.keys(scannedTables.keyframesHashTable)) {
-        mergedKeyframesTable[key] = scannedTables.keyframesHashTable[key];
         if (key.startsWith(`${resourcePath}-`)) {
             const varName = key.slice(resourcePath.length + 1);
             mergedKeyframesTable[varName] = scannedTables.keyframesHashTable[key];
@@ -415,9 +412,8 @@ const transformSource = async (env) => {
     for (const key of Object.keys(keyframesImportMap)) {
         mergedKeyframesTable[key] = keyframesImportMap[key];
     }
-    const mergedViewTransitionTable = {};
+    const mergedViewTransitionTable = Object.create(scannedTables.viewTransitionHashTable);
     for (const key of Object.keys(scannedTables.viewTransitionHashTable)) {
-        mergedViewTransitionTable[key] = scannedTables.viewTransitionHashTable[key];
         if (key.startsWith(`${resourcePath}-`)) {
             const varName = key.slice(resourcePath.length + 1);
             mergedViewTransitionTable[varName] =
@@ -427,9 +423,8 @@ const transformSource = async (env) => {
     for (const key of Object.keys(viewTransitionImportMap)) {
         mergedViewTransitionTable[key] = viewTransitionImportMap[key];
     }
-    const mergedCreateTable = {};
+    const mergedCreateTable = Object.create(scannedTables.createHashTable);
     for (const key of Object.keys(scannedTables.createHashTable)) {
-        mergedCreateTable[key] = scannedTables.createHashTable[key];
         if (key.startsWith(`${resourcePath}-`)) {
             const varName = key.slice(resourcePath.length + 1);
             mergedCreateTable[varName] = scannedTables.createHashTable[key];
@@ -438,9 +433,8 @@ const transformSource = async (env) => {
     for (const key of Object.keys(createImportMap)) {
         mergedCreateTable[key] = createImportMap[key];
     }
-    const mergedCreateThemeHashTable = {};
+    const mergedCreateThemeHashTable = Object.create(scannedTables.createThemeHashTable);
     for (const key of Object.keys(scannedTables.createThemeHashTable)) {
-        mergedCreateThemeHashTable[key] = scannedTables.createThemeHashTable[key];
         if (key.startsWith(`${resourcePath}-`)) {
             const varName = key.slice(resourcePath.length + 1);
             mergedCreateThemeHashTable[varName] =
@@ -450,9 +444,8 @@ const transformSource = async (env) => {
     for (const key of Object.keys(createThemeImportMap)) {
         mergedCreateThemeHashTable[key] = createThemeImportMap[key];
     }
-    const mergedCreateStaticHashTable = {};
+    const mergedCreateStaticHashTable = Object.create(scannedTables.createStaticHashTable);
     for (const key of Object.keys(scannedTables.createStaticHashTable)) {
-        mergedCreateStaticHashTable[key] = scannedTables.createStaticHashTable[key];
         if (key.startsWith(`${resourcePath}-`)) {
             const varName = key.slice(resourcePath.length + 1);
             mergedCreateStaticHashTable[varName] =
@@ -858,7 +851,25 @@ const transformSource = async (env) => {
             }
         },
     });
-    const jsxOpeningElementMap = new Map();
+    const jsxAttributeOwnerMap = new Map();
+    const propEntryIndexes = new Map();
+    const localPropEntries = (list, spanStart) => {
+        let index = propEntryIndexes.get(list);
+        if (!index) {
+            index = new Map();
+            for (const entry of list) {
+                if (entry.filePath !== resourcePath)
+                    continue;
+                const bucket = index.get(entry.spanStart);
+                if (bucket)
+                    bucket.push(entry);
+                else
+                    index.set(entry.spanStart, [entry]);
+            }
+            propEntryIndexes.set(list, index);
+        }
+        return index.get(spanStart);
+    };
     const componentParamNames = new Set();
     const addFirstParamName = (fn) => {
         const first = fn.params[0];
@@ -1841,10 +1852,13 @@ const transformSource = async (env) => {
     };
     (0, parser_1.traverse)(ast, {
         JSXOpeningElement({ node }) {
-            jsxOpeningElementMap.set(node.span.start, {
+            const owner = {
                 compKey: (0, parser_1.resolveComponentKey)(node.name, resourcePath, localImports),
                 attributes: node.attributes,
-            });
+            };
+            for (const attribute of node.attributes)
+                if (attribute.type === 'JSXAttribute')
+                    jsxAttributeOwnerMap.set(attribute.span.start, owner);
         },
         MemberExpression({ node }) {
             if (!isVisibleReference(node))
@@ -2023,16 +2037,7 @@ const transformSource = async (env) => {
             if (node.name.type !== 'Identifier')
                 return;
             const attrName = node.name.value;
-            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 compKey = jsxAttributeOwnerMap.get(node.span.start)?.compKey ?? null;
             const receivesStyleProp = Boolean(compKey &&
                 scannedTables.styleReceiverTable?.[compKey]?.includes(attrName));
             let relayed = false;
@@ -2066,9 +2071,8 @@ const transformSource = async (env) => {
                             return `{ ${foldDynamicVars(vars).join(', ')} }`;
                         };
                         const replaceWithKey = (subNode) => {
-                            const entries = list.filter((entry) => entry.spanStart === subNode.span.start &&
-                                entry.filePath === resourcePath);
-                            if (!entries.length)
+                            const entries = localPropEntries(list, subNode.span.start);
+                            if (!entries)
                                 return false;
                             let content = '""';
                             for (const entry of [...entries].reverse()) {
@@ -2133,16 +2137,7 @@ const transformSource = async (env) => {
                 : [{ expression: expr }];
             const dynamicClassParts = [];
             const existingStyleParts = [];
-            let attributes = [];
-            for (const [, val] of jsxOpeningElementMap) {
-                const found = val.attributes
-                    .filter((a) => a.type === 'JSXAttribute')
-                    .find((a) => a.span.start === node.span.start);
-                if (found) {
-                    attributes = val.attributes;
-                    break;
-                }
-            }
+            const attributes = jsxAttributeOwnerMap.get(node.span.start)?.attributes ?? [];
             const classNameAttr = attributes.find((attr) => attr.type === 'JSXAttribute' &&
                 attr.name.type === 'Identifier' &&
                 attr.name.value === 'className');
@@ -2325,10 +2320,11 @@ const transformSource = async (env) => {
                 `so it cannot be passed through another prop or read as a value.`, call);
         }
     });
+    replacements.sort((a, b) => a.start - b.start || b.end - a.end);
     for (const deferred of deferredSources) {
         let cursor = deferred.start;
         const pieces = [];
-        for (const replacement of [...replacements].sort((a, b) => a.start - b.start || b.end - a.end)) {
+        for (const replacement of replacements) {
             if (replacement.start < cursor || replacement.end > deferred.end)
                 continue;
             pieces.push(sourceBuffer.subarray(cursor, replacement.start).toString('utf-8'), replacement.content);
@@ -2342,9 +2338,7 @@ const transformSource = async (env) => {
     const buffer = Buffer.from(source);
     let offset = 0;
     const parts = [];
-    replacements
-        .sort((a, b) => a.start - b.start || b.end - a.end)
-        .forEach((r) => {
+    replacements.forEach((r) => {
         if (r.start < offset)
             return;
         parts.push(buffer.subarray(offset, r.start));
@@ -2353,6 +2347,6 @@ const transformSource = async (env) => {
     });
     parts.push(buffer.subarray(offset));
     const transformedSource = Buffer.concat(parts).toString();
-    return { code: transformedSource, sheets: extractedSheets };
+    return { code: transformedSource, sheets: [...extractedSheets] };
 };
 exports.transformSource = transformSource;

package/dist/types.d.ts

@@ -62,4 +62,5 @@ export type ViewTransition = {
     new?: CSSProperties;
     old?: CSSProperties;
 };
+export type SheetSink = (sheet: string) => void;
 export {};

package/package.json

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