@plumeria/utils 19.2.11 → 19.2.13

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}`);
@@ -317,85 +317,83 @@ const transformSource = async (env) => {
     const createStaticImportMap = {};
     const plumeriaAliases = {};
     const localImports = {};
-    (0, parser_1.traverse)(ast, {
-        ImportDeclaration({ node }) {
-            const sourcePath = node.source.value;
-            if (sourcePath === '@plumeria/core') {
-                node.specifiers.forEach((specifier) => {
-                    if (specifier.type === 'ImportNamespaceSpecifier') {
-                        plumeriaAliases[specifier.local.value] = 'NAMESPACE';
-                    }
-                    else if (specifier.type === 'ImportDefaultSpecifier') {
-                        plumeriaAliases[specifier.local.value] = 'NAMESPACE';
-                    }
-                    else if (specifier.type === 'ImportSpecifier') {
-                        const importedName = specifier.imported
+    for (const statement of ast.body) {
+        if (statement.type !== 'ImportDeclaration')
+            continue;
+        const node = statement;
+        const sourcePath = node.source.value;
+        if (sourcePath === '@plumeria/core') {
+            node.specifiers.forEach((specifier) => {
+                if (specifier.type === 'ImportNamespaceSpecifier') {
+                    plumeriaAliases[specifier.local.value] = 'NAMESPACE';
+                }
+                else if (specifier.type === 'ImportDefaultSpecifier') {
+                    plumeriaAliases[specifier.local.value] = 'NAMESPACE';
+                }
+                else if (specifier.type === 'ImportSpecifier') {
+                    const importedName = specifier.imported
+                        ? specifier.imported.value
+                        : specifier.local.value;
+                    plumeriaAliases[specifier.local.value] = importedName;
+                }
+            });
+        }
+        const actualPath = (0, resolver_1.resolveImportPath)(sourcePath, resourcePath);
+        if (actualPath) {
+            node.specifiers.forEach((specifier) => {
+                if (specifier.type === 'ImportNamespaceSpecifier') {
+                    localImports[specifier.local.value] = {
+                        actualPath,
+                        importedName: '*',
+                    };
+                    return;
+                }
+                if (specifier.type === 'ImportSpecifier' ||
+                    specifier.type === 'ImportDefaultSpecifier') {
+                    const importedName = specifier.type === 'ImportDefaultSpecifier'
+                        ? 'default'
+                        : specifier.imported
                             ? specifier.imported.value
                             : specifier.local.value;
-                        plumeriaAliases[specifier.local.value] = importedName;
+                    const localName = specifier.local.value;
+                    let resolvedKey = `${actualPath}-${importedName}`;
+                    const resolved = (0, parser_1.resolveExport)(actualPath, importedName);
+                    if (resolved) {
+                        resolvedKey = `${resolved.filePath}-${resolved.localName}`;
                     }
-                });
-            }
-            const actualPath = (0, resolver_1.resolveImportPath)(sourcePath, resourcePath);
-            if (actualPath) {
-                node.specifiers.forEach((specifier) => {
-                    if (specifier.type === 'ImportNamespaceSpecifier') {
-                        localImports[specifier.local.value] = {
-                            actualPath,
-                            importedName: '*',
-                        };
-                        return;
+                    const uniqueKey = resolvedKey;
+                    localImports[localName] = { actualPath, importedName };
+                    if (scannedTables.staticTable[uniqueKey]) {
+                        importMap[localName] = scannedTables.staticTable[uniqueKey];
                     }
-                    if (specifier.type === 'ImportSpecifier' ||
-                        specifier.type === 'ImportDefaultSpecifier') {
-                        const importedName = specifier.type === 'ImportDefaultSpecifier'
-                            ? 'default'
-                            : specifier.imported
-                                ? specifier.imported.value
-                                : specifier.local.value;
-                        const localName = specifier.local.value;
-                        let resolvedKey = `${actualPath}-${importedName}`;
-                        const resolved = (0, parser_1.resolveExport)(actualPath, importedName);
-                        if (resolved) {
-                            resolvedKey = `${resolved.filePath}-${resolved.localName}`;
-                        }
-                        const uniqueKey = resolvedKey;
-                        localImports[localName] = { actualPath, importedName };
-                        if (scannedTables.staticTable[uniqueKey]) {
-                            importMap[localName] = scannedTables.staticTable[uniqueKey];
-                        }
-                        if (scannedTables.keyframesHashTable[uniqueKey]) {
-                            keyframesImportMap[localName] =
-                                scannedTables.keyframesHashTable[uniqueKey];
-                        }
-                        if (scannedTables.viewTransitionHashTable[uniqueKey]) {
-                            viewTransitionImportMap[localName] =
-                                scannedTables.viewTransitionHashTable[uniqueKey];
-                        }
-                        if (scannedTables.createHashTable[uniqueKey]) {
-                            createImportMap[localName] =
-                                scannedTables.createHashTable[uniqueKey];
-                        }
-                        if (scannedTables.createFunctionTable[uniqueKey]) {
-                            createFunctionImportMap[localName] = (0, dynamicKey_1.styleFunctionsOf)(scannedTables.createFunctionTable[uniqueKey]);
-                        }
-                        if (scannedTables.createThemeHashTable[uniqueKey]) {
-                            createThemeImportMap[localName] =
-                                scannedTables.createThemeHashTable[uniqueKey];
-                        }
-                        if (scannedTables.createStaticHashTable[uniqueKey]) {
-                            createStaticImportMap[localName] =
-                                scannedTables.createStaticHashTable[uniqueKey];
-                        }
+                    if (scannedTables.keyframesHashTable[uniqueKey]) {
+                        keyframesImportMap[localName] =
+                            scannedTables.keyframesHashTable[uniqueKey];
                     }
-                });
-            }
-        },
-    });
-    const mergedStaticTable = {};
-    for (const key of Object.keys(scannedTables.staticTable)) {
-        mergedStaticTable[key] = scannedTables.staticTable[key];
+                    if (scannedTables.viewTransitionHashTable[uniqueKey]) {
+                        viewTransitionImportMap[localName] =
+                            scannedTables.viewTransitionHashTable[uniqueKey];
+                    }
+                    if (scannedTables.createHashTable[uniqueKey]) {
+                        createImportMap[localName] =
+                            scannedTables.createHashTable[uniqueKey];
+                    }
+                    if (scannedTables.createFunctionTable[uniqueKey]) {
+                        createFunctionImportMap[localName] = (0, dynamicKey_1.styleFunctionsOf)(scannedTables.createFunctionTable[uniqueKey]);
+                    }
+                    if (scannedTables.createThemeHashTable[uniqueKey]) {
+                        createThemeImportMap[localName] =
+                            scannedTables.createThemeHashTable[uniqueKey];
+                    }
+                    if (scannedTables.createStaticHashTable[uniqueKey]) {
+                        createStaticImportMap[localName] =
+                            scannedTables.createStaticHashTable[uniqueKey];
+                    }
+                }
+            });
+        }
     }
+    const mergedStaticTable = Object.create(scannedTables.staticTable);
     for (const key of Object.keys(localConsts)) {
         mergedStaticTable[key] = localConsts[key];
     }
@@ -403,54 +401,43 @@ const transformSource = async (env) => {
         mergedStaticTable[key] = importMap[key];
     }
     const mergedKeyframesTable = Object.create(scannedTables.keyframesHashTable);
-    for (const key of Object.keys(scannedTables.keyframesHashTable)) {
-        if (key.startsWith(`${resourcePath}-`)) {
-            const varName = key.slice(resourcePath.length + 1);
-            mergedKeyframesTable[varName] = scannedTables.keyframesHashTable[key];
-        }
+    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 = Object.create(scannedTables.viewTransitionHashTable);
-    for (const key of Object.keys(scannedTables.viewTransitionHashTable)) {
-        if (key.startsWith(`${resourcePath}-`)) {
-            const varName = key.slice(resourcePath.length + 1);
-            mergedViewTransitionTable[varName] =
-                scannedTables.viewTransitionHashTable[key];
-        }
+    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 = Object.create(scannedTables.createHashTable);
-    for (const key of Object.keys(scannedTables.createHashTable)) {
-        if (key.startsWith(`${resourcePath}-`)) {
-            const varName = key.slice(resourcePath.length + 1);
-            mergedCreateTable[varName] = scannedTables.createHashTable[key];
-        }
+    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 = Object.create(scannedTables.createThemeHashTable);
-    for (const key of Object.keys(scannedTables.createThemeHashTable)) {
-        if (key.startsWith(`${resourcePath}-`)) {
-            const varName = key.slice(resourcePath.length + 1);
-            mergedCreateThemeHashTable[varName] =
-                scannedTables.createThemeHashTable[key];
-        }
+    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 = Object.create(scannedTables.createStaticHashTable);
-    for (const key of Object.keys(scannedTables.createStaticHashTable)) {
-        if (key.startsWith(`${resourcePath}-`)) {
-            const varName = key.slice(resourcePath.length + 1);
-            mergedCreateStaticHashTable[varName] =
-                scannedTables.createStaticHashTable[key];
-        }
+    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];
@@ -2335,17 +2322,16 @@ const transformSource = async (env) => {
         for (const replacement of replacements)
             replacement.content = replacement.content.replaceAll(deferred.token, content);
     }
-    const buffer = Buffer.from(source);
     let offset = 0;
     const parts = [];
     replacements.forEach((r) => {
         if (r.start < offset)
             return;
-        parts.push(buffer.subarray(offset, r.start));
+        parts.push(sourceBuffer.subarray(offset, r.start));
         parts.push(Buffer.from(r.content));
         offset = r.end;
     });
-    parts.push(buffer.subarray(offset));
+    parts.push(sourceBuffer.subarray(offset));
     const transformedSource = Buffer.concat(parts).toString();
     return { code: transformedSource, sheets: [...extractedSheets] };
 };

package/package.json

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