@appsemble/node-utils 0.36.6-test.0 → 0.36.7-test.0

package/README.md

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

package/getAppsembleMessages.js

@@ -1,9 +1,24 @@
 import { readdir, readFile } from 'node:fs/promises';
-import { defaultLocale } from '@appsemble/utils';
+import { defaultLocale, normalizeLocale } from '@appsemble/utils';
+import { AppsembleError } from './AppsembleError.js';
 const translationsDir = new URL('../../i18n/', import.meta.url);
-export async function getSupportedLanguages() {
+async function getLanguageFiles() {
     const files = await readdir(translationsDir);
-    return new Set(files.map((lang) => lang.split('.json')[0].toLowerCase()));
+    const result = new Map();
+    for (const file of files) {
+        if (!file.endsWith('.json')) {
+            continue;
+        }
+        const language = normalizeLocale(file.slice(0, -'.json'.length));
+        if (result.has(language)) {
+            throw new AppsembleError(`Found duplicate language codes: ‘${language}’`);
+        }
+        result.set(language, file);
+    }
+    return result;
+}
+export async function getSupportedLanguages() {
+    return new Set((await getLanguageFiles()).keys());
 }
 /**
  * Fetch and merge the Appsemble core messages based on a language and a base language.
@@ -13,21 +28,19 @@ export async function getSupportedLanguages() {
  * @returns The Appsemble core messages.
  */
 export async function getAppsembleMessages(language, baseLanguage) {
-    const lang = language.toLowerCase();
-    const baseLang = baseLanguage?.toLowerCase();
-    const languages = await getSupportedLanguages();
+    const lang = normalizeLocale(language);
+    const baseLang = baseLanguage ? normalizeLocale(baseLanguage) : undefined;
+    const languages = await getLanguageFiles();
     const messages = {};
-    // @ts-expect-error 2345 argument of type is not assignable to parameter of type
-    // (strictNullChecks)
-    if (baseLang && languages.has(baseLanguage)) {
-        Object.assign(messages, JSON.parse(await readFile(new URL(`${baseLang}.json`, translationsDir), 'utf8')));
+    if (baseLang && languages.has(baseLang)) {
+        Object.assign(messages, JSON.parse(await readFile(new URL(languages.get(baseLang), translationsDir), 'utf8')));
     }
     if (languages.has(lang)) {
-        Object.assign(messages, Object.fromEntries(Object.entries(JSON.parse(await readFile(new URL(`${lang}.json`, translationsDir), 'utf8'))).filter(([, value]) => Boolean(value))));
+        Object.assign(messages, Object.fromEntries(Object.entries(JSON.parse(await readFile(new URL(languages.get(lang), translationsDir), 'utf8'))).filter(([, value]) => Boolean(value))));
     }
-    // Fall back to reading the default locale’s messages if no core messages were found.
     if (!languages.has(lang) && (!baseLang || !languages.has(baseLang))) {
-        Object.assign(messages, JSON.parse(await readFile(new URL(`${defaultLocale}.json`, translationsDir), 'utf8')));
+        const defaultLanguage = normalizeLocale(defaultLocale);
+        Object.assign(messages, JSON.parse(await readFile(new URL(languages.get(defaultLanguage), translationsDir), 'utf8')));
     }
     return messages;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.36.6-test.0",
+  "version": "0.36.7-test.0",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -40,9 +40,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/lang-sdk": "0.36.6-test.0",
-    "@appsemble/types": "0.36.6-test.0",
-    "@appsemble/utils": "0.36.6-test.0",
+    "@appsemble/lang-sdk": "0.36.7-test.0",
+    "@appsemble/types": "0.36.7-test.0",
+    "@appsemble/utils": "0.36.7-test.0",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@kubernetes/client-node": "1.4.0",
@@ -50,7 +50,7 @@
     "@types/koa": "^2.0.0",
     "axios": "^1.0.0",
     "bcrypt": "^5.1.1",
-    "bulma": "=0.9.3",
+    "bulma": "=0.9.4",
     "bulma-checkradio": "=2.1.1",
     "bulma-slider": "=2.0.4",
     "bulma-switch": "^2.0.0",

package/readAsset.d.ts

@@ -1,4 +1,4 @@
-export declare const assetDir: import("url").URL;
+export declare const assetDir: import("node:url").URL;
 /**
  * Read a file from the server assets directory.
  *