@plumeria/utils 19.2.8 → 19.2.10

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

package/dist/parser.d.ts

@@ -1,4 +1,4 @@
-import type { CSSObject, Tables, StaticTable, KeyframesHashTable, ViewTransitionHashTable, CreateHashTable, CreateThemeHashTable, CreateThemeObjectTable, CreateStaticHashTable, CreateStaticObjectTable } from './types';
+import type { CSSObject, Tables, StaticTable, KeyframesHashTable, ViewTransitionHashTable, CreateHashTable, CreateThemeHashTable, CreateThemeObjectTable, CreateStaticHashTable, CreateStaticObjectTable, SheetSink } from './types';
 import type { Module, Expression, CallExpression, Identifier, KeyValueProperty, StringLiteral, NumericLiteral, BooleanLiteral, ObjectExpression, MemberExpression, TemplateLiteral, BinaryExpression, UnaryExpression, ParenthesisExpression, VariableDeclaration, VariableDeclarator, ExportDeclaration, ConditionalExpression, JSXExpression, ArrowFunctionExpression, FunctionExpression } from '@swc/core';
 export declare function unwrapExpression(node: any): any;
 export declare const getRootIdentifier: (node: Expression) => string | null;
@@ -55,5 +55,6 @@ export declare function resolveExport(filePath: string, exportName: string, visi
     filePath: string;
     localName: string;
 } | null;
-export declare function extractOndemandStyles(obj: any, extractedSheets: string[], t: Tables): void;
+export declare const appendSheet: (sheets: string[]) => SheetSink;
+export declare function extractOndemandStyles(obj: any, addSheet: SheetSink, t: Tables): void;
 export declare function deepMerge(target: Record<string, any>, source: Record<string, any>): Record<string, any>;

package/dist/parser.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.t = exports.getRootIdentifier = void 0;
+exports.appendSheet = exports.t = exports.getRootIdentifier = void 0;
 exports.unwrapExpression = unwrapExpression;
 exports.resolveOriginError = resolveOriginError;
 exports.resolveComponentKey = resolveComponentKey;
@@ -1217,6 +1217,7 @@ function runScan(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 = [];
@@ -1258,6 +1259,19 @@ function runScan(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);
@@ -2125,6 +2139,7 @@ function runScan(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,
@@ -2192,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') {
@@ -2216,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;
@@ -2244,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') {
@@ -2274,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') {
@@ -2313,6 +2338,7 @@ function extractAndCacheExports(filePath, ast, mtimeMs) {
             mtimeMs: mtimeMs,
             exports: { localExports, reExports, starExports, imports },
             dependencies: newDeps,
+            unresolvedImports,
             staticTable: {},
             keyframesHashTable: {},
             keyframesObjectTable: {},
@@ -2337,6 +2363,7 @@ function extractAndCacheExports(filePath, ast, mtimeMs) {
             imports,
         };
         fileCache[filePath].dependencies = newDeps;
+        fileCache[filePath].unresolvedImports = unresolvedImports;
     }
     fileCache[filePath].exportsMtimeMs = mtimeMs;
 }
@@ -2394,7 +2421,17 @@ function resolveExport(filePath, exportName, visited = new Set()) {
 }
 const REFERENCE_MARKER = /(kf|vt|cr)-([0-9a-z]+)/g;
 const CUSTOM_PROPERTY = /var\(\s*(--[^\s,)]+)/g;
-function extractOndemandStyles(obj, extractedSheets, t) {
+const appendSheet = (sheets) => {
+    const existingSheets = new Set(sheets);
+    return (sheet) => {
+        if (existingSheets.has(sheet))
+            return;
+        existingSheets.add(sheet);
+        sheets.push(sheet);
+    };
+};
+exports.appendSheet = appendSheet;
+function extractOndemandStyles(obj, addSheet, t) {
     if (!obj || typeof obj !== 'object')
         return;
     const visited = new Set();
@@ -2441,13 +2478,6 @@ function extractOndemandStyles(obj, extractedSheets, t) {
         });
     }
     walk(obj);
-    const existingSheets = new Set(extractedSheets);
-    const addSheet = (sheet) => {
-        if (!existingSheets.has(sheet)) {
-            existingSheets.add(sheet);
-            extractedSheets.push(sheet);
-        }
-    };
     if (keyframesHashes.size > 0) {
         for (const hash of keyframesHashes) {
             const definition = t.keyframesObjectTable[hash];

package/dist/transform.js

@@ -293,16 +293,14 @@ const transformSource = async (env) => {
             appliedStyleProps.add(`${owner}:${name}`);
         }
     };
-    const extractedSheets = [];
+    const extractedSheets = new Set();
     const addSheet = (sheet) => {
-        if (!extractedSheets.includes(sheet)) {
-            extractedSheets.push(sheet);
-        }
+        extractedSheets.add(sheet);
     };
     const processStyleRecords = (style, weights) => {
         const records = (0, create_1.getStyleRecords)(style, weights);
         if (collectOndemandSheets) {
-            (0, parser_1.extractOndemandStyles)(style, extractedSheets, scannedTables);
+            (0, parser_1.extractOndemandStyles)(style, addSheet, scannedTables);
             records.forEach((r) => {
                 addSheet(r.sheet);
             });
@@ -2353,6 +2351,6 @@ const transformSource = async (env) => {
     });
     parts.push(buffer.subarray(offset));
     const transformedSource = Buffer.concat(parts).toString();
-    return { code: transformedSource, sheets: extractedSheets };
+    return { code: transformedSource, sheets: [...extractedSheets] };
 };
 exports.transformSource = transformSource;

package/dist/types.d.ts

@@ -62,4 +62,5 @@ export type ViewTransition = {
     new?: CSSProperties;
     old?: CSSProperties;
 };
+export type SheetSink = (sheet: string) => void;
 export {};

package/package.json

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