@plumeria/utils 19.2.5 → 19.2.7

package/dist/parser.js

@@ -1039,6 +1039,7 @@ let resolutionConfigStamp;
 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]) => [
         key,
@@ -1055,6 +1056,15 @@ function releaseFileObjects(filePath) {
     }
     fileObjectContributions.delete(filePath);
 }
+function registerFileKey(tableName, key, filePath) {
+    let contributions = fileKeyContributions.get(filePath);
+    if (!contributions)
+        fileKeyContributions.set(filePath, (contributions = new Map()));
+    let keys = contributions.get(tableName);
+    if (!keys)
+        contributions.set(tableName, (keys = new Set()));
+    keys.add(key);
+}
 function registerObjectOwner(tableName, hash, filePath) {
     let contributions = fileObjectContributions.get(filePath);
     if (!contributions)
@@ -1090,60 +1100,17 @@ function stripFileContributions(filePath, cached) {
             delete globalAgregatedTables.styleReceiverTable[key];
         receiverKeysByFile.delete(filePath);
     }
-    for (const [name, table] of Object.entries(globalAgregatedTables)) {
-        if (name.endsWith('ObjectTable') ||
-            name === 'createAtomicMapTable' ||
-            name === 'createThemeSelectorTable' ||
-            name === 'componentPropsTable' ||
-            name === 'styleReceiverTable')
-            continue;
-        for (const key of Object.keys(table))
-            if (key.startsWith(`${filePath}-`))
+    const keyContributions = fileKeyContributions.get(filePath);
+    if (keyContributions) {
+        for (const [tableName, keys] of keyContributions) {
+            const table = globalAgregatedTables[tableName];
+            for (const key of keys)
                 delete table[key];
-    }
-    const localTables = globalAgregatedTables;
-    for (const key of Object.keys(cached.staticTable)) {
-        delete localTables.staticTable[`${filePath}-${key}`];
-    }
-    for (const key of Object.keys(cached.keyframesHashTable)) {
-        delete localTables.keyframesHashTable[`${filePath}-${key}`];
-    }
-    for (const key of Object.keys(cached.viewTransitionHashTable)) {
-        delete localTables.viewTransitionHashTable[`${filePath}-${key}`];
-    }
-    for (const key of Object.keys(cached.createThemeHashTable)) {
-        delete localTables.createThemeHashTable[`${filePath}-${key}`];
-    }
-    for (const key of Object.keys(cached.createStaticHashTable)) {
-        delete localTables.createStaticHashTable[`${filePath}-${key}`];
-    }
-    for (const key of Object.keys(cached.createHashTable)) {
-        delete localTables.createHashTable[`${filePath}-${key}`];
-        delete localTables.createFunctionTable[`${filePath}-${key}`];
-    }
-    for (const key of Object.keys(cached.createStaticObjectTable)) {
-        releaseObjectOwner('createStaticObjectTable', key, filePath, localTables.createStaticObjectTable);
-    }
-    for (const key of Object.keys(cached.keyframesObjectTable)) {
-        releaseObjectOwner('keyframesObjectTable', key, filePath, localTables.keyframesObjectTable);
-    }
-    for (const key of Object.keys(cached.viewTransitionObjectTable)) {
-        releaseObjectOwner('viewTransitionObjectTable', key, filePath, localTables.viewTransitionObjectTable);
-    }
-    for (const key of Object.keys(cached.createThemeObjectTable)) {
-        releaseObjectOwner('createThemeObjectTable', key, filePath, localTables.createThemeObjectTable);
-    }
-    for (const key of Object.keys(cached.createThemeSelectorTable)) {
-        releaseObjectOwner('createThemeSelectorTable', key, filePath, localTables.createThemeSelectorTable);
-    }
-    for (const key of Object.keys(cached.createObjectTable)) {
-        releaseObjectOwner('createObjectTable', key, filePath, localTables.createObjectTable);
-    }
-    for (const key of Object.keys(cached.createAtomicMapTable)) {
-        releaseObjectOwner('createAtomicMapTable', key, filePath, localTables.createAtomicMapTable);
+        }
+        fileKeyContributions.delete(filePath);
     }
     if (cached.componentPropsTable) {
-        const table = localTables.componentPropsTable;
+        const table = globalAgregatedTables.componentPropsTable;
         for (const compKey of Object.keys(cached.componentPropsTable)) {
             const propTable = table[compKey];
             if (!propTable)
@@ -1252,8 +1219,8 @@ function scanAll(scanCwd = process.cwd()) {
         invalidated.add(fp);
         queue.push(fp);
     }
-    while (queue.length > 0) {
-        const fp = queue.shift();
+    for (let head = 0; head < queue.length; head++) {
+        const fp = queue[head];
         const deps = dependentsMap.get(fp);
         if (deps) {
             for (const dep of deps) {
@@ -1343,10 +1310,9 @@ function scanAll(scanCwd = process.cwd()) {
         ordered.push(file);
     };
     parsedFiles.forEach(visitFile);
-    parsedFiles.splice(0, parsedFiles.length, ...ordered);
     for (let passNumber = 1; passNumber <= 2; passNumber++) {
         const isFirstPass = passNumber === 1;
-        for (const { filePath, ast, mtimeMs } of parsedFiles) {
+        for (const { filePath, ast, mtimeMs } of ordered) {
             try {
                 delete fileErrors[filePath];
                 let localConsts;
@@ -1584,9 +1550,11 @@ function scanAll(scanCwd = process.cwd()) {
                                 if (method === 'createStatic') {
                                     localStaticTable[name] = obj;
                                     localTables.staticTable[uniqueKey] = obj;
+                                    registerFileKey('staticTable', uniqueKey, filePath);
                                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
                                     localCreateStaticHashTable[name] = hash;
                                     localTables.createStaticHashTable[uniqueKey] = hash;
+                                    registerFileKey('createStaticHashTable', uniqueKey, filePath);
                                     localTables.createStaticObjectTable[hash] = obj;
                                     localCreateStaticObjectTable[hash] = obj;
                                     registerObjectOwner('createStaticObjectTable', hash, filePath);
@@ -1595,6 +1563,7 @@ function scanAll(scanCwd = process.cwd()) {
                                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
                                     localKeyframesHashTable[name] = hash;
                                     localTables.keyframesHashTable[uniqueKey] = hash;
+                                    registerFileKey('keyframesHashTable', uniqueKey, filePath);
                                     localTables.keyframesObjectTable[hash] = obj;
                                     localKeyframesObjectTable[hash] = obj;
                                     registerObjectOwner('keyframesObjectTable', hash, filePath);
@@ -1603,6 +1572,7 @@ function scanAll(scanCwd = process.cwd()) {
                                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
                                     localViewTransitionHashTable[name] = hash;
                                     localTables.viewTransitionHashTable[uniqueKey] = hash;
+                                    registerFileKey('viewTransitionHashTable', uniqueKey, filePath);
                                     localTables.viewTransitionObjectTable[hash] = obj;
                                     localViewTransitionObjectTable[hash] = obj;
                                     registerObjectOwner('viewTransitionObjectTable', hash, filePath);
@@ -1617,6 +1587,7 @@ function scanAll(scanCwd = process.cwd()) {
                                     registerObjectOwner('createThemeObjectTable', hash, filePath);
                                     localCreateThemeHashTable[name] = hash;
                                     localTables.createThemeHashTable[uniqueKey] = hash;
+                                    registerFileKey('createThemeHashTable', uniqueKey, filePath);
                                     localTables.createThemeSelectorTable[hash] = selector;
                                     localCreateThemeSelectorTable[hash] = selector;
                                     registerObjectOwner('createThemeSelectorTable', hash, filePath);
@@ -1634,18 +1605,21 @@ function scanAll(scanCwd = process.cwd()) {
                                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
                                     localCreateHashTable[name] = hash;
                                     localTables.createHashTable[uniqueKey] = hash;
+                                    registerFileKey('createHashTable', uniqueKey, filePath);
                                     localTables.createObjectTable[hash] = obj;
                                     localCreateObjectTable[hash] = obj;
                                     registerObjectOwner('createObjectTable', hash, filePath);
                                     const hasFunctionKey = objExpression.properties.some((prop) => prop.type === 'KeyValueProperty' &&
                                         (prop.value.type === 'ArrowFunctionExpression' ||
                                             prop.value.type === 'FunctionExpression'));
-                                    if (hasFunctionKey)
+                                    if (hasFunctionKey) {
                                         localTables.createFunctionTable[uniqueKey] =
                                             inlineOuterScope(objExpression, (property) => objectExpressionToObject({
                                                 ...objExpression,
                                                 properties: [property],
                                             }, scopedStaticTable, localKeyframesHashTable, localViewTransitionHashTable, localCreateThemeHashTable, localCreateThemeObjectTable, localCreateHashTable, localCreateStaticHashTable, localCreateStaticObjectTable, resolveVariable));
+                                        registerFileKey('createFunctionTable', uniqueKey, filePath);
+                                    }
                                     const hashMap = {};
                                     Object.entries(obj).forEach(([key, style]) => {
                                         const records = (0, create_1.getStyleRecords)(style);
@@ -1661,10 +1635,8 @@ function scanAll(scanCwd = process.cwd()) {
                         }
                     }
                 }
-                if (isFirstPass) {
-                    extractAndCacheExports(filePath, ast, mtimeMs);
+                if (isFirstPass)
                     continue;
-                }
                 jsxPhaseQueue.push({
                     filePath,
                     ast,
@@ -2149,7 +2121,8 @@ function scanAll(scanCwd = process.cwd()) {
     }
     for (const props of Object.values(localTables.componentPropsTable ?? {})) {
         for (const entries of Object.values(props))
-            entries.sort((a, b) => a.filePath.localeCompare(b.filePath) || a.spanStart - b.spanStart);
+            entries.sort((a, b) => (a.filePath < b.filePath ? -1 : a.filePath > b.filePath ? 1 : 0) ||
+                a.spanStart - b.spanStart);
     }
     hasComputedOnce = true;
     return snapshotTables();

package/package.json

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