oas-normalize 8.3.2 → 8.3.4

package/README.md

@@ -79,7 +79,7 @@ await oas.deref().then(definition => {
 
 Validate and optionally convert to OpenAPI, a given API definition. This supports Swagger 2.0, OpenAPI 3.x API definitions as well as Postman 2.x collections.
 
-Please note that if you've supplied a Postman collection to the library it will **always** be converted to OpenAPI, using [postman-to-openapi](https://github.com/joolfe/postman-to-openapi), and we will only validate resulting OpenAPI definition.
+Please note that if you've supplied a Postman collection to the library it will **always** be converted to OpenAPI, using [@readme/postman-to-openapi](https://npm.im/@readme/postman-to-openapi), and we will only validate resulting OpenAPI definition.
 
 ```js
 await oas.validate().then(definition => {

package/dist/index.js

@@ -76,8 +76,8 @@ exports.__esModule = true;
 exports.getAPIDefinitionType = exports.isAPIDefinition = void 0;
 var fs_1 = __importDefault(require("fs"));
 var openapi_parser_1 = __importDefault(require("@readme/openapi-parser"));
+var postman_to_openapi_1 = __importDefault(require("@readme/postman-to-openapi"));
 var node_fetch_1 = __importDefault(require("node-fetch"));
-var postman_to_openapi_1 = __importDefault(require("postman-to-openapi"));
 var swagger2openapi_1 = __importDefault(require("swagger2openapi"));
 var utils = __importStar(require("./lib/utils"));
 exports.isAPIDefinition = utils.isAPIDefinition;

package/dist/lib/utils.js

@@ -1,10 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 exports.__esModule = true;
 exports.getAPIDefinitionType = exports.isAPIDefinition = exports.stringToJSON = exports.isSwagger = exports.isPostman = exports.isOpenAPI = exports.getType = exports.normalizeURL = exports.isBuffer = void 0;
-var js_yaml_1 = __importDefault(require("js-yaml"));
+var js_yaml_1 = __importStar(require("js-yaml"));
 /**
  * Determine if a given variable is a `Buffer`.
  *
@@ -95,7 +115,7 @@ function stringToJSON(string) {
     else if (string.match(/^\s*{/)) {
         return JSON.parse(string);
     }
-    return js_yaml_1["default"].load(string);
+    return js_yaml_1["default"].load(string, { schema: js_yaml_1.JSON_SCHEMA });
 }
 exports.stringToJSON = stringToJSON;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oas-normalize",
-  "version": "8.3.2",
+  "version": "8.3.4",
   "description": "Tooling for converting, valiating, and parsing OpenAPI, Swagger, and Postman API definitions",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -43,22 +43,22 @@
   "license": "MIT",
   "dependencies": {
     "@readme/openapi-parser": "^2.4.0",
+    "@readme/postman-to-openapi": "^4.0.0",
     "js-yaml": "^4.1.0",
     "node-fetch": "^2.6.1",
     "openapi-types": "^12.1.0",
-    "postman-to-openapi": "^3.0.1",
     "swagger2openapi": "^7.0.8"
   },
   "devDependencies": {
-    "@readme/eslint-config": "^10.5.0",
+    "@readme/eslint-config": "^10.5.1",
     "@readme/oas-examples": "^5.8.1",
-    "@types/jest": "^29.4.0",
+    "@types/jest": "^29.5.0",
     "@types/js-yaml": "^4.0.5",
     "@types/node-fetch": "^2.6.2",
-    "eslint": "^8.33.0",
-    "jest": "^29.4.1",
+    "eslint": "^8.36.0",
+    "jest": "^29.5.0",
     "nock": "^13.3.0",
-    "prettier": "^2.8.3",
+    "prettier": "^2.8.5",
     "ts-jest": "^29.0.5",
     "typescript": "^4.9.5"
   },

package/src/index.ts

@@ -3,8 +3,8 @@ import type { OpenAPI } from 'openapi-types';
 import fs from 'fs';
 
 import openapiParser from '@readme/openapi-parser';
+import postmanToOpenAPI from '@readme/postman-to-openapi';
 import fetch from 'node-fetch';
-import postmanToOpenAPI from 'postman-to-openapi';
 
 import converter from 'swagger2openapi';
 

package/src/lib/utils.ts

@@ -1,5 +1,4 @@
-import YAML from 'js-yaml';
-
+import YAML, { JSON_SCHEMA } from 'js-yaml';
 /**
  * Determine if a given variable is a `Buffer`.
  *
@@ -90,7 +89,7 @@ export function stringToJSON(string: string | Record<string, unknown>) {
     return JSON.parse(string);
   }
 
-  return YAML.load(string);
+  return YAML.load(string, { schema: JSON_SCHEMA });
 }
 
 /**