@appsemble/utils 0.32.2-test.7 → 0.32.3-test.0

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.32.2-test.7/config/assets/logo.svg) Appsemble Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.32.3-test.0/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.32.2-test.7/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.32.2-test.7)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.32.3-test.0/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.32.3-test.0)
 [![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.32.2-test.7/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.32.3-test.0/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/api/components/schemas/ActionDefinition.js

@@ -28,6 +28,7 @@ export const ActionDefinition = {
                 { $ref: '#/components/schemas/AnalyticsActionDefinition' },
                 { $ref: '#/components/schemas/ControllerActionDefinition' },
                 { $ref: '#/components/schemas/ConditionActionDefinition' },
+                { $ref: '#/components/schemas/CsvParseActionDefinition' },
                 { $ref: '#/components/schemas/DialogActionDefinition' },
                 { $ref: '#/components/schemas/DialogErrorActionDefinition' },
                 { $ref: '#/components/schemas/DialogOkActionDefinition' },

package/api/components/schemas/CsvParseActionDefinition.d.ts

@@ -0,0 +1 @@
+export declare const CsvParseActionDefinition: import("openapi-types").OpenAPIV3.SchemaObject;

package/api/components/schemas/CsvParseActionDefinition.js

@@ -0,0 +1,22 @@
+import { BaseActionDefinition } from './BaseActionDefinition.js';
+import { extendJSONSchema } from './utils.js';
+export const CsvParseActionDefinition = extendJSONSchema(BaseActionDefinition, {
+    type: 'object',
+    additionalProperties: false,
+    required: ['type', 'file'],
+    properties: {
+        type: {
+            description: 'An action to parse the CSV files',
+            enum: ['csv.parse'],
+        },
+        file: {
+            description: 'The CSV file to be parsed',
+            $ref: '#/components/schemas/RemapperDefinition',
+        },
+        delimiter: {
+            description: 'The delimiter to be used, defaults to comma(",")',
+            $ref: '#/components/schemas/RemapperDefinition',
+        },
+    },
+});
+//# sourceMappingURL=CsvParseActionDefinition.js.map

package/api/components/schemas/index.d.ts

@@ -149,3 +149,4 @@ export * from './PageActionsDefinition.js';
 export * from './FilterParametersDefinition.js';
 export * from './WebhookDefinition.js';
 export * from './AppWebhookSecret.js';
+export * from './CsvParseActionDefinition.js';

package/api/components/schemas/index.js

@@ -149,4 +149,5 @@ export * from './PageActionsDefinition.js';
 export * from './FilterParametersDefinition.js';
 export * from './WebhookDefinition.js';
 export * from './AppWebhookSecret.js';
+export * from './CsvParseActionDefinition.js';
 //# sourceMappingURL=index.js.map

package/appMessages.js

@@ -55,10 +55,13 @@ export function extractAppMessages(app, onBlock) {
             }
         },
         onAction(action) {
-            Object.assign(messages.messageIds, findMessageIds(action.remap));
+            Object.assign(messages.messageIds, findMessageIds(action.remapBefore));
+            Object.assign(messages.messageIds, findMessageIds(action.remapAfter));
             switch (action.type) {
                 case 'condition':
                     Object.assign(messages.messageIds, findMessageIds(action.if));
+                    Object.assign(messages.messageIds, findMessageIds(action.then));
+                    Object.assign(messages.messageIds, findMessageIds(action.else));
                     break;
                 case 'dialog':
                     Object.assign(messages.messageIds, findMessageIds(action.title));

package/examples.js

@@ -85,6 +85,16 @@ export const examples = {
             },
         ],
     },
+    'array.contains': {
+        input: [1, 2, 3, 4, 5],
+        remapper: { 'array.contains': { static: 6 } },
+        result: false,
+    },
+    'string.contains': {
+        input: 'Input string',
+        remapper: { 'string.contains': 'string' },
+        result: true,
+    },
     len: {
         input: 'string',
         remapper: { len: null },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/utils",
-  "version": "0.32.2-test.7",
+  "version": "0.32.3-test.0",
   "description": "Utility functions used in Appsemble internally",
   "keywords": [
     "app",
@@ -39,7 +39,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.32.2-test.7",
+    "@appsemble/types": "0.32.3-test.0",
     "@odata/parser": "^0.2.14",
     "axios": "^1.0.0",
     "cron-parser": "^4.0.0",

package/reference-schemas/actions/miscellaneous.js

@@ -1,6 +1,7 @@
 import { AnalyticsActionDefinition } from '../../api/components/schemas/AnalyticsActionDefinition.js';
 import { ConditionActionDefinition } from '../../api/components/schemas/ConditionActionDefinition.js';
 import { ControllerActionDefinition } from '../../api/components/schemas/ControllerActionDefinition.js';
+import { CsvParseActionDefinition } from '../../api/components/schemas/CsvParseActionDefinition.js';
 import { DialogActionDefinition } from '../../api/components/schemas/DialogActionDefinition.js';
 import { DialogErrorActionDefinition } from '../../api/components/schemas/DialogErrorActionDefinition.js';
 import { DialogOkActionDefinition } from '../../api/components/schemas/DialogOkActionDefinition.js';
@@ -21,6 +22,7 @@ export const miscellaneousActions = {
     analytics: AnalyticsActionDefinition,
     condition: ConditionActionDefinition,
     controller: ControllerActionDefinition,
+    'csv.parse': CsvParseActionDefinition,
     download: DownloadActionDefinition,
     dialog: DialogActionDefinition,
     'dialog.ok': DialogOkActionDefinition,

package/reference-schemas/remappers/arrays.js

@@ -284,6 +284,13 @@ Flatten an array. Accepts an array of static or remapper values.
 Say for example that each person has some pets. We could get an array of all pets like so:
 
 ${schemaExample('array.flatten', { input: 'pretty', exclude: ['remapper'] })}
+`,
+    },
+    'array.contains': {
+        $ref: '#/components/schemas/RemapperDefinition',
+        description: `
+Checks if the input array includes the provided item.
+${schemaExample('array.contains')}
 `,
     },
 };

package/reference-schemas/remappers/data.js

@@ -288,7 +288,7 @@ ${schemaExample('static', { exclude: ['input'] })}
 `,
     },
     translate: {
-        type: 'string',
+        $ref: '#/components/schemas/RemapperDefinition',
         description: `> **Note:** This is explained much more in depth at [Translating](/docs/guides/translating)
 
 This remapper allows you to easily add translations to your app. To make this remapper work, replace

package/reference-schemas/remappers/strings.js

@@ -80,6 +80,13 @@ ${schemaExample('string.format')}
 Uses RegEx to find a value in a string and replace it with a given value.
 
 ${schemaExample('string.replace')}
+`,
+    },
+    'string.contains': {
+        type: 'string',
+        description: `
+Checks if the provided string is a substring of the input string.
+${schemaExample('string.contains')}
 `,
     },
 };

package/remap.js

@@ -24,6 +24,14 @@ function isEqualArray(a, b) {
     }
     return a.every((val, i) => val === b[i]);
 }
+function isEqualObject(a, b) {
+    const aKeys = Object.keys(a);
+    const bKeys = Object.keys(b);
+    if (aKeys.length !== bKeys.length) {
+        return false;
+    }
+    return aKeys.every((key) => bKeys.includes(key) && equal(a[key], b[key]));
+}
 function isNumber(a) {
     return a !== undefined && a != null && a !== '' && !Number.isNaN(Number(a));
 }
@@ -299,6 +307,19 @@ const mapperImplementations = {
             nextItem: input[index + 1],
         },
     })) ?? [],
+    'array.contains'(mapper, input, context) {
+        if (!Array.isArray(input)) {
+            return false;
+        }
+        const remapped = remap(mapper, input, context);
+        if (isPlainObject(remapped)) {
+            return input.some((item) => isEqualObject(item, remapped ?? {}));
+        }
+        if (Array.isArray(remapped)) {
+            return input.some((item) => isEqualArray(item, remapped));
+        }
+        return input.includes(remapped);
+    },
     'array.unique'(mapper, input, context) {
         if (!Array.isArray(input)) {
             return input;
@@ -528,6 +549,12 @@ const mapperImplementations = {
         }
         return input;
     },
+    'string.contains'(stringToCheck, input) {
+        if (!(typeof input === 'string')) {
+            return false;
+        }
+        return input.includes(stringToCheck);
+    },
     // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
     // @ts-ignore 2322 ... is not assignable to type (strictNullChecks)
     'string.startsWith'(substring, input) {
@@ -582,8 +609,12 @@ const mapperImplementations = {
         return String(input).replaceAll(new RegExp(regex, 'gm'), replacer);
     },
     translate(messageId, input, context) {
-        const message = context.getMessage({ id: messageId });
-        return message.format() || `{${messageId}}`;
+        const remappedId = remap(messageId, input, context);
+        if (typeof remappedId !== 'string') {
+            return null;
+        }
+        const message = context.getMessage({ id: remappedId });
+        return message.format() || `{${remappedId}}`;
     },
     'app.member': (property, input, context) => context.appMemberInfo?.[property],
     container(property, input, context) {

package/validateAppMessages.js

@@ -29,8 +29,11 @@ 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?.app, key) || typeof messages.app[key] !== 'string') && !match) {
+            const blockMatch = /^(pages\.[\dA-Za-z-]+(\..+)?)\.blocks\.\d+.+/.exec(key);
+            const emailMatch = /emails\.(appInvite|appMemberEmailChange|emailAdded|groupInvite|resend|reset|welcome)\.(body|subject)/.exec(key);
+            if ((!has(extractedMessages?.app, key) || typeof messages.app[key] !== 'string') &&
+                !blockMatch &&
+                !emailMatch) {
                 throw new AppMessageValidationError(`Invalid key ${key}`);
             }
         });