@appsemble/node-utils 0.35.7 → 0.35.9

package/README.md

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

package/getMessagesUtil.d.ts

@@ -1,3 +1,3 @@
 import { type Options } from '@appsemble/node-utils';
 import { type Context } from 'koa';
-export declare function getMessagesUtil(ctx: Context, language: string, appId: number, merge: string[] | string, { getApp, getAppMessages, getBlockMessages }: Options, override?: string[] | string): Promise<Record<string, any>>;
+export declare function getMessagesUtil(ctx: Context, language: string, appId: number, merge: string[] | string | undefined, { getApp, getAppMessages, getBlockMessages }: Options, override?: string[] | string): Promise<Record<string, any>>;

package/getMessagesUtil.js

@@ -23,7 +23,18 @@ export async function getMessagesUtil(ctx, language, appId, merge, { getApp, get
     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 appMessages = (await getAppMessages({ context: ctx, app, language })).map((item) => {
+        const appMsg = item.messages.app ?? {};
+        const filtered = Object.fromEntries(Object.entries(appMsg).filter(([k]) => {
+            const blockMatch = /^(pages\.[\dA-Za-z-]+(\..+)?)\.blocks\.\d+.+/.test(k);
+            const emailMatch = /emails\.(appInvite|appMemberEmailChange|emailAdded|groupInvite|resend|reset|welcome)\.(body|subject)/.test(k);
+            if (blockMatch || emailMatch) {
+                return true;
+            }
+            return extractedMessages.includes(k);
+        }));
+        return { ...item, messages: { ...item.messages, app: filtered } };
+    });
     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'))),

package/package.json

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

package/server/controllers/common/apps/messages/createGetAppMessagesController.js

@@ -2,8 +2,6 @@ import { getMessagesUtil } from '../../../../../index.js';
 export function createGetAppMessagesController(options) {
     return async (ctx) => {
         const { pathParams: { appId, language }, query: { merge, override = 'true' }, } = ctx;
-        // @ts-expect-error 2345 argument of type is not assignable to parameter of type
-        // (strictNullChecks)
         ctx.body = await getMessagesUtil(ctx, language, appId, merge, options, override);
     };
 }