over-zero 0.0.5 → 0.0.7

package/readme.md

@@ -1,16 +1,20 @@
 # over-zero
 
-This library is a lightweight suite of helpers that we extracted in our use of
-Zero across multiple apps that automates and simplifies setting up Zero,
-integrating authentication, writing your schema in a DRY way, and getting back
-great types.
-
-It's main exports are `createZero` and `createZeroServer`, for your client and
-server-side setup.
+This library is small suite of helpers we extracted after using Zero across a
+few production apps.
 
 It's main feature is allowing you to define a `models/*` directory where you can
-define each zero **table** alongside its **permissions** and **mutations**, a
-pattern that makes your codebase more intuitive as you co-locate schema,
-permissions, and mutations for each logical model together.
+define each zero **table** alongside its **permissions** and **mutations** in an
+intuitive and simple way.
+
+It also provides `createZero` and `createZeroServer` which return helpers for
+your that make a variety of common client and server patterns simpler.
+
+Within models, you can automatically define CRUD-style mutations which apply
+permissions defined using simple `where` and `mutations` helper functions. You
+can then use your permissions in custom mutators with the `can` helper function.
+
+For permissions, you get a handy `usePermission` helper for client.
 
-Beyond that,
+On the server, you get helpers to run one-off queries and mutations using
+standard Zero APIs, and a helper to simplify setting up your `/push` endpoint.

package/src/createPermissions.ts

@@ -7,8 +7,16 @@ import type {
 import { ANYONE_CAN, definePermissions } from '@rocicorp/zero'
 import { ensure, EnsureError, objectEntries } from '@vxrn/helpers'
 import { runWithContext } from './helpers/context'
+import { setDidRunPermissionCheck } from './helpers/didRunPermissionCheck'
 import { prettyFormatZeroQuery } from './helpers/prettyFormatZeroQuery'
-import type { AuthData, MutatorContext, TableName, Transaction, Where } from './types'
+import type {
+  AuthData,
+  Can,
+  MutatorContext,
+  TableName,
+  Transaction,
+  Where,
+} from './types'
 import { getWhereTableName } from './where'
 
 export function createPermissions<Schema extends ZeroSchema>({
@@ -100,10 +108,7 @@ export function createPermissions<Schema extends ZeroSchema>({
     return eb.and(permissionCondition, ...primaryKeyWheres)
   }
 
-  async function can<
-    PWhere extends PermissionsWhere,
-    Action extends keyof ReturnType<PWhere>,
-  >(where: PWhere, action: Action, obj: any) {
+  const can: Can = async (where, action, obj) => {
     const ctx = getContext()
     const tableName = getWhereTableName(where)
     if (!tableName) {
@@ -120,7 +125,7 @@ export function createPermissions<Schema extends ZeroSchema>({
         action as string,
         obj
       )
-      ctx.didCanPermissionsRun = true
+      setDidRunPermissionCheck(ctx)
     }
   }
 
@@ -171,41 +176,44 @@ export function createPermissions<Schema extends ZeroSchema>({
 
   const readPermissions = definePermissions<AuthData, Schema>(schema, async () => {
     const permissionsEntries = await Promise.all(
-      objectEntries(models).map(async ([key, model]) => {
-        return await runWithContext(
-          {
-            authData: { id: '', role: undefined, email: '' },
-          } as any,
-          () => {
-            return [
-              key,
-              {
-                row: {
-                  select: [
-                    (authData: AuthData, eb: ExpressionBuilder<any, any>) => {
-                      const out = model.permissions(eb, authData).read
-
-                      if (out === true) {
-                        return eb.and()
-                      }
-
-                      if (out === false) {
-                        return eb.cmpLit(true, '=', false)
-                      }
-
-                      return out
-                    },
-                  ],
-                  // we have permissions on these through our model system with custom mutators:
-                  insert: ANYONE_CAN,
-                  update: ANYONE_CAN,
-                  delete: ANYONE_CAN,
+      objectEntries(models)
+        // non permissioned models dont turn into read permissions
+        .filter(([_, model]) => !!model.permissions)
+        .map(async ([key, model]) => {
+          return await runWithContext(
+            {
+              authData: { id: '', role: undefined, email: '' },
+            } as any,
+            () => {
+              return [
+                key,
+                {
+                  row: {
+                    select: [
+                      (authData: AuthData, eb: ExpressionBuilder<any, any>) => {
+                        const out = model.permissions(eb, authData).read
+
+                        if (out === true) {
+                          return eb.and()
+                        }
+
+                        if (out === false) {
+                          return eb.cmpLit(true, '=', false)
+                        }
+
+                        return out
+                      },
+                    ],
+                    // we have permissions on these through our model system with custom mutators:
+                    insert: ANYONE_CAN,
+                    update: ANYONE_CAN,
+                    delete: ANYONE_CAN,
+                  },
                 },
-              },
-            ]
-          }
-        )
-      })
+              ]
+            }
+          )
+        })
     )
 
     const permissions = Object.fromEntries(permissionsEntries)

package/src/createZeroClient.tsx

@@ -1,6 +1,6 @@
 import type { Row, Zero, ZeroOptions, Schema as ZeroSchema } from '@rocicorp/zero'
 import { useZero, ZeroProvider, useQuery as zeroUseQuery } from '@rocicorp/zero/react'
-import { createEmitter, createLocalStorage, mapObject } from '@vxrn/helpers'
+import { createEmitter, mapObject } from '@vxrn/helpers'
 import { createContext, use, useMemo, type ReactNode } from 'react'
 import { createPermissions } from './createPermissions'
 import { context } from './helpers/context'
@@ -39,9 +39,9 @@ export function createZeroClient<
     environment: 'client',
   })
 
-  const permissionCache = createLocalStorage<string, boolean>('permissions-cache', {
-    storageLimit: 24,
-  })
+  // const permissionCache = createLocalStorage<string, boolean>('permissions-cache', {
+  //   storageLimit: 24,
+  // })
 
   const zeroEvents = createEmitter<ZeroEvent | null>('zero', null)
 
@@ -65,14 +65,14 @@ export function createZeroClient<
     // we fallback to just table.action, to avoid flickers for now
     const keyBase = `${String(table)}${action}`
     const key = `${keyBase}${typeof objOrId === 'string' ? objOrId : JSON.stringify(objOrId)}`
-    const cacheVal = permissionCache.get(key) ?? permissionCache.get(keyBase)
+    // const cacheVal = permissionCache.get(key) ?? permissionCache.get(keyBase)
     const authData = useAuthData()
     const permission = modelPermissions[table]
 
     const query = (() => {
       let baseQuery = zero.query[table].one()
 
-      if (!enabled) {
+      if (!enabled || !permission) {
         return baseQuery
       }
 
@@ -88,7 +88,7 @@ export function createZeroClient<
     })()
 
     const [data, status] = useQuery(query, {
-      enabled: Boolean(enabled && authData && objOrId),
+      enabled: Boolean(enabled && permission && authData && objOrId),
     })
 
     if (debug) {

package/src/createZeroServer.ts

@@ -1,4 +1,4 @@
-import type { Schema as ZeroSchema } from '@rocicorp/zero'
+import type { Query, Schema as ZeroSchema } from '@rocicorp/zero'
 import type { TransactionProviderInput } from '@rocicorp/zero/pg'
 import { PostgresJSConnection, PushProcessor } from '@rocicorp/zero/pg'
 import { ZQLDatabase } from '@rocicorp/zero/server'
@@ -21,17 +21,26 @@ export function createZeroServer<
   ServerActions extends Record<string, unknown>,
 >({
   createServerActions,
+  database,
   schema,
   models,
 }: {
+  /**
+   * The DB connection string, same as ZERO_UPSTREAM_DB
+   */
+  database: string
   schema: Schema
   models: Models
   createServerActions: () => ServerActions
 }) {
-  const dbString = assertString(process.env.ZERO_UPSTREAM_DB)
+  const dbString = assertString(database, `"database" prop`)
+  const db = postgres(dbString)
 
   const zeroServerDatabase = new ZQLDatabase(
-    new PostgresJSConnection(postgres(dbString)),
+    new PostgresJSConnection(
+      // TODO if you have duplicate postgres due to zero having its own in node_modules TS types break
+      db as any
+    ),
     schema
   )
 
@@ -87,7 +96,7 @@ export function createZeroServer<
     }
   }
 
-  const serverMutate = async (
+  const mutate = async (
     run: (tx: Transaction, mutators: GetZeroMutators<Models>) => Promise<void>,
     authData?: Pick<AuthData, 'email' | 'id'> & Partial<AuthData>
   ) => {
@@ -107,26 +116,14 @@ export function createZeroServer<
       can: permissions.can,
     })
 
-    await serverTransaction(async (tx) => {
+    await transaction(async (tx) => {
       await run(tx, mutators)
     })
 
     await Promise.all(asyncTasks.map((t) => t()))
   }
 
-  // shorthand but nicer for single queries
-  // TODO should unwrap q.query
-  const serverQuery = serverTransaction
-
-  // This is needed temporarily and will be cleaned up in the future.
-  const dummyTransactionInput: TransactionProviderInput = {
-    clientGroupID: 'unused',
-    clientID: 'unused',
-    mutationID: 42,
-    upstreamSchema: 'unused',
-  }
-
-  async function serverTransaction<
+  async function transaction<
     CB extends (tx: Transaction) => Promise<any>,
     Returns extends CB extends (tx: Transaction) => Promise<infer X> ? X : never,
   >(query: CB): Promise<Returns> {
@@ -139,15 +136,35 @@ export function createZeroServer<
       const output = await zeroServerDatabase.transaction(query, dummyTransactionInput)
       return output as any
     } catch (err) {
-      console.error(`Error running serverTransaction(): ${err}`)
+      console.error(`Error running transaction(): ${err}`)
       throw err
     }
   }
 
+  type ZeroQueryFn<Response extends Query<any, any>> = (
+    query: Transaction['query']
+  ) => Promise<Response>
+
+  async function query<GetQuery extends ZeroQueryFn<any>>(
+    cb: GetQuery
+  ): Promise<ReturnType<GetQuery>> {
+    return await transaction(async (tx) => {
+      return await cb(tx.query)
+    })
+  }
+
+  // This is needed temporarily and will be cleaned up in the future.
+  const dummyTransactionInput: TransactionProviderInput = {
+    clientGroupID: 'unused',
+    clientID: 'unused',
+    mutationID: 42,
+    upstreamSchema: 'unused',
+  }
+
   return {
     handleMutationRequest,
-    transaction: serverTransaction,
-    mutate: serverMutate,
-    query: serverQuery,
+    transaction,
+    mutate,
+    query,
   }
 }

package/src/helpers/createMutators.ts

@@ -1,10 +1,11 @@
 import { isClient, isServer, mapObject, time } from '@vxrn/helpers'
 import type {
   AuthData,
+  Can,
   GenericModels,
   GetZeroMutators,
+  MutatorContext,
   Transaction,
-  Where,
 } from '../types'
 import { runWithContext } from './context'
 
@@ -18,7 +19,7 @@ export function createMutators<Models extends GenericModels>({
 }: {
   environment: 'server' | 'client'
   authData: AuthData | null
-  can: (where: Where<any>, action: string, obj: any) => void
+  can: Can
   models: Models
   asyncTasks?: Array<() => Promise<void>>
   createServerActions?: () => Record<string, any>
@@ -31,13 +32,18 @@ export function createMutators<Models extends GenericModels>({
 
   function withContext<Args extends any[]>(fn: (...args: Args) => Promise<void>) {
     return async (tx: Transaction, ...args: Args): Promise<void> => {
-      const mutationContext = {
+      const mutationContext: MutatorContext = {
         tx,
         authData,
         environment,
         can,
-        serverActions,
-        asyncTasks,
+        server:
+          environment === 'server'
+            ? {
+                actions: serverActions || {},
+                asyncTasks: asyncTasks || {},
+              }
+            : undefined,
       }
 
       return await runWithContext(mutationContext, () => {

package/src/helpers/didRunPermissionCheck.ts

@@ -0,0 +1,11 @@
+import type { MutatorContext } from '../types'
+
+const PermissionCheckRan = new WeakMap<MutatorContext, boolean>()
+
+export const getDidRunPermissionCheck = (ctx: MutatorContext) => {
+  return PermissionCheckRan.get(ctx)
+}
+
+export const setDidRunPermissionCheck = (ctx: MutatorContext) => {
+  return PermissionCheckRan.set(ctx, true)
+}

package/src/mutations.ts

@@ -1,4 +1,5 @@
 import type { TableBuilderWithColumns } from '@rocicorp/zero'
+import { getDidRunPermissionCheck } from './helpers/didRunPermissionCheck'
 import type {
   MutatorContext,
   TableInsertRow,
@@ -46,11 +47,13 @@ type MutationsWithCRUD<Table extends GenericTable, Mutations extends MutationBui
       : never
 }
 
+export function mutations<Mutations extends MutationBuilders>(
+  mutations: Mutations
+): Mutations
 export function mutations<Table extends GenericTable, Permissions extends Where>(
   table: Table,
   permissions: Permissions
 ): MutationsWithCRUD<Table, {}>
-
 export function mutations<
   Table extends GenericTable,
   Permissions extends Where,
@@ -60,11 +63,6 @@ export function mutations<
   permissions: Permissions,
   mutations: Mutations
 ): MutationsWithCRUD<Table, Mutations>
-
-export function mutations<Mutations extends MutationBuilder>(
-  mutations: Mutations
-): Mutations
-
 // TODO we should enforece the CRUD mutations obj to the callier so they get it auto-typed
 export function mutations<
   Table extends GenericTable,
@@ -84,7 +82,7 @@ export function mutations<
          *   - for the rest: check runs before mutation
          */
         const runServerPermissionCheck = async () => {
-          if (ctx.didCanPermissionsRun) {
+          if (getDidRunPermissionCheck(ctx)) {
             // if the user-defined CRUD mutation runs their own "can", we avoid running ours
             return
           }

package/src/types.ts

@@ -32,6 +32,7 @@ export interface Config {}
 interface DefaultConfig {
   schema: ZeroSchema
   authData: {}
+  serverActions: null
 }
 
 interface FinalConfig extends Omit<DefaultConfig, keyof Config>, Config {}
@@ -48,10 +49,26 @@ export type AuthData = FinalConfig['authData'] extends Record<string, unknown>
   ? FinalConfig['authData']
   : Record<string, unknown>
 
+export type ServerActions = FinalConfig['serverActions'] extends Record<string, unknown>
+  ? FinalConfig['serverActions']
+  : Record<string, unknown>
+
 /**
  * ➗0️⃣ END OVERRIDDEN TYPES
  */
 
+// the first argument passed to every mutation:
+export type MutatorContext = {
+  tx: Transaction
+  authData: AuthData | null
+  environment: 'server' | 'client'
+  server?: {
+    actions: ServerActions
+    asyncTasks: Array<() => Promise<void>>
+  }
+  can: Can
+}
+
 // turns our mutators with custom context into zero mutators
 export type GetZeroMutators<Models extends GenericModels> = {
   [Key in keyof Models]: TransformMutators<GetModelMutators<Models>[Key]>
@@ -64,7 +81,7 @@ type GetModelMutators<Models extends GenericModels> = {
 export type GenericModels = {
   [key: string]: {
     mutate: Record<string, (ctx: MutatorContext, obj?: any) => Promise<any>>
-    permissions: Where
+    permissions?: Where
   }
 }
 
@@ -74,15 +91,16 @@ export type TransformMutators<T> = {
     : never
 }
 
-export type MutatorContext = {
-  tx: Transaction
-  authData: AuthData | null
-  environment: 'server' | 'client'
-  serverActions?: any // TODO
-  asyncTasks?: Array<() => Promise<void>>
-  can: any // TODO
-  didCanPermissionsRun?: boolean
-}
+export type Where<Table extends TableName = TableName, ReturnType = any> = (
+  expressionBuilder: ExpressionBuilder<Schema, Table>,
+  auth: AuthData | null
+) => ReturnType
+
+export type Can = <PWhere extends Where, Action extends keyof ReturnType<PWhere>>(
+  where: PWhere,
+  action: Action,
+  obj: string | Record<string, unknown>
+) => Promise<void>
 
 export type AsyncAction = () => Promise<void>
 
@@ -108,9 +126,4 @@ export type TablePrimaryKeys<TS extends GenericTable> = TupleToUnion<
   GetTableSchema<TS>['primaryKey']
 >
 
-export type Where<Table extends TableName = TableName, ReturnType = any> = (
-  expressionBuilder: ExpressionBuilder<Schema, Table>,
-  auth: AuthData | null
-) => ReturnType
-
 export type ZeroEvent = { type: 'error'; message: string }

package/types/createPermissions.d.ts

@@ -1,12 +1,12 @@
 import type { Condition, ExpressionBuilder, Schema as ZeroSchema } from '@rocicorp/zero';
-import type { AuthData, MutatorContext, Where } from './types';
+import type { AuthData, Can, MutatorContext, Where } from './types';
 export declare function createPermissions<Schema extends ZeroSchema>({ environment, schema, models, getContext, }: {
     environment: 'client' | 'server';
     schema: Schema;
     models: any;
     getContext: () => MutatorContext;
 }): {
-    can: <PWhere extends Where<string, Partial<Record<("read" | "write" | "insert" | "update" | "delete" | "select") | (string & {}), boolean | Condition>>>, Action extends keyof ReturnType<PWhere>>(where: PWhere, action: Action, obj: any) => Promise<void>;
+    can: Can;
     buildPermissionQuery: <PermissionWhere extends Where<string, Partial<Record<("read" | "write" | "insert" | "update" | "delete" | "select") | (string & {}), boolean | Condition>>>, Action extends string>(authData: AuthData | null, eb: ExpressionBuilder<any, any>, permissionWhere: PermissionWhere, action: Action, objOrId: Record<string, any> | string) => Condition;
     readPermissions: Promise<{
         tables: Record<string, {

package/types/createPermissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPermissions.d.ts","sourceRoot":"","sources":["../src/createPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EAEjB,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAKvB,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAA0B,KAAK,EAAE,MAAM,SAAS,CAAA;AAGtF,wBAAgB,iBAAiB,CAAC,MAAM,SAAS,UAAU,EAAE,EAC3D,WAAW,EACX,MAAM,EACN,MAAM,EACN,UAAU,GACX,EAAE;IACD,WAAW,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,GAAG,CAAA;IACX,UAAU,EAAE,MAAM,cAAc,CAAA;CACjC;UAgFG,MAAM,8IACN,MAAM,SAAS,MAAM,UAAU,CAAC,MAAM,CAAC,SAChC,MAAM,UAAU,MAAM,OAAO,GAAG;2BAvDvC,eAAe,8IACf,MAAM,SAAS,MAAM,YAEX,QAAQ,GAAG,IAAI,MACrB,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,mBACd,eAAe,UACxB,MAAM,WAEL,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;;;;sBAfhC,CAAC;sBAMQ,CAAC;sBAId,CAAC;+BACA,CAAC;gCAGa,CAAA;;sBAGW,CAAC;;;sBAMV,CAAC;sBAMnB,CAAA;sBACmD,CAAA;+BAClC,CAAC;gCAIhB,CAAA;;sBAGQ,CAAC;;;;EA2Id"}
+{"version":3,"file":"createPermissions.d.ts","sourceRoot":"","sources":["../src/createPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EAEjB,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAMvB,OAAO,KAAK,EACV,QAAQ,EACR,GAAG,EACH,cAAc,EAGd,KAAK,EACN,MAAM,SAAS,CAAA;AAGhB,wBAAgB,iBAAiB,CAAC,MAAM,SAAS,UAAU,EAAE,EAC3D,WAAW,EACX,MAAM,EACN,MAAM,EACN,UAAU,GACX,EAAE;IACD,WAAW,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,GAAG,CAAA;IACX,UAAU,EAAE,MAAM,cAAc,CAAA;CACjC;;2BA2BG,eAAe,8IACf,MAAM,SAAS,MAAM,YAEX,QAAQ,GAAG,IAAI,MACrB,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,mBACd,eAAe,UACxB,MAAM,WAEL,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;;;;sBApBtB,CAAC;sBAKN,CAAC;sBAMQ,CAAC;+BACF,CAAC;gCAIF,CAAC;;sBAG6B,CAAC;;;sBAMxC,CAAA;sBAGe,CAAC;sBAMpB,CAAC;+BAA+B,CAAC;gCAEL,CAAC;;sBAIA,CAAC;;;;EA8IrC"}

package/types/createZeroServer.d.ts

@@ -1,6 +1,10 @@
 import type { Schema as ZeroSchema } from '@rocicorp/zero';
 import type { AsyncAction, AuthData, GenericModels, GetZeroMutators, Transaction } from './types';
-export declare function createZeroServer<Schema extends ZeroSchema, Models extends GenericModels, ServerActions extends Record<string, unknown>>({ createServerActions, schema, models, }: {
+export declare function createZeroServer<Schema extends ZeroSchema, Models extends GenericModels, ServerActions extends Record<string, unknown>>({ createServerActions, database, schema, models, }: {
+    /**
+     * The DB connection string, same as ZERO_UPSTREAM_DB
+     */
+    database: string;
     schema: Schema;
     models: Models;
     createServerActions: () => ServerActions;
@@ -58,6 +62,6 @@ export declare function createZeroServer<Schema extends ZeroSchema, Models exten
     }>;
     transaction: <CB extends (tx: Transaction) => Promise<any>, Returns extends CB extends (tx: Transaction) => Promise<infer X> ? X : never>(query: CB) => Promise<Returns>;
     mutate: (run: (tx: Transaction, mutators: GetZeroMutators<Models>) => Promise<void>, authData?: Pick<AuthData, "email" | "id"> & Partial<AuthData>) => Promise<void>;
-    query: <CB extends (tx: Transaction) => Promise<any>, Returns extends CB extends (tx: Transaction) => Promise<infer X> ? X : never>(query: CB) => Promise<Returns>;
+    query: <GetQuery extends (query: Transaction["query"]) => Promise<any>>(cb: GetQuery) => Promise<ReturnType<GetQuery>>;
 };
 //# sourceMappingURL=createZeroServer.d.ts.map

package/types/createZeroServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createZeroServer.d.ts","sourceRoot":"","sources":["../src/createZeroServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAS1D,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,aAAa,EACb,eAAe,EACf,WAAW,EACZ,MAAM,SAAS,CAAA;AAEhB,wBAAgB,gBAAgB,CAC9B,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,aAAa,EAC5B,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7C,EACA,mBAAmB,EACnB,MAAM,EACN,MAAM,GACP,EAAE;IACD,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,mBAAmB,EAAE,MAAM,aAAa,CAAA;CACzC;oEAqBI;QACD,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;QACzB,OAAO,EAAE,OAAO,CAAA;QAChB,cAAc,CAAC,EAAE,OAAO,CAAA;KACzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA2EC,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,EAC5C,OAAO,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,SACrE,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;kBAzCvB,CAAC,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,aAC/D,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;YAsC7D,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,EAC5C,OAAO,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,SACrE,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;EAqB/B"}
+{"version":3,"file":"createZeroServer.d.ts","sourceRoot":"","sources":["../src/createZeroServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AASjE,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,aAAa,EACb,eAAe,EACf,WAAW,EACZ,MAAM,SAAS,CAAA;AAEhB,wBAAgB,gBAAgB,CAC9B,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,aAAa,EAC5B,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7C,EACA,mBAAmB,EACnB,QAAQ,EACR,MAAM,EACN,MAAM,GACP,EAAE;IACD;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,mBAAmB,EAAE,MAAM,aAAa,CAAA;CACzC;oEAyBI;QACD,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;QACzB,OAAO,EAAE,OAAO,CAAA;QAChB,cAAc,CAAC,EAAE,OAAO,CAAA;KACzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA+DC,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,EAC5C,OAAO,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,SACrE,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;kBA7BvB,CAAC,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,aAC/D,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;YA+C1C,QAAQ,iBAHpB,WAAW,CAAC,OAAO,CAAC,uBAIvB,QAAQ,KACX,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;EAoBjC"}

package/types/helpers/createMutators.d.ts

@@ -1,8 +1,8 @@
-import type { AuthData, GenericModels, GetZeroMutators, Where } from '../types';
+import type { AuthData, Can, GenericModels, GetZeroMutators } from '../types';
 export declare function createMutators<Models extends GenericModels>({ environment, authData, createServerActions, asyncTasks, can, models, }: {
     environment: 'server' | 'client';
     authData: AuthData | null;
-    can: (where: Where<any>, action: string, obj: any) => void;
+    can: Can;
     models: Models;
     asyncTasks?: Array<() => Promise<void>>;
     createServerActions?: () => Record<string, any>;

package/types/helpers/createMutators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createMutators.d.ts","sourceRoot":"","sources":["../../src/helpers/createMutators.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,eAAe,EAEf,KAAK,EACN,MAAM,UAAU,CAAA;AAGjB,wBAAgB,cAAc,CAAC,MAAM,SAAS,aAAa,EAAE,EAC3D,WAAW,EACX,QAAQ,EACR,mBAAmB,EACnB,UAAe,EACf,GAAG,EACH,MAAM,GACP,EAAE;IACD,WAAW,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAChC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;IACzB,GAAG,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,IAAI,CAAA;IAC1D,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;IACvC,mBAAmB,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAChD,GAAG,eAAe,CAAC,MAAM,CAAC,CAwG1B"}
+{"version":3,"file":"createMutators.d.ts","sourceRoot":"","sources":["../../src/helpers/createMutators.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,QAAQ,EACR,GAAG,EACH,aAAa,EACb,eAAe,EAGhB,MAAM,UAAU,CAAA;AAGjB,wBAAgB,cAAc,CAAC,MAAM,SAAS,aAAa,EAAE,EAC3D,WAAW,EACX,QAAQ,EACR,mBAAmB,EACnB,UAAe,EACf,GAAG,EACH,MAAM,GACP,EAAE;IACD,WAAW,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAChC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;IACzB,GAAG,EAAE,GAAG,CAAA;IACR,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;IACvC,mBAAmB,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAChD,GAAG,eAAe,CAAC,MAAM,CAAC,CA6G1B"}

package/types/helpers/didRunPermissionCheck.d.ts

@@ -0,0 +1,4 @@
+import type { MutatorContext } from '../types';
+export declare const getDidRunPermissionCheck: (ctx: MutatorContext) => boolean | undefined;
+export declare const setDidRunPermissionCheck: (ctx: MutatorContext) => WeakMap<MutatorContext, boolean>;
+//# sourceMappingURL=didRunPermissionCheck.d.ts.map

package/types/helpers/didRunPermissionCheck.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"didRunPermissionCheck.d.ts","sourceRoot":"","sources":["../../src/helpers/didRunPermissionCheck.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAI9C,eAAO,MAAM,wBAAwB,GAAI,KAAK,cAAc,wBAE3D,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAI,KAAK,cAAc,qCAE3D,CAAA"}

package/types/mutations.d.ts

@@ -13,8 +13,8 @@ type CRUDNames = 'insert' | 'upsert' | 'update' | 'delete';
 type MutationsWithCRUD<Table extends GenericTable, Mutations extends MutationBuilders> = {
     [Key in CRUDNames | keyof Mutations]: Key extends keyof Mutations ? Mutations[Key] : Key extends keyof CRUDMutations<any> ? CRUDMutations<Table>[Key] : never;
 };
+export declare function mutations<Mutations extends MutationBuilders>(mutations: Mutations): Mutations;
 export declare function mutations<Table extends GenericTable, Permissions extends Where>(table: Table, permissions: Permissions): MutationsWithCRUD<Table, {}>;
 export declare function mutations<Table extends GenericTable, Permissions extends Where, Mutations extends MutationBuilders>(table: Table, permissions: Permissions, mutations: Mutations): MutationsWithCRUD<Table, Mutations>;
-export declare function mutations<Mutations extends MutationBuilder>(mutations: Mutations): Mutations;
 export {};
 //# sourceMappingURL=mutations.d.ts.map

package/types/mutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../src/mutations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EAEd,cAAc,EACd,KAAK,EACN,MAAM,SAAS,CAAA;AAMhB,KAAK,eAAe,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AACnF,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAevD,KAAK,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;AAEhD,KAAK,aAAa,CAAC,KAAK,SAAS,YAAY,IAAI;IAC/C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;CAC/C,CAAA;AAED,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAE1D,KAAK,iBAAiB,CAAC,KAAK,SAAS,YAAY,EAAE,SAAS,SAAS,gBAAgB,IAAI;KACtF,GAAG,IAAI,SAAS,GAAG,MAAM,SAAS,GAAG,GAAG,SAAS,MAAM,SAAS,GAC7D,SAAS,CAAC,GAAG,CAAC,GACd,GAAG,SAAS,MAAM,aAAa,CAAC,GAAG,CAAC,GAClC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GACzB,KAAK;CACZ,CAAA;AAED,wBAAgB,SAAS,CAAC,KAAK,SAAS,YAAY,EAAE,WAAW,SAAS,KAAK,EAC7E,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,GACvB,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AAE/B,wBAAgB,SAAS,CACvB,KAAK,SAAS,YAAY,EAC1B,WAAW,SAAS,KAAK,EACzB,SAAS,SAAS,gBAAgB,EAElC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAEtC,wBAAgB,SAAS,CAAC,SAAS,SAAS,eAAe,EACzD,SAAS,EAAE,SAAS,GACnB,SAAS,CAAA"}
+{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../src/mutations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAE7D,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EAEd,cAAc,EACd,KAAK,EACN,MAAM,SAAS,CAAA;AAMhB,KAAK,eAAe,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AACnF,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAevD,KAAK,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;AAEhD,KAAK,aAAa,CAAC,KAAK,SAAS,YAAY,IAAI;IAC/C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;CAC/C,CAAA;AAED,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAE1D,KAAK,iBAAiB,CAAC,KAAK,SAAS,YAAY,EAAE,SAAS,SAAS,gBAAgB,IAAI;KACtF,GAAG,IAAI,SAAS,GAAG,MAAM,SAAS,GAAG,GAAG,SAAS,MAAM,SAAS,GAC7D,SAAS,CAAC,GAAG,CAAC,GACd,GAAG,SAAS,MAAM,aAAa,CAAC,GAAG,CAAC,GAClC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GACzB,KAAK;CACZ,CAAA;AAED,wBAAgB,SAAS,CAAC,SAAS,SAAS,gBAAgB,EAC1D,SAAS,EAAE,SAAS,GACnB,SAAS,CAAA;AACZ,wBAAgB,SAAS,CAAC,KAAK,SAAS,YAAY,EAAE,WAAW,SAAS,KAAK,EAC7E,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,GACvB,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AAC/B,wBAAgB,SAAS,CACvB,KAAK,SAAS,YAAY,EAC1B,WAAW,SAAS,KAAK,EACzB,SAAS,SAAS,gBAAgB,EAElC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA"}

package/types/types.d.ts

@@ -24,6 +24,7 @@ export interface Config {
 interface DefaultConfig {
     schema: ZeroSchema;
     authData: {};
+    serverActions: null;
 }
 interface FinalConfig extends Omit<DefaultConfig, keyof Config>, Config {
 }
@@ -31,9 +32,20 @@ export type Schema = FinalConfig['schema'];
 export type TableName = keyof Schema['tables'] extends string ? keyof Schema['tables'] : string;
 export type Transaction = ZeroTransaction<Schema>;
 export type AuthData = FinalConfig['authData'] extends Record<string, unknown> ? FinalConfig['authData'] : Record<string, unknown>;
+export type ServerActions = FinalConfig['serverActions'] extends Record<string, unknown> ? FinalConfig['serverActions'] : Record<string, unknown>;
 /**
  * ➗0️⃣ END OVERRIDDEN TYPES
  */
+export type MutatorContext = {
+    tx: Transaction;
+    authData: AuthData | null;
+    environment: 'server' | 'client';
+    server?: {
+        actions: ServerActions;
+        asyncTasks: Array<() => Promise<void>>;
+    };
+    can: Can;
+};
 export type GetZeroMutators<Models extends GenericModels> = {
     [Key in keyof Models]: TransformMutators<GetModelMutators<Models>[Key]>;
 };
@@ -43,28 +55,20 @@ type GetModelMutators<Models extends GenericModels> = {
 export type GenericModels = {
     [key: string]: {
         mutate: Record<string, (ctx: MutatorContext, obj?: any) => Promise<any>>;
-        permissions: Where;
+        permissions?: Where;
     };
 };
 export type TransformMutators<T> = {
     [K in keyof T]: T[K] extends (ctx: MutatorContext, ...args: infer Args) => infer Return ? (tx: Transaction, ...args: Args) => Return extends unknown ? Promise<any> : Return : never;
 };
-export type MutatorContext = {
-    tx: Transaction;
-    authData: AuthData | null;
-    environment: 'server' | 'client';
-    serverActions?: any;
-    asyncTasks?: Array<() => Promise<void>>;
-    can: any;
-    didCanPermissionsRun?: boolean;
-};
+export type Where<Table extends TableName = TableName, ReturnType = any> = (expressionBuilder: ExpressionBuilder<Schema, Table>, auth: AuthData | null) => ReturnType;
+export type Can = <PWhere extends Where, Action extends keyof ReturnType<PWhere>>(where: PWhere, action: Action, obj: string | Record<string, unknown>) => Promise<void>;
 export type AsyncAction = () => Promise<void>;
 type GenericTable = TableBuilderWithColumns<any>;
 type GetTableSchema<TS extends GenericTable> = TS extends TableBuilderWithColumns<infer S> ? S : never;
 export type TableInsertRow<TS extends GenericTable> = NullToOptional<Row<GetTableSchema<TS>>>;
 export type TableUpdateRow<TS extends GenericTable> = Pick<Row<GetTableSchema<TS>>, TablePrimaryKeys<TS>> & Partial<TableInsertRow<TS>>;
 export type TablePrimaryKeys<TS extends GenericTable> = TupleToUnion<GetTableSchema<TS>['primaryKey']>;
-export type Where<Table extends TableName = TableName, ReturnType = any> = (expressionBuilder: ExpressionBuilder<Schema, Table>, auth: AuthData | null) => ReturnType;
 export type ZeroEvent = {
     type: 'error';
     message: string;