@isograph/react 0.0.0-main-55364d41 → 0.0.0-main-1cd3db6d

package/dist/cache.js

@@ -215,21 +215,55 @@ function getParentRecordKey(astNode, variables) {
     const fieldParameters = astNode.arguments;
     if (fieldParameters != null) {
         for (const fieldParameter of fieldParameters) {
-            const { argumentName, variableName } = fieldParameter;
-            const valueToUse = variables[variableName];
-            parentRecordKey += `${exports.FIRST_SPLIT_KEY}${argumentName}${exports.SECOND_SPLIT_KEY}${valueToUse}`;
+            parentRecordKey += getStoreKeyChunkForArgument(fieldParameter, variables);
         }
     }
     return parentRecordKey;
 }
 exports.getParentRecordKey = getParentRecordKey;
+function getStoreKeyChunkForArgumentValue(argumentValue, variables) {
+    switch (argumentValue.kind) {
+        case "Literal": {
+            return argumentValue.value;
+            break;
+        }
+        case "Variable": {
+            return variables[argumentValue.name];
+            break;
+        }
+        default: {
+            // TODO configure eslint to allow unused vars starting with _
+            let _ = argumentValue;
+            throw new Error("Unexpected case");
+        }
+    }
+}
+function getStoreKeyChunkForArgument(argument, variables) {
+    const chunk = getStoreKeyChunkForArgumentValue(argument[1], variables);
+    return `${exports.FIRST_SPLIT_KEY}${argument[0]}${exports.SECOND_SPLIT_KEY}${chunk}`;
+}
 function getNetworkResponseKey(astNode) {
     let networkResponseKey = astNode.fieldName;
     const fieldParameters = astNode.arguments;
     if (fieldParameters != null) {
         for (const fieldParameter of fieldParameters) {
-            const { argumentName, variableName } = fieldParameter;
-            networkResponseKey += `${exports.FIRST_SPLIT_KEY}${argumentName}${exports.SECOND_SPLIT_KEY}${variableName}`;
+            const [argumentName, argumentValue] = fieldParameter;
+            let argumentValueChunk;
+            switch (argumentValue.kind) {
+                case "Literal": {
+                    argumentValueChunk = "l_" + argumentValue.value;
+                    break;
+                }
+                case "Variable": {
+                    argumentValueChunk = "v_" + argumentValue.name;
+                    break;
+                }
+                default: {
+                    let _ = argumentValue;
+                    throw new Error("Unexpected case");
+                }
+            }
+            networkResponseKey += `${exports.FIRST_SPLIT_KEY}${argumentName}${exports.SECOND_SPLIT_KEY}${argumentValueChunk}`;
         }
     }
     return networkResponseKey;
@@ -254,9 +288,7 @@ function getDataIdOfNetworkResponse(parentRecordId, dataToNormalize, astNode, va
         return storeKey;
     }
     for (const fieldParameter of fieldParameters) {
-        const { argumentName, variableName } = fieldParameter;
-        const valueToUse = variables[variableName];
-        storeKey += `${exports.FIRST_SPLIT_KEY}${argumentName}${exports.SECOND_SPLIT_KEY}${valueToUse}`;
+        storeKey += getStoreKeyChunkForArgument(fieldParameter, variables);
     }
     return storeKey;
 }

package/dist/index.d.ts

@@ -77,9 +77,14 @@ export type RefetchQueryArtifactWrapper = {
     allowedVariables: string[];
 };
 export type Arguments = Argument[];
-export type Argument = {
-    argumentName: string;
-    variableName: string;
+export type Argument = [ArgumentName, ArgumentValue];
+export type ArgumentName = string;
+export type ArgumentValue = {
+    kind: "Variable";
+    name: string;
+} | {
+    kind: "Literal";
+    value: any;
 };
 export type FragmentReference<TReadFromStore extends Object, TResolverProps, TResolverResult> = {
     kind: "FragmentReference";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-55364d41",
+  "version": "0.0.0-main-1cd3db6d",
   "description": "Use Isograph with React",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,8 +15,8 @@
     "prepack": "yarn run test && yarn run compile"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-55364d41",
-    "@isograph/react-disposable-state": "0.0.0-main-55364d41",
+    "@isograph/disposable-types": "0.0.0-main-1cd3db6d",
+    "@isograph/react-disposable-state": "0.0.0-main-1cd3db6d",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/cache.ts

@@ -5,6 +5,8 @@ import {
 } from "@isograph/react-disposable-state";
 import { PromiseWrapper, wrapPromise } from "./PromiseWrapper";
 import {
+  Argument,
+  ArgumentValue,
   IsographEntrypoint,
   NormalizationAst,
   NormalizationLinkedField,
@@ -412,15 +414,42 @@ export function getParentRecordKey(
   const fieldParameters = astNode.arguments;
   if (fieldParameters != null) {
     for (const fieldParameter of fieldParameters) {
-      const { argumentName, variableName } = fieldParameter;
-      const valueToUse = variables[variableName];
-      parentRecordKey += `${FIRST_SPLIT_KEY}${argumentName}${SECOND_SPLIT_KEY}${valueToUse}`;
+      parentRecordKey += getStoreKeyChunkForArgument(fieldParameter, variables);
     }
   }
 
   return parentRecordKey;
 }
 
+function getStoreKeyChunkForArgumentValue(
+  argumentValue: ArgumentValue,
+  variables: { [index: string]: string }
+) {
+  switch (argumentValue.kind) {
+    case "Literal": {
+      return argumentValue.value;
+      break;
+    }
+    case "Variable": {
+      return variables[argumentValue.name];
+      break;
+    }
+    default: {
+      // TODO configure eslint to allow unused vars starting with _
+      let _: never = argumentValue;
+      throw new Error("Unexpected case");
+    }
+  }
+}
+
+function getStoreKeyChunkForArgument(
+  argument: Argument,
+  variables: { [index: string]: string }
+) {
+  const chunk = getStoreKeyChunkForArgumentValue(argument[1], variables);
+  return `${FIRST_SPLIT_KEY}${argument[0]}${SECOND_SPLIT_KEY}${chunk}`;
+}
+
 function getNetworkResponseKey(
   astNode: NormalizationLinkedField | NormalizationScalarField
 ): string {
@@ -428,8 +457,23 @@ function getNetworkResponseKey(
   const fieldParameters = astNode.arguments;
   if (fieldParameters != null) {
     for (const fieldParameter of fieldParameters) {
-      const { argumentName, variableName } = fieldParameter;
-      networkResponseKey += `${FIRST_SPLIT_KEY}${argumentName}${SECOND_SPLIT_KEY}${variableName}`;
+      const [argumentName, argumentValue] = fieldParameter;
+      let argumentValueChunk;
+      switch (argumentValue.kind) {
+        case "Literal": {
+          argumentValueChunk = "l_" + argumentValue.value;
+          break;
+        }
+        case "Variable": {
+          argumentValueChunk = "v_" + argumentValue.name;
+          break;
+        }
+        default: {
+          let _: never = argumentValue;
+          throw new Error("Unexpected case");
+        }
+      }
+      networkResponseKey += `${FIRST_SPLIT_KEY}${argumentName}${SECOND_SPLIT_KEY}${argumentValueChunk}`;
     }
   }
   return networkResponseKey;
@@ -466,9 +510,7 @@ function getDataIdOfNetworkResponse(
   }
 
   for (const fieldParameter of fieldParameters) {
-    const { argumentName, variableName } = fieldParameter;
-    const valueToUse = variables[variableName];
-    storeKey += `${FIRST_SPLIT_KEY}${argumentName}${SECOND_SPLIT_KEY}${valueToUse}`;
+    storeKey += getStoreKeyChunkForArgument(fieldParameter, variables);
   }
   return storeKey;
 }

package/src/index.tsx

@@ -139,10 +139,17 @@ export type RefetchQueryArtifactWrapper = {
 };
 
 export type Arguments = Argument[];
-export type Argument = {
-  argumentName: string;
-  variableName: string;
-};
+export type Argument = [ArgumentName, ArgumentValue];
+export type ArgumentName = string;
+export type ArgumentValue =
+  | {
+      kind: "Variable";
+      name: string;
+    }
+  | {
+      kind: "Literal";
+      value: any;
+    };
 
 export type FragmentReference<
   TReadFromStore extends Object,