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

package/es/index.mjs

@@ -1,5 +1,5 @@
 export { isRefElement, isLinkElement as isLinkPrimitiveElement, isMemberElement, isObjectElement, isArrayElement, isBooleanElement, isNullElement, isElement, isNumberElement, isStringElement } from '@swagger-api/apidom-core';
-export { isJSONReferenceElement, JSONReferenceElement } from '@swagger-api/apidom-ns-json-schema-draft-4';
+export { isJSONReferenceElement, isJSONReferenceLikeElement, JSONReferenceElement } from '@swagger-api/apidom-ns-json-schema-draft-4';
 export { default as mediaTypes, OpenAPIMediaTypes } from "./media-types.mjs"; // eslint-disable-next-line no-restricted-exports
 export { default } from "./namespace.mjs";
 export { default as refractorPluginReplaceEmptyElement } from "./refractor/plugins/replace-empty-element.mjs";

package/es/refractor/plugins/replace-empty-element.mjs

@@ -1,4 +1,4 @@
-import { MemberElement, ArrayElement, ObjectElement, isStringElement, includesClasses, isArrayElement, cloneDeep, toValue } from '@swagger-api/apidom-core';
+import { ArrayElement, ObjectElement, isStringElement, isElement, isMemberElement, isArrayElement, includesClasses, cloneDeep, toValue } from '@swagger-api/apidom-core';
 
 /**
  * OpenAPI 2.0 specification elements.
@@ -319,39 +319,28 @@ const findElementFactory = (ancestor, keyName) => {
   const keyMapping = schema[elementType] || schema[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, toValue(element.key));
-
-        // no element factory found
-        if (typeof elementFactory === 'undefined') return undefined;
-        const originalValue = element.value;
-        return new MemberElement(element.key, elementFactory.call({
-          context: ancestor
-        }, undefined, cloneDeep(originalValue.meta), cloneDeep(originalValue.attributes)), cloneDeep(element.meta), 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 (!isArrayElement(ancestor)) return undefined;
-        const elementFactory = findElementFactory(ancestor, '<*>');
-
-        // no element factory found
-        if (typeof elementFactory === 'undefined') return undefined;
-        return elementFactory.call({
-          context: element
-        }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
+const plugin = () => () => ({
+  visitor: {
+    StringElement(element, key, parent, path, ancestors) {
+      if (!isEmptyElement(element)) return undefined;
+      const lineage = [...ancestors, parent].filter(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 (isArrayElement(parentElement)) {
+        context = element;
+        elementFactory = findElementFactory(parentElement, '<*>');
+      } else if (isMemberElement(parentElement)) {
+        context = lineage[lineage.length - 2]; // @TODO(vladimir.gorej@gmail.com): can be replaced by Array.prototype.at in future
+        elementFactory = findElementFactory(context, toValue(parentElement.key));
       }
+
+      // no element factory found
+      if (typeof elementFactory !== 'function') return undefined;
+      return elementFactory.call({
+        context
+      }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
     }
-  };
-};
+  }
+});
 export default plugin;

package/es/refractor/visitors/SpecificationVisitor.mjs

@@ -10,22 +10,14 @@ import { keyMap, getNodeType } from "../../traversal/visitor.mjs";
  */
 const SpecificationVisitor = stampit(Visitor, {
   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/es/refractor/visitors/Visitor.mjs

@@ -4,7 +4,6 @@ const Visitor = stampit({
   props: {
     element: null
   },
-  // @ts-ignore
   methods: {
     copyMetaAndAttributes(from, to) {
       // copy sourcemaps

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-ns-openapi-2",
-  "version": "0.83.0",
+  "version": "0.85.0",
   "description": "OpenAPI 2.0 namespace for ApiDOM.",
   "publishConfig": {
     "access": "public",
@@ -42,11 +42,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-core": "^0.83.0",
-    "@swagger-api/apidom-error": "^0.83.0",
-    "@swagger-api/apidom-ns-json-schema-draft-4": "^0.83.0",
+    "@swagger-api/apidom-core": "^0.85.0",
+    "@swagger-api/apidom-error": "^0.85.0",
+    "@swagger-api/apidom-ns-json-schema-draft-4": "^0.85.0",
     "@types/ramda": "~0.29.6",
-    "ramda": "~0.29.0",
+    "ramda": "~0.29.1",
     "ramda-adjunct": "^4.1.1",
     "stampit": "^4.3.2"
   },
@@ -60,5 +60,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "4f5563541b7973162e0d5096966d56dbad4c706c"
+  "gitHead": "beedab14f203c2b029ff83d4c6532669b0783aa1"
 }

package/types/dist.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="@swagger-api/apidom-core/types/minim" />
 import * as _swagger_api_apidom_core from '@swagger-api/apidom-core';
-import { MediaTypes, NamespacePluginOptions, MemberElement, StringElement, Element, Meta, Attributes, ObjectElement, ArrayElement, BooleanElement, NumberElement } from '@swagger-api/apidom-core';
+import { MediaTypes, NamespacePluginOptions, StringElement, Element, Meta, Attributes, ObjectElement, ArrayElement, BooleanElement, NumberElement, MemberElement } from '@swagger-api/apidom-core';
 export { isArrayElement, isBooleanElement, isElement, isLinkElement as isLinkPrimitiveElement, isMemberElement, isNullElement, isNumberElement, isObjectElement, isRefElement, isStringElement } from '@swagger-api/apidom-core';
 import { JSONSchemaElement, JSONReferenceElement, MediaElement } from '@swagger-api/apidom-ns-json-schema-draft-4';
-export { JSONReferenceElement, isJSONReferenceElement } from '@swagger-api/apidom-ns-json-schema-draft-4';
+export { JSONReferenceElement, isJSONReferenceElement, isJSONReferenceLikeElement } from '@swagger-api/apidom-ns-json-schema-draft-4';
 import * as minim from 'minim';
 import * as stampit from 'stampit';
 import stampit__default from 'stampit';
@@ -22,8 +22,7 @@ declare const openApi2: {
 
 declare const plugin: () => () => {
     visitor: {
-        MemberElement(element: MemberElement, ...rest: any): MemberElement | undefined;
-        StringElement(element: StringElement, ...rest: any): any;
+        StringElement(element: StringElement, key: any, parent: any, path: any, ancestors: any[]): any;
     };
 };