@tamagui/static 1.0.0-alpha.22 → 1.0.0-alpha.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.0-alpha.22",
+  "version": "1.0.0-alpha.23",
   "source": "src/index.ts",
   "typings": "types",
   "main": "dist/cjs",
@@ -8,7 +8,6 @@
   "module:jsx": "dist/jsx",
   "files": [
     "types",
-    "src",
     "dist"
   ],
   "scripts": {
@@ -44,7 +43,7 @@
     "react-native-web": "^0.17.5",
     "react-test-renderer": "18.0.0-beta-149b420f6-20211119",
     "style-loader": "^3.3.0",
-    "typescript": "^4.4.4",
+    "typescript": "^4.5.2",
     "webpack": "^5.58.1"
   },
   "dependencies": {
@@ -56,10 +55,10 @@
     "@dish/babel-preset": "^0.0.6",
     "@expo/match-media": "^0.1.0",
     "@tamagui/build": "^1.0.0-alpha.22",
-    "@tamagui/core": "^1.0.0-alpha.22",
-    "@tamagui/core-node": "^1.0.0-alpha.22",
+    "@tamagui/core": "^1.0.0-alpha.23",
+    "@tamagui/core-node": "^1.0.0-alpha.23",
     "@tamagui/fake-react-native": "^1.0.0-alpha.17",
-    "@tamagui/helpers": "^1.0.0-alpha.22",
+    "@tamagui/helpers": "^1.0.0-alpha.23",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.13.12",
     "esbuild-register": "^3.1.2",
@@ -67,10 +66,10 @@
     "fs-extra": "^9.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.0-alpha.22"
+    "tamagui": "^1.0.0-alpha.23"
   },
   "peerDependencies": {
     "react-native-web": "*"
   },
-  "gitHead": "f247aca6f00c201efbc317bb24b22a62b08d1033"
+  "gitHead": "69fb1d82868a6525fee6b0750cb2113d88ffea79"
 }

package/src/constants.ts

@@ -1,10 +0,0 @@
-import findCacheDir from 'find-cache-dir'
-
-export const CSS_FILE_NAME = '__snack.css'
-
-// ENSURE THIS ISNT THE SAME AS THE SEPARATOR USED FOR STYLE KEYS
-// SEE matching one in concatClassName
-export const MEDIA_SEP = '_'
-
-// ensure cache dir
-export const cacheDir = findCacheDir({ name: 'tamagui', create: true })

package/src/extractor/accessSafe.ts

@@ -1,18 +0,0 @@
-import * as t from '@babel/types'
-
-// accessSafe wraps memberExpressions in object/null checks
-// TODO: inject this as a function? this gets pretty repetitive
-export function accessSafe(obj: t.Expression, member: string): t.LogicalExpression {
-  return t.logicalExpression(
-    '&&',
-    t.logicalExpression(
-      '&&',
-      // typeof obj === 'object
-      t.binaryExpression('===', t.unaryExpression('typeof', obj), t.stringLiteral('object')),
-      // obj !== null
-      t.binaryExpression('!==', obj, t.nullLiteral())
-    ),
-    // obj.member
-    t.memberExpression(obj, t.identifier(member), false)
-  )
-}

package/src/extractor/babelParse.ts

@@ -1,27 +0,0 @@
-import * as babelParser from '@babel/parser'
-
-export const parserOptions: babelParser.ParserOptions = Object.freeze({
-  plugins: [
-    'asyncGenerators',
-    'classProperties',
-    'dynamicImport',
-    'functionBind',
-    'jsx',
-    'numericSeparator',
-    'objectRestSpread',
-    'optionalCatchBinding',
-    'decorators-legacy',
-    'typescript',
-    'optionalChaining',
-    'nullishCoalescingOperator',
-    // 'objectRestSpread',
-    // 'dynamicImport'
-  ],
-  sourceType: 'module',
-})
-
-const parser = babelParser.parse.bind(babelParser)
-
-export function babelParse(code: string | Buffer): any {
-  return parser(code.toString(), parserOptions)
-}

package/src/extractor/buildClassName.ts

@@ -1,61 +0,0 @@
-import * as t from '@babel/types'
-
-import { ClassNameObject } from '../types'
-
-export function buildClassName(
-  classNameObjects: ClassNameObject[]
-): t.Expression | t.StringLiteral | null {
-  return classNameObjects.reduce<t.Expression | null>((acc, val) => {
-    if (acc == null) {
-      if (
-        // pass conditional expressions through
-        t.isConditionalExpression(val) ||
-        // pass non-null literals through
-        t.isStringLiteral(val) ||
-        t.isNumericLiteral(val)
-      ) {
-        return val
-      }
-      return t.logicalExpression('||', val, t.stringLiteral(''))
-    }
-
-    let inner: t.Expression
-    if (t.isStringLiteral(val)) {
-      if (t.isStringLiteral(acc)) {
-        // join adjacent string literals
-        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)) {
-      // identifiers and member expressions make for reasonable ternaries
-      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(''))
-        )
-      }
-      // use a logical expression for more complex prop values
-      inner = t.binaryExpression(
-        '+',
-        t.stringLiteral(' '),
-        t.logicalExpression('||', val, t.stringLiteral(''))
-      )
-    }
-
-    return t.binaryExpression('+', acc, inner)
-  }, null)
-}

package/src/extractor/createEvaluator.ts

@@ -1,68 +0,0 @@
-import vm from 'vm'
-
-import generate from '@babel/generator'
-import { NodePath } from '@babel/traverse'
-import * as t from '@babel/types'
-import type { TamaguiConfig } from '@tamagui/core'
-
-import { FAILED_EVAL } from './createExtractor'
-import { evaluateAstNode } from './evaluateAstNode'
-import { isValidThemeHook } from './extractHelpers'
-
-export function createEvaluator({
-  tamaguiConfig,
-  staticNamespace,
-  sourcePath,
-  traversePath,
-  shouldPrintDebug,
-}: {
-  tamaguiConfig: TamaguiConfig
-  staticNamespace: Record<string, any>
-  sourcePath: string
-  traversePath: NodePath<t.JSXElement>
-  shouldPrintDebug: boolean
-}) {
-  // called when evaluateAstNode encounters a dynamic-looking prop
-  const evalFn = (n: t.Node) => {
-    // themes
-    if (
-      t.isMemberExpression(n) &&
-      t.isIdentifier(n.property) &&
-      isValidThemeHook(traversePath, n, sourcePath)
-    ) {
-      const key = n.property.name
-      if (shouldPrintDebug) {
-        console.log('    > found theme prop', key)
-      }
-      console.log('SHOULD FIND THEME (NESTED NOW)', key) // tamaguiConfig.themes)
-      // if (!themeKeys.has(key)) {
-      //   throw new Error(`    > accessing non-existent theme key: ${key}`)
-      // }
-      return `var(--${key})`
-    }
-    // variable
-    if (t.isIdentifier(n) && staticNamespace.hasOwnProperty(n.name)) {
-      return staticNamespace[n.name]
-    }
-    const evalContext = vm.createContext(staticNamespace)
-    const code = `(${generate(n as any).code})`
-    // if (shouldPrintDebug) {
-    //   console.log('evaluating', { n, code, evalContext })
-    // }
-    return vm.runInContext(code, evalContext)
-  }
-
-  return (n: t.Node) => {
-    return evaluateAstNode(n, evalFn)
-  }
-}
-
-export function createSafeEvaluator(attemptEval: (n: t.Node) => any) {
-  return (n: t.Node) => {
-    try {
-      return attemptEval(n)
-    } catch (err) {
-      return FAILED_EVAL
-    }
-  }
-}