rwsdk 1.0.0-beta.27 → 1.0.0-beta.27-test.20251111115809

package/dist/runtime/lib/db/typeInference/builders/alterTable.d.ts

@@ -31,14 +31,14 @@ export interface AlterTableBuilder<TName extends string, TOps extends AlterOpera
         readonly __renamedFrom: TName;
     };
     setSchema(newSchema: string): AlterTableBuilder<TName, TOps>;
-    addColumn<K extends string, T extends DataTypeExpression>(name: K, type: T, build?: (col: ColumnDefinitionBuilder<SqlToTsType<T>>) => ColumnDefinitionBuilder<SqlToTsType<T>>): AlterTableBuilder<TName, [...TOps, AddColumnOp<K, T>]>;
+    addColumn<K extends string, T extends DataTypeExpression, TNullable extends boolean = true>(name: K, type: T, build?: (col: ColumnDefinitionBuilder<SqlToTsType<T>>) => ColumnDefinitionBuilder<SqlToTsType<T>, TNullable>): AlterTableBuilder<TName, [...TOps, AddColumnOp<K, T, TNullable>]>;
     dropColumn<K extends string>(name: K): AlterTableBuilder<TName, [...TOps, DropColumnOp<K>]>;
     renameColumn<KFrom extends string, KTo extends string>(from: KFrom, to: KTo): AlterTableBuilder<TName, [...TOps, RenameColumnOp<KFrom, KTo>]>;
     alterColumn<K extends string, const TCallback extends AlterColumnBuilderCallback>(column: K, alteration: TCallback): AlterTableBuilder<TName, [
         ...TOps,
         AlterColumnOp<K, ReturnType<TCallback>["__alteration"]>
     ]>;
-    modifyColumn<K extends string, T extends DataTypeExpression>(column: K, type: T, build?: (col: ColumnDefinitionBuilder<SqlToTsType<T>>) => ColumnDefinitionBuilder<SqlToTsType<T>>): AlterTableBuilder<TName, [...TOps, ModifyColumnOp<K, T>]>;
+    modifyColumn<K extends string, T extends DataTypeExpression, TNullable extends boolean = true>(column: K, type: T, build?: (col: ColumnDefinitionBuilder<SqlToTsType<T>>) => ColumnDefinitionBuilder<SqlToTsType<T>, TNullable>): AlterTableBuilder<TName, [...TOps, ModifyColumnOp<K, T, TNullable>]>;
     addUniqueConstraint(constraintName: string, columns: string[], build?: (builder: UniqueConstraintBuilder) => UniqueConstraintBuilder): AlterTableBuilder<TName, TOps>;
     addPrimaryKeyConstraint(constraintName: string, columns: string[], build?: (builder: PrimaryKeyConstraintBuilder) => PrimaryKeyConstraintBuilder): AlterTableBuilder<TName, TOps>;
     addCheckConstraint(constraintName: string, checkExpression: Expression<any>, build?: (builder: CheckConstraintBuilder) => CheckConstraintBuilder): AlterTableBuilder<TName, TOps>;

package/dist/runtime/lib/db/typeInference/builders/columnDefinition.d.ts

@@ -1,25 +1,25 @@
 import { ColumnDefinitionNode, Expression, sql } from "kysely";
 type DefaultValueExpression = string | number | boolean | null | ReturnType<typeof sql>;
-export interface ColumnDefinitionBuilder<TType> {
-    autoIncrement(): ColumnDefinitionBuilder<TType>;
-    identity(): ColumnDefinitionBuilder<TType>;
-    primaryKey(): ColumnDefinitionBuilder<TType>;
-    references(ref: string): ColumnDefinitionBuilder<TType>;
-    onDelete(onDelete: "no action" | "restrict" | "cascade" | "set null" | "set default"): ColumnDefinitionBuilder<TType>;
-    onUpdate(onUpdate: "no action" | "restrict" | "cascade" | "set null" | "set default"): ColumnDefinitionBuilder<TType>;
-    unique(): ColumnDefinitionBuilder<TType>;
-    notNull(): ColumnDefinitionBuilder<TType>;
-    unsigned(): ColumnDefinitionBuilder<TType>;
-    defaultTo(value: DefaultValueExpression): ColumnDefinitionBuilder<TType>;
-    check(expression: Expression<any>): ColumnDefinitionBuilder<TType>;
-    generatedAlwaysAs(expression: Expression<any>): ColumnDefinitionBuilder<TType>;
-    generatedAlwaysAsIdentity(): ColumnDefinitionBuilder<TType>;
-    generatedByDefaultAsIdentity(): ColumnDefinitionBuilder<TType>;
-    stored(): ColumnDefinitionBuilder<TType>;
-    modifyFront(modifier: Expression<any>): ColumnDefinitionBuilder<TType>;
-    nullsNotDistinct(): ColumnDefinitionBuilder<TType>;
-    ifNotExists(): ColumnDefinitionBuilder<TType>;
-    modifyEnd(modifier: Expression<any>): ColumnDefinitionBuilder<TType>;
+export interface ColumnDefinitionBuilder<TType, TNullable extends boolean = true> {
+    autoIncrement(): ColumnDefinitionBuilder<TType, TNullable>;
+    identity(): ColumnDefinitionBuilder<TType, TNullable>;
+    primaryKey(): ColumnDefinitionBuilder<TType, false>;
+    references(ref: string): ColumnDefinitionBuilder<TType, TNullable>;
+    onDelete(onDelete: "no action" | "restrict" | "cascade" | "set null" | "set default"): ColumnDefinitionBuilder<TType, TNullable>;
+    onUpdate(onUpdate: "no action" | "restrict" | "cascade" | "set null" | "set default"): ColumnDefinitionBuilder<TType, TNullable>;
+    unique(): ColumnDefinitionBuilder<TType, TNullable>;
+    notNull(): ColumnDefinitionBuilder<TType, false>;
+    unsigned(): ColumnDefinitionBuilder<TType, TNullable>;
+    defaultTo(value: DefaultValueExpression): ColumnDefinitionBuilder<TType, false>;
+    check(expression: Expression<any>): ColumnDefinitionBuilder<TType, TNullable>;
+    generatedAlwaysAs(expression: Expression<any>): ColumnDefinitionBuilder<TType, TNullable>;
+    generatedAlwaysAsIdentity(): ColumnDefinitionBuilder<TType, TNullable>;
+    generatedByDefaultAsIdentity(): ColumnDefinitionBuilder<TType, TNullable>;
+    stored(): ColumnDefinitionBuilder<TType, TNullable>;
+    modifyFront(modifier: Expression<any>): ColumnDefinitionBuilder<TType, TNullable>;
+    nullsNotDistinct(): ColumnDefinitionBuilder<TType, TNullable>;
+    ifNotExists(): ColumnDefinitionBuilder<TType, TNullable>;
+    modifyEnd(modifier: Expression<any>): ColumnDefinitionBuilder<TType, TNullable>;
     $call<T>(func: (qb: this) => T): T;
     toOperationNode(): ColumnDefinitionNode;
 }

package/dist/runtime/lib/db/typeInference/builders/createTable.d.ts

@@ -28,7 +28,8 @@ export interface CreateTableBuilder<TName extends string, TSchema extends Record
     temporary(): CreateTableBuilder<TName, TSchema>;
     onCommit(onCommit: "preserve rows" | "delete rows" | "drop"): CreateTableBuilder<TName, TSchema>;
     ifNotExists(): CreateTableBuilder<TName, TSchema>;
-    addColumn<K extends string, T extends string>(name: K, type: T, build?: (col: ColumnDefinitionBuilder<SqlToTsType<T>>) => ColumnDefinitionBuilder<SqlToTsType<T>>): CreateTableBuilder<TName, Prettify<(TSchema extends Record<string, any> ? TSchema : {}) & Record<K, SqlToTsType<T>>>>;
+    addColumn<K extends string, T extends string>(name: K, type: T): CreateTableBuilder<TName, Prettify<(TSchema extends Record<string, any> ? TSchema : {}) & Record<K, SqlToTsType<T> | null>>>;
+    addColumn<K extends string, T extends string, TNullable extends boolean>(name: K, type: T, build: (col: ColumnDefinitionBuilder<SqlToTsType<T>>) => ColumnDefinitionBuilder<SqlToTsType<T>, TNullable>): CreateTableBuilder<TName, Prettify<(TSchema extends Record<string, any> ? TSchema : {}) & Record<K, TNullable extends true ? SqlToTsType<T> | null : SqlToTsType<T>>>>;
     addUniqueConstraint(constraintName: string, columns: (keyof TSchema)[], build?: (builder: UniqueConstraintBuilder) => UniqueConstraintBuilder): CreateTableBuilder<TName, TSchema>;
     addPrimaryKeyConstraint(constraintName: string, columns: (keyof TSchema)[], build?: (builder: PrimaryKeyConstraintBuilder) => PrimaryKeyConstraintBuilder): CreateTableBuilder<TName, TSchema>;
     addCheckConstraint(constraintName: string, checkExpression: Expression<any>, build?: (builder: CheckConstraintBuilder) => CheckConstraintBuilder): CreateTableBuilder<TName, TSchema>;

package/dist/runtime/lib/db/typeInference/typetests/alterTable.typetest.js

@@ -153,7 +153,7 @@
             up: async (db) => [
                 await db.schema
                     .createTable("users")
-                    .addColumn("id", "integer")
+                    .addColumn("id", "integer", (c) => c.primaryKey().autoIncrement())
                     .execute(),
             ],
         },
@@ -242,7 +242,7 @@
                 return [
                     await db.schema
                         .createTable("users")
-                        .addColumn("id", "integer")
+                        .addColumn("id", "integer", (col) => col.notNull())
                         .execute(),
                 ];
             },
@@ -271,7 +271,7 @@
                 return [
                     await db.schema
                         .createTable("users")
-                        .addColumn("id", "integer")
+                        .addColumn("id", "integer", (col) => col.primaryKey().autoIncrement())
                         .execute(),
                 ];
             },
@@ -357,4 +357,79 @@
     };
     (_test) => { };
 };
+(_it = "alterTable addColumn with notNull") => {
+    const migrations = {
+        "0": {
+            async up(db) {
+                return [
+                    await db.schema
+                        .createTable("users")
+                        .addColumn("id", "integer", (col) => col.primaryKey())
+                        .execute(),
+                ];
+            },
+        },
+        "1": {
+            async up(db) {
+                return [
+                    await db.schema
+                        .alterTable("users")
+                        .addColumn("email", "text", (col) => col.notNull())
+                        .execute(),
+                ];
+            },
+        },
+    };
+    (_test) => { };
+};
+(_it = "alterTable modifyColumn with notNull") => {
+    const migrations = {
+        "0": {
+            async up(db) {
+                return [
+                    await db.schema
+                        .createTable("products")
+                        .addColumn("price", "real")
+                        .execute(),
+                ];
+            },
+        },
+        "1": {
+            async up(db) {
+                return [
+                    await db.schema
+                        .alterTable("products")
+                        .modifyColumn("price", "real", (col) => col.notNull())
+                        .execute(),
+                ];
+            },
+        },
+    };
+    (_test) => { };
+};
+(_it = "alterTable modifyColumn nullable to non-nullable") => {
+    const migrations = {
+        "0": {
+            async up(db) {
+                return [
+                    await db.schema
+                        .createTable("orders")
+                        .addColumn("status", "text")
+                        .execute(),
+                ];
+            },
+        },
+        "1": {
+            async up(db) {
+                return [
+                    await db.schema
+                        .alterTable("orders")
+                        .modifyColumn("status", "text", (col) => col.notNull().defaultTo("pending"))
+                        .execute(),
+                ];
+            },
+        },
+    };
+    (_test) => { };
+};
 export {};

package/dist/runtime/lib/db/typeInference/typetests/createTable.typetest.js

@@ -22,9 +22,59 @@ import { sql } from "kysely";
                     await db.schema
                         .createTable("users")
                         .addColumn("username", "text", (col) => col.notNull())
-                        .addColumn("age", "integer", (col) => col.defaultTo(18))
                         .addColumn("active", "boolean", (col) => col.defaultTo(true))
                         .addColumn("anotherBoolean", "boolean", (col) => col.defaultTo(sql `true`))
+                        .addColumn("email", "text", (col) => col)
+                        .addColumn("favoriteColor", "text", (col) => col.unique())
+                        .addColumn("name", "text", (col) => col.defaultTo("John Doe"))
+                        .execute(),
+                ];
+            },
+        },
+    };
+    (_test) => { };
+};
+(_it = "createTable column without callback is nullable") => {
+    const migrations = {
+        "001_init": {
+            async up(db) {
+                return [
+                    await db.schema
+                        .createTable("posts")
+                        .addColumn("title", "text")
+                        .addColumn("body", "text")
+                        .execute(),
+                ];
+            },
+        },
+    };
+    (_test) => { };
+};
+(_it = "createTable with primaryKey is non-nullable") => {
+    const migrations = {
+        "001_init": {
+            async up(db) {
+                return [
+                    await db.schema
+                        .createTable("users")
+                        .addColumn("id", "integer", (col) => col.primaryKey())
+                        .addColumn("email", "text", (col) => col.notNull())
+                        .execute(),
+                ];
+            },
+        },
+    };
+    (_test) => { };
+};
+(_it = "createTable with unique but no notNull is nullable") => {
+    const migrations = {
+        "001_init": {
+            async up(db) {
+                return [
+                    await db.schema
+                        .createTable("products")
+                        .addColumn("sku", "text", (col) => col.unique())
+                        .addColumn("name", "text", (col) => col)
                         .execute(),
                 ];
             },

package/dist/runtime/lib/db/typeInference/utils.d.ts

@@ -1,9 +1,10 @@
 import { sql } from "kysely";
 type DataTypeExpression = string | typeof sql;
-export type AddColumnOp<K extends string, T extends DataTypeExpression> = {
+export type AddColumnOp<K extends string, T extends DataTypeExpression, TNullable extends boolean = true> = {
     op: "addColumn";
     name: K;
     type: T;
+    nullable: TNullable;
 };
 export type DropColumnOp<K extends string> = {
     op: "dropColumn";
@@ -14,10 +15,11 @@ export type RenameColumnOp<KFrom extends string, KTo extends string> = {
     from: KFrom;
     to: KTo;
 };
-export type ModifyColumnOp<K extends string, T extends DataTypeExpression> = {
+export type ModifyColumnOp<K extends string, T extends DataTypeExpression, TNullable extends boolean = true> = {
     op: "modifyColumn";
     name: K;
     type: T;
+    nullable: TNullable;
 };
 export type Alteration = {
     kind: "setDataType";
@@ -37,7 +39,7 @@ export type AlterColumnOp<K extends string, TAlteration extends Alteration> = {
     name: K;
     alteration: TAlteration;
 };
-export type AlterOperation = AddColumnOp<any, any> | DropColumnOp<any> | RenameColumnOp<any, any> | AlterColumnOp<any, any> | ModifyColumnOp<any, any>;
+export type AlterOperation = AddColumnOp<any, any, any> | DropColumnOp<any> | RenameColumnOp<any, any> | AlterColumnOp<any, any> | ModifyColumnOp<any, any, any>;
 export type SqlToTsType<T extends string | typeof sql> = T extends "text" ? string : T extends "integer" ? number : T extends "blob" ? Uint8Array : T extends "real" ? number : T extends "boolean" ? boolean : T extends typeof sql ? any : never;
 export type Prettify<T> = {
     [K in keyof T]: T[K];
@@ -57,8 +59,8 @@ export type Cast<A, B> = A extends B ? A : B;
 /**
  * Applies a single alteration operation to a schema.
  */
-type ApplyOp<TSchema, THeadOp> = THeadOp extends AddColumnOp<infer K, infer T> ? Prettify<TSchema & {
-    [P in K]: SqlToTsType<T>;
+type ApplyOp<TSchema, THeadOp> = THeadOp extends AddColumnOp<infer K, infer T, infer TNullable> ? Prettify<TSchema & {
+    [P in K]: TNullable extends true ? SqlToTsType<T> | null : SqlToTsType<T>;
 }> : THeadOp extends DropColumnOp<infer K> ? Omit<TSchema, K> : THeadOp extends RenameColumnOp<infer KFrom, infer KTo> ? KFrom extends keyof TSchema ? Prettify<Omit<TSchema, KFrom> & {
     [P in KTo]: TSchema[KFrom];
 }> : TSchema : THeadOp extends AlterColumnOp<infer K, infer TAlt> ? TAlt extends {
@@ -66,8 +68,8 @@ type ApplyOp<TSchema, THeadOp> = THeadOp extends AddColumnOp<infer K, infer T> ?
     dataType: infer DT extends string;
 } ? Prettify<Omit<TSchema, K> & {
     [P in K]: SqlToTsType<DT>;
-}> : TSchema : THeadOp extends ModifyColumnOp<infer K, infer T> ? Prettify<Omit<TSchema, K> & {
-    [P in K]: SqlToTsType<T>;
+}> : TSchema : THeadOp extends ModifyColumnOp<infer K, infer T, infer TNullable> ? Prettify<Omit<TSchema, K> & {
+    [P in K]: TNullable extends true ? SqlToTsType<T> | null : SqlToTsType<T>;
 }> : TSchema;
 /**
  * Recursively processes a list of alteration operations (AST)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-beta.27",
+  "version": "1.0.0-beta.27-test.20251111115809",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {