swagger-client 3.34.1 → 3.34.3

package/es/execute/index.js

@@ -14,27 +14,27 @@ import { getOperationRaw, idFromPathMethodLegacy } from '../helpers/index.js';
 import { isOpenAPI3 } from '../helpers/openapi-predicates.js';
 import { serialize as serializeCookie } from '../helpers/cookie.js';
 const arrayOrEmpty = ar => Array.isArray(ar) ? ar : [];
-const findObjectSchema = (schema, {
+const findObjectOrArraySchema = (schema, {
   recurse = true,
   depth = 1
 } = {}) => {
   if (!isPlainObject(schema)) return undefined;
 
-  // check if the schema is an object type
-  if (schema.type === 'object' || Array.isArray(schema.type) && schema.type.includes('object')) {
+  // check if the schema is an object or array type
+  if (schema.type === 'object' || schema.type === 'array' || Array.isArray(schema.type) && (schema.type.includes('object') || schema.type.includes('array'))) {
     return schema;
   }
   if (depth > TRAVERSE_LIMIT) return undefined;
   if (recurse) {
     // traverse oneOf keyword first
-    const oneOfResult = Array.isArray(schema.oneOf) ? schema.oneOf.find(subschema => findObjectSchema(subschema, {
+    const oneOfResult = Array.isArray(schema.oneOf) ? schema.oneOf.find(subschema => findObjectOrArraySchema(subschema, {
       recurse,
       depth: depth + 1
     })) : undefined;
     if (oneOfResult) return oneOfResult;
 
     // traverse anyOf keyword second
-    const anyOfResult = Array.isArray(schema.anyOf) ? schema.anyOf.find(subschema => findObjectSchema(subschema, {
+    const anyOfResult = Array.isArray(schema.anyOf) ? schema.anyOf.find(subschema => findObjectOrArraySchema(subschema, {
       recurse,
       depth: depth + 1
     })) : undefined;
@@ -42,21 +42,21 @@ const findObjectSchema = (schema, {
   }
   return undefined;
 };
-const parseJsonObject = ({
+const parseJsonObjectOrArray = ({
   value,
   silentFail = false
 }) => {
   try {
     const parsedValue = JSON.parse(value);
-    if (typeof parsedValue === 'object') {
+    if (isPlainObject(parsedValue) || Array.isArray(parsedValue)) {
       return parsedValue;
     }
     if (!silentFail) {
-      throw new Error('Expected JSON serialized object');
+      throw new Error('Expected JSON serialized object or array');
     }
   } catch {
     if (!silentFail) {
-      throw new Error('Could not parse object parameter value string as JSON Object');
+      throw new Error('Could not parse parameter value string as JSON Object or JSON Array');
     }
   }
   return value;
@@ -274,17 +274,24 @@ export function buildRequest(options) {
       throw new Error(`Required parameter ${parameter.name} is not provided`);
     }
     if (specIsOAS3 && typeof value === 'string') {
-      if (has('type', parameter.schema) && findObjectSchema(parameter.schema, {
+      if (has('type', parameter.schema) && typeof parameter.schema.type === 'string' && findObjectOrArraySchema(parameter.schema, {
         recurse: false
       })) {
-        value = parseJsonObject({
+        value = parseJsonObjectOrArray({
           value,
           silentFail: false
         });
-      } else if (findObjectSchema(parameter.schema, {
+      } else if (has('type', parameter.schema) && Array.isArray(parameter.schema.type) && findObjectOrArraySchema(parameter.schema, {
+        recurse: false
+      })) {
+        value = parseJsonObjectOrArray({
+          value,
+          silentFail: true
+        });
+      } else if (!has('type', parameter.schema) && findObjectOrArraySchema(parameter.schema, {
         recurse: true
       })) {
-        value = parseJsonObject({
+        value = parseJsonObjectOrArray({
           value,
           silentFail: true
         });

package/lib/execute/index.js

@@ -23,27 +23,27 @@ var _index3 = require("../helpers/index.js");
 var _openapiPredicates = require("../helpers/openapi-predicates.js");
 var _cookie = require("../helpers/cookie.js");
 const arrayOrEmpty = ar => Array.isArray(ar) ? ar : [];
-const findObjectSchema = (schema, {
+const findObjectOrArraySchema = (schema, {
   recurse = true,
   depth = 1
 } = {}) => {
   if (!(0, _ramdaAdjunct.isPlainObject)(schema)) return undefined;
 
-  // check if the schema is an object type
-  if (schema.type === 'object' || Array.isArray(schema.type) && schema.type.includes('object')) {
+  // check if the schema is an object or array type
+  if (schema.type === 'object' || schema.type === 'array' || Array.isArray(schema.type) && (schema.type.includes('object') || schema.type.includes('array'))) {
     return schema;
   }
   if (depth > _constants.TRAVERSE_LIMIT) return undefined;
   if (recurse) {
     // traverse oneOf keyword first
-    const oneOfResult = Array.isArray(schema.oneOf) ? schema.oneOf.find(subschema => findObjectSchema(subschema, {
+    const oneOfResult = Array.isArray(schema.oneOf) ? schema.oneOf.find(subschema => findObjectOrArraySchema(subschema, {
       recurse,
       depth: depth + 1
     })) : undefined;
     if (oneOfResult) return oneOfResult;
 
     // traverse anyOf keyword second
-    const anyOfResult = Array.isArray(schema.anyOf) ? schema.anyOf.find(subschema => findObjectSchema(subschema, {
+    const anyOfResult = Array.isArray(schema.anyOf) ? schema.anyOf.find(subschema => findObjectOrArraySchema(subschema, {
       recurse,
       depth: depth + 1
     })) : undefined;
@@ -51,21 +51,21 @@ const findObjectSchema = (schema, {
   }
   return undefined;
 };
-const parseJsonObject = ({
+const parseJsonObjectOrArray = ({
   value,
   silentFail = false
 }) => {
   try {
     const parsedValue = JSON.parse(value);
-    if (typeof parsedValue === 'object') {
+    if ((0, _ramdaAdjunct.isPlainObject)(parsedValue) || Array.isArray(parsedValue)) {
       return parsedValue;
     }
     if (!silentFail) {
-      throw new Error('Expected JSON serialized object');
+      throw new Error('Expected JSON serialized object or array');
     }
   } catch {
     if (!silentFail) {
-      throw new Error('Could not parse object parameter value string as JSON Object');
+      throw new Error('Could not parse parameter value string as JSON Object or JSON Array');
     }
   }
   return value;
@@ -283,17 +283,24 @@ function buildRequest(options) {
       throw new Error(`Required parameter ${parameter.name} is not provided`);
     }
     if (specIsOAS3 && typeof value === 'string') {
-      if ((0, _ramda.has)('type', parameter.schema) && findObjectSchema(parameter.schema, {
+      if ((0, _ramda.has)('type', parameter.schema) && typeof parameter.schema.type === 'string' && findObjectOrArraySchema(parameter.schema, {
         recurse: false
       })) {
-        value = parseJsonObject({
+        value = parseJsonObjectOrArray({
           value,
           silentFail: false
         });
-      } else if (findObjectSchema(parameter.schema, {
+      } else if ((0, _ramda.has)('type', parameter.schema) && Array.isArray(parameter.schema.type) && findObjectOrArraySchema(parameter.schema, {
+        recurse: false
+      })) {
+        value = parseJsonObjectOrArray({
+          value,
+          silentFail: true
+        });
+      } else if (!(0, _ramda.has)('type', parameter.schema) && findObjectOrArraySchema(parameter.schema, {
         recurse: true
       })) {
-        value = parseJsonObject({
+        value = parseJsonObjectOrArray({
           value,
           silentFail: true
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.34.1",
+  "version": "3.34.3",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
@@ -74,11 +74,11 @@
   "dependencies": {
     "@babel/runtime-corejs3": "^7.22.15",
     "@scarf/scarf": "=1.4.0",
-    "@swagger-api/apidom-core": ">=1.0.0-beta.12 <1.0.0-rc.0",
-    "@swagger-api/apidom-error": ">=1.0.0-beta.12 <1.0.0-rc.0",
-    "@swagger-api/apidom-json-pointer": ">=1.0.0-beta.12 <1.0.0-rc.0",
-    "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-beta.12 <1.0.0-rc.0",
-    "@swagger-api/apidom-reference": ">=1.0.0-beta.12 <1.0.0-rc.0",
+    "@swagger-api/apidom-core": ">=1.0.0-beta.13 <1.0.0-rc.0",
+    "@swagger-api/apidom-error": ">=1.0.0-beta.13 <1.0.0-rc.0",
+    "@swagger-api/apidom-json-pointer": ">=1.0.0-beta.13 <1.0.0-rc.0",
+    "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-beta.13 <1.0.0-rc.0",
+    "@swagger-api/apidom-reference": ">=1.0.0-beta.13 <1.0.0-rc.0",
     "@swaggerexpert/cookie": "^2.0.2",
     "deepmerge": "~4.3.0",
     "fast-json-patch": "^3.0.0-1",
@@ -86,10 +86,10 @@
     "neotraverse": "=0.6.18",
     "node-abort-controller": "^3.1.1",
     "node-fetch-commonjs": "^3.3.2",
-    "openapi-path-templating": "^2.0.1",
-    "openapi-server-url-templating": "^1.2.0",
+    "openapi-path-templating": "^2.2.1",
+    "openapi-server-url-templating": "^1.3.0",
     "ramda": "^0.30.1",
-    "ramda-adjunct": "^5.0.0"
+    "ramda-adjunct": "^5.1.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.21.0",
@@ -100,11 +100,11 @@
     "@babel/register": "^7.21.0",
     "@commitlint/cli": "^19.0.3",
     "@commitlint/config-conventional": "^19.0.3",
-    "babel-loader": "=9.2.1",
+    "babel-loader": "=10.0.0",
     "cross-env": "=7.0.3",
     "eslint": "^8.42.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "=10.0.1",
+    "eslint-config-prettier": "=10.1.1",
     "eslint-plugin-import": "=2.31.0",
     "eslint-plugin-prettier": "=5.2.3",
     "expect": "^29.0.3",