@appsemble/node-utils 0.29.7 → 0.29.9

package/README.md

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

package/csv.js

@@ -35,7 +35,7 @@ export const preProcessCSV = (instance, key, schema, options, ctx) => {
             break;
         }
         case 'array': {
-            const result = JSON.parse(value);
+            const result = JSON.parse(value || '[]');
             if (Array.isArray(result)) {
                 parent[key] = result;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.29.7",
+  "version": "0.29.9",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -38,8 +38,8 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.29.7",
-    "@appsemble/utils": "0.29.7",
+    "@appsemble/types": "0.29.9",
+    "@appsemble/utils": "0.29.9",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@kubernetes/client-node": "0.21.0",

package/resource.js

@@ -104,18 +104,40 @@ export function extractResourceBody(ctx) {
  *   3. Asset IDs from the `knownAssetIds` array which are no longer used.
  */
 export function processResourceBody(ctx, definition, knownAssetIds = [], knownExpires, knownAssetNameIds = [], isPatch = false) {
-    var _a, _b;
+    var _a, _b, _c;
     const [resource, assets, preValidateProperty] = extractResourceBody(ctx);
     const validator = new Validator();
     const assetIdMap = new Map();
     const assetUsedMap = new Map();
     const reusedAssets = new Set();
-    const preparedAssets = assets.map(({ contents, filename, mime }, index) => {
+    const thumbnailAssets = [];
+    const regularAssets = [];
+    const thumbnailAssetSuffix = '-thumbnail.png';
+    for (const asset of assets) {
+        if ((_a = asset.filename) === null || _a === void 0 ? void 0 : _a.endsWith(thumbnailAssetSuffix)) {
+            thumbnailAssets.push(asset);
+        }
+        else {
+            regularAssets.push(asset);
+        }
+    }
+    const preparedRegularAssets = regularAssets.map(({ contents, filename, mime }, index) => {
         const id = randomUUID();
         assetIdMap.set(index, id);
         assetUsedMap.set(index, false);
         return { data: contents, filename, id, mime };
     });
+    const usedPreparedRegularAssets = [];
+    const preparedThumbnailAssets = thumbnailAssets.map(({ contents, filename, mime }, index) => {
+        const regularAsset = preparedRegularAssets.find((ra) => !usedPreparedRegularAssets.includes(ra.id) &&
+            ra.filename.startsWith(filename.replace(thumbnailAssetSuffix, '')));
+        const id = regularAsset ? `${regularAsset.id}-thumbnail` : randomUUID();
+        usedPreparedRegularAssets.push(regularAsset === null || regularAsset === void 0 ? void 0 : regularAsset.id);
+        assetIdMap.set(index + preparedRegularAssets.length, id);
+        assetUsedMap.set(index, false);
+        return { data: contents, filename, id, mime };
+    });
+    const preparedAssets = [...preparedRegularAssets, ...preparedThumbnailAssets];
     validator.customFormats.binary = (input) => {
         if (knownAssetIds.includes(input)) {
             reusedAssets.add(input);
@@ -137,7 +159,7 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
     };
     const patchedSchema = {
         ...definition.schema,
-        required: ((_a = ctx.request) === null || _a === void 0 ? void 0 : _a.method) === 'PATCH' || isPatch ? [] : definition.schema.required,
+        required: ((_b = ctx.request) === null || _b === void 0 ? void 0 : _b.method) === 'PATCH' || isPatch ? [] : definition.schema.required,
         properties: {
             ...definition.schema.properties,
             id: { type: 'integer' },
@@ -152,7 +174,11 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
                 ],
             },
             $clonable: { type: 'boolean' },
-            ...Object.fromEntries(Object.values((_b = definition.references) !== null && _b !== void 0 ? _b : {}).map((reference) => [
+            $thumbnails: {
+                type: 'array',
+                items: { type: 'string', format: 'binary' },
+            },
+            ...Object.fromEntries(Object.values((_c = definition.references) !== null && _c !== void 0 ? _c : {}).map((reference) => [
                 `$${reference.resource}`,
                 { type: 'integer' },
             ])),
@@ -172,6 +198,9 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
             else if (path.length === 1) {
                 propertyName = path[0];
             }
+            if (propertyName === '$thumbnails') {
+                return;
+            }
             if (propertyName === '$expires') {
                 if (value !== undefined) {
                     const date = parseISO(value);