@plumeria/utils 12.0.5 → 12.0.7

package/dist/parser.js

@@ -220,13 +220,23 @@ function objectExpressionToObject(node, staticTable, keyframesHashTable, viewTra
 function collectLocalConsts(ast) {
     const localConsts = {};
     const decls = new Map();
-    traverse(ast, {
-        VariableDeclarator({ node }) {
-            if (exports.t.isIdentifier(node.id) && node.init) {
-                decls.set(node.id.value, node.init);
+    for (const node of ast.body) {
+        let declarations = [];
+        if (exports.t.isVariableDeclaration(node)) {
+            declarations = node.declarations;
+        }
+        else if (exports.t.isExportDeclaration(node) &&
+            exports.t.isVariableDeclaration(node.declaration)) {
+            declarations = node.declaration.declarations;
+        }
+        for (const decl of declarations) {
+            if (exports.t.isVariableDeclarator(decl) &&
+                exports.t.isIdentifier(decl.id) &&
+                decl.init) {
+                decls.set(decl.id.value, decl.init);
             }
-        },
-    });
+        }
+    }
     const visiting = new Set();
     function resolveValue(name) {
         if (localConsts[name] !== undefined)
@@ -555,100 +565,118 @@ function scanAll() {
         createStaticObjectTable: {},
     };
     const files = rs.globSync(PATTERN_PATH, GLOB_OPTIONS);
+    const uncachedFiles = [];
+    for (const filePath of files) {
+        try {
+            const stats = fs.statSync(filePath);
+            const cached = fileCache[filePath];
+            if (cached && cached.mtimeMs === stats.mtimeMs) {
+                if (cached.hasCssUsage) {
+                    for (const key of Object.keys(cached.staticTable)) {
+                        localTables.staticTable[`${filePath}-${key}`] =
+                            cached.staticTable[key];
+                    }
+                    for (const key of Object.keys(cached.keyframesHashTable)) {
+                        localTables.keyframesHashTable[`${filePath}-${key}`] =
+                            cached.keyframesHashTable[key];
+                    }
+                    for (const key of Object.keys(cached.keyframesObjectTable)) {
+                        localTables.keyframesObjectTable[key] =
+                            cached.keyframesObjectTable[key];
+                    }
+                    for (const key of Object.keys(cached.viewTransitionHashTable)) {
+                        localTables.viewTransitionHashTable[`${filePath}-${key}`] =
+                            cached.viewTransitionHashTable[key];
+                    }
+                    for (const key of Object.keys(cached.viewTransitionObjectTable)) {
+                        localTables.viewTransitionObjectTable[key] =
+                            cached.viewTransitionObjectTable[key];
+                    }
+                    for (const key of Object.keys(cached.createThemeHashTable)) {
+                        localTables.createThemeHashTable[`${filePath}-${key}`] =
+                            cached.createThemeHashTable[key];
+                    }
+                    for (const key of Object.keys(cached.createThemeObjectTable)) {
+                        localTables.createThemeObjectTable[key] =
+                            cached.createThemeObjectTable[key];
+                    }
+                    for (const key of Object.keys(cached.createStaticHashTable)) {
+                        localTables.createStaticHashTable[`${filePath}-${key}`] =
+                            cached.createStaticHashTable[key];
+                    }
+                    for (const key of Object.keys(cached.createStaticObjectTable)) {
+                        localTables.createStaticObjectTable[key] =
+                            cached.createStaticObjectTable[key];
+                    }
+                    for (const key of Object.keys(cached.createHashTable)) {
+                        localTables.createHashTable[`${filePath}-${key}`] =
+                            cached.createHashTable[key];
+                    }
+                    for (const key of Object.keys(cached.createObjectTable)) {
+                        localTables.createObjectTable[key] = cached.createObjectTable[key];
+                    }
+                    for (const key of Object.keys(cached.createAtomicMapTable)) {
+                        localTables.createAtomicMapTable[key] =
+                            cached.createAtomicMapTable[key];
+                    }
+                    for (const key of Object.keys(cached.variantsHashTable)) {
+                        localTables.variantsHashTable[`${filePath}-${key}`] =
+                            cached.variantsHashTable[key];
+                    }
+                    for (const key of Object.keys(cached.variantsObjectTable)) {
+                        localTables.variantsObjectTable[key] =
+                            cached.variantsObjectTable[key];
+                    }
+                }
+            }
+            else {
+                uncachedFiles.push(filePath);
+            }
+        }
+        catch (e) {
+            uncachedFiles.push(filePath);
+        }
+    }
+    const parsedFiles = [];
+    for (const filePath of uncachedFiles) {
+        try {
+            const stats = fs.statSync(filePath);
+            const source = fs.readFileSync(filePath, 'utf8');
+            if (!source.includes('@plumeria/core')) {
+                fileCache[filePath] = {
+                    mtimeMs: stats.mtimeMs,
+                    staticTable: {},
+                    keyframesHashTable: {},
+                    keyframesObjectTable: {},
+                    viewTransitionHashTable: {},
+                    viewTransitionObjectTable: {},
+                    createThemeHashTable: {},
+                    createThemeObjectTable: {},
+                    createHashTable: {},
+                    createObjectTable: {},
+                    createAtomicMapTable: {},
+                    variantsHashTable: {},
+                    variantsObjectTable: {},
+                    createStaticHashTable: {},
+                    createStaticObjectTable: {},
+                    hasCssUsage: false,
+                };
+                continue;
+            }
+            const ast = (0, core_1.parseSync)(source, {
+                syntax: 'typescript',
+                tsx: true,
+                target: 'es2022',
+            });
+            parsedFiles.push({ filePath, ast, mtimeMs: stats.mtimeMs });
+        }
+        catch (e) {
+        }
+    }
     for (let passNumber = 1; passNumber <= 2; passNumber++) {
         const isFirstPass = passNumber === 1;
-        for (const filePath of files) {
+        for (const { filePath, ast, mtimeMs } of parsedFiles) {
             try {
-                const stats = fs.statSync(filePath);
-                const cached = fileCache[filePath];
-                if (cached && cached.mtimeMs === stats.mtimeMs) {
-                    if (cached.hasCssUsage) {
-                        for (const key of Object.keys(cached.staticTable)) {
-                            localTables.staticTable[`${filePath}-${key}`] =
-                                cached.staticTable[key];
-                        }
-                        for (const key of Object.keys(cached.keyframesHashTable)) {
-                            localTables.keyframesHashTable[`${filePath}-${key}`] =
-                                cached.keyframesHashTable[key];
-                        }
-                        for (const key of Object.keys(cached.keyframesObjectTable)) {
-                            localTables.keyframesObjectTable[key] =
-                                cached.keyframesObjectTable[key];
-                        }
-                        for (const key of Object.keys(cached.viewTransitionHashTable)) {
-                            localTables.viewTransitionHashTable[`${filePath}-${key}`] =
-                                cached.viewTransitionHashTable[key];
-                        }
-                        for (const key of Object.keys(cached.viewTransitionObjectTable)) {
-                            localTables.viewTransitionObjectTable[key] =
-                                cached.viewTransitionObjectTable[key];
-                        }
-                        for (const key of Object.keys(cached.createThemeHashTable)) {
-                            localTables.createThemeHashTable[`${filePath}-${key}`] =
-                                cached.createThemeHashTable[key];
-                        }
-                        for (const key of Object.keys(cached.createThemeObjectTable)) {
-                            localTables.createThemeObjectTable[key] =
-                                cached.createThemeObjectTable[key];
-                        }
-                        for (const key of Object.keys(cached.createStaticHashTable)) {
-                            localTables.createStaticHashTable[`${filePath}-${key}`] =
-                                cached.createStaticHashTable[key];
-                        }
-                        for (const key of Object.keys(cached.createStaticObjectTable)) {
-                            localTables.createStaticObjectTable[key] =
-                                cached.createStaticObjectTable[key];
-                        }
-                        for (const key of Object.keys(cached.createHashTable)) {
-                            localTables.createHashTable[`${filePath}-${key}`] =
-                                cached.createHashTable[key];
-                        }
-                        for (const key of Object.keys(cached.createObjectTable)) {
-                            localTables.createObjectTable[key] =
-                                cached.createObjectTable[key];
-                        }
-                        for (const key of Object.keys(cached.createAtomicMapTable)) {
-                            localTables.createAtomicMapTable[key] =
-                                cached.createAtomicMapTable[key];
-                        }
-                        for (const key of Object.keys(cached.variantsHashTable)) {
-                            localTables.variantsHashTable[`${filePath}-${key}`] =
-                                cached.variantsHashTable[key];
-                        }
-                        for (const key of Object.keys(cached.variantsObjectTable)) {
-                            localTables.variantsObjectTable[key] =
-                                cached.variantsObjectTable[key];
-                        }
-                    }
-                    continue;
-                }
-                const source = fs.readFileSync(filePath, 'utf8');
-                if (!source.includes('@plumeria/core')) {
-                    fileCache[filePath] = {
-                        mtimeMs: stats.mtimeMs,
-                        staticTable: {},
-                        keyframesHashTable: {},
-                        keyframesObjectTable: {},
-                        viewTransitionHashTable: {},
-                        viewTransitionObjectTable: {},
-                        createThemeHashTable: {},
-                        createThemeObjectTable: {},
-                        createHashTable: {},
-                        createObjectTable: {},
-                        createAtomicMapTable: {},
-                        variantsHashTable: {},
-                        variantsObjectTable: {},
-                        createStaticHashTable: {},
-                        createStaticObjectTable: {},
-                        hasCssUsage: false,
-                    };
-                    continue;
-                }
-                const ast = (0, core_1.parseSync)(source, {
-                    syntax: 'typescript',
-                    tsx: true,
-                    target: 'es2022',
-                });
                 const localStaticTable = {};
                 const localKeyframesHashTable = {};
                 const localKeyframesObjectTable = {};
@@ -749,7 +777,6 @@ function scanAll() {
                         if (exports.t.isVariableDeclarator(decl) &&
                             exports.t.isIdentifier(decl.id) &&
                             decl.init &&
-                            exports.t.isCallExpression(decl.init) &&
                             exports.t.isCallExpression(decl.init)) {
                             const callee = decl.init.callee;
                             let method;
@@ -859,7 +886,7 @@ function scanAll() {
                 }
                 if (!isFirstPass) {
                     fileCache[filePath] = {
-                        mtimeMs: stats.mtimeMs,
+                        mtimeMs: mtimeMs,
                         staticTable: localStaticTable,
                         keyframesHashTable: localKeyframesHashTable,
                         keyframesObjectTable: localKeyframesObjectTable,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "12.0.5",
+  "version": "12.0.7",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",
@@ -22,9 +22,9 @@
   ],
   "dependencies": {
     "@rust-gear/glob": "1.0.0",
-    "@swc/core": "1.15.33",
+    "@swc/core": "1.15.40",
     "lightningcss": "^1.32.0",
-    "postcss": "8.5.14",
+    "postcss": "8.5.15",
     "postcss-combine-media-query": "^2.1.0",
     "zss-engine": "2.2.8"
   },