@tamagui/static 1.132.16 → 1.132.17

package/src/extractor/extractToNative.ts

@@ -163,10 +163,6 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
               ]),
               shouldPrintDebug,
               ...finalOptions,
-              // disable this extraction for now at least, need to figure out merging theme vs non-theme
-              // because theme need to stay in render(), whereas non-theme can be extracted
-              // for now just turn it off entirely at a small perf loss
-              disableExtractInlineMedia: true,
               // disable extracting variables as no native concept of them (only theme values)
               disableExtractVariables: options.experimentalFlattenThemesOnNative
                 ? false
@@ -188,13 +184,6 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
               },
 
               onExtractTag(props) {
-                const { isFlattened } = props
-
-                if (!isFlattened) {
-                  // we aren't optimizing at all if not flattened anymore
-                  return
-                }
-
                 assertValidTag(props.node)
                 const stylesExpr = t.arrayExpression([])
                 const hocStylesExpr = t.arrayExpression([])
@@ -285,37 +274,7 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
                         consExpr || t.nullLiteral(),
                         altExpr || t.nullLiteral()
                       )
-                      addStyleExpression(
-                        styleExpr
-                        // TODO: what is this for ?
-                        // isFlattened ? simpleHash(JSON.stringify({ consequent, alternate })) : undefined
-                      )
-                      break
-                    }
-
-                    case 'dynamic-style': {
-                      hasDynamicStyle = true
-                      expressions.push(attr.value as t.Expression)
-                      if (options.experimentalFlattenDynamicValues) {
-                        addStyleExpression(
-                          t.objectExpression([
-                            t.objectProperty(
-                              t.identifier(attr.name as string),
-                              t.identifier(`_expressions[${expressions.length - 1}]`)
-                            ),
-                          ]),
-                          true
-                        )
-                      } else {
-                        addStyleExpression(
-                          t.objectExpression([
-                            t.objectProperty(
-                              t.identifier(attr.name as string),
-                              attr.value as t.Expression
-                            ),
-                          ])
-                        )
-                      }
+                      addStyleExpression(styleExpr)
                       break
                     }
 
@@ -343,83 +302,81 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
 
                 props.node.attributes = finalAttrs
 
-                if (props.isFlattened) {
-                  if (
-                    options.experimentalFlattenThemesOnNative &&
-                    (themeKeysUsed.size ||
-                      hocStylesExpr.elements.length > 1 ||
-                      hasDynamicStyle)
-                  ) {
-                    if (!hasImportedViewWrapper) {
-                      root.unshiftContainer('body', importWithStyle())
-                      root.unshiftContainer('body', importReactUseMemo())
-                      hasImportedViewWrapper = true
-                    }
-
-                    const name = props.node.name['name']
-                    const WrapperIdentifier = root.scope.generateUidIdentifier(
-                      name + 'Wrapper'
-                    )
-
-                    root.pushContainer(
-                      'body',
-                      t.variableDeclaration('const', [
-                        t.variableDeclarator(
-                          WrapperIdentifier,
-                          t.callExpression(t.identifier('__withStableStyle'), [
-                            t.identifier(name),
-                            t.arrowFunctionExpression(
-                              [t.identifier('theme'), t.identifier('_expressions')],
-                              t.blockStatement([
-                                t.returnStatement(
-                                  t.callExpression(t.identifier('__ReactUseMemo'), [
-                                    t.arrowFunctionExpression(
-                                      [],
-                                      t.blockStatement([
-                                        t.returnStatement(
-                                          t.arrayExpression([...hocStylesExpr.elements])
-                                        ),
-                                      ])
-                                    ),
-                                    t.arrayExpression([
-                                      t.spreadElement(t.identifier('_expressions')),
-                                    ]),
-                                  ])
-                                ),
-                              ])
-                            ),
-                          ])
-                        ),
-                      ])
-                    )
+                if (
+                  options.experimentalFlattenThemesOnNative &&
+                  (themeKeysUsed.size ||
+                    hocStylesExpr.elements.length > 1 ||
+                    hasDynamicStyle)
+                ) {
+                  if (!hasImportedViewWrapper) {
+                    root.unshiftContainer('body', importWithStyle())
+                    root.unshiftContainer('body', importReactUseMemo())
+                    hasImportedViewWrapper = true
+                  }
 
+                  const name = props.flatNodeName || props.node.name['name']
+                  const WrapperIdentifier = root.scope.generateUidIdentifier(
+                    name + 'Wrapper'
+                  )
+
+                  root.pushContainer(
+                    'body',
+                    t.variableDeclaration('const', [
+                      t.variableDeclarator(
+                        WrapperIdentifier,
+                        t.callExpression(t.identifier('__withStableStyle'), [
+                          t.identifier(name),
+                          t.arrowFunctionExpression(
+                            [t.identifier('theme'), t.identifier('_expressions')],
+                            t.blockStatement([
+                              t.returnStatement(
+                                t.callExpression(t.identifier('__ReactUseMemo'), [
+                                  t.arrowFunctionExpression(
+                                    [],
+                                    t.blockStatement([
+                                      t.returnStatement(
+                                        t.arrayExpression([...hocStylesExpr.elements])
+                                      ),
+                                    ])
+                                  ),
+                                  t.arrayExpression([
+                                    t.spreadElement(t.identifier('_expressions')),
+                                  ]),
+                                ])
+                              ),
+                            ])
+                          ),
+                        ])
+                      ),
+                    ])
+                  )
+
+                  // @ts-ignore
+                  props.node.name = WrapperIdentifier
+                  if (props.jsxPath.node.closingElement) {
                     // @ts-ignore
-                    props.node.name = WrapperIdentifier
-                    if (props.jsxPath.node.closingElement) {
-                      // @ts-ignore
-                      props.jsxPath.node.closingElement.name = WrapperIdentifier
-                    }
+                    props.jsxPath.node.closingElement.name = WrapperIdentifier
+                  }
 
-                    if (expressions.length) {
-                      props.node.attributes.push(
-                        t.jsxAttribute(
-                          t.jsxIdentifier('expressions'),
-                          t.jsxExpressionContainer(t.arrayExpression(expressions))
-                        )
-                      )
-                    }
-                  } else {
+                  if (expressions.length) {
                     props.node.attributes.push(
                       t.jsxAttribute(
-                        t.jsxIdentifier('style'),
-                        t.jsxExpressionContainer(
-                          stylesExpr.elements.length === 1
-                            ? (stylesExpr.elements[0] as any)
-                            : stylesExpr
-                        )
+                        t.jsxIdentifier('expressions'),
+                        t.jsxExpressionContainer(t.arrayExpression(expressions))
                       )
                     )
                   }
+                } else {
+                  props.node.attributes.push(
+                    t.jsxAttribute(
+                      t.jsxIdentifier('style'),
+                      t.jsxExpressionContainer(
+                        stylesExpr.elements.length === 1
+                          ? (stylesExpr.elements[0] as any)
+                          : stylesExpr
+                      )
+                    )
+                  )
                 }
               },
             })

package/src/extractor/normalizeTernaries.ts

@@ -1,8 +1,9 @@
 import generate from '@babel/generator'
 import * as t from '@babel/types'
+import { mergeProps } from '@tamagui/web'
 import invariant from 'invariant'
-
 import type { Ternary } from '../types'
+import { forwardFontFamilyName } from './propsToFontFamilyCache'
 
 export function normalizeTernaries(ternaries: Ternary[]) {
   invariant(
@@ -56,8 +57,14 @@ export function normalizeTernaries(ternaries: Ternary[]) {
     }
     const altStyle = (shouldSwap ? consequent : alternate) ?? {}
     const consStyle = (shouldSwap ? alternate : consequent) ?? {}
-    Object.assign(ternariesByKey[key].alternate!, altStyle)
-    Object.assign(ternariesByKey[key].consequent!, consStyle)
+
+    const nextAlt = ternariesByKey[key].alternate!
+    ternariesByKey[key].alternate = mergeProps(altStyle, nextAlt)
+    forwardFontFamilyName(altStyle, ternariesByKey[key].alternate)
+
+    const nextCons = ternariesByKey[key].consequent!
+    ternariesByKey[key].consequent = mergeProps(consStyle, nextCons)
+    forwardFontFamilyName(consStyle, ternariesByKey[key].consequent)
   }
 
   const ternaryExpression = Object.keys(ternariesByKey).map((key) => {

package/src/extractor/propsToFontFamilyCache.ts

@@ -3,16 +3,16 @@
 const cache = new WeakMap<any, string>()
 
 export function setPropsToFontFamily(props: any, ff: string) {
-  cache.set(props, ff)
+  cache.set(props, ff.replace('$', '').trim())
 }
 
-export function getPropsToFontFamily(props: any) {
+export function getFontFamilyNameFromProps(props: any) {
   return cache.get(props)
 }
 
-export function getFontFamilyClassNameFromProps(props: any) {
-  const ff = getPropsToFontFamily(props)
+export function forwardFontFamilyName(prev: any, next: any, fallback?: string) {
+  const ff = getFontFamilyNameFromProps(prev) || fallback
   if (ff) {
-    return ` font_${ff.replace('$', '')}`
+    setPropsToFontFamily(next, ff)
   }
 }

package/src/registerRequire.ts

@@ -54,7 +54,7 @@ export function registerRequire(
       return og.apply(this, ['tamagui/native'])
     }
 
-    if (path === '@tamagui/core' || path === '@tamagui/web') {
+    if (path === '@tamagui/core') {
       return requireTamaguiCore(platform, (path) => {
         return og.apply(this, [path])
       })

package/src/types.ts

@@ -39,6 +39,7 @@ export type ExtractorOptions = {
 export type ExtractedAttrAttr = {
   type: 'attr'
   value: t.JSXAttribute | t.JSXSpreadAttribute
+  extraClassNames?: string
 }
 
 export type ExtractedAttrStyle = {
@@ -46,31 +47,27 @@ export type ExtractedAttrStyle = {
   value: ViewStyle & PseudoStyles
   attr?: t.JSXAttribute | t.JSXSpreadAttribute
   name?: string
+  extraClassNames?: string
 }
 
-export type ExtractedDynAttrStyle = {
-  type: 'dynamic-style'
-  name?: string
-  value: t.Expression | t.JSXEmptyExpression
+export type ExtractedTernaryAttr = {
+  type: 'ternary'
+  value: Ternary
 }
 
-export type ExtractedAttr =
-  | ExtractedAttrAttr
-  | { type: 'ternary'; value: Ternary }
-  | ExtractedAttrStyle
-  | ExtractedDynAttrStyle
+export type ExtractedAttr = ExtractedAttrAttr | ExtractedTernaryAttr | ExtractedAttrStyle
 
 export type ExtractTagProps = {
   parserProps: TamaguiOptionsWithFileInfo
   attrs: ExtractedAttr[]
   node: t.JSXOpeningElement
   attemptEval: (exprNode: t.Node, evalFn?: ((node: t.Node) => any) | undefined) => any
+  flatNodeName?: string
   jsxPath: NodePath<t.JSXElement>
   programPath: NodePath<t.Program>
   originalNodeName: string
   lineNumbers: string
   filePath: string
-  isFlattened: boolean
   completeProps: Record<string, any>
   staticConfig: StaticConfig
   config: TamaguiConfig
@@ -91,16 +88,16 @@ export type ExtractorParseProps = Omit<
   getFlattenedNode?: (props: { isTextView: boolean; tag: string }) => string
   extractStyledDefinitions?: boolean
   // identifer, rule
-  onStyleRule?: (identifier: string, rules: string[]) => void
+  onStyledDefinitionRule?: (identifier: string, rules: string[]) => void
 }
 
 export interface Ternary {
   test: t.Expression
-  // shorthand props that don't use hooks
-  inlineMediaQuery?: string
   remove: Function
   consequent: Object | null
   alternate: Object | null
+  fontFamily?: string
+  inlineMediaQuery?: string
 }
 
 export type ClassNameToStyleObj = {

package/types/extractor/createEvaluator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createEvaluator.d.ts","sourceRoot":"","sources":["../../src/extractor/createEvaluator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAIjC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAA;AAG1D,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,eAAe,EACf,UAAU,EACV,YAAY,EACZ,gBAAgB,GACjB,EAAE;IACD,KAAK,EAAE,0BAA0B,CAAA;IACjC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IACrC,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,IAoBS,GAAG,CAAC,CAAC,IAAI,SAGlB;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,GAAG,IACzD,GAAG,CAAC,CAAC,IAAI,SAOlB"}
+{"version":3,"file":"createEvaluator.d.ts","sourceRoot":"","sources":["../../src/extractor/createEvaluator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAIjC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAA;AAG1D,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,eAAe,EACf,UAAU,EACV,YAAY,EACZ,gBAAgB,GACjB,EAAE;IACD,KAAK,EAAE,0BAA0B,CAAA;IACjC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IACrC,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,IA6CS,GAAG,CAAC,CAAC,IAAI,SAGlB;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,GAAG,IACzD,GAAG,CAAC,CAAC,IAAI,SAOlB"}

package/types/extractor/createExtractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAiBjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcxD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAkB1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAQ9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,QAAgB,EAAE,GAAE,gBAAsC;;;;;yBAuDnD,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAKpC,UAAU,SAAS,mBAAmB;;;;;;;EAgvE1D"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAiBjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcxD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAkB1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAQ9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,QAAgB,EAAE,GAAE,gBAAsC;;;;;yBAuDnD,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAKpC,UAAU,SAAS,mBAAmB;;;;;;;EA0pE1D"}

package/types/extractor/errors.d.ts

@@ -0,0 +1,3 @@
+export declare class BailOptimizationError extends Error {
+}
+//# sourceMappingURL=errors.d.ts.map

package/types/extractor/errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/extractor/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,qBAAsB,SAAQ,KAAK;CAAG"}

package/types/extractor/extractToClassNames.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,KAAK,EAAgC,cAAc,EAAW,MAAM,UAAU,CAAA;AAGrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAgBlD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,CAAA;AAED,wBAAsB,mBAAmB,CAAC,EACxC,SAAS,EACT,MAAM,EACN,UAAe,EACf,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAia9D"}
+{"version":3,"file":"extractToClassNames.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToClassNames.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAKjC,OAAO,KAAK,EAAe,cAAc,EAAW,MAAM,UAAU,CAAA;AAEpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAWlD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAA;IACX,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,cAAc,CAAA;IACvB,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC,CAAA;AAQD,wBAAsB,mBAAmB,CAAC,EACxC,SAAS,EACT,MAAM,EACN,UAAe,EACf,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CA8c9D"}

package/types/extractor/extractToNative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractToNative.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToNative.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,aAAa,CAAA;AAQxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AA4B9C,wBAAgB,eAAe,CAC7B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,eAAe,CAoBjB;AAED,wBAAgB,cAAc,QAK7B;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc;;;;wBAM3C,GAAG;;;EA8YtB"}
+{"version":3,"file":"extractToNative.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToNative.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,aAAa,CAAA;AAQxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AA4B9C,wBAAgB,eAAe,CAC7B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,eAAe,CAoBjB;AAED,wBAAgB,cAAc,QAK7B;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc;;;;wBAM3C,GAAG;;;EAmWtB"}

package/types/extractor/normalizeTernaries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeTernaries.d.ts","sourceRoot":"","sources":["../../src/extractor/normalizeTernaries.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAEvC,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,OAAO,EAAE,aA6DtD"}
+{"version":3,"file":"normalizeTernaries.d.ts","sourceRoot":"","sources":["../../src/extractor/normalizeTernaries.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAGvC,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,OAAO,EAAE,aAmEtD"}

package/types/extractor/propsToFontFamilyCache.d.ts

@@ -1,4 +1,4 @@
 export declare function setPropsToFontFamily(props: any, ff: string): void;
-export declare function getPropsToFontFamily(props: any): string | undefined;
-export declare function getFontFamilyClassNameFromProps(props: any): string | undefined;
+export declare function getFontFamilyNameFromProps(props: any): string | undefined;
+export declare function forwardFontFamilyName(prev: any, next: any, fallback?: string): void;
 //# sourceMappingURL=propsToFontFamilyCache.d.ts.map

package/types/extractor/propsToFontFamilyCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"propsToFontFamilyCache.d.ts","sourceRoot":"","sources":["../../src/extractor/propsToFontFamilyCache.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,QAE1D;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,sBAE9C;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,sBAKzD"}
+{"version":3,"file":"propsToFontFamilyCache.d.ts","sourceRoot":"","sources":["../../src/extractor/propsToFontFamilyCache.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,QAE1D;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,GAAG,sBAEpD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,QAK5E"}

package/types/types.d.ts

@@ -29,33 +29,31 @@ export type ExtractorOptions = {
 export type ExtractedAttrAttr = {
     type: 'attr';
     value: t.JSXAttribute | t.JSXSpreadAttribute;
+    extraClassNames?: string;
 };
 export type ExtractedAttrStyle = {
     type: 'style';
     value: ViewStyle & PseudoStyles;
     attr?: t.JSXAttribute | t.JSXSpreadAttribute;
     name?: string;
+    extraClassNames?: string;
 };
-export type ExtractedDynAttrStyle = {
-    type: 'dynamic-style';
-    name?: string;
-    value: t.Expression | t.JSXEmptyExpression;
-};
-export type ExtractedAttr = ExtractedAttrAttr | {
+export type ExtractedTernaryAttr = {
     type: 'ternary';
     value: Ternary;
-} | ExtractedAttrStyle | ExtractedDynAttrStyle;
+};
+export type ExtractedAttr = ExtractedAttrAttr | ExtractedTernaryAttr | ExtractedAttrStyle;
 export type ExtractTagProps = {
     parserProps: TamaguiOptionsWithFileInfo;
     attrs: ExtractedAttr[];
     node: t.JSXOpeningElement;
     attemptEval: (exprNode: t.Node, evalFn?: ((node: t.Node) => any) | undefined) => any;
+    flatNodeName?: string;
     jsxPath: NodePath<t.JSXElement>;
     programPath: NodePath<t.Program>;
     originalNodeName: string;
     lineNumbers: string;
     filePath: string;
-    isFlattened: boolean;
     completeProps: Record<string, any>;
     staticConfig: StaticConfig;
     config: TamaguiConfig;
@@ -73,14 +71,15 @@ export type ExtractorParseProps = Omit<TamaguiOptionsWithFileInfo, 'allLoadedCom
         tag: string;
     }) => string;
     extractStyledDefinitions?: boolean;
-    onStyleRule?: (identifier: string, rules: string[]) => void;
+    onStyledDefinitionRule?: (identifier: string, rules: string[]) => void;
 };
 export interface Ternary {
     test: t.Expression;
-    inlineMediaQuery?: string;
     remove: Function;
     consequent: Object | null;
     alternate: Object | null;
+    fontFamily?: string;
+    inlineMediaQuery?: string;
 }
 export type ClassNameToStyleObj = {
     [key: string]: StyleObject;

package/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,KAAK,CAAC,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAEhE,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,KAAK,CAAA;AAE9C,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAEzE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAEnD,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,UAAU,CAAA;AAE5D,MAAM,WAAW,WAAW;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAA;CACrB;AAED,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,IAAI,CAAA;IAC7C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,IAAI,CAAA;IAC7C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,IAAI,CAAA;CAC/C;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,eAAe,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,kBAAkB,CAAA;CAC7C,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,SAAS,GAAG,YAAY,CAAA;IAC/B,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,kBAAkB,CAAA;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,eAAe,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,kBAAkB,CAAA;CAC3C,CAAA;AAED,MAAM,MAAM,aAAa,GACrB,iBAAiB,GACjB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GACnC,kBAAkB,GAClB,qBAAqB,CAAA;AAEzB,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,0BAA0B,CAAA;IACvC,KAAK,EAAE,aAAa,EAAE,CAAA;IACtB,IAAI,EAAE,CAAC,CAAC,iBAAiB,CAAA;IACzB,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,GAAG,SAAS,KAAK,GAAG,CAAA;IACpF,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IAC/B,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAChC,gBAAgB,EAAE,MAAM,CAAA;IACxB,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,OAAO,CAAA;IACpB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAClC,YAAY,EAAE,YAAY,CAAA;IAC1B,MAAM,EAAE,aAAa,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG,cAAc,GAAG;IACxD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,mBAAmB,EAAE,gBAAgB,EAAE,CAAA;CACxC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CACpC,0BAA0B,EAC1B,qBAAqB,CACtB,GAAG;IACF,QAAQ,EAAE,eAAe,CAAA;IACzB,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACtC,YAAY,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAA;IAC9C,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAA;IAC1E,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAElC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;CAC5D,CAAA;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,CAAC,CAAC,UAAU,CAAA;IAElB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,MAAM,EAAE,QAAQ,CAAA;IAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CACzB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CAC3B,CAAA;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,KAAK,GAAG,CAAA;CAC/D"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/extractor/buildClassName.js

@@ -1,72 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: !0 });
-}, __copyProps = (to, from, except, desc) => {
-  if (from && typeof from == "object" || typeof from == "function")
-    for (let key of __getOwnPropNames(from))
-      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
-  mod
-)), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
-var buildClassName_exports = {};
-__export(buildClassName_exports, {
-  buildClassName: () => buildClassName,
-  buildClassNameLogic: () => buildClassNameLogic
-});
-module.exports = __toCommonJS(buildClassName_exports);
-var t = __toESM(require("@babel/types"));
-const buildClassName = (objectsIn, extras = "") => {
-  let objects = buildClassNameLogic(objectsIn);
-  return objects ? (t.isStringLiteral(objects) ? objects.value = `${extras} ${objects.value}` : objects = t.binaryExpression("+", t.stringLiteral(extras), objects), objects) : null;
-}, buildClassNameLogic = (objects) => objects.reduce((acc, val) => {
-  if (acc == null)
-    return (
-      // pass conditional expressions through
-      t.isConditionalExpression(val) || // pass non-null literals through
-      t.isStringLiteral(val) || t.isNumericLiteral(val) ? val : t.logicalExpression("||", val, t.stringLiteral(""))
-    );
-  let inner;
-  if (t.isStringLiteral(val)) {
-    if (t.isStringLiteral(acc))
-      return t.stringLiteral(`${acc.value} ${val.value}`);
-    inner = t.stringLiteral(` ${val.value}`);
-  } else if (t.isLiteral(val))
-    inner = t.binaryExpression("+", t.stringLiteral(" "), val);
-  else if (t.isConditionalExpression(val) || t.isBinaryExpression(val)) {
-    if (t.isStringLiteral(acc))
-      return t.binaryExpression("+", t.stringLiteral(`${acc.value} `), val);
-    inner = t.binaryExpression("+", t.stringLiteral(" "), val);
-  } else if (t.isIdentifier(val) || t.isMemberExpression(val))
-    inner = t.conditionalExpression(
-      val,
-      t.binaryExpression("+", t.stringLiteral(" "), val),
-      t.stringLiteral("")
-    );
-  else {
-    if (t.isStringLiteral(acc))
-      return t.binaryExpression(
-        "+",
-        t.stringLiteral(`${acc.value} `),
-        t.logicalExpression("||", val, t.stringLiteral(""))
-      );
-    inner = t.binaryExpression(
-      "+",
-      t.stringLiteral(" "),
-      t.logicalExpression("||", val, t.stringLiteral(""))
-    );
-  }
-  return t.binaryExpression("+", acc, inner);
-}, null);
-//# sourceMappingURL=buildClassName.js.map

package/dist/extractor/buildClassName.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/extractor/buildClassName.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,QAAmB;AASZ,MAAM,iBAA0B,CAAC,WAAW,SAAS,OAAO;AACjE,MAAI,UAAU,oBAAoB,SAAS;AAC3C,SAAK,WACD,EAAE,gBAAgB,OAAO,IAE3B,QAAQ,QAAQ,GAAG,MAAM,IAAI,QAAQ,KAAK,KAE1C,UAAU,EAAE,iBAAiB,KAAK,EAAE,cAAc,MAAM,GAAG,OAAO,GAE7D,WAPc;AAQvB,GAEa,sBAA+B,CAAC,YACpC,QAAQ,OAA4B,CAAC,KAAK,QAAQ;AACvD,MAAI,OAAO;AACT;AAAA;AAAA,MAEE,EAAE,wBAAwB,GAAG;AAAA,MAE7B,EAAE,gBAAgB,GAAG,KACrB,EAAE,iBAAiB,GAAG,IAEf,MAEF,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc,EAAE,CAAC;AAAA;AAG3D,MAAI;AACJ,MAAI,EAAE,gBAAgB,GAAG,GAAG;AAC1B,QAAI,EAAE,gBAAgB,GAAG;AAEvB,aAAO,EAAE,cAAc,GAAG,IAAI,KAAK,IAAI,IAAI,KAAK,EAAE;AAEpD,YAAQ,EAAE,cAAc,IAAI,IAAI,KAAK,EAAE;AAAA,EACzC,WAAW,EAAE,UAAU,GAAG;AACxB,YAAQ,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,GAAG,GAAG;AAAA,WAChD,EAAE,wBAAwB,GAAG,KAAK,EAAE,mBAAmB,GAAG,GAAG;AACtE,QAAI,EAAE,gBAAgB,GAAG;AACvB,aAAO,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,IAAI,KAAK,GAAG,GAAG,GAAG;AAEtE,YAAQ,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,GAAG,GAAG;AAAA,EAC3D,WAAW,EAAE,aAAa,GAAG,KAAK,EAAE,mBAAmB,GAAG;AAExD,YAAQ,EAAE;AAAA,MACR;AAAA,MACA,EAAE,iBAAiB,KAAK,EAAE,cAAc,GAAG,GAAG,GAAG;AAAA,MACjD,EAAE,cAAc,EAAE;AAAA,IACpB;AAAA,OACK;AACL,QAAI,EAAE,gBAAgB,GAAG;AACvB,aAAO,EAAE;AAAA,QACP;AAAA,QACA,EAAE,cAAc,GAAG,IAAI,KAAK,GAAG;AAAA,QAC/B,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc,EAAE,CAAC;AAAA,MACpD;AAGF,YAAQ,EAAE;AAAA,MACR;AAAA,MACA,EAAE,cAAc,GAAG;AAAA,MACnB,EAAE,kBAAkB,MAAM,KAAK,EAAE,cAAc,EAAE,CAAC;AAAA,IACpD;AAAA,EACF;AAEA,SAAO,EAAE,iBAAiB,KAAK,KAAK,KAAK;AAC3C,GAAG,IAAI;",
-  "names": []
-}

package/dist/extractor/buildClassName.native.js

@@ -1,67 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: !0 });
-}, __copyProps = (to, from, except, desc) => {
-  if (from && typeof from == "object" || typeof from == "function")
-    for (let key of __getOwnPropNames(from))
-      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
-  mod
-)), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
-var buildClassName_exports = {};
-__export(buildClassName_exports, {
-  buildClassName: () => buildClassName,
-  buildClassNameLogic: () => buildClassNameLogic
-});
-module.exports = __toCommonJS(buildClassName_exports);
-var t = __toESM(require("@babel/types")), buildClassName = function(objectsIn) {
-  var extras = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "", objects = buildClassNameLogic(objectsIn);
-  return objects ? (t.isStringLiteral(objects) ? objects.value = `${extras} ${objects.value}` : objects = t.binaryExpression("+", t.stringLiteral(extras), objects), objects) : null;
-}, buildClassNameLogic = function(objects) {
-  return objects.reduce(function(acc, val) {
-    if (acc == null)
-      return (
-        // pass conditional expressions through
-        t.isConditionalExpression(val) || // pass non-null literals through
-        t.isStringLiteral(val) || t.isNumericLiteral(val) ? val : t.logicalExpression("||", val, t.stringLiteral(""))
-      );
-    var inner;
-    if (t.isStringLiteral(val)) {
-      if (t.isStringLiteral(acc))
-        return t.stringLiteral(`${acc.value} ${val.value}`);
-      inner = t.stringLiteral(` ${val.value}`);
-    } else if (t.isLiteral(val))
-      inner = t.binaryExpression("+", t.stringLiteral(" "), val);
-    else if (t.isConditionalExpression(val) || t.isBinaryExpression(val)) {
-      if (t.isStringLiteral(acc))
-        return t.binaryExpression("+", t.stringLiteral(`${acc.value} `), val);
-      inner = t.binaryExpression("+", t.stringLiteral(" "), val);
-    } else if (t.isIdentifier(val) || t.isMemberExpression(val))
-      inner = t.conditionalExpression(val, t.binaryExpression("+", t.stringLiteral(" "), val), t.stringLiteral(""));
-    else {
-      if (t.isStringLiteral(acc))
-        return t.binaryExpression("+", t.stringLiteral(`${acc.value} `), t.logicalExpression("||", val, t.stringLiteral("")));
-      inner = t.binaryExpression("+", t.stringLiteral(" "), t.logicalExpression("||", val, t.stringLiteral("")));
-    }
-    return t.binaryExpression("+", acc, inner);
-  }, null);
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  buildClassName,
-  buildClassNameLogic
-});
-//# sourceMappingURL=buildClassName.js.map

package/dist/extractor/buildClassName.native.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/extractor/buildClassName.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;QAAmB,kCASNA,iBAA0B,SAACC,WAAAA;MAAWC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS,IACtDC,UAAUC,oBAAoBH,SAAAA;AAClC,SAAKE,WACDE,EAAEC,gBAAgBH,OAAAA,IAEpBA,QAAQI,QAAQ,GAAGL,MAAAA,IAAUC,QAAQI,KAAK,KAE1CJ,UAAUE,EAAEG,iBAAiB,KAAKH,EAAEI,cAAcP,MAAAA,GAASC,OAAAA,GAEtDA,WAPc;AAQvB,GAEaC,sBAA+B,SAACD,SAAAA;AAC3C,SAAOA,QAAQO,OAA4B,SAACC,KAAKC,KAAAA;AAC/C,QAAID,OAAO;AACT;;QAEEN,EAAEQ,wBAAwBD,GAAAA;QAE1BP,EAAEC,gBAAgBM,GAAAA,KAClBP,EAAES,iBAAiBF,GAAAA,IAEZA,MAEFP,EAAEU,kBAAkB,MAAMH,KAAKP,EAAEI,cAAc,EAAA,CAAA;;AAGxD,QAAIO;AACJ,QAAIX,EAAEC,gBAAgBM,GAAAA,GAAM;AAC1B,UAAIP,EAAEC,gBAAgBK,GAAAA;AAEpB,eAAON,EAAEI,cAAc,GAAGE,IAAIJ,KAAK,IAAIK,IAAIL,KAAK,EAAE;AAEpDS,cAAQX,EAAEI,cAAc,IAAIG,IAAIL,KAAK,EAAE;IACzC,WAAWF,EAAEY,UAAUL,GAAAA;AACrBI,cAAQX,EAAEG,iBAAiB,KAAKH,EAAEI,cAAc,GAAA,GAAMG,GAAAA;aAC7CP,EAAEQ,wBAAwBD,GAAAA,KAAQP,EAAEa,mBAAmBN,GAAAA,GAAM;AACtE,UAAIP,EAAEC,gBAAgBK,GAAAA;AACpB,eAAON,EAAEG,iBAAiB,KAAKH,EAAEI,cAAc,GAAGE,IAAIJ,KAAK,GAAG,GAAGK,GAAAA;AAEnEI,cAAQX,EAAEG,iBAAiB,KAAKH,EAAEI,cAAc,GAAA,GAAMG,GAAAA;IACxD,WAAWP,EAAEc,aAAaP,GAAAA,KAAQP,EAAEe,mBAAmBR,GAAAA;AAErDI,cAAQX,EAAEgB,sBACRT,KACAP,EAAEG,iBAAiB,KAAKH,EAAEI,cAAc,GAAA,GAAMG,GAAAA,GAC9CP,EAAEI,cAAc,EAAA,CAAA;SAEb;AACL,UAAIJ,EAAEC,gBAAgBK,GAAAA;AACpB,eAAON,EAAEG,iBACP,KACAH,EAAEI,cAAc,GAAGE,IAAIJ,KAAK,GAAG,GAC/BF,EAAEU,kBAAkB,MAAMH,KAAKP,EAAEI,cAAc,EAAA,CAAA,CAAA;AAInDO,cAAQX,EAAEG,iBACR,KACAH,EAAEI,cAAc,GAAA,GAChBJ,EAAEU,kBAAkB,MAAMH,KAAKP,EAAEI,cAAc,EAAA,CAAA,CAAA;IAEnD;AAEA,WAAOJ,EAAEG,iBAAiB,KAAKG,KAAKK,KAAAA;EACtC,GAAG,IAAA;AACL;",
-  "names": ["buildClassName", "objectsIn", "extras", "objects", "buildClassNameLogic", "t", "isStringLiteral", "value", "binaryExpression", "stringLiteral", "reduce", "acc", "val", "isConditionalExpression", "isNumericLiteral", "logicalExpression", "inner", "isLiteral", "isBinaryExpression", "isIdentifier", "isMemberExpression", "conditionalExpression"]
-}