@dxos/functions 0.8.3-main.672df60 → 0.8.3-staging.0fa589b

package/dist/types/src/services/service-container.d.ts

@@ -1,16 +1,34 @@
-import { type Context } from 'effect';
+import { Layer, type Context } from 'effect';
 import { AiService } from './ai';
 import { CredentialsService } from './credentials';
 import { DatabaseService } from './database';
-import { QueuesService } from './queues';
+import { EventLogger } from './event-logger';
+import { FunctionCallService } from './function-call-service';
+import { QueueService } from './queues';
 import { TracingService } from './tracing';
-export interface Services {
-    database: Context.Tag.Service<DatabaseService>;
-    ai: Context.Tag.Service<AiService>;
-    queues: Context.Tag.Service<QueuesService>;
-    credentials: Context.Tag.Service<CredentialsService>;
-    tracing: Context.Tag.Service<TracingService>;
+/**
+ * List of all service tags and their names.
+ */
+export interface ServiceTagRecord {
+    ai: AiService;
+    credentials: CredentialsService;
+    database: DatabaseService;
+    eventLogger: EventLogger;
+    functionCallService: FunctionCallService;
+    tracing: TracingService;
+    queues: QueueService;
 }
+/**
+ * List of all services and their runtime types.
+ */
+export type ServiceRecord = {
+    [K in keyof ServiceTagRecord]: Context.Tag.Service<ServiceTagRecord[K]>;
+};
+/**
+ * Union of all services.
+ */
+export type Services = ServiceTagRecord[keyof ServiceTagRecord];
+export declare const SERVICE_TAGS: Context.Tag<any, any>[];
 export declare class ServiceContainer {
     private _services;
     /**
@@ -18,8 +36,9 @@ export declare class ServiceContainer {
      * @param services - Services to set.
      * @returns The container instance.
      */
-    setServices(services: Partial<Services>): this;
+    setServices(services: Partial<ServiceRecord>): this;
     getService<T extends Context.Tag<any, any>>(tag: T): Context.Tag.Service<T>;
     clone(): ServiceContainer;
+    createLayer(): Layer.Layer<Services>;
 }
 //# sourceMappingURL=service-container.d.ts.map

package/dist/types/src/services/service-container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-container.d.ts","sourceRoot":"","sources":["../../../../src/services/service-container.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC/C,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3C,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACrD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;CAC9C;AAcD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,SAAS,CAA8C;IAE/D;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI;IAK9C,UAAU,CAAC,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAS3E,KAAK,IAAI,gBAAgB;CAG1B"}
+{"version":3,"file":"service-container.d.ts","sourceRoot":"","sources":["../../../../src/services/service-container.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,KAAK,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAgC,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,SAAS,CAAC;IACd,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,EAAE,eAAe,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;KACzB,CAAC,IAAI,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;CACxE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,gBAAgB,CAAC,CAAC;AAYhE,eAAO,MAAM,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,EAQ/C,CAAC;AAMF,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,SAAS,CAAmD;IAEpE;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAKnD,UAAU,CAAC,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAS3E,KAAK,IAAI,gBAAgB;IAKzB,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;CAkBrC"}

package/dist/types/src/testing/index.d.ts

@@ -0,0 +1,2 @@
+export * from './services';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/src/testing/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,cAAc,YAAY,CAAC"}

package/dist/types/src/testing/logger.d.ts

@@ -0,0 +1,5 @@
+import { type Context } from 'effect';
+import { type EventLogger } from '../services';
+export declare const noopLogger: Context.Tag.Service<EventLogger>;
+export declare const consoleLogger: Context.Tag.Service<EventLogger>;
+//# sourceMappingURL=logger.d.ts.map

package/dist/types/src/testing/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../../src/testing/logger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,KAAK,OAAO,EAAE,MAAM,QAAQ,CAAC;AAI9C,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,aAAa,CAAC;AAElE,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAGvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAoC,CAAC"}

package/dist/types/src/testing/services.d.ts

@@ -0,0 +1,13 @@
+import { type Context } from 'effect';
+import type { AiServiceClient } from '@dxos/ai';
+import type { QueueFactory } from '@dxos/echo-db';
+import { ServiceContainer } from '../services';
+import type { EventLogger } from '../services/event-logger';
+export type TestServiceOptions = {
+    ai?: AiServiceClient;
+    queueFactory?: QueueFactory;
+    enableLogging?: boolean;
+    logger?: Context.Tag.Service<EventLogger>;
+};
+export declare const createTestServices: ({ ai, queueFactory, enableLogging, logger, }?: TestServiceOptions) => ServiceContainer;
+//# sourceMappingURL=services.d.ts.map

package/dist/types/src/testing/services.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../../src/testing/services.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGlD,OAAO,EAA2B,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,CAAC,EAAE,eAAe,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,+CAKhC,kBAAuB,KAAG,gBAM5B,CAAC"}

package/dist/types/src/trace.d.ts

@@ -1,7 +1,7 @@
 import { Schema } from 'effect';
+import { Type, type Ref } from '@dxos/echo';
 import { Queue } from '@dxos/echo-db';
-import { Expando, Ref } from '@dxos/echo-schema';
-import { type FunctionTriggerType } from './types';
+import { FunctionTrigger, type FunctionTriggerType } from './types';
 export declare enum InvocationOutcome {
     SUCCESS = "success",
     FAILURE = "failure",
@@ -18,7 +18,7 @@ export declare const TraceEventException: Schema.Struct<{
     stack: Schema.optional<typeof Schema.String>;
 }>;
 export type TraceEventException = Schema.Schema.Type<typeof TraceEventException>;
-export declare const InvocationTraceStartEvent: import("@dxos/echo-schema").EchoTypeSchema<Schema.Struct<{
+export declare const InvocationTraceStartEvent: Type.obj<Schema.Struct<{
     /**
      * Queue message id.
      */
@@ -39,46 +39,21 @@ export declare const InvocationTraceStartEvent: import("@dxos/echo-schema").Echo
     /**
      * Queue  for function/workflow invocation events.
      */
-    invocationTraceQueue: import("@dxos/echo-schema").Ref$<Queue<import("@dxos/echo-schema").AnyEchoObject>>;
+    invocationTraceQueue: Type.ref<Schema.Schema<Queue<import("@dxos/echo/Obj").Any | import("@dxos/echo/Relation").Any>, Queue<import("@dxos/echo/Obj").Any | import("@dxos/echo/Relation").Any>, never>>;
     /**
      * DXN of the invoked function/workflow.
      */
-    invocationTarget: import("@dxos/echo-schema").Ref$<Expando>;
+    invocationTarget: Type.ref<Schema.Schema<Type.Expando, {
+        [x: string]: any;
+        id: string;
+    }, never>>;
     /**
      * Present for automatic invocations.
      */
-    trigger: Schema.optional<import("@dxos/echo-schema").Ref$<import("@dxos/echo-schema").TypedObjectFields<Readonly<{
-        function: Schema.optional<Schema.SchemaClass<Ref<Expando>, import("@dxos/echo-protocol").EncodedReference, never>>;
-        inputNodeId: Schema.optional<Schema.SchemaClass<string, string, never>>;
-        enabled: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
-        spec: Schema.optional<Schema.Union<[Schema.mutable<Schema.Struct<{
-            kind: Schema.Literal<[import("./types").TriggerKind.Timer]>;
-            cron: Schema.SchemaClass<string, string, never>;
-        }>>, Schema.mutable<Schema.Struct<{
-            kind: Schema.Literal<[import("./types").TriggerKind.Webhook]>;
-            method: Schema.optional<Schema.SchemaClass<string, string, never>>;
-            port: Schema.optional<Schema.SchemaClass<number, number, never>>;
-        }>>, Schema.mutable<Schema.Struct<{
-            kind: Schema.Literal<[import("./types").TriggerKind.Subscription]>;
-            filter: Schema.Struct<{
-                type: Schema.optional<Schema.SchemaClass<string, string, never>>;
-                props: Schema.optional<Schema.Record$<typeof Schema.String, typeof Schema.Any>>;
-            }>;
-            options: Schema.optional<Schema.Struct<{
-                deep: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
-                delay: Schema.optional<Schema.SchemaClass<number, number, never>>;
-            }>>;
-        }>>, Schema.mutable<Schema.Struct<{
-            kind: Schema.Literal<[import("./types").TriggerKind.Email]>;
-        }>>, Schema.mutable<Schema.Struct<{
-            kind: Schema.Literal<[import("./types").TriggerKind.Queue]>;
-            queue: Schema.refine<string, typeof Schema.NonEmptyString>;
-        }>>]>>;
-        input: Schema.optional<Schema.mutable<Schema.Record$<typeof Schema.String, typeof Schema.Any>>>;
-    }>, import("@dxos/echo-schema").TypedObjectOptions>>>;
-}>, {}>;
+    trigger: Schema.optional<Type.ref<typeof FunctionTrigger>>;
+}>>;
 export type InvocationTraceStartEvent = Schema.Schema.Type<typeof InvocationTraceStartEvent>;
-export declare const InvocationTraceEndEvent: import("@dxos/echo-schema").EchoTypeSchema<Schema.Struct<{
+export declare const InvocationTraceEndEvent: Type.obj<Schema.Struct<{
     /**
      * Trace event id.
      */
@@ -99,7 +74,7 @@ export declare const InvocationTraceEndEvent: import("@dxos/echo-schema").EchoTy
         name: typeof Schema.String;
         stack: Schema.optional<typeof Schema.String>;
     }>>;
-}>, {}>;
+}>>;
 export type InvocationTraceEndEvent = Schema.Schema.Type<typeof InvocationTraceEndEvent>;
 export type InvocationTraceEvent = InvocationTraceStartEvent | InvocationTraceEndEvent;
 export declare const TraceEventLog: Schema.Struct<{
@@ -108,7 +83,7 @@ export declare const TraceEventLog: Schema.Struct<{
     message: typeof Schema.String;
     context: Schema.optional<typeof Schema.Object>;
 }>;
-export declare const TraceEvent: import("@dxos/echo-schema").EchoTypeSchema<Schema.Struct<{
+export declare const TraceEvent: Type.obj<Schema.Struct<{
     id: import("@dxos/keys").ObjectIdClass;
     outcome: typeof Schema.String;
     truncated: typeof Schema.Boolean;
@@ -128,11 +103,11 @@ export declare const TraceEvent: import("@dxos/echo-schema").EchoTypeSchema<Sche
         name: typeof Schema.String;
         stack: Schema.optional<typeof Schema.String>;
     }>>;
-}>, {}>;
+}>>;
 export type TraceEvent = Schema.Schema.Type<typeof TraceEvent>;
 /**
- * Deprecated InvocationTrace event format.
- * @deprecated
+ * InvocationTrace event format.
+ * This is the combined format of InvocationTraceStartEvent and InvocationTraceEndEvents for UI consumption.
  */
 export type InvocationSpan = {
     id: string;
@@ -140,9 +115,9 @@ export type InvocationSpan = {
     outcome: InvocationOutcome;
     input: object;
     durationMs: number;
-    invocationTraceQueue: Ref<Queue>;
-    invocationTarget: Ref<Expando>;
-    trigger?: Ref<FunctionTriggerType>;
+    invocationTraceQueue: Ref.Ref<Queue>;
+    invocationTarget: Ref.Ref<Type.Expando>;
+    trigger?: Ref.Ref<FunctionTriggerType>;
     exception?: TraceEventException;
 };
 export declare const createInvocationSpans: (items?: InvocationTraceEvent[]) => InvocationSpan[];

package/dist/types/src/trace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../../src/trace.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAc,OAAO,EAAY,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGvE,OAAO,EAAmB,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEpE,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAGD,oBAAY,wBAAwB;IAClC,KAAK,UAAU;IACf,GAAG,QAAQ;CACZ;AAED,eAAO,MAAM,mBAAmB;;;;;EAK9B,CAAC;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEjF,eAAO,MAAM,yBAAyB;IACpC;;OAEG;;;IAGH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAGH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAEoF,CAAC;AAE1F,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE7F,eAAO,MAAM,uBAAuB;IAClC;;OAEG;;;IAGH;;OAEG;;IAEH;;OAEG;;;;;;;;;OAKkF,CAAC;AAExF,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAEzF,MAAM,MAAM,oBAAoB,GAAG,yBAAyB,GAAG,uBAAuB,CAAC;AAEvF,eAAO,MAAM,aAAa;;;;;EAKxB,CAAC;AAEH,eAAO,MAAM,UAAU;;;;IAKrB;;OAEG;;;;;;;;;;;;;;OAI0E,CAAC;AAEhF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAE/D;;;GAGG;AAEH,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IACjC,gBAAgB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACnC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,QAAQ,oBAAoB,EAAE,KAAG,cAAc,EAkDpF,CAAC"}
+{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../../src/trace.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAItC,OAAO,EAAE,eAAe,EAAE,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEpE,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAGD,oBAAY,wBAAwB;IAClC,KAAK,UAAU;IACf,GAAG,QAAQ;CACZ;AAED,eAAO,MAAM,mBAAmB;;;;;EAK9B,CAAC;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEjF,eAAO,MAAM,yBAAyB;IACpC;;OAEG;;;IAGH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;IAGH;;OAEG;;IAEH;;OAEG;;;;;IAEH;;OAEG;;GAEkF,CAAC;AAExF,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE7F,eAAO,MAAM,uBAAuB;IAClC;;OAEG;;;IAGH;;OAEG;;IAEH;;OAEG;;;;;;;;;GAKgF,CAAC;AAEtF,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAEzF,MAAM,MAAM,oBAAoB,GAAG,yBAAyB,GAAG,uBAAuB,CAAC;AAEvF,eAAO,MAAM,aAAa;;;;;EAKxB,CAAC;AAEH,eAAO,MAAM,UAAU;;;;IAKrB;;OAEG;;;;;;;;;;;;;;GAIwE,CAAC;AAE9E,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAE/D;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrC,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACvC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,QAAQ,oBAAoB,EAAE,KAAG,cAAc,EAkDpF,CAAC"}

package/dist/types/src/translations.d.ts

@@ -1,8 +1,10 @@
-import { ScriptType } from './schema';
 declare const _default: {
     'en-US': {
-        [ScriptType.typename]: {
+        [x: string]: {
             'typename label': string;
+            'typename label_zero': string;
+            'typename label_one': string;
+            'typename label_other': string;
         };
     };
 }[];

package/dist/types/src/translations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../../src/translations.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;;;QAKhC,CAAC,UAAU,CAAC,QAAQ,CAAC;;UAEpB;;;AALP,wBAQE"}
+{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../../src/translations.ts"],"names":[],"mappings":";;;;;;;;;;AAQA,wBAWE"}

package/dist/types/src/types.d.ts

@@ -1,6 +1,5 @@
 import { Schema } from 'effect';
 import { Expando, Ref } from '@dxos/echo-schema';
-import { FunctionType } from './schema';
 /**
  * Type discriminator for TriggerType.
  * Every spec has a type field of type TriggerKind that we can use to understand which type we're working with.
@@ -270,41 +269,31 @@ export declare class FunctionTrigger extends FunctionTrigger_base {
  * Function manifest file.
  */
 export declare const FunctionManifestSchema: Schema.Struct<{
-    functions: Schema.optional<Schema.mutable<Schema.Array$<Schema.Schema<import("@dxos/echo-schema").ExcludeId<import("@dxos/echo-schema").TypedObjectFields<{
-        name: typeof Schema.NonEmptyString;
-        version: typeof Schema.String;
-        description: Schema.optional<typeof Schema.String>;
-        source: Schema.optional<import("@dxos/echo-schema").Ref$<{
-            readonly id: string;
+    functions: Schema.optional<Schema.mutable<Schema.Array$<Schema.Schema<import("@dxos/echo-schema").ExcludeId<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+        name: string;
+        description?: string | undefined;
+        source?: Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
             name?: string | undefined;
             description?: string | undefined;
             changed?: boolean | undefined;
-            source: Ref<{
-                readonly id: string;
+            source: Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
                 content: string;
             }>;
-        }>>;
-        inputSchema: Schema.optional<Schema.Schema<import("@dxos/echo-schema").JsonSchemaType, import("@dxos/echo-schema").JsonSchemaType, never>>;
-        outputSchema: Schema.optional<Schema.Schema<import("@dxos/echo-schema").JsonSchemaType, import("@dxos/echo-schema").JsonSchemaType, never>>;
-        binding: Schema.optional<typeof Schema.String>;
-    }, import("@dxos/echo-schema").TypedObjectOptions>> & import("@dxos/echo-schema").WithMeta, Schema.Struct.Encoded<{
-        name: typeof Schema.NonEmptyString;
-        version: typeof Schema.String;
-        description: Schema.optional<typeof Schema.String>;
-        source: Schema.optional<import("@dxos/echo-schema").Ref$<{
-            readonly id: string;
-            name?: string | undefined;
-            description?: string | undefined;
-            changed?: boolean | undefined;
-            source: Ref<{
-                readonly id: string;
-                content: string;
-            }>;
-        }>>;
-        inputSchema: Schema.optional<Schema.Schema<import("@dxos/echo-schema").JsonSchemaType, import("@dxos/echo-schema").JsonSchemaType, never>>;
-        outputSchema: Schema.optional<Schema.Schema<import("@dxos/echo-schema").JsonSchemaType, import("@dxos/echo-schema").JsonSchemaType, never>>;
-        binding: Schema.optional<typeof Schema.String>;
-    }>, never>>>>;
+        }> | undefined;
+        version: string;
+        inputSchema?: import("@dxos/echo-schema").JsonSchemaType | undefined;
+        outputSchema?: import("@dxos/echo-schema").JsonSchemaType | undefined;
+        binding?: string | undefined;
+    }> & import("@dxos/echo-schema").WithMeta, {
+        id: string;
+        name: string;
+        version: string;
+        description?: string | undefined;
+        source?: import("@dxos/echo-protocol").EncodedReference | undefined;
+        inputSchema?: import("@dxos/echo-schema").JsonSchemaType | undefined;
+        outputSchema?: import("@dxos/echo-schema").JsonSchemaType | undefined;
+        binding?: string | undefined;
+    }, never>>>>;
     triggers: Schema.optional<Schema.mutable<Schema.Array$<Schema.Schema<import("@dxos/echo-schema").ExcludeId<import("@dxos/echo-schema").TypedObjectFields<Readonly<{
         /**
          * Function or workflow to invoke.
@@ -402,6 +391,21 @@ export declare const FunctionManifestSchema: Schema.Struct<{
     }>>, never>>>>;
 }>;
 export type FunctionManifest = Schema.Schema.Type<typeof FunctionManifestSchema>;
-export declare const FUNCTION_TYPES: (typeof FunctionType | typeof FunctionTrigger)[];
+export declare const FUNCTION_TYPES: (import("@dxos/echo/Type").obj<Schema.Struct<{
+    name: typeof Schema.NonEmptyString;
+    version: typeof Schema.String;
+    description: Schema.optional<typeof Schema.String>;
+    source: Schema.optional<import("@dxos/echo-schema").Ref$<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+        name?: string | undefined;
+        description?: string | undefined;
+        changed?: boolean | undefined;
+        source: Ref<import("@dxos/echo/Type").OfKind<import("@dxos/echo-schema").EntityKind.Object> & {
+            content: string;
+        }>;
+    }>>;
+    inputSchema: Schema.optional<Schema.Schema<import("@dxos/echo-schema").JsonSchemaType, import("@dxos/echo-schema").JsonSchemaType, never>>;
+    outputSchema: Schema.optional<Schema.Schema<import("@dxos/echo-schema").JsonSchemaType, import("@dxos/echo-schema").JsonSchemaType, never>>;
+    binding: Schema.optional<typeof Schema.String>;
+}>> | typeof FunctionTrigger)[];
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/types/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.8.3-main.672df60",
+  "version": "0.8.3-staging.0fa589b",
   "description": "Functions API and runtime.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -23,6 +23,11 @@
       "types": "./dist/types/src/edge/index.d.ts",
       "browser": "./dist/lib/browser/edge/index.mjs",
       "node": "./dist/lib/node-esm/edge/index.mjs"
+    },
+    "./testing": {
+      "types": "./dist/types/src/testing/index.d.ts",
+      "browser": "./dist/lib/browser/testing/index.mjs",
+      "node": "./dist/lib/node-esm/testing/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -51,28 +56,29 @@
     "get-port-please": "^3.1.1",
     "iso-did": "^1.6.0",
     "ws": "^8.14.2",
-    "@dxos/ai": "0.8.3-main.672df60",
-    "@dxos/context": "0.8.3-main.672df60",
-    "@dxos/async": "0.8.3-main.672df60",
-    "@dxos/client": "0.8.3-main.672df60",
-    "@dxos/echo-db": "0.8.3-main.672df60",
-    "@dxos/echo-protocol": "0.8.3-main.672df60",
-    "@dxos/crypto": "0.8.3-main.672df60",
-    "@dxos/invariant": "0.8.3-main.672df60",
-    "@dxos/echo-schema": "0.8.3-main.672df60",
-    "@dxos/edge-client": "0.8.3-main.672df60",
-    "@dxos/keys": "0.8.3-main.672df60",
-    "@dxos/node-std": "0.8.3-main.672df60",
-    "@dxos/protocols": "0.8.3-main.672df60",
-    "@dxos/live-object": "0.8.3-main.672df60",
-    "@dxos/log": "0.8.3-main.672df60",
-    "@dxos/schema": "0.8.3-main.672df60",
-    "@dxos/util": "0.8.3-main.672df60"
+    "@dxos/ai": "0.8.3-staging.0fa589b",
+    "@dxos/client": "0.8.3-staging.0fa589b",
+    "@dxos/async": "0.8.3-staging.0fa589b",
+    "@dxos/context": "0.8.3-staging.0fa589b",
+    "@dxos/crypto": "0.8.3-staging.0fa589b",
+    "@dxos/echo-db": "0.8.3-staging.0fa589b",
+    "@dxos/echo-protocol": "0.8.3-staging.0fa589b",
+    "@dxos/echo": "0.8.3-staging.0fa589b",
+    "@dxos/echo-schema": "0.8.3-staging.0fa589b",
+    "@dxos/edge-client": "0.8.3-staging.0fa589b",
+    "@dxos/keys": "0.8.3-staging.0fa589b",
+    "@dxos/invariant": "0.8.3-staging.0fa589b",
+    "@dxos/live-object": "0.8.3-staging.0fa589b",
+    "@dxos/log": "0.8.3-staging.0fa589b",
+    "@dxos/node-std": "0.8.3-staging.0fa589b",
+    "@dxos/protocols": "0.8.3-staging.0fa589b",
+    "@dxos/util": "0.8.3-staging.0fa589b",
+    "@dxos/schema": "0.8.3-staging.0fa589b"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/ws": "^7.4.0",
-    "@dxos/agent": "0.8.3-main.672df60"
+    "@dxos/agent": "0.8.3-staging.0fa589b"
   },
   "publishConfig": {
     "access": "public"

package/src/handler.ts

@@ -4,7 +4,7 @@
 
 import { Schema, type Context, type Effect } from 'effect';
 
-import { type AIServiceClient } from '@dxos/ai';
+import { type AiServiceClient } from '@dxos/ai';
 // import { type Space } from '@dxos/client/echo';
 import type { CoreDatabase, EchoDatabase } from '@dxos/echo-db';
 import { type HasId } from '@dxos/echo-schema';
@@ -50,7 +50,7 @@ export interface FunctionContext {
    */
   space: SpaceAPI | undefined;
 
-  ai: AIServiceClient;
+  ai: AiServiceClient;
 }
 
 export interface FunctionContextAi {

package/src/schema.ts

@@ -4,7 +4,8 @@
 
 import { Schema } from 'effect';
 
-import { EchoObject, JsonSchemaType, LabelAnnotation, Ref, TypedObject } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
+import { JsonSchemaType, LabelAnnotation, Ref } from '@dxos/echo-schema';
 import { DataType } from '@dxos/schema';
 
 /**
@@ -18,22 +19,19 @@ export const ScriptType = Schema.Struct({
   changed: Schema.optional(Schema.Boolean),
   source: Ref(DataType.Text),
 }).pipe(
-  EchoObject({
+  Type.Obj({
     typename: 'dxos.org/type/Script',
     version: '0.1.0',
   }),
   LabelAnnotation.set(['name']),
 );
 
-export type ScriptType = Schema.Schema.Type<typeof ScriptType>;
+export interface ScriptType extends Schema.Schema.Type<typeof ScriptType> {}
 
 /**
  * Function deployment.
  */
-export class FunctionType extends TypedObject({
-  typename: 'dxos.org/type/Function',
-  version: '0.1.0',
-})({
+export const FunctionType = Schema.Struct({
   // TODO(burdon): Rename to id/uri?
   name: Schema.NonEmptyString,
   version: Schema.String,
@@ -49,4 +47,11 @@ export class FunctionType extends TypedObject({
 
   // Local binding to a function name.
   binding: Schema.optional(Schema.String),
-}) {}
+}).pipe(
+  Type.Obj({
+    typename: 'dxos.org/type/Function',
+    version: '0.1.0',
+  }),
+  LabelAnnotation.set(['name']),
+);
+export interface FunctionType extends Schema.Schema.Type<typeof FunctionType> {}

package/src/services/ai.ts

@@ -2,14 +2,31 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Context } from 'effect';
+import { Context, Layer } from 'effect';
 
-import type { AIServiceClient } from '@dxos/ai';
+import type { AiServiceClient } from '@dxos/ai';
 
 // TODO(burdon): Move to @dxos/ai.
 export class AiService extends Context.Tag('AiService')<
   AiService,
   {
-    readonly client: AIServiceClient;
+    readonly client: AiServiceClient;
   }
->() {}
+>() {
+  static make = (client: AiServiceClient): Context.Tag.Service<AiService> => {
+    return {
+      get client() {
+        return client;
+      },
+    };
+  };
+
+  static makeLayer = (client: AiServiceClient): Layer.Layer<AiService> =>
+    Layer.succeed(AiService, AiService.make(client));
+
+  static notAvailable = Layer.succeed(AiService, {
+    get client(): AiServiceClient {
+      throw new Error('AiService not available');
+    },
+  });
+}

package/src/services/database.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Context } from 'effect';
+import { Context, Layer } from 'effect';
 
 import type { EchoDatabase } from '@dxos/echo-db';
 
@@ -11,4 +11,18 @@ export class DatabaseService extends Context.Tag('DatabaseService')<
   {
     readonly db: EchoDatabase;
   }
->() {}
+>() {
+  static notAvailable = Layer.succeed(DatabaseService, {
+    get db(): EchoDatabase {
+      throw new Error('Database not available');
+    },
+  });
+
+  static make = (db: EchoDatabase): Context.Tag.Service<DatabaseService> => {
+    return {
+      get db() {
+        return db;
+      },
+    };
+  };
+}