@appsemble/utils 0.30.14-test.3 → 0.30.14-test.4

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.30.14-test.3/config/assets/logo.svg) Appsemble Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.30.14-test.4/config/assets/logo.svg) Appsemble Utilities
 
 > Internal utility functions used across multiple Appsemble projects.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/utils)](https://www.npmjs.com/package/@appsemble/utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.30.14-test.3/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.30.14-test.3)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.30.14-test.4/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.30.14-test.4)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.30.14-test.3/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.30.14-test.4/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/api/components/schemas/AppServiceSecret.js

@@ -44,6 +44,10 @@ export const AppServiceSecret = {
             type: 'string',
             description: 'The scope to request access tokens for.',
         },
+        ca: {
+            type: 'string',
+            description: 'The custom certificate authority.',
+        },
     },
 };
 //# sourceMappingURL=AppServiceSecret.js.map

package/appMessages.js

@@ -7,7 +7,6 @@ import { normalize } from './normalize.js';
  * @returns All message IDs found
  */
 export function findMessageIds(obj) {
-    var _a;
     if (!obj || typeof obj !== 'object') {
         return {};
     }
@@ -18,8 +17,8 @@ export function findMessageIds(obj) {
     // Remappers throw if multiple keys are defined, so this means it’s not a remapper.
     if (entries.length === 1) {
         const [[key, value]] = entries;
-        if (key === 'string.format' && typeof (value === null || value === void 0 ? void 0 : value.messageId) === 'string') {
-            return { [value.messageId]: (_a = value.template) !== null && _a !== void 0 ? _a : '', ...findMessageIds(value.values) };
+        if (key === 'string.format' && typeof value?.messageId === 'string') {
+            return { [value.messageId]: value.template ?? '', ...findMessageIds(value.values) };
         }
         if (key === 'translate') {
             return { [value]: '' };
@@ -36,12 +35,11 @@ export function findMessageIds(obj) {
  * @returns A list of message IDs
  */
 export function extractAppMessages(app, onBlock) {
-    var _a, _b;
     const messages = {
         app: {
             name: app.name,
             description: app.description,
-            ...Object.fromEntries(Object.entries((_b = (_a = app.security) === null || _a === void 0 ? void 0 : _a.roles) !== null && _b !== void 0 ? _b : {}).flatMap(([role, roleDefinition]) => [
+            ...Object.fromEntries(Object.entries(app.security?.roles ?? {}).flatMap(([role, roleDefinition]) => [
                 [`app.roles.${role}`, role],
                 [`app.roles.${role}.description`, roleDefinition.description],
             ])),
@@ -90,19 +88,18 @@ export function extractAppMessages(app, onBlock) {
             }
         },
         onPage(page) {
-            var _a, _b;
             const prefix = `pages.${normalize(page.name)}`;
             messages.app[prefix] = page.name;
             if (page.type === 'tabs' && Array.isArray(page.tabs)) {
                 for (const [index, tab] of page.tabs.entries()) {
                     messages.app[`${prefix}.tabs.${index}`] =
-                        (_a = (typeof tab.name === 'string' ? tab.name : '')) !== null && _a !== void 0 ? _a : '';
+                        (typeof tab.name === 'string' ? tab.name : '') ?? '';
                 }
             }
             if (page.type === 'flow') {
                 for (const [index, step] of page.steps.entries()) {
                     messages.app[`${prefix}.steps.${index}`] =
-                        (_b = (typeof step.name === 'string' ? step.name : '')) !== null && _b !== void 0 ? _b : '';
+                        (typeof step.name === 'string' ? step.name : '') ?? '';
                 }
             }
             if (page.type === 'loop') {

package/assets.js

@@ -35,12 +35,11 @@ const mimeTypeCategories = {
  * @returns A category that the mimetype falls into or null if no category is found
  */
 export function getMimeTypeCategory(mimeType) {
-    var _a;
     const [mimeBaseType, mimeSubType] = mimeType.split('/');
-    const [category] = (_a = Object.entries(mimeTypeCategories).find(([, types]) => types.some((type) => {
+    const [category] = Object.entries(mimeTypeCategories).find(([, types]) => types.some((type) => {
         const [baseType, subType] = type.split('/');
         return baseType === mimeBaseType && (subType === '*' || subType === mimeSubType);
-    }))) !== null && _a !== void 0 ? _a : [null];
+    })) ?? [null];
     return category;
 }
 export function getMimeTypeCategories(mimeTypes) {

package/authorization.js

@@ -26,14 +26,13 @@ function checkAppPermissions(acquiredPermissions, requiredPermissions) {
     });
 }
 export function getAppInheritedRoles(appSecurityDefinition, roles, accumulatedRoles = []) {
-    var _a;
     if (!appSecurityDefinition || !roles) {
         return [];
     }
     for (const role of roles) {
         if (!accumulatedRoles.includes(role)) {
             accumulatedRoles.push(role);
-            const roleDefinition = (_a = appSecurityDefinition.roles) === null || _a === void 0 ? void 0 : _a[role];
+            const roleDefinition = appSecurityDefinition.roles?.[role];
             if (roleDefinition && roleDefinition.inherits) {
                 accumulatedRoles.push(...getAppInheritedRoles(appSecurityDefinition, roleDefinition.inherits, accumulatedRoles));
             }
@@ -42,11 +41,10 @@ export function getAppInheritedRoles(appSecurityDefinition, roles, accumulatedRo
     return Array.from(new Set(accumulatedRoles));
 }
 export function getAppRolePermissions(appSecurityDefinition, roles) {
-    var _a;
     const accumulatedPermissions = [];
     const inheritedRoles = getAppInheritedRoles(appSecurityDefinition, roles);
     for (const role of inheritedRoles) {
-        const roleDefinition = (_a = appSecurityDefinition.roles) === null || _a === void 0 ? void 0 : _a[role];
+        const roleDefinition = appSecurityDefinition.roles?.[role];
         if (roleDefinition) {
             const rolePermissions = roleDefinition.permissions;
             if (rolePermissions) {
@@ -76,7 +74,7 @@ export function checkGuestAppPermissions(appSecurityDefinition, requiredPermissi
     return checkAppPermissions(guestPermissions, requiredPermissions);
 }
 export function getAppRoles(appSecurityDefinition) {
-    return Array.from(new Set(Object.keys((appSecurityDefinition === null || appSecurityDefinition === void 0 ? void 0 : appSecurityDefinition.roles) || {})));
+    return Array.from(new Set(Object.keys(appSecurityDefinition?.roles || {})));
 }
 export function getAppPossibleGuestPermissions(appDefinition) {
     const possibleAllViews = {};
@@ -87,7 +85,7 @@ export function getAppPossibleGuestPermissions(appDefinition) {
         }
     }
     for (const view of Object.keys(possibleAllViews)) {
-        if (resourceDefinitions.some((resourceDefinition) => { var _a; return !((_a = resourceDefinition.views) === null || _a === void 0 ? void 0 : _a[view]); })) {
+        if (resourceDefinitions.some((resourceDefinition) => !resourceDefinition.views?.[view])) {
             possibleAllViews[view] = false;
         }
     }

package/examples.js

@@ -691,7 +691,7 @@ export const examples = {
  * @returns Example based on the input options.
  */
 export function schemaExample(remapper, options) {
-    const { exclude = [], input = 'inline', result } = options !== null && options !== void 0 ? options : {};
+    const { exclude = [], input = 'inline', result } = options ?? {};
     let example = '';
     if (!exclude.includes('input')) {
         const spacing = input === 'pretty' && 2;
@@ -713,7 +713,7 @@ export function createExampleContext(url, lang, userInfo, history) {
         url: String(url),
         appUrl: `${url.protocol}//example-app.example-organization.${url.host}`,
         context: {},
-        history: history !== null && history !== void 0 ? history : ['Default example value'],
+        history: history ?? ['Default example value'],
         appId: 0,
         locale: 'en',
         pageData: { default: 'Page data' },

package/ics.js

@@ -24,15 +24,14 @@ export function getDuration(duration) {
     };
 }
 export function processLocation(location) {
-    var _a, _b, _c, _d, _e;
     if (typeof location !== 'object' || !location) {
         return;
     }
-    const lat = (_b = (_a = location.latitude) !== null && _a !== void 0 ? _a : location.lat) !== null && _b !== void 0 ? _b : location[0];
+    const lat = location.latitude ?? location.lat ?? location[0];
     if (typeof lat !== 'number' || !Number.isFinite(lat) || lat < -90 || lat > 90) {
         return;
     }
-    let lon = (_e = (_d = (_c = location.longitude) !== null && _c !== void 0 ? _c : location.lon) !== null && _d !== void 0 ? _d : location.lng) !== null && _e !== void 0 ? _e : location[1];
+    let lon = location.longitude ?? location.lon ?? location.lng ?? location[1];
     if (typeof lon !== 'number' || !Number.isFinite(lon)) {
         return;
     }

package/iterApp.js

@@ -9,8 +9,7 @@
  * @returns True if any callback returns true, false otherwise.
  */
 export function iterAction(action, callbacks, prefix = []) {
-    var _a;
-    if ((_a = callbacks.onAction) === null || _a === void 0 ? void 0 : _a.call(callbacks, action, prefix)) {
+    if (callbacks.onAction?.(action, prefix)) {
         return true;
     }
     if (action.onSuccess && iterAction(action.onSuccess, callbacks, [...prefix, 'onSuccess'])) {
@@ -33,8 +32,7 @@ export function iterAction(action, callbacks, prefix = []) {
     return false;
 }
 export function iterController(controller, callbacks, prefix = []) {
-    var _a;
-    if ((_a = callbacks.onController) === null || _a === void 0 ? void 0 : _a.call(callbacks, controller, prefix)) {
+    if (callbacks.onController?.(controller, prefix)) {
         return true;
     }
     if (controller.actions) {
@@ -53,8 +51,7 @@ export function iterController(controller, callbacks, prefix = []) {
  * @returns True if any callback returns true, false otherwise.
  */
 export function iterBlock(block, callbacks, prefix = []) {
-    var _a;
-    if ((_a = callbacks.onBlock) === null || _a === void 0 ? void 0 : _a.call(callbacks, block, prefix)) {
+    if (callbacks.onBlock?.(block, prefix)) {
         return true;
     }
     if (block.actions) {
@@ -73,8 +70,7 @@ export function iterBlock(block, callbacks, prefix = []) {
  * @returns True if any callback returns true, false otherwise.
  */
 export function iterBlockList(blockList, callbacks, prefix = []) {
-    var _a;
-    if ((_a = callbacks.onBlockList) === null || _a === void 0 ? void 0 : _a.call(callbacks, blockList, prefix)) {
+    if (callbacks.onBlockList?.(blockList, prefix)) {
         return true;
     }
     return blockList.some((block, index) => iterBlock(block, callbacks, [...prefix, index]));
@@ -90,8 +86,7 @@ export function iterBlockList(blockList, callbacks, prefix = []) {
  * @returns True if any callback returns true, false otherwise.
  */
 export function iterPage(page, callbacks, prefix = []) {
-    var _a;
-    if ((_a = callbacks.onPage) === null || _a === void 0 ? void 0 : _a.call(callbacks, page, prefix)) {
+    if (callbacks.onPage?.(page, prefix)) {
         return true;
     }
     if (page.type === 'flow' || page.type === 'tabs') {
@@ -145,7 +140,7 @@ export function iterApp(app, callbacks) {
     }
     if (app.cron) {
         for (const [name, job] of Object.entries(app.cron)) {
-            if ((job === null || job === void 0 ? void 0 : job.action) && iterAction(job.action, callbacks, ['cron', name, 'action'])) {
+            if (job?.action && iterAction(job.action, callbacks, ['cron', name, 'action'])) {
                 return true;
             }
         }

package/jsonschema.js

@@ -57,7 +57,6 @@ export function generateDataFromSchema(schema) {
  * @returns The combined schema.
  */
 export function combineSchemas(...schemas) {
-    var _a;
     const result = {};
     for (const schema of schemas) {
         if ('type' in schema) {
@@ -88,7 +87,7 @@ export function combineSchemas(...schemas) {
                 : schema.multipleOf;
         }
         if ('default' in schema) {
-            (_a = result.default) !== null && _a !== void 0 ? _a : (result.default = schema.default);
+            result.default ?? (result.default = schema.default);
         }
         if (schema.description) {
             result.description || (result.description = schema.description);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/utils",
-  "version": "0.30.14-test.3",
+  "version": "0.30.14-test.4",
   "description": "Utility functions used in Appsemble internally",
   "keywords": [
     "app",
@@ -37,7 +37,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.30.14-test.3",
+    "@appsemble/types": "0.30.14-test.4",
     "axios": "^1.0.0",
     "cron-parser": "^4.0.0",
     "date-fns": "^2.0.0",
@@ -63,6 +63,6 @@
     "vitest": "^1.0.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   }
 }

package/remap.js

@@ -82,7 +82,7 @@ const mapperImplementations = {
             }
             result = result[p];
         }
-        return result !== null && result !== void 0 ? result : null;
+        return result ?? null;
     },
     variable(name, input, context) {
         if (context.getVariable) {
@@ -166,8 +166,8 @@ const mapperImplementations = {
         return remap(condition ? mappers.then : mappers.else, input, context);
     },
     match(mappers, input, context) {
-        var _a, _b;
-        return ((_b = remap((_a = mappers.find((mapper) => remap(mapper.case, input, context))) === null || _a === void 0 ? void 0 : _a.value, input, context)) !== null && _b !== void 0 ? _b : null);
+        return (remap(mappers.find((mapper) => remap(mapper.case, input, context))?.value, input, context) ??
+            null);
     },
     'object.from': (mappers, input, context) => mapValues(mappers, (mapper) => remap(mapper, input, context)),
     'object.assign': (mappers, input, context) => ({
@@ -184,7 +184,7 @@ const mapperImplementations = {
                         delete acc[k];
                     }
                     else {
-                        acc = acc === null || acc === void 0 ? void 0 : acc[k];
+                        acc = acc?.[k];
                     }
                 }
             }
@@ -204,13 +204,10 @@ const mapperImplementations = {
         }
         return typeof input;
     },
-    'array.map': (mapper, input, context) => {
-        var _a;
-        return (_a = input === null || input === void 0 ? void 0 : input.map((item, index) => remap(mapper, item, {
-            ...context,
-            array: { index, length: input.length, item },
-        }))) !== null && _a !== void 0 ? _a : [];
-    },
+    'array.map': (mapper, input, context) => input?.map((item, index) => remap(mapper, item, {
+        ...context,
+        array: { index, length: input.length, item },
+    })) ?? [],
     'array.unique'(mapper, input, context) {
         if (!Array.isArray(input)) {
             return input;
@@ -230,13 +227,13 @@ const mapperImplementations = {
             return true;
         });
     },
-    array: (prop, input, context) => { var _a; return (_a = context.array) === null || _a === void 0 ? void 0 : _a[prop]; },
+    array: (prop, input, context) => context.array?.[prop],
     'array.filter'(mapper, input, context) {
         if (!Array.isArray(input)) {
             console.error(`${input} is not an array!`);
             return null;
         }
-        return input === null || input === void 0 ? void 0 : input.filter((item, index) => {
+        return input?.filter((item, index) => {
             const remapped = remap(mapper, item, {
                 ...context,
                 array: { index, length: input.length, item },
@@ -245,12 +242,11 @@ const mapperImplementations = {
         });
     },
     'array.find'(mapper, input, context) {
-        var _a;
         if (!Array.isArray(input)) {
             console.error(`${input} is not an array!`);
             return null;
         }
-        return ((_a = input === null || input === void 0 ? void 0 : input.find((item) => {
+        return (input?.find((item) => {
             const remapped = remap(mapper, item, context);
             switch (typeof remapped) {
                 case 'boolean':
@@ -258,7 +254,7 @@ const mapperImplementations = {
                 default:
                     return equal(remapped, item) ? item : null;
             }
-        })) !== null && _a !== void 0 ? _a : null);
+        }) ?? null);
     },
     'array.from': (mappers, input, context) => mappers.map((mapper) => remap(mapper, input, context)),
     'array.append': (mappers, input, context) => Array.isArray(input)
@@ -379,7 +375,7 @@ const mapperImplementations = {
         return result.join('');
     },
     root: (args, input, context) => context.root,
-    history: (index, input, context) => { var _a; return (_a = context.history) === null || _a === void 0 ? void 0 : _a[index]; },
+    history: (index, input, context) => context.history?.[index],
     'from.history': ({ index, props }, input, context) => mapValues(props, (mapper) => remap(mapper, context.history[index], context)),
     'assign.history': ({ index, props }, input, context) => ({
         ...input,
@@ -395,7 +391,7 @@ const mapperImplementations = {
                         delete acc[k];
                     }
                     else {
-                        acc = acc === null || acc === void 0 ? void 0 : acc[k];
+                        acc = acc?.[k];
                     }
                 }
             }
@@ -415,7 +411,7 @@ const mapperImplementations = {
         return input;
     },
     log(level, input, context) {
-        console[level !== null && level !== void 0 ? level : 'info'](JSON.stringify({ input, context }, null, 2));
+        console[level ?? 'info'](JSON.stringify({ input, context }, null, 2));
         return input;
     },
     'string.format'({ messageId, template, values }, input, context) {
@@ -439,7 +435,7 @@ const mapperImplementations = {
         const message = context.getMessage({ id: messageId });
         return message.format() || `{${messageId}}`;
     },
-    'app.member': (property, input, context) => { var _a; return (_a = context.appMemberInfo) === null || _a === void 0 ? void 0 : _a[property]; },
+    'app.member': (property, input, context) => context.appMemberInfo?.[property],
     container(property, input, context) {
         // This value is replaced when the request is made
         // By using the value of the release name

package/remap.test.js

@@ -5,8 +5,8 @@ import { remap } from './remap.js';
 function runTests(tests) {
     it.each(Object.entries(tests))('should %s', (name, { appMemberInfo, context, expected, history, input, mappers, messages, variables }) => {
         const result = remap(mappers, input, {
-            getMessage: ({ defaultMessage, id }) => { var _a, _b; return new IntlMessageFormat((_b = (_a = messages === null || messages === void 0 ? void 0 : messages.messageIds) === null || _a === void 0 ? void 0 : _a[id]) !== null && _b !== void 0 ? _b : defaultMessage); },
-            getVariable: (variableName) => { var _a; return (_a = variables.find((variable) => variable.name === variableName)) === null || _a === void 0 ? void 0 : _a.value; },
+            getMessage: ({ defaultMessage, id }) => new IntlMessageFormat(messages?.messageIds?.[id] ?? defaultMessage),
+            getVariable: (variableName) => variables.find((variable) => variable.name === variableName)?.value,
             url: 'https://example.com/en/example',
             appUrl: 'https://example.com',
             context,
@@ -287,7 +287,7 @@ describe('log', () => {
                 },
             }, null, 2);
             remap(mappers, input, {
-                getMessage: ({ defaultMessage, id }) => { var _a, _b; return new IntlMessageFormat((_b = (_a = messages === null || messages === void 0 ? void 0 : messages.messageIds) === null || _a === void 0 ? void 0 : _a[id]) !== null && _b !== void 0 ? _b : defaultMessage); },
+                getMessage: ({ defaultMessage, id }) => new IntlMessageFormat(messages?.messageIds?.[id] ?? defaultMessage),
                 getVariable: (variableName) => variables.find((variable) => variable.name === variableName).value,
                 url: 'https://example.com/en/example',
                 appUrl: 'https://example.com',

package/validateAppMessages.js

@@ -8,7 +8,6 @@ export class AppMessageValidationError extends Error {
     }
 }
 export function validateMessages(messages, app) {
-    var _a, _b;
     const blockMessageKeys = {};
     const extractedMessages = extractAppMessages(app, (block) => {
         const type = normalizeBlockName(block.type);
@@ -31,7 +30,7 @@ export function validateMessages(messages, app) {
     if (messages.app) {
         Object.keys(messages.app).map((key) => {
             const match = /^(pages\.[\dA-Za-z-]+(\..+)?)\.blocks\.\d+.+/.exec(key);
-            if ((!has(extractedMessages === null || extractedMessages === void 0 ? void 0 : extractedMessages.app, key) || typeof messages.app[key] !== 'string') && !match) {
+            if ((!has(extractedMessages?.app, key) || typeof messages.app[key] !== 'string') && !match) {
                 throw new AppMessageValidationError(`Invalid key ${key}`);
             }
         });
@@ -44,14 +43,14 @@ export function validateMessages(messages, app) {
             }
         }
     }
-    const coreMessages = (_a = messages.core) !== null && _a !== void 0 ? _a : {};
+    const coreMessages = messages.core ?? {};
     for (const [key, value] of Object.entries(coreMessages)) {
         if (typeof value !== 'string') {
             throw new AppMessageValidationError(`Invalid translation key: core.${key}`);
         }
     }
     for (const [blockName] of Object.entries(blockMessageKeys)) {
-        if ((_b = messages.blocks) === null || _b === void 0 ? void 0 : _b[blockName]) {
+        if (messages.blocks?.[blockName]) {
             blockMessages[blockName] = {};
             for (const [version, oldValues] of Object.entries(messages.blocks[blockName])) {
                 if (!has(blockMessageKeys[blockName], version)) {

package/validation.js

@@ -73,13 +73,12 @@ function validateUniquePageNames(definition, report) {
     checkPages(definition.pages);
 }
 function validateMembersSchema(definition, report) {
-    var _a;
     if (!definition.members) {
         return;
     }
     for (const [propertyName, propertyDefinition] of Object.entries(definition.members.properties)) {
         // Handled by schema validation
-        if (!(propertyDefinition === null || propertyDefinition === void 0 ? void 0 : propertyDefinition.schema)) {
+        if (!propertyDefinition?.schema) {
             continue;
         }
         const { schema } = propertyDefinition;
@@ -90,7 +89,7 @@ function validateMembersSchema(definition, report) {
         }
         if ('reference' in propertyDefinition) {
             const { resource: resourceName } = propertyDefinition.reference;
-            const resourceDefinition = (_a = definition.resources) === null || _a === void 0 ? void 0 : _a[resourceName];
+            const resourceDefinition = definition.resources?.[resourceName];
             if (!resourceDefinition) {
                 report(resourceName, 'refers to a resource that doesn’t exist', [
                     'members',
@@ -109,7 +108,7 @@ function validateResourceSchemas(definition, report) {
     }
     for (const [resourceName, resource] of Object.entries(definition.resources)) {
         // Handled by schema validation
-        if (!(resource === null || resource === void 0 ? void 0 : resource.schema)) {
+        if (!resource?.schema) {
             continue;
         }
         const { schema } = resource;
@@ -208,7 +207,6 @@ function validateController(definition, controllerImplementations, report) {
     }
     iterApp(definition, {
         onController(controller, path) {
-            var _a, _b, _c, _d, _e, _f;
             const actionParameters = new Set();
             if (controller.actions) {
                 if (controllerImplementations.actions) {
@@ -251,16 +249,16 @@ function validateController(definition, controllerImplementations, report) {
             }
             if (controller.events.emit) {
                 for (const [key, value] of Object.entries(controller.events.emit)) {
-                    if (!((_b = (_a = controllerImplementations.events) === null || _a === void 0 ? void 0 : _a.emit) === null || _b === void 0 ? void 0 : _b.$any) &&
-                        !has((_c = controllerImplementations.events) === null || _c === void 0 ? void 0 : _c.emit, key)) {
+                    if (!controllerImplementations.events?.emit?.$any &&
+                        !has(controllerImplementations.events?.emit, key)) {
                         report(value, 'is an unknown event emitter', [...path, 'events', 'emit', key]);
                     }
                 }
             }
             if (controller.events.listen) {
                 for (const [key, value] of Object.entries(controller.events.listen)) {
-                    if (!((_e = (_d = controllerImplementations.events) === null || _d === void 0 ? void 0 : _d.listen) === null || _e === void 0 ? void 0 : _e.$any) &&
-                        !has((_f = controllerImplementations.events) === null || _f === void 0 ? void 0 : _f.listen, key)) {
+                    if (!controllerImplementations.events?.listen?.$any &&
+                        !has(controllerImplementations.events?.listen, key)) {
                         report(value, 'is an unknown event listener', [...path, 'events', 'listen', key]);
                     }
                 }
@@ -271,7 +269,6 @@ function validateController(definition, controllerImplementations, report) {
 function validateBlocks(definition, blockVersions, report) {
     iterApp(definition, {
         onBlock(block, path) {
-            var _a, _b, _c, _d, _e, _f;
             const type = normalizeBlockName(block.type);
             const versions = blockVersions.get(type);
             if (!versions) {
@@ -292,8 +289,8 @@ function validateBlocks(definition, blockVersions, report) {
                     actionParameters.add(property);
                     return has(block.actions, property);
                 };
-                validator.customFormats['event-listener'] = (property) => { var _a; return has((_a = block.events) === null || _a === void 0 ? void 0 : _a.listen, property); };
-                validator.customFormats['event-emitter'] = (property) => { var _a; return has((_a = block.events) === null || _a === void 0 ? void 0 : _a.emit, property); };
+                validator.customFormats['event-listener'] = (property) => has(block.events?.listen, property);
+                validator.customFormats['event-emitter'] = (property) => has(block.events?.emit, property);
                 const result = validator.validate(block.parameters || {}, version.parameters, {
                     nestedErrors: true,
                 });
@@ -334,14 +331,14 @@ function validateBlocks(definition, blockVersions, report) {
             }
             if (block.events.emit) {
                 for (const [key, value] of Object.entries(block.events.emit)) {
-                    if (!((_b = (_a = version.events) === null || _a === void 0 ? void 0 : _a.emit) === null || _b === void 0 ? void 0 : _b.$any) && !has((_c = version.events) === null || _c === void 0 ? void 0 : _c.emit, key)) {
+                    if (!version.events?.emit?.$any && !has(version.events?.emit, key)) {
                         report(value, 'is an unknown event emitter', [...path, 'events', 'emit', key]);
                     }
                 }
             }
             if (block.events.listen) {
                 for (const [key, value] of Object.entries(block.events.listen)) {
-                    if (!((_e = (_d = version.events) === null || _d === void 0 ? void 0 : _d.listen) === null || _e === void 0 ? void 0 : _e.$any) && !has((_f = version.events) === null || _f === void 0 ? void 0 : _f.listen, key)) {
+                    if (!version.events?.listen?.$any && !has(version.events?.listen, key)) {
                         report(value, 'is an unknown event listener', [...path, 'events', 'listen', key]);
                     }
                 }
@@ -350,7 +347,6 @@ function validateBlocks(definition, blockVersions, report) {
     });
 }
 function validatePermissions(appDefinition, permissions, inheritedPermissions, possiblePermissions, report, path) {
-    var _a, _b, _c, _d;
     const checked = [];
     for (const [index, permission] of permissions.entries()) {
         if (checked.includes(permission)) {
@@ -361,7 +357,7 @@ function validatePermissions(appDefinition, permissions, inheritedPermissions, p
             if (resourcePermissionPattern.test(permission) ||
                 ownResourcePermissionPattern.test(permission)) {
                 const [, resourceName] = permission.split(':');
-                if (resourceName && resourceName !== 'all' && !((_a = appDefinition.resources) === null || _a === void 0 ? void 0 : _a[resourceName])) {
+                if (resourceName && resourceName !== 'all' && !appDefinition.resources?.[resourceName]) {
                     report(appDefinition, `resource ${resourceName} does not exist in the app's resources definition`, [...path, 'permissions', index]);
                     return;
                 }
@@ -370,14 +366,14 @@ function validatePermissions(appDefinition, permissions, inheritedPermissions, p
                 const [, resourceName, , resourceView] = permission.split(':');
                 if (resourceName === 'all') {
                     for (const [rName, resourceDefinition] of Object.entries(appDefinition.resources)) {
-                        if (!((_b = resourceDefinition.views) === null || _b === void 0 ? void 0 : _b[resourceView])) {
+                        if (!resourceDefinition.views?.[resourceView]) {
                             report(appDefinition, `resource ${rName} is missing a definition for the ${resourceView} view`, [...path, 'permissions', index]);
                             return;
                         }
                     }
                 }
                 else {
-                    if (!((_d = (_c = appDefinition.resources[resourceName]) === null || _c === void 0 ? void 0 : _c.views) === null || _d === void 0 ? void 0 : _d[resourceView])) {
+                    if (!appDefinition.resources[resourceName]?.views?.[resourceView]) {
                         report(appDefinition, `resource ${resourceName} is missing a definition for the ${resourceView} view`, [...path, 'permissions', index]);
                         return;
                     }
@@ -616,13 +612,12 @@ function checkCyclicRoleInheritance(roles, name, report) {
     let lastChecked;
     const stack = [];
     const checkRoleRecursively = (role) => {
-        var _a, _b;
         lastChecked = role;
         if (stack.includes(role)) {
             return true;
         }
         stack.push(role);
-        return (_b = (_a = roles[role]) === null || _a === void 0 ? void 0 : _a.inherits) === null || _b === void 0 ? void 0 : _b.some(checkRoleRecursively);
+        return roles[role]?.inherits?.some(checkRoleRecursively);
     };
     const duplicate = checkRoleRecursively(name);
     if (duplicate && lastChecked === name) {
@@ -646,7 +641,7 @@ function validateSecurity(definition, report) {
         return true;
     };
     const checkRoles = (object, path) => {
-        if (!(object === null || object === void 0 ? void 0 : object.roles)) {
+        if (!object?.roles) {
             return;
         }
         for (const [index, role] of object.roles.entries()) {
@@ -692,7 +687,7 @@ function validateSecurity(definition, report) {
                 report(definition, `not allowed to overwrite role ${name}`, ['security', 'roles', name]);
             }
             const inheritedPermissions = [];
-            if (role === null || role === void 0 ? void 0 : role.inherits) {
+            if (role?.inherits) {
                 let found = false;
                 for (const [index, inherited] of (role.inherits || []).entries()) {
                     found || (found = checkRoleExists(inherited, ['security', 'roles', name, 'inherits', index]));
@@ -731,7 +726,6 @@ function validateSecurity(definition, report) {
  * @param report A function used to report a value.
  */
 function validateHooks(definition, report) {
-    var _a, _b, _c;
     if (!definition.resources) {
         return;
     }
@@ -741,10 +735,10 @@ function validateHooks(definition, report) {
             if (!has(resource, actionType)) {
                 continue;
             }
-            const tos = (_b = (_a = resource[actionType].hooks) === null || _a === void 0 ? void 0 : _a.notification) === null || _b === void 0 ? void 0 : _b.to;
+            const tos = resource[actionType].hooks?.notification?.to;
             if (tos) {
                 for (const [index, to] of tos.entries()) {
-                    if (to !== '$author' && !has((_c = definition.security) === null || _c === void 0 ? void 0 : _c.roles, to)) {
+                    if (to !== '$author' && !has(definition.security?.roles, to)) {
                         report(to, 'is an unknown role', [
                             'resources',
                             resourceKey,
@@ -810,7 +804,7 @@ function validateCronJobs({ cron }, report) {
         return;
     }
     for (const [id, job] of Object.entries(cron)) {
-        if (typeof (job === null || job === void 0 ? void 0 : job.schedule) !== 'string') {
+        if (typeof job?.schedule !== 'string') {
             continue;
         }
         try {
@@ -825,7 +819,6 @@ function validateActions(definition, report) {
     const urlRegex = new RegExp(`^${partialNormalized.source}:`);
     iterApp(definition, {
         onAction(action, path) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             if (path[0] === 'cron' && !serverActions.has(action.type)) {
                 report(action.type, 'action type is not supported for cron jobs', [...path, 'type']);
                 return;
@@ -835,10 +828,10 @@ function validateActions(definition, report) {
                 return;
             }
             if (['app.member.register', 'app.member.properties.patch', 'app.member.current.patch'].includes(action.type) &&
-                Object.values((_a = action.properties) !== null && _a !== void 0 ? _a : {})[0] &&
-                ((_b = definition.members) === null || _b === void 0 ? void 0 : _b.properties)) {
-                for (const propertyName of Object.keys(Object.values((_c = action.properties) !== null && _c !== void 0 ? _c : {})[0])) {
-                    if (!((_d = definition.members) === null || _d === void 0 ? void 0 : _d.properties[propertyName])) {
+                Object.values(action.properties ?? {})[0] &&
+                definition.members?.properties) {
+                for (const propertyName of Object.keys(Object.values(action.properties ?? {})[0])) {
+                    if (!definition.members?.properties[propertyName]) {
                         report(action.type, 'contains a property that doesn’t exist in app member properties', [
                             ...path,
                             'properties',
@@ -849,7 +842,7 @@ function validateActions(definition, report) {
             if (action.type.startsWith('resource.')) {
                 // All of the actions starting with `resource.` contain a property called `resource`.
                 const { resource: resourceName, view } = action;
-                const resource = (_e = definition.resources) === null || _e === void 0 ? void 0 : _e[resourceName];
+                const resource = definition.resources?.[resourceName];
                 const [, resourceAction] = action.type.split('.');
                 if (!resource) {
                     report(action.type, 'refers to a resource that doesn’t exist', [...path, 'resource']);
@@ -860,7 +853,7 @@ function validateActions(definition, report) {
                         report(action.type, 'missing security definition', [...path, 'resource']);
                         return;
                     }
-                    const allPermissions = ((_f = definition.security.guest) === null || _f === void 0 ? void 0 : _f.permissions) || [];
+                    const allPermissions = definition.security.guest?.permissions || [];
                     if (definition.security.roles) {
                         const allRolePermissions = getAppRolePermissions(definition.security, Object.keys(definition.security.roles));
                         allPermissions.push(...allRolePermissions);
@@ -899,19 +892,19 @@ function validateActions(definition, report) {
                 }
             }
             if (action.type.startsWith('flow.')) {
-                const page = (_g = definition.pages) === null || _g === void 0 ? void 0 : _g[Number(path[1])];
+                const page = definition.pages?.[Number(path[1])];
                 if (page.type !== 'flow' && page.type !== 'loop') {
                     report(action.type, 'flow actions can only be used on pages with the type ‘flow’ or ‘loop’', [...path, 'type']);
                     return;
                 }
-                if (action.type === 'flow.cancel' && !((_h = page.actions) === null || _h === void 0 ? void 0 : _h.onFlowCancel)) {
+                if (action.type === 'flow.cancel' && !page.actions?.onFlowCancel) {
                     report(action.type, 'was defined but ‘onFlowCancel’ page action wasn’t defined', [
                         ...path,
                         'type',
                     ]);
                     return;
                 }
-                if (action.type === 'flow.finish' && !((_j = page.actions) === null || _j === void 0 ? void 0 : _j.onFlowFinish)) {
+                if (action.type === 'flow.finish' && !page.actions?.onFlowFinish) {
                     report(action.type, 'was defined but ‘onFlowFinish’ page action wasn’t defined', [
                         ...path,
                         'type',
@@ -925,7 +918,7 @@ function validateActions(definition, report) {
                 if (page.type === 'flow' &&
                     action.type === 'flow.next' &&
                     Number(path[3]) === page.steps.length - 1 &&
-                    !((_k = page.actions) === null || _k === void 0 ? void 0 : _k.onFlowFinish)) {
+                    !page.actions?.onFlowFinish) {
                     report(action.type, 'was defined on the last step but ‘onFlowFinish’ page action wasn’t defined', [...path, 'type']);
                     return;
                 }