swagger-client 3.27.9 → 3.28.1

package/es/resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/visitors/parameters.js

@@ -1,43 +1,40 @@
 import { toValue } from '@swagger-api/apidom-core';
-import compose from '../utils/compose.js';
 import toPath from '../utils/to-path.js';
-const ParameterMacroVisitor = compose({
-  init({
+class ParameterMacroVisitor {
+  parameterMacro;
+  options;
+  #macroOperation;
+  OperationElement = {
+    enter: operationElement => {
+      this.#macroOperation = operationElement;
+    },
+    leave: () => {
+      this.#macroOperation = undefined;
+    }
+  };
+  ParameterElement = {
+    leave: (parameterElement, key, parent, path, ancestors) => {
+      const pojoOperation = this.#macroOperation ? toValue(this.#macroOperation) : null;
+      const pojoParameter = toValue(parameterElement);
+      try {
+        const macroValue = this.parameterMacro(pojoOperation, pojoParameter);
+        parameterElement.set('default', macroValue);
+      } catch (error) {
+        var _this$options$derefer, _this$options$derefer2;
+        const macroError = new Error(error, {
+          cause: error
+        });
+        macroError.fullPath = toPath([...ancestors, parent]);
+        (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 || (_this$options$derefer = _this$options$derefer.errors) === null || _this$options$derefer === void 0 || (_this$options$derefer2 = _this$options$derefer.push) === null || _this$options$derefer2 === void 0 || _this$options$derefer2.call(_this$options$derefer, macroError);
+      }
+    }
+  };
+  constructor({
     parameterMacro,
     options
   }) {
     this.parameterMacro = parameterMacro;
     this.options = options;
-  },
-  props: {
-    parameterMacro: null,
-    options: null,
-    macroOperation: null,
-    OperationElement: {
-      enter(operationElement) {
-        this.macroOperation = operationElement;
-      },
-      leave() {
-        this.macroOperation = null;
-      }
-    },
-    ParameterElement: {
-      leave(parameterElement, key, parent, path, ancestors) {
-        const pojoOperation = this.macroOperation === null ? null : toValue(this.macroOperation);
-        const pojoParameter = toValue(parameterElement);
-        try {
-          const macroValue = this.parameterMacro(pojoOperation, pojoParameter);
-          parameterElement.set('default', macroValue);
-        } catch (error) {
-          var _this$options$derefer, _this$options$derefer2;
-          const macroError = new Error(error, {
-            cause: error
-          });
-          macroError.fullPath = toPath([...ancestors, parent]);
-          (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 || (_this$options$derefer = _this$options$derefer.errors) === null || _this$options$derefer === void 0 || (_this$options$derefer2 = _this$options$derefer.push) === null || _this$options$derefer2 === void 0 || _this$options$derefer2.call(_this$options$derefer, macroError);
-        }
-      }
-    }
   }
-});
+}
 export default ParameterMacroVisitor;

package/es/resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/visitors/properties.js

@@ -1,37 +1,34 @@
 import { isObjectElement, toValue } from '@swagger-api/apidom-core';
-import compose from '../utils/compose.js';
 import toPath from '../utils/to-path.js';
-const ModelPropertyMacroVisitor = compose({
-  init({
+class ModelPropertyMacroVisitor {
+  modelPropertyMacro;
+  options;
+  SchemaElement = {
+    leave: (schemaElement, key, parent, path, ancestors) => {
+      if (typeof schemaElement.properties === 'undefined') return;
+      if (!isObjectElement(schemaElement.properties)) return;
+      schemaElement.properties.forEach(property => {
+        if (!isObjectElement(property)) return;
+        try {
+          const macroValue = this.modelPropertyMacro(toValue(property));
+          property.set('default', macroValue);
+        } catch (error) {
+          var _this$options$derefer, _this$options$derefer2;
+          const macroError = new Error(error, {
+            cause: error
+          });
+          macroError.fullPath = [...toPath([...ancestors, parent, schemaElement]), 'properties'];
+          (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 || (_this$options$derefer = _this$options$derefer.errors) === null || _this$options$derefer === void 0 || (_this$options$derefer2 = _this$options$derefer.push) === null || _this$options$derefer2 === void 0 || _this$options$derefer2.call(_this$options$derefer, macroError);
+        }
+      });
+    }
+  };
+  constructor({
     modelPropertyMacro,
     options
   }) {
     this.modelPropertyMacro = modelPropertyMacro;
     this.options = options;
-  },
-  props: {
-    modelPropertyMacro: null,
-    options: null,
-    SchemaElement: {
-      leave(schemaElement, key, parent, path, ancestors) {
-        if (typeof schemaElement.properties === 'undefined') return;
-        if (!isObjectElement(schemaElement.properties)) return;
-        schemaElement.properties.forEach(property => {
-          if (!isObjectElement(property)) return;
-          try {
-            const macroValue = this.modelPropertyMacro(toValue(property));
-            property.set('default', macroValue);
-          } catch (error) {
-            var _this$options$derefer, _this$options$derefer2;
-            const macroError = new Error(error, {
-              cause: error
-            });
-            macroError.fullPath = [...toPath([...ancestors, parent, schemaElement]), 'properties'];
-            (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 || (_this$options$derefer = _this$options$derefer.errors) === null || _this$options$derefer === void 0 || (_this$options$derefer2 = _this$options$derefer.push) === null || _this$options$derefer2 === void 0 || _this$options$derefer2.call(_this$options$derefer, macroError);
-          }
-        });
-      }
-    }
   }
-});
+}
 export default ModelPropertyMacroVisitor;

package/es/resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/visitors/root.js

@@ -0,0 +1,45 @@
+import { mergeAllVisitors } from '@swagger-api/apidom-core';
+import { getNodeType } from '@swagger-api/apidom-ns-openapi-3-1';
+import ModelPropertyMacroVisitor from './properties.js';
+import AllOfVisitor from './all-of.js';
+import ParameterMacroVisitor from './parameters.js';
+import OpenAPI3_1SwaggerClientDereferenceVisitor from './dereference.js'; // eslint-disable-line camelcase
+
+const mergeAllVisitorsAsync = mergeAllVisitors[Symbol.for('nodejs.util.promisify.custom')];
+class RootVisitor {
+  constructor({
+    parameterMacro,
+    modelPropertyMacro,
+    mode,
+    options,
+    ...rest
+  }) {
+    const visitors = [];
+    visitors.push(new OpenAPI3_1SwaggerClientDereferenceVisitor({
+      ...rest,
+      options
+    }));
+    if (typeof modelPropertyMacro === 'function') {
+      visitors.push(new ModelPropertyMacroVisitor({
+        modelPropertyMacro,
+        options
+      }));
+    }
+    if (mode !== 'strict') {
+      visitors.push(new AllOfVisitor({
+        options
+      }));
+    }
+    if (typeof parameterMacro === 'function') {
+      visitors.push(new ParameterMacroVisitor({
+        parameterMacro,
+        options
+      }));
+    }
+    const mergedVisitor = mergeAllVisitorsAsync(visitors, {
+      nodeTypeGetter: getNodeType
+    });
+    Object.assign(this, mergedVisitor);
+  }
+}
+export default RootVisitor;

package/es/resolver/apidom/reference/parse/parsers/json/index.js

@@ -1,49 +1,50 @@
 import { from, ParseResultElement } from '@swagger-api/apidom-core';
 import { ParserError, Parser } from '@swagger-api/apidom-reference/configuration/empty';
-const JsonParser = Parser.compose({
-  props: {
-    name: 'json-swagger-client',
-    fileExtensions: ['.json'],
-    mediaTypes: ['application/json']
-  },
-  methods: {
-    async canParse(file) {
-      const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
-      const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
-      if (!hasSupportedFileExtension) return false;
-      if (hasSupportedMediaType) return true;
-      if (!hasSupportedMediaType) {
-        try {
-          JSON.parse(file.toString());
-          return true;
-        } catch (error) {
-          return false;
-        }
-      }
-      return false;
-    },
-    async parse(file) {
-      if (this.sourceMap) {
-        throw new ParserError("json-swagger-client parser plugin doesn't support sourceMaps option");
-      }
-      const parseResultElement = new ParseResultElement();
-      const source = file.toString();
-
-      // allow empty files
-      if (this.allowEmpty && source.trim() === '') {
-        return parseResultElement;
-      }
+class JSONParser extends Parser {
+  constructor(options = {}) {
+    super({
+      ...options,
+      name: 'json-swagger-client',
+      fileExtensions: ['.json'],
+      mediaTypes: ['application/json']
+    });
+  }
+  async canParse(file) {
+    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
+    const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
+    if (!hasSupportedFileExtension) return false;
+    if (hasSupportedMediaType) return true;
+    if (!hasSupportedMediaType) {
       try {
-        const element = from(JSON.parse(source));
-        element.classes.push('result');
-        parseResultElement.push(element);
-        return parseResultElement;
+        JSON.parse(file.toString());
+        return true;
       } catch (error) {
-        throw new ParserError(`Error parsing "${file.uri}"`, {
-          cause: error
-        });
+        return false;
       }
     }
+    return false;
+  }
+  async parse(file) {
+    if (this.sourceMap) {
+      throw new ParserError("json-swagger-client parser plugin doesn't support sourceMaps option");
+    }
+    const parseResultElement = new ParseResultElement();
+    const source = file.toString();
+
+    // allow empty files
+    if (this.allowEmpty && source.trim() === '') {
+      return parseResultElement;
+    }
+    try {
+      const element = from(JSON.parse(source));
+      element.classes.push('result');
+      parseResultElement.push(element);
+      return parseResultElement;
+    } catch (error) {
+      throw new ParserError(`Error parsing "${file.uri}"`, {
+        cause: error
+      });
+    }
   }
-});
-export default JsonParser;
+}
+export default JSONParser;

package/es/resolver/apidom/reference/parse/parsers/openapi-json-3-1/index.js

@@ -2,54 +2,55 @@
 import { ParseResultElement } from '@swagger-api/apidom-core';
 import { ParserError, Parser } from '@swagger-api/apidom-reference/configuration/empty';
 import { mediaTypes, OpenApi3_1Element, OpenAPIMediaTypes } from '@swagger-api/apidom-ns-openapi-3-1';
-const OpenApiJson3_1Parser = Parser.compose({
-  props: {
-    name: 'openapi-json-3-1-swagger-client',
-    fileExtensions: ['.json'],
-    mediaTypes: new OpenAPIMediaTypes(...mediaTypes.filterByFormat('generic'), ...mediaTypes.filterByFormat('json')),
-    detectionRegExp: /"openapi"\s*:\s*"(?<version_json>3\.1\.(?:[1-9]\d*|0))"/
-  },
-  methods: {
-    async canParse(file) {
-      const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
-      const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
-      if (!hasSupportedFileExtension) return false;
-      if (hasSupportedMediaType) return true;
-      if (!hasSupportedMediaType) {
-        try {
-          const source = file.toString();
-          JSON.parse(source);
-          return this.detectionRegExp.test(source);
-        } catch (error) {
-          return false;
-        }
-      }
-      return false;
-    },
-    async parse(file) {
-      if (this.sourceMap) {
-        throw new ParserError("openapi-json-3-1-swagger-client parser plugin doesn't support sourceMaps option");
-      }
-      const parseResultElement = new ParseResultElement();
-      const source = file.toString();
-
-      // allow empty files
-      if (this.allowEmpty && source.trim() === '') {
-        return parseResultElement;
-      }
+class OpenAPIJSON3_1Parser extends Parser {
+  detectionRegExp = /"openapi"\s*:\s*"(?<version_json>3\.1\.(?:[1-9]\d*|0))"/;
+  constructor(options = {}) {
+    super({
+      ...options,
+      name: 'openapi-json-3-1-swagger-client',
+      fileExtensions: ['.json'],
+      mediaTypes: new OpenAPIMediaTypes(...mediaTypes.filterByFormat('generic'), ...mediaTypes.filterByFormat('json'))
+    });
+  }
+  async canParse(file) {
+    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
+    const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
+    if (!hasSupportedFileExtension) return false;
+    if (hasSupportedMediaType) return true;
+    if (!hasSupportedMediaType) {
       try {
-        const pojo = JSON.parse(source);
-        const element = OpenApi3_1Element.refract(pojo, this.refractorOpts);
-        element.classes.push('result');
-        parseResultElement.push(element);
-        return parseResultElement;
+        const source = file.toString();
+        JSON.parse(source);
+        return this.detectionRegExp.test(source);
       } catch (error) {
-        throw new ParserError(`Error parsing "${file.uri}"`, {
-          cause: error
-        });
+        return false;
       }
     }
+    return false;
+  }
+  async parse(file) {
+    if (this.sourceMap) {
+      throw new ParserError("openapi-json-3-1-swagger-client parser plugin doesn't support sourceMaps option");
+    }
+    const parseResultElement = new ParseResultElement();
+    const source = file.toString();
+
+    // allow empty files
+    if (this.allowEmpty && source.trim() === '') {
+      return parseResultElement;
+    }
+    try {
+      const pojo = JSON.parse(source);
+      const element = OpenApi3_1Element.refract(pojo, this.refractorOpts);
+      element.classes.push('result');
+      parseResultElement.push(element);
+      return parseResultElement;
+    } catch (error) {
+      throw new ParserError(`Error parsing "${file.uri}"`, {
+        cause: error
+      });
+    }
   }
-});
-export default OpenApiJson3_1Parser;
+}
+export default OpenAPIJSON3_1Parser;
 /* eslint-enable camelcase */

package/es/resolver/apidom/reference/parse/parsers/openapi-yaml-3-1/index.js

@@ -3,54 +3,55 @@ import YAML, { JSON_SCHEMA } from 'js-yaml';
 import { ParseResultElement } from '@swagger-api/apidom-core';
 import { ParserError, Parser } from '@swagger-api/apidom-reference/configuration/empty';
 import { mediaTypes, OpenApi3_1Element, OpenAPIMediaTypes } from '@swagger-api/apidom-ns-openapi-3-1';
-const OpenApiYaml3_1Parser = Parser.compose({
-  props: {
-    name: 'openapi-yaml-3-1-swagger-client',
-    fileExtensions: ['.yaml', '.yml'],
-    mediaTypes: new OpenAPIMediaTypes(...mediaTypes.filterByFormat('generic'), ...mediaTypes.filterByFormat('yaml')),
-    detectionRegExp: /(?<YAML>^(["']?)openapi\2\s*:\s*(["']?)(?<version_yaml>3\.1\.(?:[1-9]\d*|0))\3(?:\s+|$))|(?<JSON>"openapi"\s*:\s*"(?<version_json>3\.1\.(?:[1-9]\d*|0))")/m
-  },
-  methods: {
-    async canParse(file) {
-      const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
-      const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
-      if (!hasSupportedFileExtension) return false;
-      if (hasSupportedMediaType) return true;
-      if (!hasSupportedMediaType) {
-        try {
-          const source = file.toString();
-          YAML.load(source);
-          return this.detectionRegExp.test(source);
-        } catch (error) {
-          return false;
-        }
-      }
-      return false;
-    },
-    async parse(file) {
-      if (this.sourceMap) {
-        throw new ParserError("openapi-yaml-3-1-swagger-client parser plugin doesn't support sourceMaps option");
-      }
-      const parseResultElement = new ParseResultElement();
-      const source = file.toString();
+class OpenAPIYAML31Parser extends Parser {
+  detectionRegExp = /(?<YAML>^(["']?)openapi\2\s*:\s*(["']?)(?<version_yaml>3\.1\.(?:[1-9]\d*|0))\3(?:\s+|$))|(?<JSON>"openapi"\s*:\s*"(?<version_json>3\.1\.(?:[1-9]\d*|0))")/m;
+  constructor(options = {}) {
+    super({
+      name: 'openapi-yaml-3-1-swagger-client',
+      ...options,
+      fileExtensions: ['.yaml', '.yml'],
+      mediaTypes: new OpenAPIMediaTypes(...mediaTypes.filterByFormat('generic'), ...mediaTypes.filterByFormat('yaml'))
+    });
+  }
+  async canParse(file) {
+    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
+    const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
+    if (!hasSupportedFileExtension) return false;
+    if (hasSupportedMediaType) return true;
+    if (!hasSupportedMediaType) {
       try {
-        const pojo = YAML.load(source, {
-          schema: JSON_SCHEMA
-        });
-        if (this.allowEmpty && typeof pojo === 'undefined') {
-          return parseResultElement;
-        }
-        const element = OpenApi3_1Element.refract(pojo, this.refractorOpts);
-        element.classes.push('result');
-        parseResultElement.push(element);
-        return parseResultElement;
+        const source = file.toString();
+        YAML.load(source);
+        return this.detectionRegExp.test(source);
       } catch (error) {
-        throw new ParserError(`Error parsing "${file.uri}"`, {
-          cause: error
-        });
+        return false;
+      }
+    }
+    return false;
+  }
+  async parse(file) {
+    if (this.sourceMap) {
+      throw new ParserError("openapi-yaml-3-1-swagger-client parser plugin doesn't support sourceMaps option");
+    }
+    const parseResultElement = new ParseResultElement();
+    const source = file.toString();
+    try {
+      const pojo = YAML.load(source, {
+        schema: JSON_SCHEMA
+      });
+      if (this.allowEmpty && typeof pojo === 'undefined') {
+        return parseResultElement;
       }
+      const element = OpenApi3_1Element.refract(pojo, this.refractorOpts);
+      element.classes.push('result');
+      parseResultElement.push(element);
+      return parseResultElement;
+    } catch (error) {
+      throw new ParserError(`Error parsing "${file.uri}"`, {
+        cause: error
+      });
     }
   }
-});
-export default OpenApiYaml3_1Parser;
+}
+export default OpenAPIYAML31Parser;
 /* eslint-enable camelcase */

package/es/resolver/apidom/reference/parse/parsers/yaml-1-2/index.js

@@ -1,53 +1,54 @@
 import YAML, { JSON_SCHEMA } from 'js-yaml';
 import { from, ParseResultElement } from '@swagger-api/apidom-core';
 import { ParserError, Parser } from '@swagger-api/apidom-reference/configuration/empty';
-const YamlParser = Parser.compose({
-  props: {
-    name: 'yaml-1-2-swagger-client',
-    fileExtensions: ['.yaml', '.yml'],
-    mediaTypes: ['text/yaml', 'application/yaml']
-  },
-  methods: {
-    async canParse(file) {
-      const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
-      const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
-      if (!hasSupportedFileExtension) return false;
-      if (hasSupportedMediaType) return true;
-      if (!hasSupportedMediaType) {
-        try {
-          YAML.load(file.toString(), {
-            schema: JSON_SCHEMA
-          });
-          return true;
-        } catch (error) {
-          return false;
-        }
-      }
-      return false;
-    },
-    async parse(file) {
-      if (this.sourceMap) {
-        throw new ParserError("yaml-1-2-swagger-client parser plugin doesn't support sourceMaps option");
-      }
-      const parseResultElement = new ParseResultElement();
-      const source = file.toString();
+class YAMLParser extends Parser {
+  constructor(options = {}) {
+    super({
+      ...options,
+      name: 'yaml-1-2-swagger-client',
+      fileExtensions: ['.yaml', '.yml'],
+      mediaTypes: ['text/yaml', 'application/yaml']
+    });
+  }
+  async canParse(file) {
+    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
+    const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
+    if (!hasSupportedFileExtension) return false;
+    if (hasSupportedMediaType) return true;
+    if (!hasSupportedMediaType) {
       try {
-        const pojo = YAML.load(source, {
+        YAML.load(file.toString(), {
           schema: JSON_SCHEMA
         });
-        if (this.allowEmpty && typeof pojo === 'undefined') {
-          return parseResultElement;
-        }
-        const element = from(pojo);
-        element.classes.push('result');
-        parseResultElement.push(element);
-        return parseResultElement;
+        return true;
       } catch (error) {
-        throw new ParserError(`Error parsing "${file.uri}"`, {
-          cause: error
-        });
+        return false;
+      }
+    }
+    return false;
+  }
+  async parse(file) {
+    if (this.sourceMap) {
+      throw new ParserError("yaml-1-2-swagger-client parser plugin doesn't support sourceMaps option");
+    }
+    const parseResultElement = new ParseResultElement();
+    const source = file.toString();
+    try {
+      const pojo = YAML.load(source, {
+        schema: JSON_SCHEMA
+      });
+      if (this.allowEmpty && typeof pojo === 'undefined') {
+        return parseResultElement;
       }
+      const element = from(pojo);
+      element.classes.push('result');
+      parseResultElement.push(element);
+      return parseResultElement;
+    } catch (error) {
+      throw new ParserError(`Error parsing "${file.uri}"`, {
+        cause: error
+      });
     }
   }
-});
-export default YamlParser;
+}
+export default YAMLParser;