Import cleanup.

Author: rkistner

packages/sync-rules/src/BaseSqlDataQuery.ts

@@ -3,9 +3,9 @@ import { SqlRuleError } from './errors.js';
 import { ColumnDefinition } from './ExpressionType.js';
 import { SourceTableInterface } from './SourceTableInterface.js';
 import { AvailableTable, SqlTools } from './sql_filters.js';
+import { castAsText } from './sql_functions.js';
 import { TablePattern } from './TablePattern.js';
 import {
-  BucketIdTransformer,
   EvaluationResult,
   QueryParameters,
   QuerySchema,
@@ -15,7 +15,6 @@ import {
   SqliteRow
 } from './types.js';
 import { filterJsonRow } from './utils.js';
-import { castAsText } from './sql_functions.js';
 
 export interface RowValueExtractor {
   extract(tables: QueryParameters, into: SqliteRow): void;

packages/sync-rules/src/HydrationState.ts

@@ -1,5 +1,5 @@
-import { BucketDataSource, BucketDataSourceDefinition, BucketParameterLookupSourceDefinition } from './BucketSource.js';
-import { BucketIdTransformer, CompatibilityContext, CompatibilityOption, CreateSourceParams } from './index.js';
+import { BucketDataSourceDefinition, BucketParameterLookupSourceDefinition } from './BucketSource.js';
+import { BucketIdTransformer, CreateSourceParams } from './index.js';
 
 export interface BucketSourceState {
   /** The prefix is the bucket name before the parameters. */

packages/sync-rules/src/SqlDataQuery.ts

@@ -1,6 +1,7 @@
 import { JSONBig } from '@powersync/service-jsonbig';
 import { parse } from 'pgsql-ast-parser';
 import { BaseSqlDataQuery, BaseSqlDataQueryOptions, RowValueExtractor } from './BaseSqlDataQuery.js';
+import { CompatibilityContext } from './compatibility.js';
 import { SqlRuleError } from './errors.js';
 import { ExpressionType } from './ExpressionType.js';
 import { SourceTableInterface } from './SourceTableInterface.js';
@@ -9,9 +10,8 @@ import { checkUnsupportedFeatures, isClauseError } from './sql_support.js';
 import { SyncRulesOptions } from './SqlSyncRules.js';
 import { TablePattern } from './TablePattern.js';
 import { TableQuerySchema } from './TableQuerySchema.js';
-import { BucketIdTransformer, EvaluationResult, ParameterMatchClause, QuerySchema, SqliteRow } from './types.js';
+import { EvaluationResult, ParameterMatchClause, QuerySchema, SqliteRow } from './types.js';
 import { getBucketId, isSelectStatement } from './utils.js';
-import { CompatibilityContext } from './compatibility.js';
 
 export interface SqlDataQueryOptions extends BaseSqlDataQueryOptions {
   filter: ParameterMatchClause;

packages/sync-rules/src/SqlParameterQuery.ts

@@ -19,6 +19,7 @@ import {
   CreateSourceParams
 } from './BucketSource.js';
 import { SqlRuleError } from './errors.js';
+import { ParameterLookupScope, resolveHydrationState } from './HydrationState.js';
 import { BucketDataSourceDefinition, GetQuerierOptions } from './index.js';
 import { SourceTableInterface } from './SourceTableInterface.js';
 import { AvailableTable, SqlTools } from './sql_filters.js';
@@ -28,7 +29,6 @@ import { TablePattern } from './TablePattern.js';
 import { TableQuerySchema } from './TableQuerySchema.js';
 import { TableValuedFunctionSqlParameterQuery } from './TableValuedFunctionSqlParameterQuery.js';
 import {
-  BucketIdTransformer,
   EvaluatedParameters,
   EvaluatedParametersResult,
   InputParameter,
@@ -44,7 +44,6 @@ import {
 } from './types.js';
 import { filterJsonRow, getBucketId, isJsonValue, isSelectStatement, normalizeParameterValue } from './utils.js';
 import { DetectRequestParameters } from './validators.js';
-import { ParameterLookupScope, HydrationState, resolveHydrationState } from './HydrationState.js';
 
 export interface SqlParameterQueryOptions {
   sourceTable: TablePattern;

packages/sync-rules/src/StaticSqlParameterQuery.ts

@@ -7,21 +7,15 @@ import {
   CreateSourceParams
 } from './BucketSource.js';
 import { SqlRuleError } from './errors.js';
+import { resolveHydrationState } from './HydrationState.js';
 import { BucketDataSourceDefinition, GetQuerierOptions } from './index.js';
 import { SourceTableInterface } from './SourceTableInterface.js';
 import { AvailableTable, SqlTools } from './sql_filters.js';
 import { checkUnsupportedFeatures, isClauseError, sqliteBool } from './sql_support.js';
 import { TablePattern } from './TablePattern.js';
-import {
-  BucketIdTransformer,
-  ParameterValueClause,
-  QueryParseOptions,
-  RequestParameters,
-  SqliteJsonValue
-} from './types.js';
+import { ParameterValueClause, QueryParseOptions, RequestParameters, SqliteJsonValue } from './types.js';
 import { getBucketId, isJsonValue } from './utils.js';
 import { DetectRequestParameters } from './validators.js';
-import { resolveHydrationState } from './HydrationState.js';
 
 export interface StaticSqlParameterQueryOptions {
   sql: string;

packages/sync-rules/src/TableValuedFunctionSqlParameterQuery.ts

@@ -6,14 +6,14 @@ import {
   CreateSourceParams
 } from './BucketSource.js';
 import { SqlRuleError } from './errors.js';
+import { resolveHydrationState } from './HydrationState.js';
 import { BucketDataSourceDefinition, BucketParameterQuerier, GetQuerierOptions, PendingQueriers } from './index.js';
 import { SourceTableInterface } from './SourceTableInterface.js';
 import { AvailableTable, SqlTools } from './sql_filters.js';
 import { checkUnsupportedFeatures, isClauseError, sqliteBool } from './sql_support.js';
 import { TablePattern } from './TablePattern.js';
 import { generateTableValuedFunctions, TableValuedFunction } from './TableValuedFunctions.js';
 import {
-  BucketIdTransformer,
   ParameterValueClause,
   ParameterValueSet,
   QueryParseOptions,
@@ -23,7 +23,6 @@ import {
 } from './types.js';
 import { getBucketId, isJsonValue } from './utils.js';
 import { DetectRequestParameters } from './validators.js';
-import { resolveHydrationState } from './HydrationState.js';
 
 export interface TableValuedFunctionSqlParameterQueryOptions {
   sql: string;

packages/sync-rules/src/streams/parameter.ts

@@ -1,17 +1,8 @@
 import { ParameterLookup } from '../BucketParameterQuerier.js';
-import { BucketParameterLookupSource, BucketParameterLookupSourceDefinition } from '../BucketSource.js';
+import { BucketParameterLookupSourceDefinition } from '../BucketSource.js';
 import { HydrationState } from '../HydrationState.js';
-import { SourceTableInterface } from '../SourceTableInterface.js';
 import { TablePattern } from '../TablePattern.js';
-import {
-  EvaluateRowOptions,
-  ParameterValueSet,
-  RequestParameters,
-  SqliteJsonValue,
-  SqliteRow,
-  SqliteValue,
-  TableRow
-} from '../types.js';
+import { ParameterValueSet, RequestParameters, SqliteJsonValue, SqliteValue, TableRow } from '../types.js';
 
 /**
  * A source of parameterization, causing data from the source table to be distributed into multiple buckets instead of

packages/sync-rules/src/streams/stream.ts

@@ -1,12 +1,9 @@
 import { BaseSqlDataQuery } from '../BaseSqlDataQuery.js';
-import { BucketInclusionReason, BucketPriority, DEFAULT_BUCKET_PRIORITY } from '../BucketDescription.js';
-import { PendingQueriers } from '../BucketParameterQuerier.js';
+import { BucketPriority, DEFAULT_BUCKET_PRIORITY } from '../BucketDescription.js';
 import {
   BucketDataSource,
   BucketDataSourceDefinition,
-  BucketParameterLookupSource,
   BucketParameterLookupSourceDefinition,
-  BucketParameterQuerierSource,
   BucketParameterQuerierSourceDefinition,
   BucketSource,
   BucketSourceType,
@@ -15,17 +12,8 @@ import {
 import { ColumnDefinition } from '../ExpressionType.js';
 import { resolveHydrationState } from '../HydrationState.js';
 import { SourceTableInterface } from '../SourceTableInterface.js';
-import { GetQuerierOptions, RequestedStream } from '../SqlSyncRules.js';
 import { TablePattern } from '../TablePattern.js';
-import {
-  BucketIdTransformer,
-  EvaluatedParametersResult,
-  EvaluateRowOptions,
-  EvaluationResult,
-  RequestParameters,
-  SourceSchema,
-  TableRow
-} from '../types.js';
+import { EvaluateRowOptions, EvaluationResult, SourceSchema, TableRow } from '../types.js';
 import { StreamVariant } from './variant.js';
 
 export class SyncStream implements BucketSource {

packages/sync-rules/src/streams/variant.ts

@@ -2,26 +2,15 @@ import { BucketInclusionReason, ResolvedBucket } from '../BucketDescription.js';
 import { BucketParameterQuerier, ParameterLookup, PendingQueriers } from '../BucketParameterQuerier.js';
 import {
   BucketDataSourceDefinition,
-  BucketParameterLookupSource,
   BucketParameterLookupSourceDefinition,
   BucketParameterQuerierSource,
   BucketParameterQuerierSourceDefinition,
   CreateSourceParams
 } from '../BucketSource.js';
 import { resolveHydrationState } from '../HydrationState.js';
 import { GetQuerierOptions, RequestedStream } from '../index.js';
-import { SourceTableInterface } from '../SourceTableInterface.js';
-import { TablePattern } from '../TablePattern.js';
-import {
-  BucketIdTransformer,
-  EvaluatedParametersResult,
-  EvaluateRowOptions,
-  RequestParameters,
-  SqliteJsonValue,
-  SqliteRow,
-  TableRow
-} from '../types.js';
-import { isJsonValue, JSONBucketNameSerialize, normalizeParameterValue } from '../utils.js';
+import { RequestParameters, SqliteJsonValue, TableRow } from '../types.js';
+import { isJsonValue, JSONBucketNameSerialize } from '../utils.js';
 import { BucketParameter, SubqueryEvaluator } from './parameter.js';
 import { SyncStream, SyncStreamDataSource } from './stream.js';
 import { cartesianProduct } from './utils.js';