@appsemble/node-utils 0.33.5 → 0.33.7

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.33.5/config/assets/logo.svg) Appsemble Node Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.33.7/config/assets/logo.svg) Appsemble Node Utilities
 
 > NodeJS utilities used by Appsemble internally.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/node-utils)](https://www.npmjs.com/package/@appsemble/node-utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.33.5/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.33.5)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.33.7/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.33.7)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ compatibility is not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.33.5/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.33.7/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/app.d.ts

@@ -1,5 +1,5 @@
+import { type RemapperContext } from '@appsemble/lang-sdk';
 import { type App, type AppsembleMessages } from '@appsemble/types';
-import { type RemapperContext } from '@appsemble/utils';
 import { type DefaultContext, type DefaultState, type ParameterizedContext } from 'koa';
 import { type Options } from './server/types.js';
 /**

package/app.js

@@ -1,7 +1,8 @@
 import { existsSync } from 'node:fs';
 import { readFile, rm, writeFile } from 'node:fs/promises';
 import { basename, dirname, join } from 'node:path';
-import { defaultLocale, has, objectCache } from '@appsemble/utils';
+import { defaultLocale } from '@appsemble/lang-sdk';
+import { has, objectCache } from '@appsemble/utils';
 import { memoize } from '@formatjs/fast-memoize';
 import { generate, parse, walk } from 'css-tree';
 import { copy, ensureDir } from 'fs-extra';

package/container/helpers.d.ts

@@ -1,4 +1,4 @@
-import { type ContainerEnvVar, type ContainerResourceProps, type ContainerResources } from '@appsemble/types';
+import { type ContainerEnvVar, type ContainerResourceProps, type ContainerResources } from '@appsemble/lang-sdk';
 import { AppsV1Api, CoreV1Api, KubeConfig, type V1EnvVar } from '@kubernetes/client-node';
 export declare const maxCPU: number;
 export declare const maxMemoryGi: number;

package/container/operations.d.ts

@@ -1,4 +1,4 @@
-import { type CompanionContainerDefinition } from '@appsemble/types';
+import { type CompanionContainerDefinition } from '@appsemble/lang-sdk';
 /**
  * Creates or updates secret.
  * Secret resource is named after the app name + id, where whitespace

package/container/specs.d.ts

@@ -1,4 +1,4 @@
-import { type CompanionContainerDefinition } from '@appsemble/types';
+import { type CompanionContainerDefinition } from '@appsemble/lang-sdk';
 import { type V1Deployment, type V1Service } from '@kubernetes/client-node';
 /**
  * Create the spec objects for a service, deployment, and pod.

package/getMessagesUtil.js

@@ -1,5 +1,6 @@
+import { defaultLocale, normalizeBlockName } from '@appsemble/lang-sdk';
 import { getAppsembleMessages, mergeMessages, } from '@appsemble/node-utils';
-import { defaultLocale, extractAppMessages, normalizeBlockName, } from '@appsemble/utils';
+import { extractAppMessages } from '@appsemble/utils';
 import tags from 'language-tags';
 import { assertKoaCondition, throwKoaError } from './koa.js';
 export async function getMessagesUtil(ctx, language, appId, merge, { getApp, getAppMessages, getBlockMessages }, override = 'true') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.33.5",
+  "version": "0.33.7",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -40,8 +40,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.33.5",
-    "@appsemble/utils": "0.33.5",
+    "@appsemble/types": "0.33.7",
+    "@appsemble/utils": "0.33.7",
+    "@appsemble/lang-sdk": "0.33.7",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@kubernetes/client-node": "^0.22.2",

package/resource.d.ts

@@ -1,4 +1,5 @@
-import { type AppDefinition, type ResourceDefinition, type Resource as ResourceType } from '@appsemble/types';
+import { type AppDefinition, type ResourceDefinition } from '@appsemble/lang-sdk';
+import { type Resource as ResourceType } from '@appsemble/types';
 import { type PreValidatePropertyFunction } from 'jsonschema';
 import { type Context, type DefaultContext, type DefaultState, type ParameterizedContext } from 'koa';
 import { type JsonValue } from 'type-fest';

package/resource.js

@@ -2,6 +2,7 @@ import { randomUUID } from 'node:crypto';
 import { mapValues } from '@appsemble/utils';
 import { addMilliseconds, isPast, parseISO } from 'date-fns';
 import { ValidationError, Validator } from 'jsonschema';
+import { partition } from 'lodash-es';
 import parseDuration from 'parse-duration';
 import { preProcessCSV } from './csv.js';
 import { handleValidatorResult, TempFile } from './index.js';
@@ -118,6 +119,7 @@ export function extractResourceBody(ctx) {
         preValidateProperty,
     ];
 }
+// XXX: unify with webhooks logic
 /**
  * Process an incoming resource request body.
  *
@@ -138,38 +140,41 @@ export function extractResourceBody(ctx) {
 export function processResourceBody(ctx, definition, knownAssetIds = [], knownExpires, knownAssetNameIds = [], isPatch = false) {
     const [resource, assets, preValidateProperty] = extractResourceBody(ctx);
     const validator = new Validator();
-    const assetIdMap = new Map();
-    const assetUsedMap = new Map();
     const reusedAssets = new Set();
-    const thumbnailAssets = [];
-    const regularAssets = [];
+    const usedAssetIndices = new Set();
     const thumbnailAssetSuffix = '-thumbnail.png';
-    for (const asset of assets) {
-        if (asset.filename?.endsWith(thumbnailAssetSuffix)) {
-            thumbnailAssets.push(asset);
-        }
-        else {
-            regularAssets.push(asset);
-        }
+    const [thumbnailAssets, regularAssets] = partition(
+    // Preserve original index to handle asset references in data
+    assets.map((asset, index) => ({ asset, index })), ({ asset }) => asset.filename?.endsWith(thumbnailAssetSuffix));
+    const preparedRegularAssets = regularAssets.map(({ asset: { filename, mime, path }, index }) => ({
+        index,
+        asset: {
+            id: randomUUID(),
+            filename,
+            mime,
+            path,
+        },
+    }));
+    // Maps 1 unique thumbnail asset to 1 unique regular asset (without other thumbnail assets
+    // pointing to it), or a random UUID if no match is found
+    // eslint-disable-next-line unicorn/no-array-reduce
+    const { prepared: preparedThumbnailAssets } = thumbnailAssets.reduce(({ prepared, used }, { asset, index }) => {
+        const reg = preparedRegularAssets.find((regular) => regular.asset.filename?.startsWith(asset.filename.replace(thumbnailAssetSuffix, '')) &&
+            !used.includes(regular.asset.id));
+        const id = reg ? `${reg.asset.id}-thumbnail` : randomUUID();
+        return {
+            prepared: [...prepared, { index, asset: { ...asset, id } }],
+            used: used.concat(reg?.asset.id ?? []),
+        };
+    }, { used: [], prepared: [] });
+    const assetIndexIdMap = new Map();
+    for (const { asset, index } of preparedRegularAssets) {
+        assetIndexIdMap.set(index, asset.id);
     }
-    const preparedRegularAssets = regularAssets.map(({ filename, mime, path }, index) => {
-        const id = randomUUID();
-        assetIdMap.set(index, id);
-        assetUsedMap.set(index, false);
-        return { path, filename, id, mime };
-    });
-    const usedPreparedRegularAssets = [];
-    const preparedThumbnailAssets = thumbnailAssets.map(({ filename, mime, path }, index) => {
-        const regularAsset = preparedRegularAssets.find((ra) => !usedPreparedRegularAssets.includes(ra.id) &&
-            ra.filename?.startsWith(filename.replace(thumbnailAssetSuffix, '')));
-        const id = regularAsset ? `${regularAsset.id}-thumbnail` : randomUUID();
-        // @ts-expect-error 2322 null is not assignable to type (strictNullChecks) - Severe
-        usedPreparedRegularAssets.push(regularAsset?.id);
-        assetIdMap.set(index + preparedRegularAssets.length, id);
-        assetUsedMap.set(index, false);
-        return { path, filename, id, mime };
-    });
-    const preparedAssets = [...preparedRegularAssets, ...preparedThumbnailAssets];
+    for (const { asset, index } of preparedThumbnailAssets) {
+        assetIndexIdMap.set(index, asset.id);
+    }
+    const preparedAssets = [...preparedRegularAssets, ...preparedThumbnailAssets].map(({ asset }) => asset);
     validator.customFormats.binary = (input) => {
         if (knownAssetIds.includes(input)) {
             reusedAssets.add(input);
@@ -184,7 +189,7 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
             return false;
         }
         const num = Number(input);
-        if (assetUsedMap.get(num)) {
+        if (usedAssetIndices.has(num)) {
             return false;
         }
         return num >= 0 && num < assets.length;
@@ -200,7 +205,9 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
                     { type: 'string', format: 'date-time' },
                     {
                         type: 'string',
-                        pattern: /^(\d+(y|yr|years))?\s*(\d+months)?\s*(\d+(w|wk|weeks))?\s*(\d+(d|days))?\s*(\d+(h|hr|hours))?\s*(\d+(m|min|minutes))?\s*(\d+(s|sec|seconds))?$/
+                        pattern: 
+                        // TODO: This pattern is duplicated at least 5 times across the codebase
+                        /^(\d+(y|yr|years))?\s*(\d+months)?\s*(\d+(w|wk|weeks))?\s*(\d+(d|days))?\s*(\d+(h|hr|hours))?\s*(\d+(m|min|minutes))?\s*(\d+(s|sec|seconds))?$/
                             .source,
                     },
                 ],
@@ -270,24 +277,22 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
                 return value;
             }
             const num = Number(value);
-            if (!assetIdMap.has(num)) {
+            if (!assetIndexIdMap.has(num)) {
                 return value;
             }
-            const uuid = assetIdMap.get(num);
+            const uuid = assetIndexIdMap.get(num);
             const currentResource = Array.isArray(resource) ? resource[path[0]] : resource;
             const preparedAsset = preparedAssets.find((asset) => asset.id === uuid);
             if (preparedAsset) {
                 preparedAsset.resource = currentResource;
             }
-            assetUsedMap.set(num, true);
+            usedAssetIndices.add(num);
             return uuid;
         },
     });
     result.errors.push(...customErrors);
-    for (const [assetId, used] of assetUsedMap.entries()) {
-        if (!used) {
-            result.errors.push(new ValidationError('is not referenced from the resource', assetId, undefined, ['assets', assetId], 'binary', 'format'));
-        }
+    for (const index of [...assetIndexIdMap.keys()].filter((idx) => !usedAssetIndices.has(idx))) {
+        result.errors.push(new ValidationError('is not referenced from the resource', index, undefined, ['assets', index], 'binary', 'format'));
     }
     handleValidatorResult(ctx, result, 'Resource validation failed');
     return [resource, preparedAssets, knownAssetIds.filter((id) => !reusedAssets.has(id))];

package/server/controllers/common/apps/groups/createGetAppGroupsController.js

@@ -1,4 +1,4 @@
-import { AppPermission } from '@appsemble/types';
+import { AppPermission } from '@appsemble/lang-sdk';
 import { assertKoaCondition } from '../../../../../koa.js';
 export function createGetAppGroupsController({ checkAuthSubjectAppPermissions, getApp, getAppGroups, }) {
     return async (ctx) => {

package/server/controllers/common/apps/resources/createGetAppResourceByIdController.js

@@ -1,5 +1,5 @@
+import { defaultLocale, remap } from '@appsemble/lang-sdk';
 import { assertKoaCondition, getRemapperContext, getResourceDefinition, } from '@appsemble/node-utils';
-import { defaultLocale, remap } from '@appsemble/utils';
 export function createGetAppResourceByIdController(options) {
     return async (ctx) => {
         const { pathParams: { appId, resourceId, resourceType }, queryParams: { selectedGroupId, view }, user: authSubject, } = ctx;

package/server/controllers/common/apps/resources/createQueryAppResourcesController.js

@@ -1,5 +1,5 @@
+import { defaultLocale, remap } from '@appsemble/lang-sdk';
 import { getRemapperContext, getResourceDefinition, } from '@appsemble/node-utils';
-import { defaultLocale, remap } from '@appsemble/utils';
 import { generateResourceQuery } from '../../../../utils/resources.js';
 export function createQueryAppResourcesController(options) {
     return async (ctx) => {

package/server/routes/appRouter/bulmaHandler.js

@@ -1,6 +1,6 @@
 import { createRequire } from 'node:module';
+import { baseTheme } from '@appsemble/lang-sdk';
 import { bulmaVersion, logger } from '@appsemble/node-utils';
-import { baseTheme } from '@appsemble/utils';
 import { renderSync } from 'sass';
 import stripBom from 'strip-bom';
 const require = createRequire(import.meta.url);

package/server/routes/appRouter/indexHandler.js

@@ -1,5 +1,6 @@
 import { randomBytes } from 'node:crypto';
-import { createThemeURL, defaultLocale, getAppBlocks, mergeThemes } from '@appsemble/utils';
+import { getAppBlocks } from '@appsemble/lang-sdk';
+import { createThemeURL, defaultLocale, mergeThemes } from '@appsemble/utils';
 import { organizationBlocklist } from '../../../organizationBlocklist.js';
 import { makeCSP, render } from '../../../render.js';
 import { bulmaVersion, faVersion } from '../../../versions.js';

package/server/routes/appRouter/manifestHandler.js

@@ -1,5 +1,6 @@
+import { baseTheme } from '@appsemble/lang-sdk';
 import { assertKoaCondition } from '@appsemble/node-utils';
-import { baseTheme, normalize } from '@appsemble/utils';
+import { normalize } from '@appsemble/utils';
 import { extension } from 'mime-types';
 const iconSizes = [48, 144, 192, 512];
 export function createManifestHandler({ getApp, getAppScreenshots }) {

package/server/routes/appRouter/serviceWorkerHandler.js

@@ -1,6 +1,6 @@
 import { readFile } from 'node:fs/promises';
+import { getAppBlocks } from '@appsemble/lang-sdk';
 import { assertKoaCondition } from '@appsemble/node-utils';
-import { getAppBlocks } from '@appsemble/utils';
 export function createServiceWorkerHandler({ getApp, getBlocksAssetsPaths }) {
     return async (ctx) => {
         const production = process.env.NODE_ENV === 'production';

package/server/types.d.ts

@@ -1,6 +1,6 @@
 import { type Readable } from 'node:stream';
-import { type App, type AppConfigEntry, type AppMemberInfo, type AppMessages, type Asset, type BlockDefinition, type BlockManifest, type ControllerDefinition, type CustomAppPermission, type EmailActionDefinition, type Group, type OrganizationPermission, type Resource, type ResourceDefinition, type Theme as ThemeType } from '@appsemble/types';
-import { type IdentifiableBlock } from '@appsemble/utils';
+import { type BlockDefinition, type ControllerDefinition, type CustomAppPermission, type EmailActionDefinition, type IdentifiableBlock, type ResourceDefinition, type Theme as ThemeType } from '@appsemble/lang-sdk';
+import { type App, type AppConfigEntry, type AppMemberInfo, type AppMessages, type Asset, type BlockManifest, type Group, type OrganizationPermission, type Resource } from '@appsemble/types';
 import { type RawAxiosRequestConfig } from 'axios';
 import { type DefaultContext as DefaultContextInterface, type DefaultState, type ParameterizedContext } from 'koa';
 export interface AuthSubject {

package/server/utils/actions.d.ts

@@ -1,5 +1,6 @@
+import { type EmailActionDefinition, type NotifyActionDefinition } from '@appsemble/lang-sdk';
 import { type Options } from '@appsemble/node-utils';
-import { type App, type EmailActionDefinition, type NotifyActionDefinition } from '@appsemble/types';
+import { type App } from '@appsemble/types';
 import { type Context, type Middleware } from 'koa';
 export declare function handleEmail(ctx: Context, app: App, action: EmailActionDefinition, options: Options): Promise<void>;
 export declare function handleNotify(ctx: Context, app: App, action: NotifyActionDefinition, options: Options): Promise<void>;

package/server/utils/actions.js

@@ -1,5 +1,5 @@
+import { defaultLocale, remap, } from '@appsemble/lang-sdk';
 import { assertKoaCondition, createFormData, EmailQuotaExceededError, getContainerNamespace, getRemapperContext, logger, parseServiceUrl, scaleDeployment, setLastRequestAnnotation, throwKoaError, version, waitForPodReadiness, } from '@appsemble/node-utils';
-import { defaultLocale, remap } from '@appsemble/utils';
 import axios from 'axios';
 import { get, mapValues, pick } from 'lodash-es';
 /**

package/server/utils/resources.d.ts

@@ -1,4 +1,5 @@
-import { type App, type ResourceDefinition } from '@appsemble/types';
+import { type ResourceDefinition } from '@appsemble/lang-sdk';
+import { type App } from '@appsemble/types';
 import { type Context } from 'koa';
 import { type Options, type OrderItem, type WhereOptions } from '../types.js';
 export declare function generateResourceQuery(ctx: Context, { parseQuery }: Options, resourceDefinition?: ResourceDefinition): {