@plumeria/utils 19.2.10 → 19.2.12

package/dist/dynamicKey.js

@@ -232,7 +232,7 @@ exports.applyVarFallback = applyVarFallback;
 const resolveDynamicStyle = (func, runtimeParams, staticTable, tables, providedParams) => {
     if (func.unsupportedParams)
         throw new Error('[plumeria] Dynamic styles require named parameters or object destructuring; array and rest parameters are not supported.');
-    const tempStaticTable = { ...staticTable };
+    const tempStaticTable = Object.create(staticTable);
     const resolveBody = () => (0, parser_1.objectExpressionToObject)(func.body, tempStaticTable, tables.keyframesHashTable, tables.viewTransitionHashTable, tables.createThemeHashTable, tables.createThemeObjectTable, tables.createHashTable, tables.createStaticHashTable, tables.createStaticObjectTable);
     const withDefault = Object.entries(func.defaults ?? {}).filter(([param]) => providedParams
         ? !providedParams.has(param)

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

package/dist/parser.d.ts

@@ -49,6 +49,8 @@ export declare function resolveFileError(actualPath: string, importedName: strin
     filePath: string;
     message: string;
 } | undefined;
+export declare function fileTableKeys(filePath: string, tableName: string): ReadonlySet<string> | undefined;
+export declare function scanOverlay(scanCwd?: string): Tables;
 export declare function scanAll(scanCwd?: string): Tables;
 export declare function getFileDependencies(filePath: string): string[];
 export declare function resolveExport(filePath: string, exportName: string, visited?: Set<string>): {

package/dist/parser.js

@@ -42,6 +42,8 @@ exports.objectExpressionToObject = objectExpressionToObject;
 exports.collectLocalConsts = collectLocalConsts;
 exports.resolveThemeSelector = resolveThemeSelector;
 exports.resolveFileError = resolveFileError;
+exports.fileTableKeys = fileTableKeys;
+exports.scanOverlay = scanOverlay;
 exports.scanAll = scanAll;
 exports.getFileDependencies = getFileDependencies;
 exports.resolveExport = resolveExport;
@@ -271,10 +273,9 @@ function objectExpressionToObject(node, staticTable, keyframesHashTable, viewTra
                 const root = (0, exports.getRootIdentifier)(val);
                 const resolved = root ? resolveVariable(root) : undefined;
                 if (resolved !== undefined && root) {
-                    const member = resolveStaticTableMemberExpression(val, {
-                        ...staticTable,
+                    const member = resolveStaticTableMemberExpression(val, Object.assign(Object.create(staticTable), {
                         [root]: resolved,
-                    });
+                    }));
                     if (member === undefined)
                         throw new Error(`[plumeria] Unknown style member on ${root}.`);
                     obj[key] = member;
@@ -1040,12 +1041,46 @@ let scannedCwd;
 const objectTableOwners = new Map();
 const fileObjectContributions = new Map();
 const fileKeyContributions = new Map();
-function snapshotTables() {
-    return Object.fromEntries(Object.entries(globalAgregatedTables).map(([key, value]) => [
+const detachedTables = new Set([
+    'staticTable',
+    'keyframesHashTable',
+    'viewTransitionHashTable',
+    'createHashTable',
+    'createObjectTable',
+    'createFunctionTable',
+    'createThemeHashTable',
+    'componentPropsTable',
+]);
+const detachedOverlayTables = new Set([
+    'createThemeHashTable',
+    'componentPropsTable',
+]);
+let overlayScan = false;
+let tablesGeneration = 0;
+let overlayBaseGeneration = -1;
+let overlayBase;
+function layerTables(source, detached) {
+    return Object.fromEntries(Object.entries(source).map(([key, value]) => [
         key,
-        key === 'styleReceiverTable' ? value : { ...value },
+        key === 'styleReceiverTable'
+            ? value
+            : detached.has(key)
+                ? { ...value }
+                : Object.create(value),
     ]));
 }
+function snapshotTables() {
+    if (!overlayScan)
+        return layerTables(globalAgregatedTables, detachedTables);
+    if (overlayBaseGeneration !== tablesGeneration) {
+        overlayBase = Object.fromEntries(Object.entries(globalAgregatedTables).map(([key, value]) => [
+            key,
+            key === 'styleReceiverTable' ? value : { ...value },
+        ]));
+        overlayBaseGeneration = tablesGeneration;
+    }
+    return layerTables(overlayBase, detachedOverlayTables);
+}
 function releaseFileObjects(filePath) {
     const contributions = fileObjectContributions.get(filePath);
     if (!contributions)
@@ -1056,6 +1091,9 @@ function releaseFileObjects(filePath) {
     }
     fileObjectContributions.delete(filePath);
 }
+function fileTableKeys(filePath, tableName) {
+    return fileKeyContributions.get(filePath)?.get(tableName);
+}
 function registerFileKey(tableName, key, filePath) {
     let contributions = fileKeyContributions.get(filePath);
     if (!contributions)
@@ -1161,6 +1199,15 @@ function statFile(filePath) {
         throw e;
     }
 }
+function scanOverlay(scanCwd = process.cwd()) {
+    overlayScan = true;
+    try {
+        return scanAll(scanCwd);
+    }
+    finally {
+        overlayScan = false;
+    }
+}
 function scanAll(scanCwd = process.cwd()) {
     scanning = true;
     statMemo.clear();
@@ -1287,6 +1334,7 @@ function runScan(scanCwd = process.cwd()) {
     if (invalidated.size === 0 && hasComputedOnce) {
         return snapshotTables();
     }
+    tablesGeneration++;
     for (const fp of deletedFiles) {
         const cached = fileCache[fp];
         if (cached)

package/dist/transform.js

@@ -201,7 +201,7 @@ const transformSource = async (env) => {
             }
         }
     };
-    const scannedTables = (0, parser_1.scanAll)();
+    const scannedTables = (0, parser_1.scanOverlay)();
     const ownFailure = (0, parser_1.resolveFileError)(baseId, '');
     if (ownFailure)
         throwCompilationError(`Plumeria: ${ownFailure.message}`);
@@ -392,70 +392,51 @@ const transformSource = async (env) => {
             }
         },
     });
-    const mergedStaticTable = {};
-    for (const key of Object.keys(scannedTables.staticTable)) {
-        mergedStaticTable[key] = scannedTables.staticTable[key];
-    }
+    const mergedStaticTable = Object.create(scannedTables.staticTable);
     for (const key of Object.keys(localConsts)) {
         mergedStaticTable[key] = localConsts[key];
     }
     for (const key of Object.keys(importMap)) {
         mergedStaticTable[key] = importMap[key];
     }
-    const mergedKeyframesTable = {};
-    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];
-        }
+    const mergedKeyframesTable = Object.create(scannedTables.keyframesHashTable);
+    for (const key of (0, parser_1.fileTableKeys)(resourcePath, 'keyframesHashTable') ?? []) {
+        mergedKeyframesTable[key.slice(resourcePath.length + 1)] =
+            scannedTables.keyframesHashTable[key];
     }
     for (const key of Object.keys(keyframesImportMap)) {
         mergedKeyframesTable[key] = keyframesImportMap[key];
     }
-    const mergedViewTransitionTable = {};
-    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] =
-                scannedTables.viewTransitionHashTable[key];
-        }
+    const mergedViewTransitionTable = Object.create(scannedTables.viewTransitionHashTable);
+    for (const key of (0, parser_1.fileTableKeys)(resourcePath, 'viewTransitionHashTable') ??
+        []) {
+        mergedViewTransitionTable[key.slice(resourcePath.length + 1)] =
+            scannedTables.viewTransitionHashTable[key];
     }
     for (const key of Object.keys(viewTransitionImportMap)) {
         mergedViewTransitionTable[key] = viewTransitionImportMap[key];
     }
-    const mergedCreateTable = {};
-    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];
-        }
+    const mergedCreateTable = Object.create(scannedTables.createHashTable);
+    for (const key of (0, parser_1.fileTableKeys)(resourcePath, 'createHashTable') ?? []) {
+        mergedCreateTable[key.slice(resourcePath.length + 1)] =
+            scannedTables.createHashTable[key];
     }
     for (const key of Object.keys(createImportMap)) {
         mergedCreateTable[key] = createImportMap[key];
     }
-    const mergedCreateThemeHashTable = {};
-    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] =
-                scannedTables.createThemeHashTable[key];
-        }
+    const mergedCreateThemeHashTable = Object.create(scannedTables.createThemeHashTable);
+    for (const key of (0, parser_1.fileTableKeys)(resourcePath, 'createThemeHashTable') ?? []) {
+        mergedCreateThemeHashTable[key.slice(resourcePath.length + 1)] =
+            scannedTables.createThemeHashTable[key];
     }
     for (const key of Object.keys(createThemeImportMap)) {
         mergedCreateThemeHashTable[key] = createThemeImportMap[key];
     }
-    const mergedCreateStaticHashTable = {};
-    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] =
-                scannedTables.createStaticHashTable[key];
-        }
+    const mergedCreateStaticHashTable = Object.create(scannedTables.createStaticHashTable);
+    for (const key of (0, parser_1.fileTableKeys)(resourcePath, 'createStaticHashTable') ??
+        []) {
+        mergedCreateStaticHashTable[key.slice(resourcePath.length + 1)] =
+            scannedTables.createStaticHashTable[key];
     }
     for (const key of Object.keys(createStaticImportMap)) {
         mergedCreateStaticHashTable[key] = createStaticImportMap[key];
@@ -856,7 +837,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 +1838,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 +2023,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 +2057,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 +2123,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 +2306,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 +2324,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.12",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",