lambda-live-debugger 1.2.6 → 1.4.0

package/dist/frameworks/slsFramework.mjs

@@ -51,51 +51,35 @@ export class SlsFramework {
         let resolveVariablesMeta;
         let sources;
         let Serverless;
+        let error1;
         try {
-            // lazy load modules
-            resolveConfigurationPath = (await import(
-            //@ts-ignore
-            'serverless/lib/cli/resolve-configuration-path.js')).default;
-            readConfiguration = (await import(
-            //@ts-ignore
-            'serverless/lib/configuration/read.js')).default;
-            resolveVariables = (await import(
-            //@ts-ignore
-            'serverless/lib/configuration/variables/resolve.js')).default;
-            resolveVariablesMeta = (await import(
-            //@ts-ignore
-            'serverless/lib/configuration/variables/resolve-meta.js')).default;
-            const env = await import(
-            //@ts-ignore
-            'serverless/lib/configuration/variables/sources/env.js');
-            const file = await import(
-            //@ts-ignore
-            'serverless/lib/configuration/variables/sources/file.js');
-            const opt = await import(
-            //@ts-ignore
-            'serverless/lib/configuration/variables/sources/opt.js');
-            const self = await import(
-            //@ts-ignore
-            'serverless/lib/configuration/variables/sources/self.js');
-            const strToBool = await import(
-            //@ts-ignore
-            'serverless/lib/configuration/variables/sources/str-to-bool.js');
-            const sls = await import(
-            //@ts-ignores
-            'serverless/lib/configuration/variables/sources/instance-dependent/get-sls.js');
-            sources = {
-                env: env.default,
-                file: file.default,
-                opt: opt.default,
-                self: self.default,
-                strToBool: strToBool.default,
-                sls: sls.default(),
-            };
-            Serverless = (await import('serverless')).default;
+            try {
+                const frameworkFunctions = await loadFramework('serverless');
+                resolveConfigurationPath = frameworkFunctions.resolveConfigurationPath;
+                readConfiguration = frameworkFunctions.readConfiguration;
+                resolveVariables = frameworkFunctions.resolveVariables;
+                resolveVariablesMeta = frameworkFunctions.resolveVariablesMeta;
+                sources = frameworkFunctions.sources;
+                Serverless = frameworkFunctions.Serverless;
+                Logger.verbose(`[SLS] Npm module 'serverless' loaded`);
+            }
+            catch (error) {
+                Logger.verbose(`[SLS] Failed to load npm module 'serverless'`, error);
+                error1 = error;
+                const frameworkFunctions = await loadFramework('osls');
+                resolveConfigurationPath = frameworkFunctions.resolveConfigurationPath;
+                readConfiguration = frameworkFunctions.readConfiguration;
+                resolveVariables = frameworkFunctions.resolveVariables;
+                resolveVariablesMeta = frameworkFunctions.resolveVariablesMeta;
+                sources = frameworkFunctions.sources;
+                Serverless = frameworkFunctions.Serverless;
+                Logger.verbose(`[SLS] Npm module 'osls' loaded`);
+            }
         }
-        catch (error) {
-            Logger.error('Error loading serverless modules', error);
-            Logger.log('If you are running Lambda Live Debugger from a global installation, install Serverless Framework globally as well. If you are using monorepo, install Serverless Framework also in the project root folder.');
+        catch (error2) {
+            const error = error1 ?? error2;
+            Logger.error('Error loading serverless (or osls) module', error);
+            Logger.log('If you are running Lambda Live Debugger from a global installation, install Serverless Framework globally as well. If you are using monorepo, install Serverless Framework also in the project root folder. The fork of Serverless Framework https://github.com/oss-serverless/serverless is also supported.');
             throw new Error(`Error loading serverless modules. ${error.message}`, {
                 cause: error,
             });
@@ -242,3 +226,53 @@ export class SlsFramework {
     }
 }
 export const slsFramework = new SlsFramework();
+async function loadFramework(npmName) {
+    // lazy load modules
+    const resolveConfigurationPath = (await import(
+    //@ts-ignore
+    `${npmName}/lib/cli/resolve-configuration-path.js`)).default;
+    const readConfiguration = (await import(
+    //@ts-ignore
+    `${npmName}/lib/configuration/read.js`)).default;
+    const resolveVariables = (await import(
+    //@ts-ignore
+    `${npmName}/lib/configuration/variables/resolve.js`)).default;
+    const resolveVariablesMeta = (await import(
+    //@ts-ignore
+    `${npmName}/lib/configuration/variables/resolve-meta.js`)).default;
+    const env = await import(
+    //@ts-ignore
+    `${npmName}/lib/configuration/variables/sources/env.js`);
+    const file = await import(
+    //@ts-ignore
+    `${npmName}/lib/configuration/variables/sources/file.js`);
+    const opt = await import(
+    //@ts-ignore
+    `${npmName}/lib/configuration/variables/sources/opt.js`);
+    const self = await import(
+    //@ts-ignore
+    `${npmName}/lib/configuration/variables/sources/self.js`);
+    const strToBool = await import(
+    //@ts-ignore
+    `${npmName}/lib/configuration/variables/sources/str-to-bool.js`);
+    const sls = await import(
+    //@ts-ignores
+    `${npmName}/lib/configuration/variables/sources/instance-dependent/get-sls.js`);
+    const sources = {
+        env: env.default,
+        file: file.default,
+        opt: opt.default,
+        self: self.default,
+        strToBool: strToBool.default,
+        sls: sls.default(),
+    };
+    const Serverless = (await import(npmName)).default;
+    return {
+        resolveConfigurationPath,
+        readConfiguration,
+        resolveVariablesMeta,
+        resolveVariables,
+        sources,
+        Serverless,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambda-live-debugger",
-  "version": "1.2.6",
+  "version": "1.4.0",
   "type": "module",
   "description": "Debug Lambda functions locally like it is running in the cloud",
   "repository": {
@@ -60,6 +60,12 @@
     "test-sls-esbuild-cjs-observable": "npm run build && RUN_TEST_FROM_CLI=true OBSERVABLE_MODE=true vitest run test/sls-esbuild-cjs.test.ts",
     "test-sls-esbuild-esm": "npm run build && RUN_TEST_FROM_CLI=true vitest run test/sls-esbuild-esm.test.ts",
     "test-sls-esbuild-esm-observable": "npm run build && RUN_TEST_FROM_CLI=true OBSERVABLE_MODE=true vitest run test/sls-esbuild-esm.test.ts",
+    "test-osls-basic": "npm run build && RUN_TEST_FROM_CLI=true vitest run test/osls-basic.test.ts",
+    "test-osls-basic-observable": "npm run build && RUN_TEST_FROM_CLI=true OBSERVABLE_MODE=true vitest run test/osls-basic.test.ts",
+    "test-osls-esbuild-cjs": "npm run build && RUN_TEST_FROM_CLI=true vitest run test/osls-esbuild-cjs.test.ts",
+    "test-osls-esbuild-cjs-observable": "npm run build && RUN_TEST_FROM_CLI=true OBSERVABLE_MODE=true vitest run test/osls-esbuild-cjs.test.ts",
+    "test-osls-esbuild-esm": "npm run build && RUN_TEST_FROM_CLI=true vitest run test/osls-esbuild-esm.test.ts",
+    "test-osls-esbuild-esm-observable": "npm run build && RUN_TEST_FROM_CLI=true OBSERVABLE_MODE=true vitest run test/osls-esbuild-esm.test.ts",
     "test-sam-basic": "npm run build && RUN_TEST_FROM_CLI=true vitest run test/sam-basic.test.ts",
     "test-sam-basic-observable": "npm run build && RUN_TEST_FROM_CLI=true OBSERVABLE_MODE=true vitest run test/sam-basic.test.ts",
     "test-sam-alt": "npm run build && RUN_TEST_FROM_CLI=true vitest run test/sam-alt.test.ts",
@@ -89,6 +95,7 @@
     "prettier": "^3.3.3",
     "semantic-release": "^23.0.8",
     "serverless": "^3.38.0",
+    "osls": "^3.41.0",
     "serverless-esbuild": "^1.52.1",
     "tsx": "^4.7.1",
     "typescript-eslint": "^8.0.0",
@@ -141,6 +148,10 @@
     "test/cdk-config",
     "test/sls-basic",
     "test/sls-esbuild",
+    "test/sls-esbuild-cjs",
+    "test/osls-basic",
+    "test/osls-esbuild",
+    "test/osls-esbuild-cjs",
     "test/sam-basic",
     "test/sam-alt",
     "test/terraform-basic"

package/prepareForTest.js

@@ -0,0 +1,33 @@
+import { readFile, writeFile } from 'fs/promises';
+import { argv } from 'process';
+
+/**
+ * Prepare the package.json file for testing.
+ * Remove everything that is not needed for testing.
+ * @param {*} testCase
+ */
+async function modifyPackageJson(testCase) {
+  const filePath = 'package.json';
+
+  const data = await readFile(filePath, 'utf-8');
+  const packageJson = JSON.parse(data);
+
+  // Delete scripts and devDependencies nodes
+  delete packageJson.scripts;
+  delete packageJson.devDependencies;
+
+  // Replace workspaces node with the test and the test case workspaces
+  // With this all the necessary npm packages will be installed
+  packageJson.workspaces = ['test', `test/${testCase}`];
+
+  await writeFile(filePath, JSON.stringify(packageJson, null, 2), 'utf-8');
+  console.log(`Modified ${filePath} successfully!`);
+}
+
+const [testCase] = argv.slice(2);
+if (!testCase) {
+  console.error('Usage: node prepareForTest.js <testCase>');
+  process.exit(1);
+}
+
+void modifyPackageJson(testCase).catch(console.error);