@planningcenter/tapestry-migration-cli 2.4.0-rc.19 → 2.4.0-rc.20

package/package.json

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

package/src/components/link/index.ts

@@ -3,11 +3,11 @@ import { Transform } from "jscodeshift"
 import auditSpreadProps from "./transforms/auditSpreadProps"
 import childrenToLabel from "./transforms/childrenToLabel"
 import convertStyleProps from "./transforms/convertStyleProps"
-import inlineMemberToKind from "./transforms/inlineMemberToKind"
-import inlinePropToKind from "./transforms/inlinePropToKind"
 import innerRefToRef from "./transforms/innerRefToRef"
 import moveLinkImport from "./transforms/moveLinkImport"
 import removeAs from "./transforms/removeAs"
+import removeInlineMember from "./transforms/removeInlineMember"
+import removeInlineProp from "./transforms/removeInlineProp"
 import reviewStyles from "./transforms/reviewStyles"
 import targetBlankToExternal from "./transforms/targetBlankToExternal"
 import tooltipToWrapper from "./transforms/tooltipToWrapper"
@@ -19,8 +19,8 @@ const transform: Transform = (fileInfo, api, options) => {
   let hasAnyChanges = false
 
   const transforms: Transform[] = [
-    inlineMemberToKind,
-    inlinePropToKind,
+    removeInlineMember,
+    removeInlineProp,
     tooltipToWrapper,
     toToHref,
     targetBlankToExternal,

package/src/components/link/transforms/{inlineMemberToKind.test.ts → removeInlineMember.test.ts}

@@ -1,7 +1,7 @@
 import jscodeshift from "jscodeshift"
 import { describe, expect, it } from "vitest"
 
-import transform from "./inlineMemberToKind"
+import transform from "./removeInlineMember"
 
 const j = jscodeshift.withParser("tsx")
 
@@ -14,9 +14,9 @@ function applyTransform(source: string): string | null {
   ) as string | null
 }
 
-describe("inlineMemberToKind transform", () => {
+describe("removeInlineMember transform", () => {
   describe("basic transformations", () => {
-    it("should transform Link.Inline to Link with kind='inline-text'", () => {
+    it("should transform Link.Inline to Link", () => {
       const input = `
 import { Link } from "@planningcenter/tapestry-react"
 
@@ -29,7 +29,7 @@ export default function Test() {
 import { Link } from "@planningcenter/tapestry-react"
 
 export default function Test() {
-  return <Link href="/profile" kind="inline-text">Profile</Link>;
+  return <Link href="/profile">Profile</Link>;
 }
       `.trim()
 
@@ -57,13 +57,11 @@ export default function Test() {
       `.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")
     })
@@ -81,7 +79,7 @@ export default function Test() {
 import { Link } from "@planningcenter/tapestry-react"
 
 export default function Test() {
-  return <Link href="/dashboard" kind="inline-text" />;
+  return <Link href="/dashboard" />;
 }
       `.trim()
 
@@ -104,12 +102,8 @@ export default function Test() {
       `.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).toContain('<Link href="/home">Home</Link>')
+      expect(result).toContain('<Link href="/about">About</Link>')
       expect(result).not.toContain("Link.Inline")
     })
   })
@@ -132,9 +126,7 @@ export default function Test() {
 
       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 href="/profile">Profile</Link>')
       expect(result).toContain(
         '<Link as="button" href="/dashboard">Dashboard</Link>'
       )
@@ -152,7 +144,7 @@ export default function Test() {
 
       const result = applyTransform(input)
       expect(result).toContain(
-        '<TapestryLink href="/profile" kind="inline-text">Profile</TapestryLink>'
+        '<TapestryLink href="/profile">Profile</TapestryLink>'
       )
       expect(result).not.toContain("TapestryLink.Inline")
     })
@@ -175,11 +167,9 @@ export default function Test({ items, showInline }) {
 
       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>'
+        "<Link key={item.id} href={item.url}>{item.name}</Link>"
       )
+      expect(result).toContain('<Link href="/conditional">Conditional</Link>')
       expect(result).not.toContain("Link.Inline")
     })
   })
@@ -216,7 +206,6 @@ export default function Test({ url, isExternal }) {
       `.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"}')
@@ -245,12 +234,8 @@ export default function Test() {
       `.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).toContain('<Link href="/about">about page</Link>')
+      expect(result).toContain('<Link href="/help">help section</Link>')
       expect(result).not.toContain("Link.Inline")
     })
   })

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

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

package/src/components/link/transforms/{inlinePropToKind.test.ts → removeInlineProp.test.ts}

@@ -1,7 +1,7 @@
 import jscodeshift from "jscodeshift"
 import { describe, expect, it } from "vitest"
 
-import transform from "./inlinePropToKind"
+import transform from "./removeInlineProp"
 
 const j = jscodeshift.withParser("tsx")
 
@@ -14,9 +14,9 @@ function applyTransform(source: string): string | null {
   ) as string | null
 }
 
-describe("inlinePropToKind transform", () => {
+describe("removeInlineProp transform", () => {
   describe("basic transformations", () => {
-    it("should transform Link with inline prop to kind='inline-text'", () => {
+    it("should remove inline prop from Link", () => {
       const input = `
 import { Link } from "@planningcenter/tapestry-react"
 
@@ -26,14 +26,14 @@ export default function Test() {
       `.trim()
 
       const result = applyTransform(input)
-      expect(result).toContain('kind="inline-text"')
       expect(result).not.toContain("inline>")
       expect(result).not.toContain("inline />")
       expect(result).not.toContain("inline=")
       expect(result).toContain('href="/profile"')
+      expect(result).toContain('<Link href="/profile">Profile</Link>')
     })
 
-    it("should transform Link with inline={true} to kind='inline-text'", () => {
+    it("should remove inline={true} from Link", () => {
       const input = `
 import { Link } from "@planningcenter/tapestry-react"
 
@@ -43,7 +43,6 @@ export default function Test() {
       `.trim()
 
       const result = applyTransform(input)
-      expect(result).toContain('kind="inline-text"')
       expect(result).not.toContain("inline>")
       expect(result).not.toContain("inline />")
       expect(result).not.toContain("inline=")
@@ -69,7 +68,6 @@ export default function Test() {
       `.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('data-testid="profile-link"')
@@ -88,7 +86,6 @@ export default function Test() {
       `.trim()
 
       const result = applyTransform(input)
-      expect(result).toContain('kind="inline-text"')
       expect(result).toContain('href="/dashboard"')
       expect(result).not.toContain("inline>")
       expect(result).not.toContain("inline />")
@@ -110,12 +107,8 @@ export default function Test() {
       `.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).toContain('<Link href="/home">Home</Link>')
+      expect(result).toContain('<Link href="/about">About</Link>')
       expect(result).not.toContain("inline>")
       expect(result).not.toContain("inline />")
       expect(result).not.toContain("inline=")
@@ -140,9 +133,7 @@ export default function Test() {
 
       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 href="/profile">Profile</Link>')
       expect(result).toContain(
         '<Link href="/dashboard" kind="primary">Dashboard</Link>'
       )
@@ -161,7 +152,6 @@ export default function Test() {
       `.trim()
 
       const result = applyTransform(input)
-      expect(result).toContain('kind="inline-text"')
       expect(result).not.toContain("inline>")
       expect(result).not.toContain("inline />")
       expect(result).not.toContain("inline=")
@@ -193,7 +183,6 @@ export default function Test({ linkProps }) {
       `.trim()
 
       const result = applyTransform(input)
-      expect(result).toContain('kind="inline-text"')
       expect(result).toContain("{...linkProps}")
       expect(result).not.toContain("inline>")
       expect(result).not.toContain("inline />")
@@ -218,11 +207,9 @@ export default function Test({ items, showInline }) {
 
       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>'
+        "<Link key={item.id} href={item.url}>{item.name}</Link>"
       )
+      expect(result).toContain('<Link href="/conditional">Conditional</Link>')
       expect(result).not.toContain("inline>")
       expect(result).not.toContain("inline />")
       expect(result).not.toContain("inline=")
@@ -247,12 +234,8 @@ export default function Test() {
       `.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).toContain('<Link href="/about">about page</Link>')
+      expect(result).toContain('<Link href="/help">help section</Link>')
       expect(result).not.toContain("inline>")
       expect(result).not.toContain("inline />")
       expect(result).not.toContain("inline=")

package/src/components/link/transforms/{inlinePropToKind.ts → removeInlineProp.ts}

@@ -1,4 +1,3 @@
-import { addAttribute } from "../../shared/actions/addAttribute"
 import { removeAttribute } from "../../shared/actions/removeAttribute"
 import { hasAttribute } from "../../shared/conditions/hasAttribute"
 import { attributeTransformFactory } from "../../shared/transformFactories/attributeTransformFactory"
@@ -9,14 +8,6 @@ const transform = attributeTransformFactory({
   targetPackage: "@planningcenter/tapestry-react",
   transform: (element, { j, source }) => {
     removeAttribute("inline", { element, j, source })
-
-    addAttribute({
-      element,
-      j,
-      name: "kind",
-      value: "inline-text",
-    })
-
     return true
   },
 })

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

@@ -1,49 +0,0 @@
-import { Transform } from "jscodeshift"
-
-import { addAttribute } from "../../shared/actions/addAttribute"
-import { attributeTransformFactory } from "../../shared/transformFactories/attributeTransformFactory"
-import { componentTransformFactory } from "../../shared/transformFactories/componentTransformFactory"
-
-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
-  },
-})
-
-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