src/Schema/MobX/ObservableClass.ts

@@ -8,24 +8,19 @@ interface ObservableClassSelf {
     readonly fields: { readonly [K in keyof Schema.Struct.Fields]: Schema.Struct.Fields[K] }
 }
 
-export const ObservableClass = <Self extends ObservableClassSelf>(
+interface ObservableClassOptions extends Omit<CreateObservableOptions, "proxy"> {}
-    self:      Self,
-    options?:  Omit<CreateObservableOptions, "proxy">,
-) =>
-    class Observable extends self {
-        declare ["constructor"]: typeof Observable
 
-        constructor(...args: any[]) {
+export const ObservableClass = (options?: ObservableClassOptions) =>
-            super(...args)
+    <Self extends ObservableClassSelf>(self: Self) =>
+        class Observable extends self {
+            declare ["constructor"]: typeof Observable
 
-            makeObservable(this,
+            constructor(...args: any[]) {
-                mapValues(this.constructor.fields, () => observable),
+                super(...args)
-                options,
-            )
-        }
-    } as Self
 
-export const ObservableClassDual: {
+                makeObservable(this,
-    <Self extends ObservableClassSelf>(options?: Omit<CreateObservableOptions, "proxy">): (self: Self) => Self
+                    mapValues(this.constructor.fields, () => observable),
-    <Self extends ObservableClassSelf>(self: Self, options?: Omit<CreateObservableOptions, "proxy">): Self
+                    options,
-} = () => {}
+                )
+            }
+        } as Self

src/tests.ts

@@ -22,7 +22,7 @@ class User extends MutableTaggedClass<User>()("User", {
     id:    S.BigIntFromSelf,
     role:  S.Union(S.Literal("BasicUser"), S.Literal("Admin")),
 }).pipe(
-    ObservableClass
+    ObservableClass()
 ) {}
 
 const JsonifiableUser = User.pipe(