@planningcenter/tapestry-migration-cli 2.4.0-rc.10 → 2.4.0-rc.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/tapestry-migration-cli",
-  "version": "2.4.0-rc.10",
+  "version": "2.4.0-rc.12",
   "description": "CLI tool for Tapestry migrations",
   "type": "module",
   "main": "dist/index.js",
@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cb64c1483123040f674d56065cb108dbb10ca985"
+  "gitHead": "e7660769921beb3848d31ed3733846bcb22e7159"
 }

package/src/components/link/index.ts

@@ -4,9 +4,11 @@ import childrenToLabel from "./transforms/childrenToLabel"
 import convertStyleProps from "./transforms/convertStyleProps"
 import inlineMemberToKind from "./transforms/inlineMemberToKind"
 import inlinePropToKind from "./transforms/inlinePropToKind"
+import moveLinkImport from "./transforms/moveLinkImport"
 import removeAs from "./transforms/removeAs"
 import reviewStyles from "./transforms/reviewStyles"
 import targetBlankToExternal from "./transforms/targetBlankToExternal"
+import tooltipToWrapper from "./transforms/tooltipToWrapper"
 import toToHref from "./transforms/toToHref"
 import unsupportedProps from "./transforms/unsupportedProps"
 
@@ -17,6 +19,7 @@ const transform: Transform = (fileInfo, api, options) => {
   const transforms: Transform[] = [
     inlineMemberToKind,
     inlinePropToKind,
+    tooltipToWrapper,
     toToHref,
     targetBlankToExternal,
     removeAs,
@@ -24,6 +27,7 @@ const transform: Transform = (fileInfo, api, options) => {
     reviewStyles,
     convertStyleProps,
     unsupportedProps,
+    moveLinkImport,
   ]
 
   for (const individualTransform of transforms) {

package/src/components/link/transforms/moveLinkImport.test.ts

@@ -0,0 +1,295 @@
+import jscodeshift from "jscodeshift"
+import { describe, expect, it } from "vitest"
+
+import transform from "./moveLinkImport"
+
+const j = jscodeshift.withParser("tsx")
+
+function applyTransform(source: string): string | null {
+  const fileInfo = { path: "test.tsx", source }
+  return transform(
+    fileInfo,
+    { j, jscodeshift: j, report: () => {}, stats: () => {} },
+    {}
+  ) as string | null
+}
+
+describe("moveLinkImport transform", () => {
+  describe("basic transformations", () => {
+    it("should move Link import from tapestry-react to tapestry", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/test">Test</Link>
+}
+      `.trim()
+
+      const expected = `
+import { Link } from "@planningcenter/tapestry";
+
+export default function Test() {
+  return <Link href="/test">Test</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result?.trim()).toBe(expected)
+    })
+
+    it("should handle multiple Link components", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <div>
+      <Link href="/home">Home</Link>
+      <Link href="/about">About</Link>
+    </div>
+  )
+}
+      `.trim()
+
+      const expected = `
+import { Link } from "@planningcenter/tapestry";
+
+export default function Test() {
+  return (
+    <div>
+      <Link href="/home">Home</Link>
+      <Link href="/about">About</Link>
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result?.trim()).toBe(expected)
+    })
+
+    it("should preserve other imports from tapestry-react", () => {
+      const input = `
+import { Link, Button, Input } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/test">Test</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        'import { Button, Input } from "@planningcenter/tapestry-react"'
+      )
+      expect(result).toContain(
+        'import { Link } from "@planningcenter/tapestry"'
+      )
+      expect(result).toContain('<Link href="/test">Test</Link>')
+      expect(result).not.toContain(
+        'Link, Button } from "@planningcenter/tapestry-react"'
+      )
+    })
+  })
+
+  describe("import conflict handling", () => {
+    it("should use alias when Link already imported from tapestry", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry"
+import { Link as ReactLink } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <ReactLink href="/test">Test</ReactLink>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        'import { Link } from "@planningcenter/tapestry"'
+      )
+      expect(result).toContain('<Link href="/test">Test</Link>')
+      expect(result).not.toContain('from "@planningcenter/tapestry-react"')
+      expect(result).not.toContain("ReactLink")
+    })
+
+    it("should handle existing tapestry import with other components", () => {
+      const input = `
+import { Button, Input } from "@planningcenter/tapestry"
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/test">Test</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        'import { Button, Input, Link } from "@planningcenter/tapestry"'
+      )
+      expect(result).toContain('<Link href="/test">Test</Link>')
+      expect(result).not.toContain('from "@planningcenter/tapestry-react"')
+    })
+  })
+
+  describe("edge cases", () => {
+    it("should not transform if Link is not imported from tapestry-react", () => {
+      const input = `
+import { Button } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Button>Test</Button>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBe(null)
+    })
+
+    it("should handle Link with aliased import", () => {
+      const input = `
+import { Link as ReactLink } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <ReactLink href="/test">Test</ReactLink>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        'import { Link } from "@planningcenter/tapestry"'
+      )
+      expect(result).toContain('<Link href="/test">Test</Link>')
+      expect(result).not.toContain("ReactLink")
+      expect(result).not.toContain('from "@planningcenter/tapestry-react"')
+    })
+
+    it("should handle self-closing Link components", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/test" />
+}
+      `.trim()
+
+      const expected = `
+import { Link } from "@planningcenter/tapestry";
+
+export default function Test() {
+  return <Link href="/test" />
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result?.trim()).toBe(expected)
+    })
+
+    it("should handle Link with props", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/test" kind="primary" onClick={handleClick}>Test</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        'import { Link } from "@planningcenter/tapestry"'
+      )
+      expect(result).toContain('kind="primary"')
+      expect(result).toContain("onClick={handleClick}")
+      expect(result).not.toContain('from "@planningcenter/tapestry-react"')
+    })
+  })
+
+  describe("no changes scenarios", () => {
+    it("should return null when no Link import exists", () => {
+      const input = `
+import React from "react"
+
+export default function Test() {
+  return <div>Hello</div>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBe(null)
+    })
+
+    it("should return null when Link already imported from tapestry", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry"
+
+export default function Test() {
+  return <Link href="/test">Test</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBe(null)
+    })
+
+    it("should return null for empty file", () => {
+      const result = applyTransform("")
+      expect(result).toBe(null)
+    })
+  })
+
+  describe("complex scenarios", () => {
+    it("should handle mixed imports and multiple components", () => {
+      const input = `
+import React from "react"
+import { Link, Button } from "@planningcenter/tapestry-react"
+import { Input } from "@planningcenter/tapestry"
+
+export default function Test() {
+  return (
+    <form>
+      <Input name="email" />
+      <Button type="submit">Submit</Button>
+      <Link href="/cancel">Cancel</Link>
+    </form>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        'import { Button } from "@planningcenter/tapestry-react"'
+      )
+      expect(result).toContain(
+        'import { Input, Link } from "@planningcenter/tapestry"'
+      )
+      expect(result).toContain('<Button type="submit">Submit</Button>')
+      expect(result).toContain('<Link href="/cancel">Cancel</Link>')
+      expect(result).not.toContain(
+        'Link, Button } from "@planningcenter/tapestry-react"'
+      )
+    })
+
+    it("should handle Link usage in JSX expressions", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test({ showLink }) {
+  return (
+    <div>
+      {showLink && <Link href="/conditional">Conditional</Link>}
+      {items.map(item => <Link key={item.id} href={item.url}>{item.name}</Link>)}
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        'import { Link } from "@planningcenter/tapestry"'
+      )
+      expect(result).toContain('<Link href="/conditional">Conditional</Link>')
+      expect(result).toContain(
+        "<Link key={item.id} href={item.url}>{item.name}</Link>"
+      )
+      expect(result).not.toContain('from "@planningcenter/tapestry-react"')
+    })
+  })
+})

package/src/components/link/transforms/moveLinkImport.ts

@@ -0,0 +1,14 @@
+import { Transform } from "jscodeshift"
+
+import { componentTransformFactory } from "../../shared/transformFactories/componentTransformFactory"
+
+const transform: Transform = componentTransformFactory({
+  condition: () => true,
+  conflictAlias: "TLink",
+  fromComponent: "Link",
+  fromPackage: "@planningcenter/tapestry-react",
+  toComponent: "Link",
+  toPackage: "@planningcenter/tapestry",
+})
+
+export default transform

package/src/components/link/transforms/tooltipToWrapper.test.ts

@@ -0,0 +1,392 @@
+import jscodeshift from "jscodeshift"
+import { describe, expect, it } from "vitest"
+
+import transform from "./tooltipToWrapper"
+
+const j = jscodeshift.withParser("tsx")
+
+function applyTransform(source: string): string | null {
+  const fileInfo = { path: "test.tsx", source }
+  return transform(
+    fileInfo,
+    { j, jscodeshift: j, report: () => {}, stats: () => {} },
+    {}
+  ) as string | null
+}
+
+describe("tooltipToWrapper transform", () => {
+  describe("basic transformations", () => {
+    it("should wrap Link with tooltip string in Tooltip component", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/save" tooltip={{ title: "Save this item" }}>Save</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        'import { Link, Tooltip } from "@planningcenter/tapestry-react"'
+      )
+      expect(result).toContain('<Tooltip {...{ title: "Save this item" }}>')
+      expect(result).toContain('<Link href="/save">Save</Link>')
+      expect(result).toContain("</Tooltip>")
+      expect(result).not.toContain("tooltip=")
+    })
+
+    it("should handle tooltip with JSX expression containing string literal", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/save" tooltip={{ title: "Save this item" }}>Save</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain('<Tooltip {...{ title: "Save this item" }}>')
+      expect(result).toContain('<Link href="/save">Save</Link>')
+      expect(result).not.toContain("tooltip=")
+    })
+
+    it("should handle tooltip with object expression as spread", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/save" tooltip={{text: "Save", placement: "top"}}>Save</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        '<Tooltip {...{text: "Save", placement: "top"}}>'
+      )
+      expect(result).toContain('<Link href="/save">Save</Link>')
+      expect(result).not.toContain("tooltip=")
+    })
+
+    it("should preserve other Link attributes", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/help" tooltip={{title: "Help"}} kind="primary" onClick={handler}>Help</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain('<Tooltip {...{title: "Help"}}>')
+      expect(result).toContain(
+        '<Link href="/help" kind="primary" onClick={handler}>Help</Link>'
+      )
+      expect(result).not.toContain("tooltip=")
+    })
+
+    it("should handle self-closing Link with tooltip", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/icon" tooltip={{title: "Icon link"}} />
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain('<Tooltip {...{title: "Icon link"}}>')
+      expect(result).toContain('<Link href="/icon" />')
+      expect(result).toContain("</Tooltip>")
+      expect(result).not.toContain("tooltip=")
+    })
+  })
+
+  describe("import management", () => {
+    it("should add Tooltip to existing tapestry-react import", () => {
+      const input = `
+import { Link, Button } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/save" tooltip={{title: "Save"}}>Save</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        'import { Link, Button, Tooltip } from "@planningcenter/tapestry-react"'
+      )
+      expect(result).toContain('<Tooltip {...{title: "Save"}}>')
+    })
+
+    it("should not add duplicate Tooltip import", () => {
+      const input = `
+import { Link, Tooltip } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/save" tooltip={{title: "Save"}}>Save</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      const tooltipImports = (result?.match(/import.*Tooltip.*from/g) || [])
+        .length
+      expect(tooltipImports).toBe(1)
+      expect(result).toContain(
+        'import { Link, Tooltip } from "@planningcenter/tapestry-react"'
+      )
+    })
+
+    it("should create new tapestry-react import when none exists", () => {
+      const input = `
+import React from "react"
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/save" tooltip={{title: "Save"}}>Save</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        'import { Link, Tooltip } from "@planningcenter/tapestry-react"'
+      )
+    })
+
+    it("should handle empty imports scenario", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+export default function Test() {
+  return <Link href="/save" tooltip={{title: "Save"}}>Save</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        'import { Link, Tooltip } from "@planningcenter/tapestry-react"'
+      )
+    })
+  })
+
+  describe("multiple elements", () => {
+    it("should handle multiple Links with tooltips", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <div>
+      <Link href="/save" tooltip={{title: "Save the document"}}>Save</Link>
+      <Link href="/cancel" tooltip={{title: "Cancel operation"}}>Cancel</Link>
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        'import { Link, Tooltip } from "@planningcenter/tapestry-react"'
+      )
+      expect(result).toContain('<Tooltip {...{title: "Save the document"}}>')
+      expect(result).toContain('<Tooltip {...{title: "Cancel operation"}}>')
+      expect(result).not.toContain("tooltip=")
+    })
+
+    it("should only transform Links with tooltip attribute", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <div>
+      <Link href="/with" tooltip={{title: "Has tooltip"}}>With Tooltip</Link>
+      <Link href="/without">Without Tooltip</Link>
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain('<Tooltip {...{title: "Has tooltip"}}>')
+      expect(result).toContain('<Link href="/with">With Tooltip</Link>')
+      expect(result).toContain('<Link href="/without">Without Tooltip</Link>')
+      const tooltipCount = (result?.match(/<Tooltip/g) || []).length
+      expect(tooltipCount).toBe(1)
+    })
+  })
+
+  describe("edge cases", () => {
+    it("should return null when Link is not imported from tapestry-react", () => {
+      const input = `
+import { Button } from "@planningcenter/tapestry-react"
+import { Link } from "other-library"
+
+export default function Test() {
+  return <Link href="/save" tooltip={{title: "Save"}}>Save</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBe(null)
+    })
+
+    it("should return null when no Link is imported", () => {
+      const input = `
+import React from "react"
+
+export default function Test() {
+  return <div>No links here</div>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBe(null)
+    })
+
+    it("should return null when no tooltips are present", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/primary" kind="primary">Save</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBe(null)
+    })
+
+    it("should handle aliased Link import", () => {
+      const input = `
+import { Link as TapestryLink } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <TapestryLink href="/save" tooltip={{title: "Save item"}}>Save</TapestryLink>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        'import { Link as TapestryLink, Tooltip } from "@planningcenter/tapestry-react"'
+      )
+      expect(result).toContain('<Tooltip {...{title: "Save item"}}>')
+      expect(result).toContain('<TapestryLink href="/save">Save</TapestryLink>')
+      expect(result).not.toContain("tooltip=")
+    })
+
+    it("should handle complex JSX expressions", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test({ items }) {
+  return (
+    <div>
+      {items.map(item => (
+        <Link key={item.id} href={item.url} tooltip={\`Save \${item.name}\`} onClick={() => save(item)}>
+          {item.name}
+        </Link>
+      ))}
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        "<Tooltip key={item.id} {...`Save ${item.name}`}>"
+      )
+      expect(result).toContain(
+        "<Link href={item.url} onClick={() => save(item)}>"
+      )
+      expect(result).not.toContain("tooltip=")
+    })
+
+    it("should handle empty tooltip attribute", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/save" tooltip>Save</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain("<Tooltip>")
+      expect(result).toContain('<Link href="/save">Save</Link>')
+      expect(result).toContain("</Tooltip>")
+      expect(result).not.toContain("tooltip")
+    })
+  })
+
+  describe("complex scenarios", () => {
+    it("should handle nested JSX and mixed components", () => {
+      const input = `
+import React from "react"
+import { Link, Button } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <form>
+      <div className="actions">
+        <Link href="/submit" tooltip={{title: "Submit the form"}} kind="primary">
+          Submit
+        </Link>
+        <Button onClick={cancel}>Cancel</Button>
+        <Link href="/reset" tooltip={{text: "Reset form", placement: "bottom"}}>
+          Reset
+        </Link>
+      </div>
+    </form>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        'import { Link, Button, Tooltip } from "@planningcenter/tapestry-react"'
+      )
+      expect(result).toContain('<Tooltip {...{title: "Submit the form"}}>')
+      expect(result).toContain('href="/submit" kind="primary"')
+      expect(result).toContain("Submit")
+      expect(result).toContain(
+        '<Tooltip {...{text: "Reset form", placement: "bottom"}}>'
+      )
+      expect(result).toContain('href="/reset"')
+      expect(result).toContain("Reset")
+      expect(result).toContain("<Button onClick={cancel}>Cancel</Button>")
+      expect(result).not.toContain("tooltip=")
+    })
+  })
+
+  it("converts tooltip with string literal to title prop", () => {
+    const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/click" tooltip="Click me">Click</Link>
+}
+    `.trim()
+
+    const result = applyTransform(input)!
+
+    expect(result.replace(/(\s*)?\n(\s*)?/gm, " ")).toContain(
+      '<Tooltip {...{ title: "Click me" }}>'
+    )
+    expect(result).toContain('<Link href="/click">Click</Link>')
+    expect(result).not.toContain("tooltip=")
+  })
+})

package/src/components/link/transforms/tooltipToWrapper.ts

@@ -0,0 +1,35 @@
+import { createWrapper } from "../../shared/actions/createWrapper"
+import { getAttributeValueAsProps } from "../../shared/actions/getAttributeValueAsProps"
+import { removeAttribute } from "../../shared/actions/removeAttribute"
+import { hasAttribute } from "../../shared/conditions/hasAttribute"
+import { attributeTransformFactory } from "../../shared/transformFactories/attributeTransformFactory"
+
+const transform = attributeTransformFactory({
+  condition: hasAttribute("tooltip"),
+  targetComponent: "Link",
+  targetPackage: "@planningcenter/tapestry-react",
+  transform: (element, { j, source }) => {
+    const wrapperProps = getAttributeValueAsProps({
+      element,
+      j,
+      name: "tooltip",
+      stringValueKey: "title",
+    })
+
+    removeAttribute("tooltip", { element, j, source })
+
+    createWrapper({
+      conflictAlias: "TRTooltip",
+      element,
+      j,
+      source,
+      wrapperName: "Tooltip",
+      wrapperPackage: "@planningcenter/tapestry-react",
+      wrapperProps,
+    })
+
+    return true
+  },
+})
+
+export default transform