@wix/zero-config-implementation 1.94.0 → 1.95.0

package/package.json

@@ -4,7 +4,7 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "version": "1.94.0",
+  "version": "1.95.0",
   "description": "Core library for extracting component manifests from JS and CSS files",
   "type": "module",
   "main": "dist/index.js",
@@ -106,5 +106,5 @@
       ]
     }
   },
-  "falconPackageHash": "c359f3991c9148a6bb0473cbb1eef6bfef7fd8401e45720aaed8b44c"
+  "falconPackageHash": "831bcccde22937359efc18de9a5b8b4e52d3ca3fa6ebdbdd9bcb4a65"
 }

package/src/converters/to-editor-component.test.ts

@@ -263,6 +263,29 @@ describe('toEditorReactComponent display conversion', () => {
   })
 })
 
+describe('toEditorReactComponent — cssProperties defaultValue', () => {
+  it('ignores the var() fallback when building a regular CSS property defaultValue', () => {
+    const extractorData = new Map<string, unknown>()
+    extractorData.set('css-matcher', matcherDataFromCss('background: var(wst-primary-background-color, tomato);'))
+    extractorData.set('css-properties', { relevant: [CSS_PROPERTIES.CSS_PROPERTY_TYPE.background] })
+
+    const rootElement: ExtractedElement = {
+      traceId: 'trace-root',
+      name: 'root',
+      tag: 'div',
+      attributes: {},
+      extractorData,
+      children: [],
+    }
+
+    const result = toEditorReactComponent(createComponent(rootElement))
+
+    expect(result.editorElement?.cssProperties?.background).toEqual({
+      defaultValue: 'var(--wst-primary-background-color)',
+    })
+  })
+})
+
 describe('toEditorReactComponent selector conversion', () => {
   it.each([
     ['a', 'a___'],

package/src/converters/to-editor-component.ts

@@ -16,6 +16,7 @@ import { IoError } from '../errors'
 import { buildRefElementManifestKey } from '../extensions/ref-elements/path-utils'
 import type { RefElementMatch } from '../extensions/ref-elements/types'
 import type { ComponentInfoWithCss } from '../index'
+import { stripVarFallback } from '../information-extractors/css/parse'
 import type { MatchedCssData, RegisteredCustomProperty } from '../information-extractors/css/types'
 import type {
   CoupledComponentInfo,
@@ -580,7 +581,8 @@ function buildCssProperties(element: ExtractedElement | undefined): Record<strin
       result[propName] = buildDisplayProperty(element)
       continue
     }
-    const defaultValue = resolveLonghand(propName, cssPropertyValues)
+    const resolvedValue = resolveLonghand(propName, cssPropertyValues)
+    const defaultValue = resolvedValue !== undefined ? stripVarFallback(resolvedValue) : undefined
     result[propName] = {
       ...(defaultValue !== undefined && { defaultValue }),
     }

package/src/information-extractors/css/parse.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { parseCss, resolveCssPropertyValue } from './parse'
+import { parseCss, resolveCssPropertyValue, stripVarFallback } from './parse'
 
 describe('parseCss — getStateClasses', () => {
   it('extracts a custom-class modifier with no paired pseudo', () => {
@@ -325,3 +325,21 @@ describe('resolveVarIdentifiers — CSS Modules @value compatibility', () => {
     expect(contentProperty.value).toBe('"var(foo)"')
   })
 })
+
+describe('stripVarFallback', () => {
+  it('removes a var() fallback, keeping only the variable reference', () => {
+    expect(stripVarFallback('var(--wst-primary-background-color, tomato)')).toBe('var(--wst-primary-background-color)')
+  })
+
+  it('leaves a var() with no fallback unchanged', () => {
+    expect(stripVarFallback('var(--x)')).toBe('var(--x)')
+  })
+
+  it('strips a fallback embedded within a larger value', () => {
+    expect(stripVarFallback('1px solid var(--border-color, gray)')).toBe('1px solid var(--border-color)')
+  })
+
+  it('leaves a value with no var() unchanged', () => {
+    expect(stripVarFallback('10px')).toBe('10px')
+  })
+})

package/src/information-extractors/css/parse.ts

@@ -373,6 +373,34 @@ function resolveVarIdentifiers(valueNode: CssNode, valueAliases: Map<string, str
   return generate(valueNode)
 }
 
+/**
+ * Removes the fallback argument from every var() call in a CSS value string. A var()
+ * fallback is not a meaningful "default value" for the editor to surface — only the
+ * variable reference itself is — so `var(--x, tomato)` becomes `var(--x)`.
+ */
+export function stripVarFallback(cssValue: string): string {
+  if (!cssValue.includes('var(')) return cssValue
+
+  try {
+    const valueAst = parse(cssValue, { context: 'value' })
+    walk(valueAst, {
+      visit: 'Function',
+      enter(functionNode: FunctionNode) {
+        if (functionNode.name !== 'var') return
+        const functionArguments = [...functionNode.children]
+        const firstCommaIndex = functionArguments.findIndex(
+          (argumentNode) => argumentNode.type === 'Operator' && argumentNode.value === ',',
+        )
+        if (firstCommaIndex === -1) return
+        functionNode.children.fromArray(functionArguments.slice(0, firstCommaIndex))
+      },
+    })
+    return generate(valueAst)
+  } catch {
+    return cssValue
+  }
+}
+
 /**
  * Extracts all CSS custom property names referenced via var() by walking
  * the declaration value AST for Function nodes named "var".