rado 0.2.2 → 0.2.4

package/dist/define/Column.d.ts

@@ -40,7 +40,7 @@ export declare namespace Column {
 export declare class OptionalColumn<T> extends Column<T> {
     [Column.isOptional]: true;
 }
-export declare class PrimaryColumn<T, K> extends Column<T> {
+export declare class PrimaryColumn<T, K> extends Column<PrimaryKey<T, K>> {
     [Column.isPrimary]: K;
 }
 export type PrimaryKey<T, K> = string extends K ? T : T & {

package/dist/define/Table.d.ts

@@ -1,4 +1,4 @@
-import { Column, ColumnData, OptionalColumn, PrimaryColumn, PrimaryKey } from './Column';
+import { Column, ColumnData, OptionalColumn, PrimaryColumn } from './Column';
 import { Cursor } from './Cursor';
 import { EV } from './Expr';
 import { Index, IndexData } from './Index';
@@ -33,11 +33,11 @@ declare class TableProto<Definition> {
 }
 export type Table<Definition> = Definition & TableProto<Definition>;
 export declare namespace Table {
-    export type Of<Row> = Table<{
-        [K in keyof Row]: Column<Row[K]>;
-    }>;
+    export type Of<Row> = {
+        [Selection.__tableType](): Row;
+    };
     export type Select<Definition> = {
-        [K in keyof Definition as Definition[K] extends Column<any> ? K : never]: Definition[K] extends PrimaryColumn<infer T, infer K> ? PrimaryKey<T, K> : Definition[K] extends Column<infer T> ? T : never;
+        [K in keyof Definition as Definition[K] extends Column<any> ? K : never]: Definition[K] extends Column<infer T> ? T : never;
     };
     export type Update<Definition> = Partial<{
         [K in keyof Definition as Definition[K] extends Column<any> ? K : never]: Definition[K] extends Column<infer T> ? EV<T> : never;

package/dist/define/Table.js

@@ -1,7 +1,5 @@
 // src/define/Table.ts
-import {
-  Column
-} from "./Column.js";
+import { Column } from "./Column.js";
 import { Cursor } from "./Cursor.js";
 import { BinOpType, Expr, ExprData } from "./Expr.js";
 import { Selection } from "./Selection.js";

package/package.json

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