rado 0.2.19 → 0.2.21

package/dist/define/Column.d.ts

@@ -1,3 +1,4 @@
+import { Callable } from '../util/Callable';
 import { EV, Expr, ExprData } from './Expr';
 import { Fields } from './Fields';
 declare const DATA: unique symbol;
@@ -38,7 +39,7 @@ export declare namespace Column {
 interface ValueColumn<T> extends Expr<T> {
     <X extends T = T>(): ValueColumn<T extends null ? X | null : X>;
 }
-declare class ValueColumn<T> implements Column<T> {
+declare class ValueColumn<T> extends Callable implements Column<T> {
     [TYPE]: T;
     [DATA]: PartialColumnData;
     constructor(data: PartialColumnData);
@@ -58,7 +59,7 @@ export declare class PrimaryColumn<T, K> extends ValueColumn<PrimaryKey<T, K>> {
 interface ObjectColumn<T> {
     <X extends T = T>(): Column<T extends null ? X | null : X> & Fields<X>;
 }
-declare class ObjectColumn<T> implements Column<T> {
+declare class ObjectColumn<T> extends Callable implements Column<T> {
     [TYPE]: T;
     [DATA]: PartialColumnData;
     constructor(data: PartialColumnData);
@@ -76,7 +77,7 @@ type DefaultValue<T> = EV<T> | (() => EV<T>);
 interface UnTyped {
     (name: string): UnTyped;
 }
-declare class UnTyped {
+declare class UnTyped extends Callable {
     [DATA]: PartialColumnData;
     constructor(data?: PartialColumnData);
     get nullable(): NullableUnTyped;

package/dist/define/Column.js

@@ -1,5 +1,5 @@
 // src/define/Column.ts
-import { callable } from "../util/Callable.js";
+import { Callable } from "../util/Callable.js";
 import { Expr, ExprData } from "./Expr.js";
 var DATA = Symbol("DATA");
 var TYPE = Symbol("tYPE");
@@ -16,16 +16,11 @@ var Column;
   Column2.Data = DATA;
   Column2.Type = TYPE;
 })(Column || (Column = {}));
-var ValueColumn = class {
+var ValueColumn = class extends Callable {
   [(TYPE, DATA)];
   constructor(data) {
+    super(() => this);
     this[DATA] = data;
-    return callable(this, (defaultValue) => {
-      return new ValueColumn({
-        ...this[DATA],
-        defaultValue: createDefaultValue(defaultValue)
-      });
-    });
   }
   get nullable() {
     return new ValueColumn({ ...this[DATA], nullable: true });
@@ -67,11 +62,11 @@ var OptionalColumn = class extends ValueColumn {
 var PrimaryColumn = class extends ValueColumn {
   [Column.IsPrimary];
 };
-var ObjectColumn = class {
+var ObjectColumn = class extends Callable {
   [(TYPE, DATA)];
   constructor(data) {
+    super(() => this);
     this[DATA] = data;
-    return callable(this, () => this);
   }
   get nullable() {
     return new ObjectColumn({ ...this[DATA], nullable: true });
@@ -89,13 +84,13 @@ var ObjectColumn = class {
 var OptionalObjectColumn = class extends ObjectColumn {
   [Column.IsOptional];
 };
-var UnTyped = class {
+var UnTyped = class extends Callable {
   [DATA];
   constructor(data = {}) {
-    this[DATA] = data;
-    return callable(this, (name) => {
+    super((name) => {
       return new ValueColumn({ ...data, name });
     });
+    this[DATA] = data;
   }
   get nullable() {
     return new UnTyped({ ...this[DATA], nullable: true });

package/dist/define/Table.js

@@ -13,28 +13,16 @@ var {
   entries,
   fromEntries,
   getOwnPropertyDescriptors,
-  assign,
   getPrototypeOf,
   setPrototypeOf,
-  getOwnPropertyDescriptor,
+  defineProperty,
   getOwnPropertyNames
 } = Object;
-var { ownKeys } = Reflect;
 var Table;
 ((Table2) => {
   Table2.Data = DATA;
   Table2.Meta = META;
 })(Table || (Table = {}));
-function keysOf(input) {
-  const methods = [];
-  while (input = getPrototypeOf(input)) {
-    const keys2 = ownKeys(input);
-    for (const key of keys2)
-      if (typeof key === "string")
-        methods.push(key);
-  }
-  return methods;
-}
 function createTable(data) {
   const target = Target.Table(data);
   const call = {
@@ -56,7 +44,6 @@ function createTable(data) {
     }
   }[data.name];
   const cols = keys(data.columns);
-  const hasKeywords = cols.concat(keysOf(data.definition)).some((name) => name in Function);
   const row = ExprData.Row(target);
   const expressions = fromEntries(
     cols.map((name) => {
@@ -67,46 +54,14 @@ function createTable(data) {
     })
   );
   const toExpr = () => new Expr(row);
-  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 });
-    setPrototypeOf(call, getPrototypeOf(data.definition));
-  } else {
-    let get2 = function(key) {
-      return expressions[key] || data.definition[key];
-    };
-    var get = get2;
-    res = new Proxy(call, {
-      get(target2, key) {
-        if (key === DATA)
-          return data;
-        if (key === Expr.ToExpr)
-          return toExpr;
-        return get2(key);
-      },
-      ownKeys(target2) {
-        return ownKeys2;
-      },
-      getOwnPropertyDescriptor(target2, key) {
-        const value = get2(key);
-        const descriptor = getOwnPropertyDescriptor(call, key);
-        if (descriptor)
-          return {
-            ...descriptor,
-            enumerable: cols.includes(key),
-            value
-          };
-        return {
-          value,
-          enumerable: true,
-          configurable: true
-        };
-      }
-    });
-  }
-  return res;
+  delete call.name;
+  delete call.length;
+  for (const [key, value] of entries(expressions))
+    defineProperty(call, key, { value, enumerable: true, configurable: true });
+  defineProperty(call, DATA, { value: data, enumerable: false });
+  defineProperty(call, Expr.ToExpr, { value: toExpr, enumerable: false });
+  setPrototypeOf(call, getPrototypeOf(data.definition));
+  return call;
 }
 function table(define) {
   const names = keys(define);

package/dist/lib/Driver.d.ts

@@ -3,9 +3,10 @@ import { Expr } from '../define/Expr';
 import { Query } from '../define/Query';
 import { SchemaInstructions } from '../define/Schema';
 import { Table } from '../define/Table';
+import { Callable } from '../util/Callable';
 import { Formatter } from './Formatter';
 import { Statement } from './Statement';
-declare abstract class DriverBase {
+declare abstract class DriverBase extends Callable {
     formatter: Formatter;
     constructor(formatter: Formatter);
     compile<T extends Array<Expr<any>>, R>(create: (...params: T) => Cursor<R>): [Query<T>, Statement];

package/dist/lib/Driver.js

@@ -5,14 +5,13 @@ import { ParamData } from "../define/Param.js";
 import { Query, QueryType } from "../define/Query.js";
 import { Schema } from "../define/Schema.js";
 import { Table } from "../define/Table.js";
-import { callable } from "../util/Callable.js";
+import { Callable } from "../util/Callable.js";
 function isTemplateStringsArray(input) {
   return Boolean(Array.isArray(input) && input.raw);
 }
-var DriverBase = class {
+var DriverBase = class extends Callable {
   constructor(formatter) {
-    this.formatter = formatter;
-    return callable(this, (...args) => {
+    super((...args) => {
       const [input, ...rest] = args;
       if (input instanceof Cursor && rest.length === 0)
         return this.executeQuery(input[Cursor.Query]);
@@ -24,6 +23,7 @@ var DriverBase = class {
         })
       );
     });
+    this.formatter = formatter;
   }
   compile(create) {
     const { length } = create;

package/dist/util/Callable.d.ts

@@ -1 +1,3 @@
-export declare function callable(target: any, call: Function): any;
+export declare class Callable {
+    constructor(fn: Function);
+}

package/dist/util/Callable.js

@@ -1,15 +1,10 @@
 // src/util/Callable.ts
-function callable(target, call) {
-  return new Proxy(call, {
-    set(_, prop, value) {
-      target[prop] = value;
-      return true;
-    },
-    get(_, prop) {
-      return target[prop];
-    }
-  });
-}
+var { setPrototypeOf } = Object;
+var Callable = class {
+  constructor(fn) {
+    return setPrototypeOf(fn, new.target.prototype);
+  }
+};
 export {
-  callable
+  Callable
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",