over-zero 0.0.21 → 0.0.29

package/src/createZeroServer.ts

@@ -85,7 +85,7 @@ export function createZeroServer<
       authData,
     })
 
-    // @ts-ignore type is ok but config in monorepo
+    // @ts-expect-error type is ok but config in monorepo
     const response = await processor.process(mutators, request)
 
     // now finish
@@ -170,7 +170,7 @@ export function createZeroServer<
         const { tx } = mutatorContext()
         return await query(tx)
       }
-      // @ts-ignore type
+      // @ts-expect-error type
       const output = await zeroDb.transaction(query, dummyTransactionInput)
       return output as any
     } catch (err) {

package/src/helpers/prettyFormatZeroQuery.ts

@@ -5,7 +5,6 @@ export const prettyFormatZeroQuery = (
   query: Query<any, any, any>,
   mode: 'full' | 'minimal' = 'full'
 ): string => {
-  // @ts-ignore
   const astObject = query['_completeAst']?.()
 
   if (!astObject) return ''

package/src/helpers/useZeroDebug.ts

@@ -23,10 +23,6 @@ const MAX_AST_HISTORY = 10
 // short name because otherwise it often forces multiple lines in chrome devtools
 // due to showing the filename next to log lines
 export const useZeroDebug = (query: Query<any, any, any>, options: any, results: any) => {
-  // if (DEBUG_LEVEL < 2) {
-  //   return
-  // }
-  // @ts-ignore
   const astObject = query['_completeAst']?.()
   const table = astObject.table
   const ast = JSON.stringify(astObject, null, 2)

package/src/index.ts

@@ -7,6 +7,7 @@ export * from './helpers/mutatorContext'
 export * from './createZeroClient'
 export * from './mutations'
 export * from './where'
+export * from './serverWhere'
 export * from './zql'
 
 export type * from './types'

package/src/serverWhere.ts

@@ -0,0 +1,20 @@
+import type { Condition } from '@rocicorp/zero'
+import type { TableName, Where } from './types'
+import { where } from './where'
+
+export function serverWhere<Table extends TableName, Builder extends Where<Table>>(
+  tableName: Table,
+  builder: Builder
+): Where<Table, Condition>
+
+export function serverWhere<
+  Table extends TableName,
+  Builder extends Where = Where<Table>,
+>(builder: Builder): Where<Table, Condition>
+
+export function serverWhere<Table extends TableName, Builder extends Where<Table>>(
+  a: Table | Builder,
+  b?: Builder
+): Where<Table, any> | Builder {
+  return where(a as any, b as any, true)
+}

package/src/where.ts

@@ -5,7 +5,8 @@ import type { TableName, Where } from './types'
 
 export function where<Table extends TableName, Builder extends Where<Table>>(
   tableName: Table,
-  builder: Builder
+  builder: Builder,
+  isServerOnly?: boolean
 ): Where<Table, Condition>
 
 export function where<Table extends TableName, Builder extends Where = Where<Table>>(
@@ -14,7 +15,8 @@ export function where<Table extends TableName, Builder extends Where = Where<Tab
 
 export function where<Table extends TableName, Builder extends Where<Table>>(
   a: Table | Builder,
-  b?: Builder
+  b?: Builder,
+  isServerOnly = false
 ): Where<Table, any> | Builder {
   const whereFn = (b || a) as any
 
@@ -22,7 +24,7 @@ export function where<Table extends TableName, Builder extends Where<Table>>(
     a: ExpressionBuilder<any, any>,
     b = getQueryOrMutatorAuthData()
   ) => {
-    if (isClient) {
+    if (isClient && isServerOnly) {
       // on client where conditions always pass
       return a.and()
     }

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

@@ -1 +1 @@
-{"version":3,"file":"prettyFormatZeroQuery.d.ts","sourceRoot":"","sources":["../../src/helpers/prettyFormatZeroQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAG3C,eAAO,MAAM,qBAAqB,GAChC,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC3B,OAAM,MAAM,GAAG,SAAkB,KAChC,MAUF,CAAA"}
+{"version":3,"file":"prettyFormatZeroQuery.d.ts","sourceRoot":"","sources":["../../src/helpers/prettyFormatZeroQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAG3C,eAAO,MAAM,qBAAqB,GAChC,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC3B,OAAM,MAAM,GAAG,SAAkB,KAChC,MASF,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"useZeroDebug.d.ts","sourceRoot":"","sources":["../../src/helpers/useZeroDebug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAwB3C,eAAO,MAAM,YAAY,GAAI,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,SAAS,GAAG,EAAE,SAAS,GAAG,SA+EnF,CAAA"}
+{"version":3,"file":"useZeroDebug.d.ts","sourceRoot":"","sources":["../../src/helpers/useZeroDebug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAwB3C,eAAO,MAAM,YAAY,GAAI,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,SAAS,GAAG,EAAE,SAAS,GAAG,SA2EnF,CAAA"}

package/types/index.d.ts

@@ -6,6 +6,7 @@ export * from './helpers/mutatorContext';
 export * from './createZeroClient';
 export * from './mutations';
 export * from './where';
+export * from './serverWhere';
 export * from './zql';
 export type * from './types';
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AAExC,cAAc,oBAAoB,CAAA;AAClC,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AAErB,mBAAmB,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AAExC,cAAc,oBAAoB,CAAA;AAClC,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,cAAc,eAAe,CAAA;AAC7B,cAAc,OAAO,CAAA;AAErB,mBAAmB,SAAS,CAAA"}

package/types/serverWhere.d.ts

@@ -0,0 +1,5 @@
+import type { Condition } from '@rocicorp/zero';
+import type { TableName, Where } from './types';
+export declare function serverWhere<Table extends TableName, Builder extends Where<Table>>(tableName: Table, builder: Builder): Where<Table, Condition>;
+export declare function serverWhere<Table extends TableName, Builder extends Where = Where<Table>>(builder: Builder): Where<Table, Condition>;
+//# sourceMappingURL=serverWhere.d.ts.map

package/types/serverWhere.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serverWhere.d.ts","sourceRoot":"","sources":["../src/serverWhere.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAG/C,wBAAgB,WAAW,CAAC,KAAK,SAAS,SAAS,EAAE,OAAO,SAAS,KAAK,CAAC,KAAK,CAAC,EAC/E,SAAS,EAAE,KAAK,EAChB,OAAO,EAAE,OAAO,GACf,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAE1B,wBAAgB,WAAW,CACzB,KAAK,SAAS,SAAS,EACvB,OAAO,SAAS,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,EACpC,OAAO,EAAE,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA"}

package/types/where.d.ts

@@ -1,6 +1,6 @@
 import type { Condition } from '@rocicorp/zero';
 import type { TableName, Where } from './types';
-export declare function where<Table extends TableName, Builder extends Where<Table>>(tableName: Table, builder: Builder): Where<Table, Condition>;
+export declare function where<Table extends TableName, Builder extends Where<Table>>(tableName: Table, builder: Builder, isServerOnly?: boolean): Where<Table, Condition>;
 export declare function where<Table extends TableName, Builder extends Where = Where<Table>>(builder: Builder): Where<Table, Condition>;
 export declare function getWhereTableName(where: Where): string | undefined;
 //# sourceMappingURL=where.d.ts.map

package/types/where.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"where.d.ts","sourceRoot":"","sources":["../src/where.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAA;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/C,wBAAgB,KAAK,CAAC,KAAK,SAAS,SAAS,EAAE,OAAO,SAAS,KAAK,CAAC,KAAK,CAAC,EACzE,SAAS,EAAE,KAAK,EAChB,OAAO,EAAE,OAAO,GACf,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAE1B,wBAAgB,KAAK,CAAC,KAAK,SAAS,SAAS,EAAE,OAAO,SAAS,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,EACjF,OAAO,EAAE,OAAO,GACf,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AA0C1B,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,sBAE7C"}
+{"version":3,"file":"where.d.ts","sourceRoot":"","sources":["../src/where.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAA;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/C,wBAAgB,KAAK,CAAC,KAAK,SAAS,SAAS,EAAE,OAAO,SAAS,KAAK,CAAC,KAAK,CAAC,EACzE,SAAS,EAAE,KAAK,EAChB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,OAAO,GACrB,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAE1B,wBAAgB,KAAK,CAAC,KAAK,SAAS,SAAS,EAAE,OAAO,SAAS,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,EACjF,OAAO,EAAE,OAAO,GACf,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AA2C1B,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,sBAE7C"}

package/types/builder.d.ts

@@ -1,3 +0,0 @@
-import type { QueryBuilder } from './types';
-export declare const zql: QueryBuilder;
-//# sourceMappingURL=builder.d.ts.map

package/types/builder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAE3C,eAAO,MAAM,GAAG,cAKd,CAAA"}

package/types/helpers/context.d.ts

@@ -1,5 +0,0 @@
-import type { MutatorContext } from '../types';
-export declare function context(): MutatorContext;
-export declare function isInZeroMutation(): boolean;
-export declare function runWithContext<T>(context: MutatorContext, fn: () => T | Promise<T>): Promise<T>;
-//# sourceMappingURL=context.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/helpers/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAI9C,wBAAgB,OAAO,IAAI,cAAc,CAOxC;AAED,wBAAgB,gBAAgB,YAE/B;AAED,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,EAAE,cAAc,EACvB,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,CAAC,CAAC,CAEZ"}

package/types/helpers/queryContext.d.ts

@@ -1,5 +0,0 @@
-import type { AuthData } from '../types';
-export declare function queryContext(): AuthData;
-export declare function isInQuery(): boolean;
-export declare function runWithQueryContext<T>(context: AuthData, fn: () => T | Promise<T>): Promise<T>;
-//# sourceMappingURL=queryContext.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"queryContext.d.ts","sourceRoot":"","sources":["../../src/helpers/queryContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAIxC,wBAAgB,YAAY,IAAI,QAAQ,CAOvC;AAED,wBAAgB,SAAS,YAExB;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,OAAO,EAAE,QAAQ,EACjB,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,CAAC,CAAC,CAEZ"}