@plumeria/utils 6.0.2 → 6.1.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export type { CSSObject, FileStyles, StaticTable, ThemeTable, KeyframesHashTable, KeyframesObjectTable, ViewTransitionHashTable, ViewTransitionObjectTable, CreateThemeObjectTable, CreateHashTable, CreateObjectTable, VariantsHashTable, VariantsObjectTable, } from './types';
-export { objectExpressionToObject, collectLocalConsts, traverse, t, tables, extractOndemandStyles, deepMerge, scanAll, } from './parser';
+export { objectExpressionToObject, collectLocalConsts, traverse, t, extractOndemandStyles, deepMerge, scanAll, } from './parser';
 export { getStyleRecords } from './create';
 export type { StyleRecord } from './create';
 export { resolveImportPath } from './resolver';

package/dist/index.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveImportPath = exports.getStyleRecords = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = exports.tables = exports.t = exports.traverse = exports.collectLocalConsts = exports.objectExpressionToObject = void 0;
+exports.resolveImportPath = exports.getStyleRecords = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = 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; } });
 Object.defineProperty(exports, "traverse", { enumerable: true, get: function () { return parser_1.traverse; } });
 Object.defineProperty(exports, "t", { enumerable: true, get: function () { return parser_1.t; } });
-Object.defineProperty(exports, "tables", { enumerable: true, get: function () { return parser_1.tables; } });
 Object.defineProperty(exports, "extractOndemandStyles", { enumerable: true, get: function () { return parser_1.extractOndemandStyles; } });
 Object.defineProperty(exports, "deepMerge", { enumerable: true, get: function () { return parser_1.deepMerge; } });
 Object.defineProperty(exports, "scanAll", { enumerable: true, get: function () { return parser_1.scanAll; } });

package/dist/parser.js

@@ -86,6 +86,7 @@ exports.tables = {
     createThemeObjectTable: {},
     createHashTable: {},
     createObjectTable: {},
+    createAtomicMapTable: {},
     variantsHashTable: {},
     variantsObjectTable: {},
 };
@@ -211,10 +212,6 @@ function collectLocalConsts(ast) {
 }
 function getPropertyKey(node, staticTable, keyframesHashTable, viewTransitionHashTable, themeTable) {
     if (exports.t.isIdentifier(node)) {
-        if (staticTable[node.value] &&
-            typeof staticTable[node.value] === 'string') {
-            return staticTable[node.value];
-        }
         return node.value;
     }
     if (exports.t.isStringLiteral(node)) {
@@ -416,10 +413,13 @@ function scanAll() {
         createThemeObjectTable: {},
         createHashTable: {},
         createObjectTable: {},
+        createAtomicMapTable: {},
         variantsHashTable: {},
         variantsObjectTable: {},
+        extractedSheet: '',
     };
     const files = fs_1.default.globSync(PATTERN_PATH, GLOB_OPTIONS);
+    const totalExtractedSheets = [];
     for (const filePath of files) {
         try {
             const stats = fs_1.default.statSync(filePath);
@@ -461,6 +461,10 @@ function scanAll() {
                     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];
@@ -469,11 +473,14 @@ function scanAll() {
                         localTables.variantsObjectTable[key] =
                             cached.variantsObjectTable[key];
                     }
+                    if (cached.extractedSheet) {
+                        totalExtractedSheets.push(cached.extractedSheet);
+                    }
                 }
                 continue;
             }
             const source = fs_1.default.readFileSync(filePath, 'utf8');
-            if (!source.includes('css.')) {
+            if (!source.includes('@plumeria/core')) {
                 fileCache[filePath] = {
                     mtimeMs: stats.mtimeMs,
                     staticTable: {},
@@ -485,9 +492,11 @@ function scanAll() {
                     createThemeObjectTable: {},
                     createHashTable: {},
                     createObjectTable: {},
+                    createAtomicMapTable: {},
                     variantsHashTable: {},
                     variantsObjectTable: {},
                     hasCssUsage: false,
+                    extractedSheet: '',
                 };
                 continue;
             }
@@ -505,8 +514,38 @@ function scanAll() {
             const localCreateThemeObjectTable = {};
             const localCreateHashTable = {};
             const localCreateObjectTable = {};
+            const localCreateAtomicMapTable = {};
             const localVariantsHashTable = {};
             const localVariantsObjectTable = {};
+            const plumeriaAliases = {};
+            const fileExtractedSheets = [];
+            const isProduction = process.env.NODE_ENV === 'production';
+            for (const node of ast.body) {
+                if (node.type === 'ImportDeclaration') {
+                    const sourceValue = node.source.value;
+                    if (sourceValue === '@plumeria/core') {
+                        node.specifiers.forEach((specifier) => {
+                            if (specifier.type === 'ImportNamespaceSpecifier') {
+                                if (specifier.local) {
+                                    plumeriaAliases[specifier.local.value] = 'NAMESPACE';
+                                }
+                            }
+                            else if (specifier.type === 'ImportSpecifier') {
+                                const importedName = specifier.imported
+                                    ? specifier.imported.value
+                                    : specifier.local.value;
+                                const localName = specifier.local.value;
+                                plumeriaAliases[localName] = importedName;
+                            }
+                            else if (specifier.type === 'ImportDefaultSpecifier') {
+                                if (specifier.local) {
+                                    plumeriaAliases[specifier.local.value] = 'NAMESPACE';
+                                }
+                            }
+                        });
+                    }
+                }
+            }
             for (const node of ast.body) {
                 let declarations = [];
                 if (exports.t.isVariableDeclaration(node)) {
@@ -521,61 +560,105 @@ function scanAll() {
                         exports.t.isIdentifier(decl.id) &&
                         decl.init &&
                         exports.t.isCallExpression(decl.init) &&
-                        exports.t.isMemberExpression(decl.init.callee) &&
-                        exports.t.isIdentifier(decl.init.callee.object, { name: 'css' }) &&
-                        exports.t.isIdentifier(decl.init.callee.property) &&
-                        decl.init.arguments.length > 0 &&
-                        exports.t.isObjectExpression(decl.init.arguments[0].expression)) {
-                        const method = decl.init.callee.property.value;
-                        const name = decl.id.value;
-                        const init = decl.init;
-                        const resolveVariable = (name) => {
-                            const hash = localCreateHashTable[name];
-                            if (hash && localCreateObjectTable[hash]) {
-                                return localCreateObjectTable[hash];
+                        exports.t.isCallExpression(decl.init)) {
+                        const callee = decl.init.callee;
+                        let method;
+                        if (exports.t.isMemberExpression(callee) &&
+                            exports.t.isIdentifier(callee.object) &&
+                            exports.t.isIdentifier(callee.property)) {
+                            const objectName = callee.object.value;
+                            const propertyName = callee.property.value;
+                            const alias = plumeriaAliases[objectName];
+                            if (alias === 'NAMESPACE' || objectName === 'css') {
+                                method = propertyName;
                             }
-                            return undefined;
-                        };
-                        const obj = objectExpressionToObject(init.arguments[0].expression, localStaticTable, localKeyframesHashTable, localViewTransitionHashTable, localThemeTable, localCreateHashTable, localVariantsHashTable, resolveVariable);
-                        const uniqueKey = `${filePath}-${name}`;
-                        if (method === 'createStatic') {
-                            localStaticTable[name] = obj;
-                            localTables.staticTable[uniqueKey] = obj;
                         }
-                        else if (method === 'keyframes') {
-                            const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
-                            localKeyframesHashTable[name] = hash;
-                            localTables.keyframesHashTable[uniqueKey] = hash;
-                            localTables.keyframesObjectTable[hash] = obj;
-                            localKeyframesObjectTable[hash] = obj;
-                        }
-                        else if (method === 'viewTransition') {
-                            const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
-                            localViewTransitionHashTable[name] = hash;
-                            localTables.viewTransitionHashTable[uniqueKey] = hash;
-                            localTables.viewTransitionObjectTable[hash] = obj;
-                            localViewTransitionObjectTable[hash] = obj;
-                        }
-                        else if (method === 'createTheme') {
-                            const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
-                            localThemeTable[name] = obj;
-                            localTables.themeTable[uniqueKey] = obj;
-                            localTables.createThemeObjectTable[hash] = obj;
-                            localCreateThemeObjectTable[hash] = obj;
-                        }
-                        else if (method === 'create') {
-                            const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
-                            localCreateHashTable[name] = hash;
-                            localTables.createHashTable[uniqueKey] = hash;
-                            localTables.createObjectTable[hash] = obj;
-                            localCreateObjectTable[hash] = obj;
+                        else if (exports.t.isIdentifier(callee)) {
+                            const calleeName = callee.value;
+                            const originalName = plumeriaAliases[calleeName];
+                            if (originalName) {
+                                method = originalName;
+                            }
                         }
-                        else if (method === 'variants') {
-                            const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
-                            localVariantsHashTable[name] = hash;
-                            localTables.variantsHashTable[uniqueKey] = hash;
-                            localTables.variantsObjectTable[hash] = obj;
-                            localVariantsObjectTable[hash] = obj;
+                        if (method &&
+                            decl.init.arguments.length > 0 &&
+                            exports.t.isObjectExpression(decl.init.arguments[0].expression)) {
+                            const name = decl.id.value;
+                            const init = decl.init;
+                            const resolveVariable = (name) => {
+                                const hash = localCreateHashTable[name];
+                                if (hash && localCreateObjectTable[hash]) {
+                                    return localCreateObjectTable[hash];
+                                }
+                                return undefined;
+                            };
+                            const obj = objectExpressionToObject(init.arguments[0].expression, localStaticTable, localKeyframesHashTable, localViewTransitionHashTable, localThemeTable, localCreateHashTable, localVariantsHashTable, resolveVariable);
+                            const uniqueKey = `${filePath}-${name}`;
+                            if (method === 'createStatic') {
+                                localStaticTable[name] = obj;
+                                localTables.staticTable[uniqueKey] = obj;
+                            }
+                            else if (method === 'keyframes') {
+                                const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
+                                localKeyframesHashTable[name] = hash;
+                                localTables.keyframesHashTable[uniqueKey] = hash;
+                                localTables.keyframesObjectTable[hash] = obj;
+                                localTables.keyframesObjectTable[hash] = obj;
+                                localKeyframesObjectTable[hash] = obj;
+                                if (!isProduction) {
+                                    extractOndemandStyles({ kf: `kf-${hash}` }, fileExtractedSheets, localTables);
+                                }
+                            }
+                            else if (method === 'viewTransition') {
+                                const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
+                                localViewTransitionHashTable[name] = hash;
+                                localTables.viewTransitionHashTable[uniqueKey] = hash;
+                                localTables.viewTransitionObjectTable[hash] = obj;
+                                localTables.viewTransitionObjectTable[hash] = obj;
+                                localViewTransitionObjectTable[hash] = obj;
+                                if (!isProduction) {
+                                    extractOndemandStyles(obj, fileExtractedSheets, localTables);
+                                    extractOndemandStyles({ vt: `vt-${hash}` }, fileExtractedSheets, localTables);
+                                }
+                            }
+                            else if (method === 'createTheme') {
+                                const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
+                                localThemeTable[name] = obj;
+                                localTables.themeTable[uniqueKey] = obj;
+                                localTables.createThemeObjectTable[hash] = obj;
+                                localCreateThemeObjectTable[hash] = obj;
+                            }
+                            else if (method === 'create') {
+                                const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
+                                localCreateHashTable[name] = hash;
+                                localTables.createHashTable[uniqueKey] = hash;
+                                localTables.createObjectTable[hash] = obj;
+                                localCreateObjectTable[hash] = obj;
+                                const hashMap = {};
+                                Object.entries(obj).forEach(([key, style]) => {
+                                    const records = (0, create_1.getStyleRecords)(key, style, 2);
+                                    const atomMap = {};
+                                    records.forEach((r) => (atomMap[r.key] = r.hash));
+                                    hashMap[key] = atomMap;
+                                    if (!isProduction) {
+                                        extractOndemandStyles(style, fileExtractedSheets, localTables);
+                                        records.forEach((r) => {
+                                            if (!fileExtractedSheets.includes(r.sheet)) {
+                                                fileExtractedSheets.push(r.sheet);
+                                            }
+                                        });
+                                    }
+                                });
+                                localCreateAtomicMapTable[hash] = hashMap;
+                                localTables.createAtomicMapTable[hash] = hashMap;
+                            }
+                            else if (method === 'variants') {
+                                const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
+                                localVariantsHashTable[name] = hash;
+                                localTables.variantsHashTable[uniqueKey] = hash;
+                                localTables.variantsObjectTable[hash] = obj;
+                                localVariantsObjectTable[hash] = obj;
+                            }
                         }
                     }
                 }
@@ -591,14 +674,20 @@ function scanAll() {
                 createThemeObjectTable: localCreateThemeObjectTable,
                 createHashTable: localCreateHashTable,
                 createObjectTable: localCreateObjectTable,
+                createAtomicMapTable: localCreateAtomicMapTable,
                 variantsHashTable: localVariantsHashTable,
                 variantsObjectTable: localVariantsObjectTable,
                 hasCssUsage: true,
+                extractedSheet: fileExtractedSheets.join(''),
             };
+            if (fileExtractedSheets.length > 0) {
+                totalExtractedSheets.push(fileExtractedSheets.join(''));
+            }
         }
         catch (e) {
         }
     }
+    localTables.extractedSheet = totalExtractedSheets.join('');
     return localTables;
 }
 function extractOndemandStyles(obj, extractedSheets, t = exports.tables) {

package/dist/types.d.ts

@@ -15,6 +15,7 @@ export type CreateHashTable = Record<string, string>;
 export type CreateObjectTable = Record<string, CSSObject>;
 export type VariantsHashTable = Record<string, string>;
 export type VariantsObjectTable = Record<string, CSSObject>;
+export type CreateAtomicMapTable = Record<string, Record<string, Record<string, string>>>;
 export interface Tables {
     staticTable: StaticTable;
     themeTable: ThemeTable;
@@ -25,8 +26,10 @@ export interface Tables {
     createThemeObjectTable: CreateThemeObjectTable;
     createHashTable: CreateHashTable;
     createObjectTable: CreateObjectTable;
+    createAtomicMapTable: CreateAtomicMapTable;
     variantsHashTable: VariantsHashTable;
     variantsObjectTable: VariantsObjectTable;
+    extractedSheet?: string;
 }
 export interface FileStyles {
     baseStyles?: string;

package/package.json

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