Bump Primer pin for edge flavor support (#1098)

hackworthltd · Nov 23, 2023 · eb1bbff · eb1bbff
2 parents 6c8719c + 145ab91
commit eb1bbff
Show file tree

Hide file tree

Showing 10 changed files with 947 additions and 639 deletions.
diff --git a/argocd/base/statefulset.yaml b/argocd/base/statefulset.yaml
@@ -26,7 +26,7 @@ spec:
           # Note: use the *dev* version of the package here, so that
           # PRs can deploy `primer-service` container images that have
           # not yet been merged to `primer` `main`.
-          image: ghcr.io/hackworthltd/primer-service-dev:git-e8e9f14d326e82e0814a79185a1246327abc62f7
+          image: ghcr.io/hackworthltd/primer-service-dev:git-4a105b7c084cdbf599acb2bc5bb9283d0eae46ff
           ports:
             - containerPort: 8081
           env:

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -19,7 +19,7 @@
 
     # Note: don't override any of primer's Nix flake inputs, or else
     # we won't hit its binary cache.
-    primer.url = github:hackworthltd/primer/e8e9f14d326e82e0814a79185a1246327abc62f7;
+    primer.url = github:hackworthltd/primer/4a105b7c084cdbf599acb2bc5bb9283d0eae46ff;
 
     flake-parts.url = "github:hercules-ci/flake-parts";
   };

diff --git a/src/components/TreeReactFlow/TreeReactFlow.stories.tsx b/src/components/TreeReactFlow/TreeReactFlow.stories.tsx
@@ -93,25 +93,37 @@ const typeDef1: TypeDef = {
         nodeId: "1111",
         childTrees: [
           {
-            body: { tag: "NoBody", contents: "KType" },
-            nodeId: "1112",
-            childTrees: [],
+            fst: "FunIn",
+            snd: {
+              body: { tag: "NoBody", contents: "KType" },
+              nodeId: "1112",
+              childTrees: [],
+            },
           },
           {
-            body: { tag: "NoBody", contents: "KFun" },
-            nodeId: "1113",
-            childTrees: [
-              {
-                body: { tag: "NoBody", contents: "KHole" },
-                nodeId: "1114",
-                childTrees: [],
-              },
-              {
-                body: { tag: "NoBody", contents: "KType" },
-                nodeId: "1115",
-                childTrees: [],
-              },
-            ],
+            fst: "FunOut",
+            snd: {
+              body: { tag: "NoBody", contents: "KFun" },
+              nodeId: "1113",
+              childTrees: [
+                {
+                  fst: "FunIn",
+                  snd: {
+                    body: { tag: "NoBody", contents: "KHole" },
+                    nodeId: "1114",
+                    childTrees: [],
+                  },
+                },
+                {
+                  fst: "FunOut",
+                  snd: {
+                    body: { tag: "NoBody", contents: "KType" },
+                    nodeId: "1115",
+                    childTrees: [],
+                  },
+                },
+              ],
+            },
           },
         ],
       },
@@ -142,43 +154,55 @@ const typeDef1: TypeDef = {
           body: { tag: "NoBody", contents: "TApp" },
           childTrees: [
             {
-              nodeId: "1102",
-              body: { tag: "NoBody", contents: "TApp" },
-              childTrees: [
-                {
-                  nodeId: "1103",
-                  body: {
-                    tag: "TextBody",
-                    contents: {
-                      fst: "TVar",
-                      snd: { baseName: "b" },
+              fst: "AppFun",
+              snd: {
+                nodeId: "1102",
+                body: { tag: "NoBody", contents: "TApp" },
+                childTrees: [
+                  {
+                    fst: "AppFun",
+                    snd: {
+                      nodeId: "1103",
+                      body: {
+                        tag: "TextBody",
+                        contents: {
+                          fst: "TVar",
+                          snd: { baseName: "b" },
+                        },
+                      },
+                      childTrees: [],
                     },
                   },
-                  childTrees: [],
-                },
-                {
-                  nodeId: "1104",
-                  body: {
-                    tag: "TextBody",
-                    contents: {
-                      fst: "TCon",
-                      snd: { baseName: "Bool" },
+                  {
+                    fst: "AppArg",
+                    snd: {
+                      nodeId: "1104",
+                      body: {
+                        tag: "TextBody",
+                        contents: {
+                          fst: "TCon",
+                          snd: { baseName: "Bool" },
+                        },
+                      },
+                      childTrees: [],
                     },
                   },
-                  childTrees: [],
-                },
-              ],
+                ],
+              },
             },
             {
-              nodeId: "1105",
-              body: {
-                tag: "TextBody",
-                contents: {
-                  fst: "TCon",
-                  snd: { baseName: "Pair" },
+              fst: "AppArg",
+              snd: {
+                nodeId: "1105",
+                body: {
+                  tag: "TextBody",
+                  contents: {
+                    fst: "TCon",
+                    snd: { baseName: "Pair" },
+                  },
                 },
+                childTrees: [],
               },
-              childTrees: [],
             },
           ],
         },

diff --git a/src/components/TreeReactFlow/index.tsx b/src/components/TreeReactFlow/index.tsx
@@ -523,14 +523,14 @@ const augmentTree = async <T, E>(
   f: (tree: APITreeNode) => Promise<[T, (child: T, isRight: boolean) => E]>
 ): Promise<Tree<T, E>> => {
   const childTrees = await Promise.all(
-    tree.childTrees.map((t) => augmentTree(t, f))
+    tree.childTrees.map((t) => augmentTree(t.snd, f))
   );
   const [node, makeEdge] = await f({
     children: tree.childTrees.length + (tree.rightChild ? 1 : 0),
     ...tree,
   });
   const rightChild = await (tree.rightChild
-    ? augmentTree(tree.rightChild, f)
+    ? augmentTree(tree.rightChild.snd, f)
     : undefined);
   return {
     ...(rightChild