@plumeria/utils 6.2.1 → 6.3.1

package/dist/create.d.ts

@@ -4,4 +4,4 @@ export interface StyleRecord {
     hash: string;
     sheet: string;
 }
-export declare function getStyleRecords(key: string, styleRule: CSSProperties, priority?: number): StyleRecord[];
+export declare function getStyleRecords(key: string, styleRule: CSSProperties): StyleRecord[];

package/dist/create.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStyleRecords = getStyleRecords;
 const zss_engine_1 = require("zss-engine");
-function getStyleRecords(key, styleRule, priority = 1 | 2) {
+function getStyleRecords(key, styleRule) {
     const flat = {};
     const nonFlat = {};
-    const notNormalize = priority === 1 ? ':not(#\\#)' : ':not(#\\#):not(#\\#)';
+    const notNormalize = ':not(#\\#)';
     (0, zss_engine_1.splitAtomicAndNested)(styleRule, flat, nonFlat);
     const finalFlat = (0, zss_engine_1.overrideLonghand)(flat);
     const records = [];
@@ -73,10 +73,9 @@ function getStyleRecords(key, styleRule, priority = 1 | 2) {
                     else {
                         hashSource = { [selector]: hashSource };
                     }
-                    const suffix = atRule ? notNormalize : ':not(#\\#)';
                     const hash = (0, zss_engine_1.genBase36Hash)(hashSource, 1, 8);
                     let sheet = (0, zss_engine_1.transpileAtomic)(prop, value, hash, normalizedSelector);
-                    sheet = sheet.replace(`.${hash}`, `.${hash}${suffix}`);
+                    sheet = sheet.replace(`.${hash}`, `.${hash}${notNormalize}`);
                     if (atRule) {
                         sheet = `${atRule} { ${sheet} }`;
                     }

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveImportPath = exports.getStyleRecords = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = exports.t = exports.traverse = exports.collectLocalConsts = exports.objectExpressionToObject = void 0;
+exports.optimizer = exports.resolveImportPath = exports.createTheme = 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; } });
@@ -11,5 +11,9 @@ Object.defineProperty(exports, "deepMerge", { enumerable: true, get: function ()
 Object.defineProperty(exports, "scanAll", { enumerable: true, get: function () { return parser_1.scanAll; } });
 var create_1 = require("./create");
 Object.defineProperty(exports, "getStyleRecords", { enumerable: true, get: function () { return create_1.getStyleRecords; } });
+var createTheme_1 = require("./createTheme");
+Object.defineProperty(exports, "createTheme", { enumerable: true, get: function () { return createTheme_1.createTheme; } });
 var resolver_1 = require("./resolver");
 Object.defineProperty(exports, "resolveImportPath", { enumerable: true, get: function () { return resolver_1.resolveImportPath; } });
+var optimizer_1 = require("./optimizer");
+Object.defineProperty(exports, "optimizer", { enumerable: true, get: function () { return optimizer_1.optimizer; } });

package/dist/optimizer.d.ts

@@ -0,0 +1 @@
+export declare function optimizer(cssCode: string): Promise<string>;

package/dist/optimizer.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.optimizer = optimizer;
+const postcss_1 = __importDefault(require("postcss"));
+const postcss_combine_media_query_1 = __importDefault(require("postcss-combine-media-query"));
+const lightningcss_1 = require("lightningcss");
+async function optimizer(cssCode) {
+    const merged = await (0, postcss_1.default)([(0, postcss_combine_media_query_1.default)()]).process(cssCode, {
+        from: undefined,
+    });
+    const light = (0, lightningcss_1.transform)({
+        filename: 'global.css',
+        code: Buffer.from(merged.css),
+        minify: true,
+        targets: {
+            safari: 16,
+            edge: 110,
+            firefox: 110,
+            chrome: 110,
+        },
+    });
+    return Buffer.from(light.code).toString('utf-8');
+}

package/dist/parser.js

@@ -227,6 +227,9 @@ function getPropertyKey(node, staticTable, keyframesHashTable, viewTransitionHas
             const staticResult = resolveCreateStaticTableMemberExpression(expr, createStaticHashTable, createStaticObjectTable);
             if (typeof staticResult === 'string')
                 return staticResult;
+            const themeResult = resolveCreateThemeTableMemberExpressionByNode(expr, createThemeHashTable, createThemeObjectTable);
+            if (typeof themeResult === 'string')
+                return themeResult;
         }
         if (exports.t.isTemplateLiteral(expr)) {
             return evaluateTemplateLiteral(expr, staticTable, keyframesHashTable, viewTransitionHashTable, createThemeHashTable, createThemeObjectTable, createStaticHashTable, createStaticObjectTable);
@@ -453,18 +456,8 @@ function scanAll() {
         extractedSheet: '',
     };
     const files = fs_1.default.globSync(PATTERN_PATH, GLOB_OPTIONS);
-    files.sort((a, b) => {
-        const aPriority = a.includes('/lib/') || a.includes('/utils/') || a.includes('/common/')
-            ? 0
-            : 1;
-        const bPriority = b.includes('/lib/') || b.includes('/utils/') || b.includes('/common/')
-            ? 0
-            : 1;
-        if (aPriority !== bPriority)
-            return aPriority - bPriority;
-        return a.localeCompare(b);
-    });
     const totalExtractedSheets = [];
+    const currentScanThemeObjectTable = {};
     for (let passNumber = 1; passNumber <= 2; passNumber++) {
         const isFirstPass = passNumber === 1;
         for (const filePath of files) {
@@ -500,6 +493,8 @@ function scanAll() {
                         for (const key of Object.keys(cached.createThemeObjectTable)) {
                             localTables.createThemeObjectTable[key] =
                                 cached.createThemeObjectTable[key];
+                            currentScanThemeObjectTable[key] =
+                                cached.createThemeObjectTable[key];
                         }
                         for (const key of Object.keys(cached.createStaticHashTable)) {
                             localTables.createStaticHashTable[`${filePath}-${key}`] =
@@ -625,9 +620,21 @@ function scanAll() {
                                         if (localTables.createThemeHashTable[uniqueKey]) {
                                             const hash = localTables.createThemeHashTable[uniqueKey];
                                             localCreateThemeHashTable[localName] = hash;
-                                            if (localTables.createThemeObjectTable[hash]) {
-                                                localCreateThemeObjectTable[hash] =
-                                                    localTables.createThemeObjectTable[hash];
+                                        }
+                                        if (localTables.keyframesHashTable[uniqueKey]) {
+                                            const hash = localTables.keyframesHashTable[uniqueKey];
+                                            localKeyframesHashTable[localName] = hash;
+                                            if (localTables.keyframesObjectTable[hash]) {
+                                                localKeyframesObjectTable[hash] =
+                                                    localTables.keyframesObjectTable[hash];
+                                            }
+                                        }
+                                        if (localTables.viewTransitionHashTable[uniqueKey]) {
+                                            const hash = localTables.viewTransitionHashTable[uniqueKey];
+                                            localViewTransitionHashTable[localName] = hash;
+                                            if (localTables.viewTransitionObjectTable[hash]) {
+                                                localViewTransitionObjectTable[hash] =
+                                                    localTables.viewTransitionObjectTable[hash];
                                             }
                                         }
                                     }
@@ -684,7 +691,10 @@ function scanAll() {
                                 };
                                 const obj = objectExpressionToObject(init.arguments[0].expression, localStaticTable, localKeyframesHashTable, localViewTransitionHashTable, localCreateThemeHashTable, localCreateThemeObjectTable, localCreateHashTable, localCreateStaticHashTable, localCreateStaticObjectTable, localVariantsHashTable, resolveVariable);
                                 const uniqueKey = `${filePath}-${name}`;
-                                const isPassOneMethod = method === 'createStatic' || method === 'createTheme';
+                                const isPassOneMethod = method === 'createStatic' ||
+                                    method === 'createTheme' ||
+                                    method === 'keyframes' ||
+                                    method === 'viewTransition';
                                 if (isFirstPass && !isPassOneMethod)
                                     continue;
                                 if (method === 'createStatic') {
@@ -724,7 +734,6 @@ function scanAll() {
                                     localTables.viewTransitionObjectTable[hash] = obj;
                                     localViewTransitionObjectTable[hash] = obj;
                                     if (!isProduction) {
-                                        extractOndemandStyles(obj, fileExtractedSheets, localTables);
                                         extractOndemandStyles({ vt: `vt-${hash}` }, fileExtractedSheets, localTables);
                                     }
                                 }
@@ -734,6 +743,13 @@ function scanAll() {
                                     localCreateThemeObjectTable[hash] = obj;
                                     localCreateThemeHashTable[name] = hash;
                                     localTables.createThemeHashTable[uniqueKey] = hash;
+                                    currentScanThemeObjectTable[hash] = obj;
+                                    const hashMap = {};
+                                    for (const [key] of Object.entries(obj)) {
+                                        const cssVarName = (0, zss_engine_1.camelToKebabCase)(key);
+                                        hashMap[key] = `var(--${cssVarName})`;
+                                    }
+                                    localTables.createAtomicMapTable[hash] = hashMap;
                                 }
                                 else if (method === 'create') {
                                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
@@ -743,7 +759,7 @@ function scanAll() {
                                     localCreateObjectTable[hash] = obj;
                                     const hashMap = {};
                                     Object.entries(obj).forEach(([key, style]) => {
-                                        const records = (0, create_1.getStyleRecords)(key, style, 2);
+                                        const records = (0, create_1.getStyleRecords)(key, style);
                                         const atomMap = {};
                                         records.forEach((r) => (atomMap[r.key] = r.hash));
                                         hashMap[key] = atomMap;
@@ -828,7 +844,7 @@ function extractOndemandStyles(obj, extractedSheets, t) {
                 else if (val.startsWith('cr-')) {
                     createHashes.add(val.slice(3));
                 }
-                else if (!needsTheme && val.includes('var(--')) {
+                else if (val.includes('var(--')) {
                     needsTheme = true;
                 }
             }
@@ -868,7 +884,7 @@ function extractOndemandStyles(obj, extractedSheets, t) {
             const obj = t.createObjectTable[hash];
             if (obj) {
                 Object.entries(obj).forEach(([key, style]) => {
-                    const records = (0, create_1.getStyleRecords)(key, style, 2);
+                    const records = (0, create_1.getStyleRecords)(key, style);
                     records.forEach((r) => addSheet(r.sheet));
                 });
             }

package/dist/resolver.js

@@ -20,7 +20,7 @@ function getTsConfig(startDir) {
         };
     }
     while (currentDir !== path_1.default.parse(currentDir).root) {
-        const tsConfigPath = path_1.default.join(currentDir, 'tsconfig.json');
+        const tsConfigPath = path_1.default.join(process.cwd(), 'tsconfig.json');
         if (fs_1.default.existsSync(tsConfigPath)) {
             if (!tsConfigCache.has(tsConfigPath)) {
                 try {
@@ -34,7 +34,7 @@ function getTsConfig(startDir) {
             tsConfigPathCache.set(startDir, tsConfigPath);
             return {
                 config: tsConfigCache.get(tsConfigPath) ?? null,
-                basePath: currentDir,
+                basePath: path_1.default.dirname(tsConfigPath),
             };
         }
         currentDir = path_1.default.dirname(currentDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "6.2.1",
+  "version": "6.3.1",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",
@@ -22,7 +22,10 @@
   ],
   "dependencies": {
     "@swc/core": "1.15.8",
-    "zss-engine": "2.2.0"
+    "zss-engine": "2.2.0",
+    "postcss": "8.5.6",
+    "postcss-combine-media-query": "^2.1.0",
+    "lightningcss": "^1.30.2"
   },
   "publishConfig": {
     "access": "public",