fix: upgrade to prettier 3

Author: jedwards1211

package.json

@@ -189,7 +189,7 @@
     "lint-staged": "^10.5.3",
     "mocha": "^10.1.0",
     "nyc": "^15.1.0",
-    "prettier": "^2.2.1",
+    "prettier": "^3.0.3",
     "prettier-eslint": "^12.0.0",
     "require-glob": "^3.2.0",
     "rimraf": "^3.0.2",

pnpm-lock.yaml

@@ -73,11 +73,11 @@ export default class AstxWorker {
         emitted(worker, 'message', {
           filter: (event: any) => event.seq === seq,
           rejectionEvents: ['error', 'exit'],
-        }).catch((reason) =>
-          typeof reason === 'number'
-            ? `worker exited with code ${reason}`
+        }).catch((reason) => {
+          throw typeof reason === 'number'
+            ? new Error(`worker exited with code ${reason}`)
             : reason
-        ),
+        }),
         ...(signal
           ? [emitted(signal as any, '', { rejectionEvents: ['abort'] })]
           : []),

src/node/AstxWorker.ts

@@ -36,7 +36,7 @@ const getPrettier = memoize(async (path: string): Promise<any> => {
   } catch (error) {
     // ignore
   }
-  return null
+  return await import('prettier')
 })
 
 export interface Fs {
@@ -174,7 +174,7 @@ export default async function runTransformOnFile({
           const prettierConfig = (await prettier.resolveConfig(file)) || {}
           prettierConfig.filepath = file
           if (/\.tsx?$/.test(file)) prettierConfig.parser = 'typescript'
-          transformed = prettier.format(transformed, prettierConfig)
+          transformed = await prettier.format(transformed, prettierConfig)
         }
         if (transformed != null) {
           transformed = omitBlankLineChanges(source, transformed)

src/node/runTransformOnFile.ts

@@ -17,13 +17,12 @@ describe(`Astx`, function () {
     new BabelBackend(),
   ] as Backend<any>[]) {
     const prettierOptions = { parser: 'babel-ts' }
-    const format = (code: string) =>
-      prettier
-        .format(code, prettierOptions)
+    const format = async (code: string) =>
+      (await prettier.format(code, prettierOptions))
         .trim()
         .replace(/\n{2,}/gm, '\n')
-    const reformat = (code: string) =>
-      format(backend.generate(backend.parse(code)).code)
+    const reformat = async (code: string) =>
+      await format(backend.generate(backend.parse(code)).code)
 
     const toSource = (astx: Astx) => backend.generate(astx.nodes[0]).code
     let source = ''
@@ -274,41 +273,55 @@ describe(`Astx`, function () {
           )
         ).to.deep.equal([{ node: '1 + 2', captures: { $a: '1', $b: '2' } }])
       })
-      it(`.replace tagged template works`, function () {
+      it(`.replace tagged template works`, async function () {
         const astx = createAstx(`1 + 2; 3 + 4`)
         astx.find`$a + $b`().replace`$b + $a`()
-        expect(reformat(toSource(astx))).to.equal(reformat(`2 + 1; 4 + 3;`))
+        expect(await reformat(toSource(astx))).to.equal(
+          await reformat(`2 + 1; 4 + 3;`)
+        )
       })
-      it(`.replace tagged template after find options works`, function () {
+      it(`.replace tagged template after find options works`, async function () {
         const astx = createAstx(`1 + 2; 3 + 4`)
         astx.find`$a + $b`({
-          where: { $b: (path: any) => path.node.value < 4 },
+          where: {
+            $b: (path: any) => path.node.value < 4,
+          },
         }).replace`$b + $a`()
-        expect(reformat(toSource(astx))).to.equal(reformat(`2 + 1; 3 + 4`))
+        expect(await reformat(toSource(astx))).to.equal(
+          await reformat(`2 + 1; 3 + 4`)
+        )
       })
-      it(`.replace tagged template interpolation works`, function () {
+      it(`.replace tagged template interpolation works`, async function () {
         const astx = createAstx(`1 + 2; 3 + 4`)
         astx.find`$a + $b`().replace`$b + ${t.identifier('foo')}`()
-        expect(reformat(toSource(astx))).to.equal(reformat(`2 + foo; 4 + foo;`))
+        expect(await reformat(toSource(astx))).to.equal(
+          await reformat(`2 + foo; 4 + foo;`)
+        )
       })
-      it(`.replace function returning parse tagged template literal works`, function () {
+      it(`.replace function returning parse tagged template literal works`, async function () {
         const astx = createAstx(`1 + FOO; 3 + BAR`)
         astx.find`$a + $b`().replace(
           ({ $b }, parse) => parse`${$b.code.toLowerCase()} + $a`
         )
-        expect(reformat(toSource(astx))).to.equal(reformat(`foo + 1; bar + 3;`))
+        expect(await reformat(toSource(astx))).to.equal(
+          await reformat(`foo + 1; bar + 3;`)
+        )
       })
-      it(`.replace function returning string works`, function () {
+      it(`.replace function returning string works`, async function () {
         const astx = createAstx(`1 + FOO; 3 + BAR`)
         astx.find`$a + $b`().replace(
           ({ $b }) => `${$b.code.toLowerCase()} + $a`
         )
-        expect(reformat(toSource(astx))).to.equal(reformat(`foo + 1; bar + 3;`))
+        expect(await reformat(toSource(astx))).to.equal(
+          await reformat(`foo + 1; bar + 3;`)
+        )
       })
-      it(`.replace called with string works`, function () {
+      it(`.replace called with string works`, async function () {
         const astx = createAstx(`1 + 2; 3 + 4`)
         astx.find('$a + $b').replace('$b + $a')
-        expect(reformat(toSource(astx))).to.equal(reformat(`2 + 1; 4 + 3;`))
+        expect(await reformat(toSource(astx))).to.equal(
+          await reformat(`2 + 1; 4 + 3;`)
+        )
       })
       function expectCodeFrameError(
         callee: () => any,

test/Astx.test.ts

@@ -175,18 +175,17 @@ export function findReplaceTestcase(fixture: Fixture): void {
         parser: actualParser === 'babel/tsx' ? 'babel-ts' : 'babel-flow',
       }
 
-      const format = (code: string) =>
+      const format = async (code: string) =>
         _format === false
           ? code
-          : prettier
-              .format(code, prettierOptions)
+          : (await prettier.format(code, prettierOptions))
               .trim()
               .replace(/\n{2,}/gm, '\n')
 
-      const reformat = (code: string) =>
+      const reformat = async (code: string) =>
         _format === false
           ? code
-          : format(backend.generate(backend.parse(code)).code)
+          : await format(backend.generate(backend.parse(code)).code)
 
       if (expectedFind || !_replace) {
         it(`<find>    ${parser}`, function () {
@@ -226,7 +225,7 @@ export function findReplaceTestcase(fixture: Fixture): void {
         })
       }
       if (_replace) {
-        it(`<replace> ${parser}`, function () {
+        it(`<replace> ${parser}`, async function () {
           const ast = backend.parse(input)
           const root = new backend.t.NodePath(ast)
           const matches = find(root, backend.parsePattern(_find), {
@@ -272,7 +271,9 @@ export function findReplaceTestcase(fixture: Fixture): void {
               { backend }
             )
             const actual = backend.generate(ast).code
-            expect(reformat(format(actual))).to.deep.equal(reformat(expected))
+            expect(await reformat(await format(actual))).to.deep.equal(
+              await reformat(expected)
+            )
           }
         })
       }