on-zero 0.6.14 → 0.6.16

package/src/syncHost.ts

@@ -1,19 +1,29 @@
 import { asQueryInternals } from '@rocicorp/zero/bindings'
 
 import { createPermissions } from './createPermissions'
-import { resolveServerQuery, type ZeroServerCommonOptions } from './createZeroServerCore'
 import {
-  createZeroSQLiteServer,
+  createZeroDirectServer,
+  resolveServerQuery,
+  type ZeroDirectServer,
+  type ZeroServerCommonOptions,
+} from './createZeroDirectServer'
+import {
+  createSQLiteDatabase,
   createZeroSQLiteTransaction,
+  defaultLedgerTables,
+  encodeSQLiteValue,
+  type SqlStatementMetadata,
+  type SQLiteExecResult,
   type SQLiteTransactionExecutor,
+  type SQLiteTransactionProvider,
   type ZeroSQLiteTransactionOptions,
-} from './createZeroSQLiteServer'
+} from './sqliteRuntime'
 import { createMutators } from './helpers/createMutators'
 import { runWithAuthScope } from './helpers/mutatorContext'
 import { runWithQueryContext } from './helpers/queryContext'
 import { setEnvironment, setSchema } from './state'
 
-import type { AuthData, GenericModels } from './types'
+import type { AsyncTaskEntry, AuthData, GenericModels } from './types'
 import type { Schema as ZeroSchema } from '@rocicorp/zero'
 
 export type SyncHostJsonValue =
@@ -34,14 +44,18 @@ export type SyncHostTransactionContext = {
 }
 
 export type SyncHostTransactionExecutor = {
-  exec(sql: string, params?: readonly unknown[]): void | Promise<void>
+  exec(
+    sql: string,
+    params?: readonly unknown[],
+    metadata?: SqlStatementMetadata,
+  ): SQLiteExecResult | Promise<SQLiteExecResult>
   query<Row extends Record<string, unknown> = Record<string, unknown>>(
     sql: string,
     params?: readonly unknown[],
   ): Row[] | Promise<Row[]>
   queryAst<Result = unknown>(
     ast: SyncHostJsonValue,
-    format: import('./createZeroSQLiteServer').SQLiteQueryFormat,
+    format: import('./sqliteRuntime').SQLiteQueryFormat,
     queryName?: string,
   ): Result | Promise<Result>
 }
@@ -79,6 +93,19 @@ export type CreateZeroSyncHostAdapterOptions<
     defaultMutateAuthData?: Pick<AuthData, 'email' | 'id'> & Partial<AuthData>
   }
 
+export type ZeroSyncHostAdapter<
+  Schema extends ZeroSchema,
+  Models extends GenericModels,
+> = {
+  mutators: Readonly<Record<string, SyncHostRegisteredMutator>>
+  resolveQuery(
+    name: string,
+    args: readonly SyncHostJsonValue[],
+    claims: SyncHostClaims,
+  ): Promise<SyncHostJsonValue>
+  server: ZeroDirectServer<Schema, Models>
+}
+
 export class MutationApplicationError extends Error {
   constructor(
     readonly details: string,
@@ -98,7 +125,10 @@ export function createZeroSyncHostAdapter<
   mapAuthData = defaultMapAuthData,
   transaction,
   ...options
-}: CreateZeroSyncHostAdapterOptions<Schema, Models, ServerActions>) {
+}: CreateZeroSyncHostAdapterOptions<Schema, Models, ServerActions>): ZeroSyncHostAdapter<
+  Schema,
+  Models
+> {
   setSchema(options.schema)
   setEnvironment('server')
 
@@ -117,9 +147,11 @@ export function createZeroSyncHostAdapter<
     for (const mutatorName of Object.keys(model.mutate ?? {})) {
       mutators[`${modelName}|${mutatorName}`] = async (executor, args, context) => {
         const authData = mapAuthData(context.claims)
-        const asyncTasks: Array<() => Promise<void>> = []
+        const asyncTaskEntries: AsyncTaskEntry[] = []
         const modelMutators = createMutators({
-          asyncTasks,
+          enqueueTask(task, opts) {
+            asyncTaskEntries.push({ task, barrier: opts?.barrier === true })
+          },
           authData,
           can: permissions.can,
           createServerActions: options.createServerActions,
@@ -151,7 +183,7 @@ export function createZeroSyncHostAdapter<
         } catch (error) {
           throw asMutationApplicationError(error)
         }
-        for (const task of asyncTasks) {
+        for (const { task } of asyncTaskEntries) {
           context.defer(() => runWithAuthScope(authData, task))
         }
       }
@@ -163,11 +195,18 @@ export function createZeroSyncHostAdapter<
   // creating a second on-zero cleanup ledger.
   mutators._zero_cleanupResults = async () => {}
 
-  const direct = createZeroSQLiteServer({
+  const transactionProvider: SQLiteTransactionProvider = (work) =>
+    transaction((executor) => work(toSQLiteExecutor(executor)))
+  const directDatabaseOptions = {
+    encodeValue: encodeValue ?? encodeSQLiteValue,
+    initializedLedgers: new Set<string>(),
+    ledgerTables: defaultLedgerTables,
+    schema: options.schema,
+    transactionProvider,
+  }
+  const direct = createZeroDirectServer({
     ...options,
-    encodeValue,
-    transactionProvider: (work) =>
-      transaction((executor) => work(toSQLiteExecutor(executor))),
+    createDatabase: () => createSQLiteDatabase(directDatabaseOptions),
   })
 
   return {
@@ -214,8 +253,8 @@ function toSQLiteExecutor(
   executor: SyncHostTransactionExecutor,
 ): SQLiteTransactionExecutor {
   return {
-    exec(sql, params) {
-      return executor.exec(sql, params)
+    exec(sql, params, metadata) {
+      return executor.exec(sql, params, metadata)
     },
     query<Row extends Record<string, unknown>>(sql: string, params?: readonly unknown[]) {
       return executor.query<Row>(sql, params)

package/src/types.ts

@@ -60,6 +60,17 @@ export type ServerActions =
 
 export type QueryBuilder = SchemaQuery<Schema>
 
+export type AsyncTask = () => Promise<void>
+
+export type AsyncTaskOptions = {
+  barrier?: boolean
+}
+
+export type AsyncTaskEntry = {
+  task: AsyncTask
+  barrier: boolean
+}
+
 /**
  * ➗0️⃣ END OVERRIDDEN TYPES
  */
@@ -71,7 +82,16 @@ export type MutatorContext = {
   environment: 'server' | 'client'
   server?: {
     actions: ServerActions
-    asyncTasks: Array<() => Promise<void>>
+    /**
+     * Schedules work after the mutation transaction commits. Tasks run in the
+     * background by default, following Zero's async task model, so they do not
+     * block the push response.
+     *
+     * Set `barrier: true` only when the client's next writes depend on the
+     * effect, such as provisioning a namespace before the client writes
+     * through a new instance. Barrier tasks finish before the push response.
+     */
+    enqueueTask(task: AsyncTask, opts?: AsyncTaskOptions): void
   }
   can: Can
 }
@@ -112,8 +132,6 @@ export type Can = <PWhere extends Where>(
   obj: string | Record<string, unknown>,
 ) => Promise<void>
 
-export type AsyncAction = () => Promise<void>
-
 type GenericTable = TableBuilderWithColumns<any>
 
 type GetTableSchema<TS extends GenericTable> =

package/src/vite-plugin.ts

@@ -62,6 +62,7 @@ export function onZeroPlugin(options: OnZeroPluginOptions = {}): Plugin[] {
       dir: dataDir,
       after: options.after,
       silent,
+      force: options.force,
     })
 
   return [

package/test-fixtures/server-return-types.ts

@@ -1,5 +1,9 @@
-import { createZeroServer } from 'on-zero/server'
-import { createZeroSQLiteServer } from 'on-zero/sqlite'
+import {
+  createZeroServer,
+  runAsyncTaskEntries,
+  type AsyncTaskEntry,
+} from 'on-zero/server'
+import { createZeroSQLiteServer, type SqlStatementMetadata } from 'on-zero/sqlite'
 
 import type { Config, MutatorContext } from 'on-zero'
 import type { Schema as ZeroSchema } from '@rocicorp/zero'
@@ -30,6 +34,7 @@ type SQLiteServer = ReturnType<typeof createZeroSQLiteServer<ZeroSchema, Models,
 
 declare const postgresServer: PostgresServer
 declare const sqliteServer: SQLiteServer
+declare const taskEntries: AsyncTaskEntry[]
 
 const authData: Config['authData'] = {
   email: 'admin@example.com',
@@ -37,6 +42,19 @@ const authData: Config['authData'] = {
   role: 'admin',
 }
 
+const sqliteWrite: SqlStatementMetadata = {
+  table: 'project_records',
+  publicTable: 'project',
+  kind: 'upsert',
+}
+void sqliteWrite
+
+void runAsyncTaskEntries(taskEntries, {
+  background(promise) {
+    void promise
+  },
+})
+
 postgresServer.mutate.project.create(
   { id: 'pg' },
   { authData: { email: authData.email, id: authData.id, role: authData.role } },

package/types/asyncTasks.d.ts

@@ -0,0 +1,7 @@
+import type { AsyncTaskEntry } from './types';
+export type RunAsyncTaskEntriesOptions = {
+    /** Receives the background-task promise. Omit this to await all entries. */
+    background?: (promise: Promise<void>) => void;
+};
+export declare function runAsyncTaskEntries(entries: readonly AsyncTaskEntry[], { background }?: RunAsyncTaskEntriesOptions): Promise<void>;
+//# sourceMappingURL=asyncTasks.d.ts.map

package/types/asyncTasks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"asyncTasks.d.ts","sourceRoot":"","sources":["../src/asyncTasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,MAAM,MAAM,0BAA0B,GAAG;IACvC,4EAA4E;IAC5E,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAA;CAC9C,CAAA;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,SAAS,cAAc,EAAE,EAClC,EAAE,UAAU,EAAE,GAAE,0BAA+B,GAC9C,OAAO,CAAC,IAAI,CAAC,CAsBf"}

package/types/createSchemaFromDrizzle.d.ts

@@ -1,4 +1,4 @@
-export { drizzleZeroConfig as createSchemaFromDrizzle } from 'drizzle-zero';
-export { createZeroTableBuilder } from 'drizzle-zero';
+export { drizzleZeroConfig as createSchemaFromDrizzle } from 'drizzle-zero-sqlite';
+export { createZeroTableBuilder } from 'drizzle-zero-sqlite';
 export { generateDrizzleSchemaFile } from './generate';
 //# sourceMappingURL=createSchemaFromDrizzle.d.ts.map

package/types/createSchemaFromDrizzle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSchemaFromDrizzle.d.ts","sourceRoot":"","sources":["../src/createSchemaFromDrizzle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,IAAI,uBAAuB,EAAE,MAAM,cAAc,CAAA;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA"}
+{"version":3,"file":"createSchemaFromDrizzle.d.ts","sourceRoot":"","sources":["../src/createSchemaFromDrizzle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,IAAI,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA"}

package/types/createZeroDirectServer.d.ts

@@ -0,0 +1,80 @@
+import { createPermissions } from './createPermissions';
+import type { AdminRoleMode, AsyncTask, AsyncTaskEntry, AsyncTaskOptions, AuthData, GenericModels, MutatorContext, QueryBuilder, Transaction } from './types';
+import type { AnyQueryRegistry, HumanReadable, Query, Schema as ZeroSchema } from '@rocicorp/zero';
+import type { Database } from '@rocicorp/zero/server';
+type MutateAuthData = Pick<AuthData, 'email' | 'id'> & Partial<AuthData>;
+export type MutateOptions = {
+    authData?: MutateAuthData;
+    awaitEffects?: boolean;
+};
+export type ServerMutate<Models extends GenericModels> = {
+    [Key in keyof Models]: {
+        [K in keyof Models[Key]['mutate']]: Models[Key]['mutate'][K] extends (ctx: MutatorContext, arg: infer Arg) => any ? (arg: Arg, options?: MutateOptions) => Promise<void> : (options?: MutateOptions) => Promise<void>;
+    };
+};
+export type ValidateQueryArgs = {
+    authData: AuthData | null;
+    queryName: string;
+    params: unknown;
+};
+export type ValidateMutationArgs = {
+    authData: AuthData | null;
+    mutatorName: string;
+    tableName: string;
+    args: unknown;
+};
+export type ValidateQueryFn = (args: ValidateQueryArgs) => void;
+export type ValidateMutationFn = (args: ValidateMutationArgs) => void | Promise<void>;
+export type ServerQueryResolverOptions = {
+    authData: AuthData | null;
+    name: string;
+    args: unknown;
+    queries: AnyQueryRegistry;
+    permissions: ReturnType<typeof createPermissions>;
+    validateQuery?: ValidateQueryFn;
+};
+export declare function resolveServerQuery({ authData, name, args, queries, permissions, validateQuery, }: ServerQueryResolverOptions): any;
+export type TransactionAttemptLifecycle = {
+    beginAttempt(): void;
+    completeAttempt(): void;
+    rollbackAttempt(): void;
+    commitTransaction(): void;
+    rollbackTransaction(): void;
+};
+export type ZeroServerDatabase = Database<Transaction>;
+export type ZeroServerCommonOptions<Schema extends ZeroSchema, Models extends GenericModels, ServerActions extends Record<string, unknown>> = {
+    schema: Schema;
+    models: Models;
+    createServerActions: () => ServerActions;
+    queries?: AnyQueryRegistry;
+    /** generated validators keyed by model and mutation name */
+    mutations?: Record<string, Record<string, any>>;
+    /** synchronous query authorization hook; throw to reject */
+    validateQuery?: ValidateQueryFn;
+    /** mutation authorization hook; throw to reject */
+    validateMutation?: ValidateMutationFn;
+    /** controls which operations the admin role bypasses */
+    defaultAllowAdminRole?: AdminRoleMode;
+    /** auth data used by direct server mutations when no scope provides it */
+    defaultMutateAuthData?: MutateAuthData;
+};
+export type ZeroDirectServerOptions<Schema extends ZeroSchema, Models extends GenericModels, ServerActions extends Record<string, unknown>> = ZeroServerCommonOptions<Schema, Models, ServerActions> & {
+    createDatabase: () => ZeroServerDatabase;
+};
+export type ZeroDirectServer<Schema extends ZeroSchema, Models extends GenericModels> = {
+    transaction: <CB extends (tx: Transaction) => Promise<any>, Returns extends CB extends (tx: Transaction) => Promise<infer X> ? X : never>(query: CB) => Promise<Returns>;
+    mutate: ServerMutate<Models>;
+    query: <R>(cb: (q: QueryBuilder) => Query<any, Schema, R>, authData?: AuthData | null) => Promise<HumanReadable<R>>;
+};
+export declare function createAsyncTaskCollector(): {
+    committed: AsyncTaskEntry[];
+    enqueueTask: (task: AsyncTask, opts?: AsyncTaskOptions) => void;
+    lifecycle: TransactionAttemptLifecycle;
+};
+export declare function createZeroDirectServerRuntime<Schema extends ZeroSchema, Models extends GenericModels, ServerActions extends Record<string, unknown>>({ createDatabase, createServerActions, defaultAllowAdminRole, defaultMutateAuthData, models, mutations: mutationValidators, queries, schema, validateMutation, validateQuery, }: ZeroDirectServerOptions<Schema, Models, ServerActions>): {
+    permissions: ReturnType<typeof createPermissions<Schema>>;
+    server: ZeroDirectServer<Schema, Models>;
+};
+export declare function createZeroDirectServer<Schema extends ZeroSchema, Models extends GenericModels, ServerActions extends Record<string, unknown>>(options: ZeroDirectServerOptions<Schema, Models, ServerActions>): ZeroDirectServer<Schema, Models>;
+export {};
+//# sourceMappingURL=createZeroDirectServer.d.ts.map

package/types/createZeroDirectServer.d.ts.map

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

package/types/createZeroSQLiteServer.d.ts

@@ -1,37 +1,12 @@
-import { type ZeroServer, type ZeroServerCommonOptions } from './createZeroServerCore';
-import type { GenericModels, Transaction } from './types';
-import type { AST, Schema as ZeroSchema } from '@rocicorp/zero';
-import type { TransactionProviderInput } from '@rocicorp/zero/server';
-export type SQLiteTransactionExecutor = {
-    exec(sql: string, params?: readonly unknown[]): void | Promise<void>;
-    query<Row extends Record<string, unknown> = Record<string, unknown>>(sql: string, params?: readonly unknown[]): Row[] | Promise<Row[]>;
-    queryAst<Result = unknown>(ast: AST, format: SQLiteQueryFormat, queryName?: string): Result | Promise<Result>;
-};
-export type SQLiteQueryFormat = {
-    relationships: Record<string, SQLiteQueryFormat>;
-    singular: boolean;
-};
-export type SQLiteTransactionProvider = <R>(callback: (tx: SQLiteTransactionExecutor) => Promise<R>) => Promise<R>;
-type SQLiteColumn = ZeroSchema['tables'][string]['columns'][string];
-export type SQLiteValueContext = {
-    column: SQLiteColumn;
-    columnName: string;
-    tableName: string;
-};
-export type ZeroSQLiteTransactionOptions<Schema extends ZeroSchema> = {
-    schema: Schema;
-    encodeValue?: (value: unknown, context: SQLiteValueContext) => unknown;
-};
-export type SQLiteLedgerTables = {
-    clients: string;
-    mutations: string;
-};
+import { type SQLiteLedgerTables, type SQLiteTransactionProvider, type SQLiteValueContext } from './sqliteRuntime';
+import type { ZeroServer, ZeroServerCommonOptions } from './createZeroServerCore';
+import type { GenericModels } from './types';
+import type { Schema as ZeroSchema } from '@rocicorp/zero';
 export type CreateZeroSQLiteServerOptions<Schema extends ZeroSchema, Models extends GenericModels, ServerActions extends Record<string, unknown>> = ZeroServerCommonOptions<Schema, Models, ServerActions> & {
     transactionProvider: SQLiteTransactionProvider;
     ledgerTables?: (upstreamSchema: string) => SQLiteLedgerTables;
     encodeValue?: (value: unknown, context: SQLiteValueContext) => unknown;
 };
 export declare function createZeroSQLiteServer<Schema extends ZeroSchema, Models extends GenericModels, ServerActions extends Record<string, unknown>>({ encodeValue, ledgerTables, transactionProvider, ...options }: CreateZeroSQLiteServerOptions<Schema, Models, ServerActions>): ZeroServer<Schema, Models, ServerActions>;
-export declare function createZeroSQLiteTransaction<Schema extends ZeroSchema>(options: ZeroSQLiteTransactionOptions<Schema>, executor: SQLiteTransactionExecutor, input?: TransactionProviderInput): Transaction;
-export {};
+export * from './sqliteRuntime';
 //# sourceMappingURL=createZeroSQLiteServer.d.ts.map

package/types/createZeroSQLiteServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createZeroSQLiteServer.d.ts","sourceRoot":"","sources":["../src/createZeroSQLiteServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createZeroSQLiteServer.d.ts","sourceRoot":"","sources":["../src/createZeroSQLiteServer.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC9B,KAAK,kBAAkB,EACxB,MAAM,iBAAiB,CAAA;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAA;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE1D,MAAM,MAAM,6BAA6B,CACvC,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,aAAa,EAC5B,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAC3C,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG;IAC3D,mBAAmB,EAAE,yBAAyB,CAAA;IAC9C,YAAY,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,kBAAkB,CAAA;IAC7D,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAA;CACvE,CAAA;AAED,wBAAgB,sBAAsB,CACpC,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,aAAa,EAC5B,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7C,EACA,WAA+B,EAC/B,YAAkC,EAClC,mBAAmB,EACnB,GAAG,OAAO,EACX,EAAE,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,UAAU,CAC1E,MAAM,EACN,MAAM,EACN,aAAa,CACd,CAeA;AAED,cAAc,iBAAiB,CAAA"}