@appsemble/node-utils 0.32.1-test.16 → 0.32.1

package/README.md

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

package/getMessagesUtil.js

@@ -15,7 +15,11 @@ export async function getMessagesUtil(ctx, language, appId, merge, { getApp, get
     assertKoaCondition(app != null, ctx, 404, 'App not found');
     const blockPrefixes = [];
     const blockQuery = [];
-    const appMessages = await getAppMessages({ context: ctx, app, language });
+    const blockMessageKeys = new Set();
+    const extractedMessages = Object.keys(extractAppMessages(app.definition, (block) => {
+        blockMessageKeys.add(`${block.type.startsWith('@') ? block.type : `@appsemble/${block.type}`}-${block.version}`);
+    }).app);
+    const appMessages = (await getAppMessages({ context: ctx, app, language })).filter((item) => Object.keys(item.messages.app ?? {}).filter((key) => !(key in extractedMessages)));
     const coreMessages = await getAppsembleMessages(lang, baseLang);
     const messages = {
         core: Object.fromEntries(Object.entries(coreMessages).filter(([key]) => key.startsWith('app') || key.startsWith('react-components') || key.startsWith('server'))),
@@ -33,8 +37,31 @@ export async function getMessagesUtil(ctx, language, appId, merge, { getApp, get
         lang !== (app.definition.defaultLanguage || defaultLocale)) {
         throwKoaError(ctx, 404, `Language “${language}” could not be found`);
     }
-    const baseLanguageMessages = override === 'true' ? appMessages.find((m) => m.language === baseLang) : undefined;
-    const languageMessages = override === 'true' ? appMessages.find((m) => m.language === lang) : undefined;
+    const filteredMessages = appMessages.map((message) => {
+        // Create a shallow copy of the message to avoid mutating the original
+        const newMessage = message;
+        const filteredBlocks = {};
+        const blockKeys = Object.keys(newMessage.messages.blocks ?? {});
+        for (const key of blockKeys) {
+            const block = newMessage.messages.blocks[key];
+            const filteredBlock = {};
+            const versionKeys = Object.keys(block);
+            for (const version of versionKeys) {
+                const combinedKey = `${key}-${version}`;
+                if (blockMessageKeys.has(combinedKey)) {
+                    filteredBlock[version] = block[version];
+                }
+            }
+            if (Object.keys(filteredBlock).length > 0) {
+                filteredBlocks[key] = filteredBlock;
+            }
+        }
+        // Assign the filtered blocks back to the new message
+        newMessage.messages.blocks = filteredBlocks;
+        return newMessage;
+    });
+    const baseLanguageMessages = override === 'true' ? filteredMessages.find((m) => m.language === baseLang) : undefined;
+    const languageMessages = override === 'true' ? filteredMessages.find((m) => m.language === lang) : undefined;
     for (const block of blockMessages) {
         const { name } = block;
         const defaultMessages = block.messages?.[defaultLocale];

package/package.json

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