@faable/faable 1.40.0 → 2.0.0

package/dist/commands/auth/actions/create.js

@@ -3,6 +3,7 @@ import { withAuthHints, requireAuthAdmin } from '../../../api/auth_admin.js';
 import { log } from '../../../log.js';
 import { json_option, tenant_options } from '../options.js';
 import { print_json } from '../render.js';
+import { formatTriggers } from './triggers.js';
 
 const actions_create = {
     command: 'create',
@@ -13,18 +14,12 @@ const actions_create = {
         type: 'string',
         demandOption: true,
         description: 'Action name (max 200 chars)'
-    })
-        .option('trigger', {
-        alias: 't',
-        type: 'string',
-        choices: ['post-login', 'continue', 'client-credentials'],
-        demandOption: true,
-        description: 'Trigger point (client-credentials runs on M2M token grants: no user, no redirect)'
     })
         .option('code-file', {
         alias: 'f',
         type: 'string',
-        description: 'Path to a JS file with the action code'
+        demandOption: true,
+        description: 'Path to a JS file with the action code. The triggers are derived from the hooks it exports (exports.onExecutePostLogin / onExecuteContinue / onExecuteClientCredentials)'
     })
         .option('disabled', {
         type: 'boolean',
@@ -35,27 +30,25 @@ const actions_create = {
         type: 'number',
         description: 'Execution order (lower runs first, default 0)'
     })
-        .example('$0 auth actions create -n add-claims -t post-login -f ./claims.js', 'Create a post-login action from a file')
+        .example('$0 auth actions create -n add-claims -f ./claims.js', 'Create an action from a file; its triggers follow the exported hooks')
         .showHelpOnFail(false),
     handler: withAuthHints(async (args) => {
-        let code;
-        if (args.codeFile) {
-            if (!(await fs.pathExists(args.codeFile))) {
-                throw new Error(`Code file not found: ${args.codeFile}`);
-            }
-            code = await fs.readFile(args.codeFile, 'utf8');
+        if (!(await fs.pathExists(args.codeFile))) {
+            throw new Error(`Code file not found: ${args.codeFile}`);
         }
+        const code = await fs.readFile(args.codeFile, 'utf8');
         const api = await requireAuthAdmin(args);
         const action = await api.actionCreate({
             name: args.name,
-            trigger: args.trigger,
-            ...(code !== undefined ? { code } : {}),
+            code,
             ...(args.disabled ? { enabled: false } : {}),
             ...(args.order !== undefined ? { order: args.order } : {})
+            // `trigger` is gone from the API (auth ≥ v1.58): triggers are derived
+            // from the code. Cast until the SDK types catch up with that release.
         });
         if (args.json)
             return print_json(action);
-        log.info(`✅ Created action ${action.id} (${action.name}, trigger ${action.trigger})`);
+        log.info(`✅ Created action ${action.id} (${action.name}, triggers ${formatTriggers(action)})`);
     })
 };
 

package/dist/commands/auth/actions/get.js

@@ -25,7 +25,7 @@ const actions_get = {
             return print_json(action);
         log.info(`⚙️ ${action.id}`);
         log.info(`  Name:    ${action.name ?? '-'}`);
-        log.info(`  Trigger: ${action.trigger ?? '-'}`);
+        log.info(`  Triggers: ${formatTriggers(action)}`);
         log.info(`  Enabled: ${yes_no(action.enabled)}`);
         log.info(`  Order:   ${action.order ?? 0}`);
         log.info(`  Revision: ${action.revision ?? 1} (updated ${action.updatedAt ?? '-'})`);

package/dist/commands/auth/actions/list.js

@@ -10,7 +10,7 @@ const actions_list = {
     builder: yargs => json_option(list_options(tenant_options(yargs)))
         .option('query', {
         type: 'string',
-        description: 'FaableQL filter, e.g. "trigger:post-login"'
+        description: 'FaableQL filter, e.g. "enabled:true"'
     })
         .showHelpOnFail(false),
     handler: withAuthHints(async (args) => {
@@ -26,7 +26,7 @@ const actions_list = {
         const rows = items.map(a => [
             a.id ?? '-',
             a.name ?? '-',
-            a.trigger ?? '-',
+            formatTriggers(a),
             yes_no(a.enabled),
             String(a.order ?? 0),
             when(a.createdAt)

package/dist/commands/auth/actions/rm.js

@@ -1,6 +1,7 @@
 import prompts from 'prompts';
 import { withAuthHints, requireAuthAdmin } from '../../../api/auth_admin.js';
 import { log } from '../../../log.js';
+import { formatTriggers } from './triggers.js';
 import { tenant_options } from '../options.js';
 
 const actions_rm = {
@@ -27,7 +28,7 @@ const actions_rm = {
             const { confirm } = await prompts({
                 type: 'toggle',
                 name: 'confirm',
-                message: `Delete action "${action.name}" (${action.id}, trigger ${action.trigger})?`,
+                message: `Delete action "${action.name}" (${action.id}, triggers ${formatTriggers(action)})?`,
                 initial: false,
                 active: 'yes',
                 inactive: 'no'

package/dist/commands/auth/actions/triggers.js

@@ -0,0 +1,13 @@
+// `triggers` (auth ≥ v1.58) replaced the hand-picked `trigger`: an action runs
+// on every trigger whose hook its code exports. Tolerates both shapes so the
+// CLI prints something sensible against either server version.
+const formatTriggers = (action) => {
+    const list = action.triggers?.length
+        ? action.triggers
+        : action.trigger
+            ? [action.trigger]
+            : [];
+    return list.length ? list.join(',') : '-';
+};
+
+export { formatTriggers };

package/dist/commands/auth/actions/update.js

@@ -3,6 +3,7 @@ import { withAuthHints, requireAuthAdmin } from '../../../api/auth_admin.js';
 import { log } from '../../../log.js';
 import { json_option, tenant_options } from '../options.js';
 import { print_json } from '../render.js';
+import { formatTriggers } from './triggers.js';
 
 const actions_update = {
     command: 'update <action_id>',
@@ -21,7 +22,7 @@ const actions_update = {
         .option('code-file', {
         alias: 'f',
         type: 'string',
-        description: 'Path to a JS file with the new action code'
+        description: 'Path to a JS file with the new action code (triggers are re-derived from the hooks it exports)'
     })
         .option('order', {
         type: 'number',
@@ -55,7 +56,7 @@ const actions_update = {
         const action = await api.actionUpdate(args.action_id, patch);
         if (args.json)
             return print_json(action);
-        log.info(`✅ Updated action ${action.id} (${action.name}, trigger ${action.trigger}, enabled: ${action.enabled ? '✓' : '✗'}, revision ${action.revision ?? '-'})`);
+        log.info(`✅ Updated action ${action.id} (${action.name}, triggers ${formatTriggers(action)}, enabled: ${action.enabled ? '✓' : '✗'}, revision ${action.revision ?? '-'})`);
     })
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faable/faable",
-  "version": "1.40.0",
+  "version": "2.0.0",
   "main": "dist/index.js",
   "license": "MIT",
   "author": "Marc Pomar <marc@faable.com>",