rado 0.2.30 → 0.2.32

package/dist/index.js

@@ -1,4 +1,3 @@
-// src/index.ts
 export * from "./define/Column.js";
 export * from "./define/Expr.js";
 export * from "./define/Functions.js";

package/dist/lib/Driver.d.ts

@@ -1,11 +1,11 @@
-import { Expr } from '../define/Expr';
-import { Query, QueryData } from '../define/Query';
-import { SchemaInstructions } from '../define/Schema';
-import { Table } from '../define/Table';
-import { SelectMultiple } from '../define/query/Select';
-import { Callable } from '../util/Callable';
-import { Formatter } from './Formatter';
-import { Statement } from './Statement';
+import { Expr } from '../define/Expr.js';
+import { Query, QueryData } from '../define/Query.js';
+import { SchemaInstructions } from '../define/Schema.js';
+import { Table } from '../define/Table.js';
+import { Select } from '../define/query/Select.js';
+import { Callable } from '../util/Callable.js';
+import { Formatter } from './Formatter.js';
+import { Statement } from './Statement.js';
 declare abstract class DriverBase extends Callable {
     formatter: Formatter;
     constructor(formatter: Formatter);
@@ -31,7 +31,7 @@ declare abstract class SyncDriver extends DriverBase {
     prepare<T extends Array<Expr<any>>, R>(create: (...params: T) => Query<R>): (...params: ParamTypes<T>) => R;
     migrateSchema(...tables: Array<Table<any>>): unknown;
     executeQuery(query: QueryData, stmt?: SyncPreparedStatement, params?: Array<any>): unknown;
-    iterate<T>(cursor: SelectMultiple<T>): Iterable<T>;
+    iterate<T>(cursor: Select<T>): Iterable<T>;
     transaction<T>(run: (query: SyncDriver) => T): T;
     toAsync(): SyncWrapper;
 }
@@ -58,7 +58,7 @@ declare abstract class AsyncDriver extends DriverBase {
     prepare<T extends Array<Expr<any>>, R>(create: (...params: T) => Query<R>): (...params: ParamTypes<T>) => Promise<R>;
     migrateSchema(...tables: Array<Table<any>>): Promise<unknown>;
     executeQuery(query: QueryData, stmt?: AsyncPreparedStatement, params?: Array<any>): Promise<unknown>;
-    iterate<T>(cursor: SelectMultiple<T>): AsyncIterable<T>;
+    iterate<T>(cursor: Select<T>): AsyncIterable<T>;
     transaction<T>(run: (query: AsyncDriver) => T): Promise<T>;
 }
 declare class SyncWrapper extends AsyncDriver {

package/dist/lib/Driver.js

@@ -1,4 +1,3 @@
-// src/lib/Driver.ts
 import { Expr, ExprData } from "../define/Expr.js";
 import { ParamData } from "../define/Param.js";
 import { Query, QueryData, QueryType } from "../define/Query.js";
@@ -8,7 +7,7 @@ import { Callable } from "../util/Callable.js";
 function isTemplateStringsArray(input) {
   return Boolean(Array.isArray(input) && input.raw);
 }
-var DriverBase = class extends Callable {
+class DriverBase extends Callable {
   constructor(formatter) {
     super((...args) => {
       const [input, ...rest] = args;
@@ -39,8 +38,8 @@ var DriverBase = class extends Callable {
       new QueryData.Raw({ strings, params, expectedReturn })
     );
   }
-};
-var SyncDriver = class extends DriverBase {
+}
+class SyncDriver extends DriverBase {
   transactionId;
   constructor(formatter) {
     super(formatter);
@@ -153,8 +152,8 @@ var SyncDriver = class extends DriverBase {
   toAsync() {
     return new SyncWrapper(this);
   }
-};
-var AsyncDriver = class extends DriverBase {
+}
+class AsyncDriver extends DriverBase {
   transactionId;
   constructor(formatter) {
     super(formatter);
@@ -269,8 +268,8 @@ var AsyncDriver = class extends DriverBase {
       await release();
     }
   }
-};
-var SyncPreparedStatementWrapper = class {
+}
+class SyncPreparedStatementWrapper {
   constructor(stmt) {
     this.stmt = stmt;
   }
@@ -290,8 +289,8 @@ var SyncPreparedStatementWrapper = class {
   async execute(params) {
     return this.stmt.execute(params);
   }
-};
-var SyncWrapper = class extends AsyncDriver {
+}
+class SyncWrapper extends AsyncDriver {
   constructor(sync) {
     super(sync.formatter);
     this.sync = sync;
@@ -317,7 +316,7 @@ var SyncWrapper = class extends AsyncDriver {
     this.lock = Promise.resolve(this.lock).then(() => trigger);
     return [connection, release];
   }
-};
+}
 var Driver;
 ((Driver2) => {
   Driver2.Sync = SyncDriver;

package/dist/lib/Formatter.d.ts

@@ -1,10 +1,10 @@
-import { ColumnData, ColumnType } from '../define/Column';
-import { ExprData } from '../define/Expr';
-import { OrderBy } from '../define/OrderBy';
-import { QueryData } from '../define/Query';
-import { Target } from '../define/Target';
-import { Sanitizer } from './Sanitizer';
-import { Statement, StatementOptions } from './Statement';
+import { ColumnData, ColumnType } from '../define/Column.js';
+import { ExprData } from '../define/Expr.js';
+import { OrderBy } from '../define/OrderBy.js';
+import { QueryData } from '../define/Query.js';
+import { Target } from '../define/Target.js';
+import { Sanitizer } from './Sanitizer.js';
+import { Statement, StatementOptions } from './Statement.js';
 export interface FormatContext {
     stmt: Statement;
     nameResult?: string;
@@ -53,7 +53,7 @@ export declare abstract class Formatter implements Sanitizer {
     formatSelect({ topLevel, ...ctx }: FormatContext, query: QueryData.Select): Statement;
     formatUnion(ctx: FormatContext, { a, operator, b }: QueryData.Union): Statement;
     formatInsert(ctx: FormatContext, query: QueryData.Insert): Statement;
-    formatUpdate(ctx: FormatContext, query: QueryData.Update): Statement;
+    formatUpdate({ topLevel, ...ctx }: FormatContext, query: QueryData.Update): Statement;
     formatDelete(ctx: FormatContext, query: QueryData.Delete): Statement;
     formatCreateTable(ctx: FormatContext, query: QueryData.CreateTable): Statement;
     formatCreateIndex(ctx: FormatContext, query: QueryData.CreateIndex): Statement;

package/dist/lib/Formatter.js

@@ -1,4 +1,3 @@
-// src/lib/Formatter.ts
 import { ColumnType } from "../define/Column.js";
 import { BinOpType, Expr, ExprData, ExprType, UnOpType } from "../define/Expr.js";
 import { OrderDirection } from "../define/OrderBy.js";
@@ -6,7 +5,7 @@ import { ParamType } from "../define/Param.js";
 import { QueryData, QueryType } from "../define/Query.js";
 import { Target, TargetType } from "../define/Target.js";
 import { Statement } from "./Statement.js";
-var binOps = {
+const binOps = {
   [BinOpType.Add]: "+",
   [BinOpType.Subt]: "-",
   [BinOpType.Mult]: "*",
@@ -27,11 +26,11 @@ var binOps = {
   [BinOpType.NotIn]: "NOT IN",
   [BinOpType.Concat]: "||"
 };
-var joins = {
+const joins = {
   left: "LEFT",
   inner: "INNER"
 };
-var unions = {
+const unions = {
   [QueryData.UnionOperation.Union]: "UNION",
   [QueryData.UnionOperation.UnionAll]: "UNION ALL",
   [QueryData.UnionOperation.Intersect]: "INTERSECT",
@@ -42,7 +41,7 @@ function formatAsResultObject(stmt, mkSubject) {
   mkSubject();
   stmt.raw(")");
 }
-var Formatter = class {
+class Formatter {
   constructor() {
   }
   compile(query, options) {
@@ -158,18 +157,22 @@ var Formatter = class {
     }
     return stmt;
   }
-  formatUpdate(ctx, query) {
+  formatUpdate({ topLevel, ...ctx }, query) {
     const { stmt } = ctx;
     const data = query.set || {};
     stmt.add("UPDATE").addIdentifier(query.table.name).add("SET").space();
     const keys = Object.keys(data).filter((key) => query.table.columns[key]);
     for (const key of stmt.separate(keys)) {
+      const column = query.table.columns[key];
       stmt.identifier(key).add("=").space();
       let input = data[key];
       if (Expr.hasExpr(input))
         input = input[Expr.ToExpr]();
       if (Expr.isExpr(input))
-        this.formatExprJson(ctx, ExprData.create(data[key]));
+        this.formatExpr(
+          { ...ctx, formatAsJson: column.type === ColumnType.Json },
+          ExprData.create(data[key])
+        );
       else
         this.formatValue({ ...ctx, formatAsInsert: true }, input);
     }
@@ -791,7 +794,7 @@ var Formatter = class {
         throw new Error("todo");
     }
   }
-};
+}
 export {
   Formatter
 };

package/dist/lib/SqlError.js

@@ -1,11 +1,10 @@
-// src/lib/SqlError.ts
-var SqlError = class extends Error {
+class SqlError extends Error {
   constructor(cause, sql) {
     super(`${sql}
 \u2502
 \u2514\u2500\u2500\u2500\u2500 ${cause}`, { cause });
   }
-};
+}
 export {
   SqlError
 };

package/dist/lib/Statement.d.ts

@@ -1,5 +1,5 @@
-import { ParamData } from '../define/Param';
-import { Sanitizer } from './Sanitizer';
+import { ParamData } from '../define/Param.js';
+import { Sanitizer } from './Sanitizer.js';
 export interface StatementOptions {
     skipNewlines?: boolean;
 }

package/dist/lib/Statement.js

@@ -1,10 +1,9 @@
-// src/lib/Statement.ts
 import { ParamData, ParamType } from "../define/Param.js";
-var SEPARATE = ", ";
-var WHITESPACE = " ";
-var NEWLINE = "\n";
-var INSERT_PARAM = "?";
-var Statement = class {
+const SEPARATE = ", ";
+const WHITESPACE = " ";
+const NEWLINE = "\n";
+const INSERT_PARAM = "?";
+class Statement {
   constructor(sanitizer, options = {}) {
     this.sanitizer = sanitizer;
     this.options = options;
@@ -102,7 +101,7 @@ var Statement = class {
   toString() {
     return this.sql;
   }
-};
+}
 export {
   Statement
 };

package/dist/sqlite/SqliteFormatter.d.ts

@@ -1,6 +1,6 @@
-import { ExprData } from '../define/Expr';
-import { FormatContext, Formatter } from '../lib/Formatter';
-import { Statement } from '../lib/Statement';
+import { ExprData } from '../define/Expr.js';
+import { FormatContext, Formatter } from '../lib/Formatter.js';
+import { Statement } from '../lib/Statement.js';
 export declare class SqliteFormatter extends Formatter {
     formatParamValue(paramValue: any): any;
     escapeValue(value: any): string;

package/dist/sqlite/SqliteFormatter.js

@@ -1,12 +1,11 @@
-// src/sqlite/SqliteFormatter.ts
 import { Formatter } from "../lib/Formatter.js";
-var BACKTICK = "`";
-var ESCAPE_BACKTICK = "``";
-var SINGLE_QUOTE = "'";
-var ESCAPE_SINGLE_QUOTE = "''";
-var MATCH_BACKTICK = /`/g;
-var MATCH_SINGLE_QUOTE = /'/g;
-var SqliteFormatter = class extends Formatter {
+const BACKTICK = "`";
+const ESCAPE_BACKTICK = "``";
+const SINGLE_QUOTE = "'";
+const ESCAPE_SINGLE_QUOTE = "''";
+const MATCH_BACKTICK = /`/g;
+const MATCH_SINGLE_QUOTE = /'/g;
+class SqliteFormatter extends Formatter {
   formatParamValue(paramValue) {
     if (paramValue === null || paramValue === void 0)
       return null;
@@ -60,7 +59,7 @@ var SqliteFormatter = class extends Formatter {
         return super.formatCall(ctx, expr);
     }
   }
-};
+}
 export {
   SqliteFormatter
 };

package/dist/sqlite/SqliteFunctions.d.ts

@@ -1,6 +1,6 @@
-import { EV, Expr } from '../define/Expr';
-import { Query } from '../define/Query';
-import { Table } from '../define/Table';
+import { EV, Expr } from '../define/Expr.js';
+import { Query } from '../define/Query.js';
+import { Table } from '../define/Table.js';
 export declare const SqliteFunctions: SqliteFunctions;
 export type SqliteFunctions = {
     /** The count(X) function returns a count of the number of times that X is not NULL in a group. The count(*) function (with no arguments) returns the total number of rows in the group. */

package/dist/sqlite/SqliteFunctions.js

@@ -1,7 +1,6 @@
-// src/sqlite/SqliteFunctions.ts
 import { Functions } from "../define/Functions.js";
-var SqliteFunctions = Functions;
-var {
+const SqliteFunctions = Functions;
+const {
   count,
   iif,
   exists,

package/dist/sqlite/SqliteSchema.d.ts

@@ -1,6 +1,6 @@
-import { Expr } from '../define/Expr';
-import { Query } from '../define/Query';
-import { SchemaInstructions } from '../define/Schema';
+import { Expr } from '../define/Expr.js';
+import { Query } from '../define/Query.js';
+import { SchemaInstructions } from '../define/Schema.js';
 export declare namespace SqliteSchema {
     type Column = {
         cid: number;

package/dist/sqlite/SqliteSchema.js

@@ -1,4 +1,3 @@
-// src/sqlite/SqliteSchema.ts
 import { sql } from "../define/Sql.js";
 import { Statement } from "../lib/Statement.js";
 import { SqliteFormatter } from "./SqliteFormatter.js";

package/dist/sqlite.d.ts

@@ -1,2 +1,2 @@
-export * from './sqlite/SqliteFormatter';
-export * from './sqlite/SqliteFunctions';
+export * from './sqlite/SqliteFormatter.js';
+export * from './sqlite/SqliteFunctions.js';

package/dist/sqlite.js

@@ -1,3 +1,2 @@
-// src/sqlite.ts
 export * from "./sqlite/SqliteFormatter.js";
 export * from "./sqlite/SqliteFunctions.js";

package/dist/util/Alias.js

@@ -1,4 +1,3 @@
-// src/util/Alias.ts
 function randomAlias() {
   return `__${Math.random().toString(36).slice(2, 9)}`;
 }

package/dist/util/Callable.js

@@ -1,10 +1,9 @@
-// src/util/Callable.ts
-var { setPrototypeOf } = Object;
-var Callable = class {
+const { setPrototypeOf } = Object;
+class Callable {
   constructor(fn) {
     return setPrototypeOf(fn, new.target.prototype);
   }
-};
+}
 export {
   Callable
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.2.30",
+  "version": "0.2.32",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -12,12 +12,23 @@
   },
   "typesVersions": {
     "*": {
+      "driver/*": [
+        "dist/driver/*.d.ts"
+      ],
+      "lib/*": [
+        "dist/lib/*.d.ts"
+      ],
       "driver/bun:sqlite": [
-        "./dist/driver/bun-sqlite.d.ts"
+        "dist/driver/bun-sqlite.d.ts"
+      ],
+      "define/*": [
+        "dist/define/*.d.ts"
+      ],
+      "sqlite/*": [
+        "dist/sqlite/*.d.ts"
       ],
-      "*": [
-        "./dist/*",
-        "./dist/index.d.ts"
+      "sqlite": [
+        "dist/sqlite.d.ts"
       ]
     }
   },