@powersync/service-sync-rules 0.32.0 → 0.34.0

package/dist/schema-generators/KotlinSchemaGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"KotlinSchemaGenerator.js","sourceRoot":"","sources":["../../src/schema-generators/KotlinSchemaGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE9E,MAAM,OAAO,qBAAsB,SAAQ,eAAe;IAC/C,GAAG,GAAG,QAAQ,CAAC;IACf,KAAK,GAAG,QAAQ,CAAC;IACjB,SAAS,GAAG,eAAe,CAAC;IAC5B,QAAQ,GAAG,WAAW,CAAC;IAEhC,QAAQ,CAAC,MAAkB,EAAE,MAAoB,EAAE,OAA+B;QAChF,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAElD,OAAO;;;;;IAKP,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;EAC7F,CAAC;IACD,CAAC;IAEO,aAAa,CAAC,IAAY,EAAE,OAA2B,EAAE,OAA+B;QAC9F,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,IAAI,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YACpC,IAAI,cAAsB,CAAC;YAC3B,IAAI,IAAI,EAAE,CAAC;gBACT,cAAc,GAAG,WAAW,IAAI,EAAE,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,cAAc,GAAG,WAAW,IAAI,GAAG,CAAC;YACtC,CAAC;YAED,IAAI,OAAO,EAAE,mBAAmB,IAAI,CAAC,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;gBAC3D,OAAO,GAAG,cAAc,OAAO,CAAC,CAAC,YAAY,EAAE,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACN,OAAO,cAAc,CAAC;YACxB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO;cACG,IAAI;;EAEhB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;;IAElB,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,MAAwB;QAC7C,OAAO,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC;IAC/D,CAAC;CACF"}
+{"version":3,"file":"KotlinSchemaGenerator.js","sourceRoot":"","sources":["../../src/schema-generators/KotlinSchemaGenerator.ts"],"names":[],"mappings":"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"}

package/dist/schema-generators/RoomSchemaGenerator.js

@@ -1,4 +1,4 @@
-import { SchemaGenerator } from './SchemaGenerator.js';
+import { SchemaGenerator, toCamelCase } from './SchemaGenerator.js';
 /**
  * Generates a schema to use with the [Room library](https://docs.powersync.com/client-sdk-references/kotlin-multiplatform/libraries/room).
  */
@@ -16,7 +16,7 @@ import androidx.room.PrimaryKey
         for (const table of tables) {
             // @Entity(tableName = "todo_list_items") data class TodoListItems(
             buffer += `\n@Entity(tableName = "${table.name}")\n`;
-            buffer += `data class ${snakeCaseToKotlin(table.name, true)}(\n`;
+            buffer += `data class ${toCamelCase(table.name, true)}(\n`;
             // Id column
             buffer += '  @PrimaryKey val id: String,\n';
             for (const column of table.columns) {
@@ -27,27 +27,11 @@ import androidx.room.PrimaryKey
                     integer: 'Long'
                 }[sqliteType];
                 // @ColumnInfo(name = "author_id") val authorId: String,
-                buffer += `  @ColumnInfo("${column.name}") val ${snakeCaseToKotlin(column.name, false)}: ${kotlinType},\n`;
+                buffer += `  @ColumnInfo("${column.name}") val ${toCamelCase(column.name)}: ${kotlinType},\n`;
             }
             buffer += ')\n';
         }
         return buffer;
     }
 }
-function snakeCaseToKotlin(source, initialUpper) {
-    let result = '';
-    for (const chunk of source.split('_')) {
-        if (chunk.length == 0)
-            continue;
-        const firstCharUpper = result.length > 0 || initialUpper;
-        if (firstCharUpper) {
-            result += chunk.charAt(0).toUpperCase();
-            result += chunk.substring(1);
-        }
-        else {
-            result += chunk;
-        }
-    }
-    return result;
-}
 //# sourceMappingURL=RoomSchemaGenerator.js.map

package/dist/schema-generators/RoomSchemaGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoomSchemaGenerator.js","sourceRoot":"","sources":["../../src/schema-generators/RoomSchemaGenerator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;GAEG;AACH,MAAM,OAAO,mBAAoB,SAAQ,eAAe;IAC7C,GAAG,GAAG,aAAa,CAAC;IACpB,KAAK,GAAG,6BAA6B,CAAC;IACtC,SAAS,GAAG,eAAe,CAAC;IAC5B,QAAQ,GAAG,aAAa,CAAC;IAElC,QAAQ,CAAC,MAAkB,EAAE,MAAoB;QAC/C,IAAI,MAAM,GAAG;;;CAGhB,CAAC;QACE,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAClD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,mEAAmE;YACnE,MAAM,IAAI,0BAA0B,KAAK,CAAC,IAAI,MAAM,CAAC;YACrD,MAAM,IAAI,cAAc,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC;YAEjE,YAAY;YACZ,MAAM,IAAI,iCAAiC,CAAC;YAE5C,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;gBACnC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC3C,MAAM,UAAU,GAAG;oBACjB,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,MAAM;iBAChB,CAAC,UAAU,CAAC,CAAC;gBAEd,wDAAwD;gBACxD,MAAM,IAAI,kBAAkB,MAAM,CAAC,IAAI,UAAU,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,UAAU,KAAK,CAAC;YAC7G,CAAC;YAED,MAAM,IAAI,KAAK,CAAC;QAClB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,SAAS,iBAAiB,CAAC,MAAc,EAAE,YAAqB;IAC9D,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACtC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;YAAE,SAAS;QAEhC,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAC;QACzD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC;QAClB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"RoomSchemaGenerator.js","sourceRoot":"","sources":["../../src/schema-generators/RoomSchemaGenerator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEpE;;GAEG;AACH,MAAM,OAAO,mBAAoB,SAAQ,eAAe;IAC7C,GAAG,GAAG,aAAa,CAAC;IACpB,KAAK,GAAG,6BAA6B,CAAC;IACtC,SAAS,GAAG,eAAe,CAAC;IAC5B,QAAQ,GAAG,aAAa,CAAC;IAElC,QAAQ,CAAC,MAAkB,EAAE,MAAoB;QAC/C,IAAI,MAAM,GAAG;;;CAGhB,CAAC;QACE,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAClD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,mEAAmE;YACnE,MAAM,IAAI,0BAA0B,KAAK,CAAC,IAAI,MAAM,CAAC;YACrD,MAAM,IAAI,cAAc,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC;YAE3D,YAAY;YACZ,MAAM,IAAI,iCAAiC,CAAC;YAE5C,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;gBACnC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC3C,MAAM,UAAU,GAAG;oBACjB,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,MAAM;iBAChB,CAAC,UAAU,CAAC,CAAC;gBAEd,wDAAwD;gBACxD,MAAM,IAAI,kBAAkB,MAAM,CAAC,IAAI,UAAU,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,UAAU,KAAK,CAAC;YAChG,CAAC;YAED,MAAM,IAAI,KAAK,CAAC;QAClB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}

package/dist/schema-generators/SchemaGenerator.d.ts

@@ -1,5 +1,5 @@
 import { SyncConfig } from '../SyncConfig.js';
-import { ColumnDefinition } from '../ExpressionType.js';
+import { ColumnDefinition, ColumnType } from '../ExpressionType.js';
 import { SourceSchema } from '../types.js';
 export interface GenerateSchemaOptions {
     includeTypeComments?: boolean;
@@ -9,6 +9,7 @@ export declare abstract class SchemaGenerator {
         name: string;
         columns: ColumnDefinition[];
     }[];
+    protected getOptionalStreams(source: SyncConfig, schema: SourceSchema): OptionalStream[];
     abstract readonly key: string;
     abstract readonly label: string;
     abstract readonly mediaType: string;
@@ -25,3 +26,8 @@ export declare abstract class SchemaGenerator {
  * @returns The default SQL column type name for that type.
  */
 export declare function sqlTypeName(def: ColumnDefinition): 'text' | 'real' | 'integer';
+export interface OptionalStream {
+    name: string;
+    parameters: Record<string, ColumnType>;
+}
+export declare function toCamelCase(source: string, initialUpper?: boolean): string;

package/dist/schema-generators/SchemaGenerator.js

@@ -1,4 +1,6 @@
 import { TYPE_INTEGER, TYPE_REAL, TYPE_TEXT } from '../ExpressionType.js';
+import { PrecompiledSyncConfig } from '../sync_plan/evaluator/index.js';
+import { SyncPlanSchemaAnalyzer } from '../sync_plan/schema_inference.js';
 export class SchemaGenerator {
     getAllTables(source, schema) {
         let tables = {};
@@ -12,6 +14,23 @@ export class SchemaGenerator {
             };
         });
     }
+    getOptionalStreams(source, schema) {
+        const streams = [];
+        if (source instanceof PrecompiledSyncConfig) {
+            const analyzer = new SyncPlanSchemaAnalyzer(source.defaultSchema, schema);
+            for (const { stream, queriers } of source.plan.streams) {
+                if (stream.isSubscribedByDefault) {
+                    // Not an optional stream
+                    continue;
+                }
+                streams.push({
+                    name: stream.name,
+                    parameters: analyzer.resolveReferencedParameters(queriers)
+                });
+            }
+        }
+        return streams;
+    }
     /**
      * @param def The column definition to generate the type for.
      * @returns The SDK column type for the given column definition.
@@ -39,4 +58,20 @@ export function sqlTypeName(def) {
         return 'text';
     }
 }
+export function toCamelCase(source, initialUpper = false) {
+    let result = '';
+    for (const chunk of source.split(/[_-]/)) {
+        if (chunk.length == 0)
+            continue;
+        const firstCharUpper = result.length > 0 || initialUpper;
+        if (firstCharUpper) {
+            result += chunk.charAt(0).toUpperCase();
+            result += chunk.substring(1);
+        }
+        else {
+            result += chunk;
+        }
+    }
+    return result;
+}
 //# sourceMappingURL=SchemaGenerator.js.map

package/dist/schema-generators/SchemaGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaGenerator.js","sourceRoot":"","sources":["../../src/schema-generators/SchemaGenerator.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAO5F,MAAM,OAAgB,eAAe;IACzB,YAAY,CAAC,MAAkB,EAAE,MAAoB;QAC7D,IAAI,MAAM,GAAqD,EAAE,CAAC;QAElE,KAAK,IAAI,UAAU,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAChD,UAAU,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACpD,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;aAChC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IASD;;;OAGG;IACH,UAAU,CAAC,GAAqB;QAC9B,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,GAAqB;IAC/C,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;IACrB,IAAI,IAAI,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,IAAI,IAAI,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;QACtC,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,IAAI,IAAI,CAAC,SAAS,GAAG,YAAY,EAAE,CAAC;QACzC,OAAO,SAAS,CAAC;IACnB,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC;IAChB,CAAC;AACH,CAAC"}
+{"version":3,"file":"SchemaGenerator.js","sourceRoot":"","sources":["../../src/schema-generators/SchemaGenerator.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAExG,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAM1E,MAAM,OAAgB,eAAe;IACzB,YAAY,CAAC,MAAkB,EAAE,MAAoB;QAC7D,IAAI,MAAM,GAAqD,EAAE,CAAC;QAElE,KAAK,IAAI,UAAU,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAChD,UAAU,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACpD,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;aAChC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAES,kBAAkB,CAAC,MAAkB,EAAE,MAAoB;QACnE,MAAM,OAAO,GAAqB,EAAE,CAAC;QACrC,IAAI,MAAM,YAAY,qBAAqB,EAAE,CAAC;YAC5C,MAAM,QAAQ,GAAG,IAAI,sBAAsB,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAE1E,KAAK,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACvD,IAAI,MAAM,CAAC,qBAAqB,EAAE,CAAC;oBACjC,yBAAyB;oBACzB,SAAS;gBACX,CAAC;gBAED,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,UAAU,EAAE,QAAQ,CAAC,2BAA2B,CAAC,QAAQ,CAAC;iBAC3D,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IASD;;;OAGG;IACH,UAAU,CAAC,GAAqB;QAC9B,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,GAAqB;IAC/C,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;IACrB,IAAI,IAAI,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,IAAI,IAAI,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;QACtC,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,IAAI,IAAI,CAAC,SAAS,GAAG,YAAY,EAAE,CAAC;QACzC,OAAO,SAAS,CAAC;IACnB,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC;IAChB,CAAC;AACH,CAAC;AAOD,MAAM,UAAU,WAAW,CAAC,MAAc,EAAE,eAAwB,KAAK;IACvE,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;YAAE,SAAS;QAEhC,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAC;QACzD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC;QAClB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/schema-generators/SwiftSchemaGenerator.d.ts

@@ -9,4 +9,7 @@ export declare class SwiftSchemaGenerator extends SchemaGenerator {
     generate(source: SyncConfig, schema: SourceSchema, options?: GenerateSchemaOptions): string;
     private generateTable;
     private generateColumn;
+    private generateStreamHelper;
+    private swiftType;
+    private swiftJsonParamType;
 }

package/dist/schema-generators/SwiftSchemaGenerator.js

@@ -1,4 +1,5 @@
-import { SchemaGenerator } from './SchemaGenerator.js';
+import { TYPE_INTEGER, TYPE_REAL, TYPE_TEXT } from '../ExpressionType.js';
+import { SchemaGenerator, toCamelCase } from './SchemaGenerator.js';
 export class SwiftSchemaGenerator extends SchemaGenerator {
     key = 'swift';
     label = 'Swift';
@@ -6,11 +7,14 @@ export class SwiftSchemaGenerator extends SchemaGenerator {
     fileName = 'schema.swift';
     generate(source, schema, options) {
         const tables = super.getAllTables(source, schema);
+        const streamsHelper = this.generateStreamHelper(source, schema);
         return `import PowerSync
 
 let schema = Schema(
   ${tables.map((table) => this.generateTable(table.name, table.columns, options)).join(',\n  ')}
-)`;
+)
+${streamsHelper ?? ''}
+`;
     }
     generateTable(name, columns, options) {
         const generated = columns.map((c, i) => {
@@ -40,5 +44,65 @@ ${generated.join('\n')}
     generateColumn(column) {
         return `.${this.columnType(column)}("${column.name}")`;
     }
+    generateStreamHelper(source, schema) {
+        const optionalSyncStreams = this.getOptionalStreams(source, schema);
+        if (optionalSyncStreams.length) {
+            let generatedCode = `
+struct TypedSyncStreams {
+    private var db: PowerSyncDatabaseProtocol
+    init(_ db: PowerSyncDatabaseProtocol) {
+        self.db = db
+    }
+`;
+            for (const stream of optionalSyncStreams) {
+                const entries = Object.entries(stream.parameters);
+                let swiftParameters = entries
+                    .map(([parameter, type]) => `${toCamelCase(parameter)}: ${this.swiftType(type)}`)
+                    .join(', ');
+                let parameterMap;
+                if (entries.length) {
+                    parameterMap = '[\n';
+                    for (const [parameter, type] of entries) {
+                        parameterMap += `            "${parameter}": ${this.swiftJsonParamType(type)}(${toCamelCase(parameter)})\n`;
+                    }
+                    parameterMap += '        ]';
+                }
+                else {
+                    parameterMap = '[:]';
+                }
+                generatedCode += `    func ${toCamelCase(stream.name)}(${swiftParameters}) -> SyncStream {
+        return db.syncStream(name: "${stream.name}", params: ${parameterMap})
+    }
+`;
+            }
+            generatedCode += `}`;
+            return generatedCode;
+        }
+    }
+    swiftType({ type }) {
+        if (type.typeFlags & TYPE_TEXT) {
+            return 'String';
+        }
+        else if (type.typeFlags & TYPE_REAL) {
+            return 'Double';
+        }
+        else if (type.typeFlags & TYPE_INTEGER) {
+            return 'Int';
+        }
+        else {
+            return 'String';
+        }
+    }
+    swiftJsonParamType({ type }) {
+        if (type.typeFlags & TYPE_INTEGER) {
+            return 'JsonValue.int';
+        }
+        else if (type.typeFlags & TYPE_REAL) {
+            return 'JsonValue.double';
+        }
+        else {
+            return 'JsonValue.string';
+        }
+    }
 }
 //# sourceMappingURL=SwiftSchemaGenerator.js.map

package/dist/schema-generators/SwiftSchemaGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwiftSchemaGenerator.js","sourceRoot":"","sources":["../../src/schema-generators/SwiftSchemaGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE9E,MAAM,OAAO,oBAAqB,SAAQ,eAAe;IAC9C,GAAG,GAAG,OAAO,CAAC;IACd,KAAK,GAAG,OAAO,CAAC;IAChB,SAAS,GAAG,cAAc,CAAC;IAC3B,QAAQ,GAAG,cAAc,CAAC;IAEnC,QAAQ,CAAC,MAAkB,EAAE,MAAoB,EAAE,OAA+B;QAChF,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAElD,OAAO;;;IAGP,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;EAC7F,CAAC;IACD,CAAC;IAEO,aAAa,CAAC,IAAY,EAAE,OAA2B,EAAE,OAA+B;QAC9F,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,IAAI,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YACpC,IAAI,cAAsB,CAAC;YAC3B,IAAI,IAAI,EAAE,CAAC;gBACT,cAAc,GAAG,WAAW,IAAI,EAAE,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,cAAc,GAAG,WAAW,IAAI,GAAG,CAAC;YACtC,CAAC;YAED,IAAI,OAAO,EAAE,mBAAmB,IAAI,CAAC,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;gBAC3D,OAAO,GAAG,cAAc,OAAO,CAAC,CAAC,YAAY,EAAE,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACN,OAAO,cAAc,CAAC;YACxB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO;aACE,IAAI;;EAEf,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;;IAElB,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,MAAwB;QAC7C,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC;IACzD,CAAC;CACF"}
+{"version":3,"file":"SwiftSchemaGenerator.js","sourceRoot":"","sources":["../../src/schema-generators/SwiftSchemaGenerator.ts"],"names":[],"mappings":"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"}

package/dist/schema-generators/TsSchemaGenerator.d.ts

@@ -30,5 +30,7 @@ export declare class TsSchemaGenerator extends SchemaGenerator {
     private generateTypeExports;
     private generateImports;
     private generateTable;
+    private generateStreamHelper;
     private generateColumn;
+    private valueType;
 }

package/dist/schema-generators/TsSchemaGenerator.js

@@ -1,5 +1,5 @@
 import { TYPE_INTEGER, TYPE_REAL, TYPE_TEXT } from '../ExpressionType.js';
-import { SchemaGenerator } from './SchemaGenerator.js';
+import { SchemaGenerator, toCamelCase } from './SchemaGenerator.js';
 export var TsSchemaLanguage;
 (function (TsSchemaLanguage) {
     TsSchemaLanguage["ts"] = "ts";
@@ -40,7 +40,8 @@ export class TsSchemaGenerator extends SchemaGenerator {
     }
     generate(source, schema, options) {
         const tables = super.getAllTables(source, schema);
-        return `${this.generateImports()}
+        const streamsHelper = this.generateStreamHelper(source, schema);
+        return `${this.generateImports(streamsHelper != null)}
 
 ${tables.map((table) => this.generateTable(table.name, table.columns, options)).join('\n\n')}
 
@@ -48,7 +49,8 @@ export const AppSchema = new Schema({
   ${tables.map((table) => table.name).join(',\n  ')}
 });
 
-${this.generateTypeExports()}`;
+${this.generateTypeExports()}
+${streamsHelper ?? ''}`;
     }
     generateTypeExports() {
         if (this.language == TsSchemaLanguage.ts) {
@@ -58,17 +60,22 @@ ${this.generateTypeExports()}`;
             return ``;
         }
     }
-    generateImports() {
+    generateImports(includeSyncStreams) {
         const importStyle = this.options.imports ?? 'auto';
+        const importedNames = ['column', 'Schema', 'Table'];
+        if (includeSyncStreams) {
+            importedNames.push(...['PowerSyncDatabase', 'SyncStream']);
+        }
+        const importStart = `import { ${importedNames.join(', ')} } from`;
         if (importStyle == TsSchemaImports.web) {
-            return `import { column, Schema, Table } from '@powersync/web';`;
+            return `${importStart} '@powersync/web';`;
         }
         else if (importStyle == TsSchemaImports.reactNative) {
-            return `import { column, Schema, Table } from '@powersync/react-native';`;
+            return `${importStart} '@powersync/react-native';`;
         }
         else {
-            return `import { column, Schema, Table } from '@powersync/web';
-// OR: import { column, Schema, Table } from '@powersync/react-native';`;
+            return `${importStart} '@powersync/web';
+// OR: ${importStart} '@powersync/react-native';`;
         }
     }
     generateTable(name, columns, options) {
@@ -97,6 +104,28 @@ ${generated.join('\n')}
   { indexes: {} }
 );`;
     }
+    generateStreamHelper(source, schema) {
+        const optionalSyncStreams = this.getOptionalStreams(source, schema);
+        if (optionalSyncStreams.length) {
+            let generatedCode = `export function typedStreams(db: PowerSyncDatabase) {
+  return {
+`;
+            const methods = optionalSyncStreams.map((stream) => {
+                const allParams = Object.entries(stream.parameters);
+                let args = '';
+                if (allParams.length) {
+                    const paramsType = allParams.map(([name, type]) => `${name}: ${this.valueType(type)}`).join(', ');
+                    args += `params: { ${paramsType} }`;
+                }
+                return `    ${toCamelCase(stream.name)}(${args}): SyncStream {
+      return db.syncStream('${stream.name}', ${allParams.length ? 'params' : '{}'});
+    }`;
+            });
+            generatedCode += methods.join(',\n');
+            generatedCode += `\n  };\n}\n`;
+            return generatedCode;
+        }
+    }
     generateColumn(column) {
         const t = column.type;
         if (t.typeFlags & TYPE_TEXT) {
@@ -112,5 +141,13 @@ ${generated.join('\n')}
             return `${column.name}: column.text`;
         }
     }
+    valueType({ type }) {
+        if (type.typeFlags & (TYPE_INTEGER | TYPE_REAL)) {
+            return 'number';
+        }
+        else {
+            return 'string';
+        }
+    }
 }
 //# sourceMappingURL=TsSchemaGenerator.js.map

package/dist/schema-generators/TsSchemaGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"TsSchemaGenerator.js","sourceRoot":"","sources":["../../src/schema-generators/TsSchemaGenerator.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE5F,OAAO,EAAyB,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAO9E,MAAM,CAAN,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,6BAAS,CAAA;IACT,gDAAgD;IAChD,6BAAS,CAAA;AACX,CAAC,EAJW,gBAAgB,KAAhB,gBAAgB,QAI3B;AAED,MAAM,CAAN,IAAY,eAOX;AAPD,WAAY,eAAe;IACzB,8BAAW,CAAA;IACX,8CAA2B,CAAA;IAC3B;;OAEG;IACH,gCAAa,CAAA;AACf,CAAC,EAPW,eAAe,KAAf,eAAe,QAO1B;AAED,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAQxB;IAPnB,GAAG,CAAS;IACZ,QAAQ,CAAS;IACjB,SAAS,CAAS;IAClB,KAAK,CAAS;IAEd,QAAQ,CAAmB;IAEpC,YAA4B,UAAoC,EAAE;QAChE,KAAK,EAAE,CAAC;QADkB,YAAO,GAAP,OAAO,CAA+B;QAGhE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,gBAAgB,CAAC,EAAE,CAAC;QACxD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;QACzB,IAAI,IAAI,CAAC,QAAQ,IAAI,gBAAgB,CAAC,EAAE,EAAE,CAAC;YACzC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;YAC5B,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC;YACnC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;YAC5B,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC;YACnC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,MAAkB,EAAE,MAAoB,EAAE,OAA+B;QAChF,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAElD,OAAO,GAAG,IAAI,CAAC,eAAe,EAAE;;EAElC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;;;IAGxF,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;;;EAGjD,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;IAC7B,CAAC;IAEO,mBAAmB;QACzB,IAAI,IAAI,CAAC,QAAQ,IAAI,gBAAgB,CAAC,EAAE,EAAE,CAAC;YACzC,OAAO,uDAAuD,CAAC;QACjE,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAEO,eAAe;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC;QACnD,IAAI,WAAW,IAAI,eAAe,CAAC,GAAG,EAAE,CAAC;YACvC,OAAO,yDAAyD,CAAC;QACnE,CAAC;aAAM,IAAI,WAAW,IAAI,eAAe,CAAC,WAAW,EAAE,CAAC;YACtD,OAAO,kEAAkE,CAAC;QAC5E,CAAC;aAAM,CAAC;YACN,OAAO;wEAC2D,CAAC;QACrE,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,IAAY,EAAE,OAA2B,EAAE,OAA+B;QAC9F,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,IAAI,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;YACrC,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YACpC,IAAI,cAAsB,CAAC;YAC3B,IAAI,IAAI,EAAE,CAAC;gBACT,cAAc,GAAG,OAAO,IAAI,EAAE,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,cAAc,GAAG,OAAO,IAAI,GAAG,CAAC;YAClC,CAAC;YAED,IAAI,OAAO,EAAE,mBAAmB,IAAI,CAAC,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;gBAC3D,OAAO,GAAG,cAAc,OAAO,CAAC,CAAC,YAAY,EAAE,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACN,OAAO,cAAc,CAAC;YACxB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,SAAS,IAAI;;;EAGtB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;;;GAGnB,CAAC;IACF,CAAC;IAEO,cAAc,CAAC,MAAwB;QAC7C,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;YAC5B,OAAO,GAAG,MAAM,CAAC,IAAI,eAAe,CAAC;QACvC,CAAC;aAAM,IAAI,CAAC,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;YACnC,OAAO,GAAG,MAAM,CAAC,IAAI,eAAe,CAAC;QACvC,CAAC;aAAM,IAAI,CAAC,CAAC,SAAS,GAAG,YAAY,EAAE,CAAC;YACtC,OAAO,GAAG,MAAM,CAAC,IAAI,kBAAkB,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,MAAM,CAAC,IAAI,eAAe,CAAC;QACvC,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"TsSchemaGenerator.js","sourceRoot":"","sources":["../../src/schema-generators/TsSchemaGenerator.ts"],"names":[],"mappings":"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"}

package/dist/schema-generators/generators.d.ts

@@ -1,5 +1,5 @@
 import { DartSchemaGenerator } from './DartSchemaGenerator.js';
-import { DotNetSchemaGenerator } from './DotNetSchemaGenerator.js';
+import { DotNetSchemaGenerator, DotNetClassSchemaGenerator } from './DotNetSchemaGenerator.js';
 import { JsLegacySchemaGenerator } from './JsLegacySchemaGenerator.js';
 import { KotlinSchemaGenerator } from './KotlinSchemaGenerator.js';
 import { SwiftSchemaGenerator } from './SwiftSchemaGenerator.js';
@@ -7,6 +7,7 @@ import { TsSchemaGenerator } from './TsSchemaGenerator.js';
 export declare const schemaGenerators: {
     dart: DartSchemaGenerator;
     dotNet: DotNetSchemaGenerator;
+    dotNetClass: DotNetClassSchemaGenerator;
     js: TsSchemaGenerator;
     jsLegacy: JsLegacySchemaGenerator;
     kotlin: KotlinSchemaGenerator;

package/dist/schema-generators/generators.js

@@ -1,5 +1,5 @@
 import { DartSchemaGenerator } from './DartSchemaGenerator.js';
-import { DotNetSchemaGenerator } from './DotNetSchemaGenerator.js';
+import { DotNetSchemaGenerator, DotNetClassSchemaGenerator } from './DotNetSchemaGenerator.js';
 import { JsLegacySchemaGenerator } from './JsLegacySchemaGenerator.js';
 import { KotlinSchemaGenerator } from './KotlinSchemaGenerator.js';
 import { SwiftSchemaGenerator } from './SwiftSchemaGenerator.js';
@@ -7,6 +7,7 @@ import { TsSchemaGenerator, TsSchemaLanguage } from './TsSchemaGenerator.js';
 export const schemaGenerators = {
     dart: new DartSchemaGenerator(),
     dotNet: new DotNetSchemaGenerator(),
+    dotNetClass: new DotNetClassSchemaGenerator(),
     js: new TsSchemaGenerator({ language: TsSchemaLanguage.js }),
     jsLegacy: new JsLegacySchemaGenerator(),
     kotlin: new KotlinSchemaGenerator(),

package/dist/schema-generators/generators.js.map

@@ -1 +1 @@
-{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../src/schema-generators/generators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE7E,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,IAAI,mBAAmB,EAAE;IAC/B,MAAM,EAAE,IAAI,qBAAqB,EAAE;IACnC,EAAE,EAAE,IAAI,iBAAiB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC;IAC5D,QAAQ,EAAE,IAAI,uBAAuB,EAAE;IACvC,MAAM,EAAE,IAAI,qBAAqB,EAAE;IACnC,KAAK,EAAE,IAAI,oBAAoB,EAAE;IACjC,EAAE,EAAE,IAAI,iBAAiB,EAAE;CAC5B,CAAC"}
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../src/schema-generators/generators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC/F,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE7E,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,IAAI,mBAAmB,EAAE;IAC/B,MAAM,EAAE,IAAI,qBAAqB,EAAE;IACnC,WAAW,EAAE,IAAI,0BAA0B,EAAE;IAC7C,EAAE,EAAE,IAAI,iBAAiB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC;IAC5D,QAAQ,EAAE,IAAI,uBAAuB,EAAE;IACvC,MAAM,EAAE,IAAI,qBAAqB,EAAE;IACnC,KAAK,EAAE,IAAI,oBAAoB,EAAE;IACjC,EAAE,EAAE,IAAI,iBAAiB,EAAE;CAC5B,CAAC"}

package/dist/sql_functions.d.ts

@@ -21,16 +21,12 @@ export interface DocumentedSqlFunction extends SqlFunction {
 export declare function getOperatorFunction(op: string): SqlFunction;
 export declare function generateSqlFunctions(compatibility: CompatibilityContext): {
     named: Record<string, DocumentedSqlFunction>;
-    callable: Record<"length" | "substring" | "hex" | "ifnull" | "iif" | "lower" | "typeof" | "upper" | "json_array_length" | "json_extract" | "json_valid" | "unixepoch" | "datetime" | "base64" | "json_keys" | "uuid_blob" | "st_asgeojson" | "st_astext" | "st_x" | "st_y", (...args: SqliteValue[]) => SqliteValue>;
+    callable: Record<"upper" | "lower" | "substring" | "length" | "hex" | "base64" | "uuid_blob" | "typeof" | "ifnull" | "iif" | "instr" | "json_valid" | "json_keys" | "unixepoch" | "datetime" | "st_asgeojson" | "st_astext" | "st_x" | "st_y" | "json_extract" | "json_array_length", (...args: SqliteValue[]) => SqliteValue>;
     jsonExtract: (sourceValue: SqliteValue, path: SqliteValue, operator: string) => import("./types.js").SqliteJsonValue;
     jsonExtractFromRecord: (value: any, path: SqliteValue, operator: string) => import("./types.js").SqliteJsonValue;
     operatorJsonExtractJson: SqlFunction;
     operatorJsonExtractSql: SqlFunction;
 };
-export declare const CAST_TYPES: Set<String>;
-export declare function castAsText(value: SqliteValue): string | null;
-export declare function castAsBlob(value: SqliteValue): Uint8Array | null;
-export declare function cast(value: SqliteValue, to: string): string | number | bigint | Uint8Array<ArrayBufferLike> | null;
 export declare function sqliteTypeOf(arg: SqliteInputValue): SqliteValueType;
 export declare function parseGeometry(value?: SqliteValue): wkx.Geometry | null;
 export declare function evaluateOperator(op: string, a: SqliteValue, b: SqliteValue): SqliteValue;

package/dist/sql_functions.js

@@ -9,6 +9,7 @@ import { ExpressionType, TYPE_INTEGER } from './ExpressionType.js';
 import * as uuid from 'uuid';
 import { CustomSqliteValue } from './types/custom_sqlite_value.js';
 import { CompatibilityOption } from './compatibility.js';
+import { cast, CAST_TYPES, castAsBlob, castAsText } from './cast.js';
 export const BASIC_OPERATORS = new Set([
     '=',
     '!=',
@@ -239,6 +240,35 @@ const iif = {
     },
     detail: 'If x is true then returns y else returns z'
 };
+// This matches the behavior of the instr function in SQLite.
+// If both arguments are BLOBs, performs a byte-level search.
+// Otherwise, both arguments are interpreted as text.
+const instr = {
+    debugName: 'instr',
+    call(x, y) {
+        if (x == null || y == null) {
+            return null;
+        }
+        // Both BLOBs: byte-level search
+        if (x instanceof Uint8Array && y instanceof Uint8Array) {
+            const pos = Buffer.from(x.buffer, x.byteOffset, x.byteLength).indexOf(y);
+            return BigInt(pos < 0 ? 0 : pos + 1);
+        }
+        // Neither BLOB, or mixed: cast both to text
+        const haystack = castAsText(x);
+        const needle = castAsText(y);
+        const pos = haystack.indexOf(needle);
+        return BigInt(pos < 0 ? 0 : pos + 1);
+    },
+    parameters: [
+        { name: 'x', type: ExpressionType.ANY, optional: false },
+        { name: 'y', type: ExpressionType.ANY, optional: false }
+    ],
+    getReturnType() {
+        return ExpressionType.INTEGER;
+    },
+    detail: 'Returns 1-indexed position of y in x, or 0 if not found. If both are BLOBs, counts bytes; otherwise counts characters.'
+};
 const json_valid = {
     debugName: 'json_valid',
     call(json) {
@@ -466,6 +496,7 @@ export function generateSqlFunctions(compatibility) {
         typeof: fn_typeof,
         ifnull,
         iif,
+        instr,
         json_extract: json.json_extract,
         json_array_length: json.json_array_length,
         json_valid,
@@ -488,100 +519,6 @@ export function generateSqlFunctions(compatibility) {
         operatorJsonExtractSql: json.OPERATOR_JSON_EXTRACT_SQL
     };
 }
-export const CAST_TYPES = new Set(['text', 'numeric', 'integer', 'real', 'blob']);
-const textEncoder = new TextEncoder();
-const textDecoder = new TextDecoder();
-export function castAsText(value) {
-    if (value == null) {
-        return null;
-    }
-    else if (value instanceof Uint8Array) {
-        return textDecoder.decode(value);
-    }
-    else {
-        return value.toString();
-    }
-}
-export function castAsBlob(value) {
-    if (value == null) {
-        return null;
-    }
-    else if (value instanceof Uint8Array) {
-        return value;
-    }
-    if (typeof value != 'string') {
-        value = value.toString();
-    }
-    return textEncoder.encode(value);
-}
-export function cast(value, to) {
-    if (value == null) {
-        return null;
-    }
-    if (to == 'text') {
-        return castAsText(value);
-    }
-    else if (to == 'numeric') {
-        if (value instanceof Uint8Array) {
-            value = textDecoder.decode(value);
-        }
-        if (typeof value == 'string') {
-            return parseNumeric(value);
-        }
-        else if (typeof value == 'number' || typeof value == 'bigint') {
-            return value;
-        }
-        else {
-            return 0n;
-        }
-    }
-    else if (to == 'real') {
-        if (value instanceof Uint8Array) {
-            value = textDecoder.decode(value);
-        }
-        if (typeof value == 'string') {
-            const nr = parseFloat(value);
-            if (isNaN(nr)) {
-                return 0.0;
-            }
-            else {
-                return nr;
-            }
-        }
-        else if (typeof value == 'number') {
-            return value;
-        }
-        else if (typeof value == 'bigint') {
-            return Number(value);
-        }
-        else {
-            return 0.0;
-        }
-    }
-    else if (to == 'integer') {
-        if (value instanceof Uint8Array) {
-            value = textDecoder.decode(value);
-        }
-        if (typeof value == 'string') {
-            return parseBigInt(value);
-        }
-        else if (typeof value == 'number') {
-            return Number.isInteger(value) ? BigInt(value) : BigInt(Math.floor(value));
-        }
-        else if (typeof value == 'bigint') {
-            return value;
-        }
-        else {
-            return 0n;
-        }
-    }
-    else if (to == 'blob') {
-        return castAsBlob(value);
-    }
-    else {
-        throw new Error(`Type not supported for cast: '${to}'`);
-    }
-}
 export function sqliteTypeOf(arg) {
     if (arg == null) {
         return 'null';
@@ -623,26 +560,6 @@ export function parseGeometry(value) {
     const geo = wkx.Geometry.parse(blob);
     return geo;
 }
-function parseNumeric(text) {
-    const match = /^\s*(\d+)(\.\d*)?(e[+\-]?\d+)?/i.exec(text);
-    if (!match) {
-        return 0n;
-    }
-    if (match[2] != null || match[3] != null) {
-        const v = parseFloat(match[0]);
-        return isNaN(v) ? 0n : v;
-    }
-    else {
-        return BigInt(match[1]);
-    }
-}
-function parseBigInt(text) {
-    const match = /^\s*(\d+)/.exec(text);
-    if (!match) {
-        return 0n;
-    }
-    return BigInt(match[1]);
-}
 function isNumeric(a) {
     return typeof a == 'number' || typeof a == 'bigint';
 }