rado 0.3.6 → 0.3.8

package/dist/define/Column.d.ts

@@ -38,7 +38,7 @@ export declare namespace Column {
     function isColumn<T>(input: any): input is Column<T>;
 }
 export interface ValueColumn<T> extends Expr<T> {
-    <X extends T = T>(): ValueColumn<T extends null ? X | null : X>;
+    <X = T>(): ValueColumn<X>;
 }
 export declare class ValueColumn<T> extends Callable implements Column<T> {
     [Column.Type]: T;
@@ -51,6 +51,11 @@ export declare class ValueColumn<T> extends Callable implements Column<T> {
     references<X extends T>(column: Expr<X> | (() => Expr<X>)): ForeignKey<X>;
     default(value: DefaultValue<T>): OptionalColumn<T>;
 }
+export interface NullableValueColumn<T> extends Expr<T | null> {
+    <X extends T = T>(): ValueColumn<X | null>;
+}
+export declare class NullableValueColumn<T> extends ValueColumn<T | null> {
+}
 export declare enum Action {
     NoAction = "no action",
     Restrict = "restrict",
@@ -98,20 +103,20 @@ export declare class UnTyped extends Callable {
     get integer(): ValueColumn<number>;
     get number(): ValueColumn<number>;
     get boolean(): ValueColumn<boolean>;
-    get json(): ValueColumn<any>;
+    get json(): ValueColumn<unknown>;
     get object(): ObjectColumn<{}>;
     get array(): ValueColumn<any[]>;
 }
 export declare class NullableUnTyped {
     [Column.Data]: PartialColumnData;
     get unique(): UnTyped;
-    get string(): ValueColumn<string | null>;
-    get integer(): ValueColumn<number | null>;
-    get number(): ValueColumn<number | null>;
-    get boolean(): ValueColumn<boolean | null>;
-    get json(): ValueColumn<any | null>;
+    get string(): NullableValueColumn<string>;
+    get integer(): NullableValueColumn<number>;
+    get number(): NullableValueColumn<number>;
+    get boolean(): NullableValueColumn<boolean>;
+    get json(): NullableValueColumn<unknown>;
     get object(): ObjectColumn<{} | null>;
-    get array(): ValueColumn<Array<any> | null>;
+    get array(): NullableValueColumn<Array<any>>;
 }
 export declare const column: UnTyped;
 export {};

package/dist/define/Expr.js

@@ -384,7 +384,13 @@ class Expr {
     return this;
   }
   get(name) {
-    return new Expr(new ExprData.Field(this[Expr.Data], name));
+    switch (this[Expr.Data].type) {
+      case "ExprData.Record" /* Record */:
+        if (name in this[Expr.Data].fields)
+          return new Expr(this[Expr.Data].fields[name]);
+      default:
+        return new Expr(new ExprData.Field(this[Expr.Data], name));
+    }
   }
   static [Symbol.hasInstance](instance) {
     return instance?.[Expr.IsExpr];

package/package.json

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