swagger-client 3.33.1 → 3.34.0

package/es/execute/index.js

@@ -1,7 +1,7 @@
-import cookie from 'cookie';
 import { identity } from 'ramda';
-import { isPlainObject } from 'ramda-adjunct';
+import { isPlainObject, isNonEmptyString } from 'ramda-adjunct';
 import { test as testServerURLTemplate, substitute as substituteServerURLTemplate } from 'openapi-server-url-templating';
+import { serializeCookie, cookieValueLenientEncoder, cookieNameLenientValidator, cookieValueLenientValidator } from '@swaggerexpert/cookie';
 import { ApiDOMStructuredError } from '@swagger-api/apidom-error';
 import { url } from '@swagger-api/apidom-reference/configuration/empty';
 import { DEFAULT_BASE_URL, DEFAULT_OPENAPI_3_SERVER } from '../constants.js';
@@ -105,7 +105,6 @@ export function execute({
 
 // Build a request, which can be handled by the `http.js` implementation.
 export function buildRequest(options) {
-  var _baseURL;
   const {
     spec,
     operationId,
@@ -167,7 +166,7 @@ export function buildRequest(options) {
     method,
     pathName
   } = operationRaw;
-  baseURL = (_baseURL = baseURL) !== null && _baseURL !== void 0 ? _baseURL : baseUrl({
+  baseURL = baseURL !== null && baseURL !== void 0 ? baseURL : baseUrl({
     spec,
     scheme,
     contextUrl,
@@ -261,13 +260,20 @@ export function buildRequest(options) {
   // If the cookie convenience object exists in our request,
   // serialize its content and then delete the cookie object.
   if (req.cookies && Object.keys(req.cookies).length) {
-    const cookieString = Object.keys(req.cookies).reduce((prev, cookieName) => {
-      const cookieValue = req.cookies[cookieName];
-      const prefix = prev ? '&' : '';
-      const stringified = cookie.serialize(cookieName, cookieValue);
-      return prev + prefix + stringified;
-    }, '');
-    req.headers.Cookie = cookieString;
+    const cookieString = serializeCookie(req.cookies, {
+      encoders: {
+        value: cookieValueLenientEncoder
+      },
+      validators: {
+        name: cookieNameLenientValidator,
+        value: cookieValueLenientValidator
+      }
+    });
+    if (isNonEmptyString(req.headers.Cookie)) {
+      req.headers.Cookie += `; ${cookieString}`;
+    } else {
+      req.headers.Cookie = cookieString;
+    }
   }
   if (req.cookies) {
     // even if no cookies were defined, we need to remove

package/es/execute/oas3/parameter-builders.js

@@ -1,6 +1,8 @@
 import { resolve as resolvePathTemplate } from 'openapi-path-templating';
+import { serializeCookie } from '@swaggerexpert/cookie';
 import stylize, { encodeCharacters } from './style-serializer.js';
 import serialize from './content-serializer.js';
+import cookieValueEncoder from '../../helpers/cookie-value-encoder.js';
 export function path({
   req,
   value,
@@ -31,7 +33,7 @@ export function path({
         key: parameter.name,
         value: val,
         style: style || 'simple',
-        explode: explode || false,
+        explode: explode !== null && explode !== void 0 ? explode : false,
         escape: 'reserved'
       })
     });
@@ -112,21 +114,38 @@ export function cookie({
   parameter,
   value
 }) {
+  const {
+    name: cookieName
+  } = parameter;
   req.headers = req.headers || {};
-  const type = typeof value;
   if (value !== undefined && parameter.content) {
     const effectiveMediaType = Object.keys(parameter.content)[0];
-    req.headers.Cookie = `${parameter.name}=${serialize(value, effectiveMediaType)}`;
+    const cookieValue = serialize(value, effectiveMediaType);
+    req.headers.Cookie = serializeCookie({
+      [cookieName]: cookieValue
+    }, {
+      encoders: {
+        value: cookieValueEncoder
+      }
+    });
     return;
   }
   if (value !== undefined && !(Array.isArray(value) && value.length === 0)) {
-    const prefix = type === 'object' && !Array.isArray(value) && parameter.explode ? '' : `${parameter.name}=`;
-    req.headers.Cookie = prefix + stylize({
+    var _parameter$explode;
+    const serializedValue = stylize({
       key: parameter.name,
       value,
       escape: false,
       style: parameter.style || 'form',
-      explode: typeof parameter.explode === 'undefined' ? false : parameter.explode
+      explode: (_parameter$explode = parameter.explode) !== null && _parameter$explode !== void 0 ? _parameter$explode : false
+    });
+    const cookieValue = Array.isArray(value) && parameter.explode ? `${cookieName}=${serializedValue}` : serializedValue;
+    req.headers.Cookie = serializeCookie({
+      [cookieName]: cookieValue
+    }, {
+      encoders: {
+        value: cookieValueEncoder
+      }
     });
   }
 }

package/es/execute/oas3/style-serializer.js

@@ -32,7 +32,6 @@ export default function stylize(config) {
   return encodePrimitive(config);
 }
 export function valueEncoder(value, escape = false) {
-  var _value;
   if (Array.isArray(value) || value !== null && typeof value === 'object') {
     value = JSON.stringify(value);
   } else if (typeof value === 'number' || typeof value === 'boolean') {
@@ -41,7 +40,7 @@ export function valueEncoder(value, escape = false) {
   if (escape && typeof value === 'string' && value.length > 0) {
     return encodeCharacters(value, escape);
   }
-  return (_value = value) !== null && _value !== void 0 ? _value : '';
+  return value !== null && value !== void 0 ? value : '';
 }
 function encodeArray({
   key,

package/es/helpers/cookie-value-encoder.js

@@ -0,0 +1,5 @@
+import { cookieValueStrictEncoder } from '@swaggerexpert/cookie';
+const eqSignPE = '%3D';
+const ampersandPE = '%26';
+const cookieValueEncoder = cookieValue => cookieValueStrictEncoder(cookieValue).replace(/[=&]/gu, match => match === '=' ? eqSignPE : ampersandPE);
+export default cookieValueEncoder;

package/lib/execute/index.js

@@ -7,10 +7,10 @@ exports.baseUrl = baseUrl;
 exports.buildRequest = buildRequest;
 exports.execute = execute;
 exports.self = void 0;
-var _cookie = _interopRequireDefault(require("cookie"));
 var _ramda = require("ramda");
 var _ramdaAdjunct = require("ramda-adjunct");
 var _openapiServerUrlTemplating = require("openapi-server-url-templating");
+var _cookie = require("@swaggerexpert/cookie");
 var _apidomError = require("@swagger-api/apidom-error");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 var _constants = require("../constants.js");
@@ -114,7 +114,6 @@ function execute({
 
 // Build a request, which can be handled by the `http.js` implementation.
 function buildRequest(options) {
-  var _baseURL;
   const {
     spec,
     operationId,
@@ -176,7 +175,7 @@ function buildRequest(options) {
     method,
     pathName
   } = operationRaw;
-  baseURL = (_baseURL = baseURL) != null ? _baseURL : baseUrl({
+  baseURL = baseURL != null ? baseURL : baseUrl({
     spec,
     scheme,
     contextUrl,
@@ -270,13 +269,20 @@ function buildRequest(options) {
   // If the cookie convenience object exists in our request,
   // serialize its content and then delete the cookie object.
   if (req.cookies && Object.keys(req.cookies).length) {
-    const cookieString = Object.keys(req.cookies).reduce((prev, cookieName) => {
-      const cookieValue = req.cookies[cookieName];
-      const prefix = prev ? '&' : '';
-      const stringified = _cookie.default.serialize(cookieName, cookieValue);
-      return prev + prefix + stringified;
-    }, '');
-    req.headers.Cookie = cookieString;
+    const cookieString = (0, _cookie.serializeCookie)(req.cookies, {
+      encoders: {
+        value: _cookie.cookieValueLenientEncoder
+      },
+      validators: {
+        name: _cookie.cookieNameLenientValidator,
+        value: _cookie.cookieValueLenientValidator
+      }
+    });
+    if ((0, _ramdaAdjunct.isNonEmptyString)(req.headers.Cookie)) {
+      req.headers.Cookie += `; ${cookieString}`;
+    } else {
+      req.headers.Cookie = cookieString;
+    }
   }
   if (req.cookies) {
     // even if no cookies were defined, we need to remove

package/lib/execute/oas3/parameter-builders.js

@@ -8,8 +8,10 @@ exports.header = header;
 exports.path = path;
 exports.query = query;
 var _openapiPathTemplating = require("openapi-path-templating");
+var _cookie = require("@swaggerexpert/cookie");
 var _styleSerializer = _interopRequireWildcard(require("./style-serializer.js"));
 var _contentSerializer = _interopRequireDefault(require("./content-serializer.js"));
+var _cookieValueEncoder = _interopRequireDefault(require("../../helpers/cookie-value-encoder.js"));
 function path({
   req,
   value,
@@ -40,7 +42,7 @@ function path({
         key: parameter.name,
         value: val,
         style: style || 'simple',
-        explode: explode || false,
+        explode: explode != null ? explode : false,
         escape: 'reserved'
       })
     });
@@ -121,21 +123,38 @@ function cookie({
   parameter,
   value
 }) {
+  const {
+    name: cookieName
+  } = parameter;
   req.headers = req.headers || {};
-  const type = typeof value;
   if (value !== undefined && parameter.content) {
     const effectiveMediaType = Object.keys(parameter.content)[0];
-    req.headers.Cookie = `${parameter.name}=${(0, _contentSerializer.default)(value, effectiveMediaType)}`;
+    const cookieValue = (0, _contentSerializer.default)(value, effectiveMediaType);
+    req.headers.Cookie = (0, _cookie.serializeCookie)({
+      [cookieName]: cookieValue
+    }, {
+      encoders: {
+        value: _cookieValueEncoder.default
+      }
+    });
     return;
   }
   if (value !== undefined && !(Array.isArray(value) && value.length === 0)) {
-    const prefix = type === 'object' && !Array.isArray(value) && parameter.explode ? '' : `${parameter.name}=`;
-    req.headers.Cookie = prefix + (0, _styleSerializer.default)({
+    var _parameter$explode;
+    const serializedValue = (0, _styleSerializer.default)({
       key: parameter.name,
       value,
       escape: false,
       style: parameter.style || 'form',
-      explode: typeof parameter.explode === 'undefined' ? false : parameter.explode
+      explode: (_parameter$explode = parameter.explode) != null ? _parameter$explode : false
+    });
+    const cookieValue = Array.isArray(value) && parameter.explode ? `${cookieName}=${serializedValue}` : serializedValue;
+    req.headers.Cookie = (0, _cookie.serializeCookie)({
+      [cookieName]: cookieValue
+    }, {
+      encoders: {
+        value: _cookieValueEncoder.default
+      }
     });
   }
 }

package/lib/execute/oas3/style-serializer.js

@@ -38,7 +38,6 @@ function stylize(config) {
   return encodePrimitive(config);
 }
 function valueEncoder(value, escape = false) {
-  var _value;
   if (Array.isArray(value) || value !== null && typeof value === 'object') {
     value = JSON.stringify(value);
   } else if (typeof value === 'number' || typeof value === 'boolean') {
@@ -47,7 +46,7 @@ function valueEncoder(value, escape = false) {
   if (escape && typeof value === 'string' && value.length > 0) {
     return encodeCharacters(value, escape);
   }
-  return (_value = value) != null ? _value : '';
+  return value != null ? value : '';
 }
 function encodeArray({
   key,

package/lib/helpers/cookie-value-encoder.js

@@ -0,0 +1,9 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+var _cookie = require("@swaggerexpert/cookie");
+const eqSignPE = '%3D';
+const ampersandPE = '%26';
+const cookieValueEncoder = cookieValue => (0, _cookie.cookieValueStrictEncoder)(cookieValue).replace(/[=&]/gu, match => match === '=' ? eqSignPE : ampersandPE);
+var _default = exports.default = cookieValueEncoder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.33.1",
+  "version": "3.34.0",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
@@ -50,7 +50,7 @@
     "build:es": "cross-env BABEL_ENV=es babel src --out-dir es",
     "lint": "eslint src/ test/",
     "lint:fix": "npm run lint -- --fix",
-    "link:apidom": "npm link @swagger-api/apidom-core @swagger-api/apidom-error @swagger-api/apidom-reference @swagger-api/apidom-ns-openapi-2 @swagger-api/apidom-ns-openapi-3-0 @swagger-api/apidom-ns-openapi-3-1 @swagger-api/apidom-ns-json-schema-draft-4 @swagger-api/apidom-json-pointer",
+    "link:apidom": "npm link @swagger-api/apidom-core @swagger-api/apidom-error @swagger-api/apidom-reference @swagger-api/apidom-ns-openapi-2 @swagger-api/apidom-ns-openapi-3-0 @swagger-api/apidom-ns-openapi-3-1 @swagger-api/apidom-ns-json-schema-draft-4 @swagger-api/apidom-ns-json-schema-draft-6 @swagger-api/apidom-ns-json-schema-draft-7 @swagger-api/apidom-ns-json-schema-2019-09 @swagger-api/apidom-ns-json-schema-2020-12 @swagger-api/apidom-json-pointer",
     "test": "run-s test:unit:coverage test:artifact",
     "test:unit": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.config.js",
     "test:unit:coverage": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.coverage.config.js",
@@ -74,12 +74,12 @@
   "dependencies": {
     "@babel/runtime-corejs3": "^7.22.15",
     "@scarf/scarf": "=1.4.0",
-    "@swagger-api/apidom-core": ">=1.0.0-beta.6 <1.0.0-rc.0",
-    "@swagger-api/apidom-error": ">=1.0.0-beta.6 <1.0.0-rc.0",
-    "@swagger-api/apidom-json-pointer": ">=1.0.0-beta.6 <1.0.0-rc.0",
-    "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-beta.6 <1.0.0-rc.0",
-    "@swagger-api/apidom-reference": ">=1.0.0-beta.6 <1.0.0-rc.0",
-    "cookie": "~0.7.2",
+    "@swagger-api/apidom-core": ">=1.0.0-beta.11 <1.0.0-rc.0",
+    "@swagger-api/apidom-error": ">=1.0.0-beta.11 <1.0.0-rc.0",
+    "@swagger-api/apidom-json-pointer": ">=1.0.0-beta.11 <1.0.0-rc.0",
+    "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-beta.11 <1.0.0-rc.0",
+    "@swagger-api/apidom-reference": ">=1.0.0-beta.11 <1.0.0-rc.0",
+    "@swaggerexpert/cookie": "^1.4.1",
     "deepmerge": "~4.3.0",
     "fast-json-patch": "^3.0.0-1",
     "js-yaml": "^4.1.0",
@@ -104,11 +104,11 @@
     "cross-env": "=7.0.3",
     "eslint": "^8.42.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "=9.1.0",
+    "eslint-config-prettier": "=10.0.1",
     "eslint-plugin-import": "=2.31.0",
-    "eslint-plugin-prettier": "=5.2.1",
+    "eslint-plugin-prettier": "=5.2.3",
     "expect": "^29.0.3",
-    "glob": "=11.0.0",
+    "glob": "=11.0.1",
     "husky": "^9.0.11",
     "inspectpack": "=4.7.1",
     "install": "=0.13.0",
@@ -116,7 +116,7 @@
     "jest-environment-jsdom": "^29.0.3",
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
-    "lint-staged": "=15.3.0",
+    "lint-staged": "=15.4.2",
     "lodash": "^4.17.21",
     "npm-run-all": "=4.1.5",
     "prettier": "^3.1.1",