oksy 0.1.17 → 0.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oksy",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "The OKSY framework",
   "main": "library.js",
   "typings": "./types/src/library.pub.d.ts",

package/types/src/ReactiveStore/BaseEntity.d.ts

@@ -7,7 +7,10 @@ import { IValidator } from './Validators/IValidator';
 export type Draft<T> = {
     [P in keyof T]: T[P] extends Function ? T[P] : (P extends 'id' | 'workspaceId' ? T[P] : null | T[P]);
 };
-export type One<T1 extends GlobalEntity, T2 extends keyof T1, T3 extends BlueprintFieldOne['cascade'] = 'DELETE'> = T1;
+type ManyFields<T1 extends GlobalEntity> = {
+    [K in keyof T1]: T1[K] extends Many<any, any> ? K : never;
+}[keyof T1];
+export type One<T1 extends GlobalEntity, T2 extends ManyFields<T1>, T3 extends BlueprintFieldOne['cascade'] = 'DELETE'> = T1;
 export declare abstract class GlobalEntity {
     id: string;
     isValid: boolean;
@@ -48,3 +51,4 @@ export declare abstract class BaseFile extends Entity {
     size: number;
     type: string;
 }
+export {};

package/types/src/library.pub.d.ts

@@ -13,9 +13,10 @@ declare abstract class GlobalEntity {
         [key: string]: IValidator[];
     };
 }
-declare class Many<T1 extends {
-    id: string;
-} = any, T2 extends keyof T1 = any> {
+type RelationFields<T1 extends GlobalEntity> = {
+    [K in keyof T1]: T1[K] extends GlobalEntity ? K : (T1[K] extends Many<any, any> ? K : never);
+}[keyof T1];
+declare class Many<T1 extends GlobalEntity = any, T2 extends RelationFields<T1> = any> {
     all(): T1[];
     allWithDraft(): Draft<T1>[];
     size(): number;