@middy/util 3.0.0-alpha.5 → 3.0.0-alpha.6

package/index.js

@@ -1,6 +1,4 @@
 import { Agent } from 'https';
-import statuses from './codes.js';
-import { inherits } from 'util';
 export const awsClientDefaultOptions = {
   httpOptions: {
     agent: new Agent({
@@ -26,7 +24,10 @@ export const createClient = async (options, request) => {
   let awsClientCredentials = {};
 
   if (options.awsClientAssumeRole) {
-    if (!request) throw new Error('Request required when assuming role');
+    if (!request) {
+      throw new Error('Request required when assuming role');
+    }
+
     awsClientCredentials = await getInternal({
       credentials: options.awsClientAssumeRole
     }, request);
@@ -65,7 +66,7 @@ export const getInternal = async (variables, request) => {
     const rootOptionKey = pathOptionKey.shift();
     let valuePromise = request.internal[rootOptionKey];
 
-    if (typeof valuePromise.then !== 'function') {
+    if (!isPromise(valuePromise)) {
       valuePromise = Promise.resolve(valuePromise);
     }
 
@@ -85,6 +86,9 @@ export const getInternal = async (variables, request) => {
     [sanitizeKey(key)]: values[index].value
   }), {});
 };
+
+const isPromise = promise => typeof (promise === null || promise === void 0 ? void 0 : promise.then) === 'function';
+
 const sanitizeKeyPrefixLeadingNumber = /^([0-9])/;
 const sanitizeKeyRemoveDisallowedChar = /[^a-zA-Z0-9]+/g;
 export const sanitizeKey = key => {
@@ -153,16 +157,23 @@ export const clearCache = (keys = null) => {
     cache[cacheKey] = undefined;
   }
 };
-export const jsonSafeParse = (string, reviver) => {
-  if (typeof string !== 'string') return string;
-  const firstChar = string[0];
-  if (firstChar !== '{' && firstChar !== '[' && firstChar !== '"') return string;
+export const jsonSafeParse = (text, reviver) => {
+  if (typeof text !== 'string') return text;
+  const firstChar = text[0];
+  if (firstChar !== '{' && firstChar !== '[' && firstChar !== '"') return text;
+
+  try {
+    return JSON.parse(text, reviver);
+  } catch (e) {}
 
+  return text;
+};
+export const jsonSafeStringify = (value, replacer, space) => {
   try {
-    return JSON.parse(string, reviver);
+    return JSON.stringify(value, replacer, space);
   } catch (e) {}
 
-  return string;
+  return value;
 };
 export const normalizeHttpResponse = request => {
   var _response, _response2, _response3, _response4;
@@ -184,52 +195,89 @@ export const normalizeHttpResponse = request => {
   return response;
 };
 const createErrorRegexp = /[^a-zA-Z]/g;
-export const createError = (code, message, properties = {}) => {
-  const name = statuses[code].replace(createErrorRegexp, '');
-  const className = name.substr(-5) !== 'Error' ? name + 'Error' : name;
-
-  function HttpError(message) {
-    const msg = message ?? statuses[code];
-    const err = new Error(msg);
-    Error.captureStackTrace(err, HttpError);
-    Object.setPrototypeOf(err, HttpError.prototype);
-    Object.defineProperty(err, 'message', {
-      enumerable: true,
-      configurable: true,
-      value: msg,
-      writable: true
-    });
-    Object.defineProperty(err, 'name', {
-      enumerable: false,
-      configurable: true,
-      value: className,
-      writable: true
-    });
-    return err;
+export class HttpError extends Error {
+  constructor(code, message, options = {}) {
+    if (message && typeof message !== 'string') {
+      options = message;
+      message = undefined;
+    }
+
+    message ?? (message = httpErrorCodes[code]);
+    super(message);
+    this.cause = options.cause;
+    const name = httpErrorCodes[code].replace(createErrorRegexp, '');
+    this.name = name.substr(-5) !== 'Error' ? name + 'Error' : name;
+    this.status = this.statusCode = code;
+    this.expose = options.expose ?? code < 500;
   }
 
-  inherits(HttpError, Error);
-  const desc = Object.getOwnPropertyDescriptor(HttpError, 'name');
-  desc.value = className;
-  Object.defineProperty(HttpError, 'name', desc);
-  Object.assign(HttpError.prototype, {
-    status: code,
-    statusCode: code,
-    expose: code < 500
-  }, properties);
-  return new HttpError(message);
+}
+export const createError = (code, message, properties = {}) => {
+  return new HttpError(code, message, properties);
 };
-export default {
-  createPrefetchClient,
-  createClient,
-  canPrefetch,
-  getInternal,
-  sanitizeKey,
-  processCache,
-  getCache,
-  modifyCache,
-  clearCache,
-  jsonSafeParse,
-  normalizeHttpResponse,
-  createError
+const httpErrorCodes = {
+  100: 'Continue',
+  101: 'Switching Protocols',
+  102: 'Processing',
+  103: 'Early Hints',
+  200: 'OK',
+  201: 'Created',
+  202: 'Accepted',
+  203: 'Non-Authoritative Information',
+  204: 'No Content',
+  205: 'Reset Content',
+  206: 'Partial Content',
+  207: 'Multi-Status',
+  208: 'Already Reported',
+  226: 'IM Used',
+  300: 'Multiple Choices',
+  301: 'Moved Permanently',
+  302: 'Found',
+  303: 'See Other',
+  304: 'Not Modified',
+  305: 'Use Proxy',
+  306: '(Unused)',
+  307: 'Temporary Redirect',
+  308: 'Permanent Redirect',
+  400: 'Bad Request',
+  401: 'Unauthorized',
+  402: 'Payment Required',
+  403: 'Forbidden',
+  404: 'Not Found',
+  405: 'Method Not Allowed',
+  406: 'Not Acceptable',
+  407: 'Proxy Authentication Required',
+  408: 'Request Timeout',
+  409: 'Conflict',
+  410: 'Gone',
+  411: 'Length Required',
+  412: 'Precondition Failed',
+  413: 'Payload Too Large',
+  414: 'URI Too Long',
+  415: 'Unsupported Media Type',
+  416: 'Range Not Satisfiable',
+  417: 'Expectation Failed',
+  418: "I'm a teapot",
+  421: 'Misdirected Request',
+  422: 'Unprocessable Entity',
+  423: 'Locked',
+  424: 'Failed Dependency',
+  425: 'Unordered Collection',
+  426: 'Upgrade Required',
+  428: 'Precondition Required',
+  429: 'Too Many Requests',
+  431: 'Request Header Fields Too Large',
+  451: 'Unavailable For Legal Reasons',
+  500: 'Internal Server Error',
+  501: 'Not Implemented',
+  502: 'Bad Gateway',
+  503: 'Service Unavailable',
+  504: 'Gateway Timeout',
+  505: 'HTTP Version Not Supported',
+  506: 'Variant Also Negotiates',
+  507: 'Insufficient Storage',
+  508: 'Loop Detected',
+  509: 'Bandwidth Limit Exceeded',
+  510: 'Not Extended',
+  511: 'Network Authentication Required'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/util",
-  "version": "3.0.0-alpha.5",
+  "version": "3.0.0-alpha.6",
   "description": "🛵 The stylish Node.js middleware engine for AWS Lambda (util package)",
   "type": "module",
   "engines": {
@@ -46,12 +46,12 @@
     "url": "https://github.com/middyjs/middy/issues"
   },
   "devDependencies": {
-    "@middy/core": "^3.0.0-alpha.5",
+    "@middy/core": "^3.0.0-alpha.6",
     "@types/aws-lambda": "^8.10.76",
     "@types/node": "^17.0.0",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
   "homepage": "https://github.com/middyjs/middy#readme",
-  "gitHead": "cf6a1b02a2e163bea353b10146d67e0d95ef8072"
+  "gitHead": "176660ed3e0716d6bfb635c77251b301e0e24720"
 }

package/codes.js

@@ -1,66 +0,0 @@
-export default {
-  100: 'Continue',
-  101: 'Switching Protocols',
-  102: 'Processing',
-  103: 'Early Hints',
-  200: 'OK',
-  201: 'Created',
-  202: 'Accepted',
-  203: 'Non-Authoritative Information',
-  204: 'No Content',
-  205: 'Reset Content',
-  206: 'Partial Content',
-  207: 'Multi-Status',
-  208: 'Already Reported',
-  226: 'IM Used',
-  300: 'Multiple Choices',
-  301: 'Moved Permanently',
-  302: 'Found',
-  303: 'See Other',
-  304: 'Not Modified',
-  305: 'Use Proxy',
-  306: '(Unused)',
-  307: 'Temporary Redirect',
-  308: 'Permanent Redirect',
-  400: 'Bad Request',
-  401: 'Unauthorized',
-  402: 'Payment Required',
-  403: 'Forbidden',
-  404: 'Not Found',
-  405: 'Method Not Allowed',
-  406: 'Not Acceptable',
-  407: 'Proxy Authentication Required',
-  408: 'Request Timeout',
-  409: 'Conflict',
-  410: 'Gone',
-  411: 'Length Required',
-  412: 'Precondition Failed',
-  413: 'Payload Too Large',
-  414: 'URI Too Long',
-  415: 'Unsupported Media Type',
-  416: 'Range Not Satisfiable',
-  417: 'Expectation Failed',
-  418: "I'm a teapot",
-  421: 'Misdirected Request',
-  422: 'Unprocessable Entity',
-  423: 'Locked',
-  424: 'Failed Dependency',
-  425: 'Unordered Collection',
-  426: 'Upgrade Required',
-  428: 'Precondition Required',
-  429: 'Too Many Requests',
-  431: 'Request Header Fields Too Large',
-  451: 'Unavailable For Legal Reasons',
-  500: 'Internal Server Error',
-  501: 'Not Implemented',
-  502: 'Bad Gateway',
-  503: 'Service Unavailable',
-  504: 'Gateway Timeout',
-  505: 'HTTP Version Not Supported',
-  506: 'Variant Also Negotiates',
-  507: 'Insufficient Storage',
-  508: 'Loop Detected',
-  509: 'Bandwidth Limit Exceeded',
-  510: 'Not Extended',
-  511: 'Network Authentication Required'
-}