@csszyx/compiler 0.10.4 → 0.10.5

package/dist/index.cjs

@@ -638,16 +638,19 @@ function transformSourceCode(source, filename, options) {
               if (!t__namespace.isIdentifier(path.node.id)) {
                 return;
               }
-              const configArg = init.arguments[0];
-              if (!t__namespace.isObjectExpression(configArg)) {
-                return;
-              }
-              const config = evaluateStaticObject(configArg);
-              if (!config) {
+              const configArg = resolveToConstObjectExpression(
+                init.arguments[0],
+                path.scope
+              );
+              if (!configArg) {
                 return;
               }
-              const base = config.base ?? {};
-              const variants = config.variants ?? {};
+              const base = readStaticConfigObject(configArg, "base", path.scope) ?? {};
+              const variants = readStaticConfigObject(
+                configArg,
+                "variants",
+                path.scope
+              ) ?? {};
               const classStrings = [];
               const baseResult = transformCore.transform(base);
               const baseCls = typeof baseResult === "string" ? baseResult : baseResult.className;
@@ -885,6 +888,35 @@ function tryHoistConditionalSpread(node, getBinding) {
   }
   return t__namespace.conditionalExpression(conditionalExpr.test, resolvedA, resolvedB);
 }
+function readStaticConfigObject(configExpr, key, scope) {
+  for (const prop of configExpr.properties) {
+    if (!t__namespace.isObjectProperty(prop) || prop.computed) {
+      continue;
+    }
+    const k = t__namespace.isIdentifier(prop.key) ? prop.key.name : t__namespace.isStringLiteral(prop.key) ? prop.key.value : null;
+    if (k !== key) {
+      continue;
+    }
+    const obj = resolveToConstObjectExpression(prop.value, scope);
+    return obj ? evaluateStaticObject(obj) : null;
+  }
+  return null;
+}
+function resolveToConstObjectExpression(node, scope) {
+  if (t__namespace.isObjectExpression(node)) {
+    return node;
+  }
+  if (t__namespace.isIdentifier(node)) {
+    const binding = scope.getBinding(node.name);
+    if (binding?.kind === "const" && binding.constant) {
+      const declNode = binding.path.node;
+      if (t__namespace.isVariableDeclarator(declNode) && t__namespace.isObjectExpression(declNode.init)) {
+        return declNode.init;
+      }
+    }
+  }
+  return null;
+}
 function evaluateStaticObject(node) {
   const result = {};
   for (const prop of node.properties) {
@@ -2266,6 +2298,7 @@ function transformOxc(source, filename, options) {
   assertAstBudget(parsed.program, effectiveFilename, astBudget);
   const edits = new MagicString__default(source);
   const objectBindings = collectObjectBindings(parsed.program);
+  const constObjectBindings = collectObjectBindings(parsed.program, true);
   const conditionalBindings = collectConditionalBindings(parsed.program);
   const reservedCSSVariableNames = options?.mangleVars ? collectStaticStyleCustomPropertyNames(parsed.program) : void 0;
   const componentHoists = options?.mangleVars ? planOxcComponentVariableHoists(
@@ -2294,7 +2327,7 @@ function transformOxc(source, filename, options) {
       collectSzvCallClasses(
         node,
         effectiveFilename,
-        objectBindings,
+        constObjectBindings,
         classes
       );
       return;
@@ -3224,18 +3257,9 @@ function collectSzvCallClasses(node, filename, bindings, classes) {
   if (!configNode) {
     return;
   }
-  let config;
-  try {
-    config = astObjectToSzObject(configNode, filename, bindings);
-  } catch (err) {
-    if (err instanceof OxcNotImplementedError) {
-      return;
-    }
-    throw err;
-  }
-  const base = isSzObject(config.base) ? config.base : {};
+  const base = readConfigSubObject(configNode, "base", filename, bindings);
   addCompiledClasses(base, classes);
-  const variants = isSzObject(config.variants) ? config.variants : {};
+  const variants = readConfigSubObject(configNode, "variants", filename, bindings);
   for (const variantValues of Object.values(variants)) {
     if (!isSzObject(variantValues)) {
       continue;
@@ -3248,6 +3272,30 @@ function collectSzvCallClasses(node, filename, bindings, classes) {
     }
   }
 }
+function readConfigSubObject(configNode, key, filename, bindings) {
+  for (const propRaw of configNode.properties) {
+    if (propRaw.type !== "Property") {
+      continue;
+    }
+    const prop = propRaw;
+    if (prop.computed || extractKeyName(prop.key) !== key) {
+      continue;
+    }
+    const valueObj = resolveObjectExpression(prop.value, bindings);
+    if (!valueObj) {
+      return {};
+    }
+    try {
+      return astObjectToSzObject(valueObj, filename, bindings);
+    } catch (err) {
+      if (err instanceof OxcNotImplementedError) {
+        return {};
+      }
+      throw err;
+    }
+  }
+  return {};
+}
 function addCompiledClasses(object, classes) {
   const result = transformCore.transform(object);
   for (const cls of result.className.split(/\s+/)) {
@@ -4090,20 +4138,33 @@ function astValueToSzValue(node, filename, bindings) {
     `unsupported value node type ${node.type} at ${filename}:${node.start}`
   );
 }
-function collectObjectBindings(root) {
+function collectObjectBindings(root, constOnly = false) {
   const bindings = /* @__PURE__ */ new Map();
   walk(root, (node) => {
-    if (node.type !== "VariableDeclarator") {
+    if (node.type !== "VariableDeclaration") {
       return;
     }
-    const id = node.id;
-    const init = node.init;
-    if (!id || id.type !== "Identifier" || !init) {
+    const decl = node;
+    if (constOnly && decl.kind !== "const") {
       return;
     }
-    const unwrapped = unwrapExpression(init);
-    if (unwrapped.type === "ObjectExpression") {
-      bindings.set(String(id.name), unwrapped);
+    if (!decl.declarations) {
+      return;
+    }
+    for (const declaratorNode of decl.declarations) {
+      const declarator = declaratorNode;
+      const id = declarator.id;
+      const init = declarator.init;
+      if (!id || id.type !== "Identifier" || !init) {
+        continue;
+      }
+      const unwrapped = unwrapExpression(init);
+      if (unwrapped.type === "ObjectExpression") {
+        bindings.set(
+          String(id.name),
+          unwrapped
+        );
+      }
     }
   });
   return bindings;

package/dist/index.mjs

@@ -619,16 +619,19 @@ function transformSourceCode(source, filename, options) {
               if (!t.isIdentifier(path.node.id)) {
                 return;
               }
-              const configArg = init.arguments[0];
-              if (!t.isObjectExpression(configArg)) {
-                return;
-              }
-              const config = evaluateStaticObject(configArg);
-              if (!config) {
+              const configArg = resolveToConstObjectExpression(
+                init.arguments[0],
+                path.scope
+              );
+              if (!configArg) {
                 return;
               }
-              const base = config.base ?? {};
-              const variants = config.variants ?? {};
+              const base = readStaticConfigObject(configArg, "base", path.scope) ?? {};
+              const variants = readStaticConfigObject(
+                configArg,
+                "variants",
+                path.scope
+              ) ?? {};
               const classStrings = [];
               const baseResult = transform(base);
               const baseCls = typeof baseResult === "string" ? baseResult : baseResult.className;
@@ -866,6 +869,35 @@ function tryHoistConditionalSpread(node, getBinding) {
   }
   return t.conditionalExpression(conditionalExpr.test, resolvedA, resolvedB);
 }
+function readStaticConfigObject(configExpr, key, scope) {
+  for (const prop of configExpr.properties) {
+    if (!t.isObjectProperty(prop) || prop.computed) {
+      continue;
+    }
+    const k = t.isIdentifier(prop.key) ? prop.key.name : t.isStringLiteral(prop.key) ? prop.key.value : null;
+    if (k !== key) {
+      continue;
+    }
+    const obj = resolveToConstObjectExpression(prop.value, scope);
+    return obj ? evaluateStaticObject(obj) : null;
+  }
+  return null;
+}
+function resolveToConstObjectExpression(node, scope) {
+  if (t.isObjectExpression(node)) {
+    return node;
+  }
+  if (t.isIdentifier(node)) {
+    const binding = scope.getBinding(node.name);
+    if (binding?.kind === "const" && binding.constant) {
+      const declNode = binding.path.node;
+      if (t.isVariableDeclarator(declNode) && t.isObjectExpression(declNode.init)) {
+        return declNode.init;
+      }
+    }
+  }
+  return null;
+}
 function evaluateStaticObject(node) {
   const result = {};
   for (const prop of node.properties) {
@@ -2247,6 +2279,7 @@ function transformOxc(source, filename, options) {
   assertAstBudget(parsed.program, effectiveFilename, astBudget);
   const edits = new MagicString(source);
   const objectBindings = collectObjectBindings(parsed.program);
+  const constObjectBindings = collectObjectBindings(parsed.program, true);
   const conditionalBindings = collectConditionalBindings(parsed.program);
   const reservedCSSVariableNames = options?.mangleVars ? collectStaticStyleCustomPropertyNames(parsed.program) : void 0;
   const componentHoists = options?.mangleVars ? planOxcComponentVariableHoists(
@@ -2275,7 +2308,7 @@ function transformOxc(source, filename, options) {
       collectSzvCallClasses(
         node,
         effectiveFilename,
-        objectBindings,
+        constObjectBindings,
         classes
       );
       return;
@@ -3205,18 +3238,9 @@ function collectSzvCallClasses(node, filename, bindings, classes) {
   if (!configNode) {
     return;
   }
-  let config;
-  try {
-    config = astObjectToSzObject(configNode, filename, bindings);
-  } catch (err) {
-    if (err instanceof OxcNotImplementedError) {
-      return;
-    }
-    throw err;
-  }
-  const base = isSzObject(config.base) ? config.base : {};
+  const base = readConfigSubObject(configNode, "base", filename, bindings);
   addCompiledClasses(base, classes);
-  const variants = isSzObject(config.variants) ? config.variants : {};
+  const variants = readConfigSubObject(configNode, "variants", filename, bindings);
   for (const variantValues of Object.values(variants)) {
     if (!isSzObject(variantValues)) {
       continue;
@@ -3229,6 +3253,30 @@ function collectSzvCallClasses(node, filename, bindings, classes) {
     }
   }
 }
+function readConfigSubObject(configNode, key, filename, bindings) {
+  for (const propRaw of configNode.properties) {
+    if (propRaw.type !== "Property") {
+      continue;
+    }
+    const prop = propRaw;
+    if (prop.computed || extractKeyName(prop.key) !== key) {
+      continue;
+    }
+    const valueObj = resolveObjectExpression(prop.value, bindings);
+    if (!valueObj) {
+      return {};
+    }
+    try {
+      return astObjectToSzObject(valueObj, filename, bindings);
+    } catch (err) {
+      if (err instanceof OxcNotImplementedError) {
+        return {};
+      }
+      throw err;
+    }
+  }
+  return {};
+}
 function addCompiledClasses(object, classes) {
   const result = transform(object);
   for (const cls of result.className.split(/\s+/)) {
@@ -4071,20 +4119,33 @@ function astValueToSzValue(node, filename, bindings) {
     `unsupported value node type ${node.type} at ${filename}:${node.start}`
   );
 }
-function collectObjectBindings(root) {
+function collectObjectBindings(root, constOnly = false) {
   const bindings = /* @__PURE__ */ new Map();
   walk(root, (node) => {
-    if (node.type !== "VariableDeclarator") {
+    if (node.type !== "VariableDeclaration") {
       return;
     }
-    const id = node.id;
-    const init = node.init;
-    if (!id || id.type !== "Identifier" || !init) {
+    const decl = node;
+    if (constOnly && decl.kind !== "const") {
       return;
     }
-    const unwrapped = unwrapExpression(init);
-    if (unwrapped.type === "ObjectExpression") {
-      bindings.set(String(id.name), unwrapped);
+    if (!decl.declarations) {
+      return;
+    }
+    for (const declaratorNode of decl.declarations) {
+      const declarator = declaratorNode;
+      const id = declarator.id;
+      const init = declarator.init;
+      if (!id || id.type !== "Identifier" || !init) {
+        continue;
+      }
+      const unwrapped = unwrapExpression(init);
+      if (unwrapped.type === "ObjectExpression") {
+        bindings.set(
+          String(id.name),
+          unwrapped
+        );
+      }
     }
   });
   return bindings;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@csszyx/compiler",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "Core compiler and transformation logic for csszyx",
   "keywords": [
     "csszyx",
@@ -65,7 +65,7 @@
     "@babel/types": "^7.23.6",
     "magic-string": "0.30.21",
     "oxc-parser": "0.131.0",
-    "@csszyx/core": "0.10.4"
+    "@csszyx/core": "0.10.5"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",