From 2df3d33e3e5088a001e1a934a4b3ff2321a66168 Mon Sep 17 00:00:00 2001
From: Paula Stachova <paula.stachova@mongodb.com>
Date: Tue, 21 Jan 2025 17:09:59 +0100
Subject: [PATCH] bump node types and use ??=

---
 package-lock.json      | 38 +++++++++++++++++++++++++++++---------
 package.json           |  2 +-
 src/schema-accessor.ts |  9 +++------
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 31ab965..5f9e9cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
       "devDependencies": {
         "@types/json-schema": "^7.0.15",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.11.18",
+        "@types/node": "^22.10.7",
         "@types/reservoir": "^0.1.0",
         "@types/sinon": "^17.0.3",
         "@typescript-eslint/eslint-plugin": "^5.47.1",
@@ -2361,10 +2361,14 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.11.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz",
-      "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==",
-      "dev": true
+      "version": "22.10.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
+      "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
@@ -7549,6 +7553,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/undici-types": {
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -10052,10 +10063,13 @@
       "dev": true
     },
     "@types/node": {
-      "version": "18.11.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz",
-      "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==",
-      "dev": true
+      "version": "22.10.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
+      "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
+      "dev": true,
+      "requires": {
+        "undici-types": "~6.20.0"
+      }
     },
     "@types/parse-json": {
       "version": "4.0.0",
@@ -13873,6 +13887,12 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
+    "undici-types": {
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "dev": true
+    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
diff --git a/package.json b/package.json
index d7967fc..aa169a0 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
   "devDependencies": {
     "@types/json-schema": "^7.0.15",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.18",
+    "@types/node": "^22.10.7",
     "@types/reservoir": "^0.1.0",
     "@types/sinon": "^17.0.3",
     "@typescript-eslint/eslint-plugin": "^5.47.1",
diff --git a/src/schema-accessor.ts b/src/schema-accessor.ts
index 530d8bd..cd70681 100644
--- a/src/schema-accessor.ts
+++ b/src/schema-accessor.ts
@@ -34,17 +34,14 @@ export class InternalSchemaBasedAccessor implements SchemaAccessor {
   }
 
   async getStandardJsonSchema(options: Options = {}): Promise<StandardJSONSchema> {
-    if (this.standardJSONSchema) return this.standardJSONSchema;
-    return this.standardJSONSchema = await convertors.internalSchemaToStandard(this.internalSchema, options);
+    return this.standardJSONSchema ??= await convertors.internalSchemaToStandard(this.internalSchema, options);
   }
 
   async getMongoDBJsonSchema(options: Options = {}): Promise<MongoDBJSONSchema> {
-    if (this.mongodbJSONSchema) return this.mongodbJSONSchema;
-    return this.mongodbJSONSchema = await convertors.internalSchemaToMongoDB(this.internalSchema, options);
+    return this.mongodbJSONSchema ??= await convertors.internalSchemaToMongoDB(this.internalSchema, options);
   }
 
   async getExtendedJsonSchema(options: Options = {}): Promise<ExtendedJSONSchema> {
-    if (this.extendedJSONSchema) return this.extendedJSONSchema;
-    return this.extendedJSONSchema = await convertors.internalSchemaToExtended(this.internalSchema, options);
+    return this.extendedJSONSchema ??= await convertors.internalSchemaToExtended(this.internalSchema, options);
   }
 }