Merge pull request #316 from vladislavarsenev/v5

Updated dependencies
trivago · Nov 18, 2024 · 1a1f130 · 1a1f130
2 parents 7067f2a + c99ddcf
commit 1a1f130
Show file tree

Hide file tree

Showing 15 changed files with 3,785 additions and 3,832 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,11 +5,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [12.x, 14.x, 16.x, 18.x, 20.x]
+        node: [18.x, 20.x, 22.x]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      - run: yarn --frozen-lockfile
+      - run: npm i -g yarn
+      - run: yarn set version stable
+      - run: yarn --immutable
       - run: yarn test
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.yarn/install-state.gz
 lerna-debug.log*
 
 # Diagnostic reports (https://nodejs.org/api/report.html)

diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "compile": "tsc",
     "preexample": "yarn run compile",
     "example": "prettier --config ./examples/.prettierrc --plugin lib/src/index.js",
-    "test": "jest -i",
+    "test": "yarn node --experimental-vm-modules $(yarn bin jest)",
     "type-check": "tsc --noEmit",
     "prepublishOnly": "npm run compile && npm run test"
   },
@@ -33,29 +33,32 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/generator": "7.17.7",
-    "@babel/parser": "^7.20.5",
-    "@babel/traverse": "7.23.2",
-    "@babel/types": "7.17.0",
+    "@babel/generator": "7.26.2",
+    "@babel/parser": "7.26.2",
+    "@babel/traverse": "7.25.9",
+    "@babel/types": "7.26.0",
     "javascript-natural-sort": "0.7.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.7",
-    "@types/chai": "4.2.15",
-    "@types/jest": "26.0.20",
-    "@types/lodash": "4.14.168",
-    "@types/node": "20.8.6",
-    "@vue/compiler-sfc": "^3.2.41",
-    "jest": "26.6.3",
-    "prettier": "2.8",
-    "ts-jest": "26.5.3",
-    "typescript": "4.9.4"
+    "@babel/core": "7.26.0",
+    "@types/chai": "5.0.1",
+    "@types/jest": "29.5.14",
+    "@types/lodash": "4.17.13",
+    "@types/node": "22.9.0",
+    "@vue/compiler-sfc": "^3.5.12",
+    "jest": "29.7.0",
+    "prettier": "3.3.3",
+    "ts-jest": "29.2.5",
+    "typescript": "5.6.3"
   },
   "peerDependencies": {
     "@vue/compiler-sfc": "3.x",
     "prettier": "2.x - 3.x"
   },
+  "engines": {
+    "node": ">18.12"
+  },
   "peerDependenciesMeta": {
     "@vue/compiler-sfc": {
       "optional": true

diff --git a/src/index.ts b/src/index.ts
@@ -1,8 +1,7 @@
-import { parsers as babelParsers } from 'prettier/parser-babel';
-import { parsers as flowParsers } from 'prettier/parser-flow';
-import { parsers as htmlParsers } from 'prettier/parser-html';
-import { parsers as typescriptParsers } from 'prettier/parser-typescript';
-
+import { parsers as babelParsers } from 'prettier/plugins/babel';
+import { parsers as flowParsers } from 'prettier/plugins/flow';
+import { parsers as htmlParsers } from 'prettier/plugins/html';
+import { parsers as typescriptParsers } from 'prettier/plugins/typescript';
 import { defaultPreprocessor } from './preprocessors/default-processor';
 import { vuePreprocessor } from './preprocessors/vue-preprocessor';
 

diff --git a/src/utils/__tests__/get-code-from-ast.spec.ts b/src/utils/__tests__/get-code-from-ast.spec.ts
@@ -8,7 +8,7 @@ import { getExperimentalParserPlugins } from '../get-experimental-parser-plugins
 import { getImportNodes } from '../get-import-nodes';
 import { getSortedNodes } from '../get-sorted-nodes';
 
-test('it sorts imports correctly', () => {
+test('it sorts imports correctly', async () => {
     const code = `// first comment
 // second comment
 import z from 'z';
@@ -27,7 +27,7 @@ import a from 'a';
         importOrderSortSpecifiers: false,
     });
     const formatted = getCodeFromAst(sortedNodes, [], code, null);
-    expect(format(formatted, { parser: 'babel' })).toEqual(
+    expect(await format(formatted, { parser: 'babel' })).toEqual(
         `// first comment
 // second comment
 import a from "a";
@@ -40,7 +40,7 @@ import z from "z";
     );
 });
 
-test('it renders directives correctly', () => {
+test('it renders directives correctly', async () => {
     const code = `
     "use client";
 // first comment
@@ -56,7 +56,7 @@ import a from 'a';`;
     const { directives, importNodes } = extractASTNodes(ast);
 
     const formatted = getCodeFromAst(importNodes, directives, code, null);
-    expect(format(formatted, { parser: 'babel' })).toEqual(
+    expect(await format(formatted, { parser: 'babel' })).toEqual(
         `"use client";
 
 // first comment

diff --git a/src/utils/__tests__/remove-nodes-from-original-code.spec.ts b/src/utils/__tests__/remove-nodes-from-original-code.spec.ts
@@ -17,7 +17,7 @@ import k from 'k';
 import a from 'a';
 `;
 
-test('it should remove nodes from the original code', () => {
+test('it should remove nodes from the original code', async () => {
     const importNodes = getImportNodes(code);
     const sortedNodes = getSortedNodes(importNodes, {
         importOrder: [],
@@ -36,6 +36,6 @@ test('it should remove nodes from the original code', () => {
         code,
         commentAndImportsToRemoveFromCode,
     );
-    const result = format(codeWithoutImportDeclarations, { parser: 'babel' });
+    const result = await format(codeWithoutImportDeclarations, { parser: 'babel' });
     expect(result).toEqual('');
 });
diff --git a/src/utils/extract-ast-nodes.ts b/src/utils/extract-ast-nodes.ts
@@ -29,7 +29,7 @@ export function extractASTNodes(ast: ParseResult<File>) {
 
         ImportDeclaration(path: NodePath<ImportDeclaration>) {
             const tsModuleParent = path.findParent((p) =>
-                isTSModuleDeclaration(p),
+                p.isTSModuleDeclaration(),
             );
             if (!tsModuleParent) {
                 importNodes.push(path.node);

diff --git a/src/utils/get-code-from-ast.ts b/src/utils/get-code-from-ast.ts
@@ -36,15 +36,16 @@ export const getCodeFromAst = (
         directives,
         sourceType: 'module',
         interpreter: interpreter,
-        sourceFile: '',
         leadingComments: [],
         innerComments: [],
         trailingComments: [],
         start: 0,
         end: 0,
         loc: {
-            start: { line: 0, column: 0 },
-            end: { line: 0, column: 0 },
+            filename: '',
+            identifierName: '',
+            start: { line: 0, column: 0, index: 0 },
+            end: { line: 0, column: 0, index: 0 },
         },
     });
 

diff --git a/src/utils/get-import-nodes.ts b/src/utils/get-import-nodes.ts
@@ -1,6 +1,6 @@
 import { ParserOptions, parse as babelParser } from '@babel/parser';
-import traverse, { NodePath } from '@babel/traverse';
-import { ImportDeclaration, isTSModuleDeclaration } from '@babel/types';
+import traverse from '@babel/traverse';
+import { ImportDeclaration } from '@babel/types';
 
 export const getImportNodes = (code: string, options?: ParserOptions) => {
     const importNodes: ImportDeclaration[] = [];
@@ -10,9 +10,9 @@ export const getImportNodes = (code: string, options?: ParserOptions) => {
     });
 
     traverse(ast, {
-        ImportDeclaration(path: NodePath<ImportDeclaration>) {
+        ImportDeclaration(path) {
             const tsModuleParent = path.findParent((p) =>
-                isTSModuleDeclaration(p),
+                p.isTSModuleDeclaration(),
             );
             if (!tsModuleParent) {
                 importNodes.push(path.node);

diff --git a/src/utils/get-sorted-nodes.ts b/src/utils/get-sorted-nodes.ts
@@ -99,6 +99,10 @@ export const getSortedNodes: GetSortedNodes = (nodes, options) => {
     });
 
     if (firstNodesComments) {
+        // remove comments location to not confuse printe
+        firstNodesComments.forEach((comment) => {
+            delete comment.loc;
+        });
         addComments(finalNodes[0], 'leading', firstNodesComments);
     }
 

diff --git a/src/utils/is-sort-imports-ignored.ts b/src/utils/is-sort-imports-ignored.ts
@@ -6,6 +6,6 @@ import { getAllCommentsFromNodes } from './get-all-comments-from-nodes';
 export const isSortImportsIgnored = (nodes: Statement[]) =>
     getAllCommentsFromNodes(nodes).some(
         (comment) =>
-            comment.loc.start.line === 1 &&
+            comment.loc && comment.loc.start.line === 1 &&
             comment.value.includes(sortImportsIgnoredComment),
     );
diff --git a/test-setup/run_spec.js b/test-setup/run_spec.js
@@ -32,22 +32,22 @@ function run_spec(dirname, parsers, options) {
                 parser: parsers[0],
             });
             const output = prettyprint(source, path, mergedOptions);
-            test(`${filename} - ${mergedOptions.parser}-verify`, () => {
+            test(`${filename} - ${mergedOptions.parser}-verify`, async () => {
                 try {
                     expect(
-                        raw(source + '~'.repeat(80) + '\n' + output),
+                        raw(source + '~'.repeat(80) + '\n' + await output),
                     ).toMatchSnapshot(filename);
                 } catch (e) {
                     console.error(e, path);
                 }
             });
 
             parsers.slice(1).forEach((parserName) => {
-                test(`${filename} - ${parserName}-verify`, () => {
+                test(`${filename} - ${parserName}-verify`, async () => {
                     const verifyOptions = Object.assign(mergedOptions, {
                         parser: parserName,
                     });
-                    const verifyOutput = prettyprint(
+                    const verifyOutput = await prettyprint(
                         source,
                         path,
                         verifyOptions,

diff --git a/tests/Angular/__snapshots__/ppsi.spec.js.snap b/tests/Angular/__snapshots__/ppsi.spec.js.snap
@@ -60,21 +60,25 @@ export class TemplateController {
     constructor(
         private templateService: TemplateService,
         private _httpService: HttpService,
-        private _canvaskitService: CanvasKitService
+        private _canvaskitService: CanvasKitService,
     ) {
         this.CanvasKit = this._canvaskitService.canvasKit;
         this.requestFile = (url) => {
-            const req = this._httpService
-                .get<ArrayBuffer>(\`http:\${url}\`, {
-                    responseType: "arraybuffer",
+            const req =
+                this._httpService.get <
+                ArrayBuffer >
+                (\`http:\${url}\`, { responseType: "arraybuffer" })
+                    .pipe(retry(3))
+                    .toPromise();
+            return (
+                new Promise() <
+                ArrayBuffer >
+                ((resolve, reject) => {
+                    req.then((resp) => {
+                        resolve(resp.data);
+                    }).catch(reject);
                 })
-                .pipe(retry(3))
-                .toPromise();
-            return new Promise<ArrayBuffer>((resolve, reject) => {
-                req.then((resp) => {
-                    resolve(resp.data);
-                }).catch(reject);
-            });
+            );
         };
     }
 }