@plumeria/compiler 6.2.0 → 6.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/index.js +26 -13
  2. package/package.json +2 -2
package/dist/index.js CHANGED
@@ -74,9 +74,6 @@ function compileCSS(options) {
74
74
  importMap[localName] =
75
75
  scannedTables.viewTransitionHashTable[uniqueKey];
76
76
  }
77
- if (scannedTables.themeTable[uniqueKey]) {
78
- importMap[localName] = scannedTables.themeTable[uniqueKey];
79
- }
80
77
  if (scannedTables.createHashTable[uniqueKey]) {
81
78
  importMap[localName] = scannedTables.createHashTable[uniqueKey];
82
79
  }
@@ -84,6 +81,14 @@ function compileCSS(options) {
84
81
  importMap[localName] =
85
82
  scannedTables.variantsHashTable[uniqueKey];
86
83
  }
84
+ if (scannedTables.createThemeHashTable[uniqueKey]) {
85
+ importMap[localName] =
86
+ scannedTables.createThemeHashTable[uniqueKey];
87
+ }
88
+ if (scannedTables.createStaticHashTable[uniqueKey]) {
89
+ importMap[localName] =
90
+ scannedTables.createStaticHashTable[uniqueKey];
91
+ }
87
92
  }
88
93
  });
89
94
  }
@@ -114,12 +119,20 @@ function compileCSS(options) {
114
119
  for (const key of Object.keys(importMap)) {
115
120
  mergedViewTransitionTable[key] = importMap[key];
116
121
  }
117
- const mergedThemeTable = {};
118
- for (const key of Object.keys(scannedTables.themeTable)) {
119
- mergedThemeTable[key] = scannedTables.themeTable[key];
122
+ const mergedCreateThemeHashTable = {};
123
+ for (const key of Object.keys(scannedTables.createThemeHashTable)) {
124
+ mergedCreateThemeHashTable[key] = scannedTables.createThemeHashTable[key];
125
+ }
126
+ for (const key of Object.keys(importMap)) {
127
+ mergedCreateThemeHashTable[key] = importMap[key];
128
+ }
129
+ const mergedCreateStaticHashTable = {};
130
+ for (const key of Object.keys(scannedTables.createStaticHashTable)) {
131
+ mergedCreateStaticHashTable[key] =
132
+ scannedTables.createStaticHashTable[key];
120
133
  }
121
134
  for (const key of Object.keys(importMap)) {
122
- mergedThemeTable[key] = importMap[key];
135
+ mergedCreateStaticHashTable[key] = importMap[key];
123
136
  }
124
137
  const mergedCreateTable = {};
125
138
  for (const key of Object.keys(scannedTables.createHashTable)) {
@@ -169,7 +182,7 @@ function compileCSS(options) {
169
182
  }
170
183
  };
171
184
  if (propName === 'create') {
172
- const obj = (0, utils_1.objectExpressionToObject)(node.init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable, mergedCreateTable, mergedVariantsTable, resolveVariable);
185
+ const obj = (0, utils_1.objectExpressionToObject)(node.init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable, resolveVariable);
173
186
  if (obj) {
174
187
  localCreateStyles[node.id.value] = { type: 'create', obj };
175
188
  Object.entries(obj).forEach(([key, style]) => {
@@ -182,7 +195,7 @@ function compileCSS(options) {
182
195
  }
183
196
  }
184
197
  else if (propName === 'variants') {
185
- const obj = (0, utils_1.objectExpressionToObject)(node.init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable, mergedCreateTable, mergedVariantsTable, resolveVariable);
198
+ const obj = (0, utils_1.objectExpressionToObject)(node.init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable, resolveVariable);
186
199
  if (obj) {
187
200
  localCreateStyles[node.id.value] = { type: 'variant', obj };
188
201
  }
@@ -215,7 +228,7 @@ function compileCSS(options) {
215
228
  const extractStylesFromExpression = (expr) => {
216
229
  const results = [];
217
230
  if (utils_1.t.isObjectExpression(expr)) {
218
- const obj = (0, utils_1.objectExpressionToObject)(expr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable, mergedCreateTable, mergedVariantsTable);
231
+ const obj = (0, utils_1.objectExpressionToObject)(expr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
219
232
  if (obj)
220
233
  results.push(obj);
221
234
  }
@@ -443,14 +456,14 @@ function compileCSS(options) {
443
456
  else if (propName === 'keyframes' &&
444
457
  args.length > 0 &&
445
458
  utils_1.t.isObjectExpression(args[0].expression)) {
446
- const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable, mergedCreateTable, mergedVariantsTable);
459
+ const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
447
460
  const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
448
461
  scannedTables.keyframesObjectTable[hash] = obj;
449
462
  }
450
463
  else if (propName === 'viewTransition' &&
451
464
  args.length > 0 &&
452
465
  utils_1.t.isObjectExpression(args[0].expression)) {
453
- const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable, mergedCreateTable, mergedVariantsTable);
466
+ const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
454
467
  const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
455
468
  scannedTables.viewTransitionObjectTable[hash] = obj;
456
469
  (0, utils_1.extractOndemandStyles)(obj, extractedSheets, scannedTables);
@@ -459,7 +472,7 @@ function compileCSS(options) {
459
472
  else if (propName === 'createTheme' &&
460
473
  args.length > 0 &&
461
474
  utils_1.t.isObjectExpression(args[0].expression)) {
462
- const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable, mergedCreateTable, mergedVariantsTable);
475
+ const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
463
476
  const themeHash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
464
477
  scannedTables.createThemeObjectTable[themeHash] = obj;
465
478
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@plumeria/compiler",
3
- "version": "6.2.0",
3
+ "version": "6.2.1",
4
4
  "description": "Plumeria swc based compiler for statically extracting css",
5
5
  "author": "Refirst 11",
6
6
  "license": "MIT",
@@ -21,7 +21,7 @@
21
21
  "dist/"
22
22
  ],
23
23
  "dependencies": {
24
- "@plumeria/utils": "^6.2.0"
24
+ "@plumeria/utils": "^6.2.1"
25
25
  },
26
26
  "devDependencies": {
27
27
  "@swc/core": "1.15.8",