rado 0.1.42 → 0.1.44

package/dist/lib/Column.d.ts

@@ -10,11 +10,11 @@ interface PartialColumnData {
     type: ColumnType;
     name?: string;
     nullable?: boolean;
-    defaultValue?: ExprData;
+    defaultValue?: ExprData | (() => ExprData);
     autoIncrement?: boolean;
     primaryKey?: boolean;
     unique?: boolean;
-    references?: ExprData;
+    references?: () => ExprData;
 }
 export interface ColumnData extends PartialColumnData {
     type: ColumnType;
@@ -29,6 +29,7 @@ export declare class Column<T> {
     primaryKey<K extends string>(): Column<Column.IsPrimary<T, K>>;
     references<X extends T>(column: Expr<X> | (() => Expr<X>)): Column<X>;
     unique(): Column<T>;
+    defaultValue(create: () => EV<T>): Column<Column.IsOptional<T>>;
     defaultValue(value: EV<T>): Column<Column.IsOptional<T>>;
 }
 export type PrimaryKey<T, K> = string extends K ? T : T & {

package/dist/lib/Column.js

@@ -27,7 +27,7 @@ var Column = class {
   references(column2) {
     return new Column({
       ...this.data,
-      get references() {
+      references() {
         return ExprData.create(typeof column2 === "function" ? column2() : column2);
       }
     });
@@ -36,7 +36,10 @@ var Column = class {
     return new Column({ ...this.data, unique: true });
   }
   defaultValue(value) {
-    return new Column({ ...this.data, defaultValue: ExprData.create(value) });
+    return new Column({
+      ...this.data,
+      defaultValue: typeof value === "function" ? () => ExprData.create(value()) : ExprData.create(value)
+    });
   }
 };
 ((Column2) => {

package/dist/lib/Formatter.js

@@ -229,20 +229,22 @@ var Formatter = class {
     if (!column.nullable)
       stmt.add("NOT NULL");
     if (column.defaultValue !== void 0) {
-      stmt.add("DEFAULT").space();
-      stmt.openParenthesis();
-      this.formatExpr(
-        {
-          ...ctx,
-          formatAsJson: true,
-          forceInline: true
-        },
-        column.defaultValue
-      );
-      stmt.closeParenthesis();
+      if (typeof column.defaultValue !== "function") {
+        stmt.add("DEFAULT").space();
+        stmt.openParenthesis();
+        this.formatExpr(
+          {
+            ...ctx,
+            formatAsJson: true,
+            forceInline: true
+          },
+          column.defaultValue
+        );
+        stmt.closeParenthesis();
+      }
     }
     if (column.references)
-      this.formatContraintReference(ctx, column.references);
+      this.formatContraintReference(ctx, column.references());
     return stmt;
   }
   formatContraintReference(ctx, reference) {
@@ -282,8 +284,11 @@ var Formatter = class {
     const isNull = columnValue === void 0 || columnValue === null;
     const isOptional = column.nullable || column.autoIncrement || column.primaryKey;
     if (isNull) {
-      if (column.defaultValue !== void 0)
+      if (column.defaultValue !== void 0) {
+        if (typeof column.defaultValue === "function")
+          return this.formatExprJson(ctx, column.defaultValue());
         return this.formatExprJson(ctx, column.defaultValue);
+      }
       if (!isOptional)
         throw new TypeError(`Expected value for column ${column.name}`);
       return stmt.raw("NULL");

package/package.json

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