lambda-live-debugger 0.0.97 → 0.0.99

package/dist/configuration/getConfigFromWizard.d.ts

@@ -1,10 +1,11 @@
-import { LldConfigBase, LldConfigTs } from "../types/lldConfig.js";
+import { LldConfigBase, LldConfigCliArgs, LldConfigTs } from "../types/lldConfig.js";
 /**
  * Get configuration from wizard
  * @param parameters
  * @returns
  */
-export declare function getConfigFromWizard({ supportedFrameworks, currentFramework, currentConfig, }: {
+export declare function getConfigFromWizard({ configFromCliArgs, supportedFrameworks, currentFramework, currentConfig, }: {
+    configFromCliArgs: LldConfigCliArgs;
     supportedFrameworks: string[];
     currentFramework: string | undefined;
     currentConfig?: LldConfigTs;

package/dist/configuration/getConfigFromWizard.mjs

@@ -13,7 +13,7 @@ const configFileName = path.resolve(configFileDefaultName);
  * @param parameters
  * @returns
  */
-export async function getConfigFromWizard({ supportedFrameworks, currentFramework, currentConfig, }) {
+export async function getConfigFromWizard({ configFromCliArgs, supportedFrameworks, currentFramework, currentConfig, }) {
     let lambdasList;
     let answers = await inquirer.prompt([
         {
@@ -21,13 +21,18 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
             name: "framework",
             message: `Which framework are you using (detected: ${currentFramework ?? "?"})?`,
             choices: [...supportedFrameworks, "other"],
-            default: currentConfig?.framework ?? currentFramework,
+            default: configFromCliArgs.framework ??
+                currentConfig?.framework ??
+                currentFramework,
         },
     ]);
     if (answers.framework === "other") {
         answers.framework = undefined;
     }
     const oldContext = currentConfig?.context ?? [];
+    if (configFromCliArgs.context?.length) {
+        oldContext.push(...configFromCliArgs.context);
+    }
     if (answers.framework === "cdk") {
         const cdkAnswers = await inquirer.prompt([
             {
@@ -68,7 +73,7 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
                 type: "input",
                 name: "stage",
                 message: "Would you like to enter Serverless Framework stage?",
-                default: currentConfig?.stage,
+                default: configFromCliArgs.stage ?? currentConfig?.stage,
             },
         ]);
         answers = { ...answers, ...slsAnswers };
@@ -79,7 +84,7 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
                 type: "input",
                 name: "configEnv",
                 message: "Would you like to enter SAM environment?",
-                default: currentConfig?.configEnv,
+                default: configFromCliArgs.configEnv ?? currentConfig?.configEnv,
             },
         ]);
         answers = { ...answers, ...samAnswers };
@@ -91,7 +96,7 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
             type: "input",
             name: "subfolder",
             message: "If you are using monorepo, enter subfolder where the framework is instaled.",
-            default: currentConfig?.subfolder,
+            default: configFromCliArgs.subfolder ?? currentConfig?.subfolder,
         },
     ]);
     if (answersSubfolder.subfolder) {
@@ -104,7 +109,9 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
             type: "confirm",
             name: "observable",
             message: "Do you want to use observable mode, which just sends events to the debugger and do not use the respose?",
-            default: currentConfig?.observable ?? false,
+            default: configFromCliArgs.observable !== undefined
+                ? configFromCliArgs.observable
+                : currentConfig?.observable,
         },
     ]);
     answers = { ...answers, ...answersObservable };
@@ -114,7 +121,11 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
                 type: "number",
                 name: "interval",
                 message: `Would you like to enter observable mode interval at which events are sent to the debugger? Default is ${defaultObservableInterval}`,
-                default: currentConfig?.interval ?? defaultObservableInterval,
+                default: configFromCliArgs.observable !== undefined
+                    ? configFromCliArgs.observable
+                    : currentConfig?.interval !== undefined
+                        ? currentConfig?.interval
+                        : defaultObservableInterval,
             },
         ]);
         answers = {
@@ -129,19 +140,19 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
             type: "input",
             name: "profile",
             message: "Would you like to use named AWS profile?",
-            default: currentConfig?.profile,
+            default: configFromCliArgs.profile ?? currentConfig?.profile,
         },
         {
             type: "input",
             name: "region",
             message: "Would you like to specify AWS region?",
-            default: currentConfig?.region,
+            default: configFromCliArgs.region ?? currentConfig?.region,
         },
         {
             type: "input",
             name: "role",
             message: "Would you like to specify AWS role?",
-            default: currentConfig?.role,
+            default: configFromCliArgs.role ?? currentConfig?.role,
         },
     ]);
     answers = { ...answers, ...answersAws };
@@ -174,7 +185,7 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
                 name: "function",
                 message: "Pick Lambda to debug",
                 choices: lambdasList.map((l) => l.functionName),
-                default: currentConfig?.function,
+                default: currentConfig?.function ?? lambdasList[0].functionName,
             },
         ]);
         answers.function = lambdas.function;
@@ -188,7 +199,7 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
                 type: "input",
                 name: "name",
                 message: "Enter Lambda name to filter. Use * as wildcard",
-                default: currentConfig?.function,
+                default: configFromCliArgs.function ?? currentConfig?.function,
             },
         ]);
         answers.function = filter.name;
@@ -234,7 +245,10 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
                 default: currentConfig?.verbose === true,
             },
         ]);
-        answers.verbose = answersVerbose.verbose;
+        answers.verbose =
+            configFromCliArgs.verbose !== undefined
+                ? configFromCliArgs.verbose
+                : answersVerbose.verbose;
     }
     /*
   {

package/dist/configuration.mjs

@@ -15,14 +15,16 @@ let lambdasList = undefined;
  */
 async function readConfig() {
     const supportedFrameworks = ResourceDiscovery.getSupportedFrameworksNames();
-    const currentFramework = await ResourceDiscovery.getCurrentFrameworkName();
     const configFromCliArgs = await getConfigFromCliArgs(supportedFrameworks);
+    Configuration.setConfig(configFromCliArgs); // not complete config
+    const currentFramework = await ResourceDiscovery.getCurrentFrameworkName();
     Logger.setVerbose(configFromCliArgs.verbose === true);
     const configFileName = configFromCliArgs.config || configFileDefaultName;
     const configFromConfigFile = (await getConfigTsFromConfigFile(configFileName))
         ?.default;
     if (configFromCliArgs.wizard) {
         const configFromWizard = await getConfigFromWizard({
+            configFromCliArgs,
             supportedFrameworks,
             currentFramework,
             currentConfig: configFromConfigFile,

package/dist/frameworks/cdkFramework.mjs

@@ -7,7 +7,7 @@ import { findPackageJson } from "../utils/findPackageJson.mjs";
 import { CloudFormation } from "../cloudFormation.mjs";
 import { Logger } from "../logger.mjs";
 import { Worker } from "node:worker_threads";
-import { getModuleDirname } from "../getDirname.mjs";
+import { getModuleDirname, getProjectDirname } from "../getDirname.mjs";
 import { Configuration } from "../configuration.mjs";
 /**
  * Support for AWS CDK framework
@@ -190,7 +190,7 @@ export class CdkFramework {
                 });
             },
         };
-        const compileOutput = path.resolve(`${outputFolder}/compiledCdk.js`);
+        const compileOutput = path.join(getProjectDirname(), outputFolder, `compiledCdk.js`);
         try {
             // Build CDK code
             await esbuild.build({

package/dist/nodeEsBuild.mjs

@@ -57,7 +57,7 @@ async function getBuild(functionId) {
         if (!artifactFile) {
             throw new Error(`Artifact file not found for function ${functionId}`);
         }
-        return artifactFile;
+        return path.join(getProjectDirname(), artifactFile);
     }
     catch (error) {
         throw new Error(`Error building function ${functionId}: ${error.message}`, {

package/dist/nodeWorker.mjs

@@ -52,7 +52,7 @@ async function runInWorker(input) {
  * @returns
  */
 function startWorker(input) {
-    Logger.verbose(`[Function ${input.functionId}] [Worker ${input.workerId}] Starting worker`);
+    Logger.verbose(`[Function ${input.functionId}] [Worker ${input.workerId}] Starting worker. Artifact: ${input.artifactFile}`);
     let localProjectDir = getProjectDirname();
     const worker = new Worker(path.resolve(path.join(getModuleDirname(), `./nodeWorkerRunner.mjs`)), {
         env: {

package/dist/nodeWorkerRunner.mjs

@@ -6,7 +6,7 @@ import { Logger } from "./logger.mjs";
 
 Logger.setVerbose(workerData.verbose);
 Logger.verbose(
-  `[Function ${workerData.functionId}] [Worker ${workerData.workerId}] Worker started`
+  `[Function ${workerData.functionId}] [Worker ${workerData.workerId}] Worker started.`
 );
 
 parentPort.on("message", async (data) => {

package/dist/vsCode.mjs

@@ -22,16 +22,16 @@ async function getVsCodeLaunchConfig(lldConfig) {
     };
     const moduleDirname = getModuleDirname();
     //Logger.log("Module folder", moduleDirname);
-    const currentFolder = path.resolve();
+    const projectDirname = getProjectDirname();
     //Logger.log("Current folder", currentFolder);
-    const localFolder = path.join(currentFolder, "node_modules/.bin/lld");
+    const localFolder = path.resolve(path.join(projectDirname, "node_modules/.bin/lld"));
     let runtimeExecutableSet = false;
     //if installed locally
     if (moduleDirname.startsWith("/home/")) {
         Logger.verbose("Lambda Live Debugger is installed locally");
         // check if file exists
         try {
-            //Logger.log("Checking local folder", localFolder);
+            Logger.log("Checking local folder for runtimeExecutable setting for VsCode configuration", localFolder);
             await fs.access(localFolder, fs.constants.F_OK);
             config.configurations[0].runtimeExecutable = localRuntimeExecutable;
             runtimeExecutableSet = true;
@@ -46,11 +46,13 @@ async function getVsCodeLaunchConfig(lldConfig) {
     }
     if (!runtimeExecutableSet) {
         Logger.verbose(`Setting absolute path for runtimeExecutable setting for VsCode configuration`);
+        const localFolderSubfolder = path.resolve("node_modules/.bin/lld");
         const globalModule1 = path.join(moduleDirname, "..", "..", ".bin/lld");
         const globalModule2 = path.join(moduleDirname, "..", "..", "bin/lld");
         const globalModule3 = path.join(moduleDirname, "..", "..", "..", "..", "bin/lld");
         const possibleFolders = {
             [localFolder]: "${workspaceFolder}/node_modules/.bin/lld",
+            [localFolderSubfolder]: localFolderSubfolder,
             [globalModule1]: globalModule1,
             [globalModule2]: globalModule2,
             [globalModule3]: globalModule3,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambda-live-debugger",
-  "version": "0.0.97",
+  "version": "0.0.99",
   "type": "module",
   "description": "Debug Lambda functions locally like it is running in the cloud",
   "repository": {