Adds new package @microsoft/sarif-matcher-utils

packages/jest-sarif/package.json

@@ -6,7 +6,6 @@
   "typings": "lib/index.d.ts",
   "scripts": {
     "build": "tsc --build",
-    "generate": "node ./scripts/generate-definitions.js",
     "prepare": "npm run build",
     "test": "jest"
   },
@@ -36,6 +35,7 @@
   },
   "homepage": "https://github.com/microsoft/sarif-js-sdk#readme",
   "dependencies": {
+    "@microsoft/sarif-matcher-utils": "0.0.1",
     "ajv": "^6.12.6",
     "chalk": "^4.1.0",
     "sync-fetch": "^0.3.0",

packages/jest-sarif/src/index.ts

@@ -1,3 +1,2 @@
+export { Definition } from '@microsoft/sarif-matcher-utils';
 export * from './matchers';
-
-export type { Definition } from './types';

packages/jest-sarif/src/matchers/to-be-valid-sarif-for.ts

@@ -1,5 +1,4 @@
-import { buildMatcher } from '../build-matcher';
-import { Definition } from '../types';
+import { buildMatcher, Definition } from '@microsoft/sarif-matcher-utils';
 
 declare global {
   namespace jest {

packages/jest-sarif/src/matchers/to-be-valid-sarif-log.ts

@@ -1,5 +1,5 @@
 import * as Sarif from 'sarif';
-import { buildMatcher } from '../build-matcher';
+import { buildMatcher } from '@microsoft/sarif-matcher-utils';
 
 type MaybeSarifLog = Sarif.Log | unknown;
 

packages/jest-sarif/tsconfig.json

@@ -6,5 +6,10 @@
     "esModuleInterop": true,
     "resolveJsonModule": true
   },
-  "include": ["./src", "./src/schemas/**/*.json"]
+  "references": [
+    {
+      "path": "../sarif-matcher-utils"
+    }
+  ],
+  "include": ["./src"]
 }

packages/sarif-matcher-utils/README.md

@@ -0,0 +1,97 @@
+# @microsoft/sarif-matcher-utils
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+![workflows](https://github.com/microsoft/sarif-js-sdk/workflows/CI/badge.svg?branch=main)
+[![Version](https://img.shields.io/npm/v/@microsoft/sarif-matcher-utils.svg)](https://npmjs.org/package/@microsoft/sarif-matcher-utils)
+[![TypeScript](https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg)](http://www.typescriptlang.org/)
+[![code style: prettier](https://img.shields.io/badge/code_style-prettier-f8bc45.svg)](https://github.com/prettier/prettier)
+
+> Custom matchers for SARIF logs for Jest
+
+## Overview
+
+The [Static Analysis Result Interchange Format (SARIF)](https://docs.oasis-open.org/sarif/sarif/v2.1.0/csprd01/sarif-v2.1.0-csprd01.html) is comprehensive spec that provides a standardized schema for tools running static analysis. For tools producing SARIF output, it's useful to be able to test that output to validate it conforms to the SARIF JSON schema.
+
+This library helps achieve that through a custom matcher utility, which allows for assertion extensions for popular test libraries such as `jest` and `vitest`. It uses the SARIF JSON Schema to validate the log structure against the actual schema, which helps ensure flexibility when matching whole or partial portions of that schema.
+
+## Installation
+
+```bash
+npm install @microsoft/sarif-matcher-utils --save-dev
+
+# or
+
+yarn add @microsoft/sarif-matcher-utils -D
+```
+
+## Usage
+
+The main API is the `buildMatcher` function, which can be used to extend the `jest` or `vitest` matcher API with custom assertions. The example below demonstrates using the `buildMatcher` function to extend the `vitest` matcher API with custom assertions.
+
+Using JavaScript:
+
+```js
+// sarif-log-matcher.ts
+import { expect } from 'vitest';
+import { buildMatcher } from '@microsoft/sarif-matcher-utils';
+
+const toBeValidSarifLog = buildMatcher();
+
+expect.extend({ toBeValidSarifLog });
+```
+
+Using TypeScript, which includes necessary type extensions for `vitest`:
+
+```ts
+// sarif-log-matcher.ts
+import { expect } from 'vitest';
+import * as Sarif from 'sarif';
+import { buildMatcher } from '@microsoft/sarif-matcher-utils';
+
+type MaybeSarifLog = Sarif.Log | unknown;
+
+interface CustomMatchers<R = unknown> {
+  toBeValidSarifLog(): R;
+}
+
+declare global {
+  namespace Vi {
+    interface Assertion extends CustomMatchers {}
+    interface AsymmetricMatchersContaining extends CustomMatchers {}
+  }
+}
+
+const toBeValidSarifLog = buildMatcher<MaybeSarifLog>();
+
+expect.extend({ toBeValidSarifLog });
+```
+
+Which can then be used in tests:
+
+```js
+import './sarif-log-matcher';
+
+it('should be a valid SARIF log', () => {
+  const sarifLog = buildSarifLog();
+
+  expect(sarifLog).toBeValidSarifLog();
+});
+```
+
+## Attribution
+
+This package was based on the [jest-json-schema](https://www.npmjs.com/package/jest-json-schema) package.
+
+## Contributing
+
+This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit [https://cla.opensource.microsoft.com](https://cla.opensource.microsoft.com).
+
+When you submit a pull request, a CLA bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
+
+## Trademarks
+
+This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft trademarks or logos is subject to and must follow
+[Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship.
+Any use of third-party trademarks or logos are subject to those third-party's policies.

packages/sarif-matcher-utils/package.json

@@ -0,0 +1,64 @@
+{
+  "name": "@microsoft/sarif-matcher-utils",
+  "version": "0.0.1",
+  "description": "Test assertion matcher utils for working with SARIF",
+  "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
+  "scripts": {
+    "build": "tsc --build",
+    "generate": "node ./scripts/generate-definitions.js",
+    "prepare": "npm run build",
+    "test": "vitest run"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/microsoft/sarif-js-sdk.git"
+  },
+  "keywords": [
+    "sarif-matcher",
+    "sarif"
+  ],
+  "engines": {
+    "node": ">= 14"
+  },
+  "files": [
+    "/lib"
+  ],
+  "author": "Microsoft Corporation",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "bugs": {
+    "url": "https://github.com/microsoft/sarif-js-sdk/issues"
+  },
+  "homepage": "https://github.com/microsoft/sarif-js-sdk#readme",
+  "dependencies": {
+    "ajv": "^6.12.6",
+    "chalk": "^4.1.0",
+    "jest-matcher-utils": "^28.1.0",
+    "sync-fetch": "^0.3.0",
+    "tslib": "^2.2.0"
+  },
+  "devDependencies": {
+    "prettier": "^2.2.1",
+    "vite": "^2.8.6",
+    "vitest": "^0.10.5"
+  },
+  "release-it": {
+    "plugins": {
+      "release-it-lerna-changelog": {
+        "infile": "CHANGELOG.md",
+        "launchEditor": true
+      }
+    },
+    "git": {
+      "tagName": "sarif-matcher-utils@${version}"
+    },
+    "github": {
+      "release": true,
+      "releaseName": "sarif-matcher-utils@${version}",
+      "tokenRef": "GITHUB_AUTH"
+    }
+  }
+}

packages/jest-sarif/src/build-matcher.ts → packages/sarif-matcher-utils/src/build-matcher.ts

@@ -4,6 +4,11 @@ import { matcherHint } from 'jest-matcher-utils';
 import chalk from 'chalk';
 import { Definition } from './types';
 
+type CustomMatcherLike<T> = (
+  received: T,
+  definition?: Definition | undefined
+) => { actual: T; message: () => string; name: string; pass: boolean };
+
 // Keywords where the `Expected: ...` output is hidden
 const ERROR_KEYWORDS_HIDE_EXPECTED = new Set([
   'type',
@@ -77,9 +82,9 @@ function buildValidator(): Ajv.Ajv {
  * @param options.matcherName The name of the matcher.
  * @param options.schemaName [Optional] The name of the schema to load.
  * @param options.definition [Optional] The name of the SARIF schema definition fragment to dynamically build a schema for.
- * @returns {jest.CustomMatcher}
+ * @returns {CustomMatcherLike<T>}
  */
-export function buildMatcher<T>(): jest.CustomMatcher {
+export function buildMatcher<T>(): CustomMatcherLike<T> {
   const ajv = buildValidator();
   // eslint-disable-next-line no-underscore-dangle
   const { verbose } = ajv._opts;

packages/sarif-matcher-utils/src/index.ts

@@ -0,0 +1,3 @@
+export { buildMatcher } from './build-matcher';
+
+export type { Definition } from './types';

packages/sarif-matcher-utils/src/types/index.ts

@@ -0,0 +1 @@
+export { Definition } from './definition';

packages/sarif-matcher-utils/tests/build-matcher-test.ts

@@ -0,0 +1,62 @@
+import { describe, it, expect } from 'vitest';
+import { buildMatcher } from '../src/build-matcher';
+import * as Sarif from 'sarif';
+
+type MaybeSarifLog = Sarif.Log | unknown;
+
+interface CustomMatchers<R = unknown> {
+  toBeValidSarifLog(): R;
+}
+
+declare global {
+  namespace Vi {
+    interface Assertion extends CustomMatchers {}
+    interface AsymmetricMatchersContaining extends CustomMatchers {}
+  }
+}
+
+const toBeValidSarifLog = buildMatcher<MaybeSarifLog>();
+
+expect.extend({ toBeValidSarifLog });
+
+describe('toBeValidSarifLog', () => {
+  it('does not throw', () => {
+    // eslint-disable-next-line unicorn/no-null
+    expect(null).not.toBeValidSarifLog();
+    // eslint-disable-next-line unicorn/no-useless-undefined
+    expect(undefined).not.toBeValidSarifLog();
+    expect(1).not.toBeValidSarifLog();
+    expect({}).not.toBeValidSarifLog();
+    expect({ hello: 'world' }).not.toBeValidSarifLog();
+    expect({ hello: 'a', world: 'b' }).not.toBeValidSarifLog();
+  });
+
+  it('fails for wrong type', () => {
+    const testObj = { hello: 1 };
+    expect(() => expect(testObj).toBeValidSarifLog()).toThrow(
+      "should NOT have additional properties, but found 'hello'"
+    );
+  });
+
+  it('fails for missing required keys', () => {
+    expect(() => expect({}).toBeValidSarifLog()).toThrow("should have required property 'version'");
+  });
+
+  it('fails when additional properties are found but forbidden', () => {
+    const testObj = {
+      hello: 'world',
+      another: 'property',
+    };
+    expect(() => expect(testObj).toBeValidSarifLog()).toThrow(
+      "should NOT have additional properties, but found 'hello'"
+    );
+  });
+
+  it('fails when validating a valid SARIF log when using .not', () => {
+    const sarifLog = require('./fixtures/sarif-log.json');
+
+    expect(() => expect(sarifLog).not.toBeValidSarifLog()).toThrow(
+      'Expected value not to match schema'
+    );
+  });
+});

packages/sarif-matcher-utils/tests/fixtures/sarif-log.json

@@ -0,0 +1,36 @@
+{
+  "version": "2.1.0",
+  "$schema": "https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.4.json",
+  "runs": [
+    {
+      "tool": {
+        "driver": {
+          "name": "ESLint"
+        }
+      },
+      "results": [
+        {
+          "ruleId": "no-unused-vars",
+          "level": "error",
+          "message": {
+            "text": "'x' is assigned a value but never used."
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "file:///C:/dev/sarif/sarif-tutorials/samples/Introduction/simple-example.js",
+                  "index": 0
+                },
+                "region": {
+                  "startLine": 1,
+                  "startColumn": 5
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

packages/sarif-matcher-utils/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig-base.json",
+  "compilerOptions": {
+    "outDir": "lib",
+    "rootDir": "src",
+    "esModuleInterop": true,
+    "resolveJsonModule": true
+  },
+  "include": ["./src", "./src/schemas/**/*.json"]
+}

packages/sarif-matcher-utils/vitest.config.ts

@@ -0,0 +1,10 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  test: {
+    include: ['tests/**/*-test.ts'],
+    deps: {
+      inline: ['graceful-fs'],
+    },
+  },
+});

tsconfig-base.json

@@ -12,6 +12,7 @@
     "baseUrl": ".",
     "paths": {
       "@microsoft/jest-sarif": ["./packages/jest-sarif/lib/index.d.ts"],
+      "@microsoft/sarif-matcher-utils": ["./packages/sarif-matcher-utils/lib/index.d.ts"],
       "@microsoft/sarif-builder": ["./packages/sarif-builder/lib/index.d.ts"],
       "*": ["./types/*"]
     },

tsconfig.json

@@ -1,4 +1,8 @@
 {
   "files": [],
-  "references": [{ "path": "./packages/jest-sarif" }, { "path": "./packages/sarif-builder" }]
+  "references": [
+    { "path": "./packages/jest-sarif" },
+    { "path": "./packages/sarif-matcher-utils" },
+    { "path": "./packages/sarif-builder" }
+  ]
 }