@entur/function-tools 0.0.6 → 0.0.7

package/bin/enturFunctions.js

@@ -5,7 +5,7 @@ import { registerStart } from '../lib/commands/start.js';
 import { registerUnusedExports } from '../lib/commands/unusedExports.js';
 
 const program = new Command();
-program.name("entur-functions").description("A multi-tool for Firebase functions at Entur").version("0.0.6").option("-v, --verbose", "Enable verbose output");
+program.name("entur-functions").description("A multi-tool for Firebase functions at Entur").version("0.0.7").option("-v, --verbose", "Enable verbose output");
 registerBuild(program);
 registerDeploy(program);
 registerStart(program);

package/lib/commands/deploy.js

@@ -9,17 +9,17 @@ import { getWorkspacePackageNames } from '../utils/workspace.js';
 import { resolveProjectConfig, copyEnvFiles } from './utils.js';
 
 function registerDeploy(program) {
-    program.command("deploy").description("Deploy the project").option("-o, --output-dir <dir>", "Output directory").option("-P, --project <project id or alias>", "Project id or alias").action(async (options)=>{
+    program.command("deploy").description("Deploy the project").option("-o, --output-dir <dir>", "Output directory").option("-P, --project <project id or alias>", "Project id or alias").option("--debug", "print verbose debug output and keep a debug log file", false).action(async (options)=>{
         try {
             const projectConfig = await resolveProjectConfig(options);
-            await deploy(projectConfig);
+            await deploy(options.debug, projectConfig);
         } catch (error) {
             console.error(error);
             process.exit(1);
         }
     });
 }
-async function deploy(projectConfig) {
+async function deploy(debug, projectConfig) {
     const { projectAlias, projectId, packageJSON, packageRoot, pnpmWorkspaceYAML, projectRoot, outputDir } = projectConfig;
     const { name, exports: exports$1 } = await readPackageJSON(packageJSON);
     const workspacePackages = await getWorkspacePackageNames(pnpmWorkspaceYAML);
@@ -34,7 +34,8 @@ async function deploy(projectConfig) {
     console.log(`🚢 Deploying to ${projectAlias} (${projectId})`);
     await deploy$1({
         projectId,
-        cwd: outputDir
+        cwd: outputDir,
+        debug
     });
 }
 async function build(entryFile, packagesToInline, { outputDir, packageRoot, projectRoot }) {

package/lib/commands/start.js

@@ -9,20 +9,20 @@ import { getWorkspacePackageNames } from '../utils/workspace.js';
 import { resolveProjectConfig, copyEnvFiles } from './utils.js';
 
 function registerStart(program) {
-    program.command("start").description("Start function emulator").option("-o, --output-dir <dir>", "Output directory").option("-P, --project <project id or alias>", "Project id or alias").option("--inspect-functions [port]", "emulate Cloud Functions in debug mode with the node inspector on the given port (9229 if not specified)").action(async (options)=>{
+    program.command("start").description("Start function emulator").option("-o, --output-dir <dir>", "Output directory").option("-P, --project <project id or alias>", "Project id or alias").option("--inspect-functions [port]", "emulate Cloud Functions in debug mode with the node inspector on the given port (9229 if not specified)", false).option("--debug", "print verbose debug output and keep a debug log file", false).action(async (options)=>{
         try {
             const projectConfig = await resolveProjectConfig({
                 ...options,
                 isEmulator: true
             });
-            await start(options.inspectFunctions ?? false, projectConfig);
+            await start(options.debug, options.inspectFunctions, projectConfig);
         } catch (error) {
             console.error(error);
             process.exit(1);
         }
     });
 }
-async function start(inspectFunctions, projectConfig) {
+async function start(debug, inspectFunctions, projectConfig) {
     const { packageRoot, packageJSON, projectId, projectRoot, pnpmWorkspaceYAML, outputDir } = projectConfig;
     const { name, exports: exports$1 } = await readPackageJSON(packageJSON);
     const codebase = getPackageName(name);
@@ -41,6 +41,7 @@ async function start(inspectFunctions, projectConfig) {
             startEmulator({
                 projectId,
                 cwd: outputDir,
+                debug,
                 inspectFunctions
             }).catch((error)=>{
                 console.error(error);

package/lib/firebase/index.js

@@ -1,13 +1,19 @@
 import { spawnAsync } from '../utils/exec.js';
 
 const FUNCTIONS_DISCOVERY_TIMEOUT = "30";
-function deploy({ projectId, cwd }) {
+function deploy({ projectId, cwd, debug }) {
+    const extraArgs = [];
+    if (debug) {
+        console.log("Environment variables:", process.env);
+        extraArgs.push("--debug");
+    }
     return spawnAsync("firebase", [
         "deploy",
         "--only",
         "functions,firestore",
         "-P",
-        projectId
+        projectId,
+        ...extraArgs
     ], {
         cwd,
         env: {
@@ -16,17 +22,17 @@ function deploy({ projectId, cwd }) {
         }
     });
 }
-function startEmulator({ projectId, cwd, inspectFunctions }) {
-    let extraArgs = [];
-    if (typeof inspectFunctions === "string") {
-        extraArgs = [
-            "--inspect-functions",
-            inspectFunctions
-        ];
-    } else if (inspectFunctions) {
-        extraArgs = [
-            "--inspect-functions"
-        ];
+function startEmulator({ projectId, cwd, debug, inspectFunctions }) {
+    const extraArgs = [];
+    if (inspectFunctions) {
+        if (typeof inspectFunctions === "string") {
+            extraArgs.push("--inspect-functions", inspectFunctions);
+        } else {
+            extraArgs.push("--inspect-functions");
+        }
+    }
+    if (debug) {
+        extraArgs.push("--debug");
     }
     return spawnAsync("firebase", [
         "emulators:start",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@entur/function-tools",
   "type": "module",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "publishConfig": {
     "access": "public"
   },