vega · domoritz · Sep 8, 2024 · Sep 8, 2024 · Sep 8, 2024 · Sep 8, 2024
diff --git a/.github/workflows/publish-auto.yml b/.github/workflows/publish-auto.yml
@@ -21,6 +21,7 @@ jobs:
         with:
           registry-url: "https://registry.npmjs.org"
           cache: "yarn"
+          node-version: 22
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
         run: yarn build
 
       - name: Test coverage
-        run: yarn jest test/ --collectCoverage=true
+        run: yarn test:coverage
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,3 @@
 package.json
 test/valid-data/**/*.json
 babel.config.cjs
-jest.config.cjs
diff --git a/bin/ts-json-schema-generator.js b/bin/ts-json-schema-generator.js
@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-// eslint-disable-next-line @typescript-eslint/no-require-imports
+// eslint-disable-next-line no-undef
 require("../dist/ts-json-schema-generator.js");
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -3,7 +3,7 @@ import globals from "globals";
 import tseslint from "typescript-eslint";
 import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";
 
-/** @type {import('@types/eslint').Linter.FlatConfig[]} */
+/** @type {import('@types/eslint').Linter.Config[]} */
 export default tseslint.config(
     {
         ignores: ["dist", "cjs", "build", "eslint.config.mjs"],
@@ -15,7 +15,6 @@ export default tseslint.config(
             "index.ts",
             "src/**/*.ts",
             "factory/**/*.ts",
-            "bin/**",
             "test/**/*.test.ts",
             "test/utils.ts",
         ],
@@ -70,7 +69,7 @@ export default tseslint.config(
         files: ["test/**/*.test.ts"],
         languageOptions: {
             globals: {
-                ...globals.jest,
+                ...globals.vitest,
                 ...globals.commonjs,
             },
         },

diff --git a/jest.config.cjs b/jest.config.cjs
diff --git a/package.json b/package.json
@@ -49,49 +49,48 @@
     "prepublishOnly": "yarn build",
     "release": "yarn build && auto shipit",
     "run": "tsx ts-json-schema-generator.ts",
-    "test": "jest test/ --verbose",
-    "test:coverage": "yarn jest test/ --collectCoverage=true",
-    "test:fast": "cross-env FAST_TEST=1 jest test/ --verbose",
+    "test": "vitest run",
+    "test:coverage": "yarn vitest run --coverage",
+    "test:fast": "cross-env FAST_TEST=1 vitest run",
     "test:update": "cross-env UPDATE_SCHEMA=true yarn test:fast",
     "watch": "tsc -w"
   },
   "dependencies": {
     "@types/json-schema": "^7.0.15",
     "commander": "^12.1.0",
-    "glob": "^10.4.2",
+    "glob": "^11.0.0",
     "json5": "^2.2.3",
     "normalize-path": "^3.0.0",
-    "safe-stable-stringify": "^2.4.3",
-    "tslib": "^2.6.3",
-    "typescript": "^5.5.2"
+    "safe-stable-stringify": "^2.5.0",
+    "tslib": "^2.7.0",
+    "typescript": "^5.5.4"
   },
   "devDependencies": {
-    "@auto-it/conventional-commits": "^11.1.6",
-    "@auto-it/first-time-contributor": "^11.1.6",
-    "@babel/core": "^7.24.7",
-    "@babel/preset-env": "^7.24.7",
+    "@auto-it/conventional-commits": "^11.2.1",
+    "@auto-it/first-time-contributor": "^11.2.1",
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.4",
     "@babel/preset-typescript": "^7.24.7",
-    "@eslint/js": "^9.6.0",
-    "@types/eslint": "^9.6.0",
+    "@eslint/js": "^9.10.0",
+    "@types/eslint": "^9.6.1",
     "@types/glob": "^8.1.0",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^22.0.0",
+    "@types/node": "^22.5.4",
     "@types/normalize-path": "^3.0.2",
-    "ajv": "^8.16.0",
+    "@vitest/coverage-v8": "^2.0.5",
+    "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
-    "auto": "^11.1.6",
+    "auto": "^11.2.1",
     "chai": "^5.1.1",
     "cross-env": "^7.0.3",
-    "eslint": "^9.6.0",
+    "eslint": "^9.10.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.7.0",
-    "jest-junit": "^16.0.0",
-    "prettier": "^3.3.2",
-    "tsx": "^4.16.0",
-    "typescript-eslint": "^7.14.1",
+    "eslint-plugin-prettier": "^5.2.1",
+    "prettier": "^3.3.3",
+    "tsx": "^4.19.0",
+    "typescript-eslint": "^8.4.0",
     "vega": "^5.30.0",
-    "vega-lite": "^5.19.0"
+    "vega-lite": "^5.21.0",
+    "vitest": "^2.0.5"
   },
   "engines": {
     "node": ">=18.0.0"

diff --git a/src/AnnotationsReader/BasicAnnotationsReader.ts b/src/AnnotationsReader/BasicAnnotationsReader.ts
@@ -76,12 +76,12 @@
        }

        const annotations = jsDocTags.reduce((result: Annotations, jsDocTag) => {
            const value = this.parseJsDocTag(jsDocTag);
            if (value !== undefined) {
                if (BasicAnnotationsReader.requiresDollar.has(jsDocTag.name)) {
                    result["$" + jsDocTag.name] = value;
                } else {
                    result[jsDocTag.name] = value;
                }
            }
            return result;
@@ -99,8 +99,8 @@
        if (isTextTag) {
            return text;
        }
        let parsed = this.parseJson(text);
        parsed = parsed === undefined ? text : parsed;
        if (BasicAnnotationsReader.jsonTags.has(jsDocTag.name)) {
            return parsed;
        } else if (this.extraTags?.has(jsDocTag.name)) {
@@ -114,7 +114,7 @@
     private parseJson(value: string): any {
         try {
             return json5.parse(value);
-        } catch (e) {
+        } catch {
             return undefined;
         }
     }

diff --git a/src/AnnotationsReader/ExtendedAnnotationsReader.ts b/src/AnnotationsReader/ExtendedAnnotationsReader.ts
@@ -98,7 +98,7 @@ export class ExtendedAnnotationsReader extends BasicAnnotationsReader {
             const text = (example.text ?? []).map((part) => part.text).join("");
             try {
                 examples.push(json5.parse(text));
-            } catch (e) {
+            } catch {
                 // ignore examples which don't parse to valid JSON
                 // This could be improved to support a broader range of usages,
                 // such as if the example has a title (as explained in the tsdoc spec).

diff --git a/src/NodeParser/PrefixUnaryExpressionNodeParser.ts b/src/NodeParser/PrefixUnaryExpressionNodeParser.ts
@@ -20,7 +20,7 @@ export class PrefixUnaryExpressionNodeParser implements SubNodeParser {
                 case ts.SyntaxKind.PlusToken:
                     return new LiteralType(+operand.getValue());
                 case ts.SyntaxKind.MinusToken:
-                    return new LiteralType(-operand.getValue());
+                    return new LiteralType(-(operand.getValue() as number));
                 case ts.SyntaxKind.TildeToken:
                     return new LiteralType(~operand.getValue());
                 case ts.SyntaxKind.ExclamationToken:

diff --git a/test/config.test.ts b/test/config.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import Ajv from "ajv";
 import addFormats from "ajv-formats";
 import { readFileSync, writeFileSync } from "fs";

diff --git a/test/invalid-data.test.ts b/test/invalid-data.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import { resolve } from "path";
 import ts from "typescript";
 import { createFormatter } from "../factory/formatter";

diff --git a/test/minify/index.test.ts b/test/minify/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import { execSync } from "child_process";
 import path from "path";
 

diff --git a/test/sourceless-nodes/index.test.ts b/test/sourceless-nodes/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import path from "path";
 import ts from "typescript";
 import { createParser } from "../../factory";

diff --git a/test/sourceless-nodes/key/index.test.ts b/test/sourceless-nodes/key/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import path from "path";
 import ts from "typescript";
 import { createParser } from "../../../factory";

diff --git a/test/unit/AnnotatedTypeFormatter.test.ts b/test/unit/AnnotatedTypeFormatter.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import { makeNullable } from "../../src/TypeFormatter/AnnotatedTypeFormatter.js";
 
 describe("makeNullable", () => {

diff --git a/test/unit/String.test.ts b/test/unit/String.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import { strip } from "../../src/Utils/String";
 
 describe("strip", () => {

diff --git a/test/unit/Type/HiddenType.test.ts b/test/unit/Type/HiddenType.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import { HiddenType } from "../../../src/Type/HiddenType.js";
 import { NeverType } from "../../../src/Type/NeverType.js";
 

diff --git a/test/unit/deepMerge.test.ts b/test/unit/deepMerge.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import { deepMerge } from "../../src/Utils/deepMerge.js";
 
 describe("deepMerge", () => {

diff --git a/test/unit/intersectionOfArrays.test.ts b/test/unit/intersectionOfArrays.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import { intersectionOfArrays } from "../../src/Utils/intersectionOfArrays.js";
 
 describe("intersectionOfArrays", () => {

diff --git a/test/unit/isAssignableTo.test.ts b/test/unit/isAssignableTo.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import { AliasType } from "../../src/Type/AliasType.js";
 import { AnnotatedType } from "../../src/Type/AnnotatedType.js";
 import { AnyType } from "../../src/Type/AnyType.js";

diff --git a/test/utils.ts b/test/utils.ts
@@ -1,3 +1,4 @@
+import { expect } from "vitest";
 import Ajv, { Options as AjvOptions } from "ajv";
 import addFormats from "ajv-formats";
 import { readFileSync, writeFileSync } from "fs";

diff --git a/test/valid-data-annotations.test.ts b/test/valid-data-annotations.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import { assertValidSchema } from "./utils";
 import * as annotationDefaultSamples from "./valid-data/annotation-default/samples";
 

diff --git a/test/valid-data-other.test.ts b/test/valid-data-other.test.ts
@@ -1,3 +1,4 @@
+import { describe, it } from "vitest";
 import { assertValidSchema } from "./utils";
 import * as objectRequiredSamples from "./valid-data/object-required/samples";
 

diff --git a/test/valid-data-struct.test.ts b/test/valid-data-struct.test.ts
@@ -1,3 +1,4 @@
+import { describe, it } from "vitest";
 import { assertValidSchema } from "./utils";
 
 describe("valid-data-struct", () => {

diff --git a/test/valid-data-type.test.ts b/test/valid-data-type.test.ts
@@ -1,3 +1,4 @@
+import { describe, it } from "vitest";
 import { assertValidSchema } from "./utils";
 
 describe("valid-data-type", () => {

diff --git a/test/vega-lite.test.ts b/test/vega-lite.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from "vitest";
 import { readFileSync, writeFileSync } from "fs";
 import { resolve } from "path";
 import { CompletedConfig, DEFAULT_CONFIG } from "../src/Config.js";

diff --git a/test/vega-lite/schema.json b/test/vega-lite/schema.json
@@ -28308,6 +28308,11 @@
           ],
           "description": "For text marks, the vertical text baseline. One of `\"alphabetic\"` (default), `\"top\"`, `\"middle\"`, `\"bottom\"`, `\"line-top\"`, `\"line-bottom\"`, or an expression reference that provides one of the valid values. The `\"line-top\"` and `\"line-bottom\"` values operate similarly to `\"top\"` and `\"bottom\"`, but are calculated relative to the `lineHeight` rather than `fontSize` alone.\n\nFor range marks, the vertical alignment of the marks. One of `\"top\"`, `\"middle\"`, `\"bottom\"`.\n\n__Note:__ Expression reference is *not* supported for range marks."
         },
+        "binSpacing": {
+          "description": "Offset between bars for binned field. The ideal value for this is either 0 (preferred by statisticians) or 1 (Vega-Lite default, D3 example style).\n\n__Default value:__ `1`",
+          "minimum": 0,
+          "type": "number"
+        },
         "blend": {
           "anyOf": [
             {
@@ -28333,6 +28338,11 @@
           ],
           "description": "Default color.\n\n__Default value:__ <span style=\"color: #4682b4;\">&#9632;</span> `\"#4682b4\"`\n\n__Note:__\n- This property cannot be used in a [style config](https://vega.github.io/vega-lite/docs/mark.html#style-config).\n- The `fill` and `stroke` properties have higher precedence than `color` and will override `color`."
         },
+        "continuousBandSize": {
+          "description": "The default size of the bars on continuous scales.\n\n__Default value:__ `5`",
+          "minimum": 0,
+          "type": "number"
+        },
         "cornerRadius": {
           "anyOf": [
             {
@@ -28421,6 +28431,18 @@
             }
           ]
         },
+        "discreteBandSize": {
+          "anyOf": [
+            {
+              "type": "number"
+            },
+            {
+              "$ref": "#/definitions/RelativeBandSize"
+            }
+          ],
+          "description": "The default size of the bars with discrete dimensions. If unspecified, the default size is  `step-2`, which provides 2 pixel offset between bars.",
+          "minimum": 0
+        },
         "dx": {
           "anyOf": [
             {
@@ -28633,6 +28655,17 @@
             }
           ]
         },
+        "minBandSize": {
+          "anyOf": [
+            {
+              "type": "number"
+            },
+            {
+              "$ref": "#/definitions/ExprRef"
+            }
+          ],
+          "description": "The minimum band size for bar and rectangle marks. __Default value:__ `0.25`"
+        },
         "opacity": {
           "anyOf": [
             {