@discord/intl-ast 0.6.2 → 0.7.1-rc.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

@@ -37,8 +37,9 @@ var AstNodeIndices;
 exports.FORMAT_JS_POUND = Object.freeze({ type: 7 });
 function hydrateArray(elements) {
     for (let i = 0; i < elements.length; i++) {
-        elements[i] = hydrateFormatJsAst(elements[i]);
+        elements[i] = hydrateSingle(elements[i]);
     }
+    return true;
 }
 function hydratePlural(keyless) {
     const [type, value, options, offset, pluralType] = keyless;
@@ -49,7 +50,8 @@ function hydratePlural(keyless) {
     // This saves multiple allocations compared to building a new object
     // from scratch, either for the whole options object or for each value.
     for (const key in options) {
-        hydrateArray(options[key].value);
+        hydrateArray(options[key]);
+        options[key] = { value: options[key] };
     }
     // `pluralType` is technically only valid on `Plural` nodes, even
     // though the structure is identical to `Select`.
@@ -61,9 +63,11 @@ function hydratePlural(keyless) {
     }
 }
 function hydrateSingle(keyless) {
+    if (typeof keyless === 'string') {
+        return { type: 0, value: keyless };
+    }
     const [type] = keyless;
     switch (type) {
-        case FormatJsNodeType.Literal:
         case FormatJsNodeType.Argument:
             return { type, value: keyless[1] };
         case FormatJsNodeType.Number:
@@ -85,26 +89,32 @@ function hydrateSingle(keyless) {
     }
 }
 function hydrateFormatJsAst(keyless) {
-    // If the first element of the array is itself an array, then we have a list
-    // of elements to parse rather than a single object.
-    if (Array.isArray(keyless[0])) {
+    // If the first element of the array is a string, then we _do_ have an array of elements, but the
+    // first one is a literal node.
+    if (typeof keyless[0] === 'string') {
         hydrateArray(keyless);
         return keyless;
     }
-    else if (keyless.length === 0) {
+    if (keyless.length === 0) {
         // Some entries can be empty arrays, like an empty set of children, and those can
         // be preserved.
         return keyless;
     }
-    return hydrateSingle(keyless);
+    // If the first element is otherwise not an array, then it must be a
+    // type identifier for a single node.
+    if (!Array.isArray(keyless[0])) {
+        return hydrateSingle(keyless);
+    }
+    hydrateArray(keyless);
+    return keyless;
 }
 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 +124,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.2",
+  "version": "0.7.1-rc.0",
   "license": "MIT",
   "description": "Types and utilities for working with the ICU+Markdown AST format from @discord/intl",
   "main": "./dist/index.js",