@appsemble/lang-sdk 0.40.7-node-brotli.0 → 0.40.7

package/iterApp.js

@@ -25,6 +25,9 @@ export function iterAction(action, callbacks, prefix = []) {
     if (action.type === 'each') {
         return iterAction(action.do, callbacks, [...prefix, 'do']);
     }
+    if (action.type === 'match') {
+        return action.match.some((matchCase, index) => iterAction(matchCase.action, callbacks, [...prefix, 'match', index, 'action']));
+    }
     if ('blocks' in action) {
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
         return iterBlockList(action.blocks, callbacks, [...prefix, 'blocks']);
@@ -137,7 +140,10 @@ export function iterPage(page, callbacks, prefix = []) {
         }
         return result;
     }
-    const { blocks = [] } = page;
+    const { actions, blocks = [] } = page;
+    if (Object.entries(actions ?? {}).some(([key, action]) => iterAction(action, callbacks, [...prefix, 'actions', key]))) {
+        return true;
+    }
     return iterBlockList(blocks, callbacks, [...prefix, 'blocks']);
 }
 /**
@@ -162,6 +168,13 @@ export function iterApp(app, callbacks) {
             }
         }
     }
+    if (app.webhooks) {
+        for (const [name, webhook] of Object.entries(app.webhooks)) {
+            if (webhook?.action && iterAction(webhook.action, callbacks, ['webhooks', name, 'action'])) {
+                return true;
+            }
+        }
+    }
     return false;
 }
 //# sourceMappingURL=iterApp.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/lang-sdk",
-  "version": "0.40.7-node-brotli.0",
+  "version": "0.40.7",
   "description": "Language SDK for Appsemble",
   "keywords": [
     "app",

package/validation.js

@@ -9,7 +9,7 @@ import { findPageByName } from './findPageByName.js';
 import { isAppLink } from './pageUtils.js';
 import { bottomNavigationGridArea, breadcrumbsGridArea, builtinPagesGridAreaOrder, getBuiltinPagesDefaultGridLayout, getCascadedGridTemplateAreas, getGridTemplateAreas, gridDeviceOrder, resendBannerGridArea, } from './gridUtils.js';
 import { isValidIconName, parseIconReference } from './icons.js';
-import { iterAction, iterApp } from './iterApp.js';
+import { iterApp } from './iterApp.js';
 import { has } from './miscellaneous.js';
 import { normalize } from './normalize.js';
 import { serverActions } from './serverActions.js';
@@ -1467,6 +1467,10 @@ function validateActions(definition, report) {
                 report(action.type, 'action type is not supported for cron jobs', [...path, 'type']);
                 return;
             }
+            if (path[0] === 'webhooks' && !serverActions.has(action.type)) {
+                report(action.type, 'action type is not supported for webhooks', [...path, 'type']);
+                return;
+            }
             if (validateUnsupportedServerOptimisticResourceWrite(action, path)) {
                 return;
             }
@@ -1502,7 +1506,8 @@ function validateActions(definition, report) {
                     report(action.type, 'refers to a resource that doesn’t exist', [...path, 'resource']);
                     return;
                 }
-                if (!action.type.startsWith('resource.subscription.')) {
+                // Webhook actions run on the server without checking resource permissions.
+                if (!action.type.startsWith('resource.subscription.') && path[0] !== 'webhooks') {
                     if (!definition.security) {
                         report(action.type, 'missing security definition', [...path, 'resource']);
                         return;
@@ -1637,16 +1642,6 @@ function validateActions(definition, report) {
             }
         },
     });
-    for (const [name, webhook] of Object.entries(definition.webhooks ?? {})) {
-        if (webhook.action &&
-            iterAction(webhook.action, {
-                onAction(action, path) {
-                    return validateUnsupportedServerOptimisticResourceWrite(action, path);
-                },
-            }, ['webhooks', name, 'action'])) {
-            return;
-        }
-    }
 }
 function validateEvents(definition, blockVersions, report) {
     const indexMap = new Map();