Merge branch 'main' into sdk-long-running-discovery

Author: michael-0acf4

.ghjk/lock.json

@@ -384,6 +384,11 @@
           },
           "portRef": "[email protected]",
           "packageName": "@bytecodealliance/jco"
+        },
+        "f4760b34b6c9f9f96207cfb380deb77007a212a60bd10bdb3dc9d20b94c2785c": {
+          "version": "v8.15.2",
+          "depConfigs": {},
+          "portRef": "[email protected]"
         }
       }
     },
@@ -746,7 +751,7 @@
               }
             },
             {
-              "version": "v8.8.0",
+              "version": "v8.15.2",
               "port": {
                 "ty": "denoWorker@v1",
                 "name": "pnpm_ghrel",

.github/workflows/tests.yml

@@ -121,8 +121,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-latest
-            activate: "source .venv/bin/activate"
+          # TODO
+          # - os: macos-latest
+          #   activate: "source .venv/bin/activate"
           - os: macos-14
             activate: "source .venv/bin/activate"
           #- os: windows-latest
@@ -186,8 +187,10 @@ jobs:
             runner: ubuntu-latest
           # FIXME: try macos-14 runner once all actions support it
           # docker buildx action broken as of 2024-02-09
-          - platform: linux/arm64
-            runner: custom-macos
+
+          # TODO
+          # - platform: linux/arm64
+          #   runner: custom-macos
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-buildx-action@v3

Cargo.lock

@@ -84,7 +84,7 @@ dev:
     RUST_VERSION: 1.75.0
     DENO_VERSION: 1.40.1
     NODE_VERSION: 20.8.0
-    PNPM_VERSION: v8.8.0
+    PNPM_VERSION: v8.15.2
     CARGO_INSTA_VERSION: 1.33.0
     WASM_TOOLS_VERSION: 1.0.53
     JCO_VERSION: 1.0.0

dev/lock.yml

@@ -16,7 +16,7 @@ def authentication(g: Graph):
     deno = DenoRuntime()
     public = Policy.public()
 
-    ctx = t.struct({"username": t.string().optional().from_context("username")})
+    ctx = t.struct({"username": t.string().optional()})
 
     # highlight-start
     # expects a secret in metatype.yml
@@ -26,6 +26,10 @@ def authentication(g: Graph):
     # highlight-end
 
     g.expose(
-        get_context=deno.identity(ctx),
+        get_context=deno.identity(ctx).apply(
+            {
+                "username": g.from_context("username"),
+            }
+        ),
         default_policy=[public],
     )

examples/typegraphs/authentication.py

@@ -14,7 +14,7 @@ typegraph({
   const pub = Policy.public();
 
   const ctx = t.struct({
-    "username": t.string().optional().fromContext("username"),
+    "username": t.string().optional(),
   });
 
   // highlight-start
@@ -25,6 +25,8 @@ typegraph({
   // highlight-end
 
   g.expose({
-    get_context: deno.identity(ctx).withPolicy(pub),
+    get_context: deno.identity(ctx).apply({
+      username: g.fromContext("username"),
+    }).withPolicy(pub),
   });
 });

examples/typegraphs/authentication.ts

@@ -14,12 +14,16 @@ def basic_authentication(g: Graph):
     deno = DenoRuntime()
     public = Policy.public()
 
-    ctx = t.struct({"username": t.string().optional().from_context("username")})
+    ctx = t.struct({"username": t.string().optional()})
 
     # highlight-next-line
     g.auth(Auth.basic(["admin"]))
 
     g.expose(
         public,
-        get_context=deno.identity(ctx),
+        get_context=deno.identity(ctx).apply(
+            {
+                "username": g.from_context("username"),
+            }
+        ),
     )

examples/typegraphs/basic.py

@@ -14,13 +14,15 @@ typegraph({
   const pub = Policy.public();
 
   const ctx = t.struct({
-    "username": t.string().optional().fromContext("username"),
+    "username": t.string().optional(),
   });
 
   // highlight-next-line
   g.auth(Auth.basic(["admin"]));
 
   g.expose({
-    get_context: deno.identity(ctx).withPolicy(pub),
+    get_context: deno.identity(ctx).apply({
+      username: g.fromContext("username"),
+    }).withPolicy(pub),
   });
 });

examples/typegraphs/basic.ts

@@ -84,7 +84,9 @@ def roadmap(g: Graph):
             ),
             EffectUpdate(True),
         ),
-        get_context=deno.identity(
-            t.struct({"username": t.string().optional().from_context("username")})
+        get_context=deno.identity(t.struct({"username": t.string().optional()})).apply(
+            {
+                "username": g.from_context("username"),
+            }
         ),
     )

examples/typegraphs/execute.py

@@ -81,7 +81,9 @@ typegraph({
       effects.update(),
     ),
     get_context: deno.identity(
-      t.struct({ "username": t.string().optional().fromContext("username") }),
-    ),
+      t.struct({ "username": t.string().optional() }),
+    ).apply({
+      "username": g.fromContext("username"),
+    }),
   }, pub);
 });