@entur/function-tools 0.0.7 → 0.0.8

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.7").option("-v, --verbose", "Enable verbose output");
+program.name("entur-functions").description("A multi-tool for Firebase functions at Entur").version("0.0.8").option("-v, --verbose", "Enable verbose output");
 registerBuild(program);
 registerDeploy(program);
 registerStart(program);

package/lib/commands/build.js

@@ -7,24 +7,25 @@ import { getWorkspacePackageNames } from '../utils/workspace.js';
 import { resolveProjectConfig } from './utils.js';
 
 function registerBuild(program) {
-    program.command("build").description("Build the project").option("-o, --output-dir <dir>", "Output directory").action(async (options)=>{
+    program.command("build").description("Build the project").option("-o, --output-dir <dir>", "Output directory").action(async ({ outputDir })=>{
         try {
-            const projectConfig = await resolveProjectConfig(options);
-            const { packageRoot, packageJSON, outputDir, pnpmWorkspaceYAML } = projectConfig;
-            const { name, exports: exports$1 } = await readPackageJSON(packageJSON);
-            console.log("🧹 Cleaning dist folder");
-            await cleanDir(outputDir);
-            console.log(`🔨 Building ${name}`);
-            const workspacePackages = await getWorkspacePackageNames(pnpmWorkspaceYAML);
-            const entryFile = new URL(exports$1?.["."] ?? "./index.js", packageRoot);
-            await build(entryFile, workspacePackages, projectConfig);
+            const projectConfig = await resolveProjectConfig({
+                outputDir
+            });
+            await build(projectConfig);
         } catch (error) {
             console.error(error);
             process.exit(1);
         }
     });
 }
-async function build(entryFile, packagesToInline, { outputDir, packageRoot, projectRoot }) {
+async function build({ packageRoot, projectRoot, packageJSON, outputDir, pnpmWorkspaceYAML }) {
+    const { name, exports: exports$1 } = await readPackageJSON(packageJSON);
+    console.log("🧹 Cleaning dist folder");
+    await cleanDir(outputDir);
+    console.log(`🔨 Building ${name}`);
+    const packagesToInline = await getWorkspacePackageNames(pnpmWorkspaceYAML);
+    const entryFile = new URL(exports$1?.["."] ?? "./index.js", packageRoot);
     const { output } = await bundle(entryFile, {
         outputDir,
         packageRoot,

package/lib/commands/deploy.js

@@ -9,17 +9,20 @@ 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").option("--debug", "print verbose debug output and keep a debug log file", false).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).option("--force", "delete missing Cloud Functions and bypass interactive prompts", false).action(async ({ outputDir, project, ...options })=>{
         try {
-            const projectConfig = await resolveProjectConfig(options);
-            await deploy(options.debug, projectConfig);
+            const projectConfig = await resolveProjectConfig({
+                outputDir,
+                project
+            });
+            await deploy(options, projectConfig);
         } catch (error) {
             console.error(error);
             process.exit(1);
         }
     });
 }
-async function deploy(debug, projectConfig) {
+async function deploy(options, projectConfig) {
     const { projectAlias, projectId, packageJSON, packageRoot, pnpmWorkspaceYAML, projectRoot, outputDir } = projectConfig;
     const { name, exports: exports$1 } = await readPackageJSON(packageJSON);
     const workspacePackages = await getWorkspacePackageNames(pnpmWorkspaceYAML);
@@ -35,7 +38,7 @@ async function deploy(debug, projectConfig) {
     await deploy$1({
         projectId,
         cwd: outputDir,
-        debug
+        ...options
     });
 }
 async function build(entryFile, packagesToInline, { outputDir, packageRoot, projectRoot }) {

package/lib/commands/start.js

@@ -9,20 +9,21 @@ 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)", false).option("--debug", "print verbose debug output and keep a debug log file", false).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 ({ outputDir, project, ...options })=>{
         try {
             const projectConfig = await resolveProjectConfig({
-                ...options,
+                outputDir,
+                project,
                 isEmulator: true
             });
-            await start(options.debug, options.inspectFunctions, projectConfig);
+            await start(options, projectConfig);
         } catch (error) {
             console.error(error);
             process.exit(1);
         }
     });
 }
-async function start(debug, inspectFunctions, projectConfig) {
+async function start(options, projectConfig) {
     const { packageRoot, packageJSON, projectId, projectRoot, pnpmWorkspaceYAML, outputDir } = projectConfig;
     const { name, exports: exports$1 } = await readPackageJSON(packageJSON);
     const codebase = getPackageName(name);
@@ -41,8 +42,7 @@ async function start(debug, inspectFunctions, projectConfig) {
             startEmulator({
                 projectId,
                 cwd: outputDir,
-                debug,
-                inspectFunctions
+                ...options
             }).catch((error)=>{
                 console.error(error);
             });

package/lib/firebase/index.js

@@ -1,12 +1,14 @@
 import { spawnAsync } from '../utils/exec.js';
 
 const FUNCTIONS_DISCOVERY_TIMEOUT = "30";
-function deploy({ projectId, cwd, debug }) {
+function deploy({ projectId, cwd, debug, force }) {
     const extraArgs = [];
     if (debug) {
-        console.log("Environment variables:", process.env);
         extraArgs.push("--debug");
     }
+    if (force) {
+        extraArgs.push("--force");
+    }
     return spawnAsync("firebase", [
         "deploy",
         "--only",

package/lib/utils/fs.js

@@ -1,4 +1,4 @@
-import { rm, mkdir, readFile, writeFile, access } from 'node:fs/promises';
+import { readFile, rm, mkdir, writeFile, access } from 'node:fs/promises';
 
 async function cleanDir(dir) {
     await rm(dir, {

package/package.json

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