rado 1.2.0 → 1.3.0-preview.0

package/dist/driver/pg.js

@@ -9,6 +9,9 @@ var PreparedStatement = class {
     this.sql = sql;
     this.name = name;
   }
+  client;
+  sql;
+  name;
   all(params) {
     return this.client.query({
       name: this.name,
@@ -45,6 +48,8 @@ var PgDriver = class _PgDriver {
     this.client = client;
     this.depth = depth;
   }
+  client;
+  depth;
   parsesJson = true;
   supportsTransactions = true;
   async exec(query) {
@@ -86,7 +91,11 @@ var PgDriver = class _PgDriver {
   }
 };
 function connect(client) {
-  return new AsyncDatabase(new PgDriver(client), postgresDialect, postgresDiff);
+  return new AsyncDatabase(
+    new PgDriver(client),
+    postgresDialect,
+    postgresDiff
+  );
 }
 export {
   PgDriver,

package/dist/driver/pglite.js

@@ -3,19 +3,33 @@ import { AsyncDatabase } from "../core/Database.js";
 import { postgresDialect } from "../postgres/dialect.js";
 import { postgresDiff } from "../postgres/diff.js";
 import { setTransaction } from "../postgres/transactions.js";
+var RAW_DATE_TIME_PARSERS = {
+  20: (value) => value,
+  // int8 / bigint (e.g. count(*))
+  1082: (value) => value,
+  // date
+  1114: (value) => value,
+  // timestamp
+  1184: (value) => value
+  // timestamptz
+};
 var PreparedStatement = class {
   constructor(client, sql) {
     this.client = client;
     this.sql = sql;
   }
+  client;
+  sql;
   all(params) {
     return this.client.query(this.sql, params, {
-      rowMode: "object"
+      rowMode: "object",
+      parsers: RAW_DATE_TIME_PARSERS
     }).then((res) => res.rows);
   }
   async run(params) {
     await this.client.query(this.sql, params, {
-      rowMode: "array"
+      rowMode: "array",
+      parsers: RAW_DATE_TIME_PARSERS
     });
   }
   get(params) {
@@ -23,7 +37,8 @@ var PreparedStatement = class {
   }
   values(params) {
     return this.client.query(this.sql, params, {
-      rowMode: "array"
+      rowMode: "array",
+      parsers: RAW_DATE_TIME_PARSERS
     }).then((res) => res.rows);
   }
   free() {
@@ -34,15 +49,15 @@ var PGliteDriver = class _PGliteDriver {
     this.client = client;
     this.depth = depth;
   }
+  client;
+  depth;
   parsesJson = true;
   supportsTransactions = true;
   async exec(query) {
     await this.client.exec(query);
   }
   close() {
-    if ("close" in this.client) {
-      return Promise.resolve();
-    }
+    if ("close" in this.client) return this.client.close();
     throw new Error("Cannot close a transaction");
   }
   prepare(sql) {

package/dist/driver/sql.js.js

@@ -8,6 +8,8 @@ var PreparedStatement = class {
     this.client = client;
     this.stmt = stmt;
   }
+  client;
+  stmt;
   *iterate(params) {
     this.stmt.bind(params);
     while (this.stmt.step()) yield this.stmt.getAsObject();
@@ -41,6 +43,8 @@ var SqlJsDriver = class _SqlJsDriver {
     this.client = client;
     this.depth = depth;
   }
+  client;
+  depth;
   parsesJson = false;
   supportsTransactions = true;
   exec(query) {

package/dist/index.d.ts

@@ -18,3 +18,4 @@ export * from './core/query/Update.js';
 export * from './core/Selection.js';
 export * from './core/Sql.js';
 export * from './core/Table.js';
+export * from './core/View.js';

package/dist/index.js

@@ -19,3 +19,4 @@ export * from "./core/query/Update.js";
 export * from "./core/Selection.js";
 export * from "./core/Sql.js";
 export * from "./core/Table.js";
+export * from "./core/View.js";

package/dist/mysql/columns.d.ts

@@ -1,71 +1,71 @@
-import { type Column, type ColumnArguments, JsonColumn } from '../core/Column.js';
+import { Column, type ColumnArguments, JsonColumn } from '../core/Column.js';
 type Precision = 0 | 1 | 2 | 3 | 4 | 5 | 6;
 export declare function bigint(...args: ColumnArguments<{
     mode: 'number';
     unsigned?: boolean;
-}>): Column<number | null>;
+}>): Column<number>;
 export declare function bigint(...args: ColumnArguments<{
     unsigned?: boolean;
-}>): Column<bigint | null>;
+}>): Column<bigint>;
 export declare function binary(...args: ColumnArguments<{
     length?: number;
-}>): Column<Uint8Array | null>;
-export declare function boolean(name?: string): Column<boolean | null>;
-export declare function blob(name?: string): Column<Uint8Array | null>;
+}>): Column<Uint8Array>;
+export declare function boolean(name?: string): Column<boolean>;
+export declare function blob(name?: string): Column<Uint8Array>;
 export declare function char(...args: ColumnArguments<{
     length?: number;
-}>): Column<string | null>;
+}>): Column<string>;
 export declare function date(...args: ColumnArguments<{
     mode: 'string';
-}>): Column<string | null>;
+}>): Column<string>;
 export declare function date(...args: ColumnArguments<{
     mode: 'date';
-}>): Column<Date | null>;
+}>): Column<Date>;
 export declare function datetime(...args: ColumnArguments<{
     fsp?: Precision;
-}>): Column<Date | null>;
+}>): Column<Date>;
 export declare function datetime(...args: ColumnArguments<{
     mode: 'string';
     fsp?: Precision;
-}>): Column<string | null>;
+}>): Column<string>;
 export declare function decimal(...args: ColumnArguments<{
     precision?: number;
     scale?: number;
-}>): Column<number | null>;
-export declare function float(name?: string): Column<number | null>;
-export declare function integer(name?: string): Column<number | null>;
+}>): Column<number>;
+export declare function float(name?: string): Column<number>;
+export declare function integer(name?: string): Column<number>;
 export declare const int: typeof integer;
-export declare function json<T>(name?: string): JsonColumn<T | null>;
+export declare function json<T>(name?: string): JsonColumn<T>;
 export declare function mediumint(...args: ColumnArguments<{
     unsigned?: boolean;
-}>): Column<number | null>;
-export declare function real(name?: string): Column<number | null>;
-export declare function serial(name?: string): Column<number | null>;
+}>): Column<number>;
+export declare function real(name?: string): Column<number>;
+export declare function serial(name?: string): Column<number>;
 export declare function smallint(...args: ColumnArguments<{
     unsigned?: boolean;
-}>): Column<number | null>;
-export declare function text(name?: string): Column<string | null>;
-export declare function tinytext(name?: string): Column<string | null>;
-export declare function mediumtext(name?: string): Column<string | null>;
-export declare function longtext(name?: string): Column<string | null>;
+}>): Column<number>;
+export declare function text(name?: string): Column<string>;
+export declare function tinytext(name?: string): Column<string>;
+export declare function mediumtext(name?: string): Column<string>;
+export declare function longtext(name?: string): Column<string>;
 export declare function time(...args: ColumnArguments<{
     fsp?: Precision;
-}>): Column<string | null>;
+}>): Column<string>;
 export declare function timestamp(...args: ColumnArguments<{
     fsp?: Precision;
-}>): Column<Date | null>;
+}>): Column<Date>;
 export declare function timestamp(...args: ColumnArguments<{
     mode: 'string';
     fsp?: Precision;
-}>): Column<string | null>;
+}>): Column<string>;
 export declare function tinyint(...args: ColumnArguments<{
     unsigned?: boolean;
-}>): Column<number | null>;
+}>): Column<number>;
 export declare function varbinary(...args: ColumnArguments<{
     length?: number;
-}>): Column<Uint8Array | null>;
+}>): Column<Uint8Array>;
 export declare function varchar(...args: ColumnArguments<{
     length?: number;
-}>): Column<string | null>;
-export declare function year(name?: string): Column<number | null>;
+}>): Column<string>;
+export declare function year(name?: string): Column<number>;
 export {};

package/dist/mysql/columns.js

@@ -1,12 +1,13 @@
 // src/mysql/columns.ts
 import {
+  Column,
   JsonColumn,
   column,
   columnConfig
 } from "../core/Column.js";
 function bigint(...args) {
   const { name, options } = columnConfig(args);
-  return column({
+  return new Column({
     name,
     type: column[options?.unsigned ? "bigint unsigned" : "bigint"](),
     mapFromDriverValue: options?.mode === "number" ? Number : BigInt
@@ -14,21 +15,21 @@ function bigint(...args) {
 }
 function binary(...args) {
   const { name, options } = columnConfig(args);
-  return column({ name, type: column.binary(options?.length) });
+  return new Column({ name, type: column.binary(options?.length) });
 }
 function boolean(name) {
-  return column({ name, type: column.boolean() });
+  return new Column({ name, type: column.boolean() });
 }
 function blob(name) {
-  return column({ name, type: column.blob() });
+  return new Column({ name, type: column.blob() });
 }
 function char(...args) {
   const { name, options } = columnConfig(args);
-  return column({ name, type: column.char(options?.length) });
+  return new Column({ name, type: column.char(options?.length) });
 }
 function date(...args) {
   const { name, options } = columnConfig(args);
-  return column({
+  return new Column({
     name,
     type: column.date(),
     mapFromDriverValue(value) {
@@ -41,7 +42,7 @@ function date(...args) {
 }
 function datetime(...args) {
   const { name, options } = columnConfig(args);
-  return column({
+  return new Column({
     name,
     type: column.datetime(options?.fsp),
     mapFromDriverValue(value) {
@@ -54,16 +55,16 @@ function datetime(...args) {
 }
 function decimal(...args) {
   const { name, options } = columnConfig(args);
-  return column({
+  return new Column({
     name,
     type: column.decimal(options?.precision, options?.scale)
   });
 }
 function float(name) {
-  return column({ name, type: column.float() });
+  return new Column({ name, type: column.float() });
 }
 function integer(name) {
-  return column({ name, type: column.integer() });
+  return new Column({ name, type: column.integer() });
 }
 var int = integer;
 function json(name) {
@@ -77,43 +78,43 @@ function json(name) {
 }
 function mediumint(...args) {
   const { name, options } = columnConfig(args);
-  return column({
+  return new Column({
     name,
     type: column[options?.unsigned ? "mediumint unsigned" : "mediumint"]()
   });
 }
 function real(name) {
-  return column({ name, type: column.real() });
+  return new Column({ name, type: column.real() });
 }
 function serial(name) {
-  return column({ name, type: column.serial() });
+  return new Column({ name, type: column.serial() });
 }
 function smallint(...args) {
   const { name, options } = columnConfig(args);
-  return column({
+  return new Column({
     name,
     type: column[options?.unsigned ? "smallint unsigned" : "smallint"]()
   });
 }
 function text(name) {
-  return column({ name, type: column.text() });
+  return new Column({ name, type: column.text() });
 }
 function tinytext(name) {
-  return column({ name, type: column.tinytext() });
+  return new Column({ name, type: column.tinytext() });
 }
 function mediumtext(name) {
-  return column({ name, type: column.mediumtext() });
+  return new Column({ name, type: column.mediumtext() });
 }
 function longtext(name) {
-  return column({ name, type: column.longtext() });
+  return new Column({ name, type: column.longtext() });
 }
 function time(...args) {
   const { name, options } = columnConfig(args);
-  return column({ name, type: column.time(options?.fsp) });
+  return new Column({ name, type: column.time(options?.fsp) });
 }
 function timestamp(...args) {
   const { name, options } = columnConfig(args);
-  return column({
+  return new Column({
     name,
     type: column.timestamp(options?.fsp),
     mapFromDriverValue(value) {
@@ -126,21 +127,21 @@ function timestamp(...args) {
 }
 function tinyint(...args) {
   const { name, options } = columnConfig(args);
-  return column({
+  return new Column({
     name,
     type: column[options?.unsigned ? "tinyint unsigned" : "tinyint"]()
   });
 }
 function varbinary(...args) {
   const { name, options } = columnConfig(args);
-  return column({ name, type: column.varbinary(options?.length) });
+  return new Column({ name, type: column.varbinary(options?.length) });
 }
 function varchar(...args) {
   const { name, options } = columnConfig(args);
-  return column({ name, type: column.varchar(options?.length) });
+  return new Column({ name, type: column.varchar(options?.length) });
 }
 function year(name) {
-  return column({ name, type: column.year() });
+  return new Column({ name, type: column.year() });
 }
 export {
   bigint,

package/dist/mysql/dialect.js

@@ -5,6 +5,8 @@ import { NamedParam, ValueParam } from "../core/Param.js";
 var BACKTICK = "`";
 var ESCAPE_BACKTICK = "``";
 var MATCH_BACKTICK = /`/g;
+var ESCAPE_BACKSLASH = "\\\\";
+var MATCH_BACKSLASH = /\\/g;
 var SINGLE_QUOTE = "'";
 var ESCAPE_SINGLE_QUOTE = "''";
 var MATCH_SINGLE_QUOTE = /'/g;
@@ -24,7 +26,9 @@ var mysqlDialect = new Dialect(
       target.emit(this);
       this.sql += asSql ? "->>" : "->";
       this.sql += this.quoteString(
-        `$${segments.map((p) => typeof p === "number" ? `[${p}]` : `.${p}`).join("")}`
+        `$${segments.map(
+          (p) => typeof p === "number" ? `[${p}]` : `.${JSON.stringify(p)}`
+        ).join("")}`
       );
     }
     emitInline(value) {
@@ -36,7 +40,7 @@ var mysqlDialect = new Dialect(
       this.sql += this.quoteString(JSON.stringify(value));
     }
     quoteString(input) {
-      return SINGLE_QUOTE + input.replace(MATCH_SINGLE_QUOTE, ESCAPE_SINGLE_QUOTE) + SINGLE_QUOTE;
+      return SINGLE_QUOTE + input.replace(MATCH_BACKSLASH, ESCAPE_BACKSLASH).replace(MATCH_SINGLE_QUOTE, ESCAPE_SINGLE_QUOTE) + SINGLE_QUOTE;
     }
     emitIdentifier(identifier) {
       this.sql += BACKTICK + identifier.replace(MATCH_BACKTICK, ESCAPE_BACKTICK) + BACKTICK;

package/dist/mysql/diff.js

@@ -1,9 +1,9 @@
 // src/mysql/diff.ts
 import { formatColumn } from "../core/Column.js";
+import { eq } from "../core/expr/Conditions.js";
 import { getData, getTable } from "../core/Internal.js";
 import { schema } from "../core/Schema.js";
 import { sql } from "../core/Sql.js";
-import { eq } from "../core/expr/Conditions.js";
 import { txGenerator } from "../universal.js";
 import * as column from "./columns.js";
 import { mysqlDialect } from "./dialect.js";

package/dist/mysql.d.ts

@@ -3,6 +3,7 @@ export { index, uniqueIndex } from './core/Index.js';
 export { except, exceptAll, intersect, intersectAll, union, unionAll } from './core/query/Select.js';
 export { schema as mysqlSchema } from './core/Schema.js';
 export { alias, table as mysqlTable, tableCreator as mysqlTableCreator } from './core/Table.js';
+export { view as mysqlView } from './core/View.js';
 export * from './mysql/builder.js';
 export * from './mysql/columns.js';
 export * from './mysql/dialect.js';

package/dist/mysql.js

@@ -15,6 +15,7 @@ import {
   table,
   tableCreator
 } from "./core/Table.js";
+import { view } from "./core/View.js";
 export * from "./mysql/builder.js";
 export * from "./mysql/columns.js";
 export * from "./mysql/dialect.js";
@@ -29,6 +30,7 @@ export {
   schema as mysqlSchema,
   table as mysqlTable,
   tableCreator as mysqlTableCreator,
+  view as mysqlView,
   primaryKey,
   union,
   unionAll,

package/dist/postgres/columns.d.ts

@@ -1,63 +1,133 @@
-import { type Column, type ColumnArguments, JsonColumn } from '../core/Column.js';
+import { Column, type ColumnArguments, type Nullability } from '../core/Column.js';
 type Precision = 0 | 1 | 2 | 3 | 4 | 5 | 6;
 type IntervalFields = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second' | 'year to month' | 'day to hour' | 'day to minute' | 'day to second' | 'hour to minute' | 'hour to second' | 'minute to second';
-export declare function bigint(name: string | undefined, options: {
+type PointTuple = [number, number];
+type PointXY = {
+    x: number;
+    y: number;
+};
+type LineTuple = [number, number, number];
+type LineABC = {
+    a: number;
+    b: number;
+    c: number;
+};
+type GeometryBaseType = 'geometry' | 'point' | 'line' | 'linestring' | 'polygon' | 'multipoint' | 'multilinestring' | 'multipolygon' | 'geometrycollection' | 'circularstring' | 'compoundcurve' | 'curvepolygon' | 'multicurve' | 'multisurface' | 'polyhedralsurface' | 'triangle' | 'tin';
+type GeometryType = `${GeometryBaseType}${'' | 'z' | 'm' | 'zm'}`;
+export declare class PgColumn<Value = unknown, Nulls extends Nullability = Nullability> extends Column<Value, Nulls> {
+    notNull(): PgColumn<Value, [false, Nulls[1]]>;
+    unique(name?: string, config?: {
+        nulls: 'distinct' | 'not distinct';
+    }): PgColumn<Value, Nulls>;
+    array(size?: number): PgColumn<Array<Value>, Nulls>;
+    generatedAlwaysAsIdentity(): PgColumn<Value, Nulls>;
+    generatedByDefaultAsIdentity(): PgColumn<Value, Nulls>;
+}
+export declare function bigint(...args: ColumnArguments<{
     mode: 'number';
-}): Column<number | null>;
-export declare function bigint(name?: string): Column<bigint | null>;
-export declare function bigserial(name: string | undefined, options: {
+}>): PgColumn<number>;
+export declare function bigint(...args: ColumnArguments<{
+    mode?: 'bigint';
+}>): PgColumn<bigint>;
+export declare function bigserial(...args: ColumnArguments<{
     mode: 'number';
-}): Column<number | null>;
-export declare function bigserial(name?: string): Column<bigint | null>;
+}>): PgColumn<number>;
+export declare function bigserial(...args: ColumnArguments<{
+    mode?: 'bigint';
+}>): PgColumn<bigint>;
 export declare function char(name?: string, options?: {
     length: number;
-}): Column<string | null>;
-export declare function cidr(name?: string): Column<string | null>;
+}): PgColumn<string>;
+export declare function bit(...args: ColumnArguments<{
+    dimensions?: number;
+}>): PgColumn<string>;
+export declare function varbit(...args: ColumnArguments<{
+    dimensions?: number;
+}>): PgColumn<string>;
+export declare function cidr(name?: string): PgColumn<string>;
 export declare function date(name?: string, options?: {
     mode: 'string';
-}): Column<string | null>;
+}): PgColumn<string>;
 export declare function date(name: string | undefined, options: {
     mode: 'date';
-}): Column<Date | null>;
-export declare function doublePrecision(name?: string): Column<number | null>;
-export declare function inet(name?: string): Column<string | null>;
-export declare function integer(name?: string): Column<number | null>;
+}): PgColumn<Date>;
+export declare function doublePrecision(name?: string): PgColumn<number>;
+export declare function inet(name?: string): PgColumn<string>;
+export declare function integer(name?: string): PgColumn<number>;
 export declare const int: typeof integer;
-export declare function oid(name?: string): Column<number | null>;
+export declare function oid(name?: string): PgColumn<number>;
+export declare function point(...args: ColumnArguments<{
+    mode?: 'tuple';
+}>): PgColumn<PointTuple>;
+export declare function point(...args: ColumnArguments<{
+    mode: 'xy';
+}>): PgColumn<PointXY>;
+export declare function line(...args: ColumnArguments<{
+    mode?: 'tuple';
+}>): PgColumn<LineTuple>;
+export declare function line(...args: ColumnArguments<{
+    mode: 'abc';
+}>): PgColumn<LineABC>;
 export declare function interval(...args: ColumnArguments<{
     fields?: IntervalFields;
     precision?: Precision;
-}>): Column<string | null>;
-export declare function serial(name?: string): Column<number>;
-export declare function boolean(name?: string): Column<boolean | null>;
-export declare function bytea(name?: string): Column<Uint8Array | null>;
-export declare function text(name?: string): Column<string | null>;
-export declare function json<T>(name?: string): JsonColumn<T | null>;
-export declare function jsonb<T>(name?: string): JsonColumn<T | null>;
-export declare function macaddr(name?: string): Column<string | null>;
-export declare function macaddr8(name?: string): Column<string | null>;
+}>): PgColumn<string>;
+export declare function serial(name?: string): PgColumn<number>;
+export declare function boolean(name?: string): PgColumn<boolean>;
+export declare function bytea(name?: string): PgColumn<Uint8Array>;
+export declare function text(name?: string): PgColumn<string>;
+export declare function json<T>(name?: string): PgColumn<T>;
+export declare function jsonb<T>(name?: string): PgColumn<T>;
+export declare function geometry(...args: ColumnArguments<{
+    type?: GeometryType;
+    mode?: 'tuple' | 'xy';
+}>): PgColumn<PointTuple | PointXY | string>;
+export declare function vector(...args: ColumnArguments<{
+    dimensions: number;
+}>): PgColumn<string>;
+export declare function halfvec(...args: ColumnArguments<{
+    dimensions: number;
+}>): PgColumn<string>;
+export declare function sparsevec(...args: ColumnArguments<{
+    dimensions: number;
+}>): PgColumn<string>;
+export declare function macaddr(name?: string): PgColumn<string>;
+export declare function macaddr8(name?: string): PgColumn<string>;
 export declare function numeric(...args: ColumnArguments<{
     precision?: number;
     scale?: number;
-}>): Column<number | null>;
-export declare function real(name?: string): Column<number | null>;
-export declare function smallint(name?: string): Column<number | null>;
-export declare function smallserial(name?: string): Column<number | null>;
+}>): PgColumn<string>;
+export declare function numeric(...args: ColumnArguments<{
+    precision?: number;
+    scale?: number;
+    mode: 'number';
+}>): PgColumn<number>;
+export declare function numeric(...args: ColumnArguments<{
+    precision?: number;
+    scale?: number;
+    mode: 'bigint';
+}>): PgColumn<bigint>;
+export declare function real(name?: string): PgColumn<number>;
+export declare function smallint(name?: string): PgColumn<number>;
+export declare function smallserial(name?: string): PgColumn<number>;
 export declare function time(...args: ColumnArguments<{
     precision?: Precision;
     withTimeZone?: boolean;
-}>): Column<string | null>;
+}>): PgColumn<string>;
 export declare function timestamp(...args: ColumnArguments<{
+    mode?: 'date';
     precision?: Precision;
     withTimeZone?: boolean;
-}>): Column<Date | null>;
+    withTimezone?: boolean;
+}>): PgColumn<Date>;
 export declare function timestamp(...args: ColumnArguments<{
     mode: 'string';
     precision?: Precision;
     withTimeZone?: boolean;
-}>): Column<string | null>;
-export declare function uuid(name?: string): Column<string | null>;
+    withTimezone?: boolean;
+}>): PgColumn<string>;
+export declare function uuid(name?: string): PgColumn<string>;
 export declare function varchar(...args: ColumnArguments<{
     length: number;
-}>): Column<string | null>;
+}>): PgColumn<string>;
 export {};