@powersync/service-core 1.18.2 → 1.19.1

package/dist/util/config.js

@@ -1,12 +1,25 @@
 import * as fs from 'fs/promises';
-import { container } from '@powersync/lib-services-framework';
+import winston from 'winston';
+import { container, logger, LogFormat, DEFAULT_LOG_LEVEL, DEFAULT_LOG_FORMAT } from '@powersync/lib-services-framework';
 import { CompoundConfigCollector } from './util-index.js';
+export function configureLogger(config) {
+    const level = process.env.PS_LOG_LEVEL ?? config?.level ?? DEFAULT_LOG_LEVEL;
+    const format = process.env.PS_LOG_FORMAT ?? config?.format ?? DEFAULT_LOG_FORMAT;
+    const winstonFormat = format === 'json' ? LogFormat.production : LogFormat.development;
+    // We want the user to always be aware that a log level was configured (they might forget they set it in the config and wonder why they aren't seeing logs)
+    // We log this using the configured format, but before we configure the level.
+    logger.configure({ level: DEFAULT_LOG_LEVEL, format: winstonFormat, transports: [new winston.transports.Console()] });
+    logger.info(`Configured logger with level "${level}" and format "${format}"`);
+    logger.configure({ level, format: winstonFormat, transports: [new winston.transports.Console()] });
+}
 /**
  * Loads the resolved config using the registered config collector
  */
 export async function loadConfig(runnerConfig) {
     const collector = container.getImplementation(CompoundConfigCollector);
-    return collector.collectConfig(runnerConfig);
+    const config = await collector.collectConfig(runnerConfig);
+    configureLogger(config.base_config.system?.logging);
+    return config;
 }
 export async function loadSyncRules(config) {
     const sync_rules = config.sync_rules;

package/dist/util/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/util/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,YAA0B;IACzD,MAAM,SAAS,GAAG,SAAS,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;IACvE,OAAO,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAA+B;IACjE,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACrC,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,OAAO,UAAU,CAAC,OAAO,CAAC;IAC5B,CAAC;SAAM,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;QAC3B,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;AACH,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/util/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAGxH,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D,MAAM,UAAU,eAAe,CAAC,MAAiC;IAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,MAAM,EAAE,KAAK,IAAI,iBAAiB,CAAC;IAC7E,MAAM,MAAM,GACT,OAAO,CAAC,GAAG,CAAC,aAAoD,IAAI,MAAM,EAAE,MAAM,IAAI,kBAAkB,CAAC;IAC5G,MAAM,aAAa,GAAG,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC;IAEvF,2JAA2J;IAC3J,8EAA8E;IAC9E,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;IACtH,MAAM,CAAC,IAAI,CAAC,iCAAiC,KAAK,iBAAiB,MAAM,GAAG,CAAC,CAAC;IAE9E,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;AACrG,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,YAA0B;IACzD,MAAM,SAAS,GAAG,SAAS,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IAC3D,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAA+B;IACjE,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACrC,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,OAAO,UAAU,CAAC,OAAO,CAAC;IAC5B,CAAC;SAAM,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;QAC3B,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;AACH,CAAC"}

package/package.json

@@ -5,7 +5,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.2",
+  "version": "1.19.1",
   "main": "dist/index.js",
   "license": "FSL-1.1-ALv2",
   "type": "module",
@@ -33,11 +33,11 @@
     "uuid": "^11.1.0",
     "winston": "^3.13.0",
     "yaml": "^2.3.2",
-    "@powersync/lib-services-framework": "0.7.14",
+    "@powersync/lib-services-framework": "0.8.1",
     "@powersync/service-jsonbig": "0.17.12",
-    "@powersync/service-rsocket-router": "0.2.11",
-    "@powersync/service-sync-rules": "0.29.10",
-    "@powersync/service-types": "0.13.3"
+    "@powersync/service-rsocket-router": "0.2.13",
+    "@powersync/service-sync-rules": "0.31.0",
+    "@powersync/service-types": "0.14.0"
   },
   "devDependencies": {
     "@types/async": "^3.2.24",

package/src/api/RouteAPI.ts

@@ -1,4 +1,4 @@
-import { SqlSyncRules, TablePattern } from '@powersync/service-sync-rules';
+import { SyncConfig, TablePattern } from '@powersync/service-sync-rules';
 import * as types from '@powersync/service-types';
 import { ParseSyncRulesOptions, SyncRulesBucketStorage } from '../storage/storage-index.js';
 
@@ -41,7 +41,7 @@ export interface RouteAPI {
    *           tables to ensure syncing should function according to the input
    *           pattern. Debug errors and warnings are reported per table.
    */
-  getDebugTablesInfo(tablePatterns: TablePattern[], sqlSyncRules: SqlSyncRules): Promise<PatternResult[]>;
+  getDebugTablesInfo(tablePatterns: TablePattern[], sqlSyncRules: SyncConfig): Promise<PatternResult[]>;
 
   /**
    * @returns The replication lag: that is the amount of data which has not been

package/src/api/diagnostics.ts

@@ -1,5 +1,5 @@
 import { logger } from '@powersync/lib-services-framework';
-import { DEFAULT_TAG, SourceTableInterface, SqlSyncRules } from '@powersync/service-sync-rules';
+import { DEFAULT_TAG, SourceTableInterface, SqlSyncRules, SyncConfigWithErrors } from '@powersync/service-sync-rules';
 import { ReplicationError, SyncRulesStatus, TableInfo } from '@powersync/service-types';
 
 import * as storage from '../storage/storage-index.js';
@@ -41,11 +41,11 @@ export async function getSyncRulesStatus(
   const check_connection = options.check_connection ?? false;
   const now = new Date().toISOString();
 
-  let rules: SqlSyncRules;
+  let parsed: SyncConfigWithErrors;
   let persisted: storage.PersistedSyncRules;
   try {
     persisted = sync_rules.parsed(apiHandler.getParseSyncRulesOptions());
-    rules = persisted.sync_rules;
+    parsed = persisted.sync_rules;
   } catch (e) {
     return {
       content: include_content ? sync_rules.sync_rules_content : undefined,
@@ -54,6 +54,7 @@ export async function getSyncRulesStatus(
     };
   }
 
+  const { config: rules, errors: syncRuleErrors } = parsed;
   const sourceConfig = await apiHandler.getSourceConfig();
   // This method can run under some situations if no connection is configured yet.
   // It will return a default tag in such a case. This default tag is not module specific.
@@ -131,7 +132,7 @@ export async function getSyncRulesStatus(
     });
   }
   errors.push(
-    ...rules.errors.map((e) => {
+    ...syncRuleErrors.map((e) => {
       return {
         level: e.type,
         message: e.message,

package/src/auth/JwtPayload.ts

@@ -1,15 +1,23 @@
+import { BaseJwtPayload } from '@powersync/service-sync-rules';
+
 /**
  * Payload from a JWT, always signed.
- *
- * May have arbitrary additional parameters.
  */
-export interface JwtPayload {
+export class JwtPayload extends BaseJwtPayload {
   /**
-   * token_parameters.user_id
+   * Stringified version of sub. Used where we need a string user identifier, such as in write checkpoints
+   * and per-user metrics.
    */
-  sub: string;
+  public readonly userIdString: string;
+
+  constructor(parsedPayload: Record<string, any>) {
+    super(parsedPayload);
+
+    this.userIdString = this.userIdJson?.toString() ?? 'null';
+  }
 
-  iss?: string | undefined;
-  exp: number;
-  iat: number;
+  get exp(): number {
+    // Verified to be a number when parsing the token.
+    return this.parsedPayload.exp;
+  }
 }

package/src/auth/KeyStore.ts

@@ -122,7 +122,7 @@ export class KeyStore<Collector extends KeyCollector = KeyCollector> {
       throw new AuthorizationError(ErrorCode.PSYNC_S2101, `Payload parameters must be an object`);
     }
 
-    return tokenPayload as JwtPayload;
+    return new JwtPayload(tokenPayload);
   }
 
   private async verifyInternal(token: string, options: jose.JWTVerifyOptions) {

package/src/metrics/open-telemetry/util.ts

@@ -51,7 +51,7 @@ export function createOpenTelemetryMetricsFactory(context: ServiceContext): Metr
         const instanceId = await bucketStorage.getPowerSyncInstanceId();
         resolvedInstanceId(instanceId);
       } catch (err) {
-        resolvedInstanceId('Unknown');
+        resolvedInstanceId('unknown');
       }
     }
   });
@@ -59,6 +59,8 @@ export function createOpenTelemetryMetricsFactory(context: ServiceContext): Metr
   const resource = resourceFromAttributes({
     ['service']: 'PowerSync',
     ['service.version']: pkg.version,
+    ['source_type']: configuration.connections?.[0]?.type ?? 'unknown',
+    ['storage_type']: configuration.storage.type ?? 'unknown',
     ['instance_id']: instanceIdPromise
   });
 

package/src/replication/AbstractReplicator.ts

@@ -1,4 +1,4 @@
-import { container, logger } from '@powersync/lib-services-framework';
+import { container, ErrorCode, logger } from '@powersync/lib-services-framework';
 import { ReplicationMetric } from '@powersync/service-types';
 import { hrtime } from 'node:process';
 import winston from 'winston';
@@ -36,7 +36,7 @@ export interface AbstractReplicatorOptions {
  */
 export abstract class AbstractReplicator<T extends AbstractReplicationJob = AbstractReplicationJob> {
   protected logger: winston.Logger;
-
+  private lockAlerted: boolean = false;
   /**
    *  Map of replication jobs by sync rule id. Usually there is only one running job, but there could be two when
    *  transitioning to a new set of sync rules.
@@ -225,12 +225,20 @@ export abstract class AbstractReplicator<T extends AbstractReplicationJob = Abst
           if (syncRules.active) {
             activeJob = newJob;
           }
+          this.lockAlerted = false;
         } catch (e) {
-          // Could be a sync rules parse error,
-          // for example from stricter validation that was added.
-          // This will be retried every couple of seconds.
-          // When new (valid) sync rules are deployed and processed, this one be disabled.
-          this.logger.error('Failed to start replication for new sync rules', e);
+          if (e?.errorData?.code === ErrorCode.PSYNC_S1003) {
+            if (!this.lockAlerted) {
+              this.logger.info(`[${e.errorData.code}] ${e.errorData.description}`);
+              this.lockAlerted = true;
+            }
+          } else {
+            // Could be a sync rules parse error,
+            // for example from stricter validation that was added.
+            // This will be retried every couple of seconds.
+            // When new (valid) sync rules are deployed and processed, this one be disabled.
+            this.logger.error('Failed to start replication for new sync rules', e);
+          }
         }
       }
     }

package/src/routes/auth.ts

@@ -47,17 +47,15 @@ export async function authorizeUser(context: Context, authHeader: string = ''):
 export async function generateContext(serviceContext: ServiceContext, token: string) {
   const { configuration } = serviceContext;
 
-  let tokenPayload: auth.JwtPayload;
   try {
     const maxAge = configuration.token_max_expiration;
-    tokenPayload = await configuration.client_keystore.verifyJwt(token, {
+    const parsedToken = await configuration.client_keystore.verifyJwt(token, {
       defaultAudiences: configuration.jwt_audiences,
       maxAge: maxAge
     });
     return {
       context: {
-        user_id: tokenPayload.sub,
-        token_payload: tokenPayload
+        token_payload: parsedToken
       }
     };
   } catch (err) {

package/src/routes/configure-fastify.ts

@@ -61,7 +61,7 @@ export function configureFastifyServer(server: fastify.FastifyInstance, options:
 
   const generateContext: ContextProvider = async (request, options) => {
     return {
-      user_id: undefined,
+      user_id_string: undefined,
       service_context: service_context,
       logger: options.logger
     };

package/src/routes/endpoints/admin.ts

@@ -7,6 +7,9 @@ import * as storage from '../../storage/storage-index.js';
 import { authApi } from '../auth.js';
 import { routeDefinition } from '../router.js';
 
+/**
+ * @deprecated This will be removed in a future release
+ */
 export const executeSql = routeDefinition({
   path: '/api/admin/v1/execute-sql',
   method: router.HTTPMethod.POST,
@@ -128,7 +131,7 @@ export const reprocess = routeDefinition({
     }
 
     const new_rules = await activeBucketStorage.updateSyncRules({
-      content: active.sync_rules.content,
+      content: active.sync_rules.config.content,
       // These sync rules already passed validation. But if the rules are not valid anymore due
       // to a service change, we do want to report the error here.
       validate: true
@@ -177,7 +180,10 @@ export const validate = routeDefinition({
           sync_rules: SqlSyncRules.fromYaml(content, {
             ...apiHandler.getParseSyncRulesOptions(),
             schema
-          })
+          }),
+          hydratedSyncRules() {
+            return this.sync_rules.config.hydrate();
+          }
         };
       },
       sync_rules_content: content,

package/src/routes/endpoints/checkpointing.ts

@@ -52,18 +52,20 @@ export const writeCheckpoint2 = routeDefinition({
   authorize: authUser,
   validator: schema.createTsCodecValidator(WriteCheckpointRequest, { allowAdditional: true }),
   handler: async (payload) => {
-    const { user_id, service_context } = payload.context;
+    const { token_payload, service_context } = payload.context;
 
     const apiHandler = service_context.routerEngine.getAPI();
 
     const { replicationHead, writeCheckpoint } = await util.createWriteCheckpoint({
-      userId: user_id,
+      userId: token_payload!.userIdString,
       clientId: payload.params.client_id,
       api: apiHandler,
       storage: service_context.storageEngine.activeBucketStorage
     });
 
-    logger.info(`Write checkpoint for ${user_id}/${payload.params.client_id}: ${writeCheckpoint} | ${replicationHead}`);
+    logger.info(
+      `Write checkpoint for ${token_payload!.userIdString}/${payload.params.client_id}: ${writeCheckpoint} | ${replicationHead}`
+    );
 
     return {
       write_checkpoint: String(writeCheckpoint)

package/src/routes/endpoints/socket-route.ts

@@ -18,14 +18,14 @@ export const syncStreamReactive: SocketRouteGenerator = (router) =>
 
       logger.defaultMeta = {
         ...logger.defaultMeta,
-        user_id: context.token_payload?.sub,
+        user_id: context.token_payload!.userIdJson,
         client_id: params.client_id,
         user_agent: context.user_agent
       };
 
       const sdkData: event_types.ConnectedUserData & event_types.ClientConnectionEventData = {
         client_id: params.client_id ?? '',
-        user_id: context.user_id!,
+        user_id: context.token_payload!.userIdString,
         user_agent: context.user_agent,
         // At this point the token_payload is guaranteed to be present
         jwt_exp: new Date(context.token_payload!.exp * 1000),
@@ -109,10 +109,7 @@ export const syncStreamReactive: SocketRouteGenerator = (router) =>
         for await (const data of sync.streamResponse({
           syncContext: syncContext,
           bucketStorage: bucketStorage,
-          syncRules: {
-            syncRules,
-            version: bucketStorage.group_id
-          },
+          syncRules,
           params: {
             ...params
           },

package/src/routes/endpoints/sync-rules.ts

@@ -169,7 +169,7 @@ export const reprocessSyncRules = routeDefinition({
     }
 
     const new_rules = await activeBucketStorage.updateSyncRules({
-      content: sync_rules.sync_rules.content,
+      content: sync_rules.sync_rules.config.content,
       // These sync rules already passed validation. But if the rules are not valid anymore due
       // to a service change, we do want to report the error here.
       validate: true
@@ -197,14 +197,14 @@ async function debugSyncRules(apiHandler: RouteAPI, sync_rules: string) {
       // No schema-based validation at this point
       schema: undefined
     });
-    const source_table_patterns = rules.getSourceTables();
-    const resolved_tables = await apiHandler.getDebugTablesInfo(source_table_patterns, rules);
+    const source_table_patterns = rules.config.getSourceTables();
+    const resolved_tables = await apiHandler.getDebugTablesInfo(source_table_patterns, rules.config);
 
     return {
       valid: true,
-      bucket_definitions: rules.bucketSources.map((source) => source.debugRepresentation()),
+      bucket_definitions: rules.config.debugRepresentation(),
       source_tables: resolved_tables,
-      data_tables: rules.debugGetOutputTables()
+      data_tables: rules.config.debugGetOutputTables()
     };
   } catch (e) {
     if (e instanceof SyncRulesErrors) {

package/src/routes/endpoints/sync-stream.ts

@@ -42,12 +42,12 @@ export const syncStreamed = routeDefinition({
       ...logger.defaultMeta,
       user_agent: userAgent,
       client_id: clientId,
-      user_id: payload.context.user_id,
+      user_id: payload.context.token_payload!.userIdJson,
       bson: useBson
     };
     const sdkData: event_types.ConnectedUserData & event_types.ClientConnectionEventData = {
       client_id: clientId ?? '',
-      user_id: payload.context.user_id!,
+      user_id: payload.context.token_payload!.userIdString,
       user_agent: userAgent as string,
       // At this point the token_payload is guaranteed to be present
       jwt_exp: new Date(token_payload!.exp * 1000),
@@ -92,10 +92,7 @@ export const syncStreamed = routeDefinition({
       const syncLines = sync.streamResponse({
         syncContext: syncContext,
         bucketStorage,
-        syncRules: {
-          syncRules,
-          version: bucketStorage.group_id
-        },
+        syncRules,
         params: payload.params,
         token: payload.context.token_payload!,
         tracker,

package/src/routes/router.ts

@@ -12,8 +12,6 @@ export type RouterServiceContext = ServiceContext;
  * Common context for routes
  */
 export type Context = {
-  user_id?: string;
-
   service_context: RouterServiceContext;
 
   token_payload?: JwtPayload;

package/src/storage/PersistedSyncRulesContent.ts

@@ -1,4 +1,4 @@
-import { SqlSyncRules } from '@powersync/service-sync-rules';
+import { HydratedSyncRules, SyncConfig, SyncConfigWithErrors } from '@powersync/service-sync-rules';
 import { ReplicationLock } from './ReplicationLock.js';
 
 export interface ParseSyncRulesOptions {
@@ -28,6 +28,8 @@ export interface PersistedSyncRulesContent {
 
 export interface PersistedSyncRules {
   readonly id: number;
-  readonly sync_rules: SqlSyncRules;
+  readonly sync_rules: SyncConfigWithErrors;
   readonly slot_name: string;
+
+  hydratedSyncRules(): HydratedSyncRules;
 }

package/src/storage/SyncRulesBucketStorage.ts

@@ -1,5 +1,5 @@
 import { Logger, ObserverClient } from '@powersync/lib-services-framework';
-import { ParameterLookup, SqlSyncRules, SqliteJsonRow } from '@powersync/service-sync-rules';
+import { HydratedSyncRules, ScopedParameterLookup, SqliteJsonRow } from '@powersync/service-sync-rules';
 import * as util from '../util/util-index.js';
 import { BucketStorageBatch, FlushedResult, SaveUpdate } from './BucketStorageBatch.js';
 import { BucketStorageFactory } from './BucketStorageFactory.js';
@@ -32,7 +32,7 @@ export interface SyncRulesBucketStorage
     callback: (batch: BucketStorageBatch) => Promise<void>
   ): Promise<FlushedResult | null>;
 
-  getParsedSyncRules(options: ParseSyncRulesOptions): SqlSyncRules;
+  getParsedSyncRules(options: ParseSyncRulesOptions): HydratedSyncRules;
 
   /**
    * Terminate the sync rules.
@@ -139,7 +139,7 @@ export interface ResolveTableOptions {
   connection_tag: string;
   entity_descriptor: SourceEntityDescriptor;
 
-  sync_rules: SqlSyncRules;
+  sync_rules: HydratedSyncRules;
 }
 
 export interface ResolveTableResult {
@@ -218,10 +218,19 @@ export interface CompactOptions {
   moveBatchQueryLimit?: number;
 
   /**
+   * Minimum number new operations in a bucket to trigger compaction of that bucket.
+   *
    * Minimum of 1, default of 10.
    */
   minBucketChanges?: number;
 
+  /**
+   * Minimum ratio of new operations to existing operations in a bucket to trigger compaction of that bucket.
+   *
+   * Number between 0 and 1, default of 0.1.
+   */
+  minChangeRatio?: number;
+
   /**
    * Internal/testing use: Cache size for compacting parameters.
    */
@@ -284,7 +293,7 @@ export interface ReplicationCheckpoint {
    *
    * This gets parameter sets specific to this checkpoint.
    */
-  getParameterSets(lookups: ParameterLookup[]): Promise<SqliteJsonRow[]>;
+  getParameterSets(lookups: ScopedParameterLookup[]): Promise<SqliteJsonRow[]>;
 }
 
 export interface WatchWriteCheckpointOptions {

package/src/storage/bson.ts

@@ -1,6 +1,6 @@
 import * as bson from 'bson';
 
-import { ParameterLookup, SqliteJsonValue } from '@powersync/service-sync-rules';
+import { ScopedParameterLookup, SqliteJsonValue } from '@powersync/service-sync-rules';
 import { ReplicaId } from './BucketStorageBatch.js';
 
 type NodeBuffer = Buffer<ArrayBuffer>;
@@ -27,11 +27,11 @@ export const BSON_DESERIALIZE_DATA_OPTIONS: bson.DeserializeOptions = {
  * Lookup serialization must be number-agnostic. I.e. normalize numbers, instead of preserving numbers.
  * @param lookup
  */
-export const serializeLookupBuffer = (lookup: ParameterLookup): NodeBuffer => {
+export const serializeLookupBuffer = (lookup: ScopedParameterLookup): NodeBuffer => {
   return bson.serialize({ l: lookup.values }) as NodeBuffer;
 };
 
-export const serializeLookup = (lookup: ParameterLookup) => {
+export const serializeLookup = (lookup: ScopedParameterLookup) => {
   return new bson.Binary(serializeLookupBuffer(lookup));
 };