@dxos/functions 0.8.1 → 0.8.2-main.2f9c567

package/dist/types/src/{types/types.d.ts → types.d.ts}

@@ -1,4 +1,6 @@
-import { S } from '@dxos/echo-schema';
+import { Schema as S } 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.
@@ -79,11 +81,53 @@ export declare const TriggerSchema: S.Union<[S.mutable<S.Struct<{
     queue: S.refine<string, typeof S.NonEmptyString>;
 }>>]>;
 export type TriggerType = S.Schema.Type<typeof TriggerSchema>;
+export type EventType = EmailTriggerOutput | WebhookTriggerOutput | QueueTriggerOutput | SubscriptionTriggerOutput | TimerTriggerOutput;
+export declare const EmailTriggerOutput: S.mutable<S.Struct<{
+    from: typeof S.String;
+    to: typeof S.String;
+    subject: typeof S.String;
+    created: typeof S.String;
+    body: typeof S.String;
+}>>;
+export type EmailTriggerOutput = S.Schema.Type<typeof EmailTriggerOutput>;
+export declare const WebhookTriggerOutput: S.mutable<S.Struct<{
+    url: typeof S.String;
+    method: S.Literal<["GET", "POST"]>;
+    headers: S.Record$<typeof S.String, typeof S.String>;
+    bodyText: typeof S.String;
+}>>;
+export type WebhookTriggerOutput = S.Schema.Type<typeof WebhookTriggerOutput>;
+export declare const QueueTriggerOutput: S.mutable<S.Struct<{
+    queue: S.refine<string, typeof S.NonEmptyString>;
+    item: typeof S.Any;
+    cursor: typeof S.String;
+}>>;
+export type QueueTriggerOutput = S.Schema.Type<typeof QueueTriggerOutput>;
+export declare const SubscriptionTriggerOutput: S.mutable<S.Struct<{
+    type: typeof S.String;
+    changedObjectId: typeof S.String;
+}>>;
+export type SubscriptionTriggerOutput = S.Schema.Type<typeof SubscriptionTriggerOutput>;
+export declare const TimerTriggerOutput: S.mutable<S.Struct<{
+    tick: typeof S.Number;
+}>>;
+export type TimerTriggerOutput = S.Schema.Type<typeof TimerTriggerOutput>;
 /**
  * Function trigger.
+ * Function is invoked with the `payload` passed as input data.
+ * The event that triggers the function is available in the function context.
  */
 export declare const FunctionTriggerSchema: S.Struct<{
-    function: S.optional<S.SchemaClass<string, string, never>>;
+    /**
+     * Function or workflow to invoke.
+     */
+    function: S.optional<S.SchemaClass<Ref<Expando>, import("@dxos/echo-protocol").EncodedReference, never>>;
+    /**
+     * Only used for workflows.
+     * Specifies the input node in the circuit.
+     * @deprecated Remove and enforce a single input node in all compute graphs.
+     */
+    inputNodeId: S.optional<S.SchemaClass<string, string, never>>;
     enabled: S.optional<S.SchemaClass<boolean, boolean, never>>;
     spec: S.optional<S.Union<[S.mutable<S.Struct<{
         type: S.Literal<[TriggerKind.Timer]>;
@@ -108,13 +152,33 @@ export declare const FunctionTriggerSchema: S.Struct<{
         type: S.Literal<[TriggerKind.Queue]>;
         queue: S.refine<string, typeof S.NonEmptyString>;
     }>>]>>;
-    meta: S.optional<S.mutable<S.Record$<typeof S.String, typeof S.Any>>>;
+    /**
+     * Passed as the input data to the function.
+     * Must match the function's input schema.
+     *
+     * @example
+     * {
+     *   item: '{{$.trigger.event}}',
+     *   instructions: 'Summarize and perform entity-extraction'
+     *   mailbox: { '/': 'dxn:echo:AAA:ZZZ' }
+     * }
+     */
+    input: S.optional<S.mutable<S.Record$<typeof S.String, typeof S.Any>>>;
 }>;
 export type FunctionTriggerType = S.Schema.Type<typeof FunctionTriggerSchema>;
-declare const FunctionTrigger_base: import("@dxos/echo-schema").TypedObjectPrototype<import("@dxos/echo-schema").TypedObjectFields<{
-    readonly function: S.optional<S.SchemaClass<string, string, never>>;
-    readonly enabled: S.optional<S.SchemaClass<boolean, boolean, never>>;
-    readonly spec: S.optional<S.Union<[S.mutable<S.Struct<{
+declare const FunctionTrigger_base: import("@dxos/echo-schema").TypedObjectPrototype<import("@dxos/echo-schema").TypedObjectFields<Readonly<{
+    /**
+     * Function or workflow to invoke.
+     */
+    function: S.optional<S.SchemaClass<Ref<Expando>, import("@dxos/echo-protocol").EncodedReference, never>>;
+    /**
+     * Only used for workflows.
+     * Specifies the input node in the circuit.
+     * @deprecated Remove and enforce a single input node in all compute graphs.
+     */
+    inputNodeId: S.optional<S.SchemaClass<string, string, never>>;
+    enabled: S.optional<S.SchemaClass<boolean, boolean, never>>;
+    spec: S.optional<S.Union<[S.mutable<S.Struct<{
         type: S.Literal<[TriggerKind.Timer]>;
         cron: S.SchemaClass<string, string, never>;
     }>>, S.mutable<S.Struct<{
@@ -137,11 +201,31 @@ declare const FunctionTrigger_base: import("@dxos/echo-schema").TypedObjectProto
         type: S.Literal<[TriggerKind.Queue]>;
         queue: S.refine<string, typeof S.NonEmptyString>;
     }>>]>>;
-    readonly meta: S.optional<S.mutable<S.Record$<typeof S.String, typeof S.Any>>>;
-}, import("@dxos/echo-schema").TypedObjectOptions>, S.Struct.Encoded<{
-    readonly function: S.optional<S.SchemaClass<string, string, never>>;
-    readonly enabled: S.optional<S.SchemaClass<boolean, boolean, never>>;
-    readonly spec: S.optional<S.Union<[S.mutable<S.Struct<{
+    /**
+     * Passed as the input data to the function.
+     * Must match the function's input schema.
+     *
+     * @example
+     * {
+     *   item: '{{$.trigger.event}}',
+     *   instructions: 'Summarize and perform entity-extraction'
+     *   mailbox: { '/': 'dxn:echo:AAA:ZZZ' }
+     * }
+     */
+    input: S.optional<S.mutable<S.Record$<typeof S.String, typeof S.Any>>>;
+}>, import("@dxos/echo-schema").TypedObjectOptions>, S.Struct.Encoded<Readonly<{
+    /**
+     * Function or workflow to invoke.
+     */
+    function: S.optional<S.SchemaClass<Ref<Expando>, import("@dxos/echo-protocol").EncodedReference, never>>;
+    /**
+     * Only used for workflows.
+     * Specifies the input node in the circuit.
+     * @deprecated Remove and enforce a single input node in all compute graphs.
+     */
+    inputNodeId: S.optional<S.SchemaClass<string, string, never>>;
+    enabled: S.optional<S.SchemaClass<boolean, boolean, never>>;
+    spec: S.optional<S.Union<[S.mutable<S.Struct<{
         type: S.Literal<[TriggerKind.Timer]>;
         cron: S.SchemaClass<string, string, never>;
     }>>, S.mutable<S.Struct<{
@@ -164,49 +248,76 @@ declare const FunctionTrigger_base: import("@dxos/echo-schema").TypedObjectProto
         type: S.Literal<[TriggerKind.Queue]>;
         queue: S.refine<string, typeof S.NonEmptyString>;
     }>>]>>;
-    readonly meta: S.optional<S.mutable<S.Record$<typeof S.String, typeof S.Any>>>;
-}>>;
+    /**
+     * Passed as the input data to the function.
+     * Must match the function's input schema.
+     *
+     * @example
+     * {
+     *   item: '{{$.trigger.event}}',
+     *   instructions: 'Summarize and perform entity-extraction'
+     *   mailbox: { '/': 'dxn:echo:AAA:ZZZ' }
+     * }
+     */
+    input: S.optional<S.mutable<S.Record$<typeof S.String, typeof S.Any>>>;
+}>>>;
 /**
  * Function trigger.
  */
 export declare class FunctionTrigger extends FunctionTrigger_base {
 }
-declare const FunctionDef_base: import("@dxos/echo-schema").TypedObjectPrototype<import("@dxos/echo-schema").TypedObjectFields<{
-    uri: typeof S.String;
-    description: S.optional<typeof S.String>;
-    route: typeof S.String;
-    handler: typeof S.String;
-}, import("@dxos/echo-schema").TypedObjectOptions>, S.Struct.Encoded<{
-    uri: typeof S.String;
-    description: S.optional<typeof S.String>;
-    route: typeof S.String;
-    handler: typeof S.String;
-}>>;
-/**
- * Function definition.
- * @deprecated (Use dxos.org/type/Function)
- */
-export declare class FunctionDef extends FunctionDef_base {
-}
 /**
  * Function manifest file.
  */
 export declare const FunctionManifestSchema: S.Struct<{
     functions: S.optional<S.mutable<S.Array$<S.Schema<import("@dxos/echo-schema").ExcludeId<import("@dxos/echo-schema").TypedObjectFields<{
-        uri: typeof S.String;
+        name: typeof S.NonEmptyString;
+        version: typeof S.String;
         description: S.optional<typeof S.String>;
-        route: typeof S.String;
-        handler: typeof S.String;
+        source: S.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: S.optional<S.Schema<import("@dxos/echo-schema").JsonSchemaType, import("@dxos/echo-schema").JsonSchemaType, never>>;
+        outputSchema: S.optional<S.Schema<import("@dxos/echo-schema").JsonSchemaType, import("@dxos/echo-schema").JsonSchemaType, never>>;
+        binding: S.optional<typeof S.String>;
     }, import("@dxos/echo-schema").TypedObjectOptions>> & import("@dxos/echo-schema").WithMeta, S.Struct.Encoded<{
-        uri: typeof S.String;
+        name: typeof S.NonEmptyString;
+        version: typeof S.String;
         description: S.optional<typeof S.String>;
-        route: typeof S.String;
-        handler: typeof S.String;
+        source: S.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: S.optional<S.Schema<import("@dxos/echo-schema").JsonSchemaType, import("@dxos/echo-schema").JsonSchemaType, never>>;
+        outputSchema: S.optional<S.Schema<import("@dxos/echo-schema").JsonSchemaType, import("@dxos/echo-schema").JsonSchemaType, never>>;
+        binding: S.optional<typeof S.String>;
     }>, never>>>>;
-    triggers: S.optional<S.mutable<S.Array$<S.Schema<import("@dxos/echo-schema").ExcludeId<import("@dxos/echo-schema").TypedObjectFields<{
-        readonly function: S.optional<S.SchemaClass<string, string, never>>;
-        readonly enabled: S.optional<S.SchemaClass<boolean, boolean, never>>;
-        readonly spec: S.optional<S.Union<[S.mutable<S.Struct<{
+    triggers: S.optional<S.mutable<S.Array$<S.Schema<import("@dxos/echo-schema").ExcludeId<import("@dxos/echo-schema").TypedObjectFields<Readonly<{
+        /**
+         * Function or workflow to invoke.
+         */
+        function: S.optional<S.SchemaClass<Ref<Expando>, import("@dxos/echo-protocol").EncodedReference, never>>;
+        /**
+         * Only used for workflows.
+         * Specifies the input node in the circuit.
+         * @deprecated Remove and enforce a single input node in all compute graphs.
+         */
+        inputNodeId: S.optional<S.SchemaClass<string, string, never>>;
+        enabled: S.optional<S.SchemaClass<boolean, boolean, never>>;
+        spec: S.optional<S.Union<[S.mutable<S.Struct<{
             type: S.Literal<[TriggerKind.Timer]>;
             cron: S.SchemaClass<string, string, never>;
         }>>, S.mutable<S.Struct<{
@@ -229,11 +340,31 @@ export declare const FunctionManifestSchema: S.Struct<{
             type: S.Literal<[TriggerKind.Queue]>;
             queue: S.refine<string, typeof S.NonEmptyString>;
         }>>]>>;
-        readonly meta: S.optional<S.mutable<S.Record$<typeof S.String, typeof S.Any>>>;
-    }, import("@dxos/echo-schema").TypedObjectOptions>> & import("@dxos/echo-schema").WithMeta, S.Struct.Encoded<{
-        readonly function: S.optional<S.SchemaClass<string, string, never>>;
-        readonly enabled: S.optional<S.SchemaClass<boolean, boolean, never>>;
-        readonly spec: S.optional<S.Union<[S.mutable<S.Struct<{
+        /**
+         * Passed as the input data to the function.
+         * Must match the function's input schema.
+         *
+         * @example
+         * {
+         *   item: '{{$.trigger.event}}',
+         *   instructions: 'Summarize and perform entity-extraction'
+         *   mailbox: { '/': 'dxn:echo:AAA:ZZZ' }
+         * }
+         */
+        input: S.optional<S.mutable<S.Record$<typeof S.String, typeof S.Any>>>;
+    }>, import("@dxos/echo-schema").TypedObjectOptions>> & import("@dxos/echo-schema").WithMeta, S.Struct.Encoded<Readonly<{
+        /**
+         * Function or workflow to invoke.
+         */
+        function: S.optional<S.SchemaClass<Ref<Expando>, import("@dxos/echo-protocol").EncodedReference, never>>;
+        /**
+         * Only used for workflows.
+         * Specifies the input node in the circuit.
+         * @deprecated Remove and enforce a single input node in all compute graphs.
+         */
+        inputNodeId: S.optional<S.SchemaClass<string, string, never>>;
+        enabled: S.optional<S.SchemaClass<boolean, boolean, never>>;
+        spec: S.optional<S.Union<[S.mutable<S.Struct<{
             type: S.Literal<[TriggerKind.Timer]>;
             cron: S.SchemaClass<string, string, never>;
         }>>, S.mutable<S.Struct<{
@@ -256,10 +387,21 @@ export declare const FunctionManifestSchema: S.Struct<{
             type: S.Literal<[TriggerKind.Queue]>;
             queue: S.refine<string, typeof S.NonEmptyString>;
         }>>]>>;
-        readonly meta: S.optional<S.mutable<S.Record$<typeof S.String, typeof S.Any>>>;
-    }>, never>>>>;
+        /**
+         * Passed as the input data to the function.
+         * Must match the function's input schema.
+         *
+         * @example
+         * {
+         *   item: '{{$.trigger.event}}',
+         *   instructions: 'Summarize and perform entity-extraction'
+         *   mailbox: { '/': 'dxn:echo:AAA:ZZZ' }
+         * }
+         */
+        input: S.optional<S.mutable<S.Record$<typeof S.String, typeof S.Any>>>;
+    }>>, never>>>>;
 }>;
 export type FunctionManifest = S.Schema.Type<typeof FunctionManifestSchema>;
-export declare const FUNCTION_TYPES: (typeof FunctionTrigger | typeof FunctionDef)[];
+export declare const FUNCTION_TYPES: (typeof FunctionType | typeof FunctionTrigger)[];
 export {};
 //# sourceMappingURL=types.d.ts.map

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

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

package/dist/types/src/{types/url.d.ts → url.d.ts}

@@ -3,6 +3,12 @@ import { type SpaceId } from '@dxos/keys';
 export declare const FUNCTIONS_PRESET_META_KEY = "dxos.org/service/function-preset";
 export declare const getUserFunctionUrlInMetadata: (meta: ObjectMeta) => string | undefined;
 export declare const setUserFunctionUrlInMetadata: (meta: ObjectMeta, functionUrl: string) => void;
+/**
+ * NOTE: functionId is backend ID, not ECHO object id.
+ */
+export declare const makeFunctionUrl: (spaceId: SpaceId, fn: {
+    functionId: string;
+}) => string;
 export declare const getInvocationUrl: (functionUrl: string, edgeUrl: string, options?: InvocationOptions) => string;
 export type InvocationOptions = {
     spaceId?: SpaceId;

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

@@ -0,0 +1 @@
+{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../../src/url.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAK1C,eAAO,MAAM,yBAAyB,qCAAqC,CAAC;AAM5E,eAAO,MAAM,4BAA4B,SAAU,UAAU,uBAE5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,UAAU,eAAe,MAAM,SASjF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,YAAa,OAAO,MAAM;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,WAAmC,CAAC;AAEhH,eAAO,MAAM,gBAAgB,gBAAiB,MAAM,WAAW,MAAM,YAAW,iBAAiB,WAUhG,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.8.1",
+  "version": "0.8.2-main.2f9c567",
   "description": "Functions API and runtime.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -23,16 +23,6 @@
       "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": {
-      "types": "./dist/types/src/types/index.d.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -43,12 +33,6 @@
       ],
       "edge": [
         "dist/types/src/edge/index.d.ts"
-      ],
-      "testing": [
-        "dist/types/src/testing/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
       ]
     }
   },
@@ -61,33 +45,34 @@
     "@preact/signals-core": "^1.6.0",
     "cron": "^3.1.6",
     "cron-schedule": "^5.0.4",
-    "effect": "3.13.3",
+    "effect": "3.14.21",
     "esbuild-wasm": "^0.16.14",
     "express": "^4.19.2",
     "get-port-please": "^3.1.1",
     "iso-did": "^1.6.0",
     "ws": "^8.14.2",
-    "@dxos/async": "0.8.1",
-    "@dxos/client": "0.8.1",
-    "@dxos/context": "0.8.1",
-    "@dxos/crypto": "0.8.1",
-    "@dxos/echo-db": "0.8.1",
-    "@dxos/echo-protocol": "0.8.1",
-    "@dxos/echo-schema": "0.8.1",
-    "@dxos/edge-client": "0.8.1",
-    "@dxos/invariant": "0.8.1",
-    "@dxos/live-object": "0.8.1",
-    "@dxos/keys": "0.8.1",
-    "@dxos/log": "0.8.1",
-    "@dxos/node-std": "0.8.1",
-    "@dxos/protocols": "0.8.1",
-    "@dxos/schema": "0.8.1",
-    "@dxos/util": "0.8.1"
+    "@dxos/assistant": "0.8.2-main.2f9c567",
+    "@dxos/async": "0.8.2-main.2f9c567",
+    "@dxos/client": "0.8.2-main.2f9c567",
+    "@dxos/context": "0.8.2-main.2f9c567",
+    "@dxos/echo-db": "0.8.2-main.2f9c567",
+    "@dxos/echo-schema": "0.8.2-main.2f9c567",
+    "@dxos/echo-protocol": "0.8.2-main.2f9c567",
+    "@dxos/edge-client": "0.8.2-main.2f9c567",
+    "@dxos/crypto": "0.8.2-main.2f9c567",
+    "@dxos/invariant": "0.8.2-main.2f9c567",
+    "@dxos/keys": "0.8.2-main.2f9c567",
+    "@dxos/log": "0.8.2-main.2f9c567",
+    "@dxos/node-std": "0.8.2-main.2f9c567",
+    "@dxos/live-object": "0.8.2-main.2f9c567",
+    "@dxos/protocols": "0.8.2-main.2f9c567",
+    "@dxos/schema": "0.8.2-main.2f9c567",
+    "@dxos/util": "0.8.2-main.2f9c567"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/ws": "^7.4.0",
-    "@dxos/agent": "0.8.1"
+    "@dxos/agent": "0.8.2-main.2f9c567"
   },
   "publishConfig": {
     "access": "public"

package/src/edge/index.ts

@@ -2,4 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
+// NOTE: This module is separate because it uses the edge client.
+//  This means it cannot be used on edge itself.
+// TODO(wittjosiah): Factor out.
+
 export * from './functions';

package/src/handler.ts

@@ -5,14 +5,11 @@
 import { Schema as S } from 'effect';
 import { type Effect } from 'effect';
 
-import { type Client, PublicKey } from '@dxos/client';
-import { type Space, type SpaceId } from '@dxos/client/echo';
-import type { CoreDatabase, EchoDatabase, ReactiveEchoObject } from '@dxos/echo-db';
+import { type AIServiceClient } from '@dxos/assistant';
+import type { CoreDatabase, EchoDatabase } from '@dxos/echo-db';
 import { type HasId } from '@dxos/echo-schema';
-import { type DXN } from '@dxos/keys';
-import { log } from '@dxos/log';
+import { type SpaceId, type DXN } from '@dxos/keys';
 import { type QueryResult } from '@dxos/protocols';
-import { isNonNullable } from '@dxos/util';
 
 // TODO(burdon): Model after http request. Ref Lambda/OpenFaaS.
 // https://docs.aws.amazon.com/lambda/latest/dg/typescript-handler.html
@@ -22,13 +19,18 @@ import { isNonNullable } from '@dxos/util';
 /**
  * Function handler.
  */
-export type FunctionHandler<TData = {}, TMeta = {}, TOutput = any> = (params: {
+export type FunctionHandler<TData = {}, TOutput = any> = (params: {
+  /**
+   * Services and context available to the function.
+   */
   context: FunctionContext;
-  event: FunctionEvent<TData, TMeta>;
+
   /**
-   * @deprecated
+   * Data passed as the input to the function.
+   * Must match the function's input schema.
+   * This will be the payload from the trigger or other data passed into the function in a workflow.
    */
-  response: FunctionResponse;
+  data: TData;
 }) => TOutput | Promise<TOutput> | Effect.Effect<TOutput, any>;
 
 /**
@@ -42,18 +44,7 @@ export interface FunctionContext {
    */
   space: SpaceAPI | undefined;
 
-  ai: FunctionContextAi;
-
-  /**
-   * @deprecated
-   */
-  // TODO(burdon): Limit access to individual space.
-  client: Client;
-  /**
-   * @deprecated
-   */
-  // TODO(burdon): Replace with storage service abstraction.
-  dataDir?: string;
+  ai: AIServiceClient;
 }
 
 export interface FunctionContextAi {
@@ -61,28 +52,6 @@ export interface FunctionContextAi {
   run(model: string, inputs: any, options?: any): Promise<any>;
 }
 
-/**
- * Event payload.
- */
-// TODO(dmaretskyi): Update type definitions to match the actual payload.
-export type FunctionEvent<TData = {}, TMeta = {}> = {
-  data: FunctionEventMeta<TMeta> & TData;
-};
-
-/**
- * Metadata from trigger.
- */
-export type FunctionEventMeta<TMeta = {}> = {
-  meta: TMeta;
-};
-
-/**
- * Function response.
- */
-export type FunctionResponse = {
-  status(code: number): FunctionResponse;
-};
-
 //
 // API.
 //
@@ -108,27 +77,19 @@ export interface SpaceAPI {
   get queues(): QueuesAPI;
 }
 
-// TODO(wittjosiah): Fix this.
 const __assertFunctionSpaceIsCompatibleWithTheClientSpace = () => {
-  // const _: SpaceAPI = {} as Space;
-};
-
-export type FunctionDefinition = {
-  description?: string;
-  inputSchema: S.Schema.AnyNoContext;
-  outputSchema?: S.Schema.AnyNoContext;
-  handler: FunctionHandler<any>;
+  const _: SpaceAPI = {} as SpaceAPI;
 };
 
-export type DefineFunctionParams<T, O = any> = {
+export type FunctionDefinition<T = {}, O = any> = {
   description?: string;
   inputSchema: S.Schema<T, any>;
   outputSchema?: S.Schema<O, any>;
-  handler: FunctionHandler<T, any, O>;
+  handler: FunctionHandler<T, O>;
 };
 
 // TODO(dmaretskyi): Bind input type to function handler.
-export const defineFunction = <T, O>(params: DefineFunctionParams<T, O>): FunctionDefinition => {
+export const defineFunction = <T, O>(params: FunctionDefinition<T, O>): FunctionDefinition<T, O> => {
   if (!S.isSchema(params.inputSchema)) {
     throw new Error('Input schema must be a valid schema');
   }
@@ -143,67 +104,3 @@ export const defineFunction = <T, O>(params: DefineFunctionParams<T, O>): Functi
     handler: params.handler,
   };
 };
-
-//
-// Subscription utils.
-//
-
-export type RawSubscriptionData = {
-  spaceKey?: string;
-  objects?: string[];
-};
-
-export type SubscriptionData = {
-  space?: Space;
-  objects?: ReactiveEchoObject<any>[];
-};
-
-/**
- * Handler wrapper for subscription events; extracts space and objects.
- *
- * To test:
- * ```
- * curl -s -X POST -H "Content-Type: application/json" --data '{"space": "0446...1cbb"}' http://localhost:7100/dev/email-extractor
- * ```
- *
- * NOTE: Get space key from devtools or `dx space list --json`
- */
-// TODO(burdon): Evolve into plugin definition like Composer.
-export const subscriptionHandler = <TMeta>(
-  handler: FunctionHandler<SubscriptionData, TMeta>,
-  types?: S.Schema.AnyNoContext[],
-): FunctionHandler<RawSubscriptionData, TMeta> => {
-  return async ({ event: { data }, context, response, ...rest }) => {
-    const { client } = context;
-    const space = data.spaceKey ? client.spaces.get(PublicKey.from(data.spaceKey)) : undefined;
-    if (!space) {
-      log.error('Invalid space');
-      return response.status(500);
-    }
-
-    registerTypes(space, types);
-    const objects = space
-      ? data.objects
-          ?.map<ReactiveEchoObject<any> | undefined>((id) => space!.db.getObjectById(id))
-          .filter(isNonNullable)
-      : [];
-
-    if (!!data.spaceKey && !space) {
-      log.warn('invalid space', { data });
-    } else {
-      log.info('handler', { space: space?.key.truncate(), objects: objects?.length });
-    }
-
-    return handler({ event: { data: { ...data, space, objects } }, context, response, ...rest });
-  };
-};
-
-// TODO(burdon): Evolve types as part of function metadata.
-const registerTypes = (space: Space, types: S.Schema.AnyNoContext[] = []) => {
-  const registry = space.db.graph.schemaRegistry;
-  for (const type of types) {
-    if (!registry.hasSchema(type)) {
-      registry.addSchema([type]);
-    }
-  }
-};

package/src/index.ts

@@ -1,10 +1,9 @@
 //
-// Copyright 2023 DXOS.org
+// Copyright 2024 DXOS.org
 //
 
-export * from './edge';
-export * from './function';
 export * from './handler';
-// export * from './runtime';
-export * from './trigger';
+export * from './schema';
+export * from './trace';
 export * from './types';
+export * from './url';