@plumeria/utils 19.2.10 → 19.2.11

package/dist/transform.js

@@ -402,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];
@@ -413,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] =
@@ -425,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];
@@ -436,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] =
@@ -448,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] =
@@ -856,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];
@@ -1839,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))
@@ -2021,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;
@@ -2064,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()) {
@@ -2131,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');
@@ -2323,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);
@@ -2340,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));

package/package.json

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