@plumeria/utils 19.2.7 → 19.2.9

package/dist/parser.js

@@ -1133,7 +1133,46 @@ function stripFileContributions(filePath, cached) {
         }
     }
 }
+const propEntryKeys = new WeakMap();
+const propEntryKey = (entry) => JSON.stringify([
+    entry.filePath,
+    entry.spanStart,
+    entry.key,
+    entry.conditions,
+]);
+const statMemo = new Map();
+let scanning = false;
+function statFile(filePath) {
+    if (!scanning)
+        return fs.statSync(filePath);
+    const memo = statMemo.get(filePath);
+    if (memo) {
+        if (memo instanceof Error)
+            throw memo;
+        return memo;
+    }
+    try {
+        const stats = fs.statSync(filePath);
+        statMemo.set(filePath, stats);
+        return stats;
+    }
+    catch (e) {
+        statMemo.set(filePath, e);
+        throw e;
+    }
+}
 function scanAll(scanCwd = process.cwd()) {
+    scanning = true;
+    statMemo.clear();
+    try {
+        return runScan(scanCwd);
+    }
+    finally {
+        scanning = false;
+        statMemo.clear();
+    }
+}
+function runScan(scanCwd = process.cwd()) {
     const cwd = path.resolve(scanCwd);
     if (hasComputedOnce &&
         process.env.NODE_ENV === 'production' &&
@@ -1178,6 +1217,7 @@ function scanAll(scanCwd = process.cwd()) {
         if (!currentFiles.has(fp))
             deletedFiles.push(fp);
     }
+    const appeared = files.some((fp) => !knownFiles.has(fp));
     knownFiles = currentFiles;
     const invalidated = new Set();
     const queue = [];
@@ -1219,6 +1259,19 @@ function scanAll(scanCwd = process.cwd()) {
         invalidated.add(fp);
         queue.push(fp);
     }
+    if (appeared) {
+        for (const [filePath, cached] of Object.entries(fileCache)) {
+            if (invalidated.has(filePath) ||
+                !currentFiles.has(filePath) ||
+                !cached.unresolvedImports?.length)
+                continue;
+            const resolves = cached.unresolvedImports.some((specifier) => (0, resolver_1.resolveImportPath)(specifier, filePath));
+            if (resolves) {
+                invalidated.add(filePath);
+                queue.push(filePath);
+            }
+        }
+    }
     for (let head = 0; head < queue.length; head++) {
         const fp = queue[head];
         const deps = dependentsMap.get(fp);
@@ -2065,15 +2118,18 @@ function scanAll(scanCwd = process.cwd()) {
                         globalTable[compKey][propName] = [];
                     }
                     const entries = localComponentPropsTable[compKey][propName];
+                    const collected = globalTable[compKey][propName];
+                    let taken = propEntryKeys.get(collected);
+                    if (!taken) {
+                        taken = new Set(collected.map(propEntryKey));
+                        propEntryKeys.set(collected, taken);
+                    }
                     for (const entry of entries) {
-                        const exists = globalTable[compKey][propName].some((x) => x.spanStart === entry.spanStart &&
-                            x.filePath === entry.filePath &&
-                            x.key === entry.key &&
-                            JSON.stringify(x.conditions) ===
-                                JSON.stringify(entry.conditions));
-                        if (!exists) {
-                            globalTable[compKey][propName].push(entry);
-                        }
+                        const key = propEntryKey(entry);
+                        if (taken.has(key))
+                            continue;
+                        taken.add(key);
+                        collected.push(entry);
                     }
                 }
             }
@@ -2083,6 +2139,7 @@ function scanAll(scanCwd = process.cwd()) {
                 dependencies: Array.from(localDependencies),
                 exports: fileCache[filePath]?.exports,
                 exportsMtimeMs: fileCache[filePath]?.exportsMtimeMs,
+                unresolvedImports: fileCache[filePath]?.unresolvedImports,
                 staticTable: localStaticTable,
                 keyframesHashTable: localKeyframesHashTable,
                 keyframesObjectTable: localKeyframesObjectTable,
@@ -2150,6 +2207,7 @@ function extractAndCacheExports(filePath, ast, mtimeMs) {
     const reExports = {};
     const starExports = [];
     const localDependencies = new Set();
+    const unresolvedImports = [];
     const imports = {};
     for (const node of ast.body) {
         if (node.type === 'ImportDeclaration') {
@@ -2174,6 +2232,9 @@ function extractAndCacheExports(filePath, ast, mtimeMs) {
             if (actualPath) {
                 localDependencies.add(actualPath);
             }
+            else if (node.source.value !== '@plumeria/core') {
+                unresolvedImports.push(node.source.value);
+            }
         }
         else if (node.type === 'ExportDeclaration') {
             const decl = node.declaration;
@@ -2202,6 +2263,9 @@ function extractAndCacheExports(filePath, ast, mtimeMs) {
                 if (actualPath) {
                     localDependencies.add(actualPath);
                 }
+                else if (source !== '@plumeria/core') {
+                    unresolvedImports.push(source);
+                }
             }
             node.specifiers.forEach((spec) => {
                 if (spec.type === 'ExportSpecifier') {
@@ -2232,6 +2296,9 @@ function extractAndCacheExports(filePath, ast, mtimeMs) {
                 if (actualPath) {
                     localDependencies.add(actualPath);
                 }
+                else if (node.source.value !== '@plumeria/core') {
+                    unresolvedImports.push(node.source.value);
+                }
             }
         }
         else if (node.type === 'ExportDefaultExpression') {
@@ -2271,6 +2338,7 @@ function extractAndCacheExports(filePath, ast, mtimeMs) {
             mtimeMs: mtimeMs,
             exports: { localExports, reExports, starExports, imports },
             dependencies: newDeps,
+            unresolvedImports,
             staticTable: {},
             keyframesHashTable: {},
             keyframesObjectTable: {},
@@ -2295,6 +2363,7 @@ function extractAndCacheExports(filePath, ast, mtimeMs) {
             imports,
         };
         fileCache[filePath].dependencies = newDeps;
+        fileCache[filePath].unresolvedImports = unresolvedImports;
     }
     fileCache[filePath].exportsMtimeMs = mtimeMs;
 }
@@ -2305,7 +2374,7 @@ function resolveExport(filePath, exportName, visited = new Set()) {
     visited.add(key);
     {
         try {
-            const stats = fs.statSync(filePath);
+            const stats = statFile(filePath);
             if ((!fileCache[filePath]?.exports ||
                 fileCache[filePath].exportsMtimeMs !== stats.mtimeMs) &&
                 stats.isFile()) {

package/package.json

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