@planningcenter/tapestry-migration-cli 3.2.2-rc.16 → 3.2.2-rc.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/tapestry-migration-cli",
-  "version": "3.2.2-rc.16",
+  "version": "3.2.2-rc.17",
   "description": "CLI tool for Tapestry migrations",
   "type": "module",
   "main": "dist/index.js",
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@emotion/react": "^11.14.0",
-    "@planningcenter/tapestry": "^3.2.2-rc.16",
+    "@planningcenter/tapestry": "^3.2.2-rc.17",
     "@planningcenter/tapestry-react": "^4.11.5",
     "@types/jscodeshift": "^17.3.0",
     "@types/node": "^20.0.0",
@@ -52,5 +52,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "430054030b6df45cc7af3d09b9810ad2a2b08b0d"
+  "gitHead": "36eae38cab706a954312069d744ce5454b08c564"
 }

package/src/components/shared/helpers/unsupportedPropsHelpers.ts

@@ -151,3 +151,27 @@ export const TEXTAREA_SUPPORTED_PROPS = [
   ...TEXTAREA_SPECIFIC_PROPS,
   ...STYLE_PROP_NAMES_WITHOUT_CSS,
 ]
+
+export const TIME_FIELD_SPECIFIC_PROPS = [
+  "defaultValue",
+  "description",
+  "disabled",
+  "forceLeadingZeros",
+  "form",
+  "hideLabel",
+  "hideTimeZone",
+  "hourCycle",
+  "invalid",
+  "max",
+  "min",
+  "name",
+  "onChange",
+  "readOnly",
+  "required",
+  "value",
+]
+
+export const TIME_FIELD_SUPPORTED_PROPS = [
+  ...COMMON_PROPS,
+  ...TIME_FIELD_SPECIFIC_PROPS,
+]

package/src/components/shared/transformFactories/stylePropTransformFactory.test.ts

@@ -1,6 +1,7 @@
 import jscodeshift from "jscodeshift"
 import { describe, expect, it } from "vitest"
 
+import { stackViewPlugin } from "../../../stubs/stackViewPlugin"
 import { stylePropTransformFactory } from "./stylePropTransformFactory"
 
 const j = jscodeshift.withParser("tsx")
@@ -291,4 +292,39 @@ describe("stylePropTransformFactory", () => {
       `)
     })
   })
+
+  describe("non-inlineable plugin output", () => {
+    // stackViewPlugin maps `distribution: "fill"` to `{ "& > *": { flex: "1 0 0px" } }`,
+    // a nested CSS selector that cannot be represented as a React `style={}` object.
+    // The transform must not crash, must not silently drop the source props, and must
+    // leave an audit trail for manual review.
+    const transform = stylePropTransformFactory({
+      plugin: stackViewPlugin,
+      stylesToRemove: [],
+      targetComponent: "Stack",
+      targetPackage: "@planningcenter/tapestry-react",
+    })
+
+    it("preserves source props and emits an audit comment when plugin output includes nested CSS selectors", () => {
+      const input = `import { Stack } from "@planningcenter/tapestry-react";<Stack axis="horizontal" spacing={1} distribution="fill" />`
+      const result = applyTransform(transform, input)
+
+      // Source props must remain — they cannot be safely inlined.
+      expect(result).toContain('axis="horizontal"')
+      expect(result).toContain("spacing={1}")
+      expect(result).toContain('distribution="fill"')
+      // Must not have produced a broken inline style with a nested object.
+      expect(result).not.toContain('"& > *"')
+      // Must leave a visible audit trail so the user knows to review.
+      expect(result).toMatch(/TODO:\s*tapestry-migration/)
+    })
+
+    it("does not crash on distribution='fill' alongside other plugin props", () => {
+      const input = `import { Stack } from "@planningcenter/tapestry-react";<Stack distribution="fill" axis="horizontal" />`
+      const result = applyTransform(transform, input)
+
+      expect(result).toContain('distribution="fill"')
+      expect(result).toContain('axis="horizontal"')
+    })
+  })
 })

package/src/components/shared/transformFactories/stylePropTransformFactory.ts

@@ -110,21 +110,19 @@ function reviewBody(entry: ManualReviewEntry) {
 function processKeepStyleProps({
   attributes,
   j,
-  element,
-  source,
 }: {
   attributes: JSXAttribute[]
-  element: JSXElement
   j: JSCodeshift
-  source: Collection
 }): {
   directProps: Record<string, unknown>
   manualReviewEntries: ManualReviewEntry[]
+  processedNames: string[]
   themeProps: Record<string, unknown>
 } {
   const themeProps: Record<string, unknown> = {}
   const directProps: Record<string, unknown> = {}
   const manualReviewEntries: ManualReviewEntry[] = []
+  const processedNames: string[] = []
 
   attributes.forEach((attr) => {
     const propName = attr.name.name as string
@@ -148,10 +146,19 @@ function processKeepStyleProps({
       themeProps[propName] = propValue
     }
 
-    removeAttribute(propName, { element, j, source })
+    processedNames.push(propName)
   })
 
-  return { directProps, manualReviewEntries, themeProps }
+  return { directProps, manualReviewEntries, processedNames, themeProps }
+}
+
+function isInlineableStyleValue(value: unknown): boolean {
+  return (
+    value === null ||
+    typeof value === "string" ||
+    typeof value === "number" ||
+    typeof value === "boolean"
+  )
 }
 
 function processRemoveStyleProps({
@@ -395,9 +402,7 @@ export function stylePropTransformFactory(config: {
     )
     const keepResult = processKeepStyleProps({
       attributes: keepAttributes,
-      element,
       j,
-      source,
     })
     allStyleProps = {
       ...allStyleProps,
@@ -450,7 +455,32 @@ export function stylePropTransformFactory(config: {
         styles = { ...styles, ...directStyleProps }
         if (options.verbose) console.log("Final generated styles:", styles)
 
-        if (Object.keys(styles).length > 0) {
+        // Plugins like stackViewPlugin can emit nested CSS selectors (e.g.
+        // `{ "& > *": { flex: "1 0 0px" } }` from `distribution: "fill"`)
+        // that can't be represented in React's inline `style={}`. Preserve
+        // the source props so nothing is silently dropped and flag for review.
+        const nonInlineableKeys = Object.entries(styles)
+          .filter(([, v]) => !isInlineableStyleValue(v))
+          .map(([k]) => k)
+        if (nonInlineableKeys.length > 0) {
+          addComment({
+            element,
+            j,
+            scope: "styleProp",
+            source,
+            text: `Could not migrate style props (${keepResult.processedNames.join(
+              ", "
+            )}) — produced non-inlineable style values (${nonInlineableKeys.join(
+              ", "
+            )}) that don't fit in inline style (for example, nested selectors). Manual review required.`,
+          })
+        } else {
+          for (const propName of keepResult.processedNames) {
+            removeAttribute(propName, { element, j, source })
+          }
+        }
+
+        if (nonInlineableKeys.length === 0 && Object.keys(styles).length > 0) {
           applyStylesToComponent({
             element,
             j,
@@ -477,7 +507,10 @@ export function stylePropTransformFactory(config: {
               }
             }
           }
-        } else if (manualReviewEntries.length > 0) {
+        } else if (
+          nonInlineableKeys.length === 0 &&
+          manualReviewEntries.length > 0
+        ) {
           // No anchoring property in the style block — emit each manual-review
           // entry as a JSX-level TODO comment instead.
           for (const entry of manualReviewEntries) {

package/src/components/shared/transformFactories/ternaryConditionalToPropFactory.ts

@@ -35,27 +35,32 @@ export function ternaryConditionalToPropFactory({
       const expr = attr.value.expression
       if (expr.type !== "ConditionalExpression") return false
 
-      if (
-        expr.consequent.type !== "StringLiteral" ||
-        expr.consequent.value !== matchValue
-      ) {
-        return false
-      }
+      const isNullish = (node: Expression) =>
+        node.type === "NullLiteral" ||
+        (node.type === "Identifier" && node.name === "undefined")
 
-      const isNullAlternate = expr.alternate.type === "NullLiteral"
-      const isUndefinedAlternate =
-        expr.alternate.type === "Identifier" &&
-        expr.alternate.name === "undefined"
+      const isMatchString = (node: Expression) =>
+        node.type === "StringLiteral" && node.value === matchValue
 
-      if (!isNullAlternate && !isUndefinedAlternate) return false
+      const matchInConsequent =
+        isMatchString(expr.consequent as Expression) &&
+        isNullish(expr.alternate as Expression)
+      const matchInAlternate =
+        isMatchString(expr.alternate as Expression) &&
+        isNullish(expr.consequent as Expression)
+
+      if (!matchInConsequent && !matchInAlternate) return false
 
       const testExpr = expr.test as Expression
+      const propValue = matchInConsequent
+        ? testExpr
+        : j.unaryExpression("!", testExpr)
 
       removeAttribute(fromProp, { element, j, source })
       element.openingElement.attributes.push(
         j.jsxAttribute(
           j.jsxIdentifier(toProp),
-          j.jsxExpressionContainer(testExpr)
+          j.jsxExpressionContainer(propValue)
         )
       )
 

package/src/components/time-field/index.ts

@@ -0,0 +1,48 @@
+import { Transform } from "jscodeshift"
+
+import auditSpreadProps from "./transforms/auditSpreadProps"
+import convertStyleProps from "./transforms/convertStyleProps"
+import flagMinMax from "./transforms/flagMinMax"
+import mergeFieldIntoTimeField from "./transforms/mergeFieldIntoTimeField"
+import moveTimeFieldImport from "./transforms/moveTimeFieldImport"
+import sizeMapping from "./transforms/sizeMapping"
+import stateToInvalid from "./transforms/stateToInvalid"
+import stateToInvalidTernary from "./transforms/stateToInvalidTernary"
+import tupleToTime from "./transforms/tupleToTime"
+import twelveHourClockToHourCycle from "./transforms/twelveHourClockToHourCycle"
+import unsupportedProps from "./transforms/unsupportedProps"
+
+const transform: Transform = (fileInfo, api, options) => {
+  let currentSource = fileInfo.source
+  let hasAnyChanges = false
+
+  const transforms = [
+    mergeFieldIntoTimeField,
+    auditSpreadProps,
+    sizeMapping,
+    stateToInvalidTernary,
+    stateToInvalid,
+    twelveHourClockToHourCycle,
+    tupleToTime,
+    flagMinMax,
+    convertStyleProps,
+    unsupportedProps,
+    moveTimeFieldImport,
+  ]
+
+  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/time-field/transforms/auditSpreadProps.test.ts

@@ -0,0 +1,76 @@
+import jscodeshift from "jscodeshift"
+import { describe, expect, it } from "vitest"
+
+import transform from "./auditSpreadProps"
+
+const j = jscodeshift.withParser("tsx")
+
+const AUDIT_COMMENT =
+  "TODO: tapestry-migration (spreadAttribute): Spread props can contain unsupported props, please explore usages and migrate as needed."
+
+function applyTransform(source: string) {
+  const fileInfo = { path: "test.tsx", source }
+  return transform(
+    fileInfo,
+    { j, jscodeshift: j, report: () => {}, stats: () => {} },
+    {}
+  ) as string | null
+}
+
+describe("auditSpreadProps transform", () => {
+  it("adds comment to TimeField with spread props", () => {
+    const input = `
+import { TimeField } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  const props = { onChange: handleChange }
+  return <TimeField {...props} value={time} onChange={setTime} />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toContain(AUDIT_COMMENT)
+    expect(result).toContain("{...props}")
+  })
+
+  it("returns null when TimeField has no spread props", () => {
+    const input = `
+import { TimeField } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <TimeField value={time} onChange={setTime} />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toBe(null)
+  })
+
+  it("returns null when TimeField is from another package", () => {
+    const input = `
+import { TimeField } from "other-library"
+
+export default function Test() {
+  const props = { onChange: handleChange }
+  return <TimeField {...props} value={time} />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toBe(null)
+  })
+
+  it("returns null when TimeField is not imported at all", () => {
+    const input = `
+import { Button } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  const props = { onClick: handleClick }
+  return <Button {...props}>Save</Button>
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toBe(null)
+  })
+})

package/src/components/time-field/transforms/auditSpreadProps.ts

@@ -0,0 +1,10 @@
+import { Transform } from "jscodeshift"
+
+import { commentOnSpreadPropsFactory } from "../../shared/transformFactories/commentOnSpreadPropsFactory"
+
+const transform: Transform = commentOnSpreadPropsFactory({
+  targetComponent: "TimeField",
+  targetPackage: "@planningcenter/tapestry-react",
+})
+
+export default transform

package/src/components/time-field/transforms/convertStyleProps.test.ts

@@ -0,0 +1,43 @@
+import jscodeshift from "jscodeshift"
+import { describe, expect, it } from "vitest"
+
+import transform from "./convertStyleProps"
+
+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("convertStyleProps transform", () => {
+  it("returns null when TimeField has no style props", () => {
+    const input = `
+import { TimeField } from "@planningcenter/tapestry-react"
+
+function Test() {
+  return <TimeField value={time} onChange={setTime} />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toBeNull()
+  })
+
+  it("does not affect TimeField from other packages", () => {
+    const input = `
+import { TimeField } from "some-other-lib"
+
+function Test() {
+  return <TimeField p={2} value={time} onChange={setTime} />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toBeNull()
+  })
+})

package/src/components/time-field/transforms/convertStyleProps.ts

@@ -0,0 +1,10 @@
+import { stackViewPlugin } from "../../../stubs/stackViewPlugin"
+import { stylePropTransformFactory } from "../../shared/transformFactories/stylePropTransformFactory"
+
+export default stylePropTransformFactory({
+  plugin: stackViewPlugin,
+  stylesToKeep: [],
+  stylesToRemove: [],
+  targetComponent: "TimeField",
+  targetPackage: "@planningcenter/tapestry-react",
+})

package/src/components/time-field/transforms/flagMinMax.test.ts

@@ -0,0 +1,103 @@
+import jscodeshift from "jscodeshift"
+import { describe, expect, it } from "vitest"
+
+import transform from "./flagMinMax"
+
+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("flagMinMax transform", () => {
+  it("adds TODO comment to min prop", () => {
+    const input = `
+import { TimeField } from "@planningcenter/tapestry-react"
+
+function Test() {
+  return <TimeField min={9} value={time} onChange={setTime} />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).not.toBeNull()
+    expect(result).toContain("TODO: tapestry-migration (min)")
+    expect(result).toContain("TimeValue")
+    expect(result).toContain("min={9}")
+  })
+
+  it("adds TODO comment to max prop", () => {
+    const input = `
+import { TimeField } from "@planningcenter/tapestry-react"
+
+function Test() {
+  return <TimeField max={17} value={time} onChange={setTime} />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).not.toBeNull()
+    expect(result).toContain("TODO: tapestry-migration (max)")
+    expect(result).toContain("TimeValue")
+    expect(result).toContain("max={17}")
+  })
+
+  it("flags both min and max when present", () => {
+    const input = `
+import { TimeField } from "@planningcenter/tapestry-react"
+
+function Test() {
+  return <TimeField min={9} max={17} value={time} onChange={setTime} />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).not.toBeNull()
+    expect(result).toContain("TODO: tapestry-migration (min)")
+    expect(result).toContain("TODO: tapestry-migration (max)")
+  })
+
+  it("returns null when neither min nor max is present", () => {
+    const input = `
+import { TimeField } from "@planningcenter/tapestry-react"
+
+function Test() {
+  return <TimeField value={time} onChange={setTime} />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toBeNull()
+  })
+
+  it("does not affect other components", () => {
+    const input = `
+import { Input } from "@planningcenter/tapestry-react"
+
+function Test() {
+  return <Input min={1} max={10} label="Count" />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toBeNull()
+  })
+
+  it("does not affect TimeField from other packages", () => {
+    const input = `
+import { TimeField } from "some-other-lib"
+
+function Test() {
+  return <TimeField min={9} max={17} value={time} onChange={setTime} />
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toBeNull()
+  })
+})

package/src/components/time-field/transforms/flagMinMax.ts

@@ -0,0 +1,31 @@
+import { Transform } from "jscodeshift"
+
+import { addCommentToAttribute } from "../../shared/actions/addCommentToAttribute"
+import { getAttribute } from "../../shared/actions/getAttribute"
+import { attributeTransformFactory } from "../../shared/transformFactories/attributeTransformFactory"
+
+const TIME_PROPS = ["min", "max"]
+
+const transform: Transform = attributeTransformFactory({
+  targetComponent: "TimeField",
+  targetPackage: "@planningcenter/tapestry-react",
+  transform: (element, { j }) => {
+    let hasChanges = false
+
+    for (const propName of TIME_PROPS) {
+      const attr = getAttribute({ element, name: propName })
+      if (!attr) continue
+
+      addCommentToAttribute({
+        attribute: attr,
+        j,
+        text: `'${propName}' previously accepted an hour number (0–23). TimeField now expects a TimeValue (e.g. new Time(hour, minute)) from @internationalized/date. Migrate this value manually.`,
+      })
+      hasChanges = true
+    }
+
+    return hasChanges
+  },
+})
+
+export default transform

package/src/components/time-field/transforms/mergeFieldIntoTimeField.test.ts

@@ -0,0 +1,106 @@
+import jscodeshift from "jscodeshift"
+import { describe, expect, it } from "vitest"
+
+import transform from "./mergeFieldIntoTimeField"
+
+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("mergeFieldIntoTimeField transform", () => {
+  it("merges Field label into TimeField and unwraps Field", () => {
+    const input = `
+import { Field, TimeField } from "@planningcenter/tapestry-react"
+
+function Test() {
+  return (
+    <Field label="Start time"><TimeField value={time} onChange={setTime} /></Field>
+  )
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).not.toBeNull()
+    expect(result).not.toContain("<Field")
+    expect(result).toContain('label="Start time"')
+    expect(result).toContain("<TimeField")
+  })
+
+  it("renames feedbackText to description on TimeField", () => {
+    const input = `
+import { Field, TimeField } from "@planningcenter/tapestry-react"
+
+function Test() {
+  return (
+    <Field feedbackText="Required"><TimeField value={time} onChange={setTime} /></Field>
+  )
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).not.toBeNull()
+    expect(result).not.toContain("<Field")
+    expect(result).not.toContain("feedbackText")
+    expect(result).toContain('description="Required"')
+  })
+
+  it("flags helpContent as unsupported and removes Field", () => {
+    const input = `
+import { Field, TimeField } from "@planningcenter/tapestry-react"
+
+function Test() {
+  return (
+    <Field helpContent="Help"><TimeField value={time} onChange={setTime} /></Field>
+  )
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).not.toBeNull()
+    expect(result).not.toContain("<Field")
+    expect(result).toContain(
+      "TODO: tapestry-migration (mergeFieldIntoTimeField)"
+    )
+    expect(result).toContain("helpContent")
+    expect(result).toContain("not supported by TimeField")
+  })
+
+  it("returns null when Field is not imported from tapestry-react", () => {
+    const input = `
+import { Field } from "some-other-library"
+import { TimeField } from "@planningcenter/tapestry-react"
+
+function Test() {
+  return (
+    <Field label="Time"><TimeField value={time} onChange={setTime} /></Field>
+  )
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toBeNull()
+  })
+
+  it("returns null when TimeField is not imported from tapestry-react", () => {
+    const input = `
+import { Field } from "@planningcenter/tapestry-react"
+import { TimeField } from "some-other-library"
+
+function Test() {
+  return (
+    <Field label="Time"><TimeField value={time} onChange={setTime} /></Field>
+  )
+}
+    `.trim()
+
+    const result = applyTransform(input)
+    expect(result).toBeNull()
+  })
+})

package/src/components/time-field/transforms/mergeFieldIntoTimeField.ts

@@ -0,0 +1,5 @@
+import { mergeFieldFactory } from "../../shared/transformFactories/mergeFieldFactory"
+
+export default mergeFieldFactory({
+  targetComponent: "TimeField",
+})