Merge remote-tracking branch 'origin/v17'

StephanMeijer · Apr 25, 2023 · 7ead57a · 7ead57a
2 parents c1c605a + c19ae3d
commit 7ead57a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/lib/state.js b/lib/state.js
@@ -67,6 +67,16 @@ module.exports = internals.State = class {
 
         this.mainstay.restore();
     }
+
+    commit() {
+
+        if (this.mainstay.shadow) {
+            this.mainstay.shadow.override(this.path, this._snapshot);
+            this._snapshot = undefined;
+        }
+
+        this.mainstay.commit();
+    }
 };
 
 

diff --git a/lib/types/alternatives.js b/lib/types/alternatives.js
@@ -55,6 +55,7 @@ module.exports = Any.extend({
                 const result = item.schema.$_validate(value, localState, prefs);
                 if (!result.errors) {
                     matched.push(result.value);
+                    localState.commit();
                 }
                 else {
                     failed.push(result.errors);
@@ -112,6 +113,7 @@ module.exports = Any.extend({
 
                 const result = item.schema.$_validate(value, localState, prefs);
                 if (!result.errors) {
+                    localState.commit();
                     return result;
                 }
 

diff --git a/lib/types/array.js b/lib/types/array.js
@@ -225,6 +225,7 @@ module.exports = Any.extend({
                         requiredChecks[j] = res;
 
                         if (!res.errors) {
+                            localState.commit();
                             value[i] = res.value;
                             isValid = true;
                             internals.fastSplice(requireds, j);
@@ -270,6 +271,7 @@ module.exports = Any.extend({
 
                             res = inclusion.$_validate(item, localState, prefs);
                             if (!res.errors) {
+                                localState.commit();
                                 if (inclusion._flags.result === 'strip') {
                                     internals.fastSplice(value, i);
                                     --i;

diff --git a/lib/validator.js b/lib/validator.js
@@ -215,6 +215,11 @@ internals.Mainstay = class {
         this.externals = snapshot.externals;
         this.warnings = snapshot.warnings;
     }
+
+    commit() {
+
+        this._snapshots.pop();
+    }
 };
 
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "joi",
     "description": "Object schema validation",
-    "version": "17.9.1",
+    "version": "17.9.2",
     "repository": "git://github.com/hapijs/joi",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",