IlyaMatsuev
diff --git a/‎.eslintrc.json
Lines changed: 1 addition & 0 deletions b/‎.eslintrc.json
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/workflows/tests-deployments.yml
Lines changed: 11 additions & 11 deletions b/‎.github/workflows/tests-deployments.yml
Lines changed: 11 additions & 11 deletions
diff --git a/‎.github/workflows/update-jorje.yml
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/update-jorje.yml
Lines changed: 2 additions & 2 deletions
diff --git a/‎.tool-versions
Lines changed: 2 additions & 0 deletions b/‎.tool-versions
Lines changed: 2 additions & 0 deletions
diff --git a/‎.vscode/launch.json
Lines changed: 6 additions & 0 deletions b/‎.vscode/launch.json
Lines changed: 6 additions & 0 deletions
diff --git a/‎.vscode/settings.json
Lines changed: 7 additions & 1 deletion b/‎.vscode/settings.json
Lines changed: 7 additions & 1 deletion
diff --git a/‎CHANGELOG.md
Lines changed: 11 additions & 0 deletions b/‎CHANGELOG.md
Lines changed: 11 additions & 0 deletions
diff --git a/‎CONTRIBUTING.md
Lines changed: 1 addition & 1 deletion b/‎CONTRIBUTING.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎bin/start-apex-server.ts
Lines changed: 28 additions & 30 deletions b/‎bin/start-apex-server.ts
Lines changed: 28 additions & 30 deletions
diff --git a/‎bin/stop-apex-server.ts
Lines changed: 21 additions & 24 deletions b/‎bin/stop-apex-server.ts
Lines changed: 21 additions & 24 deletions
diff --git a/‎package.json
Lines changed: 35 additions & 38 deletions b/‎package.json
Lines changed: 35 additions & 38 deletions
@@ -4,6 +4,7 @@
     "plugin:@typescript-eslint/recommended",
     "airbnb-base",
     "airbnb-typescript/base",
+    "plugin:prettier-doc/recommended",
     "prettier"
   ],
   "plugins": ["prettier"],
 
@@ -16,10 +16,9 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - "19"
+          - "20"
           - "18"
           - "16"
-          - "14"
         java:
           - "17"
           - "11"
@@ -34,7 +33,7 @@ jobs:
             ENABLE_PACKAGE_TESTS: true
     env:
       ENABLE_CODE_COVERAGE: ${{ matrix.ENABLE_CODE_COVERAGE }}
-      RUN_INTEGRATION_TESTS: ${{ matrix.ENABLE_INTEGRATION_TESTS && (github.event_name == 'schedule' || github.event_name == 'repository_dispatch' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags')) }}
+      RUN_INTEGRATION_TESTS: ${{ matrix.ENABLE_INTEGRATION_TESTS && (github.event_name == 'schedule' || github.event_name == 'repository_dispatch' || github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags') || github.event_name == 'pull_request') }}
       RUN_PACKAGE_TESTS: ${{ matrix.ENABLE_PACKAGE_TESTS && (github.event_name == 'schedule' || github.event_name == 'repository_dispatch' || github.event_name == 'workflow_dispatch') }}
       RUN_DEPLOYMENT: ${{ matrix.ENABLE_DEPLOYMENT && startsWith(github.ref, 'refs/tags') }}
     name: Run tests on NodeJS ${{ matrix.node }} and Java ${{ matrix.java }}
@@ -70,7 +69,7 @@ jobs:
         run: yarn run wait-server
 
       - name: Run functional tests
-        run: AST_COMPARE=true yarn test -c jest.config.standalone.js
+        run: AST_COMPARE=true yarn test:standalone
 
       - name: Upload code coverage
         if: env.ENABLE_CODE_COVERAGE
@@ -80,6 +79,13 @@ jobs:
         if: env.RUN_INTEGRATION_TESTS == 'true'
         run: sudo apt-get install -y -qq parallel
 
+      # This step is needed because integration tests rely on the
+      # existence of the compiled JS, as they are run using Node
+      # instead of ts-node
+      - name: Build the project
+        if: env.RUN_INTEGRATION_TESTS == 'true'
+        run: yarn build
+
       - name: Run integration tests
         if: env.RUN_INTEGRATION_TESTS == 'true'
         run: ./tests_integration/format/run-integration-tests.sh
@@ -90,7 +96,7 @@ jobs:
 
       - name: Deploy to NPM
         if: env.RUN_DEPLOYMENT == 'true'
-        uses: JS-DevTools/npm-publish@v1
+        uses: JS-DevTools/npm-publish@v2
         with:
           token: ${{ secrets.NPM_TOKEN }}
 
@@ -106,9 +112,3 @@ jobs:
       - name: Stop Apex parsing server
         if: ${{ always() }}
         run: yarn run stop-server
-        env:
-          # Workaround for this bug from npm-publish Github Action:
-          # https://github.com/JS-DevTools/npm-publish/issues/15
-          # That Action leaves some placeholder (INPUT_TOKEN) in the .npmrc file
-          # which needs to filled in by _something_, otherwise `yarn` fails
-          INPUT_TOKEN: ''
@@ -21,9 +21,9 @@ jobs:
       - name: Give execute bit to executables
         run: chmod +x vendor/apex-ast-serializer/bin/apex-ast-serializer vendor/apex-ast-serializer/bin/apex-ast-serializer-http
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4.2.3
+        uses: peter-evans/create-pull-request@v5.0.2
         with:
           commit-message: Updated jorje
-          title: 'Update jorje dependency'
+          title: "Update jorje dependency"
           branch: updates/jorje
           token: ${{ secrets.PERSONAL_TOKEN }}
@@ -0,0 +1,2 @@
+nodejs 16.20.0
+java temurin-17.0.7+7
@@ -16,6 +16,9 @@
       "disableOptimisticBPs": true,
       "windows": {
         "program": "${workspaceFolder}/node_modules/jest/bin/jest"
+      },
+      "env": {
+        "NODE_OPTIONS": "--experimental-vm-modules"
       }
     },
     {
@@ -35,6 +38,9 @@
       "disableOptimisticBPs": true,
       "windows": {
         "program": "${workspaceFolder}/node_modules/jest/bin/jest"
+      },
+      "env": {
+        "NODE_OPTIONS": "--experimental-vm-modules"
       }
     }
   ]
 
@@ -1,4 +1,10 @@
 {
+  "json.schemas": [
+    {
+      "fileMatch": ["/renovate.json5"],
+      "url": "https://docs.renovatebot.com/renovate-schema.json"
+    }
+  ],
   "editor.formatOnSave": true,
   "jestrunner.configPath": "jest.config.standalone.js"
-}
+}
@@ -1,3 +1,14 @@
+# 2.3.0
+
+## Formatting Changes
+
+- Add support for User Mode in Database Operations ([issue](https://github.com/dangmai/prettier-plugin-apex/issues/738)).
+
+## Dependency Changes
+
+- Support Prettier v3 ([issue](https://github.com/dangmai/prettier-plugin-apex/issues/673)). You cannot use this version with Prettier v2, please plan your upgrade accordingly.
+- Drop support for NodeJS < 16.19.0.
+
 # 2.2.0
 
 ## Formatting Changes
 
@@ -7,7 +7,7 @@ yarn install
 yarn run lint
 yarn run start-server # This spins up the built in HTTP parsing server
 # In another terminal
-yarn test -c jest.config.standalone.js
+yarn test:standalone
 # When you are done
 yarn run stop-server
 ```
 
@@ -1,36 +1,34 @@
 #!/usr/bin/env node
-import yargs from "yargs";
-import { hideBin } from "yargs/helpers";
+import { parseArgs } from "util";
 
 import { start } from "../src/http-server";
 
-async function setup(host: string, port: number, allowedOrigins?: string) {
-  await start(host, port, allowedOrigins);
+async function setup(host: string, port: string, allowedOrigins?: string) {
+  await start(host, Number.parseInt(port, 10), allowedOrigins);
 }
 
-yargs(hideBin(process.argv))
-  .command(
-    "$0",
-    "start the built-in parsing server",
-    {
-      host: {
-        alias: "h",
-        default: "localhost",
-      },
-      port: {
-        alias: "p",
-        default: 2117,
-      },
-      "cors-allowed-origins": {
-        describe:
-          "Comma-delimited list of allowed origins to be added to CORS headers",
-        alias: "c",
-        type: "string",
-      },
-    },
-    (argv) => {
-      setup(argv.host, argv.port, argv["cors-allowed-origins"]);
-    },
-  )
-  .help()
-  .parse();
+const options = {
+  host: {
+    short: "h",
+    default: "localhost",
+    type: "string" as const,
+  },
+  port: {
+    short: "p",
+    default: "2117",
+    type: "string" as const,
+  },
+  "cors-allowed-origins": {
+    describe:
+      "Comma-delimited list of allowed origins to be added to CORS headers",
+    short: "c",
+    type: "string" as const,
+  },
+};
+
+const parsed = parseArgs({ options });
+setup(
+  parsed.values.host ?? options.host.default,
+  parsed.values.port ?? options.port.default,
+  parsed.values["cors-allowed-origins"],
+);
@@ -1,30 +1,27 @@
 #!/usr/bin/env node
-import yargs from "yargs";
-import { hideBin } from "yargs/helpers";
+import { parseArgs } from "util";
 
 import { stop } from "../src/http-server";
 
-async function teardown(host: string, port: number) {
-  await stop(host, port);
+async function teardown(host: string, port: string) {
+  await stop(host, Number.parseInt(port, 10));
 }
 
-yargs(hideBin(process.argv))
-  .command(
-    "$0",
-    "stop the built-in parsing server",
-    {
-      host: {
-        alias: "h",
-        default: "localhost",
-      },
-      port: {
-        alias: "p",
-        default: 2117,
-      },
-    },
-    (argv) => {
-      teardown(argv.host, argv.port);
-    },
-  )
-  .help()
-  .parse();
+const options = {
+  host: {
+    short: "h",
+    default: "localhost",
+    type: "string" as const,
+  },
+  port: {
+    short: "p",
+    default: "2117",
+    type: "string" as const,
+  },
+};
+
+const parsed = parseArgs({ options });
+teardown(
+  parsed.values.host ?? options.host.default,
+  parsed.values.port ?? options.port.default,
+);
@@ -1,16 +1,18 @@
 {
   "name": "@ilyamatsuev/prettier-plugin-apex",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Salesforce Apex plugin for Prettier (Fork of dangmai/prettier-plugin-apex with some formatting adjustments) [Not Opinionated]",
   "main": "dist/src/index.js",
+  "browser": "dist/src/standalone.umd.js",
+  "unpkg": "dist/src/standalone.umd.js",
   "bin": {
     "start-apex-server": "dist/bin/start-apex-server.js",
     "stop-apex-server": "dist/bin/stop-apex-server.js",
     "apex-ast-serializer": "vendor/apex-ast-serializer/bin/apex-ast-serializer",
     "apex-ast-serializer-http": "vendor/apex-ast-serializer/bin/apex-ast-serializer-http"
   },
   "engines": {
-    "node": ">= 14.0.0"
+    "node": ">= 16.19.0"
   },
   "files": [
     "/dist/bin",
@@ -19,18 +21,22 @@
   ],
   "scripts": {
     "build": "tsc",
-    "build:prod": "rimraf dist && tsc --project tsconfig.prod.json",
-    "dev": "tsc --watch",
-    "pretest": "yarn run lint && yarn run build",
-    "test": "jest",
-    "start-server": "ts-node bin/start-apex-server.ts",
+    "build:prod": "rimraf dist && tsc --project tsconfig.prod.json && yarn build:standalone",
+    "build:standalone": "yarn vite build",
+    "pretest": "yarn run lint",
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest",
+    "test:standalone": "yarn test -c jest.config.standalone.js",
+    "start-server": "ts-node bin/start-apex-server.ts -h 0.0.0.0 -c '*'",
     "wait-server": "wait-on --timeout 300000 http://localhost:2117/api/ast/",
     "stop-server": "ts-node bin/stop-apex-server.ts",
     "lint": "eslint \"{src,bin,tests_config}/**/*.{js,ts}\"",
-    "prettier": "prettier --write \"{src,bin,tests_config}/**/*.{js,ts}\" \"./*.md\"",
+    "prettier": "prettier --write \"{bin,src,tests_config}/**/*.{js,mjs,ts}\" \"./*.{md,mjs,ts}\"",
     "prepack": "yarn run build:prod",
     "prepare": "husky install",
-    "debug-check": "prettier --apex-standalone-parser built-in --apex-standalone-port 2117 --debug-check --plugin=."
+    "debug-check": "prettier --apex-standalone-parser built-in --apex-standalone-port 2117 --debug-check --plugin=./dist/src/index.js",
+    "vite:build": "vite build",
+    "vite:build:watch": "vite build --watch",
+    "vite:dev": "vite"
   },
   "keywords": [
     "apex",
@@ -39,46 +45,37 @@
   "author": "Dang Mai <[email protected]>",
   "license": "MIT",
   "devDependencies": {
-    "@tsconfig/node14": "1.0.3",
-    "@types/jest": "29.4.0",
-    "@types/node": "18.14.0",
+    "@tsconfig/node16": "16.1.0",
+    "@types/jest": "29.5.2",
+    "@types/node": "18.16.9",
     "@types/wait-on": "5.3.1",
-    "@typescript-eslint/eslint-plugin": "5.52.0",
-    "@typescript-eslint/parser": "5.52.0",
-    "eslint": "8.34.0",
+    "@typescript-eslint/eslint-plugin": "5.60.1",
+    "@typescript-eslint/parser": "5.60.1",
+    "cross-env": "7.0.3",
+    "eslint": "8.44.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-airbnb-typescript": "17.0.0",
-    "eslint-config-prettier": "8.6.0",
+    "eslint-config-prettier": "8.8.0",
     "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-prettier": "4.2.1",
-    "husky": "8.0.3",
-    "jest": "29.4.3",
+    "eslint-plugin-prettier": "5.0.0-alpha.1",
+    "eslint-plugin-prettier-doc": "1.1.0",
+    "husky": "^8.0.3",
+    "jest": "29.5.0",
     "jest-snapshot-serializer-raw": "1.2.0",
-    "prettier": "2.8.4",
-    "rimraf": "4.1.2",
-    "ts-jest": "29.0.5",
+    "prettier": "3.0.0-alpha.12",
+    "rimraf": "5.0.1",
+    "ts-jest": "29.1.1",
     "ts-node": "10.9.1",
-    "typescript": "4.9.5",
-    "yarnhook": "0.6.0"
+    "typescript": "5.1.6",
+    "vite": "4.3.9"
   },
   "peerDependencies": {
-    "prettier": ">= 2.7.x"
+    "prettier": "^3.0.0-alpha"
   },
   "dependencies": {
-    "axios": "^1.0.0",
+    "cross-fetch": "3.1.7",
     "jest-docblock": "^29.0.0",
-    "wait-on": "^7.0.0",
-    "yargs": "^17.0.0"
-  },
-  "directories": {
-    "test": "tests"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/IlyaMatsuev/prettier-plugin-apex.git"
-  },
-  "bugs": {
-    "url": "https://github.com/IlyaMatsuev/prettier-plugin-apex/issues"
+    "wait-on": "^7.0.0"
   },
   "homepage": "https://github.com/IlyaMatsuev/prettier-plugin-apex#readme"
 }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+nodejs 16.20.0`
	`2`	`+java temurin-17.0.7+7`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`	`"disableOptimisticBPs": true,`
`17`	`17`	`"windows": {`
`18`	`18`	`"program": "${workspaceFolder}/node_modules/jest/bin/jest"`
	`19`	`+ },`
	`20`	`+ "env": {`
	`21`	`+ "NODE_OPTIONS": "--experimental-vm-modules"`
`19`	`22`	`}`
`20`	`23`	`},`
`21`	`24`	`{`
`@@ -35,6 +38,9 @@`
`35`	`38`	`"disableOptimisticBPs": true,`
`36`	`39`	`"windows": {`
`37`	`40`	`"program": "${workspaceFolder}/node_modules/jest/bin/jest"`
	`41`	`+ },`
	`42`	`+ "env": {`
	`43`	`+ "NODE_OPTIONS": "--experimental-vm-modules"`
`38`	`44`	`}`
`39`	`45`	`}`
`40`	`46`	`]`