spectrum-ts 0.2.1 → 0.3.0

package/dist/providers/whatsapp-business/index.js

@@ -1,9 +1,14 @@
 import {
+  asAttachment
+} from "../../chunk-ZRSCHSLZ.js";
+import {
+  asCustom,
   stream
-} from "../../chunk-3TBRO2J7.js";
+} from "../../chunk-V2PK557T.js";
 import {
+  asText,
   definePlatform
-} from "../../chunk-LIRM7SBA.js";
+} from "../../chunk-XEEDIGVK.js";
 
 // src/providers/whatsapp-business/index.ts
 import {
@@ -24,67 +29,33 @@ var toMessage = async (client, msg) => {
 var mapContent = async (client, content) => {
   switch (content.type) {
     case "text":
-      return [{ type: "plain_text", text: content.body }];
+      return asText(content.body);
     case "image":
     case "video":
     case "audio":
     case "document":
-      return [await downloadMedia(client, content.media)];
+      return downloadMedia(client, content.media);
     case "sticker":
-      return [
-        {
-          type: "custom",
-          raw: { whatsapp_type: "sticker", ...content.sticker }
-        }
-      ];
+      return asCustom({ whatsapp_type: "sticker", ...content.sticker });
     case "location":
-      return [
-        {
-          type: "custom",
-          raw: { whatsapp_type: "location", ...content.location }
-        }
-      ];
+      return asCustom({ whatsapp_type: "location", ...content.location });
     case "contacts":
-      return [
-        {
-          type: "custom",
-          raw: { whatsapp_type: "contacts", contacts: content.contacts }
-        }
-      ];
+      return asCustom({
+        whatsapp_type: "contacts",
+        contacts: content.contacts
+      });
     case "reaction":
-      return [
-        {
-          type: "custom",
-          raw: { whatsapp_type: "reaction", ...content.reaction }
-        }
-      ];
+      return asCustom({ whatsapp_type: "reaction", ...content.reaction });
     case "interactive":
-      return [
-        {
-          type: "custom",
-          raw: { whatsapp_type: "interactive", ...content.interactive }
-        }
-      ];
+      return asCustom({ whatsapp_type: "interactive", ...content.interactive });
     case "button":
-      return [
-        {
-          type: "custom",
-          raw: { whatsapp_type: "button", ...content.button }
-        }
-      ];
+      return asCustom({ whatsapp_type: "button", ...content.button });
     case "order":
-      return [
-        { type: "custom", raw: { whatsapp_type: "order", ...content.order } }
-      ];
+      return asCustom({ whatsapp_type: "order", ...content.order });
     case "system":
-      return [
-        {
-          type: "custom",
-          raw: { whatsapp_type: "system", ...content.system }
-        }
-      ];
+      return asCustom({ whatsapp_type: "system", ...content.system });
     default:
-      return [{ type: "custom", raw: { whatsapp_type: "unknown" } }];
+      return asCustom({ whatsapp_type: "unknown" });
   }
 };
 var downloadMedia = async (client, media) => {
@@ -95,21 +66,17 @@ var downloadMedia = async (client, media) => {
       throw new Error(`Media download failed: ${response.status}`);
     }
     const data = Buffer.from(await response.arrayBuffer());
-    return {
-      type: "attachment",
+    return asAttachment({
       data,
       mimeType: media.mimeType,
       name: media.filename ?? `media-${media.id}`
-    };
+    });
   } catch {
-    return {
-      type: "custom",
-      raw: {
-        whatsapp_type: "media_error",
-        mediaId: media.id,
-        mimeType: media.mimeType
-      }
-    };
+    return asCustom({
+      whatsapp_type: "media_error",
+      mediaId: media.id,
+      mimeType: media.mimeType
+    });
   }
 };
 var mimeToMediaType = (mimeType) => {
@@ -145,7 +112,7 @@ var messages = (client) => {
 };
 var send = async (client, spaceId, content) => {
   switch (content.type) {
-    case "plain_text":
+    case "text":
       await client.messages.send({ to: spaceId, text: content.text });
       break;
     case "attachment": {
@@ -174,7 +141,7 @@ var reactToMessage = async (client, spaceId, messageId, reaction) => {
 };
 var replyToMessage = async (client, spaceId, messageId, content) => {
   switch (content.type) {
-    case "plain_text":
+    case "text":
       await client.messages.send({
         to: spaceId,
         replyTo: messageId,
@@ -254,10 +221,7 @@ var whatsappBusiness = definePlatform("WhatsApp Business", {
   },
   actions: {
     send: async ({ space, content, client }) => {
-      const wa = client;
-      for (const item of content) {
-        await send(wa, space.id, item);
-      }
+      await send(client, space.id, content);
     },
     reactToMessage: async ({ space, messageId, reaction, client }) => {
       await reactToMessage(
@@ -268,10 +232,12 @@ var whatsappBusiness = definePlatform("WhatsApp Business", {
       );
     },
     replyToMessage: async ({ space, messageId, content, client }) => {
-      const wa = client;
-      for (const item of content) {
-        await replyToMessage(wa, space.id, messageId, item);
-      }
+      await replyToMessage(
+        client,
+        space.id,
+        messageId,
+        content
+      );
     }
   }
 });

package/dist/{types-DQE0dQT4.d.ts → types-DuE2hXuJ.d.ts}

@@ -1,13 +1,12 @@
 import { Pipe, Tuples, Fn } from 'hotscript';
 import z__default from 'zod';
-import { NonEmptyString } from 'type-fest';
 
 declare const contentSchema: z__default.ZodDiscriminatedUnion<[z__default.ZodObject<{
-    type: z__default.ZodLiteral<"plain_text">;
+    type: z__default.ZodLiteral<"text">;
     text: z__default.ZodString;
 }, z__default.core.$strip>, z__default.ZodObject<{
     type: z__default.ZodLiteral<"custom">;
-    raw: z__default.ZodJSONSchema;
+    raw: z__default.ZodUnknown;
 }, z__default.core.$strip>, z__default.ZodObject<{
     type: z__default.ZodLiteral<"attachment">;
     data: z__default.ZodCustom<Buffer<ArrayBufferLike>, Buffer<ArrayBufferLike>>;
@@ -18,18 +17,13 @@ type Content = z__default.infer<typeof contentSchema>;
 interface ContentBuilder {
     build(): Promise<Content>;
 }
-declare function text<T extends string>(text: NonEmptyString<T>): ContentBuilder;
-declare function custom(raw: z__default.infer<ReturnType<typeof z__default.json>>): ContentBuilder;
-declare function attachment(input: string | Buffer, options?: {
-    mimeType?: string;
-    name?: string;
-}): ContentBuilder;
+type ContentInput = string | ContentBuilder;
 
 interface Space<_Def = unknown> {
     readonly __platform: string;
     readonly id: string;
     responding<T>(fn: () => T | Promise<T>): Promise<T>;
-    send(...content: [ContentBuilder, ...ContentBuilder[]]): Promise<void>;
+    send(...content: [ContentInput, ...ContentInput[]]): Promise<void>;
     startTyping(): Promise<void>;
     stopTyping(): Promise<void>;
 }
@@ -40,11 +34,11 @@ interface User {
 }
 
 interface Message<TPlatform extends string = string, TSender extends User = User, TSpace extends Space = Space> {
-    content: Content[];
+    content: Content;
     readonly id: string;
     platform: TPlatform;
     react(reaction: string): Promise<void>;
-    reply(...content: [ContentBuilder, ...ContentBuilder[]]): Promise<void>;
+    reply(...content: [ContentInput, ...ContentInput[]]): Promise<void>;
     sender: TSender;
     space: TSpace;
     timestamp: Date;
@@ -66,7 +60,7 @@ type EventProducer<TPayload = unknown, TClient = unknown, TConfig = unknown> = (
 }) => AsyncIterable<TPayload>;
 type ProviderMessage<TSender extends ResolvedUser = ResolvedUser, TSpace extends ResolvedSpace = ResolvedSpace, TExtra extends object = Record<never, never>> = {
     id: string;
-    content: Content[];
+    content: Content;
     sender: TSender;
     space: TSpace;
     timestamp?: Date;
@@ -83,7 +77,7 @@ interface PlatformDef<_Name extends string = string, _ConfigSchema extends z__de
     actions: {
         send: (_: {
             space: _ResolvedSpace & SpaceRef;
-            content: Content[];
+            content: Content;
             client: _Client;
             config: z__default.infer<_ConfigSchema>;
         }) => Promise<void>;
@@ -107,7 +101,7 @@ interface PlatformDef<_Name extends string = string, _ConfigSchema extends z__de
         replyToMessage?: (_: {
             space: _ResolvedSpace & SpaceRef;
             messageId: string;
-            content: Content[];
+            content: Content;
             client: _Client;
             config: z__default.infer<_ConfigSchema>;
         }) => Promise<void>;
@@ -258,4 +252,4 @@ interface Platform<Def extends AnyPlatformDef> {
     (message: Message): PlatformMessage<Def>;
 }
 
-export { type AnyPlatformDef as A, type CustomEventStreams as C, type EventProducer as E, type Message as M, type ProviderMessage as P, type SpectrumLike as S, type User as U, type PlatformDef as a, type Platform as b, type PlatformProviderConfig as c, type Space as d, type ContentBuilder as e, type Content as f, type PlatformInstance as g, type PlatformMessage as h, type PlatformSpace as i, type PlatformUser as j, type SchemaMessage as k, attachment as l, custom as m, text as t };
+export type { AnyPlatformDef as A, ContentBuilder as C, EventProducer as E, Message as M, ProviderMessage as P, SpectrumLike as S, User as U, ContentInput as a, Content as b, PlatformDef as c, Platform as d, PlatformProviderConfig as e, CustomEventStreams as f, Space as g, PlatformInstance as h, PlatformMessage as i, PlatformSpace as j, PlatformUser as k, SchemaMessage as l };

package/package.json

@@ -1,56 +1,33 @@
 {
   "name": "spectrum-ts",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist",
-    "src"
+    "dist"
   ],
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "bun": "./src/index.ts",
       "default": "./dist/index.js"
     },
-    "./providers/imessage": {
-      "types": "./dist/providers/imessage/index.d.ts",
-      "bun": "./src/providers/imessage/index.ts",
-      "default": "./dist/providers/imessage/index.js"
-    },
-    "./providers/terminal": {
-      "types": "./dist/providers/terminal/index.d.ts",
-      "bun": "./src/providers/terminal/index.ts",
-      "default": "./dist/providers/terminal/index.js"
-    },
-    "./providers/whatsapp-business": {
-      "types": "./dist/providers/whatsapp-business/index.d.ts",
-      "bun": "./src/providers/whatsapp-business/index.ts",
-      "default": "./dist/providers/whatsapp-business/index.js"
+    "./providers/*": {
+      "types": "./dist/providers/*/index.d.ts",
+      "default": "./dist/providers/*/index.js"
     }
   },
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch"
-  },
   "dependencies": {
     "@photon-ai/advanced-imessage": "^0.4.2",
     "@photon-ai/whatsapp-business": "^0.1.1",
-    "@photon-ai/imessage-kit": "^2.1.2",
+    "@photon-ai/imessage-kit": "^3.0.0-rc.1",
     "@repeaterjs/repeater": "^3.0.6",
     "better-grpc": "^0.3.2",
     "mime-types": "^3.0.1",
     "type-fest": "^5.4.1",
     "zod": "^4.2.1"
   },
-  "devDependencies": {
-    "@types/bun": "latest",
-    "@types/mime-types": "^3.0.1",
-    "hotscript": "^1.0.13",
-    "tsup": "^8.4.0"
-  },
   "peerDependencies": {
     "typescript": "^5"
   },

package/src/index.ts

@@ -1,38 +0,0 @@
-// biome-ignore lint/performance/noBarrelFile: library entry point
-export { definePlatform } from "./platform/define";
-export type {
-  AnyPlatformDef,
-  EventProducer,
-  Platform,
-  PlatformDef,
-  PlatformInstance,
-  PlatformMessage,
-  PlatformProviderConfig,
-  PlatformSpace,
-  PlatformUser,
-  SchemaMessage,
-} from "./platform/types";
-export { Spectrum, type SpectrumInstance } from "./spectrum";
-export {
-  attachment,
-  type Content,
-  type ContentBuilder,
-  custom,
-  text,
-} from "./types/content";
-export type { Message } from "./types/message";
-export type { Space } from "./types/space";
-export type { User } from "./types/user";
-export type {
-  CloudPlatform,
-  DedicatedTokenData,
-  ImessageInfoData,
-  PlatformStatus,
-  PlatformsData,
-  SharedTokenData,
-  SubscriptionData,
-  SubscriptionStatus,
-  TokenData,
-} from "./utils/cloud";
-export { cloud, SpectrumCloudError } from "./utils/cloud";
-export { type ManagedStream, mergeStreams, stream } from "./utils/stream";

package/src/platform/define.ts

@@ -1,308 +0,0 @@
-import type z from "zod";
-import type { ContentBuilder } from "../types/content";
-import type { Message } from "../types/message";
-import type { Space } from "../types/space";
-import type {
-  AnyPlatformDef,
-  Platform,
-  PlatformDef,
-  PlatformInstance,
-  PlatformMessage,
-  PlatformProviderConfig,
-  PlatformSpace,
-  PlatformUser,
-  ProviderMessage,
-  SpectrumLike,
-} from "./types";
-
-function createPlatformInstance<
-  Def extends AnyPlatformDef,
-  _Client,
-  _ConfigSchema extends z.ZodType<object>,
->(
-  def: Def,
-  runtime: { client: unknown; config: unknown }
-): PlatformInstance<Def> {
-  const isPlatformUser = (value: unknown): value is PlatformUser<Def> => {
-    return (
-      typeof value === "object" &&
-      value !== null &&
-      "__platform" in value &&
-      (value as { __platform?: unknown }).__platform === def.name
-    );
-  };
-
-  const normalizeSpaceArgs = (
-    args: unknown[]
-  ): { users: PlatformUser<Def>[]; params: unknown } => {
-    if (args.length === 0) {
-      return { users: [], params: undefined };
-    }
-
-    const [first, ...rest] = args;
-    if (Array.isArray(first)) {
-      return {
-        users: first as PlatformUser<Def>[],
-        params: rest[0],
-      };
-    }
-
-    if (!isPlatformUser(first)) {
-      return {
-        users: [],
-        params: first,
-      };
-    }
-
-    const last = args.at(-1);
-    if (last !== undefined && !isPlatformUser(last)) {
-      return {
-        users: args.slice(0, -1) as PlatformUser<Def>[],
-        params: last,
-      };
-    }
-
-    return {
-      users: args as PlatformUser<Def>[],
-      params: undefined,
-    };
-  };
-
-  const base = {
-    async user(userID: string) {
-      const resolved = await def.user.resolve({
-        input: { userID },
-        client: runtime.client as _Client,
-        config: runtime.config as z.infer<_ConfigSchema>,
-      });
-      return {
-        ...resolved,
-        __platform: def.name,
-      } as PlatformUser<Def>;
-    },
-
-    async space(...args: unknown[]) {
-      const { users, params } = normalizeSpaceArgs(args);
-      let parsedParams = params;
-      if (params !== undefined && def.space.params) {
-        parsedParams = def.space.params.parse(params);
-      }
-      const resolved = await def.space.resolve({
-        input: { users, params: parsedParams },
-        client: runtime.client as _Client,
-        config: runtime.config as z.infer<_ConfigSchema>,
-      });
-      const parsedSpace = def.space.schema
-        ? def.space.schema.parse(resolved)
-        : resolved;
-      const spaceRef = {
-        id: parsedSpace.id,
-        __platform: def.name,
-      };
-      const typingCtx = {
-        space: spaceRef,
-        client: runtime.client as _Client,
-        config: runtime.config as z.infer<_ConfigSchema>,
-      };
-      return {
-        ...parsedSpace,
-        ...spaceRef,
-        send: async (...content: [ContentBuilder, ...ContentBuilder[]]) => {
-          const built = await Promise.all(content.map((c) => c.build()));
-          await def.actions.send({
-            ...typingCtx,
-            content: built,
-          });
-        },
-        startTyping: async () => {
-          await def.actions.startTyping?.(typingCtx);
-        },
-        stopTyping: async () => {
-          await def.actions.stopTyping?.(typingCtx);
-        },
-        responding: async <T>(fn: () => T | Promise<T>): Promise<T> => {
-          await def.actions.startTyping?.(typingCtx);
-          try {
-            return await fn();
-          } finally {
-            await def.actions.stopTyping?.(typingCtx).catch(() => {});
-          }
-        },
-      } as PlatformSpace<Def>;
-    },
-  };
-
-  // Add flat event properties for custom events (non-messages)
-  const eventProperties: Record<string, AsyncIterable<unknown>> = {};
-  for (const eventName of Object.keys(def.events)) {
-    if (eventName === "messages") {
-      continue;
-    }
-    const producer = def.events[eventName] as
-      | ((ctx: { client: unknown; config: unknown }) => AsyncIterable<unknown>)
-      | undefined;
-    if (producer) {
-      eventProperties[eventName] = producer({
-        client: runtime.client,
-        config: runtime.config,
-      });
-    }
-  }
-
-  return Object.assign(base, eventProperties) as PlatformInstance<Def>;
-}
-
-export function definePlatform<
-  _Name extends string,
-  _ConfigSchema extends z.ZodType<object>,
-  _UserSchema extends z.ZodType<object> | undefined,
-  _SpaceSchema extends z.ZodType<object> | undefined,
-  _SpaceParamsSchema extends z.ZodType<object> | undefined,
-  _Client,
-  _ResolvedUser extends { id: string },
-  _ResolvedSpace extends { id: string },
-  _MessageSchema extends z.ZodType<object> | undefined = undefined,
-  _MessageType extends ProviderMessage<
-    _ResolvedUser,
-    _ResolvedSpace,
-    _MessageSchema extends z.ZodType<object>
-      ? z.infer<_MessageSchema>
-      : Record<never, never>
-  > = ProviderMessage<
-    _ResolvedUser,
-    _ResolvedSpace,
-    _MessageSchema extends z.ZodType<object>
-      ? z.infer<_MessageSchema>
-      : Record<never, never>
-  >,
-  _Events extends {
-    messages: (ctx: {
-      client: _Client;
-      config: z.infer<_ConfigSchema>;
-    }) => AsyncIterable<_MessageType>;
-  } = {
-    messages: (ctx: {
-      client: _Client;
-      config: z.infer<_ConfigSchema>;
-    }) => AsyncIterable<_MessageType>;
-  },
-  _Static extends Record<string, unknown> = Record<never, never>,
->(
-  name: _Name,
-  def: Omit<
-    PlatformDef<
-      _Name,
-      _ConfigSchema,
-      _UserSchema,
-      _SpaceSchema,
-      _SpaceParamsSchema,
-      _Client,
-      _ResolvedUser,
-      _ResolvedSpace,
-      _MessageSchema,
-      _MessageType,
-      _Events
-    >,
-    "name"
-  > & { static?: _Static }
-): Platform<
-  PlatformDef<
-    _Name,
-    _ConfigSchema,
-    _UserSchema,
-    _SpaceSchema,
-    _SpaceParamsSchema,
-    _Client,
-    _ResolvedUser,
-    _ResolvedSpace,
-    _MessageSchema,
-    _MessageType,
-    _Events
-  >
-> &
-  Readonly<_Static> {
-  type Def = PlatformDef<
-    _Name,
-    _ConfigSchema,
-    _UserSchema,
-    _SpaceSchema,
-    _SpaceParamsSchema,
-    _Client,
-    _ResolvedUser,
-    _ResolvedSpace,
-    _MessageSchema,
-    _MessageType,
-    _Events
-  >;
-
-  const fullDef = { name, ...def };
-
-  const platformCache = new WeakMap<SpectrumLike, PlatformInstance<Def>>();
-
-  const narrowSpectrum = (spectrum: SpectrumLike) => {
-    const cached = platformCache.get(spectrum);
-    if (cached) {
-      return cached;
-    }
-
-    const runtime = spectrum.__internal.platforms.get(name);
-    if (!runtime) {
-      throw new Error(`Platform "${name}" is not registered`);
-    }
-
-    const instance = createPlatformInstance<Def, _Client, _ConfigSchema>(
-      fullDef as Def & AnyPlatformDef,
-      runtime
-    );
-    platformCache.set(spectrum, instance);
-    return instance;
-  };
-
-  const narrowSpace = (input: Space) => {
-    if (input.__platform !== name) {
-      throw new Error(
-        `Expected space from "${name}", got "${input.__platform}"`
-      );
-    }
-    return input as PlatformSpace<Def>;
-  };
-
-  const narrowMessage = (input: Message) => {
-    if (input.platform !== name) {
-      throw new Error(
-        `Expected message from "${name}", got "${input.platform}"`
-      );
-    }
-    return input as PlatformMessage<Def>;
-  };
-
-  const narrower = ((input: SpectrumLike | Space | Message) => {
-    if ("__providers" in input && "__internal" in input) {
-      return narrowSpectrum(input as SpectrumLike);
-    }
-    if ("__platform" in input && "send" in input) {
-      return narrowSpace(input as Space);
-    }
-    if ("platform" in input && "sender" in input && "space" in input) {
-      return narrowMessage(input as Message);
-    }
-    throw new Error("Invalid input to platform narrowing function");
-  }) as Platform<Def>;
-
-  narrower.config = (config?: z.input<_ConfigSchema>) => {
-    const resolvedConfig = config ?? {};
-    return {
-      __tag: "PlatformProviderConfig" as const,
-      __def: undefined as unknown as Def,
-      __name: name,
-      config: resolvedConfig,
-      __definition: fullDef as AnyPlatformDef,
-    } satisfies PlatformProviderConfig<Def> as PlatformProviderConfig<Def>;
-  };
-
-  if (def.static) {
-    Object.assign(narrower, def.static);
-  }
-
-  return narrower as Platform<Def> & Readonly<_Static>;
-}