@planningcenter/tapestry-migration-cli 2.3.0-rc.15 → 2.3.0-rc.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/tapestry-migration-cli",
-  "version": "2.3.0-rc.15",
+  "version": "2.3.0-rc.16",
   "description": "CLI tool for Tapestry migrations",
   "type": "module",
   "main": "dist/index.js",
@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "186d72492e2422478d991e21b6e8a1780d2948e5"
+  "gitHead": "0768b8999312c4fc5e329ec1f1d68529b5de4603"
 }

package/src/components/link/index.ts

@@ -1,13 +1,18 @@
 import { Transform } from "jscodeshift"
 
 import inlineToKind from "./transforms/inlineToKind"
+import targetBlankToExternal from "./transforms/targetBlankToExternal"
 import toToHref from "./transforms/toToHref"
 
 const transform: Transform = (fileInfo, api, options) => {
   let currentSource = fileInfo.source
   let hasAnyChanges = false
 
-  const transforms: Transform[] = [inlineToKind, toToHref]
+  const transforms: Transform[] = [
+    inlineToKind,
+    toToHref,
+    targetBlankToExternal,
+  ]
 
   for (const individualTransform of transforms) {
     const result = individualTransform(

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

@@ -0,0 +1,191 @@
+import jscodeshift from "jscodeshift"
+import { describe, expect, it } from "vitest"
+
+import targetBlankToExternal from "./targetBlankToExternal"
+
+const j = jscodeshift.withParser("tsx")
+
+function applyTransform(source: string): string | null {
+  return targetBlankToExternal(
+    { path: "test.tsx", source },
+    { j, jscodeshift: j, report: () => {}, stats: () => {} },
+    {}
+  ) as string | null
+}
+
+describe("targetBlankToExternal transform", () => {
+  describe("basic transformations", () => {
+    it("should transform Link with target='_blank' to external", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/external" target="_blank">External Link</Link>
+}
+      `.trim()
+
+      const expected = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/external" external>External Link</Link>;
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result?.trim()).toBe(expected)
+    })
+
+    it("should remove target and rel attributes while adding external", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <Link 
+      href="/external" 
+      target="_blank" 
+      rel="noopener noreferrer"
+      className="external-link"
+    >
+      External Link
+    </Link>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain("external")
+      expect(result).toContain('className="external-link"')
+      expect(result).not.toContain('target="_blank"')
+      expect(result).not.toContain('rel="noopener noreferrer"')
+    })
+
+    it("should only transform Links with target='_blank'", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <div>
+      <Link href="/internal" target="_self">Internal Link</Link>
+      <Link href="/external" target="_blank">External Link</Link>
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain('target="_self"') // Should remain
+      expect(result).toContain("external") // Should be added
+      expect(result).not.toContain('target="_blank"') // Should be removed
+    })
+
+    it("should handle Links without rel attribute", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/external" target="_blank">External Link</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain("external")
+      expect(result).not.toContain('target="_blank"')
+    })
+
+    it("should handle Links with only rel attribute (no target)", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/internal" rel="noopener">Internal Link</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBeNull() // No changes should be made, transform returns null
+    })
+  })
+
+  describe("edge cases", () => {
+    it("should handle multiple Link components", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <div>
+      <Link href="/page1" target="_blank">Page 1</Link>
+      <Link href="/page2" target="_blank" rel="noopener">Page 2</Link>
+      <Link href="/page3">Page 3</Link>
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain("external") // Should appear twice
+      expect(result).not.toContain('target="_blank"')
+      expect(result).not.toContain('rel="noopener"')
+      expect(result).toContain('href="/page3"') // Should remain unchanged
+    })
+
+    it("should handle dynamic target values", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/external" target={isExternal ? "_blank" : "_self"}>Link</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBeNull() // No changes should be made for dynamic values
+    })
+
+    it("should handle self-closing Link components", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/external" target="_blank" />
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain("external")
+      expect(result).not.toContain('target="_blank"')
+    })
+  })
+
+  describe("import handling", () => {
+    it("should only transform when Link is imported from correct package", () => {
+      const input = `
+import { Link } from "react-router-dom"
+
+export default function Test() {
+  return <Link to="/external" target="_blank">External Link</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBeNull() // No changes should be made
+    })
+
+    it("should handle aliased imports", () => {
+      const input = `
+import { Link as TapestryLink } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <TapestryLink href="/external" target="_blank">External Link</TapestryLink>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain("external")
+      expect(result).not.toContain('target="_blank"')
+    })
+  })
+})

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

@@ -0,0 +1,30 @@
+import { addAttribute } from "../../shared/actions/addAttribute"
+import { removeAttribute } from "../../shared/actions/removeAttribute"
+import { hasAttributeValue } from "../../shared/conditions/hasAttributeValue"
+import { attributeTransformFactory } from "../../shared/transformFactories/attributeTransformFactory"
+
+const transform = attributeTransformFactory({
+  condition: hasAttributeValue("target", "_blank"),
+  targetComponent: "Link",
+  targetPackage: "@planningcenter/tapestry-react",
+  transform: (element, { j, source }) => {
+    // Remove target attribute
+    removeAttribute("target", { element, j, source })
+
+    // Remove rel attribute if it exists
+    removeAttribute("rel", { element, j, source })
+
+    // Add external attribute as shorthand boolean
+    addAttribute({
+      booleanAsShorthand: true,
+      element,
+      j,
+      name: "external",
+      value: true, // This will create just "external" not "external={true}"
+    })
+
+    return true
+  },
+})
+
+export default transform

package/src/components/shared/actions/addAttribute.test.ts

@@ -266,6 +266,94 @@ describe("addAttribute", () => {
     })
   })
 
+  describe("boolean shorthand values", () => {
+    it("should add boolean true attribute as shorthand", () => {
+      const element = createElementFromCode("<Button>Save</Button>")
+
+      addAttribute({
+        booleanAsShorthand: true,
+        element,
+        j,
+        name: "external",
+        value: true,
+      })
+
+      const externalAttr = getAttributeFromElement(element, "external")
+      expect(externalAttr).not.toBeNull()
+      expect(externalAttr?.value).toBeNull() // Shorthand boolean has no value
+    })
+
+    it("should not add boolean false attribute as shorthand", () => {
+      const element = createElementFromCode("<Button>Save</Button>")
+      const initialAttrCount = (element.openingElement.attributes || []).length
+
+      addAttribute({
+        booleanAsShorthand: true,
+        element,
+        j,
+        name: "external",
+        value: false,
+      })
+
+      const finalAttrCount = (element.openingElement.attributes || []).length
+      expect(finalAttrCount).toBe(initialAttrCount)
+
+      const externalAttr = getAttributeFromElement(element, "external")
+      expect(externalAttr).toBeNull()
+    })
+
+    it("should render shorthand boolean correctly in source", () => {
+      const source = j("<Button>Save</Button>")
+      const element = source.find(j.JSXElement).at(0).get().value as JSXElement
+
+      addAttribute({
+        booleanAsShorthand: true,
+        element,
+        j,
+        name: "external",
+        value: true,
+      })
+
+      const result = source.toSource()
+      expect(result).toContain("external") // Should be just "external", not "external={true}"
+      expect(result).not.toContain("external={true}")
+    })
+
+    it("should handle multiple shorthand boolean attributes", () => {
+      const element = createElementFromCode("<Button>Save</Button>")
+
+      addAttribute({
+        booleanAsShorthand: true,
+        element,
+        j,
+        name: "external",
+        value: true,
+      })
+      addAttribute({
+        booleanAsShorthand: true,
+        element,
+        j,
+        name: "loading",
+        value: false,
+      })
+      addAttribute({
+        booleanAsShorthand: true,
+        element,
+        j,
+        name: "disabled",
+        value: true,
+      })
+
+      const externalAttr = getAttributeFromElement(element, "external")
+      const loadingAttr = getAttributeFromElement(element, "loading")
+      const disabledAttr = getAttributeFromElement(element, "disabled")
+
+      expect(externalAttr).not.toBeNull()
+      expect(loadingAttr).toBeNull() // false values should not be added
+      expect(disabledAttr).not.toBeNull()
+    })
+  })
+
   describe("integration with JSCodeshift", () => {
     it("should render correctly in transformed source", () => {
       const source = j("<Button>Save</Button>")
@@ -296,5 +384,25 @@ describe("addAttribute", () => {
       expect((testIdAttr?.value as StringLiteral)?.value).toBe("save-button")
       expect((ariaAttr?.value as StringLiteral)?.value).toBe("help-text")
     })
+
+    it("should render shorthand boolean attributes correctly in source", () => {
+      const source = j("<Button>Save</Button>")
+      const element = source.find(j.JSXElement).at(0).get().value as JSXElement
+
+      addAttribute({
+        booleanAsShorthand: true,
+        element,
+        j,
+        name: "external",
+        value: true,
+      })
+      addAttribute({ element, j, name: "disabled", value: true }) // Regular boolean
+
+      const result = source.toSource()
+
+      expect(result).toContain("external") // Shorthand boolean
+      expect(result).toContain("disabled={true}") // Regular boolean
+      expect(result).not.toContain("external={true}")
+    })
   })
 })

package/src/components/shared/actions/addAttribute.ts

@@ -21,7 +21,9 @@ export function addAttribute({
   name,
   j,
   value,
+  booleanAsShorthand = false,
 }: {
+  booleanAsShorthand?: boolean
   element: JSXElement
   j: JSCodeshift
   name: string
@@ -40,6 +42,18 @@ export function addAttribute({
     return
   }
 
+  // Handle boolean shorthand
+  // booleanAsShorthand is a temporary flag to allow for boolean attributes to be added as shorthand
+  // This will be removed in a follow-up PR for button[disabled]
+  if (typeof value === "boolean" && booleanAsShorthand) {
+    if (value === true) {
+      // Add as shorthand boolean attribute (just "external")
+      attributes.push(j.jsxAttribute(j.jsxIdentifier(name), null))
+    }
+    // For false, don't add the attribute at all
+    return
+  }
+
   const formattedValue = formatValue(value, j)
   attributes.push(j.jsxAttribute(j.jsxIdentifier(name), formattedValue))
 }