@swagger-api/apidom-ns-openapi-2 1.0.0-beta.9 → 1.0.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-ns-openapi-2",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.0",
   "description": "OpenAPI 2.0 namespace for ApiDOM.",
   "publishConfig": {
     "access": "public",
@@ -26,8 +26,8 @@
     "build:umd:browser": "cross-env BABEL_ENV=browser webpack --config config/webpack/browser.config.js --progress",
     "lint": "eslint ./",
     "lint:fix": "eslint ./ --fix",
-    "clean": "rimraf --glob 'src/**/*.mjs' 'src/**/*.cjs' 'test/**/*.mjs' ./dist ./types",
-    "test": "npm run build:es && cross-env BABEL_ENV=es babel test --out-dir test --extensions '.ts' --out-file-extension '.mjs' --root-mode 'upward' && cross-env NODE_ENV=test mocha",
+    "clean": "rimraf --glob 'src/**/*.mjs' 'src/**/*.cjs' ./dist ./types",
+    "test": "NODE_ENV=test ts-mocha --exit",
     "test:update-snapshots": "cross-env UPDATE_SNAPSHOT=1 mocha",
     "typescript:check-types": "tsc --noEmit && tsc -p ./test/tsconfig.json --noEmit",
     "typescript:declaration": "tsc -p tsconfig.declaration.json && api-extractor run -l -c ./config/api-extractor/api-extractor.json 2>&1 | shx grep -v 'Visitor_base'",
@@ -41,10 +41,10 @@
   "author": "Vladimir Gorej",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-core": "^1.0.0-beta.9",
-    "@swagger-api/apidom-error": "^1.0.0-beta.9",
-    "@swagger-api/apidom-ns-json-schema-draft-4": "^1.0.0-beta.9",
+    "@babel/runtime-corejs3": "^7.26.10",
+    "@swagger-api/apidom-core": "^1.0.0-rc.0",
+    "@swagger-api/apidom-error": "^1.0.0-rc.0",
+    "@swagger-api/apidom-ns-json-schema-draft-4": "^1.0.0-rc.0",
     "@types/ramda": "~0.30.0",
     "ramda": "~0.30.0",
     "ramda-adjunct": "^5.0.0",
@@ -60,5 +60,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "2d97871bd8addd42274917c6d131a09eebe9b1f8"
+  "gitHead": "af4b6e0fcae489477729581c52036725ac57a412"
 }

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

@@ -349,9 +349,10 @@ const plugin = () => () => ({
 
       // no element factory found
       if (typeof elementFactory !== 'function') return undefined;
-      return elementFactory.call({
+      const result = elementFactory.call({
         context
       }, undefined, (0, _apidomCore.cloneDeep)(element.meta), (0, _apidomCore.cloneDeep)(element.attributes));
+      return (0, _apidomCore.assignSourceMap)(result, element);
     }
   }
 });

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

@@ -1,4 +1,4 @@
-import { ArrayElement, ObjectElement, isStringElement, isElement, isMemberElement, isArrayElement, includesClasses, cloneDeep, toValue } from '@swagger-api/apidom-core';
+import { ArrayElement, ObjectElement, isStringElement, isElement, isMemberElement, isArrayElement, includesClasses, cloneDeep, toValue, assignSourceMap } from '@swagger-api/apidom-core';
 
 /**
  * OpenAPI 2.0 specification elements.
@@ -341,9 +341,10 @@ const plugin = () => () => ({
 
       // no element factory found
       if (typeof elementFactory !== 'function') return undefined;
-      return elementFactory.call({
+      const result = elementFactory.call({
         context
       }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
+      return assignSourceMap(result, element);
     }
   }
 });

package/src/refractor/specification.cjs

@@ -31,29 +31,29 @@ var _SchemesVisitor2 = _interopRequireDefault(require("./visitors/open-api-2/ope
 var _SecurityVisitor2 = _interopRequireDefault(require("./visitors/open-api-2/operation/SecurityVisitor.cjs"));
 var _index8 = _interopRequireDefault(require("./visitors/open-api-2/external-documentation/index.cjs"));
 var _index9 = _interopRequireDefault(require("./visitors/open-api-2/parameter/index.cjs"));
-var _index10 = _interopRequireDefault(require("./visitors/open-api-2/items/index.cjs"));
-var _index11 = _interopRequireDefault(require("./visitors/open-api-2/responses/index.cjs"));
+var _index0 = _interopRequireDefault(require("./visitors/open-api-2/items/index.cjs"));
+var _index1 = _interopRequireDefault(require("./visitors/open-api-2/responses/index.cjs"));
 var _DefaultVisitor = _interopRequireDefault(require("./visitors/open-api-2/responses/DefaultVisitor.cjs"));
-var _index12 = _interopRequireDefault(require("./visitors/open-api-2/response/index.cjs"));
-var _index13 = _interopRequireDefault(require("./visitors/open-api-2/headers/index.cjs"));
-var _index14 = _interopRequireDefault(require("./visitors/open-api-2/example/index.cjs"));
-var _index15 = _interopRequireDefault(require("./visitors/open-api-2/header/index.cjs"));
-var _index16 = _interopRequireDefault(require("./visitors/open-api-2/tag/index.cjs"));
-var _index17 = _interopRequireDefault(require("./visitors/open-api-2/reference/index.cjs"));
+var _index10 = _interopRequireDefault(require("./visitors/open-api-2/response/index.cjs"));
+var _index11 = _interopRequireDefault(require("./visitors/open-api-2/headers/index.cjs"));
+var _index12 = _interopRequireDefault(require("./visitors/open-api-2/example/index.cjs"));
+var _index13 = _interopRequireDefault(require("./visitors/open-api-2/header/index.cjs"));
+var _index14 = _interopRequireDefault(require("./visitors/open-api-2/tag/index.cjs"));
+var _index15 = _interopRequireDefault(require("./visitors/open-api-2/reference/index.cjs"));
 var _$RefVisitor2 = _interopRequireDefault(require("./visitors/open-api-2/reference/$RefVisitor.cjs"));
-var _index18 = _interopRequireDefault(require("./visitors/open-api-2/schema/index.cjs"));
+var _index16 = _interopRequireDefault(require("./visitors/open-api-2/schema/index.cjs"));
 var _AllOfVisitor = _interopRequireDefault(require("./visitors/open-api-2/schema/AllOfVisitor.cjs"));
 var _ItemsVisitor = _interopRequireDefault(require("./visitors/open-api-2/schema/ItemsVisitor.cjs"));
 var _PropertiesVisitor = _interopRequireDefault(require("./visitors/open-api-2/schema/PropertiesVisitor.cjs"));
 var _SchemaOrJSONReferenceVisitor = _interopRequireDefault(require("./visitors/open-api-2/schema/SchemaOrJSONReferenceVisitor.cjs"));
-var _index19 = _interopRequireDefault(require("./visitors/open-api-2/xml/index.cjs"));
-var _index20 = _interopRequireDefault(require("./visitors/open-api-2/definitions/index.cjs"));
-var _index21 = _interopRequireDefault(require("./visitors/open-api-2/responses-definitions/index.cjs"));
-var _index22 = _interopRequireDefault(require("./visitors/open-api-2/parameters-definitions/index.cjs"));
-var _index23 = _interopRequireDefault(require("./visitors/open-api-2/security-definitions/index.cjs"));
-var _index24 = _interopRequireDefault(require("./visitors/open-api-2/security-scheme/index.cjs"));
-var _index25 = _interopRequireDefault(require("./visitors/open-api-2/scopes/index.cjs"));
-var _index26 = _interopRequireDefault(require("./visitors/open-api-2/security-requirement/index.cjs"));
+var _index17 = _interopRequireDefault(require("./visitors/open-api-2/xml/index.cjs"));
+var _index18 = _interopRequireDefault(require("./visitors/open-api-2/definitions/index.cjs"));
+var _index19 = _interopRequireDefault(require("./visitors/open-api-2/responses-definitions/index.cjs"));
+var _index20 = _interopRequireDefault(require("./visitors/open-api-2/parameters-definitions/index.cjs"));
+var _index21 = _interopRequireDefault(require("./visitors/open-api-2/security-definitions/index.cjs"));
+var _index22 = _interopRequireDefault(require("./visitors/open-api-2/security-scheme/index.cjs"));
+var _index23 = _interopRequireDefault(require("./visitors/open-api-2/scopes/index.cjs"));
+var _index24 = _interopRequireDefault(require("./visitors/open-api-2/security-requirement/index.cjs"));
 var _SpecificationExtensionVisitor = _interopRequireDefault(require("./visitors/SpecificationExtensionVisitor.cjs"));
 /**
  * Specification object allows us to have complete control over visitors
@@ -269,7 +269,7 @@ const specification = {
           }
         },
         Items: {
-          $visitor: _index10.default,
+          $visitor: _index0.default,
           fixedFields: {
             type: jsonSchemaFixedFields.type,
             format: jsonSchemaFixedFields.format,
@@ -295,13 +295,13 @@ const specification = {
           }
         },
         Responses: {
-          $visitor: _index11.default,
+          $visitor: _index1.default,
           fixedFields: {
             default: _DefaultVisitor.default
           }
         },
         Response: {
-          $visitor: _index12.default,
+          $visitor: _index10.default,
           fixedFields: {
             description: {
               $ref: '#/visitors/value'
@@ -316,13 +316,13 @@ const specification = {
           }
         },
         Headers: {
-          $visitor: _index13.default
+          $visitor: _index11.default
         },
         Example: {
-          $visitor: _index14.default
+          $visitor: _index12.default
         },
         Header: {
-          $visitor: _index15.default,
+          $visitor: _index13.default,
           fixedFields: {
             description: jsonSchemaFixedFields.description,
             type: jsonSchemaFixedFields.type,
@@ -349,7 +349,7 @@ const specification = {
           }
         },
         Tag: {
-          $visitor: _index16.default,
+          $visitor: _index14.default,
           fixedFields: {
             name: {
               $ref: '#/visitors/value'
@@ -363,13 +363,13 @@ const specification = {
           }
         },
         Reference: {
-          $visitor: _index17.default,
+          $visitor: _index15.default,
           fixedFields: {
             $ref: _$RefVisitor2.default
           }
         },
         Schema: {
-          $visitor: _index18.default,
+          $visitor: _index16.default,
           fixedFields: {
             // the following properties are taken directly from the JSON Schema definition and follow the same specifications
             format: jsonSchemaFixedFields.format,
@@ -414,7 +414,7 @@ const specification = {
           }
         },
         XML: {
-          $visitor: _index19.default,
+          $visitor: _index17.default,
           fixedFields: {
             name: {
               $ref: '#/visitors/value'
@@ -434,19 +434,19 @@ const specification = {
           }
         },
         Definitions: {
-          $visitor: _index20.default
+          $visitor: _index18.default
         },
         ParametersDefinitions: {
-          $visitor: _index22.default
+          $visitor: _index20.default
         },
         ResponsesDefinitions: {
-          $visitor: _index21.default
+          $visitor: _index19.default
         },
         SecurityDefinitions: {
-          $visitor: _index23.default
+          $visitor: _index21.default
         },
         SecurityScheme: {
-          $visitor: _index24.default,
+          $visitor: _index22.default,
           fixedFields: {
             type: {
               $ref: '#/visitors/value'
@@ -475,10 +475,10 @@ const specification = {
           }
         },
         Scopes: {
-          $visitor: _index25.default
+          $visitor: _index23.default
         },
         SecurityRequirement: {
-          $visitor: _index26.default
+          $visitor: _index24.default
         }
       },
       extension: {

package/src/refractor/visitors/Visitor.cjs

@@ -20,10 +20,9 @@ class Visitor {
   copyMetaAndAttributes(from, to) {
     if (from.meta.length > 0 || to.meta.length > 0) {
       to.meta = (0, _apidomCore.deepmerge)(to.meta, from.meta);
-      if ((0, _apidomCore.hasElementSourceMap)(from)) {
-        // avoid deep merging of source maps
-        to.meta.set('sourceMap', from.meta.get('sourceMap'));
-      }
+    }
+    if ((0, _apidomCore.hasElementSourceMap)(from)) {
+      (0, _apidomCore.assignSourceMap)(to, from);
     }
     if (from.attributes.length > 0 || from.meta.length > 0) {
       to.attributes = (0, _apidomCore.deepmerge)(to.attributes, from.attributes); // eslint-disable-line no-param-reassign

package/src/refractor/visitors/Visitor.mjs

@@ -1,4 +1,4 @@
-import { hasElementSourceMap, deepmerge } from '@swagger-api/apidom-core';
+import { hasElementSourceMap, deepmerge, assignSourceMap } from '@swagger-api/apidom-core';
 
 /**
  * @public
@@ -17,10 +17,9 @@ class Visitor {
   copyMetaAndAttributes(from, to) {
     if (from.meta.length > 0 || to.meta.length > 0) {
       to.meta = deepmerge(to.meta, from.meta);
-      if (hasElementSourceMap(from)) {
-        // avoid deep merging of source maps
-        to.meta.set('sourceMap', from.meta.get('sourceMap'));
-      }
+    }
+    if (hasElementSourceMap(from)) {
+      assignSourceMap(to, from);
     }
     if (from.attributes.length > 0 || from.meta.length > 0) {
       to.attributes = deepmerge(to.attributes, from.attributes); // eslint-disable-line no-param-reassign

package/types/apidom-ns-openapi-2.d.ts

@@ -722,7 +722,6 @@ export declare const keyMap: {
     Annotation: never[];
     Comment: never[];
     ParseResultElement: string[];
-    SourceMap: string[];
     SwaggerElement: string[];
     InfoElement: string[];
     ContactElement: string[];
@@ -1322,7 +1321,15 @@ export declare const refract: <T extends Element_2>(value: unknown, { specPath,
  */
 export declare const refractorPluginReplaceEmptyElement: () => () => {
     visitor: {
-        StringElement(element: StringElement, key: any, parent: any, path: any, ancestors: any[]): any;
+        StringElement(element: StringElement, key: any, parent: any, path: any, ancestors: any[]): {
+            [key: string]: any;
+            startPositionRow?: number;
+            startPositionColumn?: number;
+            startIndex?: number;
+            endPositionRow?: number;
+            endPositionColumn?: number;
+            endIndex?: number;
+        } | undefined;
     };
 };