cesr-ts 0.4.0 → 0.6.0

package/esm/src/primitives/indexer.js

@@ -1,6 +1,7 @@
 import { b, b64ToInt, codeB2ToB64, codeB64ToB2, concatBytes, decodeB64, encodeB64, intToB64, nabSextets, sceil, } from "../core/bytes.js";
 import { DeserializeError, ShortageError, UnknownCodeError } from "../core/errors.js";
 import { INDEXER_HARDS, INDEXER_SIZES } from "../tables/indexer.tables.generated.js";
+import { INDEXED_BOTH_SIG_CODES } from "./codex.js";
 const INDEXER_BARDS = new Map([...INDEXER_HARDS.entries()].map(([code, hs]) => [
     String.fromCharCode(codeB64ToB2(code)[0]),
     hs,
@@ -10,6 +11,7 @@ function isIndexerData(value) {
         && "code" in value && "raw" in value && "qb64" in value
         && "fullSize" in value && "fullSizeB2" in value && "index" in value;
 }
+/** Resolve the effective indexer code from the text-domain hard-selector prefix. */
 function parseIndexerCodeFromText(txt) {
     const hs = INDEXER_HARDS.get(txt[0]);
     if (!hs) {
@@ -21,6 +23,7 @@ function parseIndexerCodeFromText(txt) {
     }
     return { code };
 }
+/** Decode index and optional ondex soft fields from a fully qualified indexer token. */
 function parseIndexFields(code, qb64) {
     const sizage = INDEXER_SIZES.get(code);
     if (!sizage) {
@@ -30,9 +33,12 @@ function parseIndexFields(code, qb64) {
     const soft = qb64.slice(sizage.hs, cs);
     const ms = sizage.ss - sizage.os;
     const index = ms > 0 ? b64ToInt(soft.slice(0, ms)) : 0;
-    const ondex = sizage.os > 0 ? b64ToInt(soft.slice(ms, sizage.ss)) : undefined;
+    const ondex = sizage.os > 0
+        ? b64ToInt(soft.slice(ms, sizage.ss))
+        : (INDEXED_BOTH_SIG_CODES.has(code) ? index : undefined);
     return { index, ondex };
 }
+/** Inhale one text-domain indexer token into normalized indexer data fields. */
 function parseIndexerFromTextData(input) {
     const txt = String.fromCharCode(...input);
     if (txt.length === 0) {
@@ -47,7 +53,8 @@ function parseIndexerFromTextData(input) {
         throw new ShortageError(fullSize, txt.length);
     }
     const qb64 = txt.slice(0, fullSize);
-    const raw = decodeB64(qb64.slice(cs)).slice(sizage.ls);
+    const ps = cs % 4;
+    const raw = decodeB64("A".repeat(ps) + qb64.slice(cs)).slice(ps + sizage.ls);
     const { index, ondex } = parseIndexFields(code, qb64);
     return {
         code,
@@ -59,6 +66,7 @@ function parseIndexerFromTextData(input) {
         ondex,
     };
 }
+/** Inhale one qb2 indexer token into the canonical text-oriented indexer shape. */
 function parseIndexerFromBinaryData(input) {
     if (input.length === 0) {
         throw new ShortageError(1, 0);
@@ -91,7 +99,8 @@ function parseIndexerFromBinaryData(input) {
     }
     const qb2 = input.slice(0, bfs);
     const qb64 = codeB2ToB64(qb2, fs);
-    const raw = decodeB64(qb64.slice(cs)).slice(sizage.ls);
+    const ps = cs % 4;
+    const raw = decodeB64("A".repeat(ps) + qb64.slice(cs)).slice(ps + sizage.ls);
     const { index, ondex } = parseIndexFields(hard, qb64);
     return {
         code: hard,
@@ -103,6 +112,7 @@ function parseIndexerFromBinaryData(input) {
         ondex,
     };
 }
+/** Exhale raw bytes plus index metadata into fully qualified indexer encodings. */
 function encodeIndexerFromRaw(code, raw, index, ondex) {
     const sizage = INDEXER_SIZES.get(code);
     if (!sizage) {
@@ -115,10 +125,16 @@ function encodeIndexerFromRaw(code, raw, index, ondex) {
     if (!Number.isInteger(index) || index < 0) {
         throw new DeserializeError(`Invalid index ${index} for ${code}`);
     }
-    const ondexValue = sizage.os > 0 ? (ondex ?? index) : undefined;
+    const ondexValue = sizage.os > 0
+        ? (ondex ?? index)
+        : (INDEXED_BOTH_SIG_CODES.has(code) ? index : undefined);
     if (sizage.os > 0 && (ondexValue === undefined || ondexValue < 0)) {
         throw new DeserializeError(`Invalid ondex ${ondexValue} for ${code}`);
     }
+    if (sizage.os === 0 && INDEXED_BOTH_SIG_CODES.has(code)
+        && typeof ondex === "number" && ondex !== index) {
+        throw new DeserializeError(`Invalid ondex ${ondex} for both-signature code ${code} with index ${index}`);
+    }
     const cs = sizage.hs + sizage.ss;
     const ps = cs % 4;
     const paw = concatBytes(new Uint8Array(ps + sizage.ls), raw);
@@ -139,6 +155,7 @@ function encodeIndexerFromRaw(code, raw, index, ondex) {
         ondex: ondexValue,
     };
 }
+/** Normalize the supported constructor variants into one shared indexer payload. */
 function parseIndexerInit(init) {
     if (init.raw && init.code) {
         return encodeIndexerFromRaw(init.code, init.raw, init.index ?? 0, init.ondex);

package/esm/src/primitives/labeler.js

@@ -35,8 +35,7 @@ function decodeLabelText(matter) {
  */
 export class Labeler extends Matter {
     constructor(init) {
-        const matter = init instanceof Matter ? init : new Matter(init);
-        super(matter);
+        super(init);
         if (!isLabelerCode(this.code)) {
             throw new UnknownCodeError(`Expected labeler code, got ${this.code}`);
         }