@schematichq/schematic-react 0.1.6 → 0.1.8

package/dist/schematic-react.cjs.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.tsx
 var src_exports = {};
 __export(src_exports, {
+  Schematic: () => Schematic,
   SchematicProvider: () => SchematicProvider,
   useSchematic: () => useSchematic,
   useSchematicContext: () => useSchematicContext,
@@ -107,7 +108,7 @@ var Schematic = class {
       });
     }
   }
-  checkFlag = async (options) => {
+  async checkFlag(options) {
     const { fallback = false, key } = options;
     const context = options.context || this.context;
     if (this.useWebSocket) {
@@ -133,7 +134,7 @@ var Schematic = class {
       console.error("There was a problem with the fetch operation:", error);
       return fallback;
     });
-  };
+  }
   // Make a REST API call to fetch all flag values for a given context
   checkFlags = async (context) => {
     context = context || this.context;
@@ -271,6 +272,7 @@ var Schematic = class {
     return new Promise((resolve, reject) => {
       if (contextString(context) == contextString(this.context)) {
         resolve();
+        return;
       }
       this.context = context;
       if (!this.conn) {
@@ -281,12 +283,13 @@ var Schematic = class {
         let resolved = false;
         this.conn.onmessage = (event) => {
           const message = JSON.parse(event.data);
-          this.values[contextString(context)] = (message.flags ?? []).reduce(
-            (accum, flag) => {
-              accum[flag.flag] = flag.value;
-              return accum;
-            },
-            {}
+          if (!(contextString(context) in this.values)) {
+            this.values[contextString(context)] = {};
+          }
+          (message.flags ?? []).forEach(
+            (flag) => {
+              this.values[contextString(context)][flag.flag] = flag.value;
+            }
           );
           if (this.flagListener) {
             this.flagListener(this.values[contextString(context)]);
@@ -394,9 +397,13 @@ var useSchematicFlag = (key, opts) => {
   (0, import_react.useEffect)(() => {
     typeof flagValue === "undefined" ? setValue(fallback) : setValue(flagValue);
   }, [key, fallback, flagValue]);
-  if (client) {
-    return client.checkFlag({ key, fallback });
-  }
+  (0, import_react.useEffect)(() => {
+    if (!client)
+      return;
+    client.checkFlag({ key, fallback }).then((value2) => {
+      setValue(value2);
+    });
+  }, [client, key, fallback]);
   return value;
 };
 /*! Bundled license information:

package/dist/schematic-react.d.ts

@@ -74,7 +74,7 @@ export declare const useSchematicEvents: (opts?: SchematicHookOpts) => {
     identify: ((body: SchematicJS.EventBodyIdentify) => void) | undefined;
 };
 
-export declare const useSchematicFlag: (key: string, opts?: UseSchematicFlagOpts) => boolean | Promise<boolean>;
+export declare const useSchematicFlag: (key: string, opts?: UseSchematicFlagOpts) => boolean;
 
 export declare type UseSchematicFlagOpts = SchematicHookOpts & {
     fallback?: boolean;

package/dist/schematic-react.esm.js

@@ -77,7 +77,7 @@ var Schematic = class {
       });
     }
   }
-  checkFlag = async (options) => {
+  async checkFlag(options) {
     const { fallback = false, key } = options;
     const context = options.context || this.context;
     if (this.useWebSocket) {
@@ -103,7 +103,7 @@ var Schematic = class {
       console.error("There was a problem with the fetch operation:", error);
       return fallback;
     });
-  };
+  }
   // Make a REST API call to fetch all flag values for a given context
   checkFlags = async (context) => {
     context = context || this.context;
@@ -241,6 +241,7 @@ var Schematic = class {
     return new Promise((resolve, reject) => {
       if (contextString(context) == contextString(this.context)) {
         resolve();
+        return;
       }
       this.context = context;
       if (!this.conn) {
@@ -251,12 +252,13 @@ var Schematic = class {
         let resolved = false;
         this.conn.onmessage = (event) => {
           const message = JSON.parse(event.data);
-          this.values[contextString(context)] = (message.flags ?? []).reduce(
-            (accum, flag) => {
-              accum[flag.flag] = flag.value;
-              return accum;
-            },
-            {}
+          if (!(contextString(context) in this.values)) {
+            this.values[contextString(context)] = {};
+          }
+          (message.flags ?? []).forEach(
+            (flag) => {
+              this.values[contextString(context)][flag.flag] = flag.value;
+            }
           );
           if (this.flagListener) {
             this.flagListener(this.values[contextString(context)]);
@@ -369,12 +371,17 @@ var useSchematicFlag = (key, opts) => {
   useEffect(() => {
     typeof flagValue === "undefined" ? setValue(fallback) : setValue(flagValue);
   }, [key, fallback, flagValue]);
-  if (client) {
-    return client.checkFlag({ key, fallback });
-  }
+  useEffect(() => {
+    if (!client)
+      return;
+    client.checkFlag({ key, fallback }).then((value2) => {
+      setValue(value2);
+    });
+  }, [client, key, fallback]);
   return value;
 };
 export {
+  Schematic,
   SchematicProvider,
   useSchematic,
   useSchematicContext,

package/package.json

@@ -42,9 +42,9 @@
     "test": "jest --config jest.config.js"
   },
   "types": "dist/schematic-react.d.ts",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "dependencies": {
-    "@schematichq/schematic-js": "^0.1.7"
+    "@schematichq/schematic-js": "^0.1.10"
   },
   "peerDependencies": {
     "react": ">=18"