@swagger-api/apidom-ns-openapi-3-1 0.82.2 → 0.84.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 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 JSONSchema Object ([#3445](https://github.com/swagger-api/apidom/issues/3445)) ([5b504e5](https://github.com/swagger-api/apidom/commit/5b504e523c532a31aaf1b133a14ff3b76c126435)), closes [#3392](https://github.com/swagger-api/apidom/issues/3392)
+
+# [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-3-1
+
 ## [0.82.2](https://github.com/swagger-api/apidom/compare/v0.82.1...v0.82.2) (2023-11-03)
 
 ### Bug Fixes

package/cjs/elements/Schema.cjs

@@ -465,6 +465,10 @@ class Schema extends _apidomCore.ObjectElement {
   get example() {
     return this.get('example');
   }
+
+  /**
+   * @deprecated The example property has been deprecated in favor of the JSON Schema examples keyword. Use of example is discouraged, and later versions of this specification may remove it.
+   */
   set example(example) {
     this.set('example', example);
   }

package/cjs/index.cjs

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
 exports.isPathItemElement = exports.isParameterLikeElement = exports.isParameterElement = exports.isOperationElement = exports.isOpenapiElement = exports.isOpenApiExtension = exports.isOpenApi3_1LikeElement = exports.isOpenApi3_1Element = exports.isObjectElement = exports.isNumberElement = exports.isNullElement = exports.isMemberElement = exports.isMediaTypeElement = exports.isLinkPrimitiveElement = exports.isLinkElementExternal = exports.isLinkElement = exports.isLicenseElement = exports.isJsonSchemaDialectElement = exports.isInfoElement = exports.isExternalDocumentationElement = exports.isExampleElement = exports.isElement = exports.isContactElement = exports.isComponentsElement = exports.isCallbackElement = exports.isBooleanJsonSchemaElement = exports.isBooleanElement = exports.isArrayElement = exports.getNodeType = exports.default = exports.createToolbox = exports.XmlElement = exports.WebhooksElement = exports.TagsElement = exports.TagElement = exports.ServersElement = exports.ServerVariablesElement = exports.ServerVariableElement = exports.ServerElement = exports.SecuritySchemeElement = exports.SecurityRequirementElement = exports.SecurityElement = exports.SchemaElement = exports.ResponsesElement = exports.ResponseLinksElement = exports.ResponseHeadersElement = exports.ResponseElement = exports.ResponseContentElement = exports.RequestBodyElement = exports.RequestBodyContentElement = exports.ReferenceElement = exports.PathsElement = exports.PathItemServersElement = exports.PathItemParametersElement = exports.PathItemElement = exports.ParameterExamplesElement = exports.ParameterElement = exports.ParameterContentElement = exports.OperationTagsElement = exports.OperationServersElement = exports.OperationSecurityElement = exports.OperationParametersElement = exports.OperationElement = exports.OperationCallbacksElement = exports.OpenapiElement = exports.OpenApi3_1Element = exports.OpenAPIMediaTypes = exports.OAuthFlowsElement = exports.OAuthFlowScopesElement = exports.OAuthFlowElement = exports.MediaTypeExamplesElement = exports.MediaTypeEncodingElement = exports.MediaTypeElement = exports.LinkParametersElement = exports.LinkElement = exports.LicenseElement = exports.JsonSchemaDialectElement = exports.InfoElement = exports.HeaderExamplesElement = exports.HeaderElement = exports.HeaderContentElement = exports.ExternalDocumentationElement = exports.ExampleElement = exports.EncodingHeadersElement = exports.EncodingElement = exports.DiscriminatorMappingElement = exports.DiscriminatorElement = exports.ContactElement = exports.ComponentsSecuritySchemesElement = exports.ComponentsSchemasElement = exports.ComponentsResponsesElement = exports.ComponentsRequestBodiesElement = exports.ComponentsPathItemsElement = exports.ComponentsParametersElement = exports.ComponentsLinksElement = exports.ComponentsHeadersElement = exports.ComponentsExamplesElement = exports.ComponentsElement = exports.ComponentsCallbacksElement = exports.CallbackElement = void 0;
-exports.refractorPluginReplaceEmptyElement = exports.refractorPluginNormalizeServers = exports.refractorPluginNormalizeSecurityRequirements = exports.refractorPluginNormalizeParameters = exports.refractorPluginNormalizeParameterExamples = exports.refractorPluginNormalizeOperationIds = exports.refractorPluginNormalizeHeaderExamples = exports.mediaTypes = exports.keyMap = exports.isStringElement = exports.isServersElement = exports.isServerVariableElement = exports.isServerLikeElement = exports.isServerElement = exports.isSecurityRequirementElement = exports.isSchemaElement = exports.isResponsesElement = exports.isResponseLikeElement = exports.isResponseElement = exports.isRequestBodyElement = exports.isReferenceLikeElement = exports.isReferenceElementExternal = exports.isReferenceElement = exports.isRefElement = exports.isPathsElement = exports.isPathItemElementExternal = void 0;
+exports.specificationObj = exports.refractorPluginReplaceEmptyElement = exports.refractorPluginNormalizeServers = exports.refractorPluginNormalizeSecurityRequirements = exports.refractorPluginNormalizeParameters = exports.refractorPluginNormalizeParameterExamples = exports.refractorPluginNormalizeOperationIds = exports.refractorPluginNormalizeHeaderExamples = exports.mediaTypes = exports.keyMap = exports.isStringElement = exports.isServersElement = exports.isServerVariableElement = exports.isServerLikeElement = exports.isServerElement = exports.isSecurityRequirementElement = exports.isSchemaElement = exports.isResponsesElement = exports.isResponseLikeElement = exports.isResponseElement = exports.isRequestBodyElement = exports.isReferenceLikeElement = exports.isReferenceElementExternal = exports.isReferenceElement = exports.isRefElement = exports.isPathsElement = exports.isPathItemElementExternal = void 0;
 var _apidomCore = require("@swagger-api/apidom-core");
 exports.isRefElement = _apidomCore.isRefElement;
 exports.isLinkPrimitiveElement = _apidomCore.isLinkElement;
@@ -37,6 +37,8 @@ var _normalizeHeaderExamples = _interopRequireDefault(require("./refractor/plugi
 exports.refractorPluginNormalizeHeaderExamples = _normalizeHeaderExamples.default;
 var _toolbox = _interopRequireDefault(require("./refractor/toolbox.cjs"));
 exports.createToolbox = _toolbox.default;
+var _specification = _interopRequireDefault(require("./refractor/specification.cjs"));
+exports.specificationObj = _specification.default;
 var _predicates = require("./predicates.cjs");
 exports.isCallbackElement = _predicates.isCallbackElement;
 exports.isComponentsElement = _predicates.isComponentsElement;

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

@@ -635,33 +635,24 @@ const plugin = () => ({
   const isEmptyElement = element => predicates.isStringElement(element) && predicates.includesClasses(['yaml-e-node', 'yaml-e-scalar'], element);
   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) {
+      StringElement(element, key, parent, path, ancestors) {
         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 (!predicates.isArrayElement(ancestor)) return undefined;
-        const elementFactory = findElementFactory(ancestor, '<*>');
+        const lineage = [...ancestors, parent].filter(predicates.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 (predicates.isArrayElement(parentElement)) {
+          context = element;
+          elementFactory = findElementFactory(parentElement, '<*>');
+        } else if (predicates.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 === 'undefined') return undefined;
+        if (typeof elementFactory !== 'function') return undefined;
         return elementFactory.call({
-          context: element
+          context
         }, undefined, (0, _apidomCore.cloneDeep)(element.meta), (0, _apidomCore.cloneDeep)(element.attributes));
       }
     }

package/cjs/refractor/toolbox.cjs

@@ -12,9 +12,11 @@ const createToolbox = () => {
   const namespace = (0, _apidomCore.createNamespace)(_namespace.default);
   const predicates = {
     ...openApi3_1Predicates,
+    isElement: _apidomCore.isElement,
     isStringElement: _apidomCore.isStringElement,
     isArrayElement: _apidomCore.isArrayElement,
     isObjectElement: _apidomCore.isObjectElement,
+    isMemberElement: _apidomCore.isMemberElement,
     isServersElement: _apidomNsOpenapi.isServersElement,
     includesClasses: _apidomCore.includesClasses
   };

package/cjs/refractor/visitors/open-api-3-1/WebhooksVisitor.cjs

@@ -11,7 +11,6 @@ var _predicates = require("../../../predicates.cjs");
 const WebhooksVisitor = (0, _stampit.default)(_apidomNsOpenapi.MapVisitor, _apidomNsOpenapi.FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return (0, _apidomNsOpenapi.isReferenceLikeElement)(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'PathItem'];
     }
   },

package/cjs/refractor/visitors/open-api-3-1/components/PathItemsVisitor.cjs

@@ -10,7 +10,6 @@ var _predicates = require("../../../../predicates.cjs");
 const PathItemsVisitor = (0, _stampit.default)(_apidomNsOpenapi.MapVisitor, _apidomNsOpenapi.FallbackVisitor, {
   props: {
     specPath: element => {
-      // eslint-disable-next-line no-nested-ternary
       return (0, _apidomNsOpenapi.isReferenceLikeElement)(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'PathItem'];
     }
   },

package/cjs/refractor/visitors/open-api-3-1/schema/index.cjs

@@ -15,10 +15,13 @@ var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAw
 const SchemaVisitor = (0, _stampit.default)(_apidomNsOpenapi.FixedFieldsVisitor, _ParentSchemaAwareVisitor.default, _apidomNsOpenapi.FallbackVisitor, {
   props: {
     specPath: (0, _ramda.always)(['document', 'objects', 'Schema']),
-    canSupportSpecificationExtensions: true
+    canSupportSpecificationExtensions: true,
+    jsonSchemaDefaultDialect: _JsonSchemaDialect.default.default
   },
   // @ts-ignore
   init() {
+    this.element = new _Schema.default();
+
     /**
      * Private Api.
      */
@@ -35,7 +38,7 @@ const SchemaVisitor = (0, _stampit.default)(_apidomNsOpenapi.FixedFieldsVisitor,
       } else if (this.openApiGenericElement !== null && (0, _apidomCore.isStringElement)(this.openApiGenericElement.get('jsonSchemaDialect'))) {
         jsonSchemaDialect = (0, _apidomCore.toValue)(this.openApiGenericElement.get('jsonSchemaDialect'));
       } else {
-        jsonSchemaDialect = (0, _apidomCore.toValue)(_JsonSchemaDialect.default.default);
+        jsonSchemaDialect = (0, _apidomCore.toValue)(this.jsonSchemaDefaultDialect);
       }
       return jsonSchemaDialect;
     };
@@ -57,7 +60,7 @@ const SchemaVisitor = (0, _stampit.default)(_apidomNsOpenapi.FixedFieldsVisitor,
       // get current $id keyword
       const $id = (0, _apidomCore.toValue)(objectElement.get('$id'));
 
-      // remember $id keyword if it's a non empty strings
+      // remember $id keyword if it's a non-empty strings
       if ((0, _ramdaAdjunct.isNonEmptyString)($id)) {
         inherited$id.push($id);
       }
@@ -69,7 +72,6 @@ const SchemaVisitor = (0, _stampit.default)(_apidomNsOpenapi.FixedFieldsVisitor,
      */
     // eslint-disable-next-line @typescript-eslint/naming-convention
     this.ObjectElement = function _ObjectElement(objectElement) {
-      this.element = new _Schema.default();
       handle$schema(objectElement);
       handle$id(objectElement);