rado 0.1.32 → 0.1.34

package/dist/lib/Expr.d.ts

@@ -125,8 +125,8 @@ export declare class Expr<T> {
     isNotNull(): Expr<boolean>;
     isNot(that: EV<T>): Expr<boolean>;
     is(that: EV<T> | Cursor.SelectSingle<T>): Expr<boolean>;
-    isIn(that: EV<Array<T>> | Cursor<T>): Expr<boolean>;
-    isNotIn(that: EV<Array<T>> | Cursor<T>): Expr<boolean>;
+    in(that: EV<Array<T>> | Cursor.SelectMultiple<T>): Expr<boolean>;
+    notIn(that: EV<Array<T>> | Cursor.SelectMultiple<T>): Expr<boolean>;
     add(this: Expr<number>, that: EV<number>): Expr<number>;
     substract(this: Expr<number>, that: EV<number>): Expr<number>;
     multiply(this: Expr<number>, that: EV<number>): Expr<number>;

package/dist/lib/Expr.js

@@ -187,10 +187,10 @@ var _Expr = class {
       return this.isNull();
     return binop(this, "Equals" /* Equals */, that);
   }
-  isIn(that) {
+  in(that) {
     return binop(this, "In" /* In */, that);
   }
-  isNotIn(that) {
+  notIn(that) {
     return binop(this, "NotIn" /* NotIn */, that);
   }
   add(that) {

package/dist/lib/Selection.d.ts

@@ -1,6 +1,6 @@
 import type { Cursor } from './Cursor';
 import type { Expr } from './Expr';
-type SelectionBase = Expr<any> | Cursor.SelectMultiple<any> | Cursor.SelectSingle<any>;
+type SelectionBase = (() => any) | Expr<any> | Cursor.SelectMultiple<any> | Cursor.SelectSingle<any>;
 interface SelectionRecord extends Record<string, Selection> {
 }
 export type Selection = SelectionBase | SelectionRecord;
@@ -12,8 +12,8 @@ export declare namespace Selection {
     } ? K : T extends {
         [__cursorType](): infer K;
     } ? K : T extends Expr<infer K> ? K : T extends Record<string, Selection> ? {
-        [K in keyof T]: Infer<T[K]>;
-    } : T;
+        [K in keyof T as T[K] extends () => any ? never : K]: Infer<T[K]>;
+    } : T extends () => any ? never : T;
     type With<A, B> = Expr<Combine<A, B>>;
     type Combine<A, B> = Omit<A, keyof Infer<B>> & Infer<B>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "license": "MIT",
   "type": "module",
   "exports": {