@discord/intl-ast 0.6.1 → 0.7.0

package/dist/index.d.ts

@@ -9,20 +9,16 @@ export declare enum FormatJsNodeType {
     Pound = 7,
     Tag = 8
 }
-export type LiteralNode = [FormatJsNodeType.Literal, string];
+export type LiteralNode = [string];
 export type ArgumentNode = [FormatJsNodeType.Argument, string];
 export type NumberNode = [FormatJsNodeType.Number, string, string | undefined];
 export type DateNode = [FormatJsNodeType.Date, string, string | undefined];
 export type TimeNode = [FormatJsNodeType.Time, string, string | undefined];
-export type SelectNode = [FormatJsNodeType.Select, string, Record<string, {
-    value: AstNode[];
-}>];
+export type SelectNode = [FormatJsNodeType.Select, string, Record<string, AstNode[]>];
 export type PluralNode = [
     FormatJsNodeType.Plural,
     string,
-    Record<string, {
-        value: AstNode[];
-    }>,
+    Record<string, AstNode[]>,
     number,
     FormatJsPluralType
 ];

package/dist/index.js

@@ -51,19 +51,27 @@ function hydratePlural(keyless) {
     for (const key in options) {
         hydrateArray(options[key].value);
     }
+    const valueOptions = options.map((option) => ({ value: option }));
     // `pluralType` is technically only valid on `Plural` nodes, even
     // though the structure is identical to `Select`.
     if (type === FormatJsNodeType.Plural) {
-        return { type, value, options, offset, pluralType };
+        return {
+            type,
+            value,
+            options,
+            offset: valueOptions,
+            pluralType,
+        };
     }
     else {
-        return { type, value, options, offset };
+        return { type, value, options: valueOptions, offset };
     }
 }
 function hydrateSingle(keyless) {
     const [type] = keyless;
     switch (type) {
         case FormatJsNodeType.Literal:
+            return { type: 0, value: keyless[0] };
         case FormatJsNodeType.Argument:
             return { type, value: keyless[1] };
         case FormatJsNodeType.Number:
@@ -102,9 +110,9 @@ function compressFormatJsToAst(node) {
     if (Array.isArray(node)) {
         return node.map((element) => compressFormatJsToAst(element));
     }
-    console.log('compressing');
     switch (node.type) {
         case FormatJsNodeType.Literal:
+            return [node.value];
         case FormatJsNodeType.Argument:
             return [node.type, node.value];
         case FormatJsNodeType.Number:
@@ -114,14 +122,14 @@ function compressFormatJsToAst(node) {
         case FormatJsNodeType.Select: {
             const reducedOptions = {};
             for (const [name, option] of Object.entries(node.options)) {
-                reducedOptions[name] = { value: compressFormatJsToAst(option.value) };
+                reducedOptions[name] = compressFormatJsToAst(option.value);
             }
             return [node.type, node.value, reducedOptions];
         }
         case FormatJsNodeType.Plural: {
             const reducedOptions = {};
             for (const [name, option] of Object.entries(node.options)) {
-                reducedOptions[name] = { value: compressFormatJsToAst(option.value) };
+                reducedOptions[name] = compressFormatJsToAst(option.value);
             }
             return [node.type, node.value, reducedOptions, node.offset, node.pluralType];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discord/intl-ast",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "license": "MIT",
   "description": "Types and utilities for working with the ICU+Markdown AST format from @discord/intl",
   "main": "./dist/index.js",