Merge branch 'main' into feat/mutualtls-refractor

swagger-api · Feb 12, 2024 · eed8f16 · eed8f16
2 parents 049004d + e103eb4
commit eed8f16
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/packages/apidom-ns-openapi-3-0/src/refractor/toolbox.ts b/packages/apidom-ns-openapi-3-0/src/refractor/toolbox.ts
@@ -1,12 +1,39 @@
-import { createNamespace, isStringElement } from '@swagger-api/apidom-core';
+import {
+  isElement,
+  isStringElement,
+  isArrayElement,
+  isObjectElement,
+  isMemberElement,
+  createNamespace,
+  includesClasses,
+  hasElementSourceMap,
+} from '@swagger-api/apidom-core';
 
 import * as openApi3_0Predicates from '../predicates';
-import * as refractorPredicates from './predicates';
 import openApi3_0Namespace from '../namespace';
 
+export type Predicates = typeof openApi3_0Predicates & {
+  isElement: typeof isElement;
+  isStringElement: typeof isStringElement;
+  isArrayElement: typeof isArrayElement;
+  isObjectElement: typeof isObjectElement;
+  isMemberElement: typeof isMemberElement;
+  includesClasses: typeof includesClasses;
+  hasElementSourceMap: typeof hasElementSourceMap;
+};
+
 const createToolbox = () => {
   const namespace = createNamespace(openApi3_0Namespace);
-  const predicates = { ...refractorPredicates, ...openApi3_0Predicates, isStringElement };
+  const predicates: Predicates = {
+    ...openApi3_0Predicates,
+    isElement,
+    isStringElement,
+    isArrayElement,
+    isObjectElement,
+    isMemberElement,
+    includesClasses,
+    hasElementSourceMap,
+  };
 
   return { predicates, namespace };
 };

diff --git a/packages/apidom-ns-openapi-3-1/src/refractor/toolbox.ts b/packages/apidom-ns-openapi-3-1/src/refractor/toolbox.ts
@@ -6,6 +6,7 @@ import {
   isMemberElement,
   createNamespace,
   includesClasses,
+  hasElementSourceMap,
 } from '@swagger-api/apidom-core';
 import { isServersElement } from '@swagger-api/apidom-ns-openapi-3-0';
 
@@ -20,6 +21,7 @@ export type Predicates = typeof openApi3_1Predicates & {
   isMemberElement: typeof isMemberElement;
   isServersElement: typeof isServersElement;
   includesClasses: typeof includesClasses;
+  hasElementSourceMap: typeof hasElementSourceMap;
 };
 
 const createToolbox = () => {
@@ -33,6 +35,7 @@ const createToolbox = () => {
     isMemberElement,
     isServersElement,
     includesClasses,
+    hasElementSourceMap,
   };
 
   return { predicates, namespace };