rado 1.2.0 → 1.2.1

package/README.md

@@ -27,7 +27,7 @@ import {connect} from 'rado/driver/pg'
 import {Pool} from 'pg'
 
 // Define your schema
-const User = table({
+const User = table("user", {
   id: integer().primaryKey(),
   name: text().notNull(),
   email: text().unique()
@@ -165,7 +165,7 @@ Rado provides first-class support for JSON columns:
 ```typescript
 import {pgTable, serial, text, jsonb} from 'rado/postgres'
 
-const User = pgTable({
+const User = pgTable("user", {
   id: serial().primaryKey(),
   name: text(),
   metadata: jsonb<{subscribed: boolean}>()

package/dist/core/Column.d.ts

@@ -1,10 +1,10 @@
 import type { DriverSpecs } from './Driver.js';
-import { internalData } from './Internal.js';
+import { type HasSql, internalData, internalSql } from './Internal.js';
 import { type Sql } from './Sql.js';
 import type { Field, FieldData } from './expr/Field.js';
 import { type Input } from './expr/Input.js';
-export interface ColumnData {
-    type: Sql;
+export interface BaseColumnData {
+    type: HasSql;
     name?: string;
     json?: boolean;
     primary?: boolean;
@@ -18,6 +18,15 @@ export interface ColumnData {
     $default?(): Sql;
     $onUpdate?(): Sql;
 }
+export interface ColumnData extends BaseColumnData {
+    type: ColumnType;
+}
+export declare class ColumnType implements HasSql {
+    kind: string;
+    args: Array<Input<unknown>>;
+    [internalSql]: Sql;
+    constructor(kind: string, args: Array<Input<unknown>>, sql?: Sql);
+}
 type WithoutNull<Value> = Exclude<Value, null>;
 export declare class Column<Value = unknown> {
     readonly [internalData]: ColumnData;
@@ -46,7 +55,7 @@ export interface RequiredColumn<Value = unknown> extends Column<WithoutNull<Valu
 }
 export interface Columns {
     <T>(data: ColumnData): Column<T>;
-    [key: string]: (...args: Array<Input<any>>) => Sql<any>;
+    [key: string]: (...args: Array<Input<any>>) => ColumnType;
 }
 export declare const column: Columns;
 export type ColumnArguments<Options> = [name?: string] | [options: Options] | [name: string, options: Options];
@@ -54,5 +63,5 @@ export declare function columnConfig<Options>(args: ColumnArguments<Options>): {
     name: string | undefined;
     options: Options | undefined;
 };
-export declare function formatColumn(column: ColumnData): Sql;
+export declare function formatColumn(column: BaseColumnData): Sql;
 export {};

package/dist/core/Column.js

@@ -1,8 +1,24 @@
 // src/core/Column.ts
-import { getData, getField, internalData } from "./Internal.js";
+import {
+  getData,
+  getField,
+  internalData,
+  internalSql
+} from "./Internal.js";
 import { sql } from "./Sql.js";
 import { callFunction } from "./expr/Functions.js";
 import { input, mapToColumn } from "./expr/Input.js";
+function formatType(kind, args) {
+  return args.length === 0 ? sql.unsafe(kind) : sql`${sql.unsafe(kind)}(${sql.join(args.map(sql.inline), sql`, `)})`;
+}
+var ColumnType = class {
+  constructor(kind, args, sql2 = formatType(kind, args)) {
+    this.kind = kind;
+    this.args = args;
+    this[internalSql] = sql2;
+  }
+  [internalSql];
+};
 var Column = class _Column {
   [internalData];
   constructor(data) {
@@ -78,11 +94,7 @@ var column = new Proxy(createColumn, {
       while (args.length > 0)
         if (args.at(-1) === void 0) args.pop();
         else break;
-      if (args.length === 0) return sql.unsafe(method);
-      return sql`${sql.unsafe(method)}(${sql.join(
-        args.map(sql.inline),
-        sql`, `
-      )})`;
+      return new ColumnType(method, args);
     };
   }
 });
@@ -113,6 +125,7 @@ function formatColumn(column2) {
 }
 export {
   Column,
+  ColumnType,
   JsonColumn,
   column,
   columnConfig,

package/dist/universal/columns.js

@@ -1,23 +1,39 @@
 // src/universal/columns.ts
-import { JsonColumn, column } from "../core/Column.js";
+import { ColumnType, JsonColumn, column } from "../core/Column.js";
 import { sql } from "../core/Sql.js";
-var idType = sql.universal({
-  sqlite: sql`integer`,
-  postgres: sql`integer generated always as identity`,
-  mysql: sql`int not null auto_increment`
-});
-var blobType = sql.universal({
-  postgres: sql`bytea`,
-  default: sql`blob`
-});
-var numberType = sql.universal({
-  mysql: sql`double`,
-  default: sql`numeric`
-});
-var jsonbType = sql.universal({
-  mysql: sql`json`,
-  default: sql`jsonb`
-});
+var idType = new ColumnType(
+  "id",
+  [],
+  sql.universal({
+    sqlite: sql`integer`,
+    postgres: sql`integer generated always as identity`,
+    mysql: sql`int not null auto_increment`
+  })
+);
+var blobType = new ColumnType(
+  "blob",
+  [],
+  sql.universal({
+    postgres: sql`bytea`,
+    default: sql`blob`
+  })
+);
+var numberType = new ColumnType(
+  "number",
+  [],
+  sql.universal({
+    mysql: sql`double`,
+    default: sql`numeric`
+  })
+);
+var jsonbType = new ColumnType(
+  "json",
+  [],
+  sql.universal({
+    mysql: sql`json`,
+    default: sql`jsonb`
+  })
+);
 function id(name) {
   return column({
     name,

package/package.json

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