@l10nmonster/helpers-json 3.0.0-alpha.7 → 3.0.0-alpha.8

package/i18next.js

@@ -6,9 +6,9 @@ import { flatten, unflatten } from 'flat';
 import { regex } from '@l10nmonster/core';
 import { flattenAndSplitResources, ARB_ANNOTATION_MARKER, arbPlaceholderHandler } from './utils.js';
 
-const isArbAnnotations = e => e[0].split('.').slice(-2)[0].startsWith(ARB_ANNOTATION_MARKER);
+const isArbAnnotations = e => e[0].split('.').some(segment => segment.startsWith(ARB_ANNOTATION_MARKER));
 const validPluralSuffixes = new Set(['one', 'other', 'zero', 'two', 'few', 'many']);
-const extractArbGroupsRegex = /(?<prefix>.+?\.)?@(?<key>\S+)\.(?<attribute>\S+)/;
+const extractArbGroupsRegex = /(?<prefix>.+?\.)?@(?<key>[^.]+)\.(?<attribute>.+)/;
 const defaultArbAnnotationHandlers = {
     description: (_, data) => (data == null ? undefined : data),
     placeholders: (_, data) => (data == null ? undefined : arbPlaceholderHandler(data)),
@@ -117,7 +117,7 @@ export class I18nextFilter {
         for (const entry of Object.entries(flatResource)) {
             if (!this.enableArbAnnotations || !isArbAnnotations(entry)) {
                 const translation = await translator(...entry);
-                if (translation === undefined) {
+                if (translation === null) {
                     delete flatResource[entry[0]];
                 } else {
                     flatResource[entry[0]] = translation;
@@ -127,10 +127,25 @@ export class I18nextFilter {
         }
         if (this.enableArbAnnotations) {
             for (const entry of Object.entries(flatResource).filter(entry => isArbAnnotations(entry))) {
-                const arbGroups = extractArbGroupsRegex.exec(entry[0]).groups;
-                const sid = `${arbGroups.prefix ?? ''}${arbGroups.key}`;
-                if (!this.emitArbAnnotations || !flatResource[sid]) {
-                    delete flatResource[entry[0]];
+                const [key, value] = entry;
+                
+                // Always delete if not emitting annotations
+                if (!this.emitArbAnnotations) {
+                    delete flatResource[key];
+                    continue;
+                }
+                
+                // Only keep if regex matches and corresponding translation exists and is not null
+                const match = extractArbGroupsRegex.exec(key);
+                if (match?.groups) {
+                    const { prefix = '', key: arbKey, attribute } = match.groups;
+                    const sid = `${prefix}${arbKey}`;
+                    if (!Object.prototype.hasOwnProperty.call(flatResource, sid) || flatResource[sid] == null) {
+                        delete flatResource[key];
+                    }
+                } else {
+                    // No regex match, can't determine corresponding translation, so delete
+                    delete flatResource[key];
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@l10nmonster/helpers-json",
-    "version": "3.0.0-alpha.7",
+    "version": "3.0.0-alpha.8",
     "description": "Helpers to deal with JSON file formats",
     "type": "module",
     "main": "index.js",