@bcts/envelope-pattern 1.0.0-alpha.16 → 1.0.0-alpha.17

package/src/pattern/structure/node-pattern.ts

@@ -37,10 +37,10 @@ export type NodePatternType =
  * Corresponds to the Rust `NodePattern` enum in node_pattern.rs
  */
 export class NodePattern implements Matcher {
-  readonly #pattern: NodePatternType;
+  private readonly _pattern: NodePatternType;
 
   private constructor(pattern: NodePatternType) {
-    this.#pattern = pattern;
+    this._pattern = pattern;
   }
 
   /**
@@ -76,14 +76,14 @@ export class NodePattern implements Matcher {
    * Gets the pattern type.
    */
   get patternType(): NodePatternType {
-    return this.#pattern;
+    return this._pattern;
   }
 
   /**
    * Gets the subject pattern if this is a WithSubject type, undefined otherwise.
    */
   subjectPattern(): Pattern | undefined {
-    return this.#pattern.type === "WithSubject" ? this.#pattern.subjectPattern : undefined;
+    return this._pattern.type === "WithSubject" ? this._pattern.subjectPattern : undefined;
   }
 
   /**
@@ -101,12 +101,12 @@ export class NodePattern implements Matcher {
 
     let isHit = false;
 
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         isHit = true;
         break;
       case "AssertionsInterval":
-        isHit = this.#pattern.interval.contains(haystack.assertions().length);
+        isHit = this._pattern.interval.contains(haystack.assertions().length);
         break;
       case "WithSubject":
         // For WithSubject, we match if the node exists (subject pattern matching done at higher level)
@@ -138,13 +138,13 @@ export class NodePattern implements Matcher {
   }
 
   toString(): string {
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         return "node";
       case "AssertionsInterval":
-        return `node(${this.#pattern.interval.toString()})`;
+        return `node(${this._pattern.interval.toString()})`;
       case "WithSubject":
-        return `node(${(this.#pattern.subjectPattern as unknown as { toString(): string }).toString()})`;
+        return `node(${(this._pattern.subjectPattern as unknown as { toString(): string }).toString()})`;
     }
   }
 
@@ -152,21 +152,21 @@ export class NodePattern implements Matcher {
    * Equality comparison.
    */
   equals(other: NodePattern): boolean {
-    if (this.#pattern.type !== other.#pattern.type) {
+    if (this._pattern.type !== other._pattern.type) {
       return false;
     }
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         return true;
       case "AssertionsInterval":
-        return this.#pattern.interval.equals(
-          (other.#pattern as { type: "AssertionsInterval"; interval: Interval }).interval,
+        return this._pattern.interval.equals(
+          (other._pattern as { type: "AssertionsInterval"; interval: Interval }).interval,
         );
       case "WithSubject":
         // Simple reference equality for pattern (could be improved with deep equality)
         return (
-          this.#pattern.subjectPattern ===
-          (other.#pattern as { type: "WithSubject"; subjectPattern: Pattern }).subjectPattern
+          this._pattern.subjectPattern ===
+          (other._pattern as { type: "WithSubject"; subjectPattern: Pattern }).subjectPattern
         );
     }
   }
@@ -175,12 +175,12 @@ export class NodePattern implements Matcher {
    * Hash code for use in Maps/Sets.
    */
   hashCode(): number {
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         return 0;
       case "AssertionsInterval":
         // Simple hash based on interval min/max
-        return this.#pattern.interval.min() * 31 + (this.#pattern.interval.max() ?? 0);
+        return this._pattern.interval.min() * 31 + (this._pattern.interval.max() ?? 0);
       case "WithSubject":
         return 1;
     }

package/src/pattern/structure/object-pattern.ts

@@ -34,10 +34,10 @@ export type ObjectPatternType =
  * Corresponds to the Rust `ObjectPattern` enum in object_pattern.rs
  */
 export class ObjectPattern implements Matcher {
-  readonly #pattern: ObjectPatternType;
+  private readonly _pattern: ObjectPatternType;
 
   private constructor(pattern: ObjectPatternType) {
-    this.#pattern = pattern;
+    this._pattern = pattern;
   }
 
   /**
@@ -58,14 +58,14 @@ export class ObjectPattern implements Matcher {
    * Gets the pattern type.
    */
   get patternType(): ObjectPatternType {
-    return this.#pattern;
+    return this._pattern;
   }
 
   /**
    * Gets the inner pattern if this is a Pattern type, undefined otherwise.
    */
   innerPattern(): Pattern | undefined {
-    return this.#pattern.type === "Pattern" ? this.#pattern.pattern : undefined;
+    return this._pattern.type === "Pattern" ? this._pattern.pattern : undefined;
   }
 
   pathsWithCaptures(haystack: Envelope): [Path[], Map<string, Path[]>] {
@@ -77,12 +77,12 @@ export class ObjectPattern implements Matcher {
 
     let paths: Path[];
 
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         paths = [[object]];
         break;
       case "Pattern": {
-        const innerMatcher = this.#pattern.pattern as unknown as Matcher;
+        const innerMatcher = this._pattern.pattern as unknown as Matcher;
         if (innerMatcher.matches(object)) {
           paths = [[object]];
         } else {
@@ -117,11 +117,11 @@ export class ObjectPattern implements Matcher {
   }
 
   toString(): string {
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         return "obj";
       case "Pattern":
-        return `obj(${(this.#pattern.pattern as unknown as { toString(): string }).toString()})`;
+        return `obj(${(this._pattern.pattern as unknown as { toString(): string }).toString()})`;
     }
   }
 
@@ -129,14 +129,14 @@ export class ObjectPattern implements Matcher {
    * Equality comparison.
    */
   equals(other: ObjectPattern): boolean {
-    if (this.#pattern.type !== other.#pattern.type) {
+    if (this._pattern.type !== other._pattern.type) {
       return false;
     }
-    if (this.#pattern.type === "Any") {
+    if (this._pattern.type === "Any") {
       return true;
     }
-    const thisPattern = (this.#pattern as { type: "Pattern"; pattern: Pattern }).pattern;
-    const otherPattern = (other.#pattern as { type: "Pattern"; pattern: Pattern }).pattern;
+    const thisPattern = (this._pattern as { type: "Pattern"; pattern: Pattern }).pattern;
+    const otherPattern = (other._pattern as { type: "Pattern"; pattern: Pattern }).pattern;
     return thisPattern === otherPattern;
   }
 
@@ -144,6 +144,6 @@ export class ObjectPattern implements Matcher {
    * Hash code for use in Maps/Sets.
    */
   hashCode(): number {
-    return this.#pattern.type === "Any" ? 0 : 1;
+    return this._pattern.type === "Any" ? 0 : 1;
   }
 }

package/src/pattern/structure/obscured-pattern.ts

@@ -39,10 +39,10 @@ export type ObscuredPatternType =
  * Corresponds to the Rust `ObscuredPattern` enum in obscured_pattern.rs
  */
 export class ObscuredPattern implements Matcher {
-  readonly #pattern: ObscuredPatternType;
+  private readonly _pattern: ObscuredPatternType;
 
   private constructor(pattern: ObscuredPatternType) {
-    this.#pattern = pattern;
+    this._pattern = pattern;
   }
 
   /**
@@ -77,13 +77,13 @@ export class ObscuredPattern implements Matcher {
    * Gets the pattern type.
    */
   get patternType(): ObscuredPatternType {
-    return this.#pattern;
+    return this._pattern;
   }
 
   pathsWithCaptures(haystack: Envelope): [Path[], Map<string, Path[]>] {
     let isHit = false;
 
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         isHit = haystack.isObscured();
         break;
@@ -122,7 +122,7 @@ export class ObscuredPattern implements Matcher {
   }
 
   toString(): string {
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         return "obscured";
       case "Elided":
@@ -138,14 +138,14 @@ export class ObscuredPattern implements Matcher {
    * Equality comparison.
    */
   equals(other: ObscuredPattern): boolean {
-    return this.#pattern.type === other.#pattern.type;
+    return this._pattern.type === other._pattern.type;
   }
 
   /**
    * Hash code for use in Maps/Sets.
    */
   hashCode(): number {
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         return 0;
       case "Elided":

package/src/pattern/structure/predicate-pattern.ts

@@ -36,10 +36,10 @@ export type PredicatePatternType =
  * Corresponds to the Rust `PredicatePattern` enum in predicate_pattern.rs
  */
 export class PredicatePattern implements Matcher {
-  readonly #pattern: PredicatePatternType;
+  private readonly _pattern: PredicatePatternType;
 
   private constructor(pattern: PredicatePatternType) {
-    this.#pattern = pattern;
+    this._pattern = pattern;
   }
 
   /**
@@ -60,14 +60,14 @@ export class PredicatePattern implements Matcher {
    * Gets the pattern type.
    */
   get patternType(): PredicatePatternType {
-    return this.#pattern;
+    return this._pattern;
   }
 
   /**
    * Gets the inner pattern if this is a Pattern type, undefined otherwise.
    */
   innerPattern(): Pattern | undefined {
-    return this.#pattern.type === "Pattern" ? this.#pattern.pattern : undefined;
+    return this._pattern.type === "Pattern" ? this._pattern.pattern : undefined;
   }
 
   pathsWithCaptures(haystack: Envelope): [Path[], Map<string, Path[]>] {
@@ -79,12 +79,12 @@ export class PredicatePattern implements Matcher {
 
     let paths: Path[];
 
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         paths = [[predicate]];
         break;
       case "Pattern": {
-        const innerMatcher = this.#pattern.pattern as unknown as Matcher;
+        const innerMatcher = this._pattern.pattern as unknown as Matcher;
         if (innerMatcher.matches(predicate)) {
           paths = [[predicate]];
         } else {
@@ -119,11 +119,11 @@ export class PredicatePattern implements Matcher {
   }
 
   toString(): string {
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         return "pred";
       case "Pattern":
-        return `pred(${(this.#pattern.pattern as unknown as { toString(): string }).toString()})`;
+        return `pred(${(this._pattern.pattern as unknown as { toString(): string }).toString()})`;
     }
   }
 
@@ -131,14 +131,14 @@ export class PredicatePattern implements Matcher {
    * Equality comparison.
    */
   equals(other: PredicatePattern): boolean {
-    if (this.#pattern.type !== other.#pattern.type) {
+    if (this._pattern.type !== other._pattern.type) {
       return false;
     }
-    if (this.#pattern.type === "Any") {
+    if (this._pattern.type === "Any") {
       return true;
     }
-    const thisPattern = (this.#pattern as { type: "Pattern"; pattern: Pattern }).pattern;
-    const otherPattern = (other.#pattern as { type: "Pattern"; pattern: Pattern }).pattern;
+    const thisPattern = (this._pattern as { type: "Pattern"; pattern: Pattern }).pattern;
+    const otherPattern = (other._pattern as { type: "Pattern"; pattern: Pattern }).pattern;
     return thisPattern === otherPattern;
   }
 
@@ -146,6 +146,6 @@ export class PredicatePattern implements Matcher {
    * Hash code for use in Maps/Sets.
    */
   hashCode(): number {
-    return this.#pattern.type === "Any" ? 0 : 1;
+    return this._pattern.type === "Any" ? 0 : 1;
   }
 }

package/src/pattern/structure/subject-pattern.ts

@@ -34,10 +34,10 @@ export type SubjectPatternType =
  * Corresponds to the Rust `SubjectPattern` enum in subject_pattern.rs
  */
 export class SubjectPattern implements Matcher {
-  readonly #pattern: SubjectPatternType;
+  private readonly _pattern: SubjectPatternType;
 
   private constructor(pattern: SubjectPatternType) {
-    this.#pattern = pattern;
+    this._pattern = pattern;
   }
 
   /**
@@ -58,26 +58,26 @@ export class SubjectPattern implements Matcher {
    * Gets the pattern type.
    */
   get patternType(): SubjectPatternType {
-    return this.#pattern;
+    return this._pattern;
   }
 
   /**
    * Gets the inner pattern if this is a Pattern type, undefined otherwise.
    */
   innerPattern(): Pattern | undefined {
-    return this.#pattern.type === "Pattern" ? this.#pattern.pattern : undefined;
+    return this._pattern.type === "Pattern" ? this._pattern.pattern : undefined;
   }
 
   pathsWithCaptures(haystack: Envelope): [Path[], Map<string, Path[]>] {
     const subject = haystack.subject();
     let paths: Path[];
 
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         paths = [[subject]];
         break;
       case "Pattern": {
-        const innerMatcher = this.#pattern.pattern as unknown as Matcher;
+        const innerMatcher = this._pattern.pattern as unknown as Matcher;
         if (innerMatcher.matches(subject)) {
           paths = [[subject]];
         } else {
@@ -99,7 +99,7 @@ export class SubjectPattern implements Matcher {
   }
 
   compile(code: Instr[], literals: Pattern[], captures: string[]): void {
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         code.push({ type: "NavigateSubject" });
         break;
@@ -108,7 +108,7 @@ export class SubjectPattern implements Matcher {
         code.push({ type: "NavigateSubject" });
         // Save the path and run the inner pattern relative to the subject
         code.push({ type: "ExtendTraversal" });
-        (this.#pattern.pattern as unknown as Matcher).compile(code, literals, captures);
+        (this._pattern.pattern as unknown as Matcher).compile(code, literals, captures);
         code.push({ type: "CombineTraversal" });
         break;
     }
@@ -119,11 +119,11 @@ export class SubjectPattern implements Matcher {
   }
 
   toString(): string {
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         return "subj";
       case "Pattern":
-        return `subj(${(this.#pattern.pattern as unknown as { toString(): string }).toString()})`;
+        return `subj(${(this._pattern.pattern as unknown as { toString(): string }).toString()})`;
     }
   }
 
@@ -131,15 +131,15 @@ export class SubjectPattern implements Matcher {
    * Equality comparison.
    */
   equals(other: SubjectPattern): boolean {
-    if (this.#pattern.type !== other.#pattern.type) {
+    if (this._pattern.type !== other._pattern.type) {
       return false;
     }
-    if (this.#pattern.type === "Any") {
+    if (this._pattern.type === "Any") {
       return true;
     }
     // For Pattern type, compare the inner patterns
-    const thisPattern = (this.#pattern as { type: "Pattern"; pattern: Pattern }).pattern;
-    const otherPattern = (other.#pattern as { type: "Pattern"; pattern: Pattern }).pattern;
+    const thisPattern = (this._pattern as { type: "Pattern"; pattern: Pattern }).pattern;
+    const otherPattern = (other._pattern as { type: "Pattern"; pattern: Pattern }).pattern;
     return thisPattern === otherPattern; // Reference equality for now
   }
 
@@ -147,6 +147,6 @@ export class SubjectPattern implements Matcher {
    * Hash code for use in Maps/Sets.
    */
   hashCode(): number {
-    return this.#pattern.type === "Any" ? 0 : 1;
+    return this._pattern.type === "Any" ? 0 : 1;
   }
 }

package/src/pattern/structure/wrapped-pattern.ts

@@ -34,10 +34,10 @@ export type WrappedPatternType =
  * Corresponds to the Rust `WrappedPattern` enum in wrapped_pattern.rs
  */
 export class WrappedPattern implements Matcher {
-  readonly #pattern: WrappedPatternType;
+  private readonly _pattern: WrappedPatternType;
 
   private constructor(pattern: WrappedPatternType) {
-    this.#pattern = pattern;
+    this._pattern = pattern;
   }
 
   /**
@@ -69,14 +69,14 @@ export class WrappedPattern implements Matcher {
    * Gets the pattern type.
    */
   get patternType(): WrappedPatternType {
-    return this.#pattern;
+    return this._pattern;
   }
 
   /**
    * Gets the inner pattern if this is an Unwrap type, undefined otherwise.
    */
   innerPattern(): Pattern | undefined {
-    return this.#pattern.type === "Unwrap" ? this.#pattern.pattern : undefined;
+    return this._pattern.type === "Unwrap" ? this._pattern.pattern : undefined;
   }
 
   pathsWithCaptures(haystack: Envelope): [Path[], Map<string, Path[]>] {
@@ -88,7 +88,7 @@ export class WrappedPattern implements Matcher {
 
     let paths: Path[];
 
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         // Just match the wrapped envelope itself, don't descend
         paths = [[haystack]];
@@ -97,7 +97,7 @@ export class WrappedPattern implements Matcher {
         // Match the content of the wrapped envelope
         const unwrapped = subject.tryUnwrap?.();
         if (unwrapped !== undefined) {
-          const innerMatcher = this.#pattern.pattern as unknown as Matcher;
+          const innerMatcher = this._pattern.pattern as unknown as Matcher;
           const innerPaths = innerMatcher.paths(unwrapped);
           paths = innerPaths.map((path) => {
             // Add the current envelope to the path
@@ -126,7 +126,7 @@ export class WrappedPattern implements Matcher {
       throw new Error("WrappedPattern factory not registered");
     }
 
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any": {
         // Just match the wrapped envelope itself, don't descend
         const idx = literals.length;
@@ -145,7 +145,7 @@ export class WrappedPattern implements Matcher {
         code.push({ type: "PushAxis", axis });
 
         // Then match the pattern
-        const innerMatcher = this.#pattern.pattern as unknown as Matcher;
+        const innerMatcher = this._pattern.pattern as unknown as Matcher;
         innerMatcher.compile(code, literals, captures);
         break;
       }
@@ -157,12 +157,12 @@ export class WrappedPattern implements Matcher {
   }
 
   toString(): string {
-    switch (this.#pattern.type) {
+    switch (this._pattern.type) {
       case "Any":
         return "wrapped";
       case "Unwrap": {
         // Check if it's the "any" pattern by string comparison
-        const patternStr = (this.#pattern.pattern as unknown as { toString(): string }).toString();
+        const patternStr = (this._pattern.pattern as unknown as { toString(): string }).toString();
         if (patternStr === "*") {
           return "unwrap";
         }
@@ -175,14 +175,14 @@ export class WrappedPattern implements Matcher {
    * Equality comparison.
    */
   equals(other: WrappedPattern): boolean {
-    if (this.#pattern.type !== other.#pattern.type) {
+    if (this._pattern.type !== other._pattern.type) {
       return false;
     }
-    if (this.#pattern.type === "Any") {
+    if (this._pattern.type === "Any") {
       return true;
     }
-    const thisPattern = (this.#pattern as { type: "Unwrap"; pattern: Pattern }).pattern;
-    const otherPattern = (other.#pattern as { type: "Unwrap"; pattern: Pattern }).pattern;
+    const thisPattern = (this._pattern as { type: "Unwrap"; pattern: Pattern }).pattern;
+    const otherPattern = (other._pattern as { type: "Unwrap"; pattern: Pattern }).pattern;
     return thisPattern === otherPattern;
   }
 
@@ -190,6 +190,6 @@ export class WrappedPattern implements Matcher {
    * Hash code for use in Maps/Sets.
    */
   hashCode(): number {
-    return this.#pattern.type === "Any" ? 0 : 1;
+    return this._pattern.type === "Any" ? 0 : 1;
   }
 }