@matter/general 0.13.1-alpha.0-20250508-047aa0277 → 0.13.1-alpha.0-20250509-28e1567e1

package/dist/cjs/transaction/Transaction.d.ts

@@ -144,16 +144,16 @@ export declare const Transaction: {
      */
     act<T>(via: string, actor: (transaction: Transaction) => MaybePromise<T>): MaybePromise<T>;
     ReadOnly: {
-        "__#15412@#participants": Set<Participant>;
-        "__#15412@#roles": Map<{}, Participant>;
-        "__#15412@#resources": Set<Resource>;
-        "__#15412@#status": Status;
-        "__#15412@#waitingOn"?: Iterable<Transaction>;
-        "__#15412@#via": string;
-        "__#15412@#shared"?: import("../index.js").Observable<[]>;
-        "__#15412@#closed"?: import("../index.js").Observable<[]>;
-        "__#15412@#isAsync": boolean;
-        "__#15412@#reportingLocks": boolean;
+        "__#15442@#participants": Set<Participant>;
+        "__#15442@#roles": Map<{}, Participant>;
+        "__#15442@#resources": Set<Resource>;
+        "__#15442@#status": Status;
+        "__#15442@#waitingOn"?: Iterable<Transaction>;
+        "__#15442@#via": string;
+        "__#15442@#shared"?: import("../index.js").Observable<[]>;
+        "__#15442@#closed"?: import("../index.js").Observable<[]>;
+        "__#15442@#isAsync": boolean;
+        "__#15442@#reportingLocks": boolean;
         close(): void;
         readonly via: string;
         readonly status: Status;
@@ -175,15 +175,15 @@ export declare const Transaction: {
         waitFor(others: Set<Transaction>): Promise<void>;
         toString(): string;
         treatAsSlow(): void;
-        "__#15412@#finalize"(status: Status, why: string, finalizer: () => MaybePromise): Promise<void> | undefined;
-        "__#15412@#executePreCommit"(): MaybePromise<void>;
-        "__#15412@#executeCommit"(): MaybePromise;
-        "__#15412@#executeCommit1"(): MaybePromise;
-        "__#15412@#executeCommit2"(): Promise<void> | undefined;
-        "__#15412@#executePostCommit"(participants: Participant[]): MaybePromise;
-        "__#15412@#executeRollback"(): Promise<void> | undefined;
-        "__#15412@#locksChanged"(resources: Set<Resource>, how?: string): void;
-        "__#15412@#assertAvailable"(): void;
+        "__#15442@#finalize"(status: Status, why: string, finalizer: () => MaybePromise): Promise<void> | undefined;
+        "__#15442@#executePreCommit"(): MaybePromise<void>;
+        "__#15442@#executeCommit"(): MaybePromise;
+        "__#15442@#executeCommit1"(): MaybePromise;
+        "__#15442@#executeCommit2"(): Promise<void> | undefined;
+        "__#15442@#executePostCommit"(participants: Participant[]): MaybePromise;
+        "__#15442@#executeRollback"(): Promise<void> | undefined;
+        "__#15442@#locksChanged"(resources: Set<Resource>, how?: string): void;
+        "__#15442@#assertAvailable"(): void;
     };
     Status: typeof Status;
     Resource: typeof Resource;

package/dist/cjs/util/FormattedText.d.ts

@@ -8,7 +8,30 @@ export { camelize, describeList, serialize } from "./String.js";
  * Performs word wrap.  Input is assumed to be a series of paragraphs separated by a newline.  Output is an array of
  * formatted lines.
  *
- * Contains specialized support for lists, ESDoc directives ans ANSI escape codes.
+ * Contains specialized support for lists, ESDoc directives and ANSI escape codes.
  */
 export declare function FormattedText(text: string, width?: number): string[];
+/**
+ * Types of things we consider "blocks".  Most blocks are lists but we also support markdown-style quotes prefixed with
+ * ">".
+ */
+export declare enum BlockKind {
+    Simple = "simple",
+    Bullet1 = "\u2022",
+    Bullet2 = "\u25E6",
+    Bullet3 = "\u25AA",
+    Bullet4 = "\u25CB",
+    Bullet5 = "\u25CF",
+    Bullet6 = "\u2023",
+    Bullet7 = "\u2043",
+    Bullet8 = "\u25D8",
+    Quote = ">",
+    Number = "number",
+    LowerAlpha = "alpha",
+    UpperAlpha = "ALPHA",
+    LowerRoman = "roman",
+    UpperRoman = "ROMAN"
+}
+export declare const Bullets: BlockKind[];
+export declare function looksLikeListItem(text: string): boolean;
 //# sourceMappingURL=FormattedText.d.ts.map

package/dist/cjs/util/FormattedText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FormattedText.d.ts","sourceRoot":"","sources":["../../../src/util/FormattedText.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEhE;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAM,YAGtD"}
+{"version":3,"file":"FormattedText.d.ts","sourceRoot":"","sources":["../../../src/util/FormattedText.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEhE;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAM,YAGtD;AAED;;;GAGG;AACH,oBAAY,SAAS;IACjB,MAAM,WAAW;IACjB,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,KAAK,MAAM;IACX,MAAM,WAAW;IACjB,UAAU,UAAU;IACpB,UAAU,UAAU;IACpB,UAAU,UAAU;IACpB,UAAU,UAAU;CACvB;AAED,eAAO,MAAM,OAAO,aAEU,CAAC;AAK/B,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,WAE7C"}

package/dist/cjs/util/FormattedText.js

@@ -18,9 +18,12 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var FormattedText_exports = {};
 __export(FormattedText_exports, {
+  BlockKind: () => BlockKind,
+  Bullets: () => Bullets,
   FormattedText: () => FormattedText,
   camelize: () => import_String.camelize,
   describeList: () => import_String.describeList,
+  looksLikeListItem: () => looksLikeListItem,
   serialize: () => import_String.serialize
 });
 module.exports = __toCommonJS(FormattedText_exports);
@@ -30,107 +33,97 @@ var import_String = require("./String.js");
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-const LIST_INDENT = 2;
+const INDENT = "  ";
 function FormattedText(text, width = 120) {
   const structure = detectStructure(text);
-  return formatStructure(structure, width);
+  return formatBlock(structure, width);
 }
-var ListType = /* @__PURE__ */ ((ListType2) => {
-  ListType2["Bullet1"] = "\u2022";
-  ListType2["Bullet2"] = "\u25E6";
-  ListType2["Bullet3"] = "\u25AA";
-  ListType2["Bullet4"] = "\u25CB";
-  ListType2["Bullet5"] = "\u25CF";
-  ListType2["Bullet6"] = "\u2023";
-  ListType2["Bullet7"] = "\u2043";
-  ListType2["Bullet8"] = "\u25D8";
-  ListType2["Number"] = "number";
-  ListType2["LowerAlpha"] = "alpha";
-  ListType2["UpperAlpha"] = "ALPHA";
-  ListType2["LowerRoman"] = "roman";
-  ListType2["UpperRoman"] = "ROMAN";
-  return ListType2;
-})(ListType || {});
-function detectList(text, listState) {
-  function enterList(listType) {
-    const existing = listState.indexOf(listType);
-    if (existing == -1) {
-      listState.push(listType);
-    } else {
-      listState.length = existing + 1;
-    }
+var BlockKind = /* @__PURE__ */ ((BlockKind2) => {
+  BlockKind2["Simple"] = "simple";
+  BlockKind2["Bullet1"] = "\u2022";
+  BlockKind2["Bullet2"] = "\u25E6";
+  BlockKind2["Bullet3"] = "\u25AA";
+  BlockKind2["Bullet4"] = "\u25CB";
+  BlockKind2["Bullet5"] = "\u25CF";
+  BlockKind2["Bullet6"] = "\u2023";
+  BlockKind2["Bullet7"] = "\u2043";
+  BlockKind2["Bullet8"] = "\u25D8";
+  BlockKind2["Quote"] = ">";
+  BlockKind2["Number"] = "number";
+  BlockKind2["LowerAlpha"] = "alpha";
+  BlockKind2["UpperAlpha"] = "ALPHA";
+  BlockKind2["LowerRoman"] = "roman";
+  BlockKind2["UpperRoman"] = "ROMAN";
+  return BlockKind2;
+})(BlockKind || {});
+const Bullets = Object.entries(BlockKind).filter(([key]) => key.startsWith("Bullet")).map(([, value]) => value);
+const enumTest = "(?:\\d+|[ivx]+|[a-z])\\.";
+const listItemTest = new RegExp(`^(?:[${Bullets.join("")}]|${enumTest})\\s`, "i");
+function looksLikeListItem(text) {
+  return !!listItemTest.exec(text);
+}
+const Empty = {
+  kind: "simple" /* Simple */,
+  indentWidth: 0,
+  entries: []
+};
+function detectBlock(text, breadcrumb) {
+  const match = text.match(/^\s*(\S+)/);
+  if (!match) {
+    return;
   }
-  for (const value of Object.values(ListType)) {
-    if (text[0] === value && text[1] === " ") {
-      enterList(text[0]);
+  const [, marker] = match;
+  if (Bullets.includes(marker) || marker === ">" /* Quote */) {
+    enterBlock(marker);
+    return;
+  }
+  if (detectEnumeration(/^\d+\.$/, "1", "number" /* Number */)) return;
+  if (detectEnumeration(/^[ivx]+\.$/, "i", "roman" /* LowerRoman */)) return;
+  if (detectEnumeration(/^[IVX]+\.$/, "I", "ROMAN" /* UpperRoman */)) return;
+  if (detectEnumeration(/^[a-z]+\.$/, "a", "alpha" /* LowerAlpha */)) return;
+  if (detectEnumeration(/^[A-Z]+\.$/, "A", "ALPHA" /* UpperAlpha */)) return;
+  breadcrumb.length = 1;
+  function enterBlock(kind) {
+    const level = breadcrumb.findIndex((entry) => entry.kind === kind);
+    if (level !== -1) {
+      breadcrumb.length = level + 1;
       return;
     }
+    const block = {
+      kind,
+      indentWidth: (breadcrumb[breadcrumb.length - 1]?.indentWidth ?? 0) + kind === ">" /* Quote */ ? 0 : 2,
+      entries: []
+    };
+    breadcrumb[breadcrumb.length - 1].entries.push(block);
+    breadcrumb.push(block);
   }
-  function detectEnumeration(test, listType, first) {
-    if (!text.match(test)) {
+  function detectEnumeration(test, startsWith, kind) {
+    if (!marker.match(test)) {
       return false;
     }
-    if (listState.indexOf(listType) != -1 || text.startsWith(`${first}.`)) {
-      enterList(listType);
-      return true;
+    if (!breadcrumb.find((block) => block.kind === kind)) {
+      if (marker !== `${startsWith}.`) {
+        return false;
+      }
     }
-    return false;
+    enterBlock(kind);
+    return true;
   }
-  if (detectEnumeration(/^\d+\./, "number" /* Number */, "1")) return;
-  if (detectEnumeration(/^[ivx]+\./, "roman" /* LowerRoman */, "i")) return;
-  if (detectEnumeration(/^[IVX]+\./, "ROMAN" /* UpperRoman */, "I")) return;
-  if (detectEnumeration(/^[a-z]+\./, "alpha" /* LowerAlpha */, "a")) return;
-  if (detectEnumeration(/^[A-Z]+\./, "ALPHA" /* UpperAlpha */, "A")) return;
-  listState.length = 0;
-}
-function extractPrefix(text) {
-  const match = text.match(/^(\S+)\s+($|\S.*$)/);
-  if (match) {
-    return { prefix: match[1], text: match[2] };
-  }
-  return { prefix: text, text: "" };
 }
 function detectStructure(text) {
-  if (text == "") {
-    return { prefixWidth: 0, entries: [] };
+  const lines = text.split(/\n+/).map((line) => line.trimEnd());
+  if (!lines.some((p) => p)) {
+    return Empty;
   }
-  const paragraphs = text.split(/\n+/).map((paragraph) => paragraph.trim().replace(/\s+/g, " "));
-  if (!paragraphs.length) {
-    return { prefixWidth: 0, entries: [] };
+  const breadcrumb = [{ ...Empty, entries: [] }];
+  for (const line of lines) {
+    detectBlock(line, breadcrumb);
+    breadcrumb[breadcrumb.length - 1].entries.push(line.trim().replace(/\s+/g, " "));
   }
-  const listState = Array();
-  let index = 0;
-  function processLevel() {
-    const level = listState.length;
-    const structure = {
-      prefixWidth: 0,
-      entries: []
-    };
-    while (index < paragraphs.length) {
-      detectList(paragraphs[index], listState);
-      if (listState.length < level) {
-        break;
-      }
-      if (listState.length > level) {
-        structure.entries.push(processLevel());
-        if (listState.length < level || index >= paragraphs.length) {
-          break;
-        }
-      }
-      structure.entries.push(paragraphs[index]);
-      if (level) {
-        const { prefix } = extractPrefix(paragraphs[index]);
-        if (prefix.length > structure.prefixWidth) {
-          structure.prefixWidth = prefix.length;
-        }
-      }
-      index++;
-    }
-    return structure;
-  }
-  return processLevel();
+  return breadcrumb[0];
 }
-function wrapParagraph(input, into, wrapWidth, padding, prefixWidth) {
+function wrapParagraph(input, into, wrapWidth, initialPrefix, wrapPrefix) {
+  const prefixWidth = visibleWidthOf(initialPrefix);
   const segments = input.split(/\s+/);
   if (!segments) {
     return;
@@ -146,35 +139,23 @@ function wrapParagraph(input, into, wrapWidth, padding, prefixWidth) {
       }
     }
   }
-  let wrapPrefix;
-  if (prefixWidth) {
-    wrapPrefix = "".padStart(prefixWidth + 1, " ");
-  } else {
-    wrapPrefix = "";
-  }
-  const line = Array();
-  let length = 0;
+  const line = [initialPrefix];
+  let width = prefixWidth;
   let pushedOne = false;
-  let needWrapPrefix = false;
   for (const s of segments) {
-    const segmentLength = visibleLengthOf(s);
-    if (length && length + segmentLength > wrapWidth) {
+    const segmentWidth = visibleWidthOf(s);
+    if (width && width + segmentWidth > wrapWidth) {
       addLine();
-      line.length = length = 0;
-      needWrapPrefix = true;
-    }
-    if (!line.length && padding) {
-      line.push("".padStart(padding, " "));
-      length += padding;
+      line.length = 0;
+      width = prefixWidth;
     }
-    if (needWrapPrefix) {
-      needWrapPrefix = false;
+    if (!line.length) {
       line.push(wrapPrefix);
-      length += wrapPrefix.length;
+      width = prefixWidth;
     }
     line.push(s);
     line.push(" ");
-    length += segmentLength + 1;
+    width += segmentWidth + 1;
   }
   line.length = line.length - 1;
   if (line.length) {
@@ -190,21 +171,45 @@ function wrapParagraph(input, into, wrapWidth, padding, prefixWidth) {
     into.push(line.join(""));
   }
 }
-function formatStructure(structure, width) {
+function separatePrefixFromContent(text) {
+  const match = text.match(/^(\S+\s)\s*(\S.*$)/);
+  if (match) {
+    return { prefix: match[1], text: match[2] };
+  }
+  return { prefix: "", text };
+}
+function formatBlock(block, width) {
   const lines = Array();
-  function formatLevel(structure2, padding) {
-    for (const entry of structure2.entries) {
+  function formatLevel(block2, parentPrefix) {
+    for (const entry of block2.entries) {
       if (typeof entry == "string") {
-        wrapParagraph(entry, lines, width, padding, structure2.prefixWidth);
+        let prefix, text;
+        if (block2.kind === "simple" /* Simple */) {
+          prefix = "";
+          text = entry;
+        } else {
+          ({ prefix, text } = separatePrefixFromContent(entry));
+        }
+        wrapParagraph(
+          text,
+          lines,
+          width,
+          parentPrefix + prefix,
+          parentPrefix + " ".repeat(visibleWidthOf(prefix))
+        );
       } else {
-        formatLevel(entry, padding + LIST_INDENT);
+        let childPrefix = parentPrefix;
+        if (entry.kind !== ">" /* Quote */ || parentPrefix !== "") {
+          childPrefix += INDENT;
+        }
+        formatLevel(entry, childPrefix);
       }
     }
   }
-  formatLevel(structure, 0);
+  formatLevel(block, "");
   return lines;
 }
-function visibleLengthOf(text) {
+function visibleWidthOf(text) {
   let length = 0;
   for (let i = 0; i < text.length; ) {
     switch (text[i]) {

package/dist/cjs/util/FormattedText.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/util/FormattedText.ts"],
-  "mappings": "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",
-  "names": ["ListType", "structure"]
+  "mappings": "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",
+  "names": ["BlockKind", "block"]
 }

package/dist/esm/transaction/Transaction.d.ts

@@ -144,16 +144,16 @@ export declare const Transaction: {
      */
     act<T>(via: string, actor: (transaction: Transaction) => MaybePromise<T>): MaybePromise<T>;
     ReadOnly: {
-        "__#15412@#participants": Set<Participant>;
-        "__#15412@#roles": Map<{}, Participant>;
-        "__#15412@#resources": Set<Resource>;
-        "__#15412@#status": Status;
-        "__#15412@#waitingOn"?: Iterable<Transaction>;
-        "__#15412@#via": string;
-        "__#15412@#shared"?: import("../index.js").Observable<[]>;
-        "__#15412@#closed"?: import("../index.js").Observable<[]>;
-        "__#15412@#isAsync": boolean;
-        "__#15412@#reportingLocks": boolean;
+        "__#15442@#participants": Set<Participant>;
+        "__#15442@#roles": Map<{}, Participant>;
+        "__#15442@#resources": Set<Resource>;
+        "__#15442@#status": Status;
+        "__#15442@#waitingOn"?: Iterable<Transaction>;
+        "__#15442@#via": string;
+        "__#15442@#shared"?: import("../index.js").Observable<[]>;
+        "__#15442@#closed"?: import("../index.js").Observable<[]>;
+        "__#15442@#isAsync": boolean;
+        "__#15442@#reportingLocks": boolean;
         close(): void;
         readonly via: string;
         readonly status: Status;
@@ -175,15 +175,15 @@ export declare const Transaction: {
         waitFor(others: Set<Transaction>): Promise<void>;
         toString(): string;
         treatAsSlow(): void;
-        "__#15412@#finalize"(status: Status, why: string, finalizer: () => MaybePromise): Promise<void> | undefined;
-        "__#15412@#executePreCommit"(): MaybePromise<void>;
-        "__#15412@#executeCommit"(): MaybePromise;
-        "__#15412@#executeCommit1"(): MaybePromise;
-        "__#15412@#executeCommit2"(): Promise<void> | undefined;
-        "__#15412@#executePostCommit"(participants: Participant[]): MaybePromise;
-        "__#15412@#executeRollback"(): Promise<void> | undefined;
-        "__#15412@#locksChanged"(resources: Set<Resource>, how?: string): void;
-        "__#15412@#assertAvailable"(): void;
+        "__#15442@#finalize"(status: Status, why: string, finalizer: () => MaybePromise): Promise<void> | undefined;
+        "__#15442@#executePreCommit"(): MaybePromise<void>;
+        "__#15442@#executeCommit"(): MaybePromise;
+        "__#15442@#executeCommit1"(): MaybePromise;
+        "__#15442@#executeCommit2"(): Promise<void> | undefined;
+        "__#15442@#executePostCommit"(participants: Participant[]): MaybePromise;
+        "__#15442@#executeRollback"(): Promise<void> | undefined;
+        "__#15442@#locksChanged"(resources: Set<Resource>, how?: string): void;
+        "__#15442@#assertAvailable"(): void;
     };
     Status: typeof Status;
     Resource: typeof Resource;

package/dist/esm/util/FormattedText.d.ts

@@ -8,7 +8,30 @@ export { camelize, describeList, serialize } from "./String.js";
  * Performs word wrap.  Input is assumed to be a series of paragraphs separated by a newline.  Output is an array of
  * formatted lines.
  *
- * Contains specialized support for lists, ESDoc directives ans ANSI escape codes.
+ * Contains specialized support for lists, ESDoc directives and ANSI escape codes.
  */
 export declare function FormattedText(text: string, width?: number): string[];
+/**
+ * Types of things we consider "blocks".  Most blocks are lists but we also support markdown-style quotes prefixed with
+ * ">".
+ */
+export declare enum BlockKind {
+    Simple = "simple",
+    Bullet1 = "\u2022",
+    Bullet2 = "\u25E6",
+    Bullet3 = "\u25AA",
+    Bullet4 = "\u25CB",
+    Bullet5 = "\u25CF",
+    Bullet6 = "\u2023",
+    Bullet7 = "\u2043",
+    Bullet8 = "\u25D8",
+    Quote = ">",
+    Number = "number",
+    LowerAlpha = "alpha",
+    UpperAlpha = "ALPHA",
+    LowerRoman = "roman",
+    UpperRoman = "ROMAN"
+}
+export declare const Bullets: BlockKind[];
+export declare function looksLikeListItem(text: string): boolean;
 //# sourceMappingURL=FormattedText.d.ts.map

package/dist/esm/util/FormattedText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FormattedText.d.ts","sourceRoot":"","sources":["../../../src/util/FormattedText.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEhE;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAM,YAGtD"}
+{"version":3,"file":"FormattedText.d.ts","sourceRoot":"","sources":["../../../src/util/FormattedText.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEhE;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAM,YAGtD;AAED;;;GAGG;AACH,oBAAY,SAAS;IACjB,MAAM,WAAW;IACjB,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,OAAO,WAAM;IACb,KAAK,MAAM;IACX,MAAM,WAAW;IACjB,UAAU,UAAU;IACpB,UAAU,UAAU;IACpB,UAAU,UAAU;IACpB,UAAU,UAAU;CACvB;AAED,eAAO,MAAM,OAAO,aAEU,CAAC;AAK/B,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,WAE7C"}

package/dist/esm/util/FormattedText.js

@@ -3,108 +3,98 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-const LIST_INDENT = 2;
+const INDENT = "  ";
 import { camelize, describeList, serialize } from "./String.js";
 function FormattedText(text, width = 120) {
   const structure = detectStructure(text);
-  return formatStructure(structure, width);
+  return formatBlock(structure, width);
 }
-var ListType = /* @__PURE__ */ ((ListType2) => {
-  ListType2["Bullet1"] = "\u2022";
-  ListType2["Bullet2"] = "\u25E6";
-  ListType2["Bullet3"] = "\u25AA";
-  ListType2["Bullet4"] = "\u25CB";
-  ListType2["Bullet5"] = "\u25CF";
-  ListType2["Bullet6"] = "\u2023";
-  ListType2["Bullet7"] = "\u2043";
-  ListType2["Bullet8"] = "\u25D8";
-  ListType2["Number"] = "number";
-  ListType2["LowerAlpha"] = "alpha";
-  ListType2["UpperAlpha"] = "ALPHA";
-  ListType2["LowerRoman"] = "roman";
-  ListType2["UpperRoman"] = "ROMAN";
-  return ListType2;
-})(ListType || {});
-function detectList(text, listState) {
-  function enterList(listType) {
-    const existing = listState.indexOf(listType);
-    if (existing == -1) {
-      listState.push(listType);
-    } else {
-      listState.length = existing + 1;
-    }
+var BlockKind = /* @__PURE__ */ ((BlockKind2) => {
+  BlockKind2["Simple"] = "simple";
+  BlockKind2["Bullet1"] = "\u2022";
+  BlockKind2["Bullet2"] = "\u25E6";
+  BlockKind2["Bullet3"] = "\u25AA";
+  BlockKind2["Bullet4"] = "\u25CB";
+  BlockKind2["Bullet5"] = "\u25CF";
+  BlockKind2["Bullet6"] = "\u2023";
+  BlockKind2["Bullet7"] = "\u2043";
+  BlockKind2["Bullet8"] = "\u25D8";
+  BlockKind2["Quote"] = ">";
+  BlockKind2["Number"] = "number";
+  BlockKind2["LowerAlpha"] = "alpha";
+  BlockKind2["UpperAlpha"] = "ALPHA";
+  BlockKind2["LowerRoman"] = "roman";
+  BlockKind2["UpperRoman"] = "ROMAN";
+  return BlockKind2;
+})(BlockKind || {});
+const Bullets = Object.entries(BlockKind).filter(([key]) => key.startsWith("Bullet")).map(([, value]) => value);
+const enumTest = "(?:\\d+|[ivx]+|[a-z])\\.";
+const listItemTest = new RegExp(`^(?:[${Bullets.join("")}]|${enumTest})\\s`, "i");
+function looksLikeListItem(text) {
+  return !!listItemTest.exec(text);
+}
+const Empty = {
+  kind: "simple" /* Simple */,
+  indentWidth: 0,
+  entries: []
+};
+function detectBlock(text, breadcrumb) {
+  const match = text.match(/^\s*(\S+)/);
+  if (!match) {
+    return;
   }
-  for (const value of Object.values(ListType)) {
-    if (text[0] === value && text[1] === " ") {
-      enterList(text[0]);
+  const [, marker] = match;
+  if (Bullets.includes(marker) || marker === ">" /* Quote */) {
+    enterBlock(marker);
+    return;
+  }
+  if (detectEnumeration(/^\d+\.$/, "1", "number" /* Number */)) return;
+  if (detectEnumeration(/^[ivx]+\.$/, "i", "roman" /* LowerRoman */)) return;
+  if (detectEnumeration(/^[IVX]+\.$/, "I", "ROMAN" /* UpperRoman */)) return;
+  if (detectEnumeration(/^[a-z]+\.$/, "a", "alpha" /* LowerAlpha */)) return;
+  if (detectEnumeration(/^[A-Z]+\.$/, "A", "ALPHA" /* UpperAlpha */)) return;
+  breadcrumb.length = 1;
+  function enterBlock(kind) {
+    const level = breadcrumb.findIndex((entry) => entry.kind === kind);
+    if (level !== -1) {
+      breadcrumb.length = level + 1;
       return;
     }
+    const block = {
+      kind,
+      indentWidth: (breadcrumb[breadcrumb.length - 1]?.indentWidth ?? 0) + kind === ">" /* Quote */ ? 0 : 2,
+      entries: []
+    };
+    breadcrumb[breadcrumb.length - 1].entries.push(block);
+    breadcrumb.push(block);
   }
-  function detectEnumeration(test, listType, first) {
-    if (!text.match(test)) {
+  function detectEnumeration(test, startsWith, kind) {
+    if (!marker.match(test)) {
       return false;
     }
-    if (listState.indexOf(listType) != -1 || text.startsWith(`${first}.`)) {
-      enterList(listType);
-      return true;
+    if (!breadcrumb.find((block) => block.kind === kind)) {
+      if (marker !== `${startsWith}.`) {
+        return false;
+      }
     }
-    return false;
+    enterBlock(kind);
+    return true;
   }
-  if (detectEnumeration(/^\d+\./, "number" /* Number */, "1")) return;
-  if (detectEnumeration(/^[ivx]+\./, "roman" /* LowerRoman */, "i")) return;
-  if (detectEnumeration(/^[IVX]+\./, "ROMAN" /* UpperRoman */, "I")) return;
-  if (detectEnumeration(/^[a-z]+\./, "alpha" /* LowerAlpha */, "a")) return;
-  if (detectEnumeration(/^[A-Z]+\./, "ALPHA" /* UpperAlpha */, "A")) return;
-  listState.length = 0;
-}
-function extractPrefix(text) {
-  const match = text.match(/^(\S+)\s+($|\S.*$)/);
-  if (match) {
-    return { prefix: match[1], text: match[2] };
-  }
-  return { prefix: text, text: "" };
 }
 function detectStructure(text) {
-  if (text == "") {
-    return { prefixWidth: 0, entries: [] };
+  const lines = text.split(/\n+/).map((line) => line.trimEnd());
+  if (!lines.some((p) => p)) {
+    return Empty;
   }
-  const paragraphs = text.split(/\n+/).map((paragraph) => paragraph.trim().replace(/\s+/g, " "));
-  if (!paragraphs.length) {
-    return { prefixWidth: 0, entries: [] };
+  const breadcrumb = [{ ...Empty, entries: [] }];
+  for (const line of lines) {
+    detectBlock(line, breadcrumb);
+    breadcrumb[breadcrumb.length - 1].entries.push(line.trim().replace(/\s+/g, " "));
   }
-  const listState = Array();
-  let index = 0;
-  function processLevel() {
-    const level = listState.length;
-    const structure = {
-      prefixWidth: 0,
-      entries: []
-    };
-    while (index < paragraphs.length) {
-      detectList(paragraphs[index], listState);
-      if (listState.length < level) {
-        break;
-      }
-      if (listState.length > level) {
-        structure.entries.push(processLevel());
-        if (listState.length < level || index >= paragraphs.length) {
-          break;
-        }
-      }
-      structure.entries.push(paragraphs[index]);
-      if (level) {
-        const { prefix } = extractPrefix(paragraphs[index]);
-        if (prefix.length > structure.prefixWidth) {
-          structure.prefixWidth = prefix.length;
-        }
-      }
-      index++;
-    }
-    return structure;
-  }
-  return processLevel();
+  return breadcrumb[0];
 }
-function wrapParagraph(input, into, wrapWidth, padding, prefixWidth) {
+function wrapParagraph(input, into, wrapWidth, initialPrefix, wrapPrefix) {
+  const prefixWidth = visibleWidthOf(initialPrefix);
   const segments = input.split(/\s+/);
   if (!segments) {
     return;
@@ -120,35 +110,23 @@ function wrapParagraph(input, into, wrapWidth, padding, prefixWidth) {
       }
     }
   }
-  let wrapPrefix;
-  if (prefixWidth) {
-    wrapPrefix = "".padStart(prefixWidth + 1, " ");
-  } else {
-    wrapPrefix = "";
-  }
-  const line = Array();
-  let length = 0;
+  const line = [initialPrefix];
+  let width = prefixWidth;
   let pushedOne = false;
-  let needWrapPrefix = false;
   for (const s of segments) {
-    const segmentLength = visibleLengthOf(s);
-    if (length && length + segmentLength > wrapWidth) {
+    const segmentWidth = visibleWidthOf(s);
+    if (width && width + segmentWidth > wrapWidth) {
       addLine();
-      line.length = length = 0;
-      needWrapPrefix = true;
-    }
-    if (!line.length && padding) {
-      line.push("".padStart(padding, " "));
-      length += padding;
+      line.length = 0;
+      width = prefixWidth;
     }
-    if (needWrapPrefix) {
-      needWrapPrefix = false;
+    if (!line.length) {
       line.push(wrapPrefix);
-      length += wrapPrefix.length;
+      width = prefixWidth;
     }
     line.push(s);
     line.push(" ");
-    length += segmentLength + 1;
+    width += segmentWidth + 1;
   }
   line.length = line.length - 1;
   if (line.length) {
@@ -164,21 +142,45 @@ function wrapParagraph(input, into, wrapWidth, padding, prefixWidth) {
     into.push(line.join(""));
   }
 }
-function formatStructure(structure, width) {
+function separatePrefixFromContent(text) {
+  const match = text.match(/^(\S+\s)\s*(\S.*$)/);
+  if (match) {
+    return { prefix: match[1], text: match[2] };
+  }
+  return { prefix: "", text };
+}
+function formatBlock(block, width) {
   const lines = Array();
-  function formatLevel(structure2, padding) {
-    for (const entry of structure2.entries) {
+  function formatLevel(block2, parentPrefix) {
+    for (const entry of block2.entries) {
       if (typeof entry == "string") {
-        wrapParagraph(entry, lines, width, padding, structure2.prefixWidth);
+        let prefix, text;
+        if (block2.kind === "simple" /* Simple */) {
+          prefix = "";
+          text = entry;
+        } else {
+          ({ prefix, text } = separatePrefixFromContent(entry));
+        }
+        wrapParagraph(
+          text,
+          lines,
+          width,
+          parentPrefix + prefix,
+          parentPrefix + " ".repeat(visibleWidthOf(prefix))
+        );
       } else {
-        formatLevel(entry, padding + LIST_INDENT);
+        let childPrefix = parentPrefix;
+        if (entry.kind !== ">" /* Quote */ || parentPrefix !== "") {
+          childPrefix += INDENT;
+        }
+        formatLevel(entry, childPrefix);
       }
     }
   }
-  formatLevel(structure, 0);
+  formatLevel(block, "");
   return lines;
 }
-function visibleLengthOf(text) {
+function visibleWidthOf(text) {
   let length = 0;
   for (let i = 0; i < text.length; ) {
     switch (text[i]) {
@@ -215,9 +217,12 @@ function visibleLengthOf(text) {
   return length;
 }
 export {
+  BlockKind,
+  Bullets,
   FormattedText,
   camelize,
   describeList,
+  looksLikeListItem,
   serialize
 };
 //# sourceMappingURL=FormattedText.js.map

package/dist/esm/util/FormattedText.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/util/FormattedText.ts"],
-  "mappings": "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",
-  "names": ["ListType", "structure"]
+  "mappings": "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",
+  "names": ["BlockKind", "block"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/general",
-    "version": "0.13.1-alpha.0-20250508-047aa0277",
+    "version": "0.13.1-alpha.0-20250509-28e1567e1",
     "description": "Non-Matter support for Matter.js",
     "keywords": [
         "iot",
@@ -36,7 +36,7 @@
         "@noble/curves": "^1.8.2"
     },
     "devDependencies": {
-        "@matter/testing": "0.13.1-alpha.0-20250508-047aa0277"
+        "@matter/testing": "0.13.1-alpha.0-20250509-28e1567e1"
     },
     "files": [
         "dist/**/*",

package/src/util/FormattedText.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const LIST_INDENT = 2;
+const INDENT = "  ";
 
 export { camelize, describeList, serialize } from "./String.js";
 
@@ -12,14 +12,19 @@ export { camelize, describeList, serialize } from "./String.js";
  * Performs word wrap.  Input is assumed to be a series of paragraphs separated by a newline.  Output is an array of
  * formatted lines.
  *
- * Contains specialized support for lists, ESDoc directives ans ANSI escape codes.
+ * Contains specialized support for lists, ESDoc directives and ANSI escape codes.
  */
 export function FormattedText(text: string, width = 120) {
     const structure = detectStructure(text);
-    return formatStructure(structure, width);
+    return formatBlock(structure, width);
 }
 
-enum ListType {
+/**
+ * Types of things we consider "blocks".  Most blocks are lists but we also support markdown-style quotes prefixed with
+ * ">".
+ */
+export enum BlockKind {
+    Simple = "simple",
     Bullet1 = "•",
     Bullet2 = "◦",
     Bullet3 = "▪",
@@ -28,6 +33,7 @@ enum ListType {
     Bullet6 = "‣",
     Bullet7 = "⁃",
     Bullet8 = "◘",
+    Quote = ">",
     Number = "number",
     LowerAlpha = "alpha",
     UpperAlpha = "ALPHA",
@@ -35,115 +41,114 @@ enum ListType {
     UpperRoman = "ROMAN",
 }
 
-function detectList(text: string, listState: ListType[]) {
-    function enterList(listType: ListType) {
-        const existing = listState.indexOf(listType);
-        if (existing == -1) {
-            listState.push(listType);
-        } else {
-            listState.length = existing + 1;
-        }
-    }
-
-    for (const value of Object.values(ListType)) {
-        if (text[0] === value && text[1] === " ") {
-            enterList(text[0] as ListType);
-            return;
-        }
-    }
-
-    function detectEnumeration(test: RegExp, listType: ListType, first: string) {
-        if (!text.match(test)) {
-            return false;
-        }
-
-        if (listState.indexOf(listType) != -1 || text.startsWith(`${first}.`)) {
-            enterList(listType);
-            return true;
-        }
-
-        return false;
-    }
+export const Bullets = Object.entries(BlockKind)
+    .filter(([key]) => key.startsWith("Bullet"))
+    .map(([, value]) => value);
 
-    if (detectEnumeration(/^\d+\./, ListType.Number, "1")) return;
-    if (detectEnumeration(/^[ivx]+\./, ListType.LowerRoman, "i")) return;
-    if (detectEnumeration(/^[IVX]+\./, ListType.UpperRoman, "I")) return;
-    if (detectEnumeration(/^[a-z]+\./, ListType.LowerAlpha, "a")) return;
-    if (detectEnumeration(/^[A-Z]+\./, ListType.UpperAlpha, "A")) return;
+const enumTest = "(?:\\d+|[ivx]+|[a-z])\\.";
+const listItemTest = new RegExp(`^(?:[${Bullets.join("")}]|${enumTest})\\s`, "i");
 
-    listState.length = 0;
+export function looksLikeListItem(text: string) {
+    return !!listItemTest.exec(text);
 }
 
-type TextStructure = {
-    prefixWidth: number;
-    entries: (string | TextStructure)[];
+type Block = {
+    kind: BlockKind;
+    indentWidth: number;
+    entries: (string | Block)[];
 };
 
-function extractPrefix(text: string) {
-    const match = text.match(/^(\S+)\s+($|\S.*$)/);
-    if (match) {
-        return { prefix: match[1], text: match[2] };
-    }
-    return { prefix: text, text: "" };
-}
+const Empty: Block = {
+    kind: BlockKind.Simple,
+    indentWidth: 0,
+    entries: [],
+};
 
-function detectStructure(text: string): TextStructure {
-    if (text == "") {
-        return { prefixWidth: 0, entries: [] };
+/**
+ * Detect block prefixes.  This is designed to handle scavenged, poorly formatted text so does not use indentation.  It
+ * just focus on the prefix characters of the paragraph/line (which are the same thing as paragraphs do not include
+ * newlines).
+ */
+function detectBlock(text: string, breadcrumb: Block[]) {
+    const match = text.match(/^\s*(\S+)/);
+    if (!match) {
+        return;
     }
-    const paragraphs = text.split(/\n+/).map(paragraph => paragraph.trim().replace(/\s+/g, " "));
-    if (!paragraphs.length) {
-        return { prefixWidth: 0, entries: [] };
+
+    const [, marker] = match;
+
+    if (Bullets.includes(marker as BlockKind) || marker === BlockKind.Quote) {
+        enterBlock(marker as BlockKind);
+        return;
     }
 
-    const listState = Array<ListType>();
-    let index = 0;
+    if (detectEnumeration(/^\d+\.$/, "1", BlockKind.Number)) return;
+    if (detectEnumeration(/^[ivx]+\.$/, "i", BlockKind.LowerRoman)) return;
+    if (detectEnumeration(/^[IVX]+\.$/, "I", BlockKind.UpperRoman)) return;
+    if (detectEnumeration(/^[a-z]+\.$/, "a", BlockKind.LowerAlpha)) return;
+    if (detectEnumeration(/^[A-Z]+\.$/, "A", BlockKind.UpperAlpha)) return;
+
+    // Not in a block
+    breadcrumb.length = 1;
+
+    function enterBlock(kind: BlockKind) {
+        // If we are already in block of this kind, ensure it is the deepest level
+        const level = breadcrumb.findIndex(entry => entry.kind === kind);
+        if (level !== -1) {
+            breadcrumb.length = level + 1;
+            return;
+        }
 
-    function processLevel() {
-        const level = listState.length;
-        const structure = {
-            prefixWidth: 0,
+        // Need to start a new block
+        const block = {
+            kind,
+            indentWidth: (breadcrumb[breadcrumb.length - 1]?.indentWidth ?? 0) + kind === BlockKind.Quote ? 0 : 2,
             entries: [],
-        } as TextStructure;
+        };
 
-        while (index < paragraphs.length) {
-            detectList(paragraphs[index], listState);
+        breadcrumb[breadcrumb.length - 1].entries.push(block);
+        breadcrumb.push(block);
+    }
 
-            // If we've moved to a higher list, we're done with this level
-            if (listState.length < level) {
-                break;
-            }
+    function detectEnumeration(test: RegExp, startsWith: string, kind: BlockKind) {
+        if (!marker.match(test)) {
+            return false;
+        }
 
-            // If we've moved to a deeper list, process the new level before continuing
-            if (listState.length > level) {
-                structure.entries.push(processLevel());
-                if (listState.length < level || index >= paragraphs.length) {
-                    break;
-                }
+        // Only consider enumeration if a.) we are already in same type of enumeration, or b.) the marker is the first
+        // element of the enumeration (e.g. "1." or "i.")
+        if (!breadcrumb.find(block => block.kind === kind)) {
+            if (marker !== `${startsWith}.`) {
+                return false;
             }
+        }
 
-            // This paragraph is in this level
-            structure.entries.push(paragraphs[index]);
+        enterBlock(kind);
+        return true;
+    }
+}
 
-            // In lists, update the prefix width so we know how far out to pad when formatting
-            if (level) {
-                const { prefix } = extractPrefix(paragraphs[index]);
-                if (prefix.length > structure.prefixWidth) {
-                    structure.prefixWidth = prefix.length;
-                }
-            }
+/**
+ * Builds a block structure by detecting lists and/or quoted sections.
+ */
+function detectStructure(text: string): Block {
+    const lines = text.split(/\n+/).map(line => line.trimEnd());
+    if (!lines.some(p => p)) {
+        return Empty;
+    }
 
-            // Move to next line
-            index++;
-        }
+    const breadcrumb: Block[] = [{ ...Empty, entries: [] }];
 
-        return structure;
+    for (const line of lines) {
+        detectBlock(line, breadcrumb);
+        breadcrumb[breadcrumb.length - 1].entries.push(line.trim().replace(/\s+/g, " "));
     }
 
-    return processLevel();
+    return breadcrumb[0];
 }
 
-function wrapParagraph(input: string, into: string[], wrapWidth: number, padding: number, prefixWidth: number) {
+function wrapParagraph(input: string, into: string[], wrapWidth: number, initialPrefix: string, wrapPrefix: string) {
+    const prefixWidth = visibleWidthOf(initialPrefix);
     const segments = input.split(/\s+/);
     if (!segments) {
         return;
@@ -163,50 +168,32 @@ function wrapParagraph(input: string, into: string[], wrapWidth: number, padding
         }
     }
 
-    // Configure for list prefix formatting
-    let wrapPrefix: string;
-    if (prefixWidth) {
-        // After wrapping this prefix will pad out subsequent entries
-        wrapPrefix = "".padStart(prefixWidth + 1, " ");
-    } else {
-        // No prefix
-        wrapPrefix = "";
-    }
-
     // Wrapping setup.  Track the portions of the line and current length
-    const line = Array<string>();
-    let length = 0;
+    const line = [initialPrefix];
+    let width = prefixWidth;
 
     // Perform actual wrapping
     let pushedOne = false;
-    let needWrapPrefix = false;
     for (const s of segments) {
-        const segmentLength = visibleLengthOf(s);
+        const segmentWidth = visibleWidthOf(s);
 
         // If we'll extend too far, start on a new line
-        if (length && length + segmentLength > wrapWidth) {
+        if (width && width + segmentWidth > wrapWidth) {
             addLine();
-            line.length = length = 0;
-            needWrapPrefix = true;
+            line.length = 0;
+            width = prefixWidth;
         }
 
-        // Add padding if this is a new line
-        if (!line.length && padding) {
-            line.push("".padStart(padding, " "));
-            length += padding;
-        }
-
-        // Add wrap prefix if this is a new line in a list
-        if (needWrapPrefix) {
-            needWrapPrefix = false;
+        // Add wrap prefix if this is a new line
+        if (!line.length) {
             line.push(wrapPrefix);
-            length += wrapPrefix.length;
+            width = prefixWidth;
         }
 
         // Add to the line
         line.push(s);
         line.push(" ");
-        length += segmentLength + 1;
+        width += segmentWidth + 1;
     }
 
     // If there is a remaining line, add it
@@ -227,25 +214,51 @@ function wrapParagraph(input: string, into: string[], wrapWidth: number, padding
     }
 }
 
-function formatStructure(structure: TextStructure, width: number) {
+function separatePrefixFromContent(text: string) {
+    const match = text.match(/^(\S+\s)\s*(\S.*$)/);
+    if (match) {
+        return { prefix: match[1], text: match[2] };
+    }
+    return { prefix: "", text };
+}
+
+function formatBlock(block: Block, width: number) {
     const lines = Array<string>();
 
-    function formatLevel(structure: TextStructure, padding: number) {
-        for (const entry of structure.entries) {
+    function formatLevel(block: Block, parentPrefix: string) {
+        for (const entry of block.entries) {
             if (typeof entry == "string") {
-                wrapParagraph(entry, lines, width, padding, structure.prefixWidth);
+                let prefix, text;
+                if (block.kind === BlockKind.Simple) {
+                    prefix = "";
+                    text = entry;
+                } else {
+                    ({ prefix, text } = separatePrefixFromContent(entry));
+                }
+
+                wrapParagraph(
+                    text,
+                    lines,
+                    width,
+                    parentPrefix + prefix,
+                    parentPrefix + " ".repeat(visibleWidthOf(prefix)),
+                );
             } else {
-                formatLevel(entry, padding + LIST_INDENT);
+                let childPrefix = parentPrefix;
+                if (entry.kind !== BlockKind.Quote || parentPrefix !== "") {
+                    childPrefix += INDENT;
+                }
+                formatLevel(entry, childPrefix);
             }
         }
     }
 
-    formatLevel(structure, 0);
+    formatLevel(block, "");
 
     return lines;
 }
 
-function visibleLengthOf(text: string) {
+function visibleWidthOf(text: string) {
     let length = 0;
     for (let i = 0; i < text.length; ) {
         switch (text[i]) {