@powersync/service-core 1.20.5 → 1.22.0

package/src/sync/BucketChecksumState.ts

@@ -2,7 +2,7 @@ import {
   BucketParameterQuerier,
   BucketPriority,
   BucketSource,
-  HydratedSyncRules,
+  HydratedSyncConfig,
   mergeBuckets,
   QuerierError,
   RequestedStream,
@@ -21,13 +21,14 @@ import {
   ServiceError
 } from '@powersync/lib-services-framework';
 import { JwtPayload } from '../auth/JwtPayload.js';
+import { ParameterSetLimitExceededError } from '../storage/storage-index.js';
 import { SyncContext } from './SyncContext.js';
 import { getIntersection, hasIntersection } from './util.js';
 
 export interface BucketChecksumStateOptions {
   syncContext: SyncContext;
   bucketStorage: BucketChecksumStateStorage;
-  syncRules: HydratedSyncRules;
+  syncRules: HydratedSyncConfig;
   tokenPayload: JwtPayload;
   syncRequest: util.StreamingSyncRequest;
   logger?: Logger;
@@ -118,16 +119,38 @@ export class BucketChecksumState {
     const storage = this.bucketStorage;
 
     const update = await this.parameterState.getCheckpointUpdate(next);
-    const { buckets: allBuckets, updatedBuckets, parameterQueryResultsByDefinition } = update;
+    const { buckets: allBuckets, updatedBuckets, usedParameterResults } = update;
 
     /** Set of all buckets in this checkpoint. */
     const bucketDescriptionMap = new Map(allBuckets.map((b) => [b.bucket, b]));
 
     if (bucketDescriptionMap.size > this.context.maxBuckets) {
-      throw new ServiceError(
+      const error = new ServiceError(
         ErrorCode.PSYNC_S2305,
         `Too many buckets: ${bucketDescriptionMap.size} (limit of ${this.context.maxBuckets})`
       );
+
+      let errorMessage = error.message;
+      const logData: any = {
+        checkpoint: next.base.checkpoint,
+        user_id: this.parameterState.syncParams.userId,
+        buckets: allBuckets.length
+      };
+
+      // Count buckets per definition.
+      const bucketsByDefinition = new Map<string, number>();
+      for (const bucket of bucketDescriptionMap.values()) {
+        const definition = bucket.definition;
+        const count = bucketsByDefinition.get(definition) ?? 0;
+        bucketsByDefinition.set(definition, count + 1);
+      }
+
+      const breakdown = formatBucketDefinitionBreakdown(bucketsByDefinition);
+      errorMessage += breakdown.message;
+      logData.buckets_by_definition = breakdown.countsByDefinition;
+
+      this.logger.error(errorMessage, logData);
+      throw error;
     }
 
     let checksumMap: util.ChecksumMap;
@@ -211,13 +234,10 @@ export class BucketChecksumState {
       });
 
       deferredLog = () => {
-        const totalParamResults = computeTotalParamResults(parameterQueryResultsByDefinition);
         let message = `Updated checkpoint: ${base.checkpoint} | `;
         message += `write: ${writeCheckpoint} | `;
         message += `buckets: ${allBuckets.length} | `;
-        if (totalParamResults !== undefined) {
-          message += `param_results: ${totalParamResults} | `;
-        }
+        message += `param_results: ${usedParameterResults} | `;
         message += `updated: ${limitedBuckets(diff.updatedBuckets, 20)} | `;
         message += `removed: ${limitedBuckets(diff.removedBuckets, 20)}`;
         logCheckpoint(
@@ -230,7 +250,7 @@ export class BucketChecksumState {
             updated: diff.updatedBuckets.length,
             removed: diff.removedBuckets.length
           },
-          totalParamResults
+          usedParameterResults
         );
       };
 
@@ -244,12 +264,9 @@ export class BucketChecksumState {
       } satisfies util.StreamingSyncCheckpointDiff;
     } else {
       deferredLog = () => {
-        const totalParamResults = computeTotalParamResults(parameterQueryResultsByDefinition);
         let message = `New checkpoint: ${base.checkpoint} | write: ${writeCheckpoint} | `;
         message += `buckets: ${allBuckets.length}`;
-        if (totalParamResults !== undefined) {
-          message += ` | param_results: ${totalParamResults}`;
-        }
+        message += ` | param_results: ${usedParameterResults}`;
         message += ` ${limitedBuckets(allBuckets, 20)}`;
         logCheckpoint(
           this.logger,
@@ -259,7 +276,7 @@ export class BucketChecksumState {
             user_id: userIdForLogs,
             buckets: allBuckets.length
           },
-          totalParamResults
+          usedParameterResults
         );
       };
       bucketsToFetch = allBuckets;
@@ -268,7 +285,7 @@ export class BucketChecksumState {
       const streamNameToIndex = new Map<string, number>();
       this.streamNameToIndex = streamNameToIndex;
 
-      for (const source of this.parameterState.syncRules.definition.bucketSources) {
+      for (const source of this.parameterState.syncRules.bucketSourceDefinitions) {
         if (this.parameterState.isSubscribedToStream(source)) {
           streamNameToIndex.set(source.name, subscriptions.length);
 
@@ -392,17 +409,14 @@ export interface CheckpointUpdate {
    */
   updatedBuckets: Set<string> | typeof INVALIDATE_ALL_BUCKETS;
 
-  /**
-   * Number of parameter query results per sync stream definition (before deduplication).
-   * Map from definition name to count.
-   */
-  parameterQueryResultsByDefinition?: Map<string, number>;
+  /** The amount of rows fetched from parameters indexes. */
+  usedParameterResults: number;
 }
 
 export class BucketParameterState {
   private readonly context: SyncContext;
   public readonly bucketStorage: BucketChecksumStateStorage;
-  public readonly syncRules: HydratedSyncRules;
+  public readonly syncRules: HydratedSyncConfig;
   public readonly syncParams: RequestParameters;
   private readonly querier: BucketParameterQuerier;
   /**
@@ -425,7 +439,7 @@ export class BucketParameterState {
   constructor(
     context: SyncContext,
     bucketStorage: BucketChecksumStateStorage,
-    syncRules: HydratedSyncRules,
+    syncRules: HydratedSyncConfig,
     tokenPayload: JwtPayload,
     request: util.StreamingSyncRequest,
     logger: Logger
@@ -502,36 +516,41 @@ export class BucketParameterState {
     const querier = this.querier;
     let update: CheckpointUpdate;
     if (querier.hasDynamicBuckets) {
-      update = await this.getCheckpointUpdateDynamic(checkpoint);
-    } else {
-      update = await this.getCheckpointUpdateStatic(checkpoint);
-    }
-
-    if (update.buckets.length > this.context.maxParameterQueryResults) {
-      // TODO: Limit number of results even before we get to this point
-      // This limit applies _before_ we get the unique set
-      const error = new ServiceError(
-        ErrorCode.PSYNC_S2305,
-        `Too many parameter query results: ${update.buckets.length} (limit of ${this.context.maxParameterQueryResults})`
-      );
+      try {
+        update = await this.getCheckpointUpdateDynamic(checkpoint);
+      } catch (e: unknown) {
+        if (e instanceof ParameterSetLimitExceededError) {
+          // Too many parameter results, create a breakdown of which streams are responsible for the most queries and
+          // then abort.
+          const error = new ServiceError(
+            ErrorCode.PSYNC_S2305,
+            `Too many parameter query results (limit of ${this.context.maxParameterQueryResults})`
+          );
+
+          let errorMessage = error.message;
+          const logData: any = {
+            checkpoint: checkpoint.base.checkpoint,
+            user_id: this.syncParams.userId
+          };
+
+          if (e.breakdown) {
+            const breakdown = formatParameterQueryBreakdown(e.breakdown);
+            if (breakdown) {
+              errorMessage += breakdown.message;
+              logData.parameterResults = breakdown.largestResults;
+            }
+          }
 
-      let errorMessage = error.message;
-      const logData: any = {
-        checkpoint: checkpoint.base.checkpoint,
-        user_id: this.syncParams.userId,
-        parameter_query_results: update.buckets.length
-      };
+          this.logger.error(errorMessage, logData);
+          throw error;
+        }
 
-      if (update.parameterQueryResultsByDefinition && update.parameterQueryResultsByDefinition.size > 0) {
-        const breakdown = formatParameterQueryBreakdown(update.parameterQueryResultsByDefinition);
-        errorMessage += breakdown.message;
-        logData.parameter_query_results_by_definition = breakdown.countsByDefinition;
+        throw e;
       }
-
-      this.logger.error(errorMessage, logData);
-
-      throw error;
+    } else {
+      update = await this.getCheckpointUpdateStatic(checkpoint);
     }
+
     return update;
   }
 
@@ -545,14 +564,16 @@ export class BucketParameterState {
     if (update.invalidateDataBuckets) {
       return {
         buckets: staticBuckets,
-        updatedBuckets: INVALIDATE_ALL_BUCKETS
+        updatedBuckets: INVALIDATE_ALL_BUCKETS,
+        usedParameterResults: 0
       };
     }
 
     const updatedBuckets = new Set<string>(getIntersection(this.staticBuckets, update.updatedDataBuckets));
     return {
       buckets: staticBuckets,
-      updatedBuckets
+      updatedBuckets,
+      usedParameterResults: 0
     };
   }
 
@@ -584,27 +605,55 @@ export class BucketParameterState {
     }
 
     let dynamicBuckets: ResolvedBucket[];
-    let parameterQueryResultsByDefinition: Map<string, number> | undefined;
+    let usedParameterResults = 0;
     if (hasParameterChange || this.cachedDynamicBuckets == null || this.cachedDynamicBucketSet == null) {
       const recordedLookups = new Set<string>();
+      const parameterLimit = this.context.maxParameterQueryResults;
+      let remainingBudget = parameterLimit;
+
+      // Log of lookups to provide a breakdown if we exceed the dynamic lookup limit.
+      // FIXME: This is horrible, Sync Streams will invoke the callback concurrently and we can't properly deal with
+      // that. We should replace queriers for Sync Streams with an explicit graph structure based on sync plans instead
+      // of adding these checks to the imperative querier interface.
+      const lookupLog: storage.ParameterQueryInvocationLog[] = [];
 
       dynamicBuckets = await querier.queryDynamicBucketDescriptions({
-        getParameterSets(lookups) {
+        getParameterSets: async (lookups, definition) => {
+          if (lookups.length > parameterLimit) {
+            // Sync Streams can chain parameter lookups, so a large output from an earlier call may become the input
+            // here. We reuse the output limit as a generous upper bound; legitimate queries are much smaller.
+            const msg = `Attempted to fetch ${lookups.length} lookups at once, a maximum of ${parameterLimit} lookups are allowed.`;
+            this.logger.error(msg, {
+              user_id: this.syncParams.userId,
+              checkpoint: checkpoint.base.checkpoint,
+              cause: definition
+            });
+            throw new ServiceError(ErrorCode.PSYNC_S2305, msg);
+          }
+
           for (const lookup of lookups) {
             recordedLookups.add(lookup.serializedRepresentation);
           }
 
-          return checkpoint.base.getParameterSets(lookups);
+          try {
+            const results = await checkpoint.base.getParameterSets(lookups, remainingBudget);
+            const numRows = results.reduce((a, b) => a + b.rows.length, 0);
+
+            lookupLog.push({ definition, resultsOrLimit: numRows, didExceedLimit: false });
+            remainingBudget -= numRows;
+            usedParameterResults += numRows;
+            return results;
+          } catch (e: unknown) {
+            if (e instanceof ParameterSetLimitExceededError) {
+              lookupLog.push({ definition, resultsOrLimit: remainingBudget, didExceedLimit: true });
+              throw new ParameterSetLimitExceededError(parameterLimit, lookupLog);
+            }
+
+            throw e;
+          }
         }
       });
 
-      // Count parameter query results per definition (before deduplication)
-      parameterQueryResultsByDefinition = new Map<string, number>();
-      for (const bucket of dynamicBuckets) {
-        const count = parameterQueryResultsByDefinition.get(bucket.definition) ?? 0;
-        parameterQueryResultsByDefinition.set(bucket.definition, count + 1);
-      }
-
       this.cachedDynamicBuckets = dynamicBuckets;
       this.cachedDynamicBucketSet = new Set<string>(dynamicBuckets.map((b) => b.bucket));
       this.lookupsFromPreviousCheckpoint = recordedLookups;
@@ -628,13 +677,13 @@ export class BucketParameterState {
         buckets: allBuckets,
         // We cannot track individual bucket updates for dynamic lookups yet
         updatedBuckets: INVALIDATE_ALL_BUCKETS,
-        parameterQueryResultsByDefinition
+        usedParameterResults
       };
     } else {
       return {
         buckets: allBuckets,
         updatedBuckets: updatedBuckets,
-        parameterQueryResultsByDefinition
+        usedParameterResults
       };
     }
   }
@@ -668,18 +717,6 @@ export interface CheckpointLine {
 // Use a more specific type to simplify testing
 export type BucketChecksumStateStorage = Pick<storage.SyncRulesBucketStorage, 'getChecksums'>;
 
-/**
- * Compute the total number of parameter query results across all definitions.
- */
-function computeTotalParamResults(
-  parameterQueryResultsByDefinition: Map<string, number> | undefined
-): number | undefined {
-  if (!parameterQueryResultsByDefinition) {
-    return undefined;
-  }
-  return Array.from(parameterQueryResultsByDefinition.values()).reduce((sum, count) => sum + count, 0);
-}
-
 /**
  * Log a checkpoint message, enriching it with parameter query result counts if available.
  *
@@ -701,20 +738,20 @@ function logCheckpoint(
 }
 
 /**
- * Format a breakdown of parameter query results by sync rule definition.
+ * Format a breakdown of dynamic bucket by sync stream definition.
  *
  * Sorts definitions by count (descending), includes the top 10, and returns both the
  * formatted message string and the counts record suitable for structured log data.
  */
-function formatParameterQueryBreakdown(parameterQueryResultsByDefinition: Map<string, number>): {
+function formatBucketDefinitionBreakdown(bucketsByDefinition: Map<string, number>): {
   message: string;
   countsByDefinition: Record<string, number>;
 } {
   // Sort definitions by count (descending) and take top 10
-  const allSorted = Array.from(parameterQueryResultsByDefinition.entries()).sort((a, b) => b[1] - a[1]);
+  const allSorted = Array.from(bucketsByDefinition.entries()).sort((a, b) => b[1] - a[1]);
   const sortedDefinitions = allSorted.slice(0, 10);
 
-  let message = '\nParameter query results by definition:';
+  let message = '\Buckets by definition:';
   const countsByDefinition: Record<string, number> = {};
   for (const [definition, count] of sortedDefinitions) {
     message += `\n  ${definition}: ${count}`;
@@ -730,6 +767,33 @@ function formatParameterQueryBreakdown(parameterQueryResultsByDefinition: Map<st
   return { message, countsByDefinition };
 }
 
+function formatParameterQueryBreakdown(log: storage.ParameterQueryInvocationLog[]) {
+  if (log.length == 0) {
+    return;
+  }
+
+  // When an exception about too many parameter results is thrown, the last entry is the one that finally exceeded the
+  // limit.
+  const results = Array.from(log);
+  const failure = results.pop()!;
+
+  let message = '\nInvoked parameter queries by definition:';
+  results.sort((a, b) => b.resultsOrLimit - a.resultsOrLimit);
+  const largestResults = results.splice(0, 9);
+
+  for (const entry of largestResults) {
+    message += `\n  ${entry.definition}: ${entry.resultsOrLimit} results.`;
+  }
+
+  if (largestResults.length < log.length) {
+    message += `\n ... and ${log.length - largestResults.length} more invocations`;
+  }
+
+  message += `\n ${failure.definition} exceeded the remaining limit of ${failure.resultsOrLimit} available results.`;
+  largestResults.push(failure);
+  return { message, largestResults };
+}
+
 function limitedBuckets(buckets: string[] | { bucket: string }[], limit: number) {
   buckets = buckets.map((b) => {
     if (typeof b != 'string') {

package/src/sync/sync.ts

@@ -1,5 +1,5 @@
 import { JSONBig, JsonContainer } from '@powersync/service-jsonbig';
-import { BucketPriority, HydratedSyncRules, ResolvedBucket, SqliteJsonValue } from '@powersync/service-sync-rules';
+import { BucketPriority, HydratedSyncConfig, ResolvedBucket, SqliteJsonValue } from '@powersync/service-sync-rules';
 
 import { AbortError } from 'ix/aborterror.js';
 
@@ -17,7 +17,7 @@ import { TokenStreamOptions, acquireSemaphoreAbortable, settledPromise, tokenStr
 export interface SyncStreamParameters {
   syncContext: SyncContext;
   bucketStorage: storage.SyncRulesBucketStorage;
-  syncRules: HydratedSyncRules;
+  syncRules: HydratedSyncConfig;
   params: util.StreamingSyncRequest;
   token: auth.JwtPayload;
   logger?: Logger;
@@ -94,7 +94,7 @@ export async function* streamResponse(
 async function* streamResponseInner(
   syncContext: SyncContext,
   bucketStorage: storage.SyncRulesBucketStorage,
-  syncRules: HydratedSyncRules,
+  syncRules: HydratedSyncConfig,
   params: util.StreamingSyncRequest,
   tokenPayload: auth.JwtPayload,
   tracker: RequestTracker,
@@ -267,7 +267,7 @@ interface BucketDataRequest {
    * This signal also fires when abort_connection fires.
    */
   abort_batch: AbortSignal;
-  /** User id for debug purposes, not for sync rules. */
+  /** User id for debug purposes, not for sync config. */
   userIdForLogs?: SqliteJsonValue;
   forPriority: BucketPriority | null;
   onRowsSent: (stats: OperationsSentStats) => void;

package/src/tracing/PerformanceTracer.ts

@@ -0,0 +1,149 @@
+import { traceWriter } from './TraceWriter.js';
+
+export interface Span extends Disposable {
+  name: string;
+  /**
+   * Start time in microseconds since an arbitrary epoch.
+   */
+  startAt: number;
+  /**
+   * End time in microseconds since an arbitrary epoch.
+   */
+  endAt: number;
+  /**
+   * Time spent not in nested spans.
+   */
+  selfDuration: number;
+
+  nestedSince: number | undefined;
+  subtrackFromSelf: number;
+
+  /**
+   * Durations spent in nested spans, in microseconds.
+   */
+  nestedDurations: Record<string, number>;
+
+  /**
+   * Total duration of this span in milliseconds, rounded up. Only valid after the span has ended.
+   */
+  durationMillis: number;
+
+  /**
+   * End the span - same as [Symbol.dispose]().
+   *
+   * Safe to call multiple times. Any nested spans will automatically end as well.
+   *
+   * Returns an aggregate record of category -> "selfDuration", in microseconds.
+   */
+  end(): Record<string, number>;
+}
+
+function now() {
+  return Number(process.hrtime.bigint() / 1000n);
+}
+
+let nextThreadId = 1;
+
+/**
+ * Lightweight tracing helper, with two main goals:
+ * 1. Generate aggregate timing info with low overhead.
+ * 2. Optional support for generating trace files during development.
+ *
+ * This is only intended for a single "thread" - concurrent operations on the same instance have undefined behavior.
+ * To trace concurrent operations, use separate instances of PerformanceTracer.
+ *
+ * Spans cannot be overlapping: If a parent span is ended, all nested spans are automatically ended.
+ */
+export class PerformanceTracer<K extends string> {
+  stack: Span[] = [];
+  threadId: number;
+
+  constructor(traceName: string) {
+    this.threadId = nextThreadId;
+    nextThreadId += 1;
+    traceWriter?.write({
+      ph: 'M',
+      cat: '__metadata',
+      name: 'thread_name',
+      pid: process.pid,
+      tid: this.threadId,
+      args: { name: `PowerSync ${traceName}` }
+    });
+  }
+
+  /**
+   * Recommended usage:
+   *
+   *   using _ = tracer.span('cat', 'details');
+   *
+   * The above automatically ends the span when it goes out of scope. Alternatively, call
+   * .end() on the span to end it earlier.
+   *
+   * @param category one of the defined categories
+   * @param subcat optional subcategory. Not used for calculating "self" durations in the aggregate API.
+   */
+  span(category: K, subcat?: string): Span {
+    const stack = this.stack;
+    const index = this.stack.length;
+    const parent = this.stack[this.stack.length - 1];
+    const threadId = this.threadId;
+    const startAt = now();
+    if (parent != null) {
+      parent.nestedSince ??= startAt;
+    }
+    let name: string = category;
+    if (subcat) {
+      name += ':' + subcat;
+    }
+    const s: Span = {
+      name,
+      startAt: now(),
+      selfDuration: 0,
+      endAt: 0,
+      nestedSince: undefined,
+      subtrackFromSelf: 0,
+      nestedDurations: {},
+      end() {
+        if (this.endAt != 0) {
+          return this.nestedDurations;
+        }
+        while (stack.length - 1 > index) {
+          stack[stack.length - 1].end();
+        }
+        const endAt = now();
+        this.endAt = endAt;
+        const endTime = this.nestedSince ?? endAt;
+        this.selfDuration = endTime - startAt - this.subtrackFromSelf;
+        traceWriter?.write({
+          name,
+          cat: 'powersync',
+          ph: 'X',
+          ts: this.startAt,
+          dur: endAt - startAt,
+          pid: process.pid,
+          tid: threadId
+        });
+        stack.pop();
+        if (parent != null) {
+          parent.subtrackFromSelf += endAt - parent.nestedSince!;
+          for (let key in this.nestedDurations) {
+            parent.nestedDurations[key] = (parent.nestedDurations[key] ?? 0) + this.nestedDurations[key];
+          }
+          parent.nestedDurations[category] = (parent.nestedDurations[category] ?? 0) + this.selfDuration;
+          parent.nestedSince = undefined;
+        }
+        return this.nestedDurations;
+      },
+
+      get durationMillis() {
+        return Math.ceil((this.endAt - this.startAt) / 1000);
+      },
+      [Symbol.dispose]() {
+        this.end();
+      }
+    };
+    this.stack.push(s);
+
+    return s;
+  }
+}

package/src/tracing/TraceWriter.ts

@@ -0,0 +1,67 @@
+import { Mutex } from 'async-mutex';
+import * as fs from 'node:fs/promises';
+
+/**
+ * Write traces in the Chrome JSON Trace Format.
+ *
+ * View at https://ui.perfetto.dev/
+ */
+class TraceWriter {
+  handle: fs.FileHandle | null = null;
+  length = 0;
+  queue: any[] = [];
+  private mutex = new Mutex();
+
+  constructor(public readonly path: string) {
+    this.open().catch((e) => {
+      console.error(`Failed to open trace file at ${path}`, e);
+    });
+  }
+
+  async open() {
+    await this.mutex.runExclusive(async () => {
+      this.handle = await fs.open(this.path, 'w+');
+      this.handle.truncate(0);
+      await this.handle.write('[]');
+      this.length = 2;
+    });
+  }
+
+  write(...traceEvents: any[]) {
+    this.writeAsync(...traceEvents).catch((e) => {
+      console.error(`Failed to write trace file`, e);
+    });
+  }
+
+  async writeAsync(...traceEvents: any[]) {
+    this.queue.push(...traceEvents);
+    await this.mutex.runExclusive(async () => {
+      if (this.queue.length > 0) {
+        // Write queued events.
+        // After each write, we end the file as a valid JSON array.
+        // On the next write, we overwrite the last character to extend the array.
+        const buffer = Buffer.from(JSON.stringify(this.queue));
+        await this.handle?.write(buffer, 1, buffer.length - 1, this.length - 1);
+        this.queue = [];
+        this.length += buffer.length - 2;
+      }
+    });
+  }
+}
+
+const traceFile = process.env.POWERSYNC_TRACE_FILE;
+/**
+ * traceWriter, only present if POWERSYNC_TRACE_FILE env var is configured.
+ */
+export const traceWriter = traceFile ? new TraceWriter(traceFile) : null;
+
+if (traceWriter) {
+  traceWriter.write({
+    ph: 'M',
+    cat: '__metadata',
+    name: 'process_name',
+    pid: process.pid,
+    tid: 1000,
+    args: { name: 'powersync' }
+  });
+}

package/src/util/checkpointing.ts

@@ -13,7 +13,7 @@ export async function createWriteCheckpoint(options: CreateWriteCheckpointOption
 
   const syncBucketStorage = await options.storage.getActiveStorage();
   if (!syncBucketStorage) {
-    throw new ServiceError(ErrorCode.PSYNC_S2302, `Cannot create Write Checkpoint since no sync rules are active.`);
+    throw new ServiceError(ErrorCode.PSYNC_S2302, `Cannot create Write Checkpoint since no sync config is active.`);
   }
 
   const { writeCheckpoint, currentCheckpoint } = await options.api.createReplicationHead(async (currentCheckpoint) => {

package/src/util/config/compound-config-collector.ts

@@ -26,7 +26,7 @@ export type CompoundConfigCollectorOptions = {
    */
   configCollectors: ConfigCollector[];
   /**
-   * Collectors for PowerSync sync rules content.
+   * Collectors for PowerSync sync config content.
    * The configuration from first collector to provide a configuration
    * is used. The order of the collectors specifies precedence
    */
@@ -236,11 +236,11 @@ export class CompoundConfigCollector {
           return config;
         }
         logger.debug(
-          `Could not collect sync rules with ${collector.name} method. Moving on to next method if available.`
+          `Could not collect sync config with ${collector.name} method. Moving on to next method if available.`
         );
       } catch (ex) {
         // An error in a collector is a hard stop
-        throw new Error(`Could not collect sync rules using ${collector.name} method. Caught exception: ${ex}`);
+        throw new Error(`Could not collect sync config using ${collector.name} method. Caught exception: ${ex}`);
       }
     }
     return {

package/src/util/config/sync-rules/impl/filesystem-sync-rules-collector.ts

@@ -16,7 +16,7 @@ export class FileSystemSyncRulesCollector extends SyncRulesCollector {
 
     const { config_path } = runnerConfig;
 
-    // Depending on the container, the sync rules may not actually be present.
+    // Depending on the container, the sync config may not actually be present.
     // Only persist the path here, and load on demand using `loadSyncRules()`.
     return {
       present: true,