Upgrade better-sqlite to move on from nodejs_20 (#710)

* upgrade better-sqlite to move on from nodejs_20

* Upgrade npm deps to latest (#711)

* Upgrade safe npm dependencies

- @aws-sdk/client-s3: 3.461.0 → 3.948.0
- fast-glob: 3.3.2 → 3.3.3
- fs-extra: 10.1.0 → 11.3.2
- semver: 7.5.4 → 7.7.3
- ssh2: 1.14.0 → 1.17.0
- tmp: 0.2.4 → 0.2.5
- yaml: 2.3.4 → 2.8.2

All packages are backward compatible with no breaking API changes.
Tests pass successfully.

* Upgrade jsonrepair to v3.13.1 and fix import syntax

- jsonrepair: 2.2.1 → 3.13.1
- Changed from default export to named export: import { jsonrepair }
- Updated foreign/src/Foreign/JsonRepair.js

Breaking change in v3: jsonrepair changed from default export to named export.
Tests pass successfully.

* Upgrade tar to v7.5.2 and migrate to onReadEntry

- tar: 6.2.1 → 7.5.2
- Migrated from deprecated 'onentry' to 'onReadEntry' callback
- Updated foreign/src/Foreign/Tar.js

Breaking change in v7: onentry callback deprecated in favor of onReadEntry.
Requires Node.js 18+, compatible with Node.js 22.
Tests pass successfully.

* Upgrade fuse.js to v7.1.0

- fuse.js: 6.6.2 → 7.1.0

Despite the v7.0.0 'Extension changed' breaking change note, the core API
remains compatible. No code changes required.
Tests pass successfully.

* Upgrade spdx-expression-parse to v4.0.0

- spdx-expression-parse: 3.0.1 → 4.0.0
- Added test for joinWith to ensure generated expressions are parseable

Despite v4.0.0 being a major version bump with documented breaking changes
around parentheses requirements, all existing usage patterns remain compatible.
The generated expressions from joinWith (e.g., 'MIT AND Apache-2.0') parse
correctly in v4 without modifications.

Tests pass successfully, including new joinWith test.

* Upgrade octokit versions to latest

* use modern omit flags

Author: thomashoneyman

app/package.json

@@ -4,9 +4,9 @@
   "type": "module",
   "license": "BSD-3-Clause",
   "dependencies": {
-    "better-sqlite3": "^8.4.0",
+    "better-sqlite3": "^12.4.0",
     "registry-foreign": "file:../foreign",
     "registry-lib": "file:../lib",
-    "yaml": "^2.2.2"
+    "yaml": "^2.8.2"
   }
 }

flake.lock

@@ -1,21 +1,22 @@
 {
   "name": "registry-foreign",
+  "type": "module",
   "private": true,
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.461.0",
-    "@octokit/plugin-retry": "^3.0.9",
-    "@octokit/plugin-throttling": "^3.7.0",
-    "@octokit/rest": "^18.12.0",
-    "better-sqlite3": "^8.5.2",
-    "fast-glob": "^3.2.11",
-    "fs-extra": "^10.0.0",
-    "fuse.js": "^6.6.2",
-    "jsonrepair": "^2.2.1",
+    "@aws-sdk/client-s3": "^3.948.0",
+    "@octokit/plugin-retry": "^8.0.3",
+    "@octokit/plugin-throttling": "^11.0.3",
+    "@octokit/rest": "^22.0.1",
+    "better-sqlite3": "^12.4.0",
+    "fast-glob": "^3.3.3",
+    "fs-extra": "^11.3.2",
+    "fuse.js": "^7.1.0",
+    "jsonrepair": "^3.13.1",
     "registry-lib": "file:../lib",
-    "semver": "^7.5.2",
-    "tar": "^6.2.1",
-    "tmp": "^0.2.4",
-    "yaml": "^2.3.1"
+    "semver": "^7.7.3",
+    "tar": "^7.5.2",
+    "tmp": "^0.2.5",
+    "yaml": "^2.8.2"
   }
 }

foreign/package.json

@@ -1,4 +1,4 @@
-import jsonrepair from "jsonrepair";
+import { jsonrepair } from "jsonrepair";
 
 export const repairImpl = (onError, onSuccess, input) => {
   try {

foreign/src/Foreign/JsonRepair.js

@@ -10,7 +10,7 @@ export const getToplevelDirImpl = (filename) => () => {
       var topLevel = /^[^\/]+\/$/;
       return topLevel.exec(path);
     },
-    onentry: (entry) => {
+    onReadEntry: (entry) => {
       entries.push(entry.path);
     },
   });

foreign/src/Foreign/Tar.js

@@ -3,7 +3,7 @@
   "private": true,
   "license": "BSD-3-Clause",
   "dependencies": {
-    "spdx-expression-parse": "^3.0.0",
-    "ssh2": "^1.11.0"
+    "spdx-expression-parse": "^4.0.0",
+    "ssh2": "^1.17.0"
   }
 }

lib/package.json

@@ -3,6 +3,7 @@ module Test.Registry.License (spec) where
 import Prelude
 
 import Data.Array as Array
+import Data.Either (Either(..))
 import Data.String as String
 import Registry.License as License
 import Registry.Test.Assert as Assert
@@ -27,6 +28,22 @@ spec = do
         , Array.foldMap (append "\n  - " <<< License.print) success
         ]
 
+  Spec.it "joinWith creates valid parseable license expressions" do
+    let
+      licenses = [ License.parse "MIT", License.parse "Apache-2.0" ]
+      { fail, success } = Utils.partitionEithers licenses
+
+    unless (Array.null fail) do
+      Assert.fail "Failed to parse test licenses"
+
+    let
+      joined = License.joinWith License.And success
+      reparsed = License.parse (License.print joined)
+
+    case reparsed of
+      Left err -> Assert.fail $ "joinWith created unparseable expression: " <> License.print joined <> " - Error: " <> err
+      Right _ -> pure unit
+
 valid :: Array String
 valid =
   [ "MIT"

lib/test/Registry/License.purs

@@ -149,9 +149,6 @@ let
     };
 in
 {
-  # Use Node.js 20 LTS for all registry components
-  nodejs = prev.nodejs_20;
-
   # Pin spago to the version we use
   spago = prev.spago-bin.spago-0_93_44;
 
@@ -173,6 +170,7 @@ in
     version = "0.0.1";
     src = npmSrc;
     dontNpmBuild = true;
+    npmFlags = [ "--omit=optional" ];
 
     nativeBuildInputs =
       with prev;
@@ -183,7 +181,7 @@ in
       ++ prev.lib.optionals prev.stdenv.isDarwin [ prev.darwin.cctools ];
 
     # To update: run `nix build .#server` and copy the hash from the error
-    npmDepsHash = "sha256-vm6k4DUDWUgPcPeym3YhA1hIg1LbHCDRBSH+7Zs52Uw=";
+    npmDepsHash = "sha256-iWHvXmTcWr4A/VerriuewnH0qNIYBtYkQnqv1VO8Jhs=";
 
     installPhase = ''
       mkdir -p $out