@worldware/msg 0.6.0 → 0.6.2

package/README.md

@@ -160,6 +160,9 @@ const jsonWithoutNotes = resource.toJSON(true);
 
 // Get data object
 const data = resource.getData();
+
+// Message objects in the output only include `attributes` when they differ from
+// the resource's attributes, keeping the serialized data compact
 ```
 
 ## API Reference
@@ -187,7 +190,7 @@ const data = resource.getData();
 - `translate(data: MsgResourceData): MsgResource` - Create a translated version
 - `getTranslation(lang: string): Promise<MsgResource>` - Load and apply translations
 - `getProject(): MsgProject` - Returns the project instance associated with the resource
-- `getData(stripNotes?: boolean): MsgResourceData` - Get resource data
+- `getData(stripNotes?: boolean): MsgResourceData` - Get resource data. Message objects in the output omit `attributes` when they match the resource's attributes (to avoid redundancy)
 - `toJSON(stripNotes?: boolean): string` - Serialize to JSON
 
 **Properties:**

package/dist/{chunk-GHRFKA7N.mjs → chunk-ELDIN22M.mjs}

@@ -1,20 +1,20 @@
 // src/classes/MsgMessage/MsgMessage.ts
 import { MessageFormat } from "messageformat";
 var DEFAULT_ATTRIBUTES = {
-  lang: "",
-  dir: "",
+  lang: "und",
+  dir: "auto",
   dnt: false
 };
 var MsgMessage = class _MsgMessage {
   _key;
   _value;
   _mf;
-  _attributes = DEFAULT_ATTRIBUTES;
+  _attributes;
   _notes = [];
   constructor(key, value, attributes, notes) {
     this._key = key;
     this._value = value;
-    this._attributes = attributes ? { ...this._attributes, ...attributes } : this._attributes;
+    this._attributes = attributes ? { ...DEFAULT_ATTRIBUTES, ...attributes } : {};
     if (notes) {
       notes.forEach((note) => this.addNote(note));
     }

package/dist/{chunk-4SWDABOO.mjs → chunk-ZV7S5BRP.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-OMRO6GAZ.mjs";
 import {
   MsgMessage
-} from "./chunk-GHRFKA7N.mjs";
+} from "./chunk-ELDIN22M.mjs";
 
 // src/classes/MsgResource/MsgResource.ts
 var MsgResource = class _MsgResource extends Map {
@@ -33,6 +33,11 @@ var MsgResource = class _MsgResource extends Map {
       notes.forEach((note) => this.addNote(note));
     }
   }
+  hasMatchingAttributes(message) {
+    const res = this.attributes;
+    const msg = message.attributes;
+    return res.lang === msg.lang && res.dir === msg.dir && res.dnt === msg.dnt;
+  }
   get attributes() {
     return this._attributes;
   }
@@ -117,7 +122,13 @@ var MsgResource = class _MsgResource extends Map {
   }
   getData(stripNotes = false) {
     const messages = [];
-    this.forEach((msg) => messages.push(msg.getData(stripNotes)));
+    this.forEach((msg) => {
+      if (this.hasMatchingAttributes(msg)) {
+        messages.push({ key: msg.key, value: msg.value });
+      } else {
+        messages.push(msg.getData(stripNotes));
+      }
+    });
     return {
       title: this.title,
       attributes: this.attributes,

package/dist/classes/MsgMessage/MsgMessage.cjs

@@ -25,20 +25,20 @@ __export(MsgMessage_exports, {
 module.exports = __toCommonJS(MsgMessage_exports);
 var import_messageformat = require("messageformat");
 var DEFAULT_ATTRIBUTES = {
-  lang: "",
-  dir: "",
+  lang: "und",
+  dir: "auto",
   dnt: false
 };
 var MsgMessage = class _MsgMessage {
   _key;
   _value;
   _mf;
-  _attributes = DEFAULT_ATTRIBUTES;
+  _attributes;
   _notes = [];
   constructor(key, value, attributes, notes) {
     this._key = key;
     this._value = value;
-    this._attributes = attributes ? { ...this._attributes, ...attributes } : this._attributes;
+    this._attributes = attributes ? { ...DEFAULT_ATTRIBUTES, ...attributes } : {};
     if (notes) {
       notes.forEach((note) => this.addNote(note));
     }

package/dist/classes/MsgMessage/MsgMessage.mjs

@@ -1,6 +1,6 @@
 import {
   MsgMessage
-} from "../../chunk-GHRFKA7N.mjs";
+} from "../../chunk-ELDIN22M.mjs";
 export {
   MsgMessage
 };

package/dist/classes/MsgProject/MsgProject.d.cts

@@ -45,6 +45,7 @@ declare class MsgResource extends Map<string, MsgMessage> implements MsgInterfac
     private _project;
     static create(data: MsgResourceData, project: MsgProject): MsgResource;
     private constructor();
+    private hasMatchingAttributes;
     get attributes(): MsgAttributes;
     set attributes(attributes: MsgAttributes);
     get notes(): MsgNote[];

package/dist/classes/MsgProject/MsgProject.d.ts

@@ -45,6 +45,7 @@ declare class MsgResource extends Map<string, MsgMessage> implements MsgInterfac
     private _project;
     static create(data: MsgResourceData, project: MsgProject): MsgResource;
     private constructor();
+    private hasMatchingAttributes;
     get attributes(): MsgAttributes;
     set attributes(attributes: MsgAttributes);
     get notes(): MsgNote[];

package/dist/classes/MsgResource/MsgResource.cjs

@@ -27,20 +27,20 @@ module.exports = __toCommonJS(MsgResource_exports);
 // src/classes/MsgMessage/MsgMessage.ts
 var import_messageformat = require("messageformat");
 var DEFAULT_ATTRIBUTES = {
-  lang: "",
-  dir: "",
+  lang: "und",
+  dir: "auto",
   dnt: false
 };
 var MsgMessage = class _MsgMessage {
   _key;
   _value;
   _mf;
-  _attributes = DEFAULT_ATTRIBUTES;
+  _attributes;
   _notes = [];
   constructor(key, value, attributes, notes) {
     this._key = key;
     this._value = value;
-    this._attributes = attributes ? { ...this._attributes, ...attributes } : this._attributes;
+    this._attributes = attributes ? { ...DEFAULT_ATTRIBUTES, ...attributes } : {};
     if (notes) {
       notes.forEach((note) => this.addNote(note));
     }
@@ -128,6 +128,11 @@ var MsgResource = class _MsgResource extends Map {
       notes.forEach((note) => this.addNote(note));
     }
   }
+  hasMatchingAttributes(message) {
+    const res = this.attributes;
+    const msg = message.attributes;
+    return res.lang === msg.lang && res.dir === msg.dir && res.dnt === msg.dnt;
+  }
   get attributes() {
     return this._attributes;
   }
@@ -212,7 +217,13 @@ var MsgResource = class _MsgResource extends Map {
   }
   getData(stripNotes = false) {
     const messages = [];
-    this.forEach((msg) => messages.push(msg.getData(stripNotes)));
+    this.forEach((msg) => {
+      if (this.hasMatchingAttributes(msg)) {
+        messages.push({ key: msg.key, value: msg.value });
+      } else {
+        messages.push(msg.getData(stripNotes));
+      }
+    });
     return {
       title: this.title,
       attributes: this.attributes,

package/dist/classes/MsgResource/MsgResource.mjs

@@ -1,8 +1,8 @@
 import {
   MsgResource
-} from "../../chunk-4SWDABOO.mjs";
+} from "../../chunk-ZV7S5BRP.mjs";
 import "../../chunk-OMRO6GAZ.mjs";
-import "../../chunk-GHRFKA7N.mjs";
+import "../../chunk-ELDIN22M.mjs";
 export {
   MsgResource
 };

package/dist/classes/index.cjs

@@ -29,20 +29,20 @@ module.exports = __toCommonJS(classes_exports);
 // src/classes/MsgMessage/MsgMessage.ts
 var import_messageformat = require("messageformat");
 var DEFAULT_ATTRIBUTES = {
-  lang: "",
-  dir: "",
+  lang: "und",
+  dir: "auto",
   dnt: false
 };
 var MsgMessage = class _MsgMessage {
   _key;
   _value;
   _mf;
-  _attributes = DEFAULT_ATTRIBUTES;
+  _attributes;
   _notes = [];
   constructor(key, value, attributes, notes) {
     this._key = key;
     this._value = value;
-    this._attributes = attributes ? { ...this._attributes, ...attributes } : this._attributes;
+    this._attributes = attributes ? { ...DEFAULT_ATTRIBUTES, ...attributes } : {};
     if (notes) {
       notes.forEach((note) => this.addNote(note));
     }
@@ -130,6 +130,11 @@ var MsgResource = class _MsgResource extends Map {
       notes.forEach((note) => this.addNote(note));
     }
   }
+  hasMatchingAttributes(message) {
+    const res = this.attributes;
+    const msg = message.attributes;
+    return res.lang === msg.lang && res.dir === msg.dir && res.dnt === msg.dnt;
+  }
   get attributes() {
     return this._attributes;
   }
@@ -214,7 +219,13 @@ var MsgResource = class _MsgResource extends Map {
   }
   getData(stripNotes = false) {
     const messages = [];
-    this.forEach((msg) => messages.push(msg.getData(stripNotes)));
+    this.forEach((msg) => {
+      if (this.hasMatchingAttributes(msg)) {
+        messages.push({ key: msg.key, value: msg.value });
+      } else {
+        messages.push(msg.getData(stripNotes));
+      }
+    });
     return {
       title: this.title,
       attributes: this.attributes,

package/dist/classes/index.mjs

@@ -4,11 +4,11 @@ import {
 } from "../chunk-XS43NAP2.mjs";
 import {
   MsgResource
-} from "../chunk-4SWDABOO.mjs";
+} from "../chunk-ZV7S5BRP.mjs";
 import "../chunk-OMRO6GAZ.mjs";
 import {
   MsgMessage
-} from "../chunk-GHRFKA7N.mjs";
+} from "../chunk-ELDIN22M.mjs";
 export {
   MsgMessage,
   MsgProject,

package/dist/index.cjs

@@ -29,20 +29,20 @@ module.exports = __toCommonJS(index_exports);
 // src/classes/MsgMessage/MsgMessage.ts
 var import_messageformat = require("messageformat");
 var DEFAULT_ATTRIBUTES = {
-  lang: "",
-  dir: "",
+  lang: "und",
+  dir: "auto",
   dnt: false
 };
 var MsgMessage = class _MsgMessage {
   _key;
   _value;
   _mf;
-  _attributes = DEFAULT_ATTRIBUTES;
+  _attributes;
   _notes = [];
   constructor(key, value, attributes, notes) {
     this._key = key;
     this._value = value;
-    this._attributes = attributes ? { ...this._attributes, ...attributes } : this._attributes;
+    this._attributes = attributes ? { ...DEFAULT_ATTRIBUTES, ...attributes } : {};
     if (notes) {
       notes.forEach((note) => this.addNote(note));
     }
@@ -130,6 +130,11 @@ var MsgResource = class _MsgResource extends Map {
       notes.forEach((note) => this.addNote(note));
     }
   }
+  hasMatchingAttributes(message) {
+    const res = this.attributes;
+    const msg = message.attributes;
+    return res.lang === msg.lang && res.dir === msg.dir && res.dnt === msg.dnt;
+  }
   get attributes() {
     return this._attributes;
   }
@@ -214,7 +219,13 @@ var MsgResource = class _MsgResource extends Map {
   }
   getData(stripNotes = false) {
     const messages = [];
-    this.forEach((msg) => messages.push(msg.getData(stripNotes)));
+    this.forEach((msg) => {
+      if (this.hasMatchingAttributes(msg)) {
+        messages.push({ key: msg.key, value: msg.value });
+      } else {
+        messages.push(msg.getData(stripNotes));
+      }
+    });
     return {
       title: this.title,
       attributes: this.attributes,

package/dist/index.mjs

@@ -4,11 +4,11 @@ import {
 } from "./chunk-XS43NAP2.mjs";
 import {
   MsgResource
-} from "./chunk-4SWDABOO.mjs";
+} from "./chunk-ZV7S5BRP.mjs";
 import "./chunk-OMRO6GAZ.mjs";
 import {
   MsgMessage
-} from "./chunk-GHRFKA7N.mjs";
+} from "./chunk-ELDIN22M.mjs";
 export {
   MsgMessage,
   MsgProject,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worldware/msg",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Message localization tooling",
   "license": "MIT",
   "author": "Joel Sahleen",
@@ -11,9 +11,22 @@
   "bugs": {
     "url": "https://github.com/worldware-studios/msg/issues"
   },
-  "main": "dist/index.js",
+  "main": "dist/index.cjs",
+  "module": "dist/index.mjs",
   "type": "module",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
+    }
+  },
   "files": [
     "dist"
   ],