@speclynx/apidom-ns-openapi-3-1 2.13.0 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speclynx/apidom-ns-openapi-3-1",
-  "version": "2.13.0",
+  "version": "3.0.0",
   "description": "OpenAPI 3.1.x namespace for ApiDOM.",
   "publishConfig": {
     "access": "public",
@@ -46,12 +46,12 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.28.4",
-    "@speclynx/apidom-core": "2.13.0",
-    "@speclynx/apidom-datamodel": "2.13.0",
-    "@speclynx/apidom-json-pointer": "2.13.0",
-    "@speclynx/apidom-ns-json-schema-2020-12": "2.13.0",
-    "@speclynx/apidom-ns-openapi-3-0": "2.13.0",
-    "@speclynx/apidom-traverse": "2.13.0",
+    "@speclynx/apidom-core": "3.0.0",
+    "@speclynx/apidom-datamodel": "3.0.0",
+    "@speclynx/apidom-json-pointer": "3.0.0",
+    "@speclynx/apidom-ns-json-schema-2020-12": "3.0.0",
+    "@speclynx/apidom-ns-openapi-3-0": "3.0.0",
+    "@speclynx/apidom-traverse": "3.0.0",
     "ramda": "~0.32.0",
     "ramda-adjunct": "^6.0.0",
     "ts-mixer": "^6.0.4"
@@ -66,5 +66,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "3c92eda7e227426c3a40c918c418c14dc20fca7e"
+  "gitHead": "cb94ec84ea789d121801065876e7a91799a363d0"
 }

package/src/refractor/index.cjs

@@ -23,7 +23,8 @@ var _toolbox = _interopRequireDefault(require("./toolbox.cjs"));
 const refract = (value, {
   element = 'openApi3_1',
   plugins = [],
-  specificationObj = _specification.default
+  specificationObj = _specification.default,
+  consume = false
 } = {}) => {
   const genericElement = (0, _apidomDatamodel.refract)(value);
   const resolvedSpec = (0, _apidomCore.resolveSpecification)(specificationObj);
@@ -40,7 +41,8 @@ const refract = (value, {
    */
   const RootVisitorClass = (0, _ramda.path)(specPath, resolvedSpec);
   const rootVisitor = new RootVisitorClass({
-    specObj: resolvedSpec
+    specObj: resolvedSpec,
+    consume
   });
   (0, _apidomTraverse.traverse)(genericElement, rootVisitor, {
     nodeTypeGetter: _apidomTraverse.getNodePrimitiveType

package/src/refractor/index.mjs

@@ -16,7 +16,8 @@ import createToolbox from "./toolbox.mjs";
 const refract = (value, {
   element = 'openApi3_1',
   plugins = [],
-  specificationObj = specification
+  specificationObj = specification,
+  consume = false
 } = {}) => {
   const genericElement = baseRefract(value);
   const resolvedSpec = resolveSpecification(specificationObj);
@@ -33,7 +34,8 @@ const refract = (value, {
    */
   const RootVisitorClass = path(specPath, resolvedSpec);
   const rootVisitor = new RootVisitorClass({
-    specObj: resolvedSpec
+    specObj: resolvedSpec,
+    consume
   });
   traverse(genericElement, rootVisitor, {
     nodeTypeGetter: getNodePrimitiveType

package/src/refractor/plugins/normalize-operation-ids.cjs

@@ -89,7 +89,7 @@ const plugin = ({
             if (typeof linkElement.operationId === 'undefined') return;
             const linkOperationId = String((0, _apidomCore.toValue)(linkElement.operationId));
             const operationElement = normalizedOperations.find(normalizedOperationElement => {
-              const originalOperationId = (0, _apidomCore.toValue)(normalizedOperationElement.meta.get('originalOperationId'));
+              const originalOperationId = normalizedOperationElement.meta.get('originalOperationId');
               return originalOperationId === linkOperationId;
             });
 
@@ -110,7 +110,7 @@ const plugin = ({
         enter(path) {
           const pathItemElement = path.node;
           // `path` meta may not be always available, e.g. in Callback Object or Components Object
-          const pathTemplate = (0, _ramda.defaultTo)('path', (0, _apidomCore.toValue)(pathItemElement.meta.get('path')));
+          const pathTemplate = (0, _ramda.defaultTo)('path', pathItemElement.meta.get('path'));
           pathTemplates.push(pathTemplate);
         },
         leave() {
@@ -136,7 +136,7 @@ const plugin = ({
           // perform operationId normalization
           const pathTemplate = (0, _ramda.last)(pathTemplates);
           // `http-method` meta may not be always available, e.g. in Callback Object or Components Object
-          const method = (0, _ramda.defaultTo)('method', (0, _apidomCore.toValue)(operationElement.meta.get('http-method')));
+          const method = (0, _ramda.defaultTo)('method', operationElement.meta.get('http-method'));
           const normalizedOperationId = operationIdNormalizer(originalOperationId, pathTemplate, method);
 
           // normalization is not necessary

package/src/refractor/plugins/normalize-operation-ids.mjs

@@ -84,7 +84,7 @@ const plugin = ({
             if (typeof linkElement.operationId === 'undefined') return;
             const linkOperationId = String(toValue(linkElement.operationId));
             const operationElement = normalizedOperations.find(normalizedOperationElement => {
-              const originalOperationId = toValue(normalizedOperationElement.meta.get('originalOperationId'));
+              const originalOperationId = normalizedOperationElement.meta.get('originalOperationId');
               return originalOperationId === linkOperationId;
             });
 
@@ -105,7 +105,7 @@ const plugin = ({
         enter(path) {
           const pathItemElement = path.node;
           // `path` meta may not be always available, e.g. in Callback Object or Components Object
-          const pathTemplate = defaultTo('path', toValue(pathItemElement.meta.get('path')));
+          const pathTemplate = defaultTo('path', pathItemElement.meta.get('path'));
           pathTemplates.push(pathTemplate);
         },
         leave() {
@@ -131,7 +131,7 @@ const plugin = ({
           // perform operationId normalization
           const pathTemplate = last(pathTemplates);
           // `http-method` meta may not be always available, e.g. in Callback Object or Components Object
-          const method = defaultTo('method', toValue(operationElement.meta.get('http-method')));
+          const method = defaultTo('method', operationElement.meta.get('http-method'));
           const normalizedOperationId = operationIdNormalizer(originalOperationId, pathTemplate, method);
 
           // normalization is not necessary

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

@@ -627,7 +627,8 @@ const schema = {
 };
 const findElementFactory = (ancestor, keyName) => {
   const elementType = (0, _apidomTraverse.getNodeType)(ancestor);
-  const keyMapping = schema[elementType] || schema[(0, _apidomCore.toValue)(ancestor.classes.first)];
+  const classType = ancestor.isMetaEmpty ? undefined : ancestor.classes.at(0);
+  const keyMapping = schema[elementType] || schema[classType];
   return typeof keyMapping === 'undefined' ? undefined : Object.hasOwn(keyMapping, '[key: *]') ? keyMapping['[key: *]'] : keyMapping[keyName];
 };
 
@@ -657,7 +658,7 @@ const plugin = () => () => {
         if (typeof elementFactory !== 'function') return;
         const newElement = elementFactory.call({
           context
-        }, undefined, (0, _apidomDatamodel.cloneDeep)(element.meta), (0, _apidomDatamodel.cloneDeep)(element.attributes));
+        }, undefined, element.isMetaEmpty ? undefined : element.meta.cloneDeep(), element.isAttributesEmpty ? undefined : (0, _apidomDatamodel.cloneDeep)(element.attributes));
         _apidomDatamodel.SourceMapElement.transfer(element, newElement);
         _apidomDatamodel.StyleElement.transfer(element, newElement);
         path.replaceWith(newElement);

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

@@ -619,7 +619,8 @@ const schema = {
 };
 const findElementFactory = (ancestor, keyName) => {
   const elementType = getNodeType(ancestor);
-  const keyMapping = schema[elementType] || schema[toValue(ancestor.classes.first)];
+  const classType = ancestor.isMetaEmpty ? undefined : ancestor.classes.at(0);
+  const keyMapping = schema[elementType] || schema[classType];
   return typeof keyMapping === 'undefined' ? undefined : Object.hasOwn(keyMapping, '[key: *]') ? keyMapping['[key: *]'] : keyMapping[keyName];
 };
 
@@ -649,7 +650,7 @@ const plugin = () => () => {
         if (typeof elementFactory !== 'function') return;
         const newElement = elementFactory.call({
           context
-        }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
+        }, undefined, element.isMetaEmpty ? undefined : element.meta.cloneDeep(), element.isAttributesEmpty ? undefined : cloneDeep(element.attributes));
         SourceMapElement.transfer(element, newElement);
         StyleElement.transfer(element, newElement);
         path.replaceWith(newElement);

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

@@ -4,6 +4,8 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.default = void 0;
 var _ramda = require("ramda");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _apidomCore = require("@speclynx/apidom-core");
 var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-0");
 var _OpenApi = _interopRequireDefault(require("../../../elements/OpenApi3-1.cjs"));
 var _bases = require("./bases.cjs");
@@ -21,11 +23,18 @@ class OpenApi3_1Visitor extends _bases.BaseFixedFieldsVisitor {
     this.element = new _OpenApi.default();
     this.specPath = (0, _ramda.always)(['document', 'objects', 'OpenApi']);
     this.canSupportSpecificationExtensions = true;
+    this.consumeSafe = true;
     this.openApiSemanticElement = this.element;
   }
   ObjectElement(path) {
     const objectElement = path.node;
     this.openApiGenericElement = objectElement;
+    // precompute values from generic root before consume may release fields
+    if ((0, _apidomDatamodel.isStringElement)(objectElement.get('jsonSchemaDialect'))) {
+      this.sourceContext = {
+        jsonSchemaDialect: (0, _apidomCore.toValue)(objectElement.get('jsonSchemaDialect'))
+      };
+    }
     _apidomNsOpenapi.FixedFieldsVisitor.prototype.ObjectElement.call(this, path);
   }
 }

package/src/refractor/visitors/open-api-3-1/index.mjs

@@ -1,4 +1,6 @@
 import { always } from 'ramda';
+import { isStringElement } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
 import { FixedFieldsVisitor } from '@speclynx/apidom-ns-openapi-3-0';
 import OpenApi3_1Element from "../../../elements/OpenApi3-1.mjs";
 import { BaseFixedFieldsVisitor } from "./bases.mjs";
@@ -15,11 +17,18 @@ class OpenApi3_1Visitor extends BaseFixedFieldsVisitor {
     this.element = new OpenApi3_1Element();
     this.specPath = always(['document', 'objects', 'OpenApi']);
     this.canSupportSpecificationExtensions = true;
+    this.consumeSafe = true;
     this.openApiSemanticElement = this.element;
   }
   ObjectElement(path) {
     const objectElement = path.node;
     this.openApiGenericElement = objectElement;
+    // precompute values from generic root before consume may release fields
+    if (isStringElement(objectElement.get('jsonSchemaDialect'))) {
+      this.sourceContext = {
+        jsonSchemaDialect: toValue(objectElement.get('jsonSchemaDialect'))
+      };
+    }
     FixedFieldsVisitor.prototype.ObjectElement.call(this, path);
   }
 }

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

@@ -59,8 +59,8 @@ class SchemaVisitor extends _bases.BaseSchemaVisitor {
     (0, _predicates.isJsonSchemaDialectElement)(this.openApiSemanticElement.jsonSchemaDialect)) {
       // @ts-ignore
       jsonSchemaDialect = (0, _apidomCore.toValue)(this.openApiSemanticElement.jsonSchemaDialect);
-    } else if (this.openApiGenericElement !== undefined && (0, _apidomDatamodel.isStringElement)(this.openApiGenericElement.get('jsonSchemaDialect'))) {
-      jsonSchemaDialect = (0, _apidomCore.toValue)(this.openApiGenericElement.get('jsonSchemaDialect'));
+    } else if (this.sourceContext?.jsonSchemaDialect !== undefined) {
+      jsonSchemaDialect = this.sourceContext.jsonSchemaDialect;
     } else {
       jsonSchemaDialect = (0, _apidomCore.toValue)(this.jsonSchemaDefaultDialect);
     }

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

@@ -53,8 +53,8 @@ class SchemaVisitor extends BaseSchemaVisitor {
     isJsonSchemaDialectElement(this.openApiSemanticElement.jsonSchemaDialect)) {
       // @ts-ignore
       jsonSchemaDialect = toValue(this.openApiSemanticElement.jsonSchemaDialect);
-    } else if (this.openApiGenericElement !== undefined && isStringElement(this.openApiGenericElement.get('jsonSchemaDialect'))) {
-      jsonSchemaDialect = toValue(this.openApiGenericElement.get('jsonSchemaDialect'));
+    } else if (this.sourceContext?.jsonSchemaDialect !== undefined) {
+      jsonSchemaDialect = this.sourceContext.jsonSchemaDialect;
     } else {
       jsonSchemaDialect = toValue(this.jsonSchemaDefaultDialect);
     }

package/types/apidom-ns-openapi-3-1.d.ts

@@ -1367,7 +1367,7 @@ export { ReferenceVisitorOptions }
 /**
  * @public
  */
-export declare const refract: <T extends Element_2>(value: unknown, { element, plugins, specificationObj }?: RefractorOptions) => T;
+export declare const refract: <T extends Element_2>(value: unknown, { element, plugins, specificationObj, consume, }?: RefractorOptions) => T;
 
 /**
  * Refracts a value into a CallbackElement.
@@ -1478,6 +1478,7 @@ export declare interface RefractorOptions {
     readonly element?: string;
     readonly plugins?: RefractorPlugin[];
     readonly specificationObj?: typeof specificationObj;
+    readonly consume?: boolean;
 }
 
 /**