@dxos/functions-testing 0.8.4-main.d05539e30a → 0.8.4-main.d9fc60f731

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions-testing",
-  "version": "0.8.4-main.d05539e30a",
+  "version": "0.8.4-main.d9fc60f731",
   "description": "Functions tests",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -30,23 +30,24 @@
     "src"
   ],
   "dependencies": {
-    "@effect/platform": "0.94.4",
-    "@dxos/assistant-toolkit": "0.8.4-main.d05539e30a",
-    "@dxos/async": "0.8.4-main.d05539e30a",
-    "@dxos/client": "0.8.4-main.d05539e30a",
-    "@dxos/compute": "0.8.4-main.d05539e30a",
-    "@dxos/config": "0.8.4-main.d05539e30a",
-    "@dxos/context": "0.8.4-main.d05539e30a",
-    "@dxos/echo": "0.8.4-main.d05539e30a",
-    "@dxos/functions": "0.8.4-main.d05539e30a",
-    "@dxos/functions-runtime": "0.8.4-main.d05539e30a",
-    "@dxos/functions-runtime-cloudflare": "0.8.4-main.d05539e30a",
-    "@dxos/log": "0.8.4-main.d05539e30a",
-    "@dxos/invariant": "0.8.4-main.d05539e30a",
-    "@dxos/operation": "0.8.4-main.d05539e30a",
-    "@dxos/protocols": "0.8.4-main.d05539e30a",
-    "@dxos/schema": "0.8.4-main.d05539e30a",
-    "@dxos/util": "0.8.4-main.d05539e30a"
+    "@effect/platform": "0.96.1",
+    "@dxos/async": "0.8.4-main.d9fc60f731",
+    "@dxos/assistant-toolkit": "0.8.4-main.d9fc60f731",
+    "@dxos/client": "0.8.4-main.d9fc60f731",
+    "@dxos/compute": "0.8.4-main.d9fc60f731",
+    "@dxos/echo": "0.8.4-main.d9fc60f731",
+    "@dxos/config": "0.8.4-main.d9fc60f731",
+    "@dxos/context": "0.8.4-main.d9fc60f731",
+    "@dxos/invariant": "0.8.4-main.d9fc60f731",
+    "@dxos/functions": "0.8.4-main.d9fc60f731",
+    "@dxos/log": "0.8.4-main.d9fc60f731",
+    "@dxos/functions-runtime": "0.8.4-main.d9fc60f731",
+    "@dxos/functions-runtime-cloudflare": "0.8.4-main.d9fc60f731",
+    "@dxos/keys": "0.8.4-main.d9fc60f731",
+    "@dxos/util": "0.8.4-main.d9fc60f731",
+    "@dxos/protocols": "0.8.4-main.d9fc60f731",
+    "@dxos/operation": "0.8.4-main.d9fc60f731",
+    "@dxos/schema": "0.8.4-main.d9fc60f731"
   },
   "publishConfig": {
     "access": "public"

package/src/edge-routine.test.ts

@@ -10,7 +10,7 @@ import { Client } from '@dxos/client';
 import { Blueprint, Operation, Routine, Trigger } from '@dxos/compute';
 import { configPreset } from '@dxos/config';
 import { Context } from '@dxos/context';
-import { Feed, Obj, Ref } from '@dxos/echo';
+import { Feed, Obj, Ref, Type } from '@dxos/echo';
 import { TestSchema } from '@dxos/echo/testing';
 import { dbg, log } from '@dxos/log';
 import { ErrorCodec } from '@dxos/protocols';
@@ -66,7 +66,7 @@ describe('Edge routine', { tags: ['functions-e2e'] }, () => {
         name: 'edge-e2e-count-orgs-db-blueprint',
         instructions: trim`
               You have access to the Database blueprint tools.
-              Use the Query tool exactly once with typename "${TestSchema.Organization.typename}" and no other arguments.
+              Use the Query tool exactly once with typename "${Type.getTypename(TestSchema.Organization)}" and no other arguments.
               Then call completeJob with the output object { "count": <number of rows returned by Query> }.
               If you are unable to query -- fail.
               Do not list schemas first.

package/src/functions/definitions.ts

@@ -6,10 +6,11 @@ import * as Schema from 'effect/Schema';
 
 import { Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
+import { DXN } from '@dxos/keys';
 
 export const Fibonacci = Operation.make({
   meta: {
-    key: 'org.example.function.fib',
+    key: DXN.make('org.example.function.fib'),
     name: 'Fibonacci',
     description: 'Function that calculates a Fibonacci number',
   },
@@ -26,7 +27,7 @@ export const Fibonacci = Operation.make({
 
 export const Reply = Operation.make({
   meta: {
-    key: 'org.example.function.reply',
+    key: DXN.make('org.example.function.reply'),
     name: 'Reply',
     description: 'Function that echoes the input',
   },
@@ -36,7 +37,7 @@ export const Reply = Operation.make({
 
 export const Sleep = Operation.make({
   meta: {
-    key: 'org.example.function.sleep',
+    key: DXN.make('org.example.function.sleep'),
     name: 'Sleep',
     description: 'Function that sleeps for a given amount of time',
   },
@@ -51,7 +52,7 @@ export const Sleep = Operation.make({
 
 export const QueryDb = Operation.make({
   meta: {
-    key: 'org.example.function.query',
+    key: DXN.make('org.example.function.query'),
     name: 'Query',
     description: 'Queries the database',
   },

package/src/functions/forex-effect.ts

@@ -11,10 +11,11 @@ import * as Schedule from 'effect/Schedule';
 import * as Schema from 'effect/Schema';
 
 import { Operation } from '@dxos/compute';
+import { DXN } from '@dxos/keys';
 
 const ForexEffect = Operation.make({
   meta: {
-    key: 'org.dxos.script.forex-effect',
+    key: DXN.make('org.dxos.script.forexEffect'),
     name: 'Forex Effect',
     description: 'Returns the exchange rate between two currencies.',
   },

package/src/testing/util.ts

@@ -84,8 +84,10 @@ export const observeInvocations = async (space: Space, maxCount: number | null)
   while (true) {
     try {
       const traceFeed = space.properties.invocationTraceFeed?.target;
-      const traceFeedDXN = traceFeed ? Feed.getQueueDxn(traceFeed) : undefined;
-      const invocations = traceFeedDXN ? ((await space.queues.get(traceFeedDXN).queryObjects()) ?? []) : [];
+      const traceFeedDXN = traceFeed ? Feed.getQueueUri(traceFeed) : undefined;
+      const invocations = traceFeedDXN
+        ? ((await space.queues.get(traceFeedDXN, { subspaceTag: traceFeed!.namespace }).queryObjects()) ?? [])
+        : [];
 
       for (const invocation of invocations) {
         if (Obj.instanceOf(InvocationTraceStartEvent, invocation)) {