@planningcenter/tapestry-migration-cli 2.3.0-rc.9 → 2.4.0-rc.0

package/dist/tapestry-react-shim.cjs

@@ -3084,8 +3084,8 @@ const tokens = {
   "--t-fill-color-transparency-dark-070": "hsla(0, 0%, 0%, 0.7)",
   "--t-fill-color-transparency-dark-080": "hsla(0, 0%, 0%, 0.8)",
   "--t-fill-color-transparency-dark-090": "hsla(0, 0%, 0%, 0.9)",
-  "--t-surface-color-canvas": "hsl(0, 0%, 98%)",
   "--t-surface-color-card": "hsl(0, 0%, 100%)",
+  "--t-surface-color-canvas": "hsl(0, 0%, 100%)",
   "--t-border-color-default-base": "hsl(0, 0%, 88%)",
   "--t-border-color-default-dark": "hsl(0, 0%, 81%)",
   "--t-border-color-default-darker": "hsl(0, 0%, 68%)",

package/package.json

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

package/src/components/button/index.ts

@@ -13,6 +13,7 @@ import moveButtonImport from "./transforms/moveButtonImport"
 import removeAsButton from "./transforms/removeAsButton"
 import removeDuplicateKeys from "./transforms/removeDuplicateKeys"
 import removeToTransform from "./transforms/removeTo"
+import removeTypeButton from "./transforms/removeTypeButton"
 import reviewStyles from "./transforms/reviewStyles"
 import spinnerToLoadingButton from "./transforms/spinnerToLoadingButton"
 import themeVariantToKind from "./transforms/themeVariantToKind"
@@ -57,6 +58,7 @@ const transform: Transform = async (fileInfo, api, options) => {
     removeToTransform,
     removeDuplicateKeys,
     removeAsButton,
+    removeTypeButton,
     auditSpreadProps,
     reviewStyles,
     convertStyleProps,

package/src/components/button/transforms/convertStyleProps.test.ts

@@ -110,9 +110,9 @@ describe("convertStyleProps transform", () => {
 
       const result = applyTransform(source)
 
-      expect(result).not.toContain('height="40px"')
+      expect(result).not.toContain('<Button height="40px"')
       expect(result).toContain(
-        'TODO: tapestry-migration (height): height has been removed as this is covered by default styling: height: "40px"'
+        'TODO: tapestry-migration (styleProp): height has been removed as this is covered by default styling: height="40px"'
       )
       expect(result).toContain('kind="primary"')
     })
@@ -128,7 +128,7 @@ describe("convertStyleProps transform", () => {
 
       const result = applyTransform(source)
 
-      expect(result).not.toContain("height={buttonHeight}")
+      expect(result).not.toContain("<Button height={buttonHeight}")
       expect(result).toContain("TODO: tapestry-migration")
       expect(result).toContain("buttonHeight")
       expect(result).toContain("disabled")
@@ -219,10 +219,9 @@ describe("convertStyleProps transform", () => {
       expect(result).toContain('marginLeft: "128px"')
       expect(result).toContain("}}>")
       expect(result).toContain(
-        'TODO: tapestry-migration (height): height has been removed as this is covered by default styling: height: "40px"'
+        'TODO: tapestry-migration (styleProp): height has been removed as this is covered by default styling: height="40px"'
       )
       expect(result).not.toContain("marginLeft={16}")
-      expect(result).not.toContain('height="40px"')
       expect(result).not.toContain('distribution="center"')
       expect(result).not.toContain('paddingTop="8px"')
       expect(result).toContain('kind="primary"')

package/src/components/button/transforms/removeTypeButton.test.ts

@@ -0,0 +1,197 @@
+import jscodeshift from "jscodeshift"
+import { describe, expect, it } from "vitest"
+
+import transform from "./removeTypeButton"
+
+const j = jscodeshift.withParser("tsx")
+
+// Helper to run transform and get result
+function applyTransform(source: string): string | null {
+  const fileInfo = { path: "test.tsx", source }
+  const api = {
+    j,
+    jscodeshift: j,
+    report: () => {},
+    stats: () => {},
+  }
+  const result = transform(fileInfo, api, {})
+  return result as string | null
+}
+
+describe("removeTypeButton transform", () => {
+  describe("basic transformation", () => {
+    it("should remove type='button' from Button", () => {
+      const input = `
+        import { Button } from "@planningcenter/tapestry-react"
+
+        function Component() {
+          return <Button type="button">Click me</Button>
+        }
+      `
+
+      const result = applyTransform(input)
+
+      expect(result).toContain("<Button>Click me</Button>")
+      expect(result).not.toContain('type="button"')
+    })
+
+    it('should remove type="button" from Button', () => {
+      const input = `
+        import { Button } from "@planningcenter/tapestry-react"
+
+        function Component() {
+          return <Button type="button" onClick={handleClick}>Submit</Button>
+        }
+      `
+
+      const result = applyTransform(input)
+
+      expect(result).toContain("<Button onClick={handleClick}>Submit</Button>")
+      expect(result).not.toContain('type="button"')
+    })
+
+    it("should preserve Button without type='button'", () => {
+      const input = `
+        import { Button } from "@planningcenter/tapestry-react"
+
+        function Component() {
+          return <Button onClick={handleClick}>Click me</Button>
+        }
+      `
+
+      const result = applyTransform(input)
+
+      expect(result).toBeNull()
+    })
+
+    it("should preserve Button with type='submit'", () => {
+      const input = `
+        import { Button } from "@planningcenter/tapestry-react"
+
+        function Component() {
+          return <Button type="submit">Submit</Button>
+        }
+      `
+
+      const result = applyTransform(input)
+
+      expect(result).toBeNull()
+    })
+
+    it("should preserve Button with type='reset'", () => {
+      const input = `
+        import { Button } from "@planningcenter/tapestry-react"
+
+        function Component() {
+          return <Button type="reset">Reset</Button>
+        }
+      `
+
+      const result = applyTransform(input)
+
+      expect(result).toBeNull()
+    })
+  })
+
+  describe("multiple buttons", () => {
+    it("should handle mixed Button usage", () => {
+      const input = `
+        import { Button } from "@planningcenter/tapestry-react"
+
+        function Component() {
+          return (
+            <div>
+              <Button type="button">Click me</Button>
+              <Button type="submit">Submit</Button>
+              <Button type="button" onClick={handleClick}>Action</Button>
+            </div>
+          )
+        }
+      `
+
+      const result = applyTransform(input)
+
+      expect(result).toContain("<Button>Click me</Button>")
+      expect(result).toContain('<Button type="submit">Submit</Button>')
+      expect(result).toContain("<Button onClick={handleClick}>Action</Button>")
+      expect(result).not.toContain('type="button"')
+    })
+  })
+
+  describe("edge cases", () => {
+    it("should handle Button with multiple attributes including type='button'", () => {
+      const input = `
+        import { Button } from "@planningcenter/tapestry-react"
+
+        function Component() {
+          return <Button className="btn" type="button" disabled>Disabled</Button>
+        }
+      `
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        '<Button className="btn" disabled>Disabled</Button>'
+      )
+      expect(result).not.toContain('type="button"')
+    })
+
+    it("should not affect other components with type='button'", () => {
+      const input = `
+        import { Button } from "@planningcenter/tapestry-react"
+
+        function Component() {
+          return (
+            <div>
+              <Button type="button">Tapestry Button</Button>
+              <button type="button">HTML Button</button>
+            </div>
+          )
+        }
+      `
+
+      const result = applyTransform(input)
+
+      expect(result).toContain("<Button>Tapestry Button</Button>")
+      expect(result).toContain('<button type="button">HTML Button</button>')
+    })
+
+    it("should handle Button with expression type", () => {
+      const input = `
+        import { Button } from "@planningcenter/tapestry-react"
+
+        function Component() {
+          return <Button type={"button"}>Click me</Button>
+        }
+      `
+
+      const result = applyTransform(input)
+
+      if (result) {
+        expect(result).toContain("<Button>Click me</Button>")
+        expect(result).not.toContain('type={"button"}')
+      } else {
+        // If no transformation occurred, the original should still have the expression
+        expect(input).toContain('type={"button"}')
+      }
+    })
+  })
+
+  describe("import handling", () => {
+    it("should not affect imports", () => {
+      const input = `
+        import { Button } from "@planningcenter/tapestry-react"
+
+        function Component() {
+          return <Button type="button">Click me</Button>
+        }
+      `
+
+      const result = applyTransform(input)
+
+      expect(result).toContain(
+        'import { Button } from "@planningcenter/tapestry-react"'
+      )
+    })
+  })
+})

package/src/components/button/transforms/removeTypeButton.ts

@@ -0,0 +1,15 @@
+import { Transform } from "jscodeshift"
+
+import { removeAttribute } from "../../shared/actions/removeAttribute"
+import { hasAttributeValue } from "../../shared/conditions/hasAttributeValue"
+import { attributeTransformFactory } from "../../shared/transformFactories/attributeTransformFactory"
+
+const transform: Transform = attributeTransformFactory({
+  condition: hasAttributeValue("type", "button"),
+  targetComponent: "Button",
+  targetPackage: "@planningcenter/tapestry-react",
+  transform: (element, { j, source }) =>
+    removeAttribute("type", { element, j, source }),
+})
+
+export default transform

package/src/components/link/index.ts

@@ -0,0 +1,32 @@
+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,
+    targetBlankToExternal,
+  ]
+
+  for (const individualTransform of transforms) {
+    const result = individualTransform(
+      { ...fileInfo, source: currentSource },
+      api,
+      options
+    )
+    if (result && result !== currentSource) {
+      currentSource = result as string
+      hasAnyChanges = true
+    }
+  }
+
+  return hasAnyChanges ? currentSource : null
+}
+
+export default transform

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

@@ -0,0 +1,308 @@
+import jscodeshift from "jscodeshift"
+import { describe, expect, it } from "vitest"
+
+import transform from "./inlineToKind"
+
+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("inlineToKind transform", () => {
+  describe("basic transformations", () => {
+    it("should transform Link.Inline to Link with kind='inline-text'", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link.Inline href="/profile">Profile</Link.Inline>
+}
+      `.trim()
+
+      const expected = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/profile" kind="inline-text">Profile</Link>;
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result?.trim()).toBe(expected)
+    })
+
+    it("should preserve all existing props when transforming Link.Inline", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <Link.Inline 
+      href="/dashboard" 
+      className="nav-link" 
+      target="_blank"
+      rel="noopener"
+      data-testid="profile-link"
+    >
+      Dashboard
+    </Link.Inline>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain('kind="inline-text"')
+      expect(result).toContain('href="/dashboard"')
+      expect(result).toContain('className="nav-link"')
+      expect(result).toContain('target="_blank"')
+      expect(result).toContain('rel="noopener"')
+      expect(result).toContain('data-testid="profile-link"')
+      expect(result).toContain('kind="inline-text"')
+      expect(result).toContain("<Link")
+      expect(result).not.toContain("Link.Inline")
+    })
+
+    it("should handle self-closing Link.Inline tags", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link.Inline href="/dashboard" />
+}
+      `.trim()
+
+      const expected = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/dashboard" kind="inline-text" />;
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result?.trim()).toBe(expected)
+    })
+
+    it("should handle multiple Link.Inline components", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <div>
+      <Link.Inline href="/home">Home</Link.Inline>
+      <Link.Inline href="/about">About</Link.Inline>
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        '<Link href="/home" kind="inline-text">Home</Link>'
+      )
+      expect(result).toContain(
+        '<Link href="/about" kind="inline-text">About</Link>'
+      )
+      expect(result).not.toContain("Link.Inline")
+    })
+  })
+
+  describe("mixed scenarios", () => {
+    it("should only transform Link.Inline and leave regular Link unchanged", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <nav>
+      <Link href="/home">Home</Link>
+      <Link.Inline href="/profile">Profile</Link.Inline>
+      <Link as="button" href="/dashboard">Dashboard</Link>
+    </nav>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain('<Link href="/home">Home</Link>')
+      expect(result).toContain(
+        '<Link href="/profile" kind="inline-text">Profile</Link>'
+      )
+      expect(result).toContain(
+        '<Link as="button" href="/dashboard">Dashboard</Link>'
+      )
+      expect(result).not.toContain("Link.Inline")
+    })
+
+    it("should handle aliased Link import", () => {
+      const input = `
+import { Link as TapestryLink } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <TapestryLink.Inline href="/profile">Profile</TapestryLink.Inline>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        '<TapestryLink href="/profile" kind="inline-text">Profile</TapestryLink>'
+      )
+      expect(result).not.toContain("TapestryLink.Inline")
+    })
+
+    it("should handle complex JSX expressions", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test({ items, showInline }) {
+  return (
+    <div>
+      {items.map(item => (
+        <Link.Inline key={item.id} href={item.url}>{item.name}</Link.Inline>
+      ))}
+      {showInline && <Link.Inline href="/conditional">Conditional</Link.Inline>}
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        '<Link key={item.id} href={item.url} kind="inline-text">{item.name}</Link>'
+      )
+      expect(result).toContain(
+        '<Link href="/conditional" kind="inline-text">Conditional</Link>'
+      )
+      expect(result).not.toContain("Link.Inline")
+    })
+  })
+
+  describe("edge cases", () => {
+    it("should not transform if Link is not imported from tapestry-react", () => {
+      const input = `
+import { Link } from "react-router-dom"
+
+export default function Test() {
+  return <Link.Inline to="/profile">Profile</Link.Inline>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBe(null) // No changes needed
+    })
+
+    it("should handle Link.Inline with dynamic props", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test({ url, isExternal }) {
+  return (
+    <Link.Inline 
+      href={url} 
+      target={isExternal ? "_blank" : "_self"}
+      className={\`link-\${isExternal ? 'external' : 'internal'}\`}
+    >
+      Dynamic Link
+    </Link.Inline>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain('kind="inline-text"')
+      expect(result).toContain("<Link")
+      expect(result).toContain("href={url}")
+      expect(result).toContain('target={isExternal ? "_blank" : "_self"}')
+      expect(result).toContain(
+        "className={`link-${isExternal ? 'external' : 'internal'}`}"
+      )
+      expect(result).not.toContain("Link.Inline")
+    })
+
+    it("should handle nested Link.Inline components", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <div>
+      <p>
+        Visit our <Link.Inline href="/about">about page</Link.Inline> for more info.
+      </p>
+      <span>
+        Or check the <Link.Inline href="/help">help section</Link.Inline>.
+      </span>
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain(
+        '<Link href="/about" kind="inline-text">about page</Link>'
+      )
+      expect(result).toContain(
+        '<Link href="/help" kind="inline-text">help section</Link>'
+      )
+      expect(result).not.toContain("Link.Inline")
+    })
+  })
+
+  describe("no changes scenarios", () => {
+    it("should return null when no Link.Inline components exist", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/home">Home</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBe(null)
+    })
+
+    it("should return null when no tapestry-react imports exist", () => {
+      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 for empty file", () => {
+      const result = applyTransform("")
+      expect(result).toBe(null)
+    })
+
+    it("should return null when Link is imported but no Link.Inline used", () => {
+      const input = `
+import { Link, Button } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return (
+    <div>
+      <Link href="/home">Home</Link>
+      <Button>Click me</Button>
+    </div>
+  )
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toBe(null)
+    })
+  })
+})

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

@@ -0,0 +1,51 @@
+import { Transform } from "jscodeshift"
+
+import { addAttribute } from "../../shared/actions/addAttribute"
+import { attributeTransformFactory } from "../../shared/transformFactories/attributeTransformFactory"
+import { componentTransformFactory } from "../../shared/transformFactories/componentTransformFactory"
+
+// Step 1: Add kind="inline-text" attribute to Link.Inline elements
+const addKindAttribute = attributeTransformFactory({
+  condition: () => true, // Add to all Link.Inline elements
+  targetComponent: "Link.Inline",
+  targetPackage: "@planningcenter/tapestry-react",
+  transform: (element, { j }) => {
+    addAttribute({
+      element,
+      j,
+      name: "kind",
+      value: "inline-text",
+    })
+    return true
+  },
+})
+
+// Step 2: Transform Link.Inline to Link (preserving original component name)
+const transformComponent = componentTransformFactory({
+  condition: () => true, // Transform all Link.Inline elements
+  fromComponent: "Link.Inline",
+  fromPackage: "@planningcenter/tapestry-react",
+  toComponent: "Link",
+  toPackage: "@planningcenter/tapestry-react",
+})
+
+// Combined transform that runs both steps
+const transform: Transform = (fileInfo, api, options) => {
+  // Step 1: Add kind attribute to Link.Inline elements
+  const result1 = addKindAttribute(fileInfo, api, options)
+
+  if (!result1) {
+    return null
+  }
+
+  // Step 2: Transform Link.Inline to Link
+  const result2 = transformComponent(
+    { ...fileInfo, source: result1 as string },
+    api,
+    options
+  )
+
+  return result2 || result1
+}
+
+export default transform