@faable/faable 1.5.19 → 1.5.21

package/dist/commands/deploy/index.js

@@ -1,22 +1,67 @@
-import { deploy_command } from './deploy_command.js';
+import { context } from '../../api/context.js';
+import { cmd } from '../../lib/cmd.js';
+import { log } from '../../log.js';
+import { check_environment } from './check_environment.js';
+import { build_node } from './node-pipeline/index.js';
+import { runtime_detection } from './runtime-detect/runtime_detection.js';
+import { upload_tag } from './upload_tag.js';
 
 const deploy = {
-    command: "deploy [app_slug]",
-    describe: "Deploy a faable app",
-    builder: (yargs) => {
+    command: 'deploy [app_id]',
+    describe: 'Deploy a faable app',
+    builder: yargs => {
         return yargs
-            .positional("app_slug", {
-            type: "string",
-            description: "App slug",
+            .positional('app_id', {
+            type: 'string',
+            description: 'App Identifier'
         })
-            .option("workdir", {
-            alias: "w",
-            type: "string",
-            description: "Working directory",
+            .option('workdir', {
+            alias: 'w',
+            type: 'string',
+            description: 'Working directory'
         })
             .showHelpOnFail(false);
     },
-    handler: deploy_command,
+    handler: async (args) => {
+        const workdir = args.workdir || process.cwd();
+        const ctx = await context();
+        const { api } = ctx;
+        // Resolve runtime
+        const { runtime } = await runtime_detection(workdir);
+        const app_id = args.app_id || ctx.appId;
+        if (!app_id) {
+            throw new Error('Missing <app_id>, run inside github action or pass <app_id> after deploy command');
+        }
+        const app = await api.getApp(app_id);
+        // Check if we can build docker images
+        await check_environment();
+        log.info(`🚀 Deploying "${app.name}" (${app.id}) runtime=${runtime.name}-${runtime.version}`);
+        // get environment variables
+        const env_vars = await api.getAppSecrets(app.id);
+        let type;
+        if (runtime.name == 'node') {
+            const node_result = await build_node(app, {
+                workdir,
+                runtime,
+                env_vars
+            });
+            type = node_result.type;
+        }
+        else if (runtime.name == 'docker') {
+            type = 'node';
+            await cmd(`docker build -t ${app.id} .`, {
+                enableOutput: true
+            });
+        }
+        else {
+            throw new Error(`No build pipeline for runtime=${runtime.name}`);
+        }
+        // Upload to Faable registry
+        const { upload_tagname } = await upload_tag({ app, api });
+        // Create a deployment for this image
+        await api.createDeployment({ app_id: app.id, image: upload_tagname, type });
+        log.info(`🌍 Deployment created -> https://${app.url}`);
+    }
 };
 
 export { deploy };

package/dist/commands/deploy/runtime-detect/runtime_detection.js

@@ -1,17 +1,17 @@
-import { strategy_nodejs } from './strategies/nodejs.js';
 import * as R from 'ramda';
 import { has_any_of_files } from './helpers/has_any_of_files.js';
 import { strategy_docker } from './strategies/docker.js';
+import { strategy_nodejs } from './strategies/nodejs.js';
 
 const runtime_detection = async (workdir) => {
     const has = R.curry(has_any_of_files);
     const strategy = R.cond([
-        [has(["package.json"]), R.always(strategy_nodejs)],
+        [has(['package.json']), R.always(strategy_nodejs)],
         // [has(["requirements.txt"]), R.always(strategy_python)],
-        [has(["Dockerfile"]), R.always(strategy_docker)],
+        [has(['Dockerfile']), R.always(strategy_docker)]
     ])(workdir);
     if (!strategy) {
-        throw new Error("Cannot detect project type");
+        throw new Error('Cannot detect project type');
     }
     return strategy(workdir);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faable/faable",
-  "version": "1.5.19",
+  "version": "1.5.21",
   "main": "dist/index.js",
   "license": "MIT",
   "author": "Marc Pomar <marc@faable.com>",
@@ -46,6 +46,7 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
+    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "@types/bluebird": "^3.5.38",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^24.10.2",

package/dist/commands/deploy/deploy_command.js

@@ -1,60 +0,0 @@
-import { log } from '../../log.js';
-import { upload_tag } from './upload_tag.js';
-import { check_environment } from './check_environment.js';
-import { context } from '../../api/context.js';
-import { build_node } from './node-pipeline/index.js';
-import { runtime_detection } from './runtime-detect/runtime_detection.js';
-import { cmd } from '../../lib/cmd.js';
-
-const deploy_command = async (args) => {
-    const workdir = args.workdir || process.cwd();
-    const { api, appId } = await context();
-    // Resolve runtime
-    const { app_name, runtime } = await runtime_detection(workdir);
-    let app;
-    if (args.app_slug) {
-        app = await api.getBySlug(args.app_slug);
-    }
-    else {
-        const oidc_app_id = appId;
-        if (oidc_app_id) {
-            app = await api.getApp(oidc_app_id);
-        }
-        else if (app_name) {
-            app = await api.getBySlug(app_name);
-        }
-    }
-    if (!app) {
-        throw new Error("Missing <app_name>");
-    }
-    // Check if we can build docker images
-    await check_environment();
-    log.info(`🚀 Deploying ${app.name} (${app.id}) runtime=${runtime.name}-${runtime.version}`);
-    // get environment variables
-    const env_vars = await api.getAppSecrets(app.id);
-    let type;
-    if (runtime.name == "node") {
-        const node_result = await build_node(app, {
-            workdir,
-            runtime,
-            env_vars,
-        });
-        type = node_result.type;
-    }
-    else if (runtime.name == "docker") {
-        type = "node";
-        await cmd(`docker build -t ${app.id} .`, {
-            enableOutput: true,
-        });
-    }
-    else {
-        throw new Error(`No build pipeline for runtime=${runtime.name}`);
-    }
-    // Upload to Faable registry
-    const { upload_tagname } = await upload_tag({ app, api });
-    // Create a deployment for this image
-    await api.createDeployment({ app_id: app.id, image: upload_tagname, type });
-    log.info(`🌍 Deployment created -> https://${app.url}`);
-};
-
-export { deploy_command };