rado 0.2.33 → 0.2.35

package/README.md

@@ -3,8 +3,6 @@
 Fully typed, lightweight TypeScript query builder.
 Currently focused on SQLite.
 
-<pre>npm install <a href="https://www.npmjs.com/package/rado">rado</a></pre>
-
 - Definition via TypeScript types
 - Composable queries
 - Aggregate rows in selects
@@ -12,6 +10,8 @@ Currently focused on SQLite.
 - No code generation step
 - No dependencies
 
+<pre>npm install <a href="https://www.npmjs.com/package/rado">rado</a></pre>
+
 ## Queries
 
 #### Where

package/dist/define/Selection.d.ts

@@ -1,3 +1,4 @@
+import type { Column } from './Column.js';
 import type { Expr } from './Expr.js';
 import type { Select, SelectFirst } from './query/Select.js';
 type SelectionBase = unknown | (() => any) | Expr<any> | Select<any> | SelectFirst<any>;
@@ -11,7 +12,7 @@ export declare namespace Selection {
         [TableType](): infer K;
     } ? K : T extends {
         [CursorType](): infer K;
-    } ? K : T extends Expr<infer K> ? K : T extends Record<string, Selection> ? {
+    } ? K : T extends Expr<infer K> ? K : T extends Column<infer K> ? K : T extends Record<string, Selection> ? {
         [K in keyof T]: Infer<T[K]>;
     } : T extends () => any ? never : unknown extends T ? never : T;
     type With<A, B> = Expr<Combine<A, B>>;

package/dist/define/Table.d.ts

@@ -1,4 +1,4 @@
-import { ClearFunctionProto } from '../util/Callable.js';
+import { Callable } from '../util/Callable.js';
 import { Column, ColumnData, OptionalColumn, PrimaryColumn } from './Column.js';
 import { EV, Expr } from './Expr.js';
 import type { Fields } from './Fields.js';
@@ -18,7 +18,7 @@ export declare class TableData {
     };
     constructor(data: TableData);
 }
-export interface TableInstance<Definition> extends ClearFunctionProto {
+export interface TableInstance<Definition> extends Callable {
     (conditions: {
         [K in keyof Definition]?: Definition[K] extends Expr<infer V> ? EV<V> : never;
     }): TableSelect<Definition>;

package/dist/define/VirtualTable.d.ts

@@ -1,4 +1,4 @@
-import { ClearFunctionProto } from '../util/Callable.js';
+import { Callable } from '../util/Callable.js';
 import { Column } from './Column.js';
 import { EV, Expr } from './Expr.js';
 import { Fields } from './Fields.js';
@@ -6,7 +6,7 @@ import { Selection } from './Selection.js';
 import { Table } from './Table.js';
 import { Target } from './Target.js';
 import { Select } from './query/Select.js';
-export interface VirtualTableInstance<Definition> extends ClearFunctionProto {
+export interface VirtualTableInstance<Definition> extends Callable {
     (conditions: {
         [K in keyof Definition]?: Definition[K] extends Expr<infer V> ? EV<V> : never;
     }): Select<Table.Select<Definition>>;

package/dist/index.d.ts

@@ -14,6 +14,14 @@ export * from './define/Sql.js';
 export * from './define/Table.js';
 export * from './define/Target.js';
 export * from './define/VirtualTable.js';
+export * from './define/query/Batch.js';
+export * from './define/query/CreateTable.js';
+export * from './define/query/Delete.js';
+export * from './define/query/Insert.js';
+export * from './define/query/Select.js';
+export * from './define/query/TableSelect.js';
+export * from './define/query/Union.js';
+export * from './define/query/Update.js';
 export type { Driver } from './lib/Driver.js';
 export type { FormatContext, Formatter } from './lib/Formatter.js';
 export type { Sanitizer } from './lib/Sanitizer.js';

package/dist/index.js

@@ -11,4 +11,12 @@ export * from "./define/Sql.js";
 export * from "./define/Table.js";
 export * from "./define/Target.js";
 export * from "./define/VirtualTable.js";
+export * from "./define/query/Batch.js";
+export * from "./define/query/CreateTable.js";
+export * from "./define/query/Delete.js";
+export * from "./define/query/Insert.js";
+export * from "./define/query/Select.js";
+export * from "./define/query/TableSelect.js";
+export * from "./define/query/Union.js";
+export * from "./define/query/Update.js";
 export * from "./lib/SqlError.js";

package/dist/util/Callable.d.ts

@@ -1,11 +1,16 @@
 export declare class Callable {
     constructor(fn: Function);
 }
-export declare class ClearFunctionProto {
+declare class ClearFunctionProto {
     get name(): unknown;
     get length(): unknown;
     get call(): unknown;
+    get caller(): unknown;
     get apply(): unknown;
     get bind(): unknown;
     get prototype(): unknown;
+    get arguments(): unknown;
 }
+export interface Callable extends ClearFunctionProto {
+}
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.2.33",
+  "version": "0.2.35",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -29,6 +29,9 @@
       ],
       "sqlite": [
         "dist/sqlite.d.ts"
+      ],
+      "util/*": [
+        "dist/util/*.d.ts"
       ]
     }
   },