@powersync/service-module-mssql 0.6.2 → 0.6.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "@powersync/service-module-mssql",
   "repository": "https://github.com/powersync-ja/powersync-service",
   "types": "dist/index.d.ts",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "license": "FSL-1.1-ALv2",
   "main": "dist/index.js",
   "type": "module",
@@ -27,20 +27,20 @@
     "ts-codec": "^1.3.0",
     "uri-js": "^4.4.1",
     "uuid": "^11.1.0",
-    "@powersync/lib-services-framework": "0.9.2",
-    "@powersync/service-core": "1.20.4",
-    "@powersync/service-errors": "0.4.1",
+    "@powersync/lib-services-framework": "0.9.3",
+    "@powersync/service-core": "1.20.5",
+    "@powersync/service-errors": "0.4.2",
     "@powersync/service-jsonbig": "0.17.12",
-    "@powersync/service-sync-rules": "0.34.1",
-    "@powersync/service-types": "0.15.0"
+    "@powersync/service-sync-rules": "0.35.0",
+    "@powersync/service-types": "0.15.1"
   },
   "devDependencies": {
     "@types/mssql": "^9.1.9",
     "@types/semver": "^7.7.1",
     "@types/uuid": "^10.0.0",
-    "@powersync/service-core-tests": "0.15.3",
-    "@powersync/service-module-mongodb-storage": "0.15.3",
-    "@powersync/service-module-postgres-storage": "0.13.3"
+    "@powersync/service-core-tests": "0.15.4",
+    "@powersync/service-module-mongodb-storage": "0.15.4",
+    "@powersync/service-module-postgres-storage": "0.13.4"
   },
   "scripts": {
     "build": "tsc -b",

package/src/api/MSSQLRouteAPIAdapter.ts

@@ -5,11 +5,13 @@ import {
   ReplicationHeadCallback,
   ReplicationLagOptions
 } from '@powersync/service-core';
-import * as service_types from '@powersync/service-types';
 import { SqlSyncRules, TablePattern } from '@powersync/service-sync-rules';
-import * as types from '../types/types.js';
+import * as service_types from '@powersync/service-types';
 import { ExecuteSqlResponse } from '@powersync/service-types/dist/routes.js';
+import sql from 'mssql';
+import { toExpressionTypeFromMSSQLType } from '../common/mssqls-to-sqlite.js';
 import { MSSQLConnectionManager } from '../replication/MSSQLConnectionManager.js';
+import * as types from '../types/types.js';
 import {
   checkSourceConfiguration,
   createCheckpoint,
@@ -18,8 +20,6 @@ import {
   POWERSYNC_CHECKPOINTS_TABLE
 } from '../utils/mssql.js';
 import { getTablesFromPattern, ResolvedTable } from '../utils/schema.js';
-import { toExpressionTypeFromMSSQLType } from '../common/mssqls-to-sqlite.js';
-import sql from 'mssql';
 
 export class MSSQLRouteAPIAdapter implements api.RouteAPI {
   protected connectionManager: MSSQLConnectionManager;

package/src/common/MSSQLSourceTable.ts

@@ -1,6 +1,6 @@
 import { SourceTable } from '@powersync/service-core';
-import { toQualifiedTableName } from '../utils/mssql.js';
 import { ServiceAssertionError } from '@powersync/service-errors';
+import { toQualifiedTableName } from '../utils/mssql.js';
 import { CaptureInstance } from './CaptureInstance.js';
 
 /**

package/src/common/MSSQLSourceTableCache.ts

@@ -1,6 +1,6 @@
 import { SourceTable } from '@powersync/service-core';
-import { MSSQLSourceTable } from './MSSQLSourceTable.js';
 import { ServiceAssertionError } from '@powersync/service-errors';
+import { MSSQLSourceTable } from './MSSQLSourceTable.js';
 
 export class MSSQLSourceTableCache {
   private cache = new Map<number | string, MSSQLSourceTable>();

package/src/common/mssqls-to-sqlite.ts

@@ -1,4 +1,3 @@
-import sql from 'mssql';
 import {
   DatabaseInputRow,
   DateTimeSourceOptions,
@@ -11,6 +10,7 @@ import {
   TimeValuePrecision,
   toSyncRulesRow
 } from '@powersync/service-sync-rules';
+import sql from 'mssql';
 import { MSSQLUserDefinedType } from '../types/mssql-data-types.js';
 
 export function toSqliteInputRow(row: any, columns: sql.IColumnMetadata): SqliteInputRow {

package/src/module/MSSQLModule.ts

@@ -6,13 +6,13 @@ import {
   system,
   TearDownOptions
 } from '@powersync/service-core';
-import { MSSQLConnectionManagerFactory } from '../replication/MSSQLConnectionManagerFactory.js';
-import * as types from '../types/types.js';
+import { MSSQLRouteAPIAdapter } from '../api/MSSQLRouteAPIAdapter.js';
 import { CDCReplicator } from '../replication/CDCReplicator.js';
 import { MSSQLConnectionManager } from '../replication/MSSQLConnectionManager.js';
-import { checkSourceConfiguration } from '../utils/mssql.js';
+import { MSSQLConnectionManagerFactory } from '../replication/MSSQLConnectionManagerFactory.js';
 import { MSSQLErrorRateLimiter } from '../replication/MSSQLErrorRateLimiter.js';
-import { MSSQLRouteAPIAdapter } from '../api/MSSQLRouteAPIAdapter.js';
+import * as types from '../types/types.js';
+import { checkSourceConfiguration } from '../utils/mssql.js';
 
 export class MSSQLModule extends replication.ReplicationModule<types.MSSQLConnectionConfig> {
   constructor() {

package/src/replication/CDCPoller.ts

@@ -1,22 +1,22 @@
 import {
   DatabaseQueryError,
+  logger as defaultLogger,
   ErrorCode,
   Logger,
-  logger as defaultLogger,
   ReplicationAssertionError
 } from '@powersync/lib-services-framework';
+import { SourceEntityDescriptor } from '@powersync/service-core';
+import { TablePattern } from '@powersync/service-sync-rules';
+import sql from 'mssql';
 import timers from 'timers/promises';
-import { MSSQLConnectionManager } from './MSSQLConnectionManager.js';
-import { MSSQLSourceTable } from '../common/MSSQLSourceTable.js';
+import { CaptureInstance } from '../common/CaptureInstance.js';
 import { LSN } from '../common/LSN.js';
-import sql from 'mssql';
-import { CaptureInstanceDetails, getCaptureInstances, incrementLSN, toQualifiedTableName } from '../utils/mssql.js';
-import { isDeadlockError } from '../utils/deadlock.js';
+import { MSSQLSourceTable } from '../common/MSSQLSourceTable.js';
 import { AdditionalConfig } from '../types/types.js';
+import { isDeadlockError } from '../utils/deadlock.js';
+import { CaptureInstanceDetails, getCaptureInstances, incrementLSN, toQualifiedTableName } from '../utils/mssql.js';
 import { tableExists } from '../utils/schema.js';
-import { TablePattern } from '@powersync/service-sync-rules';
-import { CaptureInstance } from '../common/CaptureInstance.js';
-import { SourceEntityDescriptor } from '@powersync/service-core';
+import { MSSQLConnectionManager } from './MSSQLConnectionManager.js';
 
 enum Operation {
   DELETE = 1,

package/src/replication/CDCReplicationJob.ts

@@ -1,9 +1,9 @@
-import { replication } from '@powersync/service-core';
-import { MSSQLConnectionManagerFactory } from './MSSQLConnectionManagerFactory.js';
 import { container, logger as defaultLogger } from '@powersync/lib-services-framework';
-import { CDCDataExpiredError, CDCStream } from './CDCStream.js';
+import { replication } from '@powersync/service-core';
 import { AdditionalConfig } from '../types/types.js';
 import { POWERSYNC_CHECKPOINTS_TABLE } from '../utils/mssql.js';
+import { CDCDataExpiredError, CDCStream } from './CDCStream.js';
+import { MSSQLConnectionManagerFactory } from './MSSQLConnectionManagerFactory.js';
 
 export interface CDCReplicationJobOptions extends replication.AbstractReplicationJobOptions {
   connectionFactory: MSSQLConnectionManagerFactory;

package/src/replication/CDCReplicator.ts

@@ -1,8 +1,8 @@
 import { replication, storage } from '@powersync/service-core';
-import { MSSQLConnectionManagerFactory } from './MSSQLConnectionManagerFactory.js';
-import { CDCReplicationJob } from './CDCReplicationJob.js';
 import { MSSQLModule } from '../module/MSSQLModule.js';
 import { AdditionalConfig } from '../types/types.js';
+import { CDCReplicationJob } from './CDCReplicationJob.js';
+import { MSSQLConnectionManagerFactory } from './MSSQLConnectionManagerFactory.js';
 
 export interface CDCReplicatorOptions extends replication.AbstractReplicatorOptions {
   connectionFactory: MSSQLConnectionManagerFactory;

package/src/replication/MSSQLConnectionManager.ts

@@ -1,8 +1,8 @@
 import { BaseObserver, logger } from '@powersync/lib-services-framework';
-import sql from 'mssql';
-import { NormalizedMSSQLConnectionConfig } from '../types/types.js';
 import { POWERSYNC_VERSION } from '@powersync/service-core';
+import sql from 'mssql';
 import { MSSQLParameter } from '../types/mssql-data-types.js';
+import { NormalizedMSSQLConnectionConfig } from '../types/types.js';
 import { addParameters } from '../utils/mssql.js';
 
 export const DEFAULT_SCHEMA = 'dbo';

package/src/replication/MSSQLConnectionManagerFactory.ts

@@ -1,7 +1,7 @@
 import { logger } from '@powersync/lib-services-framework';
+import sql from 'mssql';
 import { ResolvedMSSQLConnectionConfig } from '../types/types.js';
 import { MSSQLConnectionManager } from './MSSQLConnectionManager.js';
-import sql from 'mssql';
 
 export class MSSQLConnectionManagerFactory {
   private readonly connectionManagers: Set<MSSQLConnectionManager>;

package/src/replication/MSSQLSnapshotQuery.ts

@@ -1,9 +1,9 @@
-import { bson, ColumnDescriptor, SourceTable } from '@powersync/service-core';
 import { ServiceAssertionError } from '@powersync/lib-services-framework';
-import { MSSQLBaseType } from '../types/mssql-data-types.js';
+import { bson, ColumnDescriptor, SourceTable } from '@powersync/service-core';
 import sql from 'mssql';
-import { escapeIdentifier } from '../utils/mssql.js';
 import { MSSQLSourceTable } from '../common/MSSQLSourceTable.js';
+import { MSSQLBaseType } from '../types/mssql-data-types.js';
+import { escapeIdentifier } from '../utils/mssql.js';
 
 export interface MSSQLSnapshotQuery {
   initialize(): Promise<void>;

package/src/utils/mssql.ts

@@ -1,21 +1,21 @@
+import { logger } from '@powersync/lib-services-framework';
+import * as sync_rules from '@powersync/service-sync-rules';
+import { SqlSyncRules, TablePattern } from '@powersync/service-sync-rules';
+import * as service_types from '@powersync/service-types';
 import sql from 'mssql';
 import { coerce, gte } from 'semver';
-import { logger } from '@powersync/lib-services-framework';
-import { retryOnDeadlock } from './deadlock.js';
-import { MSSQLConnectionManager } from '../replication/MSSQLConnectionManager.js';
+import { CaptureInstance } from '../common/CaptureInstance.js';
 import { LSN } from '../common/LSN.js';
 import { MSSQLSourceTable } from '../common/MSSQLSourceTable.js';
+import { MSSQLConnectionManager } from '../replication/MSSQLConnectionManager.js';
 import { MSSQLParameter } from '../types/mssql-data-types.js';
-import * as sync_rules from '@powersync/service-sync-rules';
-import { SqlSyncRules, TablePattern } from '@powersync/service-sync-rules';
+import { retryOnDeadlock } from './deadlock.js';
 import {
   getPendingSchemaChanges,
   getReplicationIdentityColumns,
   ReplicationIdentityColumnsResult,
   ResolvedTable
 } from './schema.js';
-import * as service_types from '@powersync/service-types';
-import { CaptureInstance } from '../common/CaptureInstance.js';
 
 export const POWERSYNC_CHECKPOINTS_TABLE = '_powersync_checkpoints';
 

package/src/utils/schema.ts

@@ -1,9 +1,9 @@
+import { logger } from '@powersync/lib-services-framework';
 import { SourceEntityDescriptor } from '@powersync/service-core';
 import { TablePattern } from '@powersync/service-sync-rules';
+import sql from 'mssql';
 import { MSSQLConnectionManager } from '../replication/MSSQLConnectionManager.js';
 import { MSSQLColumnDescriptor } from '../types/mssql-data-types.js';
-import sql from 'mssql';
-import { logger } from '@powersync/lib-services-framework';
 
 export interface GetColumnsOptions {
   connectionManager: MSSQLConnectionManager;

package/test/src/CDCStream.test.ts

@@ -1,11 +1,11 @@
-import { describe, expect, test } from 'vitest';
+import { getLatestLSN } from '@module/utils/mssql.js';
+import { storage } from '@powersync/service-core';
 import { METRICS_HELPER, putOp, removeOp } from '@powersync/service-core-tests';
 import { ReplicationMetric } from '@powersync/service-types';
-import { createTestTable, describeWithStorage, insertTestData, waitForPendingCDCChanges } from './util.js';
-import { storage } from '@powersync/service-core';
-import { CDCStreamTestContext } from './CDCStreamTestContext.js';
-import { getLatestLSN } from '@module/utils/mssql.js';
 import sql from 'mssql';
+import { describe, expect, test } from 'vitest';
+import { CDCStreamTestContext } from './CDCStreamTestContext.js';
+import { createTestTable, describeWithStorage, insertTestData, waitForPendingCDCChanges } from './util.js';
 
 const BASIC_SYNC_RULES = `
 bucket_definitions:

package/test/src/CDCStreamTestContext.ts

@@ -1,3 +1,5 @@
+import { CDCStream, CDCStreamOptions } from '@module/replication/CDCStream.js';
+import { MSSQLConnectionManager } from '@module/replication/MSSQLConnectionManager.js';
 import {
   BucketStorageFactory,
   createCoreReplicationMetrics,
@@ -10,10 +12,8 @@ import {
   updateSyncRulesFromYaml
 } from '@powersync/service-core';
 import { bucketRequest, METRICS_HELPER, test_utils } from '@powersync/service-core-tests';
-import { clearTestDb, getClientCheckpoint, TEST_CONNECTION_OPTIONS } from './util.js';
-import { CDCStream, CDCStreamOptions } from '@module/replication/CDCStream.js';
-import { MSSQLConnectionManager } from '@module/replication/MSSQLConnectionManager.js';
 import timers from 'timers/promises';
+import { clearTestDb, getClientCheckpoint, TEST_CONNECTION_OPTIONS } from './util.js';
 
 /**
  * Tests operating on the change data capture need to configure the stream and manage asynchronous

package/test/src/CDCStream_resumable_snapshot.test.ts

@@ -1,13 +1,13 @@
-import { describe, expect, test } from 'vitest';
-import { env } from './env.js';
-import { createTestTableWithBasicId, describeWithStorage, waitForPendingCDCChanges } from './util.js';
-import { TestStorageConfig, TestStorageFactory } from '@powersync/service-core';
+import { getLatestLSN } from '@module/utils/mssql.js';
+import { logger, ReplicationAbortedError } from '@powersync/lib-services-framework';
+import { TestStorageConfig } from '@powersync/service-core';
 import { METRICS_HELPER } from '@powersync/service-core-tests';
 import { ReplicationMetric } from '@powersync/service-types';
 import * as timers from 'node:timers/promises';
-import { logger, ReplicationAbortedError } from '@powersync/lib-services-framework';
+import { describe, expect, test } from 'vitest';
 import { CDCStreamTestContext } from './CDCStreamTestContext.js';
-import { getLatestLSN } from '@module/utils/mssql.js';
+import { env } from './env.js';
+import { createTestTableWithBasicId, describeWithStorage, waitForPendingCDCChanges } from './util.js';
 
 describe.skipIf(!(env.CI || env.SLOW_TESTS))('batch replication', function () {
   describeWithStorage({ timeout: 240_000 }, function (config) {

package/test/src/LSN.test.ts

@@ -1,5 +1,5 @@
-import { describe, expect, test } from 'vitest';
 import { LSN } from '@module/common/LSN.js';
+import { describe, expect, test } from 'vitest';
 
 describe('LSN', () => {
   test('normalizes lowercase hex strings to uppercase', () => {

package/test/src/mssql-to-sqlite.test.ts

@@ -1,3 +1,13 @@
+import { CDCToSqliteRow, toSqliteInputRow } from '@module/common/mssqls-to-sqlite.js';
+import { CDC_SCHEMA } from '@module/common/MSSQLSourceTable.js';
+import { MSSQLConnectionManager } from '@module/replication/MSSQLConnectionManager.js';
+import {
+  escapeIdentifier,
+  getCaptureInstances,
+  getLatestLSN,
+  getLatestReplicatedLSN,
+  toQualifiedTableName
+} from '@module/utils/mssql.js';
 import {
   applyRowContext,
   CompatibilityContext,
@@ -5,6 +15,7 @@ import {
   SqliteInputRow,
   TimeValuePrecision
 } from '@powersync/service-sync-rules';
+import sql from 'mssql';
 import { afterAll, beforeEach, describe, expect, test } from 'vitest';
 import {
   clearTestDb,
@@ -13,17 +24,6 @@ import {
   TEST_CONNECTION_OPTIONS,
   waitForPendingCDCChanges
 } from './util.js';
-import { CDCToSqliteRow, toSqliteInputRow } from '@module/common/mssqls-to-sqlite.js';
-import { MSSQLConnectionManager } from '@module/replication/MSSQLConnectionManager.js';
-import {
-  escapeIdentifier,
-  getCaptureInstances,
-  getLatestLSN,
-  getLatestReplicatedLSN,
-  toQualifiedTableName
-} from '@module/utils/mssql.js';
-import sql from 'mssql';
-import { CDC_SCHEMA } from '@module/common/MSSQLSourceTable.js';
 
 describe('MSSQL Data Types Tests', () => {
   const connectionManager = new MSSQLConnectionManager(TEST_CONNECTION_OPTIONS, {});

package/test/src/schema-changes.test.ts

@@ -1,8 +1,11 @@
-import { putOp, removeOp } from '@powersync/service-core-tests';
-import { describe, expect, test, vi } from 'vitest';
 import { storage } from '@powersync/service-core';
+import { putOp, removeOp } from '@powersync/service-core-tests';
 import sql from 'mssql';
+import { describe, expect, test, vi } from 'vitest';
 
+import { SchemaChangeType } from '@module/replication/CDCPoller.js';
+import { getLatestLSN, toQualifiedTableName } from '@module/utils/mssql.js';
+import { logger } from '@powersync/lib-services-framework';
 import { CDCStreamTestContext } from './CDCStreamTestContext.js';
 import {
   createTestTableWithBasicId,
@@ -14,9 +17,6 @@ import {
   renameTable,
   waitForPendingCDCChanges
 } from './util.js';
-import { getLatestLSN, toQualifiedTableName } from '@module/utils/mssql.js';
-import { SchemaChangeType } from '@module/replication/CDCPoller.js';
-import { logger } from '@powersync/lib-services-framework';
 
 describe('MSSQL Schema Changes Tests', () => {
   describeWithStorage({ timeout: 60_000 }, defineSchemaChangesTests);

package/test/src/util.ts

@@ -1,23 +1,17 @@
 import * as types from '@module/types/types.js';
 import { logger } from '@powersync/lib-services-framework';
-import {
-  BucketStorageFactory,
-  InternalOpId,
-  ReplicationCheckpoint,
-  TestStorageConfig,
-  TestStorageFactory
-} from '@powersync/service-core';
+import { BucketStorageFactory, InternalOpId, ReplicationCheckpoint, TestStorageConfig } from '@powersync/service-core';
 
 import * as mongo_storage from '@powersync/service-module-mongodb-storage';
 import * as postgres_storage from '@powersync/service-module-postgres-storage';
 
-import { describe, TestOptions } from 'vitest';
-import { env } from './env.js';
+import { LSN } from '@module/common/LSN.js';
 import { MSSQLConnectionManager } from '@module/replication/MSSQLConnectionManager.js';
 import { createCheckpoint, escapeIdentifier, getLatestLSN, toQualifiedTableName } from '@module/utils/mssql.js';
 import sql from 'mssql';
 import { v4 as uuid } from 'uuid';
-import { LSN } from '@module/common/LSN.js';
+import { describe, TestOptions } from 'vitest';
+import { env } from './env.js';
 
 export const TEST_URI = env.MSSQL_TEST_URI;