orez 0.5.20 → 0.5.22

package/dist/cf-do/application-sql.d.ts

@@ -0,0 +1,49 @@
+import type { SQLiteExecResult, SqlStatementMetadata } from 'orez-sync-cf-host';
+import type { DeferredEffect } from 'orez-sync-cf-host/post-commit';
+import type { CompiledTransactionQueryPlan, TransactionQueryBudget, TransactionQueryFormat } from 'orez-sync-cf-host/transaction-query';
+export type ApplicationSqlQueryCompiler = (ast: unknown, format: TransactionQueryFormat) => CompiledTransactionQueryPlan | Promise<CompiledTransactionQueryPlan>;
+export type ApplicationSqlTable = Pick<SqlStatementMetadata, 'table' | 'publicTable'> & {
+    /** capture rollback images without publishing this table to Zero clients */
+    publish?: boolean;
+};
+export type ApplicationSqlExecResult = SQLiteExecResult;
+export type ApplicationSqlTransaction = {
+    exec(sql: string, params?: readonly unknown[], metadata?: SqlStatementMetadata): Promise<ApplicationSqlExecResult>;
+    query<Row extends Record<string, unknown> = Record<string, unknown>>(sql: string, params?: readonly unknown[]): Promise<Row[]>;
+    queryAst<Result = unknown>(ast: unknown, format: TransactionQueryFormat, queryName?: string): Promise<Result>;
+    registerTables(tables: readonly ApplicationSqlTable[]): Promise<void>;
+};
+export type ApplicationSqlTransactionContext = {
+    defer(effect: DeferredEffect): void;
+};
+export type ApplicationSqlTransactionWork<Value> = (tx: ApplicationSqlTransaction, context: ApplicationSqlTransactionContext) => Value | Promise<Value>;
+/**
+ * Private Durable Object RPC protocol. Transaction callbacks stay in the
+ * caller: every SQL turn is tagged with a serialized session id, avoiding a
+ * re-entrant RPC call into a Durable Object that is awaiting a callback.
+ */
+export type ApplicationSqlRpc = {
+    applicationSqlQuery<Row extends Record<string, unknown> = Record<string, unknown>>(sql: string, params?: readonly unknown[]): Promise<Row[]>;
+    applicationSqlExec(sql: string, params?: readonly unknown[], metadata?: SqlStatementMetadata): Promise<ApplicationSqlExecResult>;
+    applicationSqlRegisterTables(tables: readonly ApplicationSqlTable[]): Promise<void>;
+    applicationSqlBegin(sessionID: string): Promise<void>;
+    applicationSqlSessionQuery<Row extends Record<string, unknown> = Record<string, unknown>>(sessionID: string, sql: string, params?: readonly unknown[]): Promise<Row[]>;
+    applicationSqlSessionExec(sessionID: string, sql: string, params?: readonly unknown[], metadata?: SqlStatementMetadata): Promise<ApplicationSqlExecResult>;
+    applicationSqlSessionQueryPlan<Result = unknown>(sessionID: string, plan: CompiledTransactionQueryPlan, queryName?: string, queryBudget?: Partial<TransactionQueryBudget>): Promise<Result>;
+    applicationSqlSessionRegisterTables(sessionID: string, tables: readonly ApplicationSqlTable[]): Promise<void>;
+    applicationSqlCommit(sessionID: string): Promise<void>;
+    applicationSqlRollback(sessionID: string): Promise<void>;
+};
+export type ApplicationSqlDurableObjectNamespace = {
+    idFromName(name: string): unknown;
+    get(id: unknown): ApplicationSqlRpc;
+};
+export type ApplicationSqlClient = {
+    readonly namespace: string;
+    query<Row extends Record<string, unknown> = Record<string, unknown>>(sql: string, params?: readonly unknown[]): Promise<Row[]>;
+    exec(sql: string, params?: readonly unknown[], metadata?: SqlStatementMetadata): Promise<ApplicationSqlExecResult>;
+    registerTables(tables: readonly ApplicationSqlTable[]): Promise<void>;
+    transaction<Value>(compileQuery: ApplicationSqlQueryCompiler, work: ApplicationSqlTransactionWork<Value>, queryBudget?: Partial<TransactionQueryBudget>): Promise<Value>;
+};
+export declare function createApplicationSqlClient(durableObjects: ApplicationSqlDurableObjectNamespace, namespace: string): ApplicationSqlClient;
+//# sourceMappingURL=application-sql.d.ts.map

package/dist/cf-do/application-sql.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"application-sql.d.ts","sourceRoot":"","sources":["../../src/cf-do/application-sql.ts"],"names":[],"mappings":"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"}

package/dist/cf-do/application-sql.js

@@ -0,0 +1,37 @@
+export function createApplicationSqlClient(durableObjects, namespace) {
+    if (!namespace)
+        throw new TypeError('application SQLite namespace is required');
+    const target = durableObjects.get(durableObjects.idFromName(namespace));
+    return {
+        namespace,
+        query: (sql, params = []) => target.applicationSqlQuery(sql, params),
+        exec: (sql, params = [], metadata) => target.applicationSqlExec(sql, params, metadata),
+        registerTables: (tables) => target.applicationSqlRegisterTables(tables),
+        async transaction(compileQuery, work, queryBudget) {
+            const sessionID = crypto.randomUUID();
+            const effects = [];
+            await target.applicationSqlBegin(sessionID);
+            const tx = {
+                exec: (sql, params = [], metadata) => target.applicationSqlSessionExec(sessionID, sql, params, metadata),
+                query: (sql, params = []) => target.applicationSqlSessionQuery(sessionID, sql, params),
+                async queryAst(ast, format, queryName) {
+                    const plan = await compileQuery(ast, format);
+                    return target.applicationSqlSessionQueryPlan(sessionID, plan, queryName, queryBudget);
+                },
+                registerTables: (tables) => target.applicationSqlSessionRegisterTables(sessionID, tables),
+            };
+            try {
+                const value = await work(tx, { defer: (effect) => effects.push(effect) });
+                await target.applicationSqlCommit(sessionID);
+                for (const effect of effects)
+                    await effect();
+                return value;
+            }
+            catch (error) {
+                await target.applicationSqlRollback(sessionID).catch(() => { });
+                throw error;
+            }
+        },
+    };
+}
+//# sourceMappingURL=application-sql.js.map

package/dist/cf-do/application-sql.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"application-sql.js","sourceRoot":"","sources":["../../src/cf-do/application-sql.ts"],"names":[],"mappings":"AAmHA,MAAM,UAAU,0BAA0B,CACxC,cAAoD,EACpD,SAAiB;IAEjB,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,SAAS,CAAC,0CAA0C,CAAC,CAAA;IAC/E,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;IACvE,OAAO;QACL,SAAS;QACT,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;QACpE,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,CACnC,MAAM,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC;QAClD,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,4BAA4B,CAAC,MAAM,CAAC;QACvE,KAAK,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,EAAE,WAAW;YAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,CAAA;YACrC,MAAM,OAAO,GAAqB,EAAE,CAAA;YACpC,MAAM,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAA;YAC3C,MAAM,EAAE,GAA8B;gBACpC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,CACnC,MAAM,CAAC,yBAAyB,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC;gBACpE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,EAAE,CAC1B,MAAM,CAAC,0BAA0B,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC;gBAC3D,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS;oBACnC,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;oBAC5C,OAAO,MAAM,CAAC,8BAA8B,CAC1C,SAAS,EACT,IAAI,EACJ,SAAS,EACT,WAAW,CACZ,CAAA;gBACH,CAAC;gBACD,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CACzB,MAAM,CAAC,mCAAmC,CAAC,SAAS,EAAE,MAAM,CAAC;aAChE,CAAA;YACD,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;gBACzE,MAAM,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;gBAC5C,KAAK,MAAM,MAAM,IAAI,OAAO;oBAAE,MAAM,MAAM,EAAE,CAAA;gBAC5C,OAAO,KAAK,CAAA;YACd,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,MAAM,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;gBAC9D,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/cf-do/worker.d.ts

@@ -1,6 +1,11 @@
 import { DurableObject } from 'cloudflare:workers';
 import { type DeferredEffect } from 'orez-sync-cf-host/post-commit';
 import { type CompiledTransactionQueryPlan, type TransactionQueryBudget, type TransactionQueryFormat } from 'orez-sync-cf-host/transaction-query';
+import type { ApplicationSqlExecResult, ApplicationSqlTable } from './application-sql.js';
+import type { SqlStatementMetadata } from 'orez-sync-cf-host';
+export { createApplicationSqlClient } from './application-sql.js';
+export type { ApplicationSqlClient, ApplicationSqlDurableObjectNamespace, ApplicationSqlExecResult, ApplicationSqlQueryCompiler, ApplicationSqlRpc, ApplicationSqlTable, ApplicationSqlTransaction, ApplicationSqlTransactionContext, ApplicationSqlTransactionWork, } from './application-sql.js';
+export type { SqlStatementMetadata } from 'orez-sync-cf-host';
 /**
  * zero-do: Durable Object that exposes raw SQL execution over ctx.storage.sql.
  *
@@ -22,9 +27,9 @@ interface Env {
     OREZ_DO_WRITE_BUDGET_ADMIN_TOKEN?: string;
     OREZ_DO_WRITE_BUDGET_DISABLED?: string;
 }
-export type ZeroDOQueryCompiler = (ast: unknown, format: TransactionQueryFormat) => CompiledTransactionQueryPlan;
+export type ZeroDOQueryCompiler = (ast: unknown, format: TransactionQueryFormat) => CompiledTransactionQueryPlan | Promise<CompiledTransactionQueryPlan>;
 export type ZeroDOTransactionExecutor = {
-    exec(sql: string, params?: readonly unknown[]): Promise<void>;
+    exec(sql: string, params?: readonly unknown[], metadata?: SqlStatementMetadata): Promise<ApplicationSqlExecResult>;
     query<Row extends Record<string, unknown> = Record<string, unknown>>(sql: string, params?: readonly unknown[]): Promise<Row[]>;
     queryAst<Result = unknown>(ast: unknown, format: TransactionQueryFormat, queryName?: string): Promise<Result>;
 };
@@ -42,6 +47,7 @@ export declare class ZeroDO extends DurableObject {
     private writeBudgetAdminToken;
     private activeWriteMeasurements;
     private pendingChangesSchemaReady;
+    private applicationSqlSessionID;
     private recordWriteBudgetRows;
     private writeBudgetErrorResponse;
     constructor(ctx: DurableObjectState, env: Env);
@@ -102,6 +108,26 @@ export declare class ZeroDO extends DurableObject {
      * external effects run only after the storage transaction commits.
      */
     protected runApplicationTransaction<T>(compileQuery: ZeroDOQueryCompiler, work: (tx: ZeroDOTransactionExecutor, context: ZeroDOTransactionContext) => T | Promise<T>, queryBudget?: Partial<TransactionQueryBudget>): Promise<T>;
+    private assertApplicationSqlSession;
+    private assertNoApplicationSqlSession;
+    private registerApplicationSqlTables;
+    /**
+     * Private Durable Object RPC surface for the application SQLite client.
+     *
+     * The client owns its callback and sends serialized session turns. This
+     * avoids re-entering a Durable Object while it waits on a callback. These
+     * methods are intentionally absent from fetch().
+     */
+    applicationSqlQuery<Row extends Record<string, unknown> = Record<string, unknown>>(sql: string, params?: readonly unknown[]): Promise<Row[]>;
+    applicationSqlExec(sql: string, params?: readonly unknown[], metadata?: SqlStatementMetadata): Promise<ApplicationSqlExecResult>;
+    applicationSqlRegisterTables(tables: readonly ApplicationSqlTable[]): Promise<void>;
+    applicationSqlBegin(sessionID: string): Promise<void>;
+    applicationSqlSessionQuery<Row extends Record<string, unknown> = Record<string, unknown>>(sessionID: string, sql: string, params?: readonly unknown[]): Promise<Row[]>;
+    applicationSqlSessionExec(sessionID: string, sql: string, params?: readonly unknown[], metadata?: SqlStatementMetadata): Promise<ApplicationSqlExecResult>;
+    applicationSqlSessionQueryPlan<Result = unknown>(sessionID: string, plan: CompiledTransactionQueryPlan, queryName?: string, queryBudget?: Partial<TransactionQueryBudget>): Promise<Result>;
+    applicationSqlSessionRegisterTables(sessionID: string, tables: readonly ApplicationSqlTable[]): Promise<void>;
+    applicationSqlCommit(sessionID: string): Promise<void>;
+    applicationSqlRollback(sessionID: string): Promise<void>;
     private atomicallySync;
     private invalidateSchemaCaches;
     private tableHasColumn;

package/dist/cf-do/worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cf-do/worker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAEL,KAAK,4BAA4B,EACjC,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAC5B,MAAM,qCAAqC,CAAA;AA+B5C;;;;;;;;;;;;;GAaG;AAEH,UAAU,GAAG;IACX,OAAO,EAAE,sBAAsB,CAAA;IAC/B,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC,8BAA8B,CAAC,EAAE,MAAM,CAAA;IACvC,gCAAgC,CAAC,EAAE,MAAM,CAAA;IACzC,6BAA6B,CAAC,EAAE,MAAM,CAAA;CACvC;AA+DD,MAAM,MAAM,mBAAmB,GAAG,CAChC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,sBAAsB,KAC3B,4BAA4B,CAAA;AAEjC,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7D,KAAK,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjE,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,SAAS,OAAO,EAAE,GAC1B,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IACjB,QAAQ,CAAC,MAAM,GAAG,OAAO,EACvB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,sBAAsB,EAC9B,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAA;CACpC,CAAA;AAkFD,qBAAa,MAAO,SAAQ,aAAa;IACvC,OAAO,CAAC,GAAG,CAAK;IAChB,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,YAAY,CAAiC;IACrD,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,qBAAqB,CAAoB;IACjD,OAAO,CAAC,uBAAuB,CAAqC;IACpE,OAAO,CAAC,yBAAyB,CAAQ;IAEzC,OAAO,CAAC,qBAAqB;YA6Bf,wBAAwB;gBAO1B,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG;IAmDvC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;YAiDlC,uBAAuB;IAgBrC,OAAO,CAAC,iBAAiB;IA0CnB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,WAAW;IA8B3E,cAAc,CACZ,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,OAAO;IAGpB,OAAO,CAAC,mBAAmB;IAgC3B,OAAO,CAAC,sBAAsB;IA6B9B,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,UAAU;YAqBJ,cAAc;IA4B5B,OAAO,CAAC,UAAU;YAcJ,UAAU;IAwCxB,2EAA2E;YAC7D,WAAW;YAyEX,0BAA0B;IAkBxC,OAAO,CAAC,qBAAqB;IAO7B;;;;;;OAMG;YACW,uBAAuB;YAyBvB,+BAA+B;YAwB/B,yBAAyB;IA0BvC;;;;OAIG;YACW,yBAAyB;YAoBzB,aAAa;YAwCb,cAAc;IAyI5B;;;;;;;;;;OAUG;YACW,UAAU;IASxB;;;;;;OAMG;cACa,yBAAyB,CAAC,CAAC,EACzC,YAAY,EAAE,mBAAmB,EACjC,IAAI,EAAE,CACJ,EAAE,EAAE,yBAAyB,EAC7B,OAAO,EAAE,wBAAwB,KAC9B,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EACnB,WAAW,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,GAC5C,OAAO,CAAC,CAAC,CAAC;IA6Cb,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,sBAAsB;IAY9B,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,UAAU;IAoHlB,OAAO,CAAC,UAAU;IAiBlB,OAAO,CAAC,2BAA2B;IAkCnC,OAAO,CAAC,mBAAmB;IAgC3B,OAAO,CAAC,mCAAmC;IAW3C,OAAO,CAAC,iCAAiC;IAMzC,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,kBAAkB;IAgB1B,OAAO,CAAC,2BAA2B;IAKnC,OAAO,CAAC,0BAA0B;IAKlC,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,SAAS;IAgBjB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,SAAS;IAiBjB,OAAO,CAAC,SAAS;IAYjB,OAAO,CAAC,YAAY;IASpB,iFAAiF;IACjF,OAAO,CAAC,oBAAoB;IAqB5B,OAAO,CAAC,mBAAmB;IA0C3B,OAAO,CAAC,4BAA4B;IAmBpC,OAAO,CAAC,gCAAgC;IAMxC,OAAO,CAAC,6BAA6B;IAKrC,OAAO,CAAC,2BAA2B;IAuBnC,OAAO,CAAC,2BAA2B;IAKnC,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,mBAAmB;IAU3B,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,UAAU;IAkBlB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,YAAY;IAsCpB,OAAO,CAAC,YAAY;IA8BpB,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,qBAAqB;IAsC7B,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,YAAY;CAOrB;;mBAGsB,OAAO,OAAO,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;;AAD5D,wBAQC;AAqBD,UAAU,kBAAkB;IAC1B,OAAO,EAAE;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;KAAE,CAAA;IAC3E,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IACzD,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,CAAA;CACzC"}
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cf-do/worker.ts"],"names":[],"mappings":"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"}

package/dist/cf-do/worker.js

@@ -7,6 +7,7 @@ import { TransactionalCdc, } from './cdc.js';
 import { appendPendingChange, deletePendingChanges, ensurePendingChangesTable, rollbackPendingChanges, } from './row-undo.js';
 import { commitTxJournal, recoverTxJournal, rollbackTxJournal, snapshotSideEffectWriteTables, snapshotTxSchema, upgradeToTableSnapshot, } from './tx-journal.js';
 import { DurableWatermarkState } from './watermark.js';
+export { createApplicationSqlClient } from './application-sql.js';
 const SCHEMA_VERSION = 1;
 const SQL_ERROR_SNIPPET_RADIUS = 1600;
 const SQL_ERROR_FALLBACK_LIMIT = 4000;
@@ -70,6 +71,21 @@ function assertApplicationTransactionSQL(sql) {
         throw new TypeError('transaction SQL is owned by ZeroDO');
     }
 }
+function applicationSqlTrack(metadata) {
+    if (!metadata)
+        return undefined;
+    const operations = {
+        insert: 'INSERT',
+        update: 'UPDATE',
+        delete: 'DELETE',
+        upsert: 'UPSERT',
+    };
+    return {
+        tableName: metadata.publicTable,
+        physicalTableName: metadata.table,
+        operation: operations[metadata.kind],
+    };
+}
 export class ZeroDO extends DurableObject {
     sql;
     watermarks;
@@ -81,6 +97,7 @@ export class ZeroDO extends DurableObject {
     writeBudgetAdminToken;
     activeWriteMeasurements = null;
     pendingChangesSchemaReady = false;
+    applicationSqlSessionID = null;
     recordWriteBudgetRows(rows) {
         const wasTripped = this.writeBudget.status().tripped;
         try {
@@ -151,15 +168,25 @@ export class ZeroDO extends DurableObject {
                     this.recordWriteBudgetRows(rows);
             });
         };
-        if (!this.writeBudgetDisabled) {
-            ctx.blockConcurrencyWhile(async () => {
+        this.cdc = new TransactionalCdc(this.sql);
+        this.watermarks = new DurableWatermarkState(this.sql);
+        ctx.blockConcurrencyWhile(async () => {
+            if (!this.writeBudgetDisabled) {
                 const trippedAt = await ctx.storage.get(WRITE_BUDGET_TRIPPED_KEY);
                 if (trippedAt)
                     this.writeBudget.restoreTrip(trippedAt);
+            }
+            const recovered = await this.atomically(() => {
+                const transactionIDs = recoverTxJournal(this.sql, 'application', (transactionID) => {
+                    this.rollbackPendingTrackedChanges(transactionID);
+                });
+                for (const transactionID of transactionIDs)
+                    this.deletePendingTrackedChanges(transactionID);
+                return transactionIDs;
             });
-        }
-        this.cdc = new TransactionalCdc(this.sql);
-        this.watermarks = new DurableWatermarkState(this.sql);
+            if (recovered.length)
+                this.invalidateSchemaCaches();
+        });
     }
     async fetch(request) {
         const url = new URL(request.url);
@@ -811,19 +838,20 @@ export class ZeroDO extends DurableObject {
      */
     async runApplicationTransaction(compileQuery, work, queryBudget) {
         const effects = createPostCommitEffects();
-        const execute = (sql, params = []) => {
+        const execute = (sql, params = [], metadata) => {
             assertApplicationTransactionSQL(sql);
-            return this.executeSQL(sql, [...params]);
+            return this.executeSQL(sql, [...params], applicationSqlTrack(metadata));
         };
         const tx = {
-            async exec(sql, params = []) {
-                execute(sql, params);
+            async exec(sql, params = [], metadata) {
+                const result = execute(sql, params, metadata);
+                return { changes: result.changes };
             },
             async query(sql, params = []) {
                 return execute(sql, params).rows;
             },
             async queryAst(ast, format, queryName) {
-                const compiled = compileQuery(ast, format);
+                const compiled = await compileQuery(ast, format);
                 return executeTransactionQueryPlan(compiled, (sql, params) => execute(sql, params).rows, { queryName, budget: queryBudget });
             },
         };
@@ -839,6 +867,100 @@ export class ZeroDO extends DurableObject {
         });
         return value;
     }
+    assertApplicationSqlSession(sessionID) {
+        if (!sessionID || this.applicationSqlSessionID !== sessionID) {
+            throw new Error('application SQLite session is not active');
+        }
+    }
+    assertNoApplicationSqlSession() {
+        if (this.applicationSqlSessionID) {
+            throw new Error('application SQLite session is active');
+        }
+    }
+    registerApplicationSqlTables(tables) {
+        for (const table of tables) {
+            this.cdc.ensureTable({
+                physicalTableName: table.table,
+                tableName: table.publicTable,
+                ...(table.publish === false ? { publish: false } : null),
+            });
+        }
+    }
+    /**
+     * Private Durable Object RPC surface for the application SQLite client.
+     *
+     * The client owns its callback and sends serialized session turns. This
+     * avoids re-entering a Durable Object while it waits on a callback. These
+     * methods are intentionally absent from fetch().
+     */
+    async applicationSqlQuery(sql, params = []) {
+        this.assertNoApplicationSqlSession();
+        return this.runApplicationTransaction(() => {
+            throw new Error('queryAst requires an application SQLite transaction compiler');
+        }, (tx) => tx.query(sql, params));
+    }
+    async applicationSqlExec(sql, params = [], metadata) {
+        this.assertNoApplicationSqlSession();
+        return this.runApplicationTransaction(() => {
+            throw new Error('queryAst requires an application SQLite transaction compiler');
+        }, (tx) => tx.exec(sql, params, metadata));
+    }
+    async applicationSqlRegisterTables(tables) {
+        this.assertNoApplicationSqlSession();
+        await this.atomically(() => this.registerApplicationSqlTables(tables));
+    }
+    async applicationSqlBegin(sessionID) {
+        this.assertNoApplicationSqlSession();
+        if (!sessionID)
+            throw new TypeError('application SQLite session id is required');
+        await this.atomically(() => snapshotTxSchema(this.sql, sessionID, 'application'));
+        this.applicationSqlSessionID = sessionID;
+    }
+    async applicationSqlSessionQuery(sessionID, sql, params = []) {
+        this.assertApplicationSqlSession(sessionID);
+        return this.atomically(() => this.executeSQL(sql, [...params], undefined, sessionID).rows);
+    }
+    async applicationSqlSessionExec(sessionID, sql, params = [], metadata) {
+        this.assertApplicationSqlSession(sessionID);
+        return this.atomically(() => {
+            const result = this.executeSQL(sql, [...params], applicationSqlTrack(metadata), sessionID);
+            return { changes: result.changes };
+        });
+    }
+    async applicationSqlSessionQueryPlan(sessionID, plan, queryName, queryBudget) {
+        this.assertApplicationSqlSession(sessionID);
+        return this.atomically(() => executeTransactionQueryPlan(plan, (sql, params) => this.executeSQL(sql, params, undefined, sessionID).rows, { queryName, budget: queryBudget }));
+    }
+    async applicationSqlSessionRegisterTables(sessionID, tables) {
+        this.assertApplicationSqlSession(sessionID);
+        await this.atomically(() => this.registerApplicationSqlTables(tables));
+    }
+    async applicationSqlCommit(sessionID) {
+        this.assertApplicationSqlSession(sessionID);
+        try {
+            await this.atomically(() => {
+                this.commitPendingTrackedChanges(sessionID);
+                commitTxJournal(this.sql, sessionID);
+            });
+        }
+        finally {
+            this.applicationSqlSessionID = null;
+        }
+    }
+    async applicationSqlRollback(sessionID) {
+        this.assertApplicationSqlSession(sessionID);
+        try {
+            await this.atomically(() => {
+                this.rollbackPendingTrackedChanges(sessionID);
+                rollbackTxJournal(this.sql, sessionID);
+                this.deletePendingTrackedChanges(sessionID);
+            });
+            this.invalidateSchemaCaches();
+        }
+        finally {
+            this.applicationSqlSessionID = null;
+        }
+    }
     atomicallySync(work) {
         try {
             return this.ctx.storage.transactionSync(work);
@@ -881,6 +1003,12 @@ export class ZeroDO extends DurableObject {
         else if (track) {
             capturesTrackedTable = this.cdc.capturesTable(track.tableName);
         }
+        // SQLite decides whether an INSERT ... ON CONFLICT write inserted or
+        // updated. Only the installed trigger sees that result. Falling back to a
+        // caller-declared operation would publish a false change shape.
+        if (track?.operation === 'UPSERT' && !capturesTrackedTable) {
+            throw new Error(`upsert requires CDC registration for ${track.tableName}`);
+        }
         // DoBackend already marked this table row-journaled, betting the DO could
         // capture before/after images for it. When it cannot, that marker promises
         // a rollback nothing can perform, so take the table snapshot the journal
@@ -913,12 +1041,16 @@ export class ZeroDO extends DurableObject {
         this.cdc.finishSchemaChange(suspendedCdc);
         const columns = Array.isArray(cursor.columnNames) ? cursor.columnNames : [];
         const rows = this.cursorRows(cursor, columns);
+        const rowMutation = isSqlRowMutation(sql);
+        const changes = rowMutation
+            ? Number(this.sql.exec('SELECT changes() AS changes').one()?.changes ?? 0)
+            : 0;
         const mutation = isSqlMutation(sql);
         if (mutation)
             this.writeBudget.recordLogical(rows.length);
-        if (mutation && !isSqlRowMutation(sql))
+        if (mutation && !rowMutation)
             this.cdc.invalidateSchema();
-        const captured = track || (this.cdc.active && isSqlRowMutation(sql)) ? this.cdc.drain() : [];
+        const captured = track || (this.cdc.active && rowMutation) ? this.cdc.drain() : [];
         for (const change of captured) {
             this.appendCapturedChange(change, transactionID || track?.transactionID, !snapshotsOwnStatement);
         }
@@ -952,10 +1084,11 @@ export class ZeroDO extends DurableObject {
         }
         const publishedCaptured = captured.filter((change) => change.publish !== false).length;
         if (!track)
-            return { rows, columns, capturedChanges: publishedCaptured };
+            return { rows, columns, changes, capturedChanges: publishedCaptured };
         return {
             rows: track.returnRows ? rows : [],
             columns: track.returnRows ? columns : [],
+            changes,
             affectedRows: rows.length,
             capturedChanges: publishedCaptured ||
                 (capturesTrackedTable || track.publish === false ? 0 : rows.length),