rado 0.2.17 → 0.2.19

package/README.md

@@ -89,7 +89,7 @@ Post().select({
   ...Post,
   author: Post.author().select(User.username),
   tags: Post.tags().select({
-    count: pt({tagId: Tag.id}).select(count()).sure(),
+    count: pt({tagId: Tag.id}).select(count()).first(),
     name: Tag.name
   })
 })
@@ -112,7 +112,11 @@ Person().select({
   name: Person.firstName.concat(' ').concat(Person.lastName),
   isMario: Person.firstName.is('Mario'),
   isActor: Person.id.isIn(Actor().select(Actor.personId)),
-  email: iif(Person.email.isNotNull(), Person.email, 'its.me@mario')
+  email: iif(Person.email.isNotNull(), Person.email, 'its.me@mario'),
+  twitterHandle: Person.socialMedia
+    .filter(media => media.type.is('twitter'))
+    .map(media => media.handle)
+    .maybeFirst()
 })
 ```
 
@@ -189,7 +193,7 @@ const Post = table({
     content = column.string
 
     author() {
-      return User({id: this.userId}).sure()
+      return User({id: this.userId}).first()
     }
 
     tags() {

package/dist/define/Cursor.d.ts

@@ -70,8 +70,8 @@ export declare namespace Cursor {
         count(): SelectSingle<number>;
         orderBy(...orderBy: Array<Expr<any> | OrderBy>): SelectMultiple<Row>;
         groupBy(...groupBy: Array<Expr<any>>): SelectMultiple<Row>;
-        first(): SelectSingle<Row | undefined>;
-        sure(): SelectSingle<Row>;
+        maybeFirst(): SelectSingle<Row | undefined>;
+        first(): SelectSingle<Row>;
         where(...where: Array<EV<boolean>>): SelectMultiple<Row>;
         take(limit: number | undefined): SelectMultiple<Row>;
         skip(offset: number | undefined): SelectMultiple<Row>;

package/dist/define/Cursor.js

@@ -195,10 +195,10 @@ function addWhere(query, where) {
         groupBy: groupBy.map(ExprData.create)
       });
     }
-    first() {
+    maybeFirst() {
       return new SelectSingle({ ...this[QUERY], singleResult: true });
     }
-    sure() {
+    first() {
       return new SelectSingle({
         ...this[QUERY],
         singleResult: true,

package/dist/define/Expr.js

@@ -274,15 +274,13 @@ var Expr = class {
   dynamic(...path) {
     return new Proxy(
       (...args) => {
-        const method = path.pop();
-        const e = path.length > 0 ? this.get(path.join(".")) : this;
+        const method = path[path.length - 1];
+        const e = path.length > 1 ? this.get(path.slice(0, -1).join(".")) : this;
         return e[method]?.apply(e, args);
       },
       {
         get: (_, key) => {
           const e = path.length > 0 ? this.get(path.join(".")) : this;
-          if (key === "expr")
-            return e[DATA];
           if (typeof key !== "string")
             return e[key];
           return this.dynamic(...path, key);

package/dist/define/Table.js

@@ -16,7 +16,8 @@ var {
   assign,
   getPrototypeOf,
   setPrototypeOf,
-  getOwnPropertyDescriptor
+  getOwnPropertyDescriptor,
+  getOwnPropertyNames
 } = Object;
 var { ownKeys } = Reflect;
 var Table;
@@ -66,7 +67,8 @@ function createTable(data) {
     })
   );
   const toExpr = () => new Expr(row);
-  const ownKeys2 = ["prototype", ...cols];
+  const funcNames = getOwnPropertyNames(call);
+  const ownKeys2 = Array.from(/* @__PURE__ */ new Set([...funcNames, ...cols]));
   let res;
   if (!hasKeywords) {
     res = assign(call, expressions, { [DATA]: data, [Expr.ToExpr]: toExpr });
@@ -88,10 +90,16 @@ function createTable(data) {
         return ownKeys2;
       },
       getOwnPropertyDescriptor(target2, key) {
-        if (key === "prototype")
-          return getOwnPropertyDescriptor(target2, key);
+        const value = get2(key);
+        const descriptor = getOwnPropertyDescriptor(call, key);
+        if (descriptor)
+          return {
+            ...descriptor,
+            enumerable: cols.includes(key),
+            value
+          };
         return {
-          value: get2(key),
+          value,
           enumerable: true,
           configurable: true
         };

package/dist/lib/Driver.d.ts

@@ -27,6 +27,7 @@ interface SyncDriver {
 }
 declare abstract class SyncDriver extends DriverBase {
     transactionId: number;
+    constructor(formatter: Formatter);
     abstract prepareStatement(stmt: Statement, discardAfter: boolean): SyncPreparedStatement;
     abstract schemaInstructions(tableName: string): SchemaInstructions | undefined;
     prepare<T extends Array<Expr<any>>, R>(create: (...params: T) => Cursor<R>): (...params: ParamTypes<T>) => R;
@@ -58,6 +59,7 @@ interface AsyncDriver {
 }
 declare abstract class AsyncDriver extends DriverBase {
     transactionId: number;
+    constructor(formatter: Formatter);
     abstract isolate(): [connection: AsyncDriver, release: () => Promise<void>];
     abstract prepareStatement(stmt: Statement, discardAfter: boolean): AsyncPreparedStatement;
     abstract schemaInstructions(tableName: string): Promise<SchemaInstructions | undefined>;

package/dist/lib/Driver.js

@@ -46,7 +46,7 @@ var DriverBase = class {
   get(...args) {
     const [input, ...rest] = args;
     if (input instanceof Cursor.SelectMultiple)
-      return this.executeQuery(input.first()[Cursor.Query]);
+      return this.executeQuery(input.maybeFirst()[Cursor.Query]);
     if (input instanceof Cursor)
       return this.executeQuery(input[Cursor.Query]);
     return this.executeTemplate("row", input, ...rest);
@@ -59,7 +59,11 @@ var DriverBase = class {
   }
 };
 var SyncDriver = class extends DriverBase {
-  transactionId = 0;
+  transactionId;
+  constructor(formatter) {
+    super(formatter);
+    this.transactionId = 0;
+  }
   prepare(create) {
     const [query, compiled] = this.compile(create);
     const prepared = this.prepareStatement(compiled, false);
@@ -165,7 +169,11 @@ var SyncDriver = class extends DriverBase {
   }
 };
 var AsyncDriver = class extends DriverBase {
-  transactionId = 0;
+  transactionId;
+  constructor(formatter) {
+    super(formatter);
+    this.transactionId = 0;
+  }
   prepare(create) {
     const [query, compiled] = this.compile(create);
     const prepared = this.prepareStatement(compiled, false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -39,7 +39,7 @@
     "better-sqlite3": "^7.5.1",
     "bun-types": "^0.5.0",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.16.16",
+    "esbuild": "^0.17.7",
     "glob": "^8.0.3",
     "rimraf": "^4.1.2",
     "sade": "^1.8.1",
@@ -55,6 +55,6 @@
   },
   "packageManager": "yarn@3.3.1",
   "resolutions": {
-    "esbuild": "0.16.16"
+    "esbuild": "0.17.7"
   }
 }