@tamagui/static 1.0.0-alpha.13 → 1.0.0-alpha.17

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 (7) hide show
  1. package/dist/cjs/extractor/extractHelpers.js +1 -1
  2. package/dist/cjs/extractor/extractHelpers.js.map +2 -2
  3. package/dist/esm/extractor/extractHelpers.js +1 -1
  4. package/dist/esm/extractor/extractHelpers.js.map +2 -2
  5. package/dist/jsx/extractor/extractHelpers.js +1 -1
  6. package/package.json +12 -11
  7. package/src/extractor/extractHelpers.ts +1 -1
package/dist/cjs/extractor/extractHelpers.js CHANGED
@@ -113,6 +113,6 @@ function isValidThemeHook(jsxPath, n, sourcePath) {
113
113
  }
114
114
  __name(isValidThemeHook, "isValidThemeHook");
115
115
  const isInsideTamagui = /* @__PURE__ */ __name((srcName) => {
116
- return srcName.includes("/tamagui/_jsx") || srcName.includes("/core/src");
116
+ return srcName.includes("/dist/jsx") || srcName.includes("/core/src");
117
117
  }, "isInsideTamagui");
118
118
  //# sourceMappingURL=extractHelpers.js.map
package/dist/cjs/extractor/extractHelpers.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/extractor/extractHelpers.ts"],
4
- "sourcesContent": ["import type { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\n\nimport { ExtractedAttr, Ternary } from '../types'\n\nexport function isPresent<T extends Object>(input: null | void | undefined | T): input is T {\n return input != null\n}\n\nexport function isSimpleSpread(node: t.JSXSpreadAttribute) {\n return t.isIdentifier(node.argument) || t.isMemberExpression(node.argument)\n}\n\nexport const attrStr = (attr: ExtractedAttr) => {\n return attr.type === 'attr'\n ? getNameAttr(attr.value)\n : attr.type === 'ternary'\n ? `...${ternaryStr(attr.value)}`\n : `${attr.type}(${objToStr(attr.value)})`\n}\n\nexport const objToStr = (obj: any) => {\n return Object.entries(obj)\n .map(\n ([k, v]) =>\n `${k}:${Array.isArray(v) ? `[...]` : v && typeof v === 'object' ? `{${objToStr(v)}}` : v}`\n )\n .join(', ')\n}\n\nconst getNameAttr = (attr: t.JSXAttribute | t.JSXSpreadAttribute) => {\n if (t.isJSXSpreadAttribute(attr)) {\n return `...${attr.argument['name']}`\n }\n return 'name' in attr ? attr.name.name : `unknown-${attr['type']}`\n}\n\nexport const ternaryStr = (x: Ternary) => {\n return [\n 'ternary:',\n t.isIdentifier(x.test)\n ? x.test.name\n : t.isMemberExpression(x.test)\n ? [x.test.object['name'], x.test.property['name']]\n : x.test,\n x.consequent ? ` ? ${objToStr(x.consequent)}` : ' ? \u26AB\uFE0F',\n x.alternate ? ` : ${objToStr(x.alternate)}` : ' : \u26AB\uFE0F',\n ]\n .flat()\n .join('')\n}\n\nexport function findComponentName(scope) {\n let componentName = ''\n let cur = scope.path\n while (cur.parentPath && !t.isProgram(cur.parentPath.parent)) {\n cur = cur.parentPath\n }\n let node = cur.parent\n if (t.isExportNamedDeclaration(node)) {\n node = node.declaration\n }\n if (t.isVariableDeclaration(node)) {\n const [dec] = node.declarations\n if (t.isVariableDeclarator(dec) && t.isIdentifier(dec.id)) {\n return dec.id.name\n }\n }\n if (t.isFunctionDeclaration(node)) {\n return node.id?.name\n }\n return componentName\n}\n\nexport function isValidThemeHook(\n jsxPath: NodePath<t.JSXElement>,\n n: t.MemberExpression,\n sourcePath: string\n) {\n if (!t.isIdentifier(n.object) || !t.isIdentifier(n.property)) return false\n const bindings = jsxPath.scope.getAllBindings()\n const binding = bindings[n.object.name]\n if (!binding?.path) return false\n if (!binding.path.isVariableDeclarator()) return false\n const init = binding.path.node.init\n if (!t.isCallExpression(init)) return false\n if (!t.isIdentifier(init.callee)) return false\n // TODO could support renaming useTheme by looking up import first\n if (init.callee.name !== 'useTheme') return false\n const importNode = binding.scope.getBinding('useTheme')?.path.parent\n if (!t.isImportDeclaration(importNode)) return false\n if (importNode.source.value !== 'tamagui') {\n if (!isInsideTamagui(sourcePath)) {\n return false\n }\n }\n return true\n}\n\nexport const isInsideTamagui = (srcName: string) => {\n return srcName.includes('/tamagui/_jsx') || srcName.includes('/core/src')\n}\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,QAAmB;AAIZ,mBAAqC,OAAgD;AAC1F,SAAO,SAAS;AAAA;AADF;AAIT,wBAAwB,MAA4B;AACzD,SAAO,EAAE,aAAa,KAAK,aAAa,EAAE,mBAAmB,KAAK;AAAA;AADpD;AAIT,MAAM,UAAU,wBAAC,SAAwB;AAC9C,SAAO,KAAK,SAAS,SACjB,YAAY,KAAK,SACjB,KAAK,SAAS,YACd,MAAM,WAAW,KAAK,WACtB,GAAG,KAAK,QAAQ,SAAS,KAAK;AAAA,GALb;AAQhB,MAAM,WAAW,wBAAC,QAAa;AACpC,SAAO,OAAO,QAAQ,KACnB,IACC,CAAC,CAAC,GAAG,OACH,GAAG,KAAK,MAAM,QAAQ,KAAK,UAAU,KAAK,OAAO,MAAM,WAAW,IAAI,SAAS,QAAQ,KAE1F,KAAK;AAAA,GANc;AASxB,MAAM,cAAc,wBAAC,SAAgD;AACnE,MAAI,EAAE,qBAAqB,OAAO;AAChC,WAAO,MAAM,KAAK,SAAS;AAAA;AAE7B,SAAO,UAAU,OAAO,KAAK,KAAK,OAAO,WAAW,KAAK;AAAA,GAJvC;AAOb,MAAM,aAAa,wBAAC,MAAe;AACxC,SAAO;AAAA,IACL;AAAA,IACA,EAAE,aAAa,EAAE,QACb,EAAE,KAAK,OACP,EAAE,mBAAmB,EAAE,QACvB,CAAC,EAAE,KAAK,OAAO,SAAS,EAAE,KAAK,SAAS,WACxC,EAAE;AAAA,IACN,EAAE,aAAa,OAAO,SAAS,EAAE,gBAAgB;AAAA,IACjD,EAAE,YAAY,OAAO,SAAS,EAAE,eAAe;AAAA,IAE9C,OACA,KAAK;AAAA,GAZgB;AAenB,2BAA2B,OAAO;AApDzC;AAqDE,MAAI,gBAAgB;AACpB,MAAI,MAAM,MAAM;AAChB,SAAO,IAAI,cAAc,CAAC,EAAE,UAAU,IAAI,WAAW,SAAS;AAC5D,UAAM,IAAI;AAAA;AAEZ,MAAI,OAAO,IAAI;AACf,MAAI,EAAE,yBAAyB,OAAO;AACpC,WAAO,KAAK;AAAA;AAEd,MAAI,EAAE,sBAAsB,OAAO;AACjC,UAAM,CAAC,OAAO,KAAK;AACnB,QAAI,EAAE,qBAAqB,QAAQ,EAAE,aAAa,IAAI,KAAK;AACzD,aAAO,IAAI,GAAG;AAAA;AAAA;AAGlB,MAAI,EAAE,sBAAsB,OAAO;AACjC,WAAO,WAAK,OAAL,mBAAS;AAAA;AAElB,SAAO;AAAA;AAnBO;AAsBT,0BACL,SACA,GACA,YACA;AA9EF;AA+EE,MAAI,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,aAAa,EAAE;AAAW,WAAO;AACrE,QAAM,WAAW,QAAQ,MAAM;AAC/B,QAAM,UAAU,SAAS,EAAE,OAAO;AAClC,MAAI,CAAC,oCAAS;AAAM,WAAO;AAC3B,MAAI,CAAC,QAAQ,KAAK;AAAwB,WAAO;AACjD,QAAM,OAAO,QAAQ,KAAK,KAAK;AAC/B,MAAI,CAAC,EAAE,iBAAiB;AAAO,WAAO;AACtC,MAAI,CAAC,EAAE,aAAa,KAAK;AAAS,WAAO;AAEzC,MAAI,KAAK,OAAO,SAAS;AAAY,WAAO;AAC5C,QAAM,aAAa,cAAQ,MAAM,WAAW,gBAAzB,mBAAsC,KAAK;AAC9D,MAAI,CAAC,EAAE,oBAAoB;AAAa,WAAO;AAC/C,MAAI,WAAW,OAAO,UAAU,WAAW;AACzC,QAAI,CAAC,gBAAgB,aAAa;AAChC,aAAO;AAAA;AAAA;AAGX,SAAO;AAAA;AAtBO;AAyBT,MAAM,kBAAkB,wBAAC,YAAoB;AAClD,SAAO,QAAQ,SAAS,oBAAoB,QAAQ,SAAS;AAAA,GADhC;",
4
+ "sourcesContent": ["import type { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\n\nimport { ExtractedAttr, Ternary } from '../types'\n\nexport function isPresent<T extends Object>(input: null | void | undefined | T): input is T {\n return input != null\n}\n\nexport function isSimpleSpread(node: t.JSXSpreadAttribute) {\n return t.isIdentifier(node.argument) || t.isMemberExpression(node.argument)\n}\n\nexport const attrStr = (attr: ExtractedAttr) => {\n return attr.type === 'attr'\n ? getNameAttr(attr.value)\n : attr.type === 'ternary'\n ? `...${ternaryStr(attr.value)}`\n : `${attr.type}(${objToStr(attr.value)})`\n}\n\nexport const objToStr = (obj: any) => {\n return Object.entries(obj)\n .map(\n ([k, v]) =>\n `${k}:${Array.isArray(v) ? `[...]` : v && typeof v === 'object' ? `{${objToStr(v)}}` : v}`\n )\n .join(', ')\n}\n\nconst getNameAttr = (attr: t.JSXAttribute | t.JSXSpreadAttribute) => {\n if (t.isJSXSpreadAttribute(attr)) {\n return `...${attr.argument['name']}`\n }\n return 'name' in attr ? attr.name.name : `unknown-${attr['type']}`\n}\n\nexport const ternaryStr = (x: Ternary) => {\n return [\n 'ternary:',\n t.isIdentifier(x.test)\n ? x.test.name\n : t.isMemberExpression(x.test)\n ? [x.test.object['name'], x.test.property['name']]\n : x.test,\n x.consequent ? ` ? ${objToStr(x.consequent)}` : ' ? \u26AB\uFE0F',\n x.alternate ? ` : ${objToStr(x.alternate)}` : ' : \u26AB\uFE0F',\n ]\n .flat()\n .join('')\n}\n\nexport function findComponentName(scope) {\n let componentName = ''\n let cur = scope.path\n while (cur.parentPath && !t.isProgram(cur.parentPath.parent)) {\n cur = cur.parentPath\n }\n let node = cur.parent\n if (t.isExportNamedDeclaration(node)) {\n node = node.declaration\n }\n if (t.isVariableDeclaration(node)) {\n const [dec] = node.declarations\n if (t.isVariableDeclarator(dec) && t.isIdentifier(dec.id)) {\n return dec.id.name\n }\n }\n if (t.isFunctionDeclaration(node)) {\n return node.id?.name\n }\n return componentName\n}\n\nexport function isValidThemeHook(\n jsxPath: NodePath<t.JSXElement>,\n n: t.MemberExpression,\n sourcePath: string\n) {\n if (!t.isIdentifier(n.object) || !t.isIdentifier(n.property)) return false\n const bindings = jsxPath.scope.getAllBindings()\n const binding = bindings[n.object.name]\n if (!binding?.path) return false\n if (!binding.path.isVariableDeclarator()) return false\n const init = binding.path.node.init\n if (!t.isCallExpression(init)) return false\n if (!t.isIdentifier(init.callee)) return false\n // TODO could support renaming useTheme by looking up import first\n if (init.callee.name !== 'useTheme') return false\n const importNode = binding.scope.getBinding('useTheme')?.path.parent\n if (!t.isImportDeclaration(importNode)) return false\n if (importNode.source.value !== 'tamagui') {\n if (!isInsideTamagui(sourcePath)) {\n return false\n }\n }\n return true\n}\n\nexport const isInsideTamagui = (srcName: string) => {\n return srcName.includes('/dist/jsx') || srcName.includes('/core/src')\n}\n"],
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,QAAmB;AAIZ,mBAAqC,OAAgD;AAC1F,SAAO,SAAS;AAAA;AADF;AAIT,wBAAwB,MAA4B;AACzD,SAAO,EAAE,aAAa,KAAK,aAAa,EAAE,mBAAmB,KAAK;AAAA;AADpD;AAIT,MAAM,UAAU,wBAAC,SAAwB;AAC9C,SAAO,KAAK,SAAS,SACjB,YAAY,KAAK,SACjB,KAAK,SAAS,YACd,MAAM,WAAW,KAAK,WACtB,GAAG,KAAK,QAAQ,SAAS,KAAK;AAAA,GALb;AAQhB,MAAM,WAAW,wBAAC,QAAa;AACpC,SAAO,OAAO,QAAQ,KACnB,IACC,CAAC,CAAC,GAAG,OACH,GAAG,KAAK,MAAM,QAAQ,KAAK,UAAU,KAAK,OAAO,MAAM,WAAW,IAAI,SAAS,QAAQ,KAE1F,KAAK;AAAA,GANc;AASxB,MAAM,cAAc,wBAAC,SAAgD;AACnE,MAAI,EAAE,qBAAqB,OAAO;AAChC,WAAO,MAAM,KAAK,SAAS;AAAA;AAE7B,SAAO,UAAU,OAAO,KAAK,KAAK,OAAO,WAAW,KAAK;AAAA,GAJvC;AAOb,MAAM,aAAa,wBAAC,MAAe;AACxC,SAAO;AAAA,IACL;AAAA,IACA,EAAE,aAAa,EAAE,QACb,EAAE,KAAK,OACP,EAAE,mBAAmB,EAAE,QACvB,CAAC,EAAE,KAAK,OAAO,SAAS,EAAE,KAAK,SAAS,WACxC,EAAE;AAAA,IACN,EAAE,aAAa,OAAO,SAAS,EAAE,gBAAgB;AAAA,IACjD,EAAE,YAAY,OAAO,SAAS,EAAE,eAAe;AAAA,IAE9C,OACA,KAAK;AAAA,GAZgB;AAenB,2BAA2B,OAAO;AApDzC;AAqDE,MAAI,gBAAgB;AACpB,MAAI,MAAM,MAAM;AAChB,SAAO,IAAI,cAAc,CAAC,EAAE,UAAU,IAAI,WAAW,SAAS;AAC5D,UAAM,IAAI;AAAA;AAEZ,MAAI,OAAO,IAAI;AACf,MAAI,EAAE,yBAAyB,OAAO;AACpC,WAAO,KAAK;AAAA;AAEd,MAAI,EAAE,sBAAsB,OAAO;AACjC,UAAM,CAAC,OAAO,KAAK;AACnB,QAAI,EAAE,qBAAqB,QAAQ,EAAE,aAAa,IAAI,KAAK;AACzD,aAAO,IAAI,GAAG;AAAA;AAAA;AAGlB,MAAI,EAAE,sBAAsB,OAAO;AACjC,WAAO,WAAK,OAAL,mBAAS;AAAA;AAElB,SAAO;AAAA;AAnBO;AAsBT,0BACL,SACA,GACA,YACA;AA9EF;AA+EE,MAAI,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,aAAa,EAAE;AAAW,WAAO;AACrE,QAAM,WAAW,QAAQ,MAAM;AAC/B,QAAM,UAAU,SAAS,EAAE,OAAO;AAClC,MAAI,CAAC,oCAAS;AAAM,WAAO;AAC3B,MAAI,CAAC,QAAQ,KAAK;AAAwB,WAAO;AACjD,QAAM,OAAO,QAAQ,KAAK,KAAK;AAC/B,MAAI,CAAC,EAAE,iBAAiB;AAAO,WAAO;AACtC,MAAI,CAAC,EAAE,aAAa,KAAK;AAAS,WAAO;AAEzC,MAAI,KAAK,OAAO,SAAS;AAAY,WAAO;AAC5C,QAAM,aAAa,cAAQ,MAAM,WAAW,gBAAzB,mBAAsC,KAAK;AAC9D,MAAI,CAAC,EAAE,oBAAoB;AAAa,WAAO;AAC/C,MAAI,WAAW,OAAO,UAAU,WAAW;AACzC,QAAI,CAAC,gBAAgB,aAAa;AAChC,aAAO;AAAA;AAAA;AAGX,SAAO;AAAA;AAtBO;AAyBT,MAAM,kBAAkB,wBAAC,YAAoB;AAClD,SAAO,QAAQ,SAAS,gBAAgB,QAAQ,SAAS;AAAA,GAD5B;",
6
6
  "names": []
7
7
  }
package/dist/esm/extractor/extractHelpers.js CHANGED
@@ -79,7 +79,7 @@ function isValidThemeHook(jsxPath, n, sourcePath) {
79
79
  }
80
80
  __name(isValidThemeHook, "isValidThemeHook");
81
81
  const isInsideTamagui = /* @__PURE__ */ __name((srcName) => {
82
- return srcName.includes("/tamagui/_jsx") || srcName.includes("/core/src");
82
+ return srcName.includes("/dist/jsx") || srcName.includes("/core/src");
83
83
  }, "isInsideTamagui");
84
84
  export {
85
85
  attrStr,
package/dist/esm/extractor/extractHelpers.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/extractor/extractHelpers.ts"],
4
- "sourcesContent": ["import type { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\n\nimport { ExtractedAttr, Ternary } from '../types'\n\nexport function isPresent<T extends Object>(input: null | void | undefined | T): input is T {\n return input != null\n}\n\nexport function isSimpleSpread(node: t.JSXSpreadAttribute) {\n return t.isIdentifier(node.argument) || t.isMemberExpression(node.argument)\n}\n\nexport const attrStr = (attr: ExtractedAttr) => {\n return attr.type === 'attr'\n ? getNameAttr(attr.value)\n : attr.type === 'ternary'\n ? `...${ternaryStr(attr.value)}`\n : `${attr.type}(${objToStr(attr.value)})`\n}\n\nexport const objToStr = (obj: any) => {\n return Object.entries(obj)\n .map(\n ([k, v]) =>\n `${k}:${Array.isArray(v) ? `[...]` : v && typeof v === 'object' ? `{${objToStr(v)}}` : v}`\n )\n .join(', ')\n}\n\nconst getNameAttr = (attr: t.JSXAttribute | t.JSXSpreadAttribute) => {\n if (t.isJSXSpreadAttribute(attr)) {\n return `...${attr.argument['name']}`\n }\n return 'name' in attr ? attr.name.name : `unknown-${attr['type']}`\n}\n\nexport const ternaryStr = (x: Ternary) => {\n return [\n 'ternary:',\n t.isIdentifier(x.test)\n ? x.test.name\n : t.isMemberExpression(x.test)\n ? [x.test.object['name'], x.test.property['name']]\n : x.test,\n x.consequent ? ` ? ${objToStr(x.consequent)}` : ' ? \u26AB\uFE0F',\n x.alternate ? ` : ${objToStr(x.alternate)}` : ' : \u26AB\uFE0F',\n ]\n .flat()\n .join('')\n}\n\nexport function findComponentName(scope) {\n let componentName = ''\n let cur = scope.path\n while (cur.parentPath && !t.isProgram(cur.parentPath.parent)) {\n cur = cur.parentPath\n }\n let node = cur.parent\n if (t.isExportNamedDeclaration(node)) {\n node = node.declaration\n }\n if (t.isVariableDeclaration(node)) {\n const [dec] = node.declarations\n if (t.isVariableDeclarator(dec) && t.isIdentifier(dec.id)) {\n return dec.id.name\n }\n }\n if (t.isFunctionDeclaration(node)) {\n return node.id?.name\n }\n return componentName\n}\n\nexport function isValidThemeHook(\n jsxPath: NodePath<t.JSXElement>,\n n: t.MemberExpression,\n sourcePath: string\n) {\n if (!t.isIdentifier(n.object) || !t.isIdentifier(n.property)) return false\n const bindings = jsxPath.scope.getAllBindings()\n const binding = bindings[n.object.name]\n if (!binding?.path) return false\n if (!binding.path.isVariableDeclarator()) return false\n const init = binding.path.node.init\n if (!t.isCallExpression(init)) return false\n if (!t.isIdentifier(init.callee)) return false\n // TODO could support renaming useTheme by looking up import first\n if (init.callee.name !== 'useTheme') return false\n const importNode = binding.scope.getBinding('useTheme')?.path.parent\n if (!t.isImportDeclaration(importNode)) return false\n if (importNode.source.value !== 'tamagui') {\n if (!isInsideTamagui(sourcePath)) {\n return false\n }\n }\n return true\n}\n\nexport const isInsideTamagui = (srcName: string) => {\n return srcName.includes('/tamagui/_jsx') || srcName.includes('/core/src')\n}\n"],
5
- "mappings": ";;AACA;AAIO,mBAAqC,OAAgD;AAC1F,SAAO,SAAS;AAAA;AADF;AAIT,wBAAwB,MAA4B;AACzD,SAAO,EAAE,aAAa,KAAK,aAAa,EAAE,mBAAmB,KAAK;AAAA;AADpD;AAIT,MAAM,UAAU,wBAAC,SAAwB;AAC9C,SAAO,KAAK,SAAS,SACjB,YAAY,KAAK,SACjB,KAAK,SAAS,YACd,MAAM,WAAW,KAAK,WACtB,GAAG,KAAK,QAAQ,SAAS,KAAK;AAAA,GALb;AAQhB,MAAM,WAAW,wBAAC,QAAa;AACpC,SAAO,OAAO,QAAQ,KACnB,IACC,CAAC,CAAC,GAAG,OACH,GAAG,KAAK,MAAM,QAAQ,KAAK,UAAU,KAAK,OAAO,MAAM,WAAW,IAAI,SAAS,QAAQ,KAE1F,KAAK;AAAA,GANc;AASxB,MAAM,cAAc,wBAAC,SAAgD;AACnE,MAAI,EAAE,qBAAqB,OAAO;AAChC,WAAO,MAAM,KAAK,SAAS;AAAA;AAE7B,SAAO,UAAU,OAAO,KAAK,KAAK,OAAO,WAAW,KAAK;AAAA,GAJvC;AAOb,MAAM,aAAa,wBAAC,MAAe;AACxC,SAAO;AAAA,IACL;AAAA,IACA,EAAE,aAAa,EAAE,QACb,EAAE,KAAK,OACP,EAAE,mBAAmB,EAAE,QACvB,CAAC,EAAE,KAAK,OAAO,SAAS,EAAE,KAAK,SAAS,WACxC,EAAE;AAAA,IACN,EAAE,aAAa,OAAO,SAAS,EAAE,gBAAgB;AAAA,IACjD,EAAE,YAAY,OAAO,SAAS,EAAE,eAAe;AAAA,IAE9C,OACA,KAAK;AAAA,GAZgB;AAenB,2BAA2B,OAAO;AACvC,MAAI,gBAAgB;AACpB,MAAI,MAAM,MAAM;AAChB,SAAO,IAAI,cAAc,CAAC,EAAE,UAAU,IAAI,WAAW,SAAS;AAC5D,UAAM,IAAI;AAAA;AAEZ,MAAI,OAAO,IAAI;AACf,MAAI,EAAE,yBAAyB,OAAO;AACpC,WAAO,KAAK;AAAA;AAEd,MAAI,EAAE,sBAAsB,OAAO;AACjC,UAAM,CAAC,OAAO,KAAK;AACnB,QAAI,EAAE,qBAAqB,QAAQ,EAAE,aAAa,IAAI,KAAK;AACzD,aAAO,IAAI,GAAG;AAAA;AAAA;AAGlB,MAAI,EAAE,sBAAsB,OAAO;AACjC,WAAO,KAAK,IAAI;AAAA;AAElB,SAAO;AAAA;AAnBO;AAsBT,0BACL,SACA,GACA,YACA;AACA,MAAI,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,aAAa,EAAE;AAAW,WAAO;AACrE,QAAM,WAAW,QAAQ,MAAM;AAC/B,QAAM,UAAU,SAAS,EAAE,OAAO;AAClC,MAAI,CAAC,SAAS;AAAM,WAAO;AAC3B,MAAI,CAAC,QAAQ,KAAK;AAAwB,WAAO;AACjD,QAAM,OAAO,QAAQ,KAAK,KAAK;AAC/B,MAAI,CAAC,EAAE,iBAAiB;AAAO,WAAO;AACtC,MAAI,CAAC,EAAE,aAAa,KAAK;AAAS,WAAO;AAEzC,MAAI,KAAK,OAAO,SAAS;AAAY,WAAO;AAC5C,QAAM,aAAa,QAAQ,MAAM,WAAW,aAAa,KAAK;AAC9D,MAAI,CAAC,EAAE,oBAAoB;AAAa,WAAO;AAC/C,MAAI,WAAW,OAAO,UAAU,WAAW;AACzC,QAAI,CAAC,gBAAgB,aAAa;AAChC,aAAO;AAAA;AAAA;AAGX,SAAO;AAAA;AAtBO;AAyBT,MAAM,kBAAkB,wBAAC,YAAoB;AAClD,SAAO,QAAQ,SAAS,oBAAoB,QAAQ,SAAS;AAAA,GADhC;",
4
+ "sourcesContent": ["import type { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\n\nimport { ExtractedAttr, Ternary } from '../types'\n\nexport function isPresent<T extends Object>(input: null | void | undefined | T): input is T {\n return input != null\n}\n\nexport function isSimpleSpread(node: t.JSXSpreadAttribute) {\n return t.isIdentifier(node.argument) || t.isMemberExpression(node.argument)\n}\n\nexport const attrStr = (attr: ExtractedAttr) => {\n return attr.type === 'attr'\n ? getNameAttr(attr.value)\n : attr.type === 'ternary'\n ? `...${ternaryStr(attr.value)}`\n : `${attr.type}(${objToStr(attr.value)})`\n}\n\nexport const objToStr = (obj: any) => {\n return Object.entries(obj)\n .map(\n ([k, v]) =>\n `${k}:${Array.isArray(v) ? `[...]` : v && typeof v === 'object' ? `{${objToStr(v)}}` : v}`\n )\n .join(', ')\n}\n\nconst getNameAttr = (attr: t.JSXAttribute | t.JSXSpreadAttribute) => {\n if (t.isJSXSpreadAttribute(attr)) {\n return `...${attr.argument['name']}`\n }\n return 'name' in attr ? attr.name.name : `unknown-${attr['type']}`\n}\n\nexport const ternaryStr = (x: Ternary) => {\n return [\n 'ternary:',\n t.isIdentifier(x.test)\n ? x.test.name\n : t.isMemberExpression(x.test)\n ? [x.test.object['name'], x.test.property['name']]\n : x.test,\n x.consequent ? ` ? ${objToStr(x.consequent)}` : ' ? \u26AB\uFE0F',\n x.alternate ? ` : ${objToStr(x.alternate)}` : ' : \u26AB\uFE0F',\n ]\n .flat()\n .join('')\n}\n\nexport function findComponentName(scope) {\n let componentName = ''\n let cur = scope.path\n while (cur.parentPath && !t.isProgram(cur.parentPath.parent)) {\n cur = cur.parentPath\n }\n let node = cur.parent\n if (t.isExportNamedDeclaration(node)) {\n node = node.declaration\n }\n if (t.isVariableDeclaration(node)) {\n const [dec] = node.declarations\n if (t.isVariableDeclarator(dec) && t.isIdentifier(dec.id)) {\n return dec.id.name\n }\n }\n if (t.isFunctionDeclaration(node)) {\n return node.id?.name\n }\n return componentName\n}\n\nexport function isValidThemeHook(\n jsxPath: NodePath<t.JSXElement>,\n n: t.MemberExpression,\n sourcePath: string\n) {\n if (!t.isIdentifier(n.object) || !t.isIdentifier(n.property)) return false\n const bindings = jsxPath.scope.getAllBindings()\n const binding = bindings[n.object.name]\n if (!binding?.path) return false\n if (!binding.path.isVariableDeclarator()) return false\n const init = binding.path.node.init\n if (!t.isCallExpression(init)) return false\n if (!t.isIdentifier(init.callee)) return false\n // TODO could support renaming useTheme by looking up import first\n if (init.callee.name !== 'useTheme') return false\n const importNode = binding.scope.getBinding('useTheme')?.path.parent\n if (!t.isImportDeclaration(importNode)) return false\n if (importNode.source.value !== 'tamagui') {\n if (!isInsideTamagui(sourcePath)) {\n return false\n }\n }\n return true\n}\n\nexport const isInsideTamagui = (srcName: string) => {\n return srcName.includes('/dist/jsx') || srcName.includes('/core/src')\n}\n"],
5
+ "mappings": ";;AACA;AAIO,mBAAqC,OAAgD;AAC1F,SAAO,SAAS;AAAA;AADF;AAIT,wBAAwB,MAA4B;AACzD,SAAO,EAAE,aAAa,KAAK,aAAa,EAAE,mBAAmB,KAAK;AAAA;AADpD;AAIT,MAAM,UAAU,wBAAC,SAAwB;AAC9C,SAAO,KAAK,SAAS,SACjB,YAAY,KAAK,SACjB,KAAK,SAAS,YACd,MAAM,WAAW,KAAK,WACtB,GAAG,KAAK,QAAQ,SAAS,KAAK;AAAA,GALb;AAQhB,MAAM,WAAW,wBAAC,QAAa;AACpC,SAAO,OAAO,QAAQ,KACnB,IACC,CAAC,CAAC,GAAG,OACH,GAAG,KAAK,MAAM,QAAQ,KAAK,UAAU,KAAK,OAAO,MAAM,WAAW,IAAI,SAAS,QAAQ,KAE1F,KAAK;AAAA,GANc;AASxB,MAAM,cAAc,wBAAC,SAAgD;AACnE,MAAI,EAAE,qBAAqB,OAAO;AAChC,WAAO,MAAM,KAAK,SAAS;AAAA;AAE7B,SAAO,UAAU,OAAO,KAAK,KAAK,OAAO,WAAW,KAAK;AAAA,GAJvC;AAOb,MAAM,aAAa,wBAAC,MAAe;AACxC,SAAO;AAAA,IACL;AAAA,IACA,EAAE,aAAa,EAAE,QACb,EAAE,KAAK,OACP,EAAE,mBAAmB,EAAE,QACvB,CAAC,EAAE,KAAK,OAAO,SAAS,EAAE,KAAK,SAAS,WACxC,EAAE;AAAA,IACN,EAAE,aAAa,OAAO,SAAS,EAAE,gBAAgB;AAAA,IACjD,EAAE,YAAY,OAAO,SAAS,EAAE,eAAe;AAAA,IAE9C,OACA,KAAK;AAAA,GAZgB;AAenB,2BAA2B,OAAO;AACvC,MAAI,gBAAgB;AACpB,MAAI,MAAM,MAAM;AAChB,SAAO,IAAI,cAAc,CAAC,EAAE,UAAU,IAAI,WAAW,SAAS;AAC5D,UAAM,IAAI;AAAA;AAEZ,MAAI,OAAO,IAAI;AACf,MAAI,EAAE,yBAAyB,OAAO;AACpC,WAAO,KAAK;AAAA;AAEd,MAAI,EAAE,sBAAsB,OAAO;AACjC,UAAM,CAAC,OAAO,KAAK;AACnB,QAAI,EAAE,qBAAqB,QAAQ,EAAE,aAAa,IAAI,KAAK;AACzD,aAAO,IAAI,GAAG;AAAA;AAAA;AAGlB,MAAI,EAAE,sBAAsB,OAAO;AACjC,WAAO,KAAK,IAAI;AAAA;AAElB,SAAO;AAAA;AAnBO;AAsBT,0BACL,SACA,GACA,YACA;AACA,MAAI,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,aAAa,EAAE;AAAW,WAAO;AACrE,QAAM,WAAW,QAAQ,MAAM;AAC/B,QAAM,UAAU,SAAS,EAAE,OAAO;AAClC,MAAI,CAAC,SAAS;AAAM,WAAO;AAC3B,MAAI,CAAC,QAAQ,KAAK;AAAwB,WAAO;AACjD,QAAM,OAAO,QAAQ,KAAK,KAAK;AAC/B,MAAI,CAAC,EAAE,iBAAiB;AAAO,WAAO;AACtC,MAAI,CAAC,EAAE,aAAa,KAAK;AAAS,WAAO;AAEzC,MAAI,KAAK,OAAO,SAAS;AAAY,WAAO;AAC5C,QAAM,aAAa,QAAQ,MAAM,WAAW,aAAa,KAAK;AAC9D,MAAI,CAAC,EAAE,oBAAoB;AAAa,WAAO;AAC/C,MAAI,WAAW,OAAO,UAAU,WAAW;AACzC,QAAI,CAAC,gBAAgB,aAAa;AAChC,aAAO;AAAA;AAAA;AAGX,SAAO;AAAA;AAtBO;AAyBT,MAAM,kBAAkB,wBAAC,YAAoB;AAClD,SAAO,QAAQ,SAAS,gBAAgB,QAAQ,SAAS;AAAA,GAD5B;",
6
6
  "names": []
7
7
  }
package/dist/jsx/extractor/extractHelpers.js CHANGED
@@ -79,7 +79,7 @@ function isValidThemeHook(jsxPath, n, sourcePath) {
79
79
  }
80
80
  __name(isValidThemeHook, "isValidThemeHook");
81
81
  const isInsideTamagui = /* @__PURE__ */ __name((srcName) => {
82
- return srcName.includes("/tamagui/_jsx") || srcName.includes("/core/src");
82
+ return srcName.includes("/dist/jsx") || srcName.includes("/core/src");
83
83
  }, "isInsideTamagui");
84
84
  export {
85
85
  attrStr,
package/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "@tamagui/static",
3
- "version": "1.0.0-alpha.13",
3
+ "version": "1.0.0-alpha.17",
4
4
  "source": "src/index.ts",
5
5
  "typings": "types",
6
6
  "main": "dist/cjs",
7
7
  "module": "dist/esm",
8
- "module:jsx": "dist/_jsx",
8
+ "module:jsx": "dist/jsx",
9
9
  "files": [
10
10
  "types",
11
11
  "src",
@@ -41,6 +41,7 @@
41
41
  "loader-utils": "^2.0.0",
42
42
  "react": "*",
43
43
  "react-dom": "*",
44
+ "react-native-web": "^0.17.5",
44
45
  "react-test-renderer": "18.0.0-beta-149b420f6-20211119",
45
46
  "style-loader": "^3.3.0",
46
47
  "typescript": "^4.4.4",
@@ -54,22 +55,22 @@
54
55
  "@babel/traverse": "^7.15.4",
55
56
  "@dish/babel-preset": "^0.0.6",
56
57
  "@expo/match-media": "^0.1.0",
57
- "@tamagui/build": "^1.0.0-alpha.12",
58
- "@tamagui/core": "^1.0.0-alpha.13",
59
- "@tamagui/core-node": "^1.0.0-alpha.13",
60
- "@tamagui/fake-react-native": "^1.0.0-alpha.2",
61
- "@tamagui/helpers": "^1.0.0-alpha.13",
58
+ "@tamagui/build": "^1.0.0-alpha.17",
59
+ "@tamagui/core": "^1.0.0-alpha.17",
60
+ "@tamagui/core-node": "^1.0.0-alpha.17",
61
+ "@tamagui/fake-react-native": "^1.0.0-alpha.17",
62
+ "@tamagui/helpers": "^1.0.0-alpha.17",
62
63
  "babel-literal-to-ast": "^2.1.0",
63
64
  "esbuild": "^0.13.12",
64
65
  "esbuild-register": "^3.1.2",
65
66
  "find-cache-dir": "^3.3.1",
66
- "fs-extra": "^9.0.0",
67
+ "fs-extra": "^9.1.0",
67
68
  "invariant": "^2.2.4",
68
- "lodash": "^4.17.20",
69
- "tamagui": "^1.0.0-alpha.13"
69
+ "lodash": "^4.17.21",
70
+ "tamagui": "^1.0.0-alpha.17"
70
71
  },
71
72
  "peerDependencies": {
72
73
  "react-native-web": "*"
73
74
  },
74
- "gitHead": "5fa09073ac2c6bf529f0e81dd65db8b31682f360"
75
+ "gitHead": "af7a3c3e6d1da0e4a6f8636915fed3117448dffb"
75
76
  }
package/src/extractor/extractHelpers.ts CHANGED
@@ -98,5 +98,5 @@ export function isValidThemeHook(
98
98
  }
99
99
 
100
100
  export const isInsideTamagui = (srcName: string) => {
101
- return srcName.includes('/tamagui/_jsx') || srcName.includes('/core/src')
101
+ return srcName.includes('/dist/jsx') || srcName.includes('/core/src')
102
102
  }