Add type resolver and remove multiple reflect-metadata (should be cal…

…led once)
laudominik · Jun 17, 2024 · c82bcf2 · c82bcf2
1 parent 2be5645
commit c82bcf2
Show file tree

Hide file tree

Showing 22 changed files with 37 additions and 25 deletions.
diff --git a/src/engine/transforms/BinaryTransform.tsx b/src/engine/transforms/BinaryTransform.tsx
@@ -1,4 +1,4 @@
-import "reflect-metadata"
+
 import {jsonObject} from "typedjson";
 import Transform from "../Transform";
 import {GUID} from "../iengine";

diff --git a/src/engine/transforms/ConvolutionTransform.tsx b/src/engine/transforms/ConvolutionTransform.tsx
@@ -1,4 +1,4 @@
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import KernelComponent from "../../components/transforms/KernelComponent";
 import Transform, { KVParams } from "../Transform";

diff --git a/src/engine/transforms/MorphologicTransform.tsx b/src/engine/transforms/MorphologicTransform.tsx
@@ -1,5 +1,5 @@
 
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import KernelComponent from "../../components/transforms/KernelComponent";
 import Transform, { KVParams } from "../Transform";

diff --git a/src/engine/transforms/PointTransform.tsx b/src/engine/transforms/PointTransform.tsx
@@ -1,4 +1,4 @@
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import PointComponent from "../../components/transforms/PointComponent";
 import Transform from "../Transform";

diff --git a/src/engine/transforms/PoolingTransform.tsx b/src/engine/transforms/PoolingTransform.tsx
@@ -1,5 +1,5 @@
 
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import Transform, { KVParams } from "../Transform";
 import { ReactNode } from "react";

diff --git a/src/engine/transforms/SourceTransform.tsx b/src/engine/transforms/SourceTransform.tsx
@@ -1,5 +1,3 @@
-import 'reflect-metadata'
-
 import {ReactNode} from "react";
 import Transform from "../Transform";
 import {jsonMember, jsonObject} from "typedjson";

diff --git a/src/engine/transforms/TernaryTransform.tsx b/src/engine/transforms/TernaryTransform.tsx
@@ -1,4 +1,4 @@
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import Transform from "../Transform";
 import { GUID } from "../iengine";

diff --git a/src/engine/transforms/convolution/GaussianTransform.tsx b/src/engine/transforms/convolution/GaussianTransform.tsx
@@ -1,4 +1,4 @@
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import ConvolutionTransform from "../ConvolutionTransform";
 

diff --git a/src/engine/transforms/convolution/LaplaceTransform.tsx b/src/engine/transforms/convolution/LaplaceTransform.tsx
@@ -1,4 +1,4 @@
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import ConvolutionTransform from "../ConvolutionTransform";
 

diff --git a/src/engine/transforms/convolution/SobelTransform.tsx b/src/engine/transforms/convolution/SobelTransform.tsx
@@ -1,5 +1,5 @@
 
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import ConvolutionTransform from "../ConvolutionTransform";
 

diff --git a/src/engine/transforms/morphologic/SkeletonizationTransform.tsx b/src/engine/transforms/morphologic/SkeletonizationTransform.tsx
@@ -1,4 +1,4 @@
-import "reflect-metadata"
+
 import {jsonObject} from "typedjson";
 import Transform from "../../Transform";
 import {GUID} from "../../iengine";

diff --git a/src/engine/transforms/point/AndTransform.tsx b/src/engine/transforms/point/AndTransform.tsx
@@ -1,5 +1,5 @@
 
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import { BitwiseTransform } from "./BitwiseTransform";
 

diff --git a/src/engine/transforms/point/BitwiseTransform.tsx b/src/engine/transforms/point/BitwiseTransform.tsx
@@ -1,4 +1,4 @@
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import PointTransform from "../PointTransform";
 

diff --git a/src/engine/transforms/point/BrightnessTransform.tsx b/src/engine/transforms/point/BrightnessTransform.tsx
@@ -1,5 +1,5 @@
 
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import PointTransform from "../PointTransform";
 

diff --git a/src/engine/transforms/point/ChannelCombinationTransform.tsx b/src/engine/transforms/point/ChannelCombinationTransform.tsx
@@ -1,4 +1,4 @@
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import Transform from "../../Transform";
 import { GUID } from "../../iengine";

diff --git a/src/engine/transforms/point/GrayscaleTransform.tsx b/src/engine/transforms/point/GrayscaleTransform.tsx
@@ -1,5 +1,5 @@
 
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import PointTransform from "../PointTransform";
 

diff --git a/src/engine/transforms/point/OrTransform.tsx b/src/engine/transforms/point/OrTransform.tsx
@@ -1,5 +1,5 @@
 
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import { BitwiseTransform } from "./BitwiseTransform";
 

diff --git a/src/engine/transforms/point/ThresholdTransform.tsx b/src/engine/transforms/point/ThresholdTransform.tsx
@@ -1,5 +1,5 @@
 
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import PointTransform from "../PointTransform";
 import { GUID } from "../../engine";

diff --git a/src/engine/transforms/point/XorTransform.tsx b/src/engine/transforms/point/XorTransform.tsx
@@ -1,5 +1,5 @@
 
-import "reflect-metadata"
+
 import { jsonObject } from "typedjson";
 import { BitwiseTransform } from "./BitwiseTransform";
 

diff --git a/src/engine/transforms/point/YCbCrTransform.tsx b/src/engine/transforms/point/YCbCrTransform.tsx
@@ -1,5 +1,5 @@
 
-import "reflect-metadata"
+
 import { jsonArrayMember, jsonMember, jsonObject } from "typedjson";
 import PointTransform from "../PointTransform";
 

diff --git a/src/index.tsx b/src/index.tsx
@@ -1,3 +1,4 @@
+import 'reflect-metadata'
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import './index.css';

diff --git a/src/stores/notebookStore.ts b/src/stores/notebookStore.ts
@@ -6,6 +6,19 @@ import LSHandler from "../persistence/lshandler";
 import DebugHandler from "../persistence/debughandler";
 import {ImageStore} from "./imageStore";
 
+const resolver = nameof
+
+function nameof(fn: Function & {name?: string}) {
+    if (fn.prototype?.__typedJsonJsonObjectMetadataInformation__?.name){
+        return fn.prototype.__typedJsonJsonObjectMetadataInformation__.name
+    }
+    if (typeof fn.name as string | undefined === 'string') {
+        console.log(fn.name)
+        return fn.name;
+    }
+    return 'undefined';
+}
+
 export class NotebookStore {
     stores: Array<[string, TopStore]>
     selectedIx: number
@@ -29,7 +42,7 @@ export class NotebookStore {
             const list = JSON.parse(cache) as string[];
             list.forEach(name => {
                 const cache = this.persistence.read("store_" + name);
-                const store = new TypedJSON(TopStore, {knownTypes: Array.from(knownTypes())}).parse(cache)!;
+                const store = new TypedJSON(TopStore, {knownTypes: Array.from(knownTypes()),nameResolver: resolver }).parse(cache)!;
                 if (store) {
                     this.bindSave(store);
                     store.fixSerialization();
@@ -59,7 +72,7 @@ export class NotebookStore {
         if (record.length) {
             console.log("Store saved")
             const name = record[0][0];
-            const serializer = new TypedJSON(TopStore, {knownTypes: Array.from(knownTypes())});
+            const serializer = new TypedJSON(TopStore, {knownTypes: Array.from(knownTypes()),nameResolver: resolver});
             const body = serializer.stringify(store);
             this.persistence.write("store_" + name, body);
         } else {
@@ -128,15 +141,15 @@ export class NotebookStore {
 
     // This is a litle funky, call it from UI only. It should be fine as long a user is slow.
     public saveNotebook() {
-        const serializer = new TypedJSON(TopStore, {knownTypes: Array.from(knownTypes())});
+        const serializer = new TypedJSON(TopStore, {knownTypes: Array.from(knownTypes()),nameResolver: resolver});
         const body = serializer.stringify(this.selected);
         return body;
     }
 
     public loadNotebook(name: string, body: string) {
         name = this.availableName(name);
         this.persistence.write("store_" + name, body);
-        let json = new TypedJSON(TopStore, {knownTypes: Array.from(knownTypes())});
+        let json = new TypedJSON(TopStore, {knownTypes: Array.from(knownTypes()),nameResolver: resolver});
         this.selected = json.parse(body)!;
         this.bindSave(this.selected);
         this.stores.push([name, this.selected])