@swagger-api/apidom-ns-openapi-2 0.83.0 → 0.84.0

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.84.0](https://github.com/swagger-api/apidom/compare/v0.83.0...v0.84.0) (2023-11-24)
+
+### Features
+
+- **ns-workflows-1:** add support for Info Object ([#3393](https://github.com/swagger-api/apidom/issues/3393)) ([5508c54](https://github.com/swagger-api/apidom/commit/5508c5479844c4328867f84481f56c445ec13225)), closes [#3392](https://github.com/swagger-api/apidom/issues/3392)
+- **reference:** add OpenAPI 2.0 dereference strategy ([#3435](https://github.com/swagger-api/apidom/issues/3435)) ([aa3710b](https://github.com/swagger-api/apidom/commit/aa3710be00fef5ecc177c7d9e2ae570a077e8b68)), closes [#3102](https://github.com/swagger-api/apidom/issues/3102)
+
 # [0.83.0](https://github.com/swagger-api/apidom/compare/v0.82.2...v0.83.0) (2023-11-07)
 
 **Note:** Version bump only for package @swagger-api/apidom-ns-openapi-2

package/cjs/index.cjs

@@ -3,7 +3,8 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
-exports.specificationObj = exports.refractorPluginReplaceEmptyElement = exports.refract = exports.mediaTypes = exports.keyMap = exports.isXmlElement = exports.isTagElement = exports.isSwaggerVersionElement = exports.isSwaggerExtension = exports.isSwaggerElement = exports.isStringElement = exports.isSecuritySchemeElement = exports.isSecurityRequirementElement = exports.isSecurityDefinitionsElement = exports.isScopesElement = exports.isSchemaElement = exports.isResponsesElement = exports.isResponsesDefinitionsElement = exports.isResponseElement = exports.isReferenceLikeElement = exports.isReferenceElement = exports.isRefElement = exports.isPathsElement = exports.isPathItemElement = exports.isParametersDefinitionsElement = exports.isParameterElement = exports.isOperationElement = exports.isObjectElement = exports.isNumberElement = exports.isNullElement = exports.isMemberElement = exports.isLinkPrimitiveElement = exports.isLicenseElement = exports.isJSONReferenceElement = exports.isItemsElement = exports.isInfoElement = exports.isHeadersElement = exports.isHeaderElement = exports.isExternalDocumentationElement = exports.isExampleElement = exports.isElement = exports.isDefinitionsElement = exports.isContactElement = exports.isBooleanElement = exports.isArrayElement = exports.getNodeType = exports.default = exports.createRefractor = exports.XmlElement = exports.Visitor = exports.TagElement = exports.SwaggerVersionElement = exports.SwaggerTagsElement = exports.SwaggerSecurityElement = exports.SwaggerSchemesElement = exports.SwaggerProducesElement = exports.SwaggerElement = exports.SwaggerConsumesElement = exports.SpecificationVisitor = exports.SecuritySchemeElement = exports.SecurityRequirementElement = exports.SecurityDefinitionsElement = exports.ScopesElement = exports.SchemaElement = exports.ResponsesElement = exports.ResponsesDefinitionsElement = exports.ResponseElement = exports.ReferenceElement = exports.PatternedFieldsVisitor = exports.PathsElement = exports.PathItemParametersElement = exports.PathItemElement = exports.ParametersDefinitionsElement = exports.ParameterElement = exports.OperationTagsElement = exports.OperationSecurityElement = exports.OperationSchemesElement = exports.OperationProducesElement = exports.OperationParametersElement = exports.OperationElement = exports.OperationConsumesElement = exports.OpenAPIMediaTypes = exports.MixedFieldsVisitor = exports.MapVisitor = exports.LicenseElement = exports.JSONReferenceElement = exports.ItemsElement = exports.InfoElement = exports.HeadersElement = exports.HeaderElement = exports.FixedFieldsVisitor = exports.FallbackVisitor = exports.ExternalDocumentationElement = exports.ExampleElement = exports.DefinitionsElement = exports.ContactElement = exports.AlternatingVisitor = void 0;
+exports.refractorPluginReplaceEmptyElement = exports.refract = exports.mediaTypes = exports.keyMap = exports.isXmlElement = exports.isTagElement = exports.isSwaggerVersionElement = exports.isSwaggerExtension = exports.isSwaggerElement = exports.isStringElement = exports.isSecuritySchemeElement = exports.isSecurityRequirementElement = exports.isSecurityDefinitionsElement = exports.isScopesElement = exports.isSchemaElement = exports.isResponsesElement = exports.isResponsesDefinitionsElement = exports.isResponseElement = exports.isReferenceLikeElement = exports.isReferenceElementExternal = exports.isReferenceElement = exports.isRefElement = exports.isPathsElement = exports.isPathItemElementExternal = exports.isPathItemElement = exports.isParametersDefinitionsElement = exports.isParameterElement = exports.isOperationElement = exports.isObjectElement = exports.isNumberElement = exports.isNullElement = exports.isMemberElement = exports.isLinkPrimitiveElement = exports.isLicenseElement = exports.isJSONReferenceLikeElement = exports.isJSONReferenceElementExternal = exports.isJSONReferenceElement = exports.isItemsElement = exports.isInfoElement = exports.isHeadersElement = exports.isHeaderElement = exports.isExternalDocumentationElement = exports.isExampleElement = exports.isElement = exports.isDefinitionsElement = exports.isContactElement = exports.isBooleanElement = exports.isArrayElement = exports.getNodeType = exports.default = exports.createRefractor = exports.XmlElement = exports.Visitor = exports.TagElement = exports.SwaggerVersionElement = exports.SwaggerTagsElement = exports.SwaggerSecurityElement = exports.SwaggerSchemesElement = exports.SwaggerProducesElement = exports.SwaggerElement = exports.SwaggerConsumesElement = exports.SpecificationVisitor = exports.SecuritySchemeElement = exports.SecurityRequirementElement = exports.SecurityDefinitionsElement = exports.ScopesElement = exports.SchemaElement = exports.ResponsesElement = exports.ResponsesDefinitionsElement = exports.ResponseElement = exports.ReferenceElement = exports.PatternedFieldsVisitor = exports.PathsElement = exports.PathItemParametersElement = exports.PathItemElement = exports.ParametersDefinitionsElement = exports.ParameterElement = exports.OperationTagsElement = exports.OperationSecurityElement = exports.OperationSchemesElement = exports.OperationProducesElement = exports.OperationParametersElement = exports.OperationElement = exports.OperationConsumesElement = exports.OpenAPIMediaTypes = exports.MixedFieldsVisitor = exports.MapVisitor = exports.LicenseElement = exports.JSONReferenceElement = exports.ItemsElement = exports.InfoElement = exports.HeadersElement = exports.HeaderElement = exports.FixedFieldsVisitor = exports.FallbackVisitor = exports.ExternalDocumentationElement = exports.ExampleElement = exports.DefinitionsElement = exports.ContactElement = exports.AlternatingVisitor = void 0;
+exports.specificationObj = void 0;
 var _apidomCore = require("@swagger-api/apidom-core");
 exports.isRefElement = _apidomCore.isRefElement;
 exports.isLinkPrimitiveElement = _apidomCore.isLinkElement;
@@ -17,6 +18,7 @@ exports.isNumberElement = _apidomCore.isNumberElement;
 exports.isStringElement = _apidomCore.isStringElement;
 var _apidomNsJsonSchemaDraft = require("@swagger-api/apidom-ns-json-schema-draft-4");
 exports.isJSONReferenceElement = _apidomNsJsonSchemaDraft.isJSONReferenceElement;
+exports.isJSONReferenceLikeElement = _apidomNsJsonSchemaDraft.isJSONReferenceLikeElement;
 exports.JSONReferenceElement = _apidomNsJsonSchemaDraft.JSONReferenceElement;
 var _mediaTypes = _interopRequireWildcard(require("./media-types.cjs"));
 exports.mediaTypes = _mediaTypes.default;
@@ -38,6 +40,7 @@ exports.isContactElement = _predicates.isContactElement;
 exports.isLicenseElement = _predicates.isLicenseElement;
 exports.isPathsElement = _predicates.isPathsElement;
 exports.isPathItemElement = _predicates.isPathItemElement;
+exports.isPathItemElementExternal = _predicates.isPathItemElementExternal;
 exports.isOperationElement = _predicates.isOperationElement;
 exports.isExternalDocumentationElement = _predicates.isExternalDocumentationElement;
 exports.isParameterElement = _predicates.isParameterElement;
@@ -49,7 +52,9 @@ exports.isExampleElement = _predicates.isExampleElement;
 exports.isHeaderElement = _predicates.isHeaderElement;
 exports.isTagElement = _predicates.isTagElement;
 exports.isReferenceElement = _predicates.isReferenceElement;
+exports.isReferenceElementExternal = _predicates.isReferenceElementExternal;
 exports.isSchemaElement = _predicates.isSchemaElement;
+exports.isJSONReferenceElementExternal = _predicates.isJSONReferenceElementExternal;
 exports.isXmlElement = _predicates.isXmlElement;
 exports.isDefinitionsElement = _predicates.isDefinitionsElement;
 exports.isParametersDefinitionsElement = _predicates.isParametersDefinitionsElement;

package/cjs/predicates.cjs

@@ -2,8 +2,9 @@
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
-exports.isXmlElement = exports.isTagElement = exports.isSwaggerVersionElement = exports.isSwaggerElement = exports.isSecuritySchemeElement = exports.isSecurityRequirementElement = exports.isSecurityDefinitionsElement = exports.isScopesElement = exports.isSchemaElement = exports.isResponsesElement = exports.isResponsesDefinitionsElement = exports.isResponseElement = exports.isReferenceElement = exports.isPathsElement = exports.isPathItemElement = exports.isParametersDefinitionsElement = exports.isParameterElement = exports.isOperationElement = exports.isLicenseElement = exports.isItemsElement = exports.isInfoElement = exports.isHeadersElement = exports.isHeaderElement = exports.isExternalDocumentationElement = exports.isExampleElement = exports.isDefinitionsElement = exports.isContactElement = void 0;
+exports.isXmlElement = exports.isTagElement = exports.isSwaggerVersionElement = exports.isSwaggerElement = exports.isSecuritySchemeElement = exports.isSecurityRequirementElement = exports.isSecurityDefinitionsElement = exports.isScopesElement = exports.isSchemaElement = exports.isResponsesElement = exports.isResponsesDefinitionsElement = exports.isResponseElement = exports.isReferenceElementExternal = exports.isReferenceElement = exports.isPathsElement = exports.isPathItemElementExternal = exports.isPathItemElement = exports.isParametersDefinitionsElement = exports.isParameterElement = exports.isOperationElement = exports.isLicenseElement = exports.isJSONReferenceElementExternal = exports.isItemsElement = exports.isInfoElement = exports.isHeadersElement = exports.isHeaderElement = exports.isExternalDocumentationElement = exports.isExampleElement = exports.isDefinitionsElement = exports.isContactElement = void 0;
 var _apidomCore = require("@swagger-api/apidom-core");
+var _apidomNsJsonSchemaDraft = require("@swagger-api/apidom-ns-json-schema-draft-4");
 var _Swagger = _interopRequireDefault(require("./elements/Swagger.cjs"));
 var _SwaggerVersion = _interopRequireDefault(require("./elements/SwaggerVersion.cjs"));
 var _Info = _interopRequireDefault(require("./elements/Info.cjs"));
@@ -80,6 +81,17 @@ const isPathItemElement = exports.isPathItemElement = (0, _apidomCore.createPred
 }) => {
   return element => element instanceof _PathItem.default || hasBasicElementProps(element) && isElementType('pathItem', element) && primitiveEq('object', element);
 });
+const isPathItemElementExternal = element => {
+  if (!isPathItemElement(element)) {
+    return false;
+  }
+  if (!(0, _apidomCore.isStringElement)(element.$ref)) {
+    return false;
+  }
+  const value = (0, _apidomCore.toValue)(element.$ref);
+  return typeof value === 'string' && value.length > 0 && !value.startsWith('#');
+};
+exports.isPathItemElementExternal = isPathItemElementExternal;
 const isOperationElement = exports.isOperationElement = (0, _apidomCore.createPredicate)(({
   hasBasicElementProps,
   isElementType,
@@ -157,6 +169,17 @@ const isReferenceElement = exports.isReferenceElement = (0, _apidomCore.createPr
 }) => {
   return element => element instanceof _Reference.default || hasBasicElementProps(element) && isElementType('reference', element) && primitiveEq('object', element);
 });
+const isReferenceElementExternal = element => {
+  if (!isReferenceElement(element)) {
+    return false;
+  }
+  if (!(0, _apidomCore.isStringElement)(element.$ref)) {
+    return false;
+  }
+  const value = (0, _apidomCore.toValue)(element.$ref);
+  return typeof value === 'string' && value.length > 0 && !value.startsWith('#');
+};
+exports.isReferenceElementExternal = isReferenceElementExternal;
 const isSchemaElement = exports.isSchemaElement = (0, _apidomCore.createPredicate)(({
   hasBasicElementProps,
   isElementType,
@@ -164,6 +187,17 @@ const isSchemaElement = exports.isSchemaElement = (0, _apidomCore.createPredicat
 }) => {
   return element => element instanceof _Schema.default || hasBasicElementProps(element) && isElementType('schema', element) && primitiveEq('object', element);
 });
+const isJSONReferenceElementExternal = element => {
+  if (!(0, _apidomNsJsonSchemaDraft.isJSONReferenceElement)(element)) {
+    return false;
+  }
+  if (!(0, _apidomCore.isStringElement)(element.$ref)) {
+    return false;
+  }
+  const value = (0, _apidomCore.toValue)(element.$ref);
+  return typeof value === 'string' && value.length > 0 && !value.startsWith('#');
+};
+exports.isJSONReferenceElementExternal = isJSONReferenceElementExternal;
 const isXmlElement = exports.isXmlElement = (0, _apidomCore.createPredicate)(({
   hasBasicElementProps,
   isElementType,

package/cjs/refractor/plugins/replace-empty-element.cjs

@@ -327,39 +327,28 @@ const findElementFactory = (ancestor, keyName) => {
   const keyMapping = schema[elementType] || schema[(0, _apidomCore.toValue)(ancestor.classes.first)];
   return typeof keyMapping === 'undefined' ? undefined : Object.prototype.hasOwnProperty.call(keyMapping, '[key: *]') ? keyMapping['[key: *]'] : keyMapping[keyName];
 };
-const plugin = () => () => {
-  return {
-    visitor: {
-      MemberElement(element, ...rest) {
-        // no empty Element, continue with next one
-        if (!isEmptyElement(element.value)) return undefined;
-        const [,,, ancestors] = rest;
-        const ancestor = ancestors[ancestors.length - 1]; // @TODO(vladimir.gorej@gmail.com): can be replaced by Array.prototype.at in future
-        const elementFactory = findElementFactory(ancestor, (0, _apidomCore.toValue)(element.key));
-
-        // no element factory found
-        if (typeof elementFactory === 'undefined') return undefined;
-        const originalValue = element.value;
-        return new _apidomCore.MemberElement(element.key, elementFactory.call({
-          context: ancestor
-        }, undefined, (0, _apidomCore.cloneDeep)(originalValue.meta), (0, _apidomCore.cloneDeep)(originalValue.attributes)), (0, _apidomCore.cloneDeep)(element.meta), (0, _apidomCore.cloneDeep)(element.attributes));
-      },
-      StringElement(element, ...rest) {
-        if (!isEmptyElement(element)) return undefined;
-        const [,,, ancestors] = rest;
-        const ancestor = ancestors[ancestors.length - 1]; // @TODO(vladimir.gorej@gmail.com): can be replaced by Array.prototype.at in future
-
-        // we're only interested in empty elements in ArrayElements
-        if (!(0, _apidomCore.isArrayElement)(ancestor)) return undefined;
-        const elementFactory = findElementFactory(ancestor, '<*>');
-
-        // no element factory found
-        if (typeof elementFactory === 'undefined') return undefined;
-        return elementFactory.call({
-          context: element
-        }, undefined, (0, _apidomCore.cloneDeep)(element.meta), (0, _apidomCore.cloneDeep)(element.attributes));
+const plugin = () => () => ({
+  visitor: {
+    StringElement(element, key, parent, path, ancestors) {
+      if (!isEmptyElement(element)) return undefined;
+      const lineage = [...ancestors, parent].filter(_apidomCore.isElement);
+      const parentElement = lineage[lineage.length - 1]; // @TODO(vladimir.gorej@gmail.com): can be replaced by Array.prototype.at in future
+      let elementFactory;
+      let context;
+      if ((0, _apidomCore.isArrayElement)(parentElement)) {
+        context = element;
+        elementFactory = findElementFactory(parentElement, '<*>');
+      } else if ((0, _apidomCore.isMemberElement)(parentElement)) {
+        context = lineage[lineage.length - 2]; // @TODO(vladimir.gorej@gmail.com): can be replaced by Array.prototype.at in future
+        elementFactory = findElementFactory(context, (0, _apidomCore.toValue)(parentElement.key));
       }
+
+      // no element factory found
+      if (typeof elementFactory !== 'function') return undefined;
+      return elementFactory.call({
+        context
+      }, undefined, (0, _apidomCore.cloneDeep)(element.meta), (0, _apidomCore.cloneDeep)(element.attributes));
     }
-  };
-};
+  }
+});
 var _default = exports.default = plugin;

package/cjs/refractor/visitors/SpecificationVisitor.cjs

@@ -15,22 +15,14 @@ var _visitor = require("../../traversal/visitor.cjs");
  */
 const SpecificationVisitor = (0, _stampit.default)(_Visitor.default, {
   props: {
-    passingOptionsNames: ['specObj', 'openApiGenericElement', 'openApiSemanticElement'],
     specObj: null,
-    openApiGenericElement: null,
-    openApiSemanticElement: null
+    passingOptionsNames: ['specObj']
   },
   init({
-    // @ts-ignore
-    specObj = this.specObj,
-    // @ts-ignore
-    openApiGenericElement = this.openApiGenericElement,
-    // @ts-ignore
-    openApiSemanticElement = this.openApiSemanticElement
+    // @ts-ignoreh
+    specObj = this.specObj
   }) {
     this.specObj = specObj;
-    this.openApiGenericElement = openApiGenericElement;
-    this.openApiSemanticElement = openApiSemanticElement;
   },
   methods: {
     retrievePassingOptions() {

package/cjs/refractor/visitors/Visitor.cjs

@@ -9,7 +9,6 @@ const Visitor = (0, _stampit.default)({
   props: {
     element: null
   },
-  // @ts-ignore
   methods: {
     copyMetaAndAttributes(from, to) {
       // copy sourcemaps