Added getState

StanfordHCI · Jul 27, 2023 · f8ca83c · f8ca83c
1 parent b02929b
commit f8ca83c
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 21 deletions.
diff --git a/lib/decorators/decorators.ts b/lib/decorators/decorators.ts
@@ -272,19 +272,22 @@ export function GenieClass(comment: string) {
           path: (string | number)[]
         ): HelperClassGetterSetter {
           return [
-            () => genieDispatch(()=>getJsonByPath(sharedState[target.name][obj[keyField]], path)),
+            () => getJsonByPath(sharedState["OBJECT"][target.name][obj[keyField]], path),
             (value) => {
               genieDispatch(() => {
                 setSharedState({
                   ...sharedState,
-                  [target.name]: {
-                    ...sharedState[target.name],
-                    [obj[keyField]]: setJsonByPath(
-                      sharedState[target.name][obj[keyField]],
-                      path,
-                      value
-                    ),
-                  },
+                  ["OBJECT"]: {
+                    ...sharedState["OBJECT"],
+                    [target.name]: {
+                      ...sharedState["OBJECT"][target.name],
+                      [obj[keyField]]: setJsonByPath(
+                        sharedState["OBJECT"][target.name][obj[keyField]],
+                        path,
+                        value
+                      ),
+                    },
+                  }
                 });
               });
             },
@@ -319,9 +322,9 @@ export function GenieClass(comment: string) {
         // save data to store
         genieDispatch(() => {
           let objectState = {};
-          if (sharedState[target.name]) {
+          if (sharedState["OBJECT"][target.name]) {
             objectState = {
-              ...sharedState[target.name],
+              ...sharedState["OBJECT"][target.name],
             };
           }
           // overwrite existing object
@@ -338,7 +341,10 @@ export function GenieClass(comment: string) {
           });
           setSharedState({
             ...sharedState,
-            [target.name]: objectState,
+            ["OBJECT"]: {
+              ...sharedState["OBJECT"],
+              [target.name]: objectState,
+            }
           });
         });
         // replace fields with getters and setters
@@ -348,20 +354,23 @@ export function GenieClass(comment: string) {
           }
           Object.defineProperty(obj, field, {
             get: function () {
-              let value = sharedState[target.name][obj[keyField]][field];
+              let value = sharedState["OBJECT"][target.name][obj[keyField]][field];
               return deserializeField(generateGetterSetter)(value, [field]);
             },
             set: function (value) {
               genieDispatch(() => {
                 setSharedState({
                   ...sharedState,
-                  [target.name]: {
-                    ...sharedState[target.name],
-                    [obj[keyField]]: {
-                      ...sharedState[target.name][obj[keyField]],
-                      [field]: serializeField(generateGetterSetter)(value, [
-                        field,
-                      ]),
+                  ["OBJECT"]: {
+                    ...sharedState["OBJECT"],
+                    [target.name]: {
+                      ...sharedState["OBJECT"][target.name],
+                      [obj[keyField]]: {
+                        ...sharedState["OBJECT"][target.name][obj[keyField]],
+                        [field]: serializeField(generateGetterSetter)(value, [
+                          field,
+                        ]),
+                      },
                     },
                   },
                 });
@@ -373,6 +382,14 @@ export function GenieClass(comment: string) {
           objects[target.name] = {};
         }
         objects[target.name][obj[keyField]] = obj;
+        obj.__getState = function () {
+          return genieDispatch(() => {
+            return {
+              "object": sharedState["OBJECT"][target.name][obj[keyField]],
+              "class": sharedState["CLASS"][target.name]
+            }
+          });
+        }
         return obj;
       };
 

diff --git a/lib/decorators/store.ts b/lib/decorators/store.ts
@@ -19,7 +19,7 @@ export function setSharedState(state: {}) {
 }
 
 export function storeReducer(
-  state: {} = {},
+  state: {} = {"CLASS": {}, "OBJECT": {}},
   action: { type: string; payload: any }
 ) {
   if (action.type === "genieAction") {

diff --git a/lib/dsl-descriptor.ts b/lib/dsl-descriptor.ts
@@ -42,6 +42,10 @@ export class GenieObject {
   static Examples: ExampleParse[] = [];
 
   static ClassDescriptor: ClassDescriptor<GenieObject>;
+
+  __getState(): {} {
+    return {};
+  }
 }
 
 /**