rado 0.2.24 → 0.2.25

package/dist/driver/sql.js.d.ts

@@ -5,8 +5,8 @@ import { Statement } from '../lib/Statement';
 import { SqliteSchema } from '../sqlite/SqliteSchema';
 export declare class SqlJsDriver extends Driver.Sync {
     db: Database;
-    tableData: (tableName: string) => Array<SqliteSchema.Column>;
-    indexData: (tableName: string) => Array<SqliteSchema.Index>;
+    tableData?: (tableName: string) => Array<SqliteSchema.Column>;
+    indexData?: (tableName: string) => Array<SqliteSchema.Index>;
     constructor(db: Database);
     prepareStatement(stmt: Statement, discardAfter: boolean): Driver.Sync.PreparedStatement;
     schemaInstructions(tableName: string): SchemaInstructions | undefined;

package/dist/driver/sql.js.js

@@ -38,8 +38,6 @@ var SqlJsDriver = class extends Driver.Sync {
   constructor(db) {
     super(new SqliteFormatter());
     this.db = db;
-    this.tableData = this.prepare(SqliteSchema.tableData);
-    this.indexData = this.prepare(SqliteSchema.indexData);
   }
   tableData;
   indexData;
@@ -55,6 +53,8 @@ var SqlJsDriver = class extends Driver.Sync {
     }
   }
   schemaInstructions(tableName) {
+    this.tableData = this.tableData || (this.tableData = this.prepare(SqliteSchema.tableData));
+    this.indexData = this.indexData || (this.indexData = this.prepare(SqliteSchema.indexData));
     const columnData = this.tableData(tableName);
     const indexData = this.indexData(tableName);
     return SqliteSchema.createInstructions(columnData, indexData);

package/dist/lib/Driver.d.ts

@@ -2,6 +2,7 @@ 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';
@@ -9,8 +10,6 @@ declare abstract class DriverBase extends Callable {
     formatter: Formatter;
     constructor(formatter: Formatter);
     compile<T extends Array<Expr<any>>, R>(create: (...params: T) => Query<R>): [QueryData, Statement];
-    all(...args: Array<any>): any;
-    get(...args: Array<any>): any;
     executeTemplate(expectedReturn: QueryData.RawReturn, strings: TemplateStringsArray, ...params: Array<any>): any;
     abstract executeQuery(query: QueryData): any;
 }
@@ -32,13 +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;
-    all<T>(cursor: Query.SelectSingle<T>): Array<T>;
-    all<T>(cursor: Query<T>): T;
-    all<T>(strings: TemplateStringsArray, ...params: Array<any>): Array<T>;
-    get<T>(cursor: Query.SelectMultiple<T>): T | null;
-    get<T>(cursor: Query<T>): T;
-    get<T>(strings: TemplateStringsArray, ...params: Array<any>): T;
-    iterate<T>(cursor: Query.SelectMultiple<T>): Iterable<T>;
+    iterate<T>(cursor: SelectMultiple<T>): Iterable<T>;
     transaction<T>(run: (query: SyncDriver) => T): T;
     toAsync(): SyncWrapper;
 }
@@ -65,13 +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>;
-    all<T>(cursor: Query.SelectSingle<T>): Promise<Array<T>>;
-    all<T>(cursor: Query<T>): Promise<T>;
-    all<T>(strings: TemplateStringsArray, ...params: Array<any>): Promise<Array<T>>;
-    get<T>(cursor: Query.SelectMultiple<T>): Promise<T | null>;
-    get<T>(cursor: Query<T>): Promise<T>;
-    get<T>(strings: TemplateStringsArray, ...params: Array<any>): Promise<T>;
-    iterate<T>(cursor: Query.SelectMultiple<T>): AsyncIterable<T>;
+    iterate<T>(cursor: SelectMultiple<T>): AsyncIterable<T>;
     transaction<T>(run: (query: AsyncDriver) => T): Promise<T>;
 }
 declare class SyncWrapper extends AsyncDriver {

package/dist/lib/Driver.js

@@ -34,22 +34,6 @@ var DriverBase = class extends Callable {
     const query = cursor[Query.Data];
     return [query, this.formatter.compile(query)];
   }
-  all(...args) {
-    const [input, ...rest] = args;
-    if (Query.isSingle(input))
-      return this.executeQuery(input.all()[Query.Data]);
-    if (Query.isQuery(input))
-      return this.executeQuery(input[Query.Data]);
-    return this.executeTemplate("rows", input, ...rest);
-  }
-  get(...args) {
-    const [input, ...rest] = args;
-    if (Query.isMultiple(input))
-      return this.executeQuery(input.maybeFirst()[Query.Data]);
-    if (Query.isQuery(input))
-      return this.executeQuery(input[Query.Data]);
-    return this.executeTemplate("row", input, ...rest);
-  }
   executeTemplate(expectedReturn, strings, ...params) {
     return this.executeQuery(
       new QueryData.Raw({ strings, params, expectedReturn })
@@ -133,12 +117,6 @@ var SyncDriver = class extends DriverBase {
         }
     }
   }
-  all(...args) {
-    return super.all(...args);
-  }
-  get(...args) {
-    return super.get(...args);
-  }
   *iterate(cursor) {
     const stmt = this.prepareStatement(
       this.formatter.compile(cursor[Query.Data]),
@@ -255,12 +233,6 @@ var AsyncDriver = class extends DriverBase {
         }
     }
   }
-  all(...args) {
-    return super.all(...args);
-  }
-  get(...args) {
-    return super.get(...args);
-  }
   async *iterate(cursor) {
     const stmt = this.prepareStatement(
       this.formatter.compile(cursor[Query.Data]),

package/dist/sqlite/SqliteSchema.js

@@ -1,16 +1,16 @@
 // src/sqlite/SqliteSchema.ts
-import { Query } from "../define/Query.js";
+import { sql } from "../define/Sql.js";
 import { Statement } from "../lib/Statement.js";
 import { SqliteFormatter } from "./SqliteFormatter.js";
 var SqliteSchema;
 ((SqliteSchema2) => {
   const formatter = new SqliteFormatter();
   function tableData(tableName) {
-    return Query.all`select * from pragma_table_info(${tableName}) order by cid`;
+    return sql.all`select * from pragma_table_info(${tableName}) order by cid`;
   }
   SqliteSchema2.tableData = tableData;
   function indexData(tableName) {
-    return Query.all`select * from sqlite_master where type='index' and tbl_name=${tableName}`;
+    return sql.all`select * from sqlite_master where type='index' and tbl_name=${tableName}`;
   }
   SqliteSchema2.indexData = indexData;
   function createInstructions(columnData, indexData2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",