@solana/codecs-strings 2.0.0-experimental.85b7dfe → 2.0.0-experimental.8618508

package/dist/index.development.js

@@ -21,23 +21,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
       throw new Error(`Codec [${codecDescription}] expected ${expected} bytes, got ${bytesLength}.`);
     }
   }
-  var mergeBytes = (byteArrays) => {
-    const nonEmptyByteArrays = byteArrays.filter((arr) => arr.length);
-    if (nonEmptyByteArrays.length === 0) {
-      return byteArrays.length ? byteArrays[0] : new Uint8Array();
-    }
-    if (nonEmptyByteArrays.length === 1) {
-      return nonEmptyByteArrays[0];
-    }
-    const totalLength = nonEmptyByteArrays.reduce((total, arr) => total + arr.length, 0);
-    const result = new Uint8Array(totalLength);
-    let offset = 0;
-    nonEmptyByteArrays.forEach((arr) => {
-      result.set(arr, offset);
-      offset += arr.length;
-    });
-    return result;
-  };
   var padBytes = (bytes, length) => {
     if (bytes.length >= length)
       return bytes;
@@ -46,99 +29,113 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return paddedBytes;
   };
   var fixBytes = (bytes, length) => padBytes(bytes.length <= length ? bytes : bytes.slice(0, length), length);
-  function combineCodec(encoder, decoder, description) {
-    if (encoder.fixedSize !== decoder.fixedSize) {
+  function getEncodedSize(value, encoder) {
+    return "fixedSize" in encoder ? encoder.fixedSize : encoder.getSizeFromValue(value);
+  }
+  function createEncoder(encoder) {
+    return Object.freeze({
+      ...encoder,
+      encode: (value) => {
+        const bytes = new Uint8Array(getEncodedSize(value, encoder));
+        encoder.write(value, bytes, 0);
+        return bytes;
+      }
+    });
+  }
+  function createDecoder(decoder) {
+    return Object.freeze({
+      ...decoder,
+      decode: (bytes, offset = 0) => decoder.read(bytes, offset)[0]
+    });
+  }
+  function isFixedSize(codec) {
+    return "fixedSize" in codec && typeof codec.fixedSize === "number";
+  }
+  function combineCodec(encoder, decoder) {
+    if (isFixedSize(encoder) !== isFixedSize(decoder)) {
+      throw new Error(`Encoder and decoder must either both be fixed-size or variable-size.`);
+    }
+    if (isFixedSize(encoder) && isFixedSize(decoder) && encoder.fixedSize !== decoder.fixedSize) {
       throw new Error(
         `Encoder and decoder must have the same fixed size, got [${encoder.fixedSize}] and [${decoder.fixedSize}].`
       );
     }
-    if (encoder.maxSize !== decoder.maxSize) {
+    if (!isFixedSize(encoder) && !isFixedSize(decoder) && encoder.maxSize !== decoder.maxSize) {
       throw new Error(
         `Encoder and decoder must have the same max size, got [${encoder.maxSize}] and [${decoder.maxSize}].`
       );
     }
-    if (description === void 0 && encoder.description !== decoder.description) {
-      throw new Error(
-        `Encoder and decoder must have the same description, got [${encoder.description}] and [${decoder.description}]. Pass a custom description as a third argument if you want to override the description and bypass this error.`
-      );
-    }
     return {
+      ...decoder,
+      ...encoder,
       decode: decoder.decode,
-      description: description != null ? description : encoder.description,
       encode: encoder.encode,
-      fixedSize: encoder.fixedSize,
-      maxSize: encoder.maxSize
+      read: decoder.read,
+      write: encoder.write
     };
   }
-  function fixCodecHelper(data, fixedBytes, description) {
-    return {
-      description: description != null ? description : `fixed(${fixedBytes}, ${data.description})`,
+  function fixEncoder(encoder, fixedBytes) {
+    return createEncoder({
       fixedSize: fixedBytes,
-      maxSize: fixedBytes
-    };
-  }
-  function fixEncoder(encoder, fixedBytes, description) {
-    return {
-      ...fixCodecHelper(encoder, fixedBytes, description),
-      encode: (value) => fixBytes(encoder.encode(value), fixedBytes)
-    };
+      write: (value, bytes, offset) => {
+        const variableByteArray = encoder.encode(value);
+        const fixedByteArray = variableByteArray.length > fixedBytes ? variableByteArray.slice(0, fixedBytes) : variableByteArray;
+        bytes.set(fixedByteArray, offset);
+        return offset + fixedBytes;
+      }
+    });
   }
-  function fixDecoder(decoder, fixedBytes, description) {
-    return {
-      ...fixCodecHelper(decoder, fixedBytes, description),
-      decode: (bytes, offset = 0) => {
+  function fixDecoder(decoder, fixedBytes) {
+    return createDecoder({
+      fixedSize: fixedBytes,
+      read: (bytes, offset) => {
         assertByteArrayHasEnoughBytesForCodec("fixCodec", fixedBytes, bytes, offset);
         if (offset > 0 || bytes.length > fixedBytes) {
           bytes = bytes.slice(offset, offset + fixedBytes);
         }
-        if (decoder.fixedSize !== null) {
+        if (isFixedSize(decoder)) {
           bytes = fixBytes(bytes, decoder.fixedSize);
         }
-        const [value] = decoder.decode(bytes, 0);
+        const [value] = decoder.read(bytes, 0);
         return [value, offset + fixedBytes];
       }
-    };
+    });
   }
 
   // src/baseX.ts
   var getBaseXEncoder = (alphabet4) => {
-    const base = alphabet4.length;
-    const baseBigInt = BigInt(base);
-    return {
-      description: `base${base}`,
-      encode(value) {
+    return createEncoder({
+      getSizeFromValue: (value) => {
+        const [leadingZeroes, tailChars] = partitionLeadingZeroes(value, alphabet4[0]);
+        if (tailChars === "")
+          return value.length;
+        const base10Number = getBigIntFromBaseX(tailChars, alphabet4);
+        return leadingZeroes.length + Math.ceil(base10Number.toString(16).length / 2);
+      },
+      write(value, bytes, offset) {
         assertValidBaseString(alphabet4, value);
         if (value === "")
-          return new Uint8Array();
-        const chars = [...value];
-        let trailIndex = chars.findIndex((c) => c !== alphabet4[0]);
-        trailIndex = trailIndex === -1 ? chars.length : trailIndex;
-        const leadingZeroes = Array(trailIndex).fill(0);
-        if (trailIndex === chars.length)
-          return Uint8Array.from(leadingZeroes);
-        const tailChars = chars.slice(trailIndex);
-        let base10Number = 0n;
-        let baseXPower = 1n;
-        for (let i = tailChars.length - 1; i >= 0; i -= 1) {
-          base10Number += baseXPower * BigInt(alphabet4.indexOf(tailChars[i]));
-          baseXPower *= baseBigInt;
+          return offset;
+        const [leadingZeroes, tailChars] = partitionLeadingZeroes(value, alphabet4[0]);
+        if (tailChars === "") {
+          bytes.set(new Uint8Array(leadingZeroes.length).fill(0), offset);
+          return offset + leadingZeroes.length;
         }
+        let base10Number = getBigIntFromBaseX(tailChars, alphabet4);
         const tailBytes = [];
         while (base10Number > 0n) {
           tailBytes.unshift(Number(base10Number % 256n));
           base10Number /= 256n;
         }
-        return Uint8Array.from(leadingZeroes.concat(tailBytes));
-      },
-      fixedSize: null,
-      maxSize: null
-    };
+        const bytesToAdd = [...Array(leadingZeroes.length).fill(0), ...tailBytes];
+        bytes.set(bytesToAdd, offset);
+        return offset + bytesToAdd.length;
+      }
+    });
   };
   var getBaseXDecoder = (alphabet4) => {
-    const base = alphabet4.length;
-    const baseBigInt = BigInt(base);
-    return {
-      decode(rawBytes, offset = 0) {
+    return createDecoder({
+      read(rawBytes, offset) {
         const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);
         if (bytes.length === 0)
           return ["", 0];
@@ -147,20 +144,30 @@ this.globalThis.solanaWeb3 = (function (exports) {
         const leadingZeroes = alphabet4[0].repeat(trailIndex);
         if (trailIndex === bytes.length)
           return [leadingZeroes, rawBytes.length];
-        let base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);
-        const tailChars = [];
-        while (base10Number > 0n) {
-          tailChars.unshift(alphabet4[Number(base10Number % baseBigInt)]);
-          base10Number /= baseBigInt;
-        }
-        return [leadingZeroes + tailChars.join(""), rawBytes.length];
-      },
-      description: `base${base}`,
-      fixedSize: null,
-      maxSize: null
-    };
+        const base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);
+        const tailChars = getBaseXFromBigInt(base10Number, alphabet4);
+        return [leadingZeroes + tailChars, rawBytes.length];
+      }
+    });
   };
   var getBaseXCodec = (alphabet4) => combineCodec(getBaseXEncoder(alphabet4), getBaseXDecoder(alphabet4));
+  function partitionLeadingZeroes(value, zeroCharacter) {
+    const leadingZeroIndex = [...value].findIndex((c) => c !== zeroCharacter);
+    return leadingZeroIndex === -1 ? [value, ""] : [value.slice(0, leadingZeroIndex), value.slice(leadingZeroIndex)];
+  }
+  function getBigIntFromBaseX(value, alphabet4) {
+    const base = BigInt(alphabet4.length);
+    return [...value].reduce((sum, char) => sum * base + BigInt(alphabet4.indexOf(char)), 0n);
+  }
+  function getBaseXFromBigInt(value, alphabet4) {
+    const base = BigInt(alphabet4.length);
+    const tailChars = [];
+    while (value > 0n) {
+      tailChars.unshift(alphabet4[Number(value % base)]);
+      value /= base;
+    }
+    return tailChars.join("");
+  }
 
   // src/base10.ts
   var alphabet = "0123456789";
@@ -169,25 +176,22 @@ this.globalThis.solanaWeb3 = (function (exports) {
   var getBase10Codec = () => getBaseXCodec(alphabet);
 
   // src/base16.ts
-  var getBase16Encoder = () => ({
-    description: "base16",
-    encode(value) {
+  var getBase16Encoder = () => createEncoder({
+    getSizeFromValue: (value) => Math.ceil(value.length / 2),
+    write(value, bytes, offset) {
       const lowercaseValue = value.toLowerCase();
       assertValidBaseString("0123456789abcdef", lowercaseValue, value);
       const matches = lowercaseValue.match(/.{1,2}/g);
-      return Uint8Array.from(matches ? matches.map((byte) => parseInt(byte, 16)) : []);
-    },
-    fixedSize: null,
-    maxSize: null
+      const hexBytes = matches ? matches.map((byte) => parseInt(byte, 16)) : [];
+      bytes.set(hexBytes, offset);
+      return hexBytes.length + offset;
+    }
   });
-  var getBase16Decoder = () => ({
-    decode(bytes, offset = 0) {
+  var getBase16Decoder = () => createDecoder({
+    read(bytes, offset) {
       const value = bytes.slice(offset).reduce((str, byte) => str + byte.toString(16).padStart(2, "0"), "");
       return [value, bytes.length];
-    },
-    description: "base16",
-    fixedSize: null,
-    maxSize: null
+    }
   });
   var getBase16Codec = () => combineCodec(getBase16Encoder(), getBase16Decoder());
 
@@ -198,29 +202,26 @@ this.globalThis.solanaWeb3 = (function (exports) {
   var getBase58Codec = () => getBaseXCodec(alphabet2);
 
   // src/baseX-reslice.ts
-  var getBaseXResliceEncoder = (alphabet4, bits) => ({
-    description: `base${alphabet4.length}`,
-    encode(value) {
+  var getBaseXResliceEncoder = (alphabet4, bits) => createEncoder({
+    getSizeFromValue: (value) => Math.floor(value.length * bits / 8),
+    write(value, bytes, offset) {
       assertValidBaseString(alphabet4, value);
       if (value === "")
-        return new Uint8Array();
+        return offset;
       const charIndices = [...value].map((c) => alphabet4.indexOf(c));
-      return new Uint8Array(reslice(charIndices, bits, 8, false));
-    },
-    fixedSize: null,
-    maxSize: null
+      const reslicedBytes = reslice(charIndices, bits, 8, false);
+      bytes.set(reslicedBytes, offset);
+      return reslicedBytes.length + offset;
+    }
   });
-  var getBaseXResliceDecoder = (alphabet4, bits) => ({
-    decode(rawBytes, offset = 0) {
+  var getBaseXResliceDecoder = (alphabet4, bits) => createDecoder({
+    read(rawBytes, offset = 0) {
       const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);
       if (bytes.length === 0)
         return ["", rawBytes.length];
       const charIndices = reslice([...bytes], 8, bits, true);
       return [charIndices.map((i) => alphabet4[i]).join(""), rawBytes.length];
-    },
-    description: `base${alphabet4.length}`,
-    fixedSize: null,
-    maxSize: null
+    }
   });
   var getBaseXResliceCodec = (alphabet4, bits) => combineCodec(getBaseXResliceEncoder(alphabet4, bits), getBaseXResliceDecoder(alphabet4, bits));
   function reslice(input, inputBits, outputBits, useRemainder) {
@@ -243,33 +244,35 @@ this.globalThis.solanaWeb3 = (function (exports) {
   }
   var getBase64Encoder = () => {
     {
-      return {
-        description: `base64`,
-        encode(value) {
+      return createEncoder({
+        getSizeFromValue: (value) => {
           try {
-            const bytes = atob(value).split("").map((c) => c.charCodeAt(0));
-            return new Uint8Array(bytes);
+            return atob(value).length;
           } catch (e2) {
             throw new Error(`Expected a string of base 64, got [${value}].`);
           }
         },
-        fixedSize: null,
-        maxSize: null
-      };
+        write(value, bytes, offset) {
+          try {
+            const bytesToAdd = atob(value).split("").map((c) => c.charCodeAt(0));
+            bytes.set(bytesToAdd, offset);
+            return bytesToAdd.length + offset;
+          } catch (e2) {
+            throw new Error(`Expected a string of base 64, got [${value}].`);
+          }
+        }
+      });
     }
   };
   var getBase64Decoder = () => {
     {
-      return {
-        decode(bytes, offset = 0) {
+      return createDecoder({
+        read(bytes, offset = 0) {
           const slice = bytes.slice(offset);
           const value = btoa(String.fromCharCode(...slice));
           return [value, bytes.length];
-        },
-        description: `base64`,
-        fixedSize: null,
-        maxSize: null
-      };
+        }
+      });
     }
   };
   var getBase64Codec = () => combineCodec(getBase64Encoder(), getBase64Decoder());
@@ -289,50 +292,33 @@ this.globalThis.solanaWeb3 = (function (exports) {
       );
     }
   }
-  function sharedNumberFactory(input) {
-    var _a;
-    let littleEndian;
-    let defaultDescription = input.name;
-    if (input.size > 1) {
-      littleEndian = !("endian" in input.config) || input.config.endian === 0;
-      defaultDescription += littleEndian ? "(le)" : "(be)";
-    }
-    return {
-      description: (_a = input.config.description) != null ? _a : defaultDescription,
-      fixedSize: input.size,
-      littleEndian,
-      maxSize: input.size
-    };
+  function isLittleEndian(config) {
+    return (config == null ? void 0 : config.endian) === 1 ? false : true;
   }
   function numberEncoderFactory(input) {
-    const codecData = sharedNumberFactory(input);
-    return {
-      description: codecData.description,
-      encode(value) {
+    return createEncoder({
+      fixedSize: input.size,
+      write(value, bytes, offset) {
         if (input.range) {
           assertNumberIsBetweenForCodec(input.name, input.range[0], input.range[1], value);
         }
         const arrayBuffer = new ArrayBuffer(input.size);
-        input.set(new DataView(arrayBuffer), value, codecData.littleEndian);
-        return new Uint8Array(arrayBuffer);
-      },
-      fixedSize: codecData.fixedSize,
-      maxSize: codecData.maxSize
-    };
+        input.set(new DataView(arrayBuffer), value, isLittleEndian(input.config));
+        bytes.set(new Uint8Array(arrayBuffer), offset);
+        return offset + input.size;
+      }
+    });
   }
   function numberDecoderFactory(input) {
-    const codecData = sharedNumberFactory(input);
-    return {
-      decode(bytes, offset = 0) {
-        assertByteArrayIsNotEmptyForCodec(codecData.description, bytes, offset);
-        assertByteArrayHasEnoughBytesForCodec(codecData.description, input.size, bytes, offset);
+    return createDecoder({
+      fixedSize: input.size,
+      read(bytes, offset = 0) {
+        assertByteArrayIsNotEmptyForCodec(input.name, bytes, offset);
+        assertByteArrayHasEnoughBytesForCodec(input.name, input.size, bytes, offset);
         const view = new DataView(toArrayBuffer(bytes, offset, input.size));
-        return [input.get(view, codecData.littleEndian), offset + input.size];
-      },
-      description: codecData.description,
-      fixedSize: codecData.fixedSize,
-      maxSize: codecData.maxSize
-    };
+        return [input.get(view, isLittleEndian(input.config)), offset + input.size];
+      }
+    });
   }
   function toArrayBuffer(bytes, offset, length) {
     const bytesOffset = bytes.byteOffset + (offset != null ? offset : 0);
@@ -360,81 +346,75 @@ this.globalThis.solanaWeb3 = (function (exports) {
   // src/utf8.ts
   var getUtf8Encoder = () => {
     let textEncoder;
-    return {
-      description: "utf8",
-      encode: (value) => new Uint8Array((textEncoder || (textEncoder = new o())).encode(value)),
-      fixedSize: null,
-      maxSize: null
-    };
+    return createEncoder({
+      getSizeFromValue: (value) => (textEncoder || (textEncoder = new o())).encode(value).length,
+      write: (value, bytes, offset) => {
+        const bytesToAdd = (textEncoder || (textEncoder = new o())).encode(value);
+        bytes.set(bytesToAdd, offset);
+        return offset + bytesToAdd.length;
+      }
+    });
   };
   var getUtf8Decoder = () => {
     let textDecoder;
-    return {
-      decode(bytes, offset = 0) {
+    return createDecoder({
+      read(bytes, offset) {
         const value = (textDecoder || (textDecoder = new e())).decode(bytes.slice(offset));
         return [removeNullCharacters(value), bytes.length];
-      },
-      description: "utf8",
-      fixedSize: null,
-      maxSize: null
-    };
+      }
+    });
   };
   var getUtf8Codec = () => combineCodec(getUtf8Encoder(), getUtf8Decoder());
 
   // src/string.ts
-  var getStringEncoder = (config = {}) => {
-    var _a, _b, _c;
+  function getStringEncoder(config = {}) {
+    var _a, _b;
     const size = (_a = config.size) != null ? _a : getU32Encoder();
     const encoding = (_b = config.encoding) != null ? _b : getUtf8Encoder();
-    const description = (_c = config.description) != null ? _c : `string(${encoding.description}; ${getSizeDescription(size)})`;
     if (size === "variable") {
-      return { ...encoding, description };
+      return encoding;
     }
     if (typeof size === "number") {
-      return fixEncoder(encoding, size, description);
+      return fixEncoder(encoding, size);
     }
-    return {
-      description,
-      encode: (value) => {
-        const contentBytes = encoding.encode(value);
-        const lengthBytes = size.encode(contentBytes.length);
-        return mergeBytes([lengthBytes, contentBytes]);
+    return createEncoder({
+      getSizeFromValue: (value) => {
+        const contentSize = getEncodedSize(value, encoding);
+        return getEncodedSize(contentSize, size) + contentSize;
       },
-      fixedSize: null,
-      maxSize: null
-    };
-  };
-  var getStringDecoder = (config = {}) => {
-    var _a, _b, _c;
+      write: (value, bytes, offset) => {
+        const contentSize = getEncodedSize(value, encoding);
+        offset = size.write(contentSize, bytes, offset);
+        return encoding.write(value, bytes, offset);
+      }
+    });
+  }
+  function getStringDecoder(config = {}) {
+    var _a, _b;
     const size = (_a = config.size) != null ? _a : getU32Decoder();
     const encoding = (_b = config.encoding) != null ? _b : getUtf8Decoder();
-    const description = (_c = config.description) != null ? _c : `string(${encoding.description}; ${getSizeDescription(size)})`;
     if (size === "variable") {
-      return { ...encoding, description };
+      return encoding;
     }
     if (typeof size === "number") {
-      return fixDecoder(encoding, size, description);
+      return fixDecoder(encoding, size);
     }
-    return {
-      decode: (bytes, offset = 0) => {
+    return createDecoder({
+      read: (bytes, offset = 0) => {
         assertByteArrayIsNotEmptyForCodec("string", bytes, offset);
-        const [lengthBigInt, lengthOffset] = size.decode(bytes, offset);
+        const [lengthBigInt, lengthOffset] = size.read(bytes, offset);
         const length = Number(lengthBigInt);
         offset = lengthOffset;
         const contentBytes = bytes.slice(offset, offset + length);
         assertByteArrayHasEnoughBytesForCodec("string", length, contentBytes);
-        const [value, contentOffset] = encoding.decode(contentBytes);
+        const [value, contentOffset] = encoding.read(contentBytes, 0);
         offset += contentOffset;
         return [value, offset];
-      },
-      description,
-      fixedSize: null,
-      maxSize: null
-    };
-  };
-  var getStringCodec = (config = {}) => combineCodec(getStringEncoder(config), getStringDecoder(config));
-  function getSizeDescription(size) {
-    return typeof size === "object" ? size.description : `${size}`;
+      }
+    });
+  }
+  function getStringCodec(config = {}) {
+    return combineCodec(getStringEncoder(config), getStringDecoder(config));
   }
 
   exports.assertValidBaseString = assertValidBaseString;