refactor: use isDefined utility for better null/undefined checks in event filter and transaction classes

Author: fazzatti

core/event/event-filter/index.ts

@@ -9,6 +9,7 @@ import type { BoundedArray } from "@/common/helpers/bounded-array.ts";
 import type { ContractId } from "@/strkeys/types.ts";
 import { assert } from "@/common/assert/assert.ts";
 import * as E from "@/event/event-filter/error.ts";
+import { isDefined } from "@/common/type-guards/is-defined.ts";
 export class EventFilter {
   private _type?: EventType;
   private _contractIds?: BoundedArray<ContractId, 0, 5>;
@@ -36,14 +37,9 @@ export class EventFilter {
     return {
       type: this._type,
       contractIds: this._contractIds,
-      topics:
-        this._topics === undefined
-          ? undefined
-          : [
-              ...this._topics.map((topicFilter) =>
-                this.encodeTopics(topicFilter)
-              ),
-            ],
+      topics: isDefined(this._topics)
+        ? [...this._topics.map((topicFilter) => this.encodeTopics(topicFilter))]
+        : undefined,
     };
   }
 
@@ -77,7 +73,7 @@ export class EventFilter {
 }
 const eventTopicsMatchFilterTopic = (
   topicFilter: TopicFilter,
-  eventTopics: xdr.ScVal[]
+  eventTopics: xdr.ScVal[],
 ): boolean => {
   assert(eventTopics.length > 0, new E.EVENT_HAS_NO_TOPICS());
 
@@ -101,7 +97,7 @@ const eventTopicsMatchFilterTopic = (
       throw new E.FAILED_TO_CHECK_FILTER_SEGMENT(
         filterSegment,
         eventSegment,
-        e as Error
+        e as Error,
       );
     }
     return false; // No match for this segment

core/event/parsing/ledger-close-meta.ts

@@ -10,25 +10,25 @@ import { assert } from "@/common/assert/assert.ts";
 import { isDefined } from "@/common/type-guards/is-defined.ts";
 
 export const isLedgerCloseMetaV1 = (
-  metadataXdr: xdr.LedgerCloseMeta
+  metadataXdr: xdr.LedgerCloseMeta,
 ): boolean => {
   return metadataXdr.switch() === 1;
 };
 
 export const isLedgerCloseMetaV2 = (
-  metadataXdr: xdr.LedgerCloseMeta
+  metadataXdr: xdr.LedgerCloseMeta,
 ): boolean => {
   return metadataXdr.switch() === 2;
 };
 
 export const parseEventsFromLedgerCloseMeta = async (
   metadataXdr: xdr.LedgerCloseMeta,
   onEvent: EventHandler,
-  filters?: EventFilter[]
+  filters?: EventFilter[],
 ): Promise<void> => {
   assert(
     xdr.LedgerCloseMeta.isValid(metadataXdr),
-    new E.INVALID_LEDGER_CLOSE_META_XDR()
+    new E.INVALID_LEDGER_CLOSE_META_XDR(),
   );
 
   let ledgerCloseMeta:
@@ -46,7 +46,7 @@ export const parseEventsFromLedgerCloseMeta = async (
 
   assert(
     isDefined(ledgerCloseMeta),
-    new E.UNSUPPORTED_LEDGER_CLOSE_META_VERSION(metadataXdr.switch())
+    new E.UNSUPPORTED_LEDGER_CLOSE_META_VERSION(metadataXdr.switch()),
   );
 
   const ledgerSequence = ledgerCloseMeta.ledgerHeader().header().ledgerSeq();
@@ -84,7 +84,7 @@ export const parseEventsFromLedgerCloseMeta = async (
         const contractId =
           contractIdXdr !== null
             ? (Address.fromScAddress(
-                xdr.ScAddress.scAddressTypeContract(contractIdXdr)
+                xdr.ScAddress.scAddressTypeContract(contractIdXdr),
               ).toString() as ContractId)
             : undefined;
 
@@ -100,7 +100,7 @@ export const parseEventsFromLedgerCloseMeta = async (
             ledgerSequence,
             transactionIndex,
             operationIndex,
-            eventIndex
+            eventIndex,
           );
 
           await onEvent(
@@ -116,7 +116,7 @@ export const parseEventsFromLedgerCloseMeta = async (
               topic: topic,
               value: value,
               inSuccessfulContractCall: inSuccessfulContractCall,
-            })
+            }),
           );
         }
       }
@@ -135,7 +135,7 @@ export const isIncludedInFilters = ({
   type?: EventType;
   topics?: xdr.ScVal[];
 }): boolean => {
-  if (filters === undefined || filters.length === 0) return true;
+  if (!isDefined(filters) || filters.length === 0) return true;
 
   for (const filter of filters) {
     if (type !== undefined && !filter.matchesType(type)) continue;

core/ledger-parser/transaction/index.ts

@@ -14,6 +14,7 @@ import {
 import { Operation } from "@/ledger-parser/operation/index.ts";
 import { INVALID_TRANSACTION_INDEX } from "@/ledger-parser/error.ts";
 import type { Ledger } from "@/ledger-parser/ledger/index.ts";
+import { isDefined } from "@/common/type-guards/is-defined.ts";
 
 /**
  * Transaction class for lazy operation parsing
@@ -41,7 +42,7 @@ export class Transaction {
     txResult: xdr.TransactionResult,
     txMeta: xdr.TransactionMeta,
     txHash: Uint8Array,
-    index: number
+    index: number,
   ) {
     this.ledger = ledger;
     this.txEnvelope = txEnvelope;
@@ -54,13 +55,13 @@ export class Transaction {
   /**
    * Factory method to create a Transaction from transaction result metadata
    *
-   * Note: Only supports TransactionMeta v4 (Lightsail archive normalizes all to v4).
+   * Note: Only supports TransactionMeta v4.
    * Envelope is NOT available in v4 meta - use fromMetaWithEnvelope for LedgerCloseMeta v2.
    */
   static fromMeta(
     ledger: Ledger,
     txResultMeta: xdr.TransactionResultMeta,
-    index: number
+    index: number,
   ): Transaction {
     if (index < 0) {
       throw new INVALID_TRANSACTION_INDEX(index, ledger.sequence, -1);
@@ -82,15 +83,12 @@ export class Transaction {
 
   /**
    * Factory method for V2 where envelope comes from txSet separately
-   *
-   * In V2, envelopes are stored in txSet.phases, not in TransactionMeta.
-   * The Ledger class extracts them and passes them here.
    */
   static fromMetaWithEnvelope(
     ledger: Ledger,
     txResultMeta: xdr.TransactionResultMeta,
     envelope: xdr.TransactionEnvelope,
-    index: number
+    index: number,
   ): Transaction {
     if (index < 0) {
       throw new INVALID_TRANSACTION_INDEX(index, ledger.sequence, -1);
@@ -106,13 +104,9 @@ export class Transaction {
 
   /**
    * Check if transaction envelope is available
-   *
-   * Envelope availability:
-   * - LedgerCloseMeta v2: ✅ Available (from txSet)
-   * - LedgerCloseMeta v0/v1: ❌ Not available (TransactionMeta v4 doesn't include envelope)
    */
   get hasEnvelope(): boolean {
-    return this.txEnvelope !== undefined;
+    return isDefined(this.txEnvelope);
   }
 
   /**
@@ -134,7 +128,7 @@ export class Transaction {
   @memoize()
   get hash(): string {
     return Array.from(this.txHash, (b) => b.toString(16).padStart(2, "0")).join(
-      ""
+      "",
     );
   }
 
@@ -186,7 +180,7 @@ export class Transaction {
   get sourceAccount(): string {
     if (!this.txEnvelope) {
       throw new Error(
-        `Cannot get source account for transaction ${this.hash} - envelope not available`
+        `Cannot get source account for transaction ${this.hash} - envelope not available`,
       );
     }
 
@@ -235,7 +229,7 @@ export class Transaction {
   get sequence(): bigint {
     if (!this.txEnvelope) {
       throw new Error(
-        `Cannot get sequence for transaction ${this.hash} - envelope not available`
+        `Cannot get sequence for transaction ${this.hash} - envelope not available`,
       );
     }
 
@@ -267,7 +261,7 @@ export class Transaction {
   get operations(): Operation[] {
     if (!this.txEnvelope) {
       throw new Error(
-        `Cannot get operations for transaction ${this.hash} - envelope not available`
+        `Cannot get operations for transaction ${this.hash} - envelope not available`,
       );
     }
 

rpc-streamer/src/streamer.ts

@@ -352,7 +352,7 @@ export class RPCStreamer<T> {
           // Don't wait if we're about to stop
           if (
             shouldWait &&
-            (options.stopLedger === undefined ||
+            (!isDefined(options.stopLedger) ||
               currentLedger <= options.stopLedger)
           ) {
             await this.waitFor("ledger");

sep10/src/client/jwt.ts

@@ -6,6 +6,7 @@
  */
 
 import * as E from "@/client/error.ts";
+import { isDefined } from "@colibri/core";
 
 /**
  * Standard JWT claims
@@ -83,7 +84,7 @@ export class Sep10Jwt {
     if (parts.length !== 3) {
       throw new E.INVALID_JWT(
         token,
-        `JWT must have 3 parts, got ${parts.length}`
+        `JWT must have 3 parts, got ${parts.length}`,
       );
     }
 
@@ -130,7 +131,7 @@ export class Sep10Jwt {
    * When the token expires.
    */
   get expiresAt(): Date | undefined {
-    if (this._claims.exp === undefined) {
+    if (!isDefined(this._claims.exp)) {
       return undefined;
     }
     return new Date(this._claims.exp * 1000);
@@ -140,7 +141,7 @@ export class Sep10Jwt {
    * When the token was issued.
    */
   get issuedAt(): Date | undefined {
-    if (this._claims.iat === undefined) {
+    if (!isDefined(this._claims.iat)) {
       return undefined;
     }
     return new Date(this._claims.iat * 1000);