Merge pull request #182 from Sphereon-Opensource/develop

New release

Author: nklomp

.eslintrc.json

@@ -1,7 +1,7 @@
 {
   "root": true,
   "parser": "@typescript-eslint/parser",
-//  "parserOptions": { "project": "./packages/tsconfig.json" },
+  //  "parserOptions": { "project": "./packages/tsconfig.json" },
   "env": { "es6": true },
   "ignorePatterns": ["node_modules", "dist", "coverage", "jest.js"],
   "plugins": ["import", "eslint-comments"],
@@ -12,28 +12,17 @@
     "plugin:import/typescript",
     "prettier"
   ],
-  "globals": { "BigInt": true, "console": true, "WebAssembly": true },
+  "globals": { "BigInt": true, "console": true, "WebAssembly": true, "vitest": true },
   "rules": {
     "@typescript-eslint/explicit-module-boundary-types": "off",
-    "eslint-comments/disable-enable-pair": [
-      "error",
-      { "allowWholeFile": true }
-    ],
+    "eslint-comments/disable-enable-pair": ["error", { "allowWholeFile": true }],
     "eslint-comments/no-unused-disable": "error",
-    "import/order": [
-      "error",
-      { "newlines-between": "always", "alphabetize": { "order": "asc" } }
-    ],
-    "sort-imports": [
-      "error",
-      { "ignoreDeclarationSort": true, "ignoreCase": true }
-    ]
+    "import/order": ["error", { "newlines-between": "always", "alphabetize": { "order": "asc" } }],
+    "sort-imports": ["error", { "ignoreDeclarationSort": true, "ignoreCase": true }]
   },
   "overrides": [
     {
-      "files": [
-        "**/__tests__/**/*.ts"
-      ],
+      "files": ["**/__tests__/**/*.ts"],
       "rules": {
         "@typescript-eslint/no-non-null-assertion": "off"
       }

.github/workflows/build-test-on-pr.yml

@@ -25,7 +25,7 @@ jobs:
           node-version: '20.x'
       - uses: pnpm/action-setup@v4
         with:
-          version: 9.15.3 # TODO remove later, we are temporary dealing with a broken pnpm version in the CI container
+          version: 10.8.1
       - run: pnpm install
       - run: pnpm build
       - name: run CI tests

.github/workflows/build-test-publish-on-push.yml

@@ -39,7 +39,7 @@ jobs:
           node-version: '20.x'
       - uses: pnpm/action-setup@v4
         with:
-          version: 9.15.3 # TODO remove later, we are temporary dealing with a broken pnpm version in the CI container
+          version: 10.8.1
       - run: pnpm install
       - run: pnpm build
       - name: run integration tests
@@ -58,7 +58,7 @@ jobs:
 
       - name: setup git coordinates
         run: |
-          git remote set-url origin https://Sphereon-Opensource:$GH_TOKEN@github.com/Sphereon-Opensource/OID4VCI.git
+          git remote set-url origin https://Sphereon-Opensource:$GH_TOKEN@github.com/Sphereon-Opensource/OID4VC.git
           git config user.name $GH_USER
           git config user.email $GH_EMAIL
 

.gitignore

@@ -15,4 +15,8 @@
 *.log
 packages/siop-oid4vp/lib/schemas/validation/schemaValidation.js
 packages/siop-oid4vp/lib/generator/*
-!packages/siop-oid4vp/lib/generator/schemaGenerator.ts
+!packages/siop-oid4vp/lib/generator/schemaGenerator.cts
+/packages/siop-oid4vp/lib/schemas/validation/schemaValidation.cjs
+
+.env
+/.turbo/

CHANGELOG.md

@@ -5,7 +5,7 @@
   <br>
 </h1>
 
-[![CI](https://github.com/Sphereon-Opensource/OID4VCI/actions/workflows/build-test-on-pr.yml/badge.svg)](https://github.com/Sphereon-Opensource/OID4VCI/actions/workflows/build-test-on-pr.yml) [![codecov](https://codecov.io/gh/Sphereon-Opensource/OID4VCI/branch/develop/graph/badge.svg)](https://codecov.io/gh/Sphereon-Opensource/OID4VCI) [![NPM Version](https://img.shields.io/npm/v/@sphereon/oid4vci-client.svg)](https://npm.im/@sphereon/oid4vci-client)
+[![CI](https://github.com/Sphereon-Opensource/OID4VC/actions/workflows/build-test-on-pr.yml/badge.svg)](https://github.com/Sphereon-Opensource/OID4VC/actions/workflows/build-test-on-pr.yml) [![codecov](https://codecov.io/gh/Sphereon-Opensource/OID4VC/branch/develop/graph/badge.svg)](https://codecov.io/gh/Sphereon-Opensource/OID4VC) [![NPM Version](https://img.shields.io/npm/v/@sphereon/oid4vci-client.svg)](https://npm.im/@sphereon/oid4vci-client)
 
 _IMPORTANT the packages are still in an early development stage, which means that breaking changes are to be expected_
 
@@ -57,7 +57,7 @@ authenticate first.
 
 The below diagram shows the steps involved in the pre-authorized code flow. Note that inner wallet functionalities (like
 saving VCs) are out of scope for this library. Also This library doesn't include any functionalities of a VC Issuer
-![Flow diagram](https://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/Sphereon-Opensource/OID4VCI-client/develop/docs/preauthorized-code-flow.puml)
+![Flow diagram](https://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/Sphereon-Opensource/OID4VC-client/develop/docs/preauthorized-code-flow.puml)
 
 # OpenID for VP Flows
 

README.md

@@ -0,0 +1,43 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+  "vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false },
+  "files": { "ignoreUnknown": false, "ignore": [] },
+  "formatter": {
+    "enabled": true,
+    "useEditorconfig": true,
+    "formatWithErrors": false,
+    "indentStyle": "space",
+    "indentWidth": 2,
+    "lineEnding": "lf",
+    "lineWidth": 150,
+    "attributePosition": "auto",
+    "bracketSpacing": true,
+    "ignore": ["**/dist/*", "**/coverage/*", "**/*/node_modules", "packages/siop-oid4vp/lib/schemas", "**/*tsconfig*", "**/schemaValidation.*js"]
+  },
+  "organizeImports": { "enabled": true },
+  "linter": {
+    "enabled": true,
+    "rules": { "recommended": false },
+    "ignore": ["**/node_modules", "**/dist/*", "**/coverage/*", "**/jest.js", "**/*tsconfig*", "**/schemaValidation.*js"]
+  },
+  "javascript": {
+    "formatter": {
+      "jsxQuoteStyle": "double",
+      "quoteProperties": "asNeeded",
+      "trailingCommas": "all",
+      "semicolons": "asNeeded",
+      "arrowParentheses": "always",
+      "bracketSameLine": false,
+      "quoteStyle": "single",
+      "attributePosition": "auto",
+      "bracketSpacing": true
+    },
+    "globals": ["BigInt", "vitest", "WebAssembly", "console"]
+  },
+  "overrides": [
+    {
+      "include": ["**/__tests__/**/*.ts"],
+      "linter": { "rules": { "style": { "noNonNullAssertion": "off" } } }
+    }
+  ]
+}

biome.json

@@ -1,13 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "0.17.0",
+  "version": "0.18.2",
   "npmClient": "pnpm",
-  "command": {
-    "publish": {
-      "allowBranch": ["main", "master"],
-      "conventionalCommits": true,
-      "gitRemote": "origin",
-      "message": "chore(release): %s"
-    }
-  }
+  "workspaces": ["packages/*"]
 }

jest.json

@@ -1,31 +1,35 @@
 {
   "name": "@sphereon/oid4vci-workspace",
-  "version": "0.11.0",
+  "version": "0.18.0",
   "description": "OpenID for Verifiable Credentials",
   "author": "Sphereon",
   "license": "Apache-2.0",
   "private": true,
+  "packageManager": "pnpm@10.8.1",
+  "workspaces": ["packages/*"],
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "fix": "pnpm run-s fix:*",
-    "fix:lint": "eslint . --fix --ext .ts",
-    "fix:prettier": "prettier --write \"{packages,__tests__,!dist}/**/*.{ts,tsx,js,json,md,yml}\"",
-    "build": "pnpm -r --stream build",
-    "build:clean": "lerna clean -y && pnpm install && lerna run build:clean --concurrency 1",
-    "test:ci": "jest --config=jest.json && jest --config=packages/siop-oid4vp/jest.json",
-    "test": "jest --verbose --config=jest.json --coverage=true --detectOpenHandles && jest --verbose --config=packages/siop-oid4vp/jest.json --coverage=true --detectOpenHandles",
-    "clean": "rimraf --glob **/dist **/coverage **/pnpm-lock.yaml packages/**/node_modules node_modules packages/**/tsconfig.tsbuildinfo",
+    "fix:lint": "biome lint --error-on-warnings",
+    "fix:prettier": "biome format --write",
+    "build": "turbo run build",
+    "test:ci": "vitest run --config ./vitest.config.ts --coverage",
+    "test": "turbo run test:vitest",
+    "test:vitest": "vitest run --config ./vitest.config.ts --coverage",
+    "clean": "rimraf --glob **/dist **/.turbo **/.tsup **/coverage **/pnpm-lock.yaml packages/**/node_modules node_modules packages/**/tsconfig.tsbuildinfo",
     "publish:latest": "lerna publish --conventional-commits --include-merged-tags --create-release github --yes --dist-tag latest --registry https://registry.npmjs.org",
     "publish:next": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid next --pre-dist-tag next --yes --registry https://registry.npmjs.org",
     "publish:unstable": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.6",
+    "pnpm": ">=10"
   },
   "resolutions": {
-    "@sphereon/ssi-types": "^0.32.1-next.161",
-    "dcql": "0.2.19",
-    "node-fetch": "2.6.12"
+    "@sphereon/ssi-types": "0.33.1-next.73",
+    "dcql": "0.2.22",
+    "node-fetch": "2.6.12",
+    "typescript": "5.8.3"
   },
   "prettier": {
     "endOfLine": "auto",
@@ -34,17 +38,18 @@
     "printWidth": 150
   },
   "devDependencies": {
+    "@swc/core": "^1.11.18",
     "@types/debug": "^4.1.12",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^18.19.39",
-    "jest": "^29.7.0",
-    "lerna": "^8.1.6",
-    "lerna-changelog": "^2.2.0",
+    "@types/node": "^20.17.30",
+    "@vitest/coverage-v8": "^3.1.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.3.2",
+    "@biomejs/biome": "^1.9.4",
     "rimraf": "^5.0.8",
-    "ts-jest": "^29.1.5",
-    "typescript": "5.4.5"
+    "lerna": "^8.2.2",
+    "tsup": "^8.4.0",
+    "turbo": "^2.5.0",
+    "typescript": "5.8.3",
+    "vitest": "^3.1.1"
   },
   "keywords": [
     "Sphereon",
@@ -65,5 +70,6 @@
     "OIDC4VP",
     "OID4VCI",
     "OID4VP"
-  ]
+  ],
+  "repository": "https://github.com/Sphereon-Opensource/OID4VC"
 }