rado 0.2.22 → 0.2.23

package/dist/define/Column.d.ts

@@ -35,6 +35,7 @@ export declare namespace Column {
     const IsOptional: unique symbol;
     const IsNullable: unique symbol;
     const IsPrimary: unique symbol;
+    function isColumn<T>(input: any): input is Column<T>;
 }
 interface ValueColumn<T> extends Expr<T> {
     <X extends T = T>(): ValueColumn<T extends null ? X | null : X>;
@@ -48,7 +49,7 @@ declare class ValueColumn<T> extends Callable implements Column<T> {
     get autoIncrement(): OptionalColumn<T>;
     primaryKey<K = string>(create?: () => EV<T>): PrimaryColumn<T, K>;
     references<X extends T>(column: Expr<X> | (() => Expr<X>)): ValueColumn<X>;
-    defaultValue(value: DefaultValue<T>): OptionalColumn<T>;
+    default(value: DefaultValue<T>): OptionalColumn<T>;
 }
 export declare class OptionalColumn<T> extends ValueColumn<T> {
     [Column.IsOptional]: true;

package/dist/define/Column.js

@@ -15,6 +15,10 @@ var Column;
 ((Column2) => {
   Column2.Data = DATA;
   Column2.Type = TYPE;
+  function isColumn(input) {
+    return Boolean(input[DATA]);
+  }
+  Column2.isColumn = isColumn;
 })(Column || (Column = {}));
 var ValueColumn = class extends Callable {
   [DATA];
@@ -46,7 +50,7 @@ var ValueColumn = class extends Callable {
       }
     });
   }
-  defaultValue(value) {
+  default(value) {
     return new OptionalColumn({
       ...this[DATA],
       defaultValue: createDefaultValue(value)

package/dist/define/Table.d.ts

@@ -57,15 +57,12 @@ export declare namespace Table {
 export interface TableMeta {
     indexes?: Record<string, Index>;
 }
-type Blueprint<T> = {
-    [K in keyof T as K extends string ? K : never]: Column<any> | (() => any);
-};
 interface Define<T> {
     new (): T;
 }
 export type table<T> = T extends Table<infer D> ? Table.Select<D> : never;
 export declare function createTable<Definition>(data: TableData): Table<Definition>;
-export declare function table<T extends Blueprint<T>>(define: Record<string, T | Define<T>>): Table<T>;
+export declare function table<T extends {}>(define: Record<string, T | Define<T>>): Table<T>;
 export declare namespace table {
     const meta: typeof META;
 }

package/dist/define/Table.js

@@ -81,23 +81,24 @@ function table(define) {
       name,
       definition,
       columns: fromEntries(
-        entries(getOwnPropertyDescriptors(columns)).map(
-          ([name2, descriptor]) => {
-            const column = columns[name2];
-            const data = column[Column.Data];
-            if (!data.type)
-              throw new Error(`Column ${name2} has no type`);
-            return [
-              name2,
-              {
-                ...data,
-                type: data.type,
-                name: data.name || name2,
-                enumerable: descriptor.enumerable
-              }
-            ];
-          }
-        )
+        entries(getOwnPropertyDescriptors(columns)).filter(([name2]) => {
+          const column = columns[name2];
+          return Column.isColumn(column);
+        }).map(([name2, descriptor]) => {
+          const column = columns[name2];
+          const data = column[Column.Data];
+          if (!data.type)
+            throw new Error(`Column ${name2} has no type`);
+          return [
+            name2,
+            {
+              ...data,
+              type: data.type,
+              name: data.name || name2,
+              enumerable: descriptor.enumerable
+            }
+          ];
+        })
       ),
       meta() {
         const createMeta = res[table.meta];

package/package.json

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