serverless-offline 8.6.0 → 8.8.1

package/dist/lambda/handler-runner/python-runner/PythonRunner.js

@@ -5,18 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _child_process = require("child_process");
+
 var _os = require("os");
 
 var _path = require("path");
 
-var _child_process = require("child_process");
-
-var _extend = _interopRequireDefault(require("extend"));
+var _process = _interopRequireWildcard(require("process"));
 
 var _readline = _interopRequireDefault(require("readline"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; }
 
 var id = 0;
@@ -28,8 +32,8 @@ const {
   stringify
 } = JSON;
 const {
-  cwd
-} = process;
+  assign
+} = Object;
 const {
   has
 } = Reflect;
@@ -84,15 +88,15 @@ class PythonRunner {
       this.v3Utils = v3Utils;
     }
 
-    if (process.env.VIRTUAL_ENV) {
+    if (_process.default.env.VIRTUAL_ENV) {
       const runtimeDir = (0, _os.platform)() === 'win32' ? 'Scripts' : 'bin';
-      process.env.PATH = [(0, _path.join)(process.env.VIRTUAL_ENV, runtimeDir), _path.delimiter, process.env.PATH].join('');
+      _process.default.env.PATH = [(0, _path.join)(_process.default.env.VIRTUAL_ENV, runtimeDir), _path.delimiter, _process.default.env.PATH].join('');
     }
 
     const [pythonExecutable] = _classPrivateFieldLooseBase(this, _runtime)[_runtime].split('.');
 
-    this.handlerProcess = (0, _child_process.spawn)(pythonExecutable, ['-u', (0, _path.resolve)(__dirname, 'invoke.py'), (0, _path.relative)(cwd(), _classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath]), _classPrivateFieldLooseBase(this, _handlerName)[_handlerName]], {
-      env: (0, _extend.default)(process.env, _classPrivateFieldLooseBase(this, _env)[_env]),
+    this.handlerProcess = (0, _child_process.spawn)(pythonExecutable, ['-u', (0, _path.resolve)(__dirname, 'invoke.py'), (0, _path.relative)((0, _process.cwd)(), _classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath]), _classPrivateFieldLooseBase(this, _handlerName)[_handlerName]], {
+      env: assign(_process.default.env, _classPrivateFieldLooseBase(this, _env)[_env]),
       shell: true
     });
     this.handlerProcess.stdout.readline = _readline.default.createInterface({
@@ -168,7 +172,8 @@ class PythonRunner {
 
       this.handlerProcess.stdout.readline.on('line', onLine);
       this.handlerProcess.stderr.on('data', onErr);
-      process.nextTick(() => {
+
+      _process.default.nextTick(() => {
         this.handlerProcess.stdin.write(input);
         this.handlerProcess.stdin.write('\n');
       });

package/dist/lambda/handler-runner/ruby-runner/RubyRunner.js

@@ -9,6 +9,8 @@ var _os = require("os");
 
 var _path = require("path");
 
+var _process = require("process");
+
 var _execa = _interopRequireDefault(require("execa"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -23,9 +25,6 @@ const {
   parse,
   stringify
 } = JSON;
-const {
-  cwd
-} = process;
 const {
   has
 } = Reflect;
@@ -120,7 +119,7 @@ class RubyRunner {
       allowCache: _classPrivateFieldLooseBase(this, _allowCache)[_allowCache]
     }); // console.log(input)
 
-    const ruby = (0, _execa.default)(runtime, [(0, _path.resolve)(__dirname, 'invoke.rb'), (0, _path.relative)(cwd(), _classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath]), _classPrivateFieldLooseBase(this, _handlerName)[_handlerName]], {
+    const ruby = (0, _execa.default)(runtime, [(0, _path.resolve)(__dirname, 'invoke.rb'), (0, _path.relative)((0, _process.cwd)(), _classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath]), _classPrivateFieldLooseBase(this, _handlerName)[_handlerName]], {
       env: _classPrivateFieldLooseBase(this, _env)[_env],
       input // shell: true,
 

package/dist/lambda/handler-runner/worker-thread-runner/WorkerThreadRunner.js

@@ -39,7 +39,6 @@ class WorkerThreadRunner {
       functionKey,
       handlerName,
       handlerPath,
-      handlerModuleNesting,
       timeout
     } = funOptions;
     _classPrivateFieldLooseBase(this, _allowCache)[_allowCache] = allowCache;
@@ -50,7 +49,6 @@ class WorkerThreadRunner {
         functionKey,
         handlerName,
         handlerPath,
-        handlerModuleNesting,
         timeout
       }
     });

package/dist/lambda/handler-runner/worker-thread-runner/workerThreadHelper.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _process = require("process");
+
 var _worker_threads = require("worker_threads");
 
 var _index = _interopRequireDefault(require("../in-process-runner/index.js"));
@@ -10,8 +12,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const {
   functionKey,
   handlerName,
-  handlerPath,
-  handlerModuleNesting
+  handlerPath
 } = _worker_threads.workerData;
 
 _worker_threads.parentPort.on('message', async messageData => {
@@ -23,7 +24,7 @@ _worker_threads.parentPort.on('message', async messageData => {
     allowCache
   } = messageData; // TODO we could probably cache this in the module scope?
 
-  const inProcessRunner = new _index.default(functionKey, handlerPath, handlerName, handlerModuleNesting, process.env, timeout, allowCache);
+  const inProcessRunner = new _index.default(functionKey, handlerPath, handlerName, _process.env, timeout, allowCache);
   const result = await inProcessRunner.run(event, context); // TODO check serializeability (contains function, symbol etc)
 
   port.postMessage(result);

package/dist/utils/generateHapiPath.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = generateHapiPath;
 
-function generateHapiPath(path = '', options, serverless) {
+function generateHapiPath(path, options, serverless) {
   // path must start with '/'
   let hapiPath = path.startsWith('/') ? path : `/${path}`;
 

package/dist/utils/getHttpApiCorsConfig.js

@@ -7,8 +7,6 @@ exports.default = getHttpApiCorsConfig;
 
 var _debugLog = _interopRequireDefault(require("../debugLog.js"));
 
-var _serverlessLog = require("../serverlessLog.js");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function getHttpApiCorsConfig(httpApiCors, {
@@ -24,20 +22,18 @@ function getHttpApiCorsConfig(httpApiCors, {
     };
 
     if (log) {
-      log.warning(c);
+      log.debug('Using CORS policy', c);
     } else {
-      (0, _debugLog.default)(c);
-      (0, _serverlessLog.logWarning)(c);
+      (0, _debugLog.default)('Using CORS policy', c);
     }
 
     return c;
   }
 
   if (log) {
-    log.warning(httpApiCors);
+    log.debug('Using CORS policy', httpApiCors);
   } else {
-    (0, _debugLog.default)(httpApiCors);
-    (0, _serverlessLog.logWarning)(httpApiCors);
+    (0, _debugLog.default)('Using CORS policy', httpApiCors);
   }
 
   return httpApiCors;

package/dist/utils/index.js

@@ -59,6 +59,12 @@ Object.defineProperty(exports, "jsonPath", {
     return _jsonPath.default;
   }
 });
+Object.defineProperty(exports, "lowerCaseKeys", {
+  enumerable: true,
+  get: function () {
+    return _lowerCaseKeys.default;
+  }
+});
 exports.nullIfEmpty = nullIfEmpty;
 Object.defineProperty(exports, "parseHeaders", {
   enumerable: true,
@@ -110,6 +116,8 @@ var _getHttpApiCorsConfig = _interopRequireDefault(require("./getHttpApiCorsConf
 
 var _jsonPath = _interopRequireDefault(require("./jsonPath.js"));
 
+var _lowerCaseKeys = _interopRequireDefault(require("./lowerCaseKeys.js"));
+
 var _parseHeaders = _interopRequireDefault(require("./parseHeaders.js"));
 
 var _parseMultiValueHeaders = _interopRequireDefault(require("./parseMultiValueHeaders.js"));
@@ -130,16 +138,15 @@ var _generateHapiPath = _interopRequireDefault(require("./generateHapiPath.js"))
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// export { default as baseImage } from './baseImage.js'
 const {
   isArray
 } = Array;
 const {
   keys
-} = Object;
-
-// export { default as baseImage } from './baseImage.js'
-// Detect the toString encoding from the request headers content-type
+} = Object; // Detect the toString encoding from the request headers content-type
 // enhance if further content types need to be non utf8 encoded.
+
 function detectEncoding(request) {
   const contentType = request.headers['content-type'];
   return typeof contentType === 'string' && contentType.includes('multipart/form-data') ? 'binary' : 'utf8';

package/dist/utils/lowerCaseKeys.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = parseHeaders;
+const {
+  entries,
+  fromEntries
+} = Object; // (obj: { [string]: string }): { [Lowercase<string>]: string }
+
+function parseHeaders(obj) {
+  return fromEntries(entries(obj).map(([k, v]) => [k.toLowerCase(), v]));
+}

package/dist/utils/resolveJoins.js

@@ -4,15 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = resolveJoins;
+const {
+  keys
+} = Object; // Used to resolve Fn::Join in environment variables
 
-// Used to resolve Fn::Join in environment variables
 function resolveJoins(environment) {
   if (!environment) {
     return undefined;
   }
 
   const newEnv = {};
-  Object.keys(environment).forEach(key => {
+  keys(environment).forEach(key => {
     const value = environment[key];
 
     if (!value) {

package/dist/utils/splitHandlerPathAndName.js

@@ -8,18 +8,18 @@ exports.default = splitHandlerPathAndName;
 // some-folder/src.index => some-folder/src
 function splitHandlerPathAndName(handler) {
   // Split handler into method name and path i.e. handler.run
-  const prepathDelimiter = handler.lastIndexOf('/');
-  const prepath = handler.substr(0, prepathDelimiter + 1); // include '/' for path
-
-  const postpath = handler.substr(prepathDelimiter + 1); // Support Ruby paths with namespace resolution operators e.g.
+  // Support Ruby paths with namespace resolution operators e.g.
   //  ./src/somefolder/source.LambdaFunctions::Handler.process
   //  prepath: ./src/somefolder/
   //  postpath: source.LambdaFunctions::Handler.process
   //  filename: source
   //  path: ./src/somefolder/source
   //  name: LambdaFunctions::Handler.process
-
   if (handler.match(/::/)) {
+    const prepathDelimiter = handler.lastIndexOf('/');
+    const prepath = handler.substr(0, prepathDelimiter + 1); // include '/' for path
+
+    const postpath = handler.substr(prepathDelimiter + 1);
     const nameDelimiter = postpath.indexOf('.');
     const filename = postpath.substr(0, nameDelimiter);
     const path = prepath + filename;
@@ -30,12 +30,8 @@ function splitHandlerPathAndName(handler) {
   //  name: run
 
 
-  const [filename, ...moduleNesting] = postpath.split('.');
-  const [name] = moduleNesting.slice(-1);
-  const path = prepath + filename; // module nesting has been added to support when the
-  // handler function is buried deep inside of a module
-  // e.g /src/somefoler/handlers/index.layer1.layer2.handler
-  // AWS supports this feature
-
-  return [path, name, moduleNesting];
+  const delimiter = handler.lastIndexOf('.');
+  const path = handler.substr(0, delimiter);
+  const name = handler.substr(delimiter + 1);
+  return [path, name];
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "8.6.0",
+  "version": "8.8.1",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "main": "dist/main.js",
@@ -118,6 +118,7 @@
     "kobanyan (https://github.com/kobanyan)",
     "Leonardo Alifraco (https://github.com/lalifraco-devspark)",
     "Leonardo Medici (https://github.com/doclm)",
+    "Luciano Jesus Lima (https://github.com/brazilianbytes)",
     "Luke Chavers (https://github.com/vmadman)",
     "Manuel Böhm (https://github.com/boehmers)",
     "Marc Campbell (https://github.com/marccampbell)",
@@ -204,59 +205,54 @@
   "dependencies": {
     "@hapi/boom": "^9.1.4",
     "@hapi/h2o2": "^9.1.0",
-    "@hapi/hapi": "^20.2.1",
-    "aws-sdk": "^2.1097.0",
+    "@hapi/hapi": "^20.2.2",
+    "aws-sdk": "^2.1136.0",
     "boxen": "^5.1.2",
     "chalk": "^4.1.2",
     "cuid": "^2.1.8",
     "execa": "^5.1.1",
-    "extend": "^3.0.2",
-    "fs-extra": "^9.1.0",
+    "fs-extra": "^10.1.0",
     "java-invoke-local": "0.0.6",
     "js-string-escape": "^1.0.1",
     "jsonpath-plus": "^5.1.0",
     "jsonschema": "^1.4.0",
     "jsonwebtoken": "^8.5.1",
-    "jszip": "^3.7.1",
-    "luxon": "^1.28.0",
+    "jszip": "^3.9.1",
+    "luxon": "^2.4.0",
     "node-fetch": "^2.6.7",
-    "node-schedule": "^1.3.3",
-    "object.fromentries": "^2.0.5",
+    "node-schedule": "^2.1.0",
     "p-memoize": "^4.0.4",
     "p-queue": "^6.6.2",
-    "p-retry": "^4.6.1",
-    "please-upgrade-node": "^3.2.0",
-    "semver": "^7.3.5",
-    "update-notifier": "^5.1.0",
+    "p-retry": "^4.6.2",
+    "semver": "^7.3.7",
     "velocityjs": "^2.0.6",
     "ws": "^7.5.7"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.6",
-    "@babel/core": "^7.17.8",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/cli": "^7.17.10",
+    "@babel/core": "^7.17.12",
+    "@babel/plugin-proposal-class-properties": "^7.17.12",
     "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-    "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-    "@babel/plugin-transform-modules-commonjs": "^7.17.7",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
+    "@babel/plugin-proposal-optional-chaining": "^7.17.12",
+    "@babel/plugin-transform-modules-commonjs": "^7.17.12",
     "@babel/register": "^7.17.7",
-    "archiver": "^5.3.0",
-    "babel-eslint": "^10.1.0",
+    "archiver": "^5.3.1",
     "copyfiles": "^2.4.1",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-config-prettier": "^7.2.0",
+    "eslint": "^8.15.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-prettier": "^4.0.0",
     "git-list-updated": "^1.2.1",
     "husky": "^4.3.8",
     "jest": "^26.6.3",
     "lint-staged": "^11.2.6",
     "p-map": "^4.0.0",
-    "prettier": "^2.6.0",
+    "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
     "serverless": "^2.72.3",
-    "standard-version": "^9.3.2"
+    "standard-version": "^9.5.0"
   },
   "peerDependencies": {
     "serverless": "^1.60.0 || 2 || 3"

package/dist/checkEngine.js

@@ -1,21 +0,0 @@
-"use strict";
-
-var _pleaseUpgradeNode = _interopRequireDefault(require("please-upgrade-node"));
-
-var _package = _interopRequireDefault(require("../package.json"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// NOTE: important, don't use any new javascript language features in this file!
-// (other than es6 modules, which are transpiled)
-const currentNodeVersion = process.versions.node;
-
-const requiredNodeVersion = _package.default.engines.node.replace('>=', '');
-
-(0, _pleaseUpgradeNode.default)(_package.default, {
-  message: function message() {
-    return (// eslint-disable-next-line prefer-template
-      'serverless-offline requires node.js version ' + requiredNodeVersion + ' or higher, but found version ' + currentNodeVersion + '. Please upgrade!'
-    );
-  }
-});