@appsemble/utils 0.27.11 → 0.28.0

package/README.md

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

package/api/components/parameters/appPath.d.ts

@@ -0,0 +1,2 @@
+import { type OpenAPIV3 } from 'openapi-types';
+export declare const appPath: OpenAPIV3.ParameterObject;

package/api/components/parameters/appPath.js

@@ -0,0 +1,8 @@
+export const appPath = {
+    name: 'appPath',
+    in: 'path',
+    description: 'The app-path of the app on which to perform an operation',
+    required: true,
+    schema: { $ref: '#/components/schemas/App/properties/path' },
+};
+//# sourceMappingURL=appPath.js.map

package/api/components/parameters/appVariableId.d.ts

@@ -0,0 +1,2 @@
+import { type OpenAPIV3 } from 'openapi-types';
+export declare const appVariableId: OpenAPIV3.ParameterObject;

package/api/components/parameters/appVariableId.js

@@ -0,0 +1,8 @@
+export const appVariableId = {
+    name: 'appVariableId',
+    in: 'path',
+    description: 'The id of the app variable on which to perform an operation',
+    required: true,
+    schema: { type: 'string' },
+};
+//# sourceMappingURL=appVariableId.js.map

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

@@ -5,6 +5,7 @@ export * from './$team.js';
 export * from './$top.js';
 export * from './$skip.js';
 export * from './appId.js';
+export * from './appPath.js';
 export * from './appOAuth2SecretId.js';
 export * from './appSamlSecretId.js';
 export * from './assetId.js';
@@ -18,6 +19,7 @@ export * from './resourceType.js';
 export * from './screenshotId.js';
 export * from './readmeId.js';
 export * from './appServiceId.js';
+export * from './appVariableId.js';
 export * from './view.js';
 export * from './trainingId.js';
 export * from './trainingBlockId.js';

package/api/components/parameters/index.js

@@ -5,6 +5,7 @@ export * from './$team.js';
 export * from './$top.js';
 export * from './$skip.js';
 export * from './appId.js';
+export * from './appPath.js';
 export * from './appOAuth2SecretId.js';
 export * from './appSamlSecretId.js';
 export * from './assetId.js';
@@ -18,6 +19,7 @@ export * from './resourceType.js';
 export * from './screenshotId.js';
 export * from './readmeId.js';
 export * from './appServiceId.js';
+export * from './appVariableId.js';
 export * from './view.js';
 export * from './trainingId.js';
 export * from './trainingBlockId.js';

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

@@ -0,0 +1,2 @@
+import { type OpenAPIV3 } from 'openapi-types';
+export declare const AppVariable: OpenAPIV3.NonArraySchemaObject;

package/api/components/schemas/AppVariable.js

@@ -0,0 +1,22 @@
+export const AppVariable = {
+    type: 'object',
+    description: 'App variable',
+    required: ['name'],
+    additionalProperties: false,
+    properties: {
+        id: {
+            type: 'number',
+            description: 'An autogenerated ID.',
+            readOnly: true,
+        },
+        name: {
+            type: 'string',
+            description: 'The name of the variable, that will be accessible from clients.',
+        },
+        value: {
+            description: 'The value of the variable.',
+            anyOf: [{ type: 'string' }, { type: 'boolean' }, { type: 'number' }],
+        },
+    },
+};
+//# sourceMappingURL=AppVariable.js.map

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

@@ -12,6 +12,7 @@ export * from './AppMessages.js';
 export * from './AppOAuth2Secret.js';
 export * from './AppsembleMessages.js';
 export * from './AppServiceSecret.js';
+export * from './AppVariable.js';
 export * from './ArrayRemapperDefinition.js';
 export * from './Asset.js';
 export * from './BlockDefinition.js';

package/api/components/schemas/index.js

@@ -12,6 +12,7 @@ export * from './AppMessages.js';
 export * from './AppOAuth2Secret.js';
 export * from './AppsembleMessages.js';
 export * from './AppServiceSecret.js';
+export * from './AppVariable.js';
 export * from './ArrayRemapperDefinition.js';
 export * from './Asset.js';
 export * from './BlockDefinition.js';

package/api/paths/appOAuth2Secrets.js

@@ -11,7 +11,7 @@ export const paths = {
                     },
                 },
             },
-            security: [{ studio: [] }],
+            security: [{ studio: [] }, { cli: ['apps:write'] }],
             responses: {
                 201: {
                     description: 'A list of the OAuth2 secrets for the app.',
@@ -41,6 +41,16 @@ export const paths = {
                 },
             },
         },
+        delete: {
+            tags: ['secret'],
+            operationId: 'deleteAppOAuth2Secrets',
+            security: [{ studio: [] }, { cli: ['apps:write'] }],
+            responses: {
+                204: {
+                    description: 'The deleted app OAuth2 secrets.',
+                },
+            },
+        },
     },
     '/api/apps/{appId}/secrets/oauth2/{appOAuth2SecretId}': {
         parameters: [

package/api/paths/appSSLSecrets.js

@@ -32,7 +32,7 @@ export const paths = {
                     $ref: '#/components/schemas/SSLSecret',
                 },
             },
-            security: [{ studio: [] }],
+            security: [{ studio: [] }, { cli: ['apps:write'] }],
         },
     },
 };

package/api/paths/appSamlSecrets.js

@@ -11,7 +11,7 @@ export const paths = {
                     },
                 },
             },
-            security: [{ studio: [] }],
+            security: [{ studio: [] }, { cli: ['apps:write'] }],
             responses: {
                 201: {
                     description: 'A list of the SAML secrets for the app.',
@@ -41,6 +41,16 @@ export const paths = {
                 },
             },
         },
+        delete: {
+            tags: ['secret'],
+            operationId: 'deleteAppSamlSecrets',
+            security: [{ studio: [] }, { cli: ['apps:write'] }],
+            responses: {
+                204: {
+                    description: 'The deleted app saml secrets.',
+                },
+            },
+        },
     },
     '/api/apps/{appId}/secrets/saml/{appSamlSecretId}': {
         parameters: [

package/api/paths/appScimSecrets.js

@@ -28,7 +28,7 @@ export const paths = {
                     },
                 },
             },
-            security: [{ studio: [] }],
+            security: [{ studio: [] }, { cli: ['apps:write'] }],
             responses: {
                 200: {
                     description: 'The app SCIM configuration',

package/api/paths/appServiceSecrets.js

@@ -3,7 +3,7 @@ export const paths = {
         parameters: [{ $ref: '#/components/parameters/appId' }],
         post: {
             tags: ['secret'],
-            operationId: 'addAppServiceSecret',
+            operationId: 'createAppServiceSecret',
             requestBody: {
                 content: {
                     'application/json': {
@@ -11,7 +11,7 @@ export const paths = {
                     },
                 },
             },
-            security: [{ studio: [] }],
+            security: [{ studio: [] }, { cli: ['apps:write'] }],
             responses: {
                 201: {
                     description: 'The created app service secret.',
@@ -41,6 +41,16 @@ export const paths = {
                 },
             },
         },
+        delete: {
+            tags: ['secret'],
+            operationId: 'deleteAppServiceSecrets',
+            security: [{ studio: [] }, { cli: ['apps:write'] }],
+            responses: {
+                204: {
+                    description: 'The deleted app service secrets.',
+                },
+            },
+        },
     },
     '/api/apps/{appId}/secrets/service/{appServiceId}': {
         parameters: [

package/api/paths/appVariables.d.ts

@@ -0,0 +1,2 @@
+import { type OpenAPIV3 } from 'openapi-types';
+export declare const paths: OpenAPIV3.PathsObject;

package/api/paths/appVariables.js

@@ -0,0 +1,93 @@
+export const paths = {
+    '/api/apps/{appId}/variables': {
+        parameters: [{ $ref: '#/components/parameters/appId' }],
+        post: {
+            tags: ['variable'],
+            operationId: 'createAppVariable',
+            requestBody: {
+                content: {
+                    'application/json': {
+                        schema: { $ref: '#/components/schemas/AppVariable' },
+                    },
+                },
+            },
+            security: [{ studio: [] }, { cli: ['apps:write'] }],
+            responses: {
+                201: {
+                    description: 'The created app variable.',
+                    content: {
+                        'application/json': {
+                            schema: { $ref: '#/components/schemas/AppVariable' },
+                        },
+                    },
+                },
+            },
+        },
+        get: {
+            tags: ['variable'],
+            operationId: 'getAppVariables',
+            responses: {
+                200: {
+                    description: 'The list of app variables.',
+                    content: {
+                        'application/json': {
+                            schema: {
+                                type: 'array',
+                                items: { $ref: '#/components/schemas/AppVariable' },
+                            },
+                        },
+                    },
+                },
+            },
+        },
+        delete: {
+            tags: ['variable'],
+            operationId: 'deleteAppVariables',
+            security: [{ studio: [] }, { cli: ['apps:write'] }],
+            responses: {
+                204: {
+                    description: 'The deleted app variables.',
+                },
+            },
+        },
+    },
+    '/api/apps/{appId}/variables/{appVariableId}': {
+        parameters: [
+            { $ref: '#/components/parameters/appId' },
+            { $ref: '#/components/parameters/appVariableId' },
+        ],
+        put: {
+            tags: ['secret'],
+            operationId: 'updateAppVariable',
+            requestBody: {
+                content: {
+                    'application/json': {
+                        schema: { $ref: '#/components/schemas/AppVariable' },
+                    },
+                },
+            },
+            security: [{ studio: [] }],
+            responses: {
+                200: {
+                    description: 'The updated app variable.',
+                    content: {
+                        'application/json': {
+                            schema: { $ref: '#/components/schemas/AppVariable' },
+                        },
+                    },
+                },
+            },
+        },
+        delete: {
+            tags: ['secret'],
+            operationId: 'deleteAppVariable',
+            security: [{ studio: [] }],
+            responses: {
+                204: {
+                    description: 'The deleted app variable.',
+                },
+            },
+        },
+    },
+};
+//# sourceMappingURL=appVariables.js.map

package/api/paths/apps.js

@@ -142,6 +142,28 @@ export const paths = {
             security: [{ studio: [] }, {}],
         },
     },
+    '/api/apps/path/{appPath}': {
+        parameters: [{ $ref: '#/components/parameters/appPath' }],
+        get: {
+            tags: ['app', 'app-path'],
+            parameters: [
+                {
+                    name: 'language',
+                    schema: { type: 'string' },
+                    description: 'The language to include the translations of, if available',
+                    in: 'query',
+                },
+            ],
+            description: 'Get an app by app-path',
+            operationId: 'getAppByPath',
+            responses: {
+                200: {
+                    description: 'The app that matches the given app path.',
+                    $ref: '#/components/responses/app',
+                },
+            },
+        },
+    },
     '/api/apps/{appId}': {
         parameters: [{ $ref: '#/components/parameters/appId' }],
         get: {
@@ -340,7 +362,7 @@ export const paths = {
         parameters: [{ $ref: '#/components/parameters/appId' }],
         get: {
             tags: ['app', 'export', 'zip'],
-            description: 'Export the app',
+            description: 'Export an app as a zip file',
             operationId: 'exportApp',
             parameters: [
                 {

package/api/paths/index.js

@@ -10,6 +10,7 @@ import { paths as appScimSecrets } from './appScimSecrets.js';
 import { paths as appsembleMessages } from './appsembleMessages.js';
 import { paths as appServiceSecrets } from './appServiceSecrets.js';
 import { paths as appSSLSecrets } from './appSSLSecrets.js';
+import { paths as appVariables } from './appVariables.js';
 import { paths as assets } from './assets.js';
 import { paths as blocks } from './blocks.js';
 import { paths as emails } from './emails.js';
@@ -33,6 +34,7 @@ export const paths = {
     ...scimEndpoints,
     ...appsembleMessages,
     ...appSSLSecrets,
+    ...appVariables,
     ...appCollections,
     ...appQuotas,
     ...assets,

package/api/paths/templates.js

@@ -68,6 +68,14 @@ export const paths = {
                                     type: 'boolean',
                                     description: 'Include example assets.',
                                 },
+                                variables: {
+                                    type: 'boolean',
+                                    description: 'Include example variables.',
+                                },
+                                secrets: {
+                                    type: 'boolean',
+                                    description: 'Include example secrets.',
+                                },
                                 visibility: {
                                     $ref: '#/components/schemas/App/properties/visibility',
                                 },

package/examples.js

@@ -279,6 +279,12 @@ export const examples = {
         result: {},
         skip: true,
     },
+    variable: {
+        input: null,
+        remapper: {},
+        result: {},
+        skip: true,
+    },
     'date.add': {
         input: '2023-06-30T14:50:19.601Z',
         remapper: [
@@ -649,6 +655,7 @@ export function schemaExample(remapper, options) {
 export function createExampleContext(url, lang, userInfo, history) {
     return {
         getMessage: ({ defaultMessage }) => new IntlMessageFormat(defaultMessage, lang, undefined),
+        getVariable: () => null,
         url: String(url),
         appUrl: `${url.protocol}//example-app.example-organization.${url.host}`,
         userInfo: userInfo !== null && userInfo !== void 0 ? userInfo : {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/utils",
-  "version": "0.27.11",
+  "version": "0.28.0",
   "description": "Utility functions used in Appsemble internally",
   "keywords": [
     "app",
@@ -37,7 +37,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.27.11",
+    "@appsemble/types": "0.28.0",
     "axios": "^1.0.0",
     "cron-parser": "^4.0.0",
     "date-fns": "^2.0.0",

package/reference-schemas/remappers/config.d.ts

@@ -0,0 +1,2 @@
+import { type OpenAPIV3 } from 'openapi-types';
+export declare const configRemappers: Record<string, OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject>;

package/reference-schemas/remappers/config.js

@@ -0,0 +1,7 @@
+export const configRemappers = {
+    variable: {
+        type: 'string',
+        description: 'Get a predefined app variable by name',
+    },
+};
+//# sourceMappingURL=config.js.map

package/reference-schemas/remappers/data.js

@@ -203,6 +203,12 @@ The result of the final page’s log would then be:
             { type: 'string' },
             { type: 'integer' },
             { type: 'array', minItems: 1, items: { anyOf: [{ type: 'string' }, { type: 'integer' }] } },
+            {
+                type: 'array',
+                minItems: 1,
+                items: { $ref: '#/components/schemas/ObjectRemapperDefinition' },
+            },
+            { $ref: '#/components/schemas/ObjectRemapperDefinition' },
         ],
         description: `Gets the chosen property from an object.
 

package/reference-schemas/remappers/dates.js

@@ -26,7 +26,12 @@ ${schemaExample('date.add')}
 `,
     },
     'date.format': {
-        enum: ['string', null],
+        oneOf: [
+            { enum: [null] },
+            {
+                type: 'string',
+            },
+        ],
         description: `Format a date according to the RFC3339 format.
 
 Here is an example of a RFC3339 complicit date:

package/reference-schemas/remappers/index.d.ts

@@ -7,3 +7,4 @@ export * from './objects.js';
 export * from './randoms.js';
 export * from './strings.js';
 export * from './unsorted.js';
+export * from './config.js';

package/reference-schemas/remappers/index.js

@@ -7,4 +7,5 @@ export * from './objects.js';
 export * from './randoms.js';
 export * from './strings.js';
 export * from './unsorted.js';
+export * from './config.js';
 //# sourceMappingURL=index.js.map

package/remap.d.ts

@@ -1,4 +1,4 @@
-import { type AppMember, type Remapper, type UserInfo } from '@appsemble/types';
+import { type AppMember, type Remapper, type UserInfo, type ValueFromProcess } from '@appsemble/types';
 import { type IntlMessageFormat } from 'intl-messageformat';
 export interface IntlMessage {
     id?: string;
@@ -11,6 +11,7 @@ export interface IntlMessage {
  * @returns A message format instance.
  */
 export type MessageGetter = (msg: IntlMessage) => IntlMessageFormat;
+export type AppConfigEntryGetter = (name: string) => ValueFromProcess;
 export interface RemapperContext {
     /**
      * The id of the app whose context the remapper is run in.
@@ -28,6 +29,10 @@ export interface RemapperContext {
      * @see MessageGetter
      */
     getMessage: MessageGetter;
+    /**
+     * @see VariableGetter
+     */
+    getVariable: AppConfigEntryGetter;
     /**
      * The history stack containing the states before an action was called.
      */

package/remap.js

@@ -84,6 +84,12 @@ const mapperImplementations = {
         }
         return result !== null && result !== void 0 ? result : null;
     },
+    variable(name, input, context) {
+        if (context.getVariable) {
+            return context.getVariable(name);
+        }
+        return { variable: name };
+    },
     equals(mappers, input, context) {
         if (mappers.length <= 1) {
             return true;
@@ -239,13 +245,45 @@ const mapperImplementations = {
         return Array.isArray(input) ? input.filter((value, i) => !indices.has(i)) : [];
     },
     static: (input) => input,
-    prop(prop, obj) {
+    prop(prop, obj, context) {
         let result = obj;
-        for (const p of [prop].flat()) {
-            if (result == null) {
+        if (result == null) {
+            return result;
+        }
+        if (Array.isArray(prop)) {
+            if (prop.every((item) => typeof item === 'number' || typeof item === 'string')) {
+                // This runs if the provided value is an array of property names or indexes
+                for (const p of [prop].flat()) {
+                    result = result[p];
+                }
+            }
+            else if (prop.every((item) => typeof item === 'object' && !Array.isArray(item))) {
+                // This runs if the provided value is an array of remappers
+                const remapped = remap(prop, obj, context);
+                if (typeof remapped === 'number' || typeof remapped === 'string') {
+                    result = result[remapped];
+                }
+                else {
+                    console.error(`Invalid remapper ${JSON.stringify(prop)}`);
+                }
+            }
+        }
+        else if (typeof prop === 'object') {
+            if (prop == null) {
+                result = result.null;
                 return result;
             }
-            result = result[p];
+            // This runs if the provided value is a remapper
+            const remapped = remap(prop, result, context);
+            if (typeof remapped === 'number' || typeof remapped === 'string') {
+                result = result[remapped];
+            }
+            else {
+                console.error(`Invalid remapper ${JSON.stringify(prop)}`);
+            }
+        }
+        else if (typeof prop === 'number' || typeof prop === 'string') {
+            result = result[prop];
         }
         return result;
     },

package/remap.test.js

@@ -3,9 +3,10 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { createExampleContext, examples } from './examples.js';
 import { remap } from './remap.js';
 function runTests(tests) {
-    it.each(Object.entries(tests))('should %s', (name, { context, expected, history, input, mappers, messages, userInfo }) => {
+    it.each(Object.entries(tests))('should %s', (name, { context, expected, history, input, mappers, messages, userInfo, 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; },
             url: 'https://example.com/en/example',
             appUrl: 'https://example.com',
             userInfo,
@@ -120,6 +121,22 @@ describe('context', () => {
         },
     });
 });
+describe('variable', () => {
+    runTests({
+        'get a variable': {
+            input: {},
+            mappers: { variable: 'my-variable' },
+            expected: 'my-variable-value',
+            variables: [{ id: 0, name: 'my-variable', value: 'my-variable-value' }],
+        },
+        'get an undefined variable': {
+            input: {},
+            mappers: { variable: 'my-variable' },
+            expected: undefined,
+            variables: [],
+        },
+    });
+});
 describe('date.now', () => {
     beforeEach(() => {
         vi.useFakeTimers({ now: 0 });
@@ -210,7 +227,7 @@ describe('log', () => {
         vi.spyOn(console, 'warn').mockImplementation(null);
     });
     function runLogTests(tests) {
-        it.each(Object.entries(tests))('should %s', (name, { context, expected: expectedInput, history, input, mappers, messages, userInfo }) => {
+        it.each(Object.entries(tests))('should %s', (name, { context, expected: expectedInput, history, input, mappers, messages, userInfo, variables, }) => {
             const expected = JSON.stringify({
                 input: expectedInput,
                 context: {
@@ -228,6 +245,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); },
+                getVariable: (variableName) => variables.find((variable) => variable.name === variableName).value,
                 url: 'https://example.com/en/example',
                 appUrl: 'https://example.com',
                 userInfo,
@@ -870,6 +888,24 @@ describe('prop', () => {
             mappers: [{ prop: 'names' }, { prop: 0 }],
             expected: 'foo',
         },
+        'handle a single remapper': {
+            input: { en: 'English', nl: 'Dutch' },
+            mappers: [{ prop: { app: 'locale' } }],
+            expected: 'English',
+        },
+        'handle an array of remappers': {
+            input: { address: { town: 'Bikini Bottom' } },
+            mappers: [{ prop: [{ 'object.from': { prop: 'address' } }, { prop: 'prop' }] }],
+            expected: { town: 'Bikini Bottom' },
+        },
+        'handle an array of remappers with numbers': {
+            input: { languages: ['English', 'Dutch'] },
+            mappers: [
+                { prop: [{ 'object.from': { prop: 'languages' } }, { prop: 'prop' }] },
+                { prop: 0 },
+            ],
+            expected: 'English',
+        },
         'handle null': {
             input: { name: 'Spongebob' },
             mappers: { prop: null },