@appsemble/lang-sdk 0.37.1 → 0.37.3

package/iterApp.js

@@ -97,34 +97,43 @@ export function iterPage(page, callbacks, prefix = []) {
         if ('actions' in page) {
             result = Object.entries(page.actions ?? {}).some(([key, action]) => iterAction(action, callbacks, [...prefix, 'actions', key]));
         }
-        return (result ||
-            (page.type === 'flow'
-                ? page.steps.some((step, index) => iterBlockList(step.blocks, callbacks, [...prefix, 'steps', index, 'blocks']))
-                : page.tabs
-                    ? page.tabs.some((tab, index) => iterBlockList(tab.blocks, callbacks, [...prefix, 'tabs', index, 'blocks']))
-                    : iterBlockList(page.definition?.foreach.blocks ?? [], callbacks, [
-                        ...prefix,
-                        'tabs',
-                        0,
-                        'blocks',
-                    ])));
+        if (result) {
+            return true;
+        }
+        if (page.type === 'flow') {
+            const { steps = [] } = page;
+            return steps.some((step, index) => iterBlockList(step.blocks ?? [], callbacks, [...prefix, 'steps', index, 'blocks']));
+        }
+        return page.tabs
+            ? page.tabs.some((tab, index) => iterBlockList(tab.blocks, callbacks, [...prefix, 'tabs', index, 'blocks']))
+            : iterBlockList(page.definition?.foreach.blocks ?? [], callbacks, [
+                ...prefix,
+                'tabs',
+                0,
+                'blocks',
+            ]);
     }
     if (page.type === 'loop') {
         let result = false;
         if ('actions' in page) {
             result = Object.entries(page.actions ?? {}).some(([key, action]) => iterAction(action, callbacks, [...prefix, 'actions', key]));
         }
-        return (result ||
-            ['steps.first', 'steps', 'steps.last'].some((suffix) => iterBlockList(page.foreach.blocks, callbacks, [...prefix, suffix, 'blocks'])));
+        if (result) {
+            return true;
+        }
+        const { foreach } = page;
+        return ['steps.first', 'steps', 'steps.last'].some((suffix) => iterBlockList(foreach?.blocks ?? [], callbacks, [...prefix, suffix, 'blocks']));
     }
     if (page.type === 'container') {
         let result = false;
-        for (const containerPage of page.pages) {
+        const { pages = [] } = page;
+        for (const containerPage of pages) {
             result = iterPage(containerPage, callbacks, prefix);
         }
         return result;
     }
-    return iterBlockList(page.blocks, callbacks, [...prefix, 'blocks']);
+    const { blocks = [] } = page;
+    return iterBlockList(blocks, callbacks, [...prefix, 'blocks']);
 }
 /**
  * Iterate over an app definition and call each callback if relevant.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/lang-sdk",
-  "version": "0.37.1",
+  "version": "0.37.3",
   "description": "Language SDK for Appsemble",
   "keywords": [
     "app",

package/schemas/AppLayoutDefinition.js

@@ -49,11 +49,13 @@ If set to \`navigation\`, it will only be visible if \`login\` is also visible i
 `,
         },
         navigation: {
-            enum: ['bottom', 'left-menu', 'hidden'],
+            enum: ['bottom', 'left-menu', 'hidden', 'top'],
             default: 'left-menu',
             description: `The navigation type to use.
 
 If this is omitted, a collapsable side navigation menu will be rendered on the left.
+Top navigation is rendered in the title bar. When the title bar is hidden, top navigation is
+rendered as side navigation.
 `,
         },
         logo: {
@@ -94,6 +96,14 @@ If this is omitted, a collapsable side navigation menu will be rendered on the l
             type: 'boolean',
             default: false,
         },
+        stackedHeader: {
+            description: `Whether to render the app logo on its own centered row above the navigation.
+
+Only applies when \`navigation\` is set to \`top\`.
+`,
+            type: 'boolean',
+            default: false,
+        },
         hideGroupDropdown: {
             description: `Whether to hide the group dropdown.
 

package/schemas/BasePageDefinition.js

@@ -35,14 +35,15 @@ have two pages with the same name. The name of the page is displayed at the *app
             default: false,
         },
         navigation: {
-            enum: ['bottom', 'left-menu', 'hidden', 'dropdown', 'profileDropdown'],
+            enum: ['bottom', 'left-menu', 'hidden', 'dropdown', 'profileDropdown', 'top'],
             description: `The type of navigation displayed on the page.
 
 This overrides the navigation property of the app itself. Defaults to \`left-menu\` if navigation or
 App navigation are not set.
 
-Set to \`bottom\` to use a navigation pane at the bottom of the screen instead of the default side
-menu. Set to \`hidden\` to display no navigational menus at all.
+Set to \`bottom\` to use a navigation pane at the bottom of the screen. Set to \`top\` to render
+navigation in the title bar. When the title bar is hidden, top navigation is rendered as side
+navigation. Set to \`hidden\` to display no navigational menus at all.
 `,
         },
         icon: {

package/types/core.d.ts

@@ -88,7 +88,9 @@ export interface AppDefinition {
         /**
          * The navigation type to use.
          *
-         * If this is omitted, a collapsible side navigation menu will be rendered on the left.
+         * If this is omitted, a collapsible side navigation menu is rendered on the left.
+         * Top navigation is rendered in the title bar. When the title bar is hidden,
+         * top navigation is rendered as side navigation.
          *
          * @default 'left-menu'
          */
@@ -110,6 +112,12 @@ export interface AppDefinition {
          * Whether to hide the title bar from all pages in the app.
          */
         hideTitleBar?: boolean;
+        /**
+         * Whether to render the app logo on its own centered row above the top navigation.
+         *
+         * Only applies when `navigation` is set to `top`.
+         */
+        stackedHeader?: boolean;
         /**
          * Whether to hide the group dropdown.
          *
@@ -203,7 +211,8 @@ export interface BasePageDefinition {
     /**
      * The navigation type to use for the page.
      * Setting this will override the default navigation for the app.
-     * if this is set to `navbar`, navigation link is rendered in the profile dropdown.
+     * Top navigation is rendered in the title bar. When the title bar is hidden,
+     * top navigation is rendered as side navigation.
      */
     navigation?: Navigation | 'profileDropdown';
     /**

package/types/layout.d.ts

@@ -1,2 +1,2 @@
-export type Navigation = 'bottom' | 'hidden' | 'left-menu';
+export type Navigation = 'bottom' | 'hidden' | 'left-menu' | 'top';
 export type LayoutPosition = 'hidden' | 'navbar' | 'navigation';

package/validation.js

@@ -55,7 +55,10 @@ function validateJSONSchema(schema, prefix, report) {
     if (schema.type !== 'object') {
         return;
     }
-    if (!('properties' in schema)) {
+    // An object that only defines `additionalProperties` (an open map, e.g. a
+    // dictionary of confidence scores) is a valid schema and does not need
+    // `properties`. Only require `properties` when there is no `additionalProperties`.
+    if (!('properties' in schema) && !schema.additionalProperties) {
         report(schema, 'is missing properties', prefix);
         return;
     }
@@ -69,6 +72,11 @@ function validateJSONSchema(schema, prefix, report) {
     for (const [key, propertySchema] of Object.entries(schema.properties ?? {})) {
         validateJSONSchema(propertySchema, [...prefix, 'properties', key], report);
     }
+    // Recurse into the `additionalProperties` sub schema so open maps are validated
+    // as thoroughly as `properties`. A boolean `additionalProperties` has no sub schema.
+    if (typeof schema.additionalProperties === 'object') {
+        validateJSONSchema(schema.additionalProperties, [...prefix, 'additionalProperties'], report);
+    }
 }
 /**
  * Validates the pages in the app definition to ensure there are no duplicate page names.