feat(walker): additionalItems

stoplightio · Jan 22, 2024 · 3dd29fc · 3dd29fc
1 parent a98ecbd
commit 3dd29fc
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 9 deletions.
diff --git a/src/__tests__/__snapshots__/tree.spec.ts.snap b/src/__tests__/__snapshots__/tree.spec.ts.snap
@@ -300,31 +300,54 @@ exports[`SchemaTree output should generate valid tree for arrays/additional-empt
 "└─ #
    ├─ types
    │  └─ 0: array
-   └─ primaryType: array
+   ├─ primaryType: array
+   └─ children
+      └─ 0
+         └─ #/additionalItems
 "
 `;
 
 exports[`SchemaTree output should generate valid tree for arrays/additional-false.json 1`] = `
 "└─ #
    ├─ types
    │  └─ 0: array
-   └─ primaryType: array
+   ├─ primaryType: array
+   └─ children
+      └─ 0
+         └─ #/additionalItems
+            └─ value: false
 "
 `;
 
 exports[`SchemaTree output should generate valid tree for arrays/additional-schema.json 1`] = `
 "└─ #
    ├─ types
    │  └─ 0: array
-   └─ primaryType: array
+   ├─ primaryType: array
+   └─ children
+      └─ 0
+         └─ #/additionalItems
+            ├─ types
+            │  └─ 0: object
+            ├─ primaryType: object
+            └─ children
+               └─ 0
+                  └─ #/additionalItems/properties/baz
+                     ├─ types
+                     │  └─ 0: number
+                     └─ primaryType: number
 "
 `;
 
 exports[`SchemaTree output should generate valid tree for arrays/additional-true.json 1`] = `
 "└─ #
    ├─ types
    │  └─ 0: array
-   └─ primaryType: array
+   ├─ primaryType: array
+   └─ children
+      └─ 0
+         └─ #/additionalItems
+            └─ value: true
 "
 `;
 

diff --git a/src/walker/walker.ts b/src/walker/walker.ts
@@ -222,11 +222,20 @@ export class Walker extends EventEmitter<WalkerEmitter> {
             this.path.push('items', String(i));
             this.walk();
           }
-        } else if (isObjectLiteral(fragment.items)) {
-          this.fragment = fragment.items;
-          this.restoreInternalWalkerState(state);
-          this.path.push('items');
-          this.walk();
+        } else {
+          if (isObjectLiteral(fragment.items)) {
+            this.fragment = fragment.items;
+            this.restoreInternalWalkerState(state);
+            this.path.push('items');
+            this.walk();
+          }
+
+          if (isValidSchemaFragment(fragment.additionalItems)) {
+            this.fragment = fragment.additionalItems;
+            this.restoreInternalWalkerState(state);
+            this.path.push('additionalItems');
+            this.walk();
+          }
         }
 
         break;