@appsemble/utils 0.37.5 → 0.38.0

package/README.md

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

package/appMessages.js

@@ -106,9 +106,12 @@ export function extractAppMessages(app, onBlock) {
                 }
             }
             if (page.type === 'loop') {
-                messages.app[`${prefix}.steps.first`] = 'first';
+                Object.assign(messages.messageIds, findMessageIds(page.start?.name), findMessageIds(page.end?.name));
+                messages.app[`${prefix}.steps.first`] =
+                    (typeof page.start?.name === 'string' ? page.start.name : '') || 'first';
                 messages.app[`${prefix}.steps`] = 'step';
-                messages.app[`${prefix}.steps.last`] = 'last';
+                messages.app[`${prefix}.steps.last`] =
+                    (typeof page.end?.name === 'string' ? page.end.name : '') || 'last';
             }
         },
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/utils",
-  "version": "0.37.5",
+  "version": "0.38.0",
   "description": "Utility functions used in Appsemble internally",
   "keywords": [
     "app",
@@ -39,8 +39,8 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/lang-sdk": "0.37.5",
-    "@appsemble/types": "0.37.5",
+    "@appsemble/lang-sdk": "0.38.0",
+    "@appsemble/types": "0.38.0",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "axios": "^1.0.0",
     "langmap": "^0.0.16",
@@ -52,7 +52,7 @@
     "@types/langmap": "0.0.3",
     "bulma": "=0.9.4",
     "koas-core": "0.7.0",
-    "vitest": "2.1.9"
+    "vitest": "4.1.11"
   },
   "engines": {
     "node": ">=24"

package/serializeResource.d.ts

@@ -3,8 +3,9 @@ import { type JsonValue } from 'type-fest';
  * Works on a resource on the client, for example passed from the form block
  *
  * @param data The resource to be serialized, optionally containing asset blobs
+ * @param onAsset Called with the index and resource path of each serialized asset
  * @returns A FormData instance containing the resource and an array of the assets
  *   referenced from the resource
  */
-export declare function serializeResource(data: any): FormData | JsonValue;
+export declare function serializeResource(data: any, onAsset?: (index: number, path: (number | string)[]) => void): FormData | JsonValue;
 export declare function deserializeResource(data: any, schema?: unknown): any;

package/serializeResource.js

@@ -1,25 +1,30 @@
-import { mapValues } from './mapValues.js';
 /**
  * Works on a resource on the client, for example passed from the form block
  *
  * @param data The resource to be serialized, optionally containing asset blobs
+ * @param onAsset Called with the index and resource path of each serialized asset
  * @returns A FormData instance containing the resource and an array of the assets
  *   referenced from the resource
  */
-export function serializeResource(data) {
+export function serializeResource(data, onAsset) {
     const assets = [];
-    const extractAssets = (value) => {
+    const extractAssets = (value, path = []) => {
         if (Array.isArray(value)) {
-            return value.map(extractAssets);
+            return value.map((item, index) => extractAssets(item, [...path, index]));
         }
         if (value instanceof Blob) {
-            return String(assets.push(value) - 1);
+            const index = assets.push(value) - 1;
+            onAsset?.(index, path);
+            return String(index);
         }
         if (value instanceof Date) {
             return value.toJSON();
         }
         if (value && typeof value === 'object') {
-            return mapValues(value, extractAssets);
+            return Object.fromEntries(Object.entries(value).map(([key, item]) => [
+                key,
+                extractAssets(item, [...path, key]),
+            ]));
         }
         return value;
     };