rado 1.0.15 → 1.2.1

package/dist/postgres/columns.js

@@ -1,5 +1,9 @@
 // src/postgres/columns.ts
-import { JsonColumn, column } from "../core/Column.js";
+import {
+  JsonColumn,
+  column,
+  columnConfig
+} from "../core/Column.js";
 function bigint(name, options) {
   return column({
     name,
@@ -54,7 +58,8 @@ var int = integer;
 function oid(name) {
   return column({ name, type: column.oid() });
 }
-function interval(name, options) {
+function interval(...args) {
+  const { name, options } = columnConfig(args);
   return column({
     name,
     type: column[options?.fields ? `interval ${options.fields}` : "interval"](
@@ -104,7 +109,8 @@ function macaddr(name) {
 function macaddr8(name) {
   return column({ name, type: column.macaddr8() });
 }
-function numeric(name, options) {
+function numeric(...args) {
+  const { name, options } = columnConfig(args);
   return column({
     name,
     type: column.numeric(options?.precision, options?.scale)
@@ -125,7 +131,8 @@ function smallint(name) {
 function smallserial(name) {
   return column({ name, type: column.smallserial() });
 }
-function time(name, options) {
+function time(...args) {
+  const { name, options } = columnConfig(args);
   return column({
     name,
     type: column[options?.withTimeZone ? "time with time zone" : "time"](
@@ -133,7 +140,8 @@ function time(name, options) {
     )
   });
 }
-function timestamp(name, options) {
+function timestamp(...args) {
+  const { name, options } = columnConfig(args);
   return column({
     name,
     type: column[options?.withTimeZone ? "timestamp with time zone" : "timestamp"](options?.precision),
@@ -148,7 +156,8 @@ function timestamp(name, options) {
 function uuid(name) {
   return column({ name, type: column.uuid() });
 }
-function varchar(name, options) {
+function varchar(...args) {
+  const { name, options } = columnConfig(args);
   return column({
     name,
     type: column.varchar(options?.length)

package/dist/postgres/dialect.js

@@ -12,13 +12,16 @@ var postgresDialect = new Dialect(
   "postgres",
   class extends Emitter {
     runtime = "postgres";
-    paramIndex = 0;
     emitValue(value) {
-      this.sql += `$${++this.paramIndex}`;
       this.params.push(new ValueParam(value));
+      this.sql += `$${this.params.length}`;
+    }
+    emitPlaceholder(name) {
+      this.params.push(new NamedParam(name));
+      this.sql += `$${this.params.length}`;
     }
     emitJsonPath({ target, asSql, segments }) {
-      target.emitTo(this);
+      target.emit(this);
       for (let i = 0; i < segments.length; i++) {
         const access = segments[i];
         if (i <= segments.length - 2) this.sql += "->";
@@ -35,10 +38,6 @@ var postgresDialect = new Dialect(
         return this.sql += this.quoteString(value);
       this.sql += this.quoteString(JSON.stringify(value));
     }
-    emitPlaceholder(name) {
-      this.sql += `$${++this.paramIndex}`;
-      this.params.push(new NamedParam(name));
-    }
     quoteString(input) {
       return SINGLE_QUOTE + input.replace(MATCH_SINGLE_QUOTE, ESCAPE_SINGLE_QUOTE) + SINGLE_QUOTE;
     }

package/dist/postgres/diff.js

@@ -1,4 +1,5 @@
 // src/postgres/diff.ts
+import { formatColumn } from "../core/Column.js";
 import { getData, getTable } from "../core/Internal.js";
 import { sql } from "../core/Sql.js";
 import { table } from "../core/Table.js";
@@ -145,7 +146,7 @@ var postgresDiff = (hasTable) => {
         stmts.push(
           sql.query({
             alterTable,
-            addColumn: [column2, sql.chunk("emitColumn", schemaInstruction)]
+            addColumn: [column2, formatColumn(schemaInstruction)]
           })
         );
       } else {

package/dist/postgres.d.ts

@@ -1,7 +1,8 @@
+export { foreignKey, primaryKey, unique } from './core/Constraint.js';
 export { index, uniqueIndex } from './core/Index.js';
-export { except, exceptAll, intersect, intersectAll, union, unionAll } from './core/query/Union.js';
+export { except, exceptAll, intersect, intersectAll, union, unionAll } from './core/query/Select.js';
 export { schema as pgSchema } from './core/Schema.js';
-export { alias, table as pgTable } from './core/Table.js';
+export { alias, table as pgTable, tableCreator as pgTableCreator } from './core/Table.js';
 export * from './postgres/builder.js';
 export * from './postgres/columns.js';
 export * from './postgres/dialect.js';

package/dist/postgres.js

@@ -1,4 +1,5 @@
 // src/postgres.ts
+import { foreignKey, primaryKey, unique } from "./core/Constraint.js";
 import { index, uniqueIndex } from "./core/Index.js";
 import {
   except,
@@ -7,9 +8,13 @@ import {
   intersectAll,
   union,
   unionAll
-} from "./core/query/Union.js";
+} from "./core/query/Select.js";
 import { schema } from "./core/Schema.js";
-import { alias, table } from "./core/Table.js";
+import {
+  alias,
+  table,
+  tableCreator
+} from "./core/Table.js";
 export * from "./postgres/builder.js";
 export * from "./postgres/columns.js";
 export * from "./postgres/dialect.js";
@@ -17,12 +22,16 @@ export {
   alias,
   except,
   exceptAll,
+  foreignKey,
   index,
   intersect,
   intersectAll,
   schema as pgSchema,
   table as pgTable,
+  tableCreator as pgTableCreator,
+  primaryKey,
   union,
   unionAll,
+  unique,
   uniqueIndex
 };

package/dist/sqlite/columns.d.ts

@@ -1,8 +1,23 @@
-import { type Column, JsonColumn } from '../core/Column.js';
+import { type Column, type ColumnArguments, JsonColumn } from '../core/Column.js';
 export declare function boolean(name?: string): Column<boolean | null>;
 export declare function integer(name?: string): Column<number | null>;
+export declare function integer(...args: ColumnArguments<{
+    mode: 'boolean';
+}>): Column<boolean | null>;
+export declare function integer(...args: ColumnArguments<{
+    mode: 'timestamp';
+}>): Column<Date | null>;
+export declare function integer(...args: ColumnArguments<{
+    mode: 'timestamp_ms';
+}>): Column<Date | null>;
 export declare const int: typeof integer;
 export declare function blob(name?: string): Column<Uint8Array | null>;
+export declare function blob(...args: ColumnArguments<{
+    mode: 'bigint';
+}>): Column<BigInt | null>;
+export declare function blob<T>(...args: ColumnArguments<{
+    mode: 'json';
+}>): Column<T | null>;
 export declare function text(name?: string): Column<string | null>;
 export declare function real(name?: string): Column<number | null>;
 export declare function numeric(name?: string): Column<number | null>;

package/dist/sqlite/columns.js

@@ -1,5 +1,9 @@
 // src/sqlite/columns.ts
-import { JsonColumn, column } from "../core/Column.js";
+import {
+  JsonColumn,
+  column,
+  columnConfig
+} from "../core/Column.js";
 function boolean(name) {
   return column({
     name,
@@ -12,11 +16,40 @@ function boolean(name) {
     }
   });
 }
-function integer(name) {
+function integer(...args) {
+  const { name, options } = columnConfig(args);
+  if (options?.mode === "timestamp" || options?.mode === "timestamp_ms") {
+    const scale = options.mode === "timestamp" ? 1e3 : 1;
+    return column({
+      name,
+      type: column.integer(),
+      mapFromDriverValue(value) {
+        if (value === null) return null;
+        return new Date(value * scale);
+      },
+      mapToDriverValue(value) {
+        return Math.floor(value.getTime() / scale);
+      }
+    });
+  }
+  if (options?.mode === "boolean") return boolean();
   return column({ name, type: column.integer() });
 }
 var int = integer;
-function blob(name) {
+function blob(...args) {
+  const { name, options } = columnConfig(args);
+  if (options?.mode === "json") return json(name);
+  if (options?.mode === "bigint")
+    return column({
+      name,
+      type: column.blob(),
+      mapFromDriverValue(value) {
+        return BigInt(value);
+      },
+      mapToDriverValue(value) {
+        return value.toString();
+      }
+    });
   return column({ name, type: column.blob() });
 }
 function text(name) {

package/dist/sqlite/dialect.js

@@ -15,11 +15,15 @@ var sqliteDialect = new Dialect(
       return typeof value === "boolean" ? value ? 1 : 0 : value;
     }
     emitValue(value) {
-      this.sql += "?";
       this.params.push(new ValueParam(value));
+      this.sql += "?";
+    }
+    emitPlaceholder(name) {
+      this.params.push(new NamedParam(name));
+      this.sql += "?";
     }
     emitJsonPath({ target, asSql, segments }) {
-      target.emitTo(this);
+      target.emit(this);
       this.sql += asSql ? "->>" : "->";
       this.sql += this.quoteString(
         `$${segments.map((p) => typeof p === "number" ? `[${p}]` : `.${p}`).join("")}`
@@ -33,10 +37,6 @@ var sqliteDialect = new Dialect(
       if (typeof value === "boolean") return this.sql += value ? "1" : "0";
       this.sql += `json(${this.quoteString(JSON.stringify(value))})`;
     }
-    emitPlaceholder(name) {
-      this.sql += "?";
-      this.params.push(new NamedParam(name));
-    }
     emitIdentifier(identifier) {
       this.sql += DOUBLE_QUOTE + identifier.replace(MATCH_DOUBLE_QUOTE, ESCAPE_DOUBLE_QUOTE) + DOUBLE_QUOTE;
     }

package/dist/sqlite/diff.js

@@ -1,4 +1,5 @@
 // src/sqlite/diff.ts
+import { formatColumn } from "../core/Column.js";
 import { Rollback } from "../core/Database.js";
 import { getData, getQuery, getTable } from "../core/Internal.js";
 import { sql } from "../core/Sql.js";
@@ -37,7 +38,7 @@ var sqliteDiff = (targetTable) => {
         return [
           column2.name,
           inline(
-            sql.chunk("emitColumn", {
+            formatColumn({
               type: sql.unsafe(column2.type.toLowerCase()),
               notNull: column2.notnull,
               primary: hasSinglePrimaryKey && column2.pk === 1,
@@ -50,10 +51,7 @@ var sqliteDiff = (targetTable) => {
     const schemaColumns = new Map(
       Object.entries(tableApi.columns).map(([name, column2]) => {
         const columnApi = getData(column2);
-        return [
-          columnApi.name ?? name,
-          inline(sql.chunk("emitColumn", columnApi))
-        ];
+        return [columnApi.name ?? name, inline(formatColumn(columnApi))];
       })
     );
     const localIndexes = new Map(

package/dist/sqlite.d.ts

@@ -1,6 +1,7 @@
+export { foreignKey, primaryKey, unique } from './core/Constraint.js';
 export { index, uniqueIndex } from './core/Index.js';
-export { except, intersect, union, unionAll } from './core/query/Union.js';
-export { alias, table as sqliteTable } from './core/Table.js';
+export { except, intersect, union, unionAll } from './core/query/Select.js';
+export { alias, table as sqliteTable, tableCreator as sqliteTableCreator } from './core/Table.js';
 export * from './sqlite/builder.js';
 export * from './sqlite/columns.js';
 export * from './sqlite/dialect.js';

package/dist/sqlite.js

@@ -1,12 +1,17 @@
 // src/sqlite.ts
+import { foreignKey, primaryKey, unique } from "./core/Constraint.js";
 import { index, uniqueIndex } from "./core/Index.js";
 import {
   except,
   intersect,
   union,
   unionAll
-} from "./core/query/Union.js";
-import { alias, table } from "./core/Table.js";
+} from "./core/query/Select.js";
+import {
+  alias,
+  table,
+  tableCreator
+} from "./core/Table.js";
 export * from "./sqlite/builder.js";
 export * from "./sqlite/columns.js";
 export * from "./sqlite/dialect.js";
@@ -14,10 +19,14 @@ export * from "./sqlite/functions.js";
 export {
   alias,
   except,
+  foreignKey,
   index,
   intersect,
+  primaryKey,
   table as sqliteTable,
+  tableCreator as sqliteTableCreator,
   union,
   unionAll,
+  unique,
   uniqueIndex
 };

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/dist/universal/functions.js

@@ -13,7 +13,10 @@ function lastInsertId() {
 function concat(...slices) {
   return sql.universal({
     mysql: Functions.concat(...slices),
-    default: sql.join(slices.map(input), sql` || `)
+    default: sql.join(
+      slices.map((slice) => input(slice)),
+      sql` || `
+    )
   });
 }
 export {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "rado",
-  "version": "1.0.15",
+  "version": "1.2.1",
   "license": "MIT",
   "type": "module",
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.build.json && bun build.ts",
     "size": "esbuild src/index.ts --bundle --minify --format=esm --outdir=dist",
     "profile": "PROFILE=true bun build.ts && cd bin && (rimraf CPU*.cpuprofile || true) && node --cpu-prof --cpu-prof-interval=100 test && speedscope CPU*.cpuprofile",
-    "prepublishOnly": "rm -rf dist && bun run build",
+    "prepublishOnly": "bun run build",
     "cycles": "madge --circular src/index.ts src/sqlite.ts src/mysql.ts src/postgres.ts",
     "test:bun": "bun test",
     "test:node": "node --test-force-exit --test-concurrency=1 --import tsx --test \"**/*.test.ts\"",
@@ -26,8 +26,8 @@
   },
   "files": ["dist"],
   "devDependencies": {
-    "@alinea/suite": "^0.4.0",
-    "@biomejs/biome": "^1.8.3",
+    "@alinea/suite": "^0.6.2",
+    "@biomejs/biome": "^1.9.4",
     "@cloudflare/workers-types": "^4.20230628.0",
     "@electric-sql/pglite": "^0.2.12",
     "@libsql/client": "^0.10.0",

package/dist/core/Join.d.ts

@@ -1 +0,0 @@
-export type JoinOperator = 'left' | 'right' | 'inner' | 'full';

package/dist/core/Query.d.ts

@@ -1,46 +0,0 @@
-import { type HasQuery, type HasResolver, type HasSql, type HasTarget, internalData, internalQuery } from './Internal.js';
-import type { Deliver, QueryMeta } from './MetaData.js';
-import type { PreparedStatement, Resolver } from './Resolver.js';
-import type { Sql } from './Sql.js';
-export declare class QueryData<Meta extends QueryMeta> {
-    resolver?: Resolver<Meta>;
-    cte?: {
-        recursive: boolean;
-        definitions: Array<HasQuery & HasTarget>;
-    };
-}
-type Exec = () => any;
-declare class Executable<Result, Meta extends QueryMeta> implements PromiseLike<Array<Result>> {
-    #private;
-    private brand;
-    constructor(exec: Exec);
-    [Symbol.iterator](): Generator<Promise<unknown>, Array<Result>, unknown>;
-    run(): Deliver<Meta, void>;
-    then<TResult1 = Array<Result>, TResult2 = never>(onfulfilled?: ((value: Array<Result>) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
-    catch<TResult = never>(onrejected?: ((reason: unknown) => TResult | PromiseLike<TResult>) | undefined | null): Promise<Array<Result> | TResult>;
-    finally(onfinally?: (() => void) | undefined | null): Promise<Array<Result>>;
-}
-export declare class QueryBatch<Results, Meta extends QueryMeta> extends Executable<Results, Meta> {
-    constructor(queryResolver: Resolver, queries: Array<HasSql | HasQuery>);
-}
-export declare abstract class Query<Result, Meta extends QueryMeta> extends Executable<Result, Meta> {
-    #private;
-    readonly [internalData]: QueryData<Meta>;
-    abstract [internalQuery]: Sql;
-    constructor(data: QueryData<Meta>);
-    all(db?: HasResolver): Deliver<Meta, Array<Result>>;
-    get(db?: HasResolver): Deliver<Meta, Result | null>;
-    run(db?: HasResolver): Deliver<Meta, void>;
-    prepare<Inputs extends Record<string, unknown>>(name?: string): PreparedQuery<Result, Inputs, Meta>;
-    toSQL(db?: HasResolver): {
-        sql: string;
-        params: Array<unknown>;
-    };
-}
-export interface PreparedQuery<Result, Inputs extends Record<string, unknown>, Meta extends QueryMeta> extends PreparedStatement<Meta> {
-    all(inputs?: Inputs): Deliver<Meta, Array<Result>>;
-    get(inputs?: Inputs): Deliver<Meta, Result>;
-    run(inputs?: Inputs): Deliver<Meta, void>;
-    execute(inputs?: Inputs): Promise<Array<Result>>;
-}
-export {};

package/dist/core/query/Union.d.ts

@@ -1,35 +0,0 @@
-import { type HasQuery, type HasSelection, type HasSql, type HasTarget, internalData, internalQuery, internalSelection } from '../Internal.js';
-import type { IsMysql, IsPostgres, QueryMeta } from '../MetaData.js';
-import { Query, type QueryData } from '../Query.js';
-import type { Selection, SelectionRow } from '../Selection.js';
-import { Sql } from '../Sql.js';
-export interface UnionBaseData<Meta extends QueryMeta> extends QueryData<Meta> {
-    select?: Selection;
-}
-export declare abstract class UnionBase<Input, Meta extends QueryMeta = QueryMeta> extends Query<SelectionRow<Input>, Meta> {
-    #private;
-    readonly [internalData]: UnionBaseData<Meta>;
-    union(right: UnionBase<Input, Meta> | ((self: Input & HasTarget) => UnionBase<Input, Meta>)): Union<Input, Meta>;
-    unionAll(right: UnionBase<Input, Meta> | ((self: Input & HasTarget) => UnionBase<Input, Meta>)): Union<Input, Meta>;
-    intersect(right: UnionBase<Input, Meta> | ((self: Input & HasTarget) => UnionBase<Input, Meta>)): Union<Input, Meta>;
-    intersectAll(this: UnionBase<Input, IsPostgres | IsMysql>, right: UnionBase<Input, Meta> | ((self: Input & HasTarget) => UnionBase<Input, Meta>)): Union<Input, Meta>;
-    except(right: UnionBase<Input, Meta> | ((self: Input & HasTarget) => UnionBase<Input, Meta>)): Union<Input, Meta>;
-    exceptAll(this: UnionBase<Input, IsPostgres | IsMysql>, right: UnionBase<Input, Meta> | ((self: Input & HasTarget) => UnionBase<Input, Meta>)): Union<Input, Meta>;
-}
-export interface UnionData<Meta extends QueryMeta = QueryMeta> extends UnionBaseData<Meta> {
-    left: HasQuery;
-    operator: HasSql;
-    right: HasQuery;
-}
-export declare class Union<Result, Meta extends QueryMeta = QueryMeta> extends UnionBase<Result, Meta> implements HasSelection {
-    readonly [internalData]: UnionData<Meta>;
-    readonly [internalSelection]: Selection;
-    constructor(data: UnionData<Meta>);
-    get [internalQuery](): Sql;
-}
-export declare function union<Result, Meta extends QueryMeta>(left: UnionBase<Result, Meta>, right: UnionBase<Result, Meta>, ...rest: Array<UnionBase<Result, Meta>>): Union<Result, Meta>;
-export declare function unionAll<Result, Meta extends QueryMeta>(left: UnionBase<Result, Meta>, right: UnionBase<Result, Meta>): Union<Result, Meta>;
-export declare function intersect<Result, Meta extends QueryMeta>(left: UnionBase<Result, Meta>, right: UnionBase<Result, Meta>): Union<Result, Meta>;
-export declare function intersectAll<Result, Meta extends IsPostgres | IsMysql>(left: UnionBase<Result, Meta>, right: UnionBase<Result, Meta>): Union<Result, Meta>;
-export declare function except<Result, Meta extends QueryMeta>(left: UnionBase<Result, Meta>, right: UnionBase<Result, Meta>): Union<Result, Meta>;
-export declare function exceptAll<Result, Meta extends IsPostgres | IsMysql>(left: UnionBase<Result, Meta>, right: UnionBase<Result, Meta>): Union<Result, Meta>;

package/dist/core/query/Union.js

@@ -1,107 +0,0 @@
-// src/core/query/Union.ts
-import {
-  getData,
-  internalData,
-  internalQuery,
-  internalSelection
-} from "../Internal.js";
-import { Query } from "../Query.js";
-import { Sql, sql } from "../Sql.js";
-var UnionBase = class extends Query {
-  [internalData];
-  #makeSelf() {
-    const { select } = getData(this);
-    return select.makeVirtual(Sql.SELF_TARGET);
-  }
-  union(right) {
-    return new Union({
-      ...getData(this),
-      left: this,
-      operator: sql`union`,
-      right: typeof right === "function" ? right(this.#makeSelf()) : right
-    });
-  }
-  unionAll(right) {
-    return new Union({
-      ...getData(this),
-      left: this,
-      operator: sql`union all`,
-      right: typeof right === "function" ? right(this.#makeSelf()) : right
-    });
-  }
-  intersect(right) {
-    return new Union({
-      ...getData(this),
-      left: this,
-      operator: sql`intersect`,
-      right: typeof right === "function" ? right(this.#makeSelf()) : right
-    });
-  }
-  intersectAll(right) {
-    return new Union({
-      ...getData(this),
-      left: this,
-      operator: sql`intersect all`,
-      right: typeof right === "function" ? right(this.#makeSelf()) : right
-    });
-  }
-  except(right) {
-    return new Union({
-      ...getData(this),
-      left: this,
-      operator: sql`except`,
-      right: typeof right === "function" ? right(this.#makeSelf()) : right
-    });
-  }
-  exceptAll(right) {
-    return new Union({
-      ...getData(this),
-      left: this,
-      operator: sql`except all`,
-      right: typeof right === "function" ? right(this.#makeSelf()) : right
-    });
-  }
-};
-var Union = class extends UnionBase {
-  [internalData];
-  [internalSelection];
-  constructor(data) {
-    super(data);
-    this[internalData] = data;
-    this[internalSelection] = data.select;
-  }
-  get [internalQuery]() {
-    return sql.chunk("emitUnion", getData(this));
-  }
-};
-function union(left, right, ...rest) {
-  return [right, ...rest].reduce(
-    (acc, query) => acc.union(query),
-    left
-  );
-}
-function unionAll(left, right) {
-  return left.unionAll(right);
-}
-function intersect(left, right) {
-  return left.intersect(right);
-}
-function intersectAll(left, right) {
-  return left.intersectAll(right);
-}
-function except(left, right) {
-  return left.except(right);
-}
-function exceptAll(left, right) {
-  return left.exceptAll(right);
-}
-export {
-  Union,
-  UnionBase,
-  except,
-  exceptAll,
-  intersect,
-  intersectAll,
-  union,
-  unionAll
-};