@dxos/functions 0.5.3-main.37bbd91 → 0.5.3-main.3b535c7

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

@@ -1,13 +1,20 @@
-import { S } from '@dxos/echo-schema';
-/**
- * Type discriminator for TriggerSpec.
- * Every spec has a type field of type FunctionTriggerType that we can use to understand which
- * type we're working with.
- * https://www.typescriptlang.org/docs/handbook/2/narrowing.html#discriminated-unions
- */
-export type FunctionTriggerType = 'subscription' | 'timer' | 'webhook' | 'websocket';
+import * as S from '@effect/schema/Schema';
+declare const TimerTriggerSchema: S.struct<{
+    cron: S.$string;
+}>;
+declare const WebhookTriggerSchema: S.struct<{
+    port: S.$number;
+}>;
+declare const WebsocketTriggerSchema: S.struct<{
+    url: S.$string;
+    init: S.PropertySignature<"?:", {
+        readonly [x: string]: any;
+    } | undefined, never, "?:", {
+        readonly [x: string]: any;
+    } | undefined, never>;
+}>;
 declare const SubscriptionTriggerSchema: S.struct<{
-    type: S.literal<["subscription"]>;
+    spaceKey: S.PropertySignature<"?:", string | undefined, never, "?:", string | undefined, never>;
     filter: S.array<S.struct<{
         type: S.$string;
         props: S.PropertySignature<"?:", {
@@ -24,178 +31,129 @@ declare const SubscriptionTriggerSchema: S.struct<{
         readonly delay?: number | undefined;
     } | undefined, never>;
 }>;
-export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
-declare const TimerTriggerSchema: S.struct<{
-    type: S.literal<["timer"]>;
-    cron: S.$string;
-}>;
-export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
-declare const WebhookTriggerSchema: S.mutable<S.struct<{
-    type: S.literal<["webhook"]>;
-    method: S.$string;
-    port: S.PropertySignature<"?:", number | undefined, never, "?:", number | undefined, never>;
-}>>;
-export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
-declare const WebsocketTriggerSchema: S.struct<{
-    type: S.literal<["websocket"]>;
-    url: S.$string;
-    init: S.PropertySignature<"?:", {
-        readonly [x: string]: any;
+declare const FunctionTriggerSchema: S.struct<{
+    function: S.$string;
+    timer: S.PropertySignature<"?:", {
+        readonly cron: string;
     } | undefined, never, "?:", {
-        readonly [x: string]: any;
+        readonly cron: string;
     } | undefined, never>;
-}>;
-export type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;
-export type TriggerSpec = TimerTrigger | WebhookTrigger | WebsocketTrigger | SubscriptionTrigger;
-declare const FunctionDef_base: import("@dxos/echo-schema").EchoSchemaClass<{
-    handler: string;
-    uri: string;
-    description?: string | undefined;
-    route: string;
-} & {
-    id: string;
-}>;
-/**
- * Function definition.
- */
-export declare class FunctionDef extends FunctionDef_base {
-}
-declare const FunctionTrigger_base: import("@dxos/echo-schema").EchoSchemaClass<{
-    function: string;
-    meta?: object | undefined;
-    spec: {
+    webhook: S.PropertySignature<"?:", {
+        readonly port: number;
+    } | undefined, never, "?:", {
+        readonly port: number;
+    } | undefined, never>;
+    websocket: S.PropertySignature<"?:", {
+        readonly url: string;
+        readonly init?: {
+            readonly [x: string]: any;
+        } | undefined;
+    } | undefined, never, "?:", {
+        readonly url: string;
+        readonly init?: {
+            readonly [x: string]: any;
+        } | undefined;
+    } | undefined, never>;
+    subscription: S.PropertySignature<"?:", {
         readonly filter: readonly {
             readonly type: string;
             readonly props?: {
                 readonly [x: string]: any;
             } | undefined;
         }[];
-        readonly type: "subscription";
+        readonly spaceKey?: string | undefined;
         readonly options?: {
             readonly deep?: boolean | undefined;
             readonly delay?: number | undefined;
         } | undefined;
-    } | {
-        readonly type: "timer";
-        readonly cron: string;
-    } | {
-        port?: number | undefined;
-        type: "webhook";
-        method: string;
-    } | {
-        readonly type: "websocket";
-        readonly url: string;
-        readonly init?: {
-            readonly [x: string]: any;
+    } | undefined, never, "?:", {
+        readonly filter: readonly {
+            readonly type: string;
+            readonly props?: {
+                readonly [x: string]: any;
+            } | undefined;
+        }[];
+        readonly spaceKey?: string | undefined;
+        readonly options?: {
+            readonly deep?: boolean | undefined;
+            readonly delay?: number | undefined;
         } | undefined;
-    };
-} & {
-    id: string;
+    } | undefined, never>;
+}>;
+export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
+export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
+export type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;
+export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
+export type FunctionTrigger = S.Schema.Type<typeof FunctionTriggerSchema>;
+/**
+ * Function definition.
+ */
+declare const FunctionDefSchema: S.struct<{
+    id: S.$string;
+    description: S.PropertySignature<"?:", string | undefined, never, "?:", string | undefined, never>;
+    name: S.$string;
+    handler: S.$string;
 }>;
-export declare class FunctionTrigger extends FunctionTrigger_base {
-}
+export type FunctionDef = S.Schema.Type<typeof FunctionDefSchema>;
 /**
  * Function manifest file.
  */
 export declare const FunctionManifestSchema: S.struct<{
-    functions: S.PropertySignature<"?:", ({
-        handler: string;
-        uri: string;
-        description?: string | undefined;
-        route: string;
-    } & {
-        "@meta"?: {
-            readonly keys: {
-                readonly id: string;
-                readonly source: string;
-            }[];
-        } | undefined;
-    })[] | undefined, never, "?:", ({
-        handler: string;
-        uri: string;
-        description?: string | undefined;
-        route: string;
-    } & {
-        "@meta"?: {
-            readonly keys: {
-                readonly id: string;
-                readonly source: string;
-            }[];
-        } | undefined;
-    })[] | undefined, never>;
-    triggers: S.PropertySignature<"?:", ({
-        function: string;
-        meta?: object | undefined;
-        spec: {
+    functions: S.mutable<S.array<S.struct<{
+        id: S.$string;
+        description: S.PropertySignature<"?:", string | undefined, never, "?:", string | undefined, never>;
+        name: S.$string;
+        handler: S.$string;
+    }>>>;
+    triggers: S.mutable<S.array<S.struct<{
+        function: S.$string;
+        timer: S.PropertySignature<"?:", {
+            readonly cron: string;
+        } | undefined, never, "?:", {
+            readonly cron: string;
+        } | undefined, never>;
+        webhook: S.PropertySignature<"?:", {
+            readonly port: number;
+        } | undefined, never, "?:", {
+            readonly port: number;
+        } | undefined, never>;
+        websocket: S.PropertySignature<"?:", {
+            readonly url: string;
+            readonly init?: {
+                readonly [x: string]: any;
+            } | undefined;
+        } | undefined, never, "?:", {
+            readonly url: string;
+            readonly init?: {
+                readonly [x: string]: any;
+            } | undefined;
+        } | undefined, never>;
+        subscription: S.PropertySignature<"?:", {
             readonly filter: readonly {
                 readonly type: string;
                 readonly props?: {
                     readonly [x: string]: any;
                 } | undefined;
             }[];
-            readonly type: "subscription";
+            readonly spaceKey?: string | undefined;
             readonly options?: {
                 readonly deep?: boolean | undefined;
                 readonly delay?: number | undefined;
             } | undefined;
-        } | {
-            readonly type: "timer";
-            readonly cron: string;
-        } | {
-            port?: number | undefined;
-            type: "webhook";
-            method: string;
-        } | {
-            readonly type: "websocket";
-            readonly url: string;
-            readonly init?: {
-                readonly [x: string]: any;
-            } | undefined;
-        };
-    } & {
-        "@meta"?: {
-            readonly keys: {
-                readonly id: string;
-                readonly source: string;
-            }[];
-        } | undefined;
-    })[] | undefined, never, "?:", ({
-        function: string;
-        meta?: object | undefined;
-        spec: {
+        } | undefined, never, "?:", {
             readonly filter: readonly {
                 readonly type: string;
                 readonly props?: {
                     readonly [x: string]: any;
                 } | undefined;
             }[];
-            readonly type: "subscription";
+            readonly spaceKey?: string | undefined;
             readonly options?: {
                 readonly deep?: boolean | undefined;
                 readonly delay?: number | undefined;
             } | undefined;
-        } | {
-            readonly type: "timer";
-            readonly cron: string;
-        } | {
-            port?: number | undefined;
-            type: "webhook";
-            method: string;
-        } | {
-            readonly type: "websocket";
-            readonly url: string;
-            readonly init?: {
-                readonly [x: string]: any;
-            } | undefined;
-        };
-    } & {
-        "@meta"?: {
-            readonly keys: {
-                readonly id: string;
-                readonly source: string;
-            }[];
-        } | undefined;
-    })[] | undefined, never>;
+        } | undefined, never>;
+    }>>>;
 }>;
 export type FunctionManifest = S.Schema.Type<typeof FunctionManifestSchema>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAa,CAAC,EAAe,MAAM,mBAAmB,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC;AAErF,QAAA,MAAM,yBAAyB;;;;;;;;;;;;;;;;;EAiB7B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAElF,QAAA,MAAM,kBAAkB;;;EAGtB,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE,QAAA,MAAM,oBAAoB;;;;GAOzB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAExE,QAAA,MAAM,sBAAsB;;;;;;;;EAI1B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAS5E,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG,cAAc,GAAG,gBAAgB,GAAG,mBAAmB,CAAC;;;;;;;;;AAEjG;;GAEG;AACH,qBAAa,WAAY,SAAQ,gBAS/B;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,eAAgB,SAAQ,oBAQnC;CAAG;AAEL;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,uBAAuB,CAAC;AAE3C,QAAA,MAAM,kBAAkB;;EAEtB,CAAC;AAEH,QAAA,MAAM,oBAAoB;;EAExB,CAAC;AAEH,QAAA,MAAM,sBAAsB;;;;;;;EAG1B,CAAC;AAEH,QAAA,MAAM,yBAAyB;;;;;;;;;;;;;;;;;EAiB7B,CAAC;AAEH,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOzB,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;AACpE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACxE,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAC5E,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAClF,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAE1E;;GAEG;AAEH,QAAA,MAAM,iBAAiB;;;;;EAMrB,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dxos/functions",
-  "version": "0.5.3-main.37bbd91",
-  "description": "Functions API and runtime.",
+  "version": "0.5.3-main.3b535c7",
+  "description": "Functions SDK and runtime.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
@@ -10,58 +10,40 @@
     ".": {
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node/index.cjs",
-      "default": "./dist/lib/node/index.cjs",
-      "types": "./dist/types/src/index.d.ts"
-    },
-    "./types": {
-      "browser": "./dist/lib/browser/types.mjs",
-      "node": "./dist/lib/node/types.cjs",
-      "default": "./dist/lib/node/types.cjs",
-      "types": "./dist/types/src/types.d.ts"
+      "default": "./dist/lib/node/index.cjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "schema",
     "src"
   ],
   "dependencies": {
+    "@effect/schema": "0.64.7",
     "@preact/signals-core": "^1.6.0",
     "cron": "^3.1.6",
-    "effect": "^2.4.19",
     "express": "^4.19.2",
     "get-port-please": "^3.1.1",
     "ws": "^8.14.2",
-    "@braneframe/types": "0.5.3-main.37bbd91",
-    "@dxos/client": "0.5.3-main.37bbd91",
-    "@dxos/async": "0.5.3-main.37bbd91",
-    "@dxos/context": "0.5.3-main.37bbd91",
-    "@dxos/echo-db": "0.5.3-main.37bbd91",
-    "@dxos/invariant": "0.5.3-main.37bbd91",
-    "@dxos/echo-schema": "0.5.3-main.37bbd91",
-    "@dxos/keys": "0.5.3-main.37bbd91",
-    "@dxos/log": "0.5.3-main.37bbd91",
-    "@dxos/node-std": "0.5.3-main.37bbd91",
-    "@dxos/util": "0.5.3-main.37bbd91",
-    "@dxos/protocols": "0.5.3-main.37bbd91"
+    "@braneframe/types": "0.5.3-main.3b535c7",
+    "@dxos/async": "0.5.3-main.3b535c7",
+    "@dxos/context": "0.5.3-main.3b535c7",
+    "@dxos/client": "0.5.3-main.3b535c7",
+    "@dxos/invariant": "0.5.3-main.3b535c7",
+    "@dxos/echo-schema": "0.5.3-main.3b535c7",
+    "@dxos/log": "0.5.3-main.3b535c7",
+    "@dxos/node-std": "0.5.3-main.3b535c7",
+    "@dxos/util": "0.5.3-main.3b535c7"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
-    "@types/ws": "^7.4.0",
-    "@dxos/agent": "0.5.3-main.37bbd91"
+    "@types/ws": "^7.4.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "gen-schema": "ts-node ./tools/schema.ts"
+    "schema": "ts-node ./tools/schema.ts"
   }
 }