rado 1.0.4 → 1.0.5

package/dist/core/Column.d.ts

@@ -11,7 +11,8 @@ export interface ColumnData {
     notNull?: boolean;
     isUnique?: boolean;
     autoIncrement?: boolean;
-    defaultValue?(): Sql;
+    $default?(): Sql;
+    defaultValue?: Sql;
     references?(): FieldData;
     onUpdate?: Sql;
     onDelete?: Sql;
@@ -23,7 +24,9 @@ export declare class Column<Value = unknown> {
     readonly [internalData]: ColumnData;
     constructor(data: ColumnData);
     notNull(): RequiredColumn<Value>;
-    default(value: Input<WithoutNull<Value>> | (() => Input<WithoutNull<Value>>)): Column<WithoutNull<Value>>;
+    $defaultFn(value: () => Input<WithoutNull<Value>>): Column<WithoutNull<Value>>;
+    $default(value: Input<WithoutNull<Value>> | (() => Input<WithoutNull<Value>>)): Column<WithoutNull<Value>>;
+    default(value: Input<WithoutNull<Value>>): Column<WithoutNull<Value>>;
     defaultNow(): Column<WithoutNull<Value>>;
     primaryKey(): Column<WithoutNull<Value>>;
     unique(name?: string): Column<Value>;

package/dist/core/Column.js

@@ -13,20 +13,27 @@ var Column = class _Column {
       notNull: true
     });
   }
-  default(value) {
+  $defaultFn(value) {
+    return this.$default(value);
+  }
+  $default(value) {
     return new _Column({
       ...getData(this),
-      defaultValue() {
+      $default() {
         return input(value instanceof Function ? value() : value);
       }
     });
   }
+  default(value) {
+    return new _Column({
+      ...getData(this),
+      defaultValue: input(value)
+    });
+  }
   defaultNow() {
     return new _Column({
       ...getData(this),
-      defaultValue() {
-        return sql.unsafe("now()");
-      }
+      defaultValue: sql.unsafe("now()")
     });
   }
   primaryKey() {

package/dist/core/Emitter.js

@@ -65,7 +65,7 @@ var Emitter = class {
       column.notNull && sql`not null`,
       column.isUnique && sql`unique`,
       column.autoIncrement && sql`autoincrement`,
-      column.defaultValue && sql`default ${column.defaultValue()}`,
+      column.defaultValue && sql`default ${column.defaultValue}`,
       column.references && sql`references ${sql.chunk("emitReferences", [column.references()])}`,
       column.onUpdate && sql`on update ${column.onUpdate}`
     ]).emitTo(this);

package/dist/core/query/Insert.js

@@ -84,11 +84,11 @@ var InsertInto = class {
         return sql`(${sql.join(
           Object.entries(table.columns).map(([key, column]) => {
             const value = row[key];
-            const { defaultValue, mapToDriverValue } = getData(column);
+            const { $default, mapToDriverValue } = getData(column);
             if (value !== void 0)
               return input(mapToDriverValue?.(value) ?? value);
-            if (defaultValue)
-              return defaultValue();
+            if ($default)
+              return $default();
             return defaultKeyword;
           }),
           sql`, `

package/dist/postgres/diff.js

@@ -113,7 +113,7 @@ var postgresDiff = (hasTable) => {
           {
             type: sql.unsafe(column2.type.toLowerCase()),
             notNull: column2.notNull,
-            defaultValue: column2.defaultValue ? () => sql.unsafe(column2.defaultValue) : void 0
+            defaultValue: column2.defaultValue ? sql.unsafe(column2.defaultValue) : void 0
           }
         ];
       })
@@ -168,8 +168,8 @@ var postgresDiff = (hasTable) => {
             })
           );
         }
-        const localDefault = localInstruction.defaultValue?.();
-        const schemaDefault = schemaInstruction.defaultValue?.();
+        const localDefault = localInstruction.defaultValue;
+        const schemaDefault = schemaInstruction.defaultValue;
         const localDefaultStr = localDefault && inline(localDefault);
         const schemaDefaultStr = schemaDefault && inline(schemaDefault);
         if (localDefaultStr !== schemaDefaultStr) {

package/dist/sqlite/diff.js

@@ -41,7 +41,7 @@ var sqliteDiff = (hasTable) => {
               type: sql.unsafe(column2.type.toLowerCase()),
               notNull: column2.notnull,
               primary: hasSinglePrimaryKey && column2.pk === 1,
-              defaultValue: column2.dflt_value !== null ? () => sql.unsafe(column2.dflt_value) : void 0
+              defaultValue: column2.dflt_value !== null ? sql.unsafe(column2.dflt_value) : void 0
             })
           )
         ];
@@ -142,7 +142,7 @@ var sqliteDiff = (hasTable) => {
       );
       const selection = { ...hasTable };
       for (const name of missingColumns) {
-        selection[name] = getData(tableApi.columns[name]).defaultValue?.() ?? sql`null`;
+        selection[name] = getData(tableApi.columns[name]).defaultValue ?? sql`null`;
       }
       return [
         // Create a new temporary table with the new definition

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "license": "MIT",
   "type": "module",
   "scripts": {