fix(docz-utils): fix closing tag detection in removeTags (#1696)

nicolo-ribaudo · web-flow · commit bfcd923793df · 2022-02-07T02:10:31.000-03:00
diff --git a/core/docz-utils/.babelrc b/core/docz-utils/.babelrc
@@ -0,0 +1,14 @@
+{
+  "plugins": ["lodash"],
+  "presets": [
+    "@babel/preset-typescript",
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "node": "current"
+        }
+      }
+    ]
+  ]
+}
diff --git a/core/docz-utils/__tests__/jsx.test.ts b/core/docz-utils/__tests__/jsx.test.ts
@@ -0,0 +1,35 @@
+import { removeTags } from '../src/jsx'
+
+describe('removeTags', () => {
+  test('removes outer JSX tag', () => {
+    expect(
+      removeTags(`
+      <Playground>
+        <div>Some text</div>
+        <p>Other text</p>
+      </Playground>
+    `)
+    ).toMatchInlineSnapshot(`
+      "
+              <div>Some text</div>
+              <p>Other text</p>
+            "
+    `)
+  })
+
+  test('works when the closing tag is repeated in a comment', () => {
+    expect(
+      removeTags(`
+      <Playground>
+        {/* </Playground> */}
+        <div>Some text</div>
+      </Playground>
+    `)
+    ).toMatchInlineSnapshot(`
+      "
+              {/* </Playground> */}
+              <div>Some text</div>
+            "
+    `)
+  })
+})
diff --git a/core/docz-utils/package.json b/core/docz-utils/package.json
@@ -21,12 +21,13 @@
     "build": "trash lib && cross-env NODE_ENV=production rollup -c",
     "fix": "yarn lint --fix",
     "lint": "eslint . --ext mdx,ts,tsx",
-    "precommit": "lint-staged"
+    "precommit": "lint-staged",
+    "test": "yarn jest"
   },
   "dependencies": {
-    "@babel/generator": "^7.5.5",
-    "@babel/parser": "^7.5.5",
-    "@babel/traverse": "^7.5.5",
+    "@babel/generator": "^7.16.8",
+    "@babel/parser": "^7.16.12",
+    "@babel/traverse": "^7.16.10",
     "art-template": "^4.13.2",
     "fs-extra": "^8.1.0",
     "humanize-string": "^2.1.0",
diff --git a/core/docz-utils/src/ast.ts b/core/docz-utils/src/ast.ts
@@ -2,13 +2,13 @@ import * as parser from '@babel/parser'
 import traverse from '@babel/traverse'
 
 type Condition = (path: any) => boolean
-type Predicate = (path: any) => any
+type Predicate<Value> = (path: any) => Value
 
-export const valueFromTraverse = (
+export const valueFromTraverse = <Value = any>(
   condition: Condition,
-  predicate: Predicate = p => p
-) => (code: string) => {
-  let value = ''
+  predicate: Predicate<Value> = p => p
+) => (code: string): Value | '' => {
+  let value: Value | '' = ''
   const ast = parser.parse(code, { plugins: ['jsx'] })
 
   traverse(ast, {
diff --git a/core/docz-utils/src/jsx.ts b/core/docz-utils/src/jsx.ts
@@ -2,19 +2,29 @@ import * as jsxUtils from 'jsx-ast-utils'
 import strip from 'strip-indent'
 import escapeJS from 'js-string-escape'
 
-import { valueFromTraverse, codeFromNode } from './ast'
+import { valueFromTraverse } from './ast'
 
 export const propFromElement = (prop: string) =>
   valueFromTraverse(
     p => p.isJSXOpeningElement(),
     p => jsxUtils.getPropValue(jsxUtils.getProp(p.node.attributes, prop))
   )
 
-export const removeTags = (code: string) => {
-  const open = codeFromNode(p => p.isJSXOpeningElement())
-  const close = codeFromNode(p => p.isJSXClosingElement())
+const getTagContentsRange = valueFromTraverse<[number, number] | null>(
+  p => p.isJSXElement(),
+  ({ node }) => {
+    if (!node.closingElement) {
+      // if the JSX element doesn't have a closingElement, it's because it's self-closed
+      // and thus does not have any content: <Playground />
+      return null
+    }
+    return [node.openingElement.end, node.closingElement.start]
+  }
+)
 
-  return code.replace(open(code), '').replace(close(code), '')
+export const removeTags = (code: string) => {
+  const [start, end] = getTagContentsRange(code) || [0, 0]
+  return code.slice(start, end)
 }
 
 export const sanitizeCode = (code: string) => {
diff --git a/yarn.lock b/yarn.lock
