@plumeria/utils 19.12.1 → 19.13.0

package/dist/compile.d.ts

@@ -4,6 +4,8 @@ interface CompilerOptions extends PropertyPolicyOptions {
     exclude: string[];
     cwd?: string;
     styleProp?: string;
+    sources?: Record<string, string>;
+    files?: string[];
 }
 export declare function compileCSS(options: CompilerOptions): string;
 export {};

package/dist/compile.js

@@ -36,7 +36,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileCSS = compileCSS;
 const core_1 = require("@swc/core");
 const zss_engine_1 = require("zss-engine");
-const fs = __importStar(require("fs"));
+const sourceCache_1 = require("./sourceCache");
+const parser_1 = require("./parser");
 const path = __importStar(require("path"));
 const rs = __importStar(require("@rust-gear/glob"));
 const index_1 = require("./index");
@@ -236,19 +237,99 @@ function extractStylesFromExpression(expression, ctx) {
     }
     return results;
 }
+const writtenTableNames = [
+    'createThemeHashTable',
+    'createThemeObjectTable',
+    'createThemeSelectorTable',
+    'createStaticHashTable',
+    'createStaticObjectTable',
+    'keyframesObjectTable',
+    'viewTransitionObjectTable',
+    'createAtomicMapTable',
+];
+const createWrites = (tables) => Object.fromEntries(writtenTableNames.map((name) => [name, Object.create(tables[name])]));
+const readTables = (tables, writes) => ({
+    ...tables,
+    ...writes,
+});
+const snapshotWrites = (writes) => Object.fromEntries(writtenTableNames.map((name) => [name, { ...writes[name] }]));
+const applyWrites = (tables, writes) => {
+    for (const name of writtenTableNames) {
+        Object.assign(tables[name], writes[name]);
+    }
+};
+const sheetCache = new Map();
+let sheetCacheContext = '';
+let sheetGlobals = '';
 function compileCSS(options) {
     const { include, exclude, cwd = process.cwd(), styleProp = index_1.DEFAULT_STYLE_PROP, } = options;
     const propertyPolicy = (0, index_1.resolvePropertyPolicy)(options);
     const allSheets = new Set();
-    const files = rs.globSync(include, {
-        cwd,
-        exclude: exclude,
-        sort: true,
-    });
-    const scannedTables = (0, index_1.scanOverlay)(cwd, styleProp);
-    const processFile = (filePath) => {
+    const files = options.files ??
+        rs.globSync(include, {
+            cwd,
+            exclude: exclude,
+            sort: true,
+        });
+    const tables = (0, index_1.scanOverlay)(cwd, styleProp);
+    const context = JSON.stringify([
+        path.resolve(cwd),
+        styleProp,
+        propertyPolicy,
+    ]);
+    const globals = JSON.stringify([
+        tables.createThemeHashTable,
+        tables.createThemeObjectTable,
+        tables.createThemeSelectorTable,
+        tables.keyframesObjectTable,
+        tables.viewTransitionObjectTable,
+    ].map((table) => {
+        const flat = {};
+        for (const key in table)
+            flat[key] = table[key];
+        return flat;
+    }));
+    if (sheetCacheContext !== context || sheetGlobals !== globals)
+        sheetCache.clear();
+    for (const [file, entry] of sheetCache) {
+        if (entry.revision !== 0 && (0, parser_1.compilationRevision)(file) === 0)
+            sheetCache.delete(file);
+    }
+    sheetCacheContext = context;
+    sheetGlobals = globals;
+    const scope = JSON.stringify([
+        include,
+        exclude,
+        options.files,
+        options.sources,
+        Object.keys(options.sources ?? {}).length
+            ? (0, parser_1.compilationGeneration)()
+            : undefined,
+    ]);
+    const stamps = new Map();
+    const stampOf = (file) => {
+        if (!stamps.has(file)) {
+            try {
+                stamps.set(file, (0, sourceCache_1.sourceStamp)(file));
+            }
+            catch {
+                stamps.set(file, undefined);
+            }
+        }
+        return stamps.get(file);
+    };
+    let imports = new Set();
+    const propsByFile = new Map();
+    for (const [key, props] of Object.entries(tables.componentPropsTable ?? {})) {
+        const file = key.slice(0, key.lastIndexOf('-'));
+        const entries = propsByFile.get(file) ?? [];
+        entries.push([key, props]);
+        propsByFile.set(file, entries);
+    }
+    const processFile = (filePath, writes) => {
+        const scannedTables = readTables(tables, writes);
         const resourcePath = path.resolve(cwd, filePath);
-        const source = fs.readFileSync(resourcePath, 'utf-8');
+        const source = options.sources?.[resourcePath] ?? (0, sourceCache_1.readSource)(resourcePath);
         const extractedSheets = [];
         const ast = (0, core_1.parseSync)(source, {
             syntax: 'typescript',
@@ -293,6 +374,7 @@ function compileCSS(options) {
                 }
                 const actualPath = (0, index_1.resolveImportPath)(sourcePath, resourcePath);
                 if (actualPath) {
+                    imports.add(actualPath);
                     node.specifiers.forEach((specifier) => {
                         if (specifier.type === 'ImportNamespaceSpecifier') {
                             localImports[specifier.local.value] = {
@@ -923,14 +1005,14 @@ function compileCSS(options) {
                     index_1.t.isObjectExpression(args[0].expression)) {
                     const obj = (0, index_1.objectExpressionToObject)(args[0].expression, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable);
                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
-                    ctx.scannedTables.keyframesObjectTable[hash] = obj;
+                    writes.keyframesObjectTable[hash] = obj;
                 }
                 else if (propName === 'viewTransition' &&
                     args.length > 0 &&
                     index_1.t.isObjectExpression(args[0].expression)) {
                     const obj = (0, index_1.objectExpressionToObject)(args[0].expression, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable);
                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
-                    ctx.scannedTables.viewTransitionObjectTable[hash] = obj;
+                    writes.viewTransitionObjectTable[hash] = obj;
                 }
                 else if (propName === 'createTheme' &&
                     args.length >= 2 &&
@@ -947,9 +1029,9 @@ function compileCSS(options) {
                     }
                     const obj = (0, index_1.objectExpressionToObject)(args[1].expression, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable);
                     const hash = (0, index_1.themeHashOf)(selector, obj);
-                    ctx.scannedTables.createThemeObjectTable[hash] = obj;
+                    writes.createThemeObjectTable[hash] = obj;
                     if (ctx.scannedTables.createThemeSelectorTable) {
-                        ctx.scannedTables.createThemeSelectorTable[hash] = selector;
+                        writes.createThemeSelectorTable[hash] = selector;
                     }
                 }
                 else if (propName === 'createStatic' &&
@@ -957,7 +1039,7 @@ function compileCSS(options) {
                     index_1.t.isObjectExpression(args[0].expression)) {
                     const obj = (0, index_1.objectExpressionToObject)(args[0].expression, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable);
                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
-                    ctx.scannedTables.createStaticObjectTable[hash] = obj;
+                    writes.createStaticObjectTable[hash] = obj;
                 }
             }
         };
@@ -1030,10 +1112,10 @@ function compileCSS(options) {
                                 const obj = (0, index_1.objectExpressionToObject)(arg, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable);
                                 const hash = (0, index_1.themeHashOf)(selector, obj);
                                 const uKey = `${resourcePath}-${node.id.value}`;
-                                ctx.scannedTables.createThemeHashTable[uKey] = hash;
-                                ctx.scannedTables.createThemeObjectTable[hash] = obj;
+                                writes.createThemeHashTable[uKey] = hash;
+                                writes.createThemeObjectTable[hash] = obj;
                                 if (ctx.scannedTables.createThemeSelectorTable) {
-                                    ctx.scannedTables.createThemeSelectorTable[hash] = selector;
+                                    writes.createThemeSelectorTable[hash] = selector;
                                 }
                                 const themeHashMap = {};
                                 for (const [key, value] of Object.entries(obj)) {
@@ -1041,7 +1123,7 @@ function compileCSS(options) {
                                     const atomicHash = (0, zss_engine_1.genBase36Hash)({ _theme: hash, [key]: value }, 1, 8);
                                     themeHashMap[key] = `var(--${atomicHash}-${cssVarName})`;
                                 }
-                                ctx.scannedTables.createAtomicMapTable[hash] = themeHashMap;
+                                writes.createAtomicMapTable[hash] = themeHashMap;
                                 ctx.localCreateStyles[node.id.value] = {
                                     type: 'create',
                                     obj: ctx.scannedTables.createAtomicMapTable[hash],
@@ -1052,8 +1134,8 @@ function compileCSS(options) {
                                 if (obj) {
                                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
                                     const uKey = `${resourcePath}-${node.id.value}`;
-                                    ctx.scannedTables.createStaticHashTable[uKey] = hash;
-                                    ctx.scannedTables.createStaticObjectTable[hash] = obj;
+                                    writes.createStaticHashTable[uKey] = hash;
+                                    writes.createStaticObjectTable[hash] = obj;
                                     ctx.mergedCreateStaticHashTable[node.id.value] = hash;
                                 }
                             }
@@ -1145,9 +1227,54 @@ function compileCSS(options) {
         });
         return extractedSheets;
     };
+    const closures = new Map();
+    const closureOf = (file) => {
+        let closure = closures.get(file);
+        if (!closure) {
+            closure = [file, ...(0, parser_1.getFileDependencies)(file)].map((dependency) => [dependency, stampOf(dependency)]);
+            closures.set(file, closure);
+        }
+        return closure;
+    };
+    const verified = new Map();
+    const isFresh = (closure) => {
+        let fresh = verified.get(closure);
+        if (fresh === undefined) {
+            fresh = closure.every(([file, stamp]) => stampOf(file) === stamp);
+            verified.set(closure, fresh);
+        }
+        return fresh;
+    };
     for (const file of files) {
-        const sheets = processFile(file);
-        for (const sheet of sheets) {
+        const resource = path.resolve(cwd, file);
+        const key = JSON.stringify([
+            scope,
+            stampOf(resource),
+            (0, parser_1.compilationRevision)(resource),
+            propsByFile.get(resource),
+        ]);
+        let cached = sheetCache.get(resource);
+        if (cached?.key !== key || !cached.dependencies.every(isFresh)) {
+            imports = new Set();
+            const writes = createWrites(tables);
+            try {
+                const sheets = processFile(file, writes);
+                cached = {
+                    key,
+                    revision: (0, parser_1.compilationRevision)(resource),
+                    sheets,
+                    writes: snapshotWrites(writes),
+                    dependencies: [...imports].map(closureOf),
+                };
+            }
+            catch (error) {
+                sheetCache.delete(resource);
+                throw error;
+            }
+            sheetCache.set(resource, cached);
+        }
+        applyWrites(tables, cached.writes);
+        for (const sheet of cached.sheets) {
             allSheets.add(sheet);
         }
     }

package/dist/constValue.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveExportValue = resolveExportValue;
+const sourceCache_1 = require("./sourceCache");
 const fs = __importStar(require("fs"));
 const core_1 = require("@swc/core");
 const parser_1 = require("./parser");
@@ -44,7 +45,7 @@ function readConstFile(filePath) {
     const cached = constFileCache.get(filePath);
     if (cached && cached.mtimeMs === mtimeMs)
         return cached;
-    const ast = (0, core_1.parseSync)(fs.readFileSync(filePath, 'utf8'), {
+    const ast = (0, core_1.parseSync)((0, sourceCache_1.readSource)(filePath), {
         syntax: 'typescript',
         tsx: true,
         target: 'es2022',

package/dist/parser.d.ts

@@ -52,6 +52,8 @@ export declare function resolveFileError(actualPath: string, importedName: strin
     filePath: string;
     message: string;
 } | undefined;
+export declare function compilationGeneration(): number;
+export declare function compilationRevision(file: string): number;
 export declare function fileTableKeys(filePath: string, tableName: string): ReadonlySet<string> | undefined;
 export declare function scanOverlay(scanCwd?: string, styleProp?: string): Tables;
 export declare function scanAll(scanCwd?: string, styleProp?: string): Tables;

package/dist/parser.js

@@ -44,6 +44,8 @@ exports.collectLocalConsts = collectLocalConsts;
 exports.readsParams = readsParams;
 exports.resolveThemeSelector = resolveThemeSelector;
 exports.resolveFileError = resolveFileError;
+exports.compilationGeneration = compilationGeneration;
+exports.compilationRevision = compilationRevision;
 exports.fileTableKeys = fileTableKeys;
 exports.scanOverlay = scanOverlay;
 exports.scanAll = scanAll;
@@ -51,6 +53,7 @@ exports.getFileDependencies = getFileDependencies;
 exports.resolveExport = resolveExport;
 exports.extractOndemandStyles = extractOndemandStyles;
 exports.deepMerge = deepMerge;
+const sourceCache_1 = require("./sourceCache");
 const createTheme_1 = require("./createTheme");
 const core_1 = require("@swc/core");
 const path = __importStar(require("path"));
@@ -1107,6 +1110,13 @@ const detachedOverlayTables = new Set([
 ]);
 let overlayScan = false;
 let tablesGeneration = 0;
+const compileRevisions = new Map();
+function compilationGeneration() {
+    return tablesGeneration;
+}
+function compilationRevision(file) {
+    return compileRevisions.get(file) ?? 0;
+}
 let overlayBaseGeneration = -1;
 let overlayBase;
 function layerTables(source, detached) {
@@ -1391,6 +1401,10 @@ function runScan(scanCwd, styleProp) {
         return snapshotTables();
     }
     tablesGeneration++;
+    for (const file of invalidated)
+        compileRevisions.set(file, tablesGeneration);
+    for (const file of deletedFiles)
+        compileRevisions.delete(file);
     for (const fp of deletedFiles) {
         const cached = fileCache[fp];
         if (cached)
@@ -1410,7 +1424,7 @@ function runScan(scanCwd, styleProp) {
     for (const filePath of uncachedFiles) {
         try {
             const stats = fs.statSync(filePath);
-            const source = fs.readFileSync(filePath, 'utf8');
+            const source = (0, sourceCache_1.readSource)(filePath);
             if (!(0, stylePropFilter_1.needsCompile)(source, styleProp, filePath)) {
                 updateDependencyEdges(filePath, fileCache[filePath]?.dependencies, undefined);
                 fileCache[filePath] = {
@@ -2493,7 +2507,7 @@ function resolveExport(filePath, exportName, visited = new Set()) {
             if ((!fileCache[filePath]?.exports ||
                 fileCache[filePath].exportsMtimeMs !== stats.mtimeMs) &&
                 stats.isFile()) {
-                const source = fs.readFileSync(filePath, 'utf8');
+                const source = (0, sourceCache_1.readSource)(filePath);
                 const ast = (0, core_1.parseSync)(source, {
                     syntax: 'typescript',
                     tsx: true,
@@ -2623,9 +2637,10 @@ function extractOndemandStyles(obj, addSheet, t) {
         }
     }
     if (usedVariables.size > 0) {
-        Object.keys(t.createThemeHashTable)
-            .sort()
-            .forEach((themeVarName) => {
+        const themeNames = [];
+        for (const name in t.createThemeHashTable)
+            themeNames.push(name);
+        themeNames.sort().forEach((themeVarName) => {
             const hash = t.createThemeHashTable[themeVarName];
             const definition = t.createThemeObjectTable[hash];
             const selector = t.createThemeSelectorTable[hash];

package/dist/sourceCache.d.ts

@@ -0,0 +1,2 @@
+export declare function sourceStamp(file: string): string;
+export declare function readSource(file: string): string;

package/dist/sourceCache.js

@@ -0,0 +1,62 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sourceStamp = sourceStamp;
+exports.readSource = readSource;
+const fs = __importStar(require("fs"));
+const sources = new Map();
+const LIMIT = 4096;
+function sourceStamp(file) {
+    const stat = fs.statSync(file);
+    return `${stat.mtimeMs}:${stat.ctimeMs}:${stat.size}`;
+}
+function readSource(file) {
+    let stamp;
+    try {
+        stamp = sourceStamp(file);
+    }
+    catch (error) {
+        sources.delete(file);
+        throw error;
+    }
+    const cached = sources.get(file);
+    if (cached?.stamp === stamp)
+        return cached.source;
+    const source = fs.readFileSync(file, 'utf8');
+    if (sources.size >= LIMIT)
+        sources.delete(sources.keys().next().value);
+    sources.set(file, { stamp, source });
+    return source;
+}

package/dist/transform.d.ts

@@ -8,11 +8,9 @@ export type TransformEnv = {
     classProp?: string;
     propertyPolicy: PropertyPolicy | undefined;
     isDev: boolean;
-    collectOndemandSheets: boolean;
     addDependency: (depPath: string) => void;
 };
 export type TransformOutput = {
     code: string;
-    sheets: string[];
 };
 export declare const transformSource: (env: TransformEnv) => Promise<TransformOutput>;

package/dist/transform.js

@@ -181,7 +181,7 @@ const foldDynamicVars = (vars) => {
     });
 };
 const transformSource = async (env) => {
-    const { source, root, styleProp, propertyPolicy, isDev, collectOndemandSheets, addDependency, } = env;
+    const { source, root, styleProp, propertyPolicy, isDev, addDependency } = env;
     const classProp = env.classProp ?? 'className';
     const id = env.moduleId;
     const resourcePath = env.moduleId;
@@ -335,20 +335,7 @@ const transformSource = async (env) => {
             appliedStyleProps.add(`${owner}:${name}`);
         }
     };
-    const extractedSheets = new Set();
-    const addSheet = (sheet) => {
-        extractedSheets.add(sheet);
-    };
-    const processStyleRecords = (style, weights) => {
-        const records = (0, create_1.getStyleRecords)(style, weights);
-        if (collectOndemandSheets) {
-            (0, parser_1.extractOndemandStyles)(style, addSheet, scannedTables);
-            records.forEach((r) => {
-                addSheet(r.sheet);
-            });
-        }
-        return records;
-    };
+    const processStyleRecords = (style, weights) => (0, create_1.getStyleRecords)(style, weights);
     const localConsts = (0, parser_1.collectLocalConsts)(ast);
     const localConstNodes = (0, parser_1.collectLocalConstNodes)(ast);
     const importMap = {};
@@ -1588,7 +1575,8 @@ const transformSource = async (env) => {
                 continue;
             if (parser_1.t.isMemberExpression(expr) &&
                 parser_1.t.isIdentifier(expr.object) &&
-                expr.property.type === 'Computed') {
+                expr.property.type === 'Computed' &&
+                expr.property.expression.type !== 'StringLiteral') {
                 const varName = expr.object.value;
                 const styleObj = isVisibleReference(expr)
                     ? resolveCreateObject(varName)
@@ -2463,6 +2451,6 @@ const transformSource = async (env) => {
     });
     parts.push(sourceBuffer.subarray(offset));
     const transformedSource = Buffer.concat(parts).toString();
-    return { code: transformedSource, sheets: [...extractedSheets] };
+    return { code: transformedSource };
 };
 exports.transformSource = transformSource;

package/package.json

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