@misofm/platform 0.26.2 → 0.28.0

package/src/party/extensions/roles.ts

@@ -7,7 +7,7 @@
 // `ArtistRole` value via its constructor move-call, then add/remove it.
 
 import * as rolesMod from "../../contracts/party_roles/party_roles.ts";
-import type { TxThunk } from "@misofm/partyos";
+import type { Recipe } from "@unconfirmed/sui-effect";
 
 /** The canonical role variants (a fixed, typo-free set the frontend can render). */
 export type CanonicalRole =
@@ -39,7 +39,7 @@ const CANONICAL_CTORS = {
 } as const;
 
 /** Builds the `ArtistRole` value for a role via its constructor move-call. */
-function buildRole(tx: Parameters<TxThunk>[0], role: Role, pkg: string) {
+function buildRole(tx: Parameters<Recipe>[0], role: Role, pkg: string) {
   if (role.kind === "custom") {
     return tx.add(rolesMod.custom({ package: pkg, arguments: [role.name] }));
   }
@@ -54,7 +54,7 @@ export interface AddRoleParams {
 }
 
 /** Adds a role to the party. Aborts on-chain if already held or the max is reached. */
-export function addRole(params: AddRoleParams): TxThunk {
+export function addRole(params: AddRoleParams): Recipe {
   return (tx) => {
     const role = buildRole(tx, params.role, params.partyRolesPackageId);
     tx.add(
@@ -71,7 +71,7 @@ export interface RemoveRoleParams {
 }
 
 /** Removes a role from the party. Aborts on-chain if not held. */
-export function removeRole(params: RemoveRoleParams): TxThunk {
+export function removeRole(params: RemoveRoleParams): Recipe {
   return (tx) => {
     const role = buildRole(tx, params.role, params.partyRolesPackageId);
     tx.add(
@@ -87,7 +87,7 @@ export interface ClearRolesParams {
 }
 
 /** Removes the party's entire role set. No-op on-chain if none is set. */
-export function clearRoles(params: ClearRolesParams): TxThunk {
+export function clearRoles(params: ClearRolesParams): Recipe {
   return (tx) => {
     tx.add(rolesMod.clearRoles({ package: params.partyRolesPackageId, arguments: [params.partyId, params.capId] }));
   };

package/src/party/extensions/tags.ts

@@ -6,7 +6,7 @@
 // concern.
 
 import * as tagsMod from "../../contracts/party_tags/party_tags.ts";
-import type { TxThunk } from "@misofm/partyos";
+import type { Recipe } from "@unconfirmed/sui-effect";
 
 export interface AddTagParams {
   partyId: string;
@@ -16,7 +16,7 @@ export interface AddTagParams {
 }
 
 /** Adds a tag to the party. Aborts on-chain if empty, too long, duplicate, or the max is reached. */
-export function addTag(params: AddTagParams): TxThunk {
+export function addTag(params: AddTagParams): Recipe {
   return (tx) => {
     tx.add(
       tagsMod.addTag({ package: params.partyTagsPackageId, arguments: [params.partyId, params.capId, params.tag] }),
@@ -32,7 +32,7 @@ export interface RemoveTagParams {
 }
 
 /** Removes a tag from the party. Aborts on-chain if not present. */
-export function removeTag(params: RemoveTagParams): TxThunk {
+export function removeTag(params: RemoveTagParams): Recipe {
   return (tx) => {
     tx.add(
       tagsMod.removeTag({ package: params.partyTagsPackageId, arguments: [params.partyId, params.capId, params.tag] }),
@@ -47,7 +47,7 @@ export interface ClearTagsParams {
 }
 
 /** Removes the party's entire tag set. No-op on-chain if none is set. */
-export function clearTags(params: ClearTagsParams): TxThunk {
+export function clearTags(params: ClearTagsParams): Recipe {
   return (tx) => {
     tx.add(tagsMod.clearTags({ package: params.partyTagsPackageId, arguments: [params.partyId, params.capId] }));
   };

package/src/party/index.ts

@@ -28,7 +28,6 @@ export {
   removeMember,
   type Party,
   type PartyKind,
-  type TxThunk,
   type CreatePartyParams,
   type SetNameParams,
   type InvitePartyParams,

package/src/party/queries.ts

@@ -1,23 +1,24 @@
 // Copyright (c) Miso Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-// Typed reads for the Party EXTENSIONS: fetch an on-chain dynamic field via the
-// Core API, BCS-parse it through the generated struct, and map to the public
-// camelCase types. Party core reads (`getPartyById`, group membership, …) live
-// in `@misofm/partyos` — this file only covers profile/media/roles/tags/genres/
-// ctas/links.
+// Typed reads for the Party EXTENSIONS: fetch an on-chain dynamic field via
+// `Sui`, BCS-parse its value through the generated struct, and map to the
+// public camelCase types. Party core reads (`getPartyById`, group
+// membership, …) live in `@misofm/partyos` — this file only covers
+// profile/media/roles/tags/genres/ctas/links.
+//
+// Each field lives under an empty positional key (Move's implicit
+// `dummy_field: bool` → one zero byte); `sui.getDynamicFieldOption(parent,
+// { type, bcs })` reads the field's VALUE bytes directly, so — unlike the
+// predecessor `@misofm/effect`-era version of this file — there is no
+// separate `Field<K, V>` wrapper struct to decode per extension: one less
+// generated-struct dependency per read, and the wrapper `bcs.struct("Field",
+// ...)` definitions are gone entirely.
 
 import { Effect, Option, Stream } from "effect";
-import { deriveDynamicFieldID } from "@mysten/sui/utils";
 import { bcs } from "@mysten/sui/bcs";
-import {
-  decodeBcs,
-  getOptionalObjectContent,
-  listDynamicFields,
-  SuiClient,
-  type BcsDecodeError,
-  type SuiRpcError,
-} from "@misofm/effect";
+import { normalizeStructTag } from "@mysten/sui/utils";
+import { ObjectId, Sui, SuiSchema, type DecodeError, type TransportError } from "@unconfirmed/sui-effect";
 import { Profile as ProfileBcs, ProfileKey as ProfileKeyBcs } from "../contracts/party_profile/party_profile.ts";
 import { Media as MediaBcs, MediaKey as MediaKeyBcs } from "../contracts/party_media/party_media.ts";
 import { ArtistRole as ArtistRoleBcs, RolesKey as RolesKeyBcs } from "../contracts/party_roles/party_roles.ts";
@@ -28,119 +29,114 @@ import { mapCtas, mapGenres, mapMedia, mapProfile, mapRoles, mapTags } from "./i
 import { buildLink, platformForDataType } from "./extensions/links.ts";
 import { Cta, Media, PlatformLink, Profile } from "./types.ts";
 
-// The profile is a dynamic field on the party UID under an empty `ProfileKey()`
-// (Move's implicit `dummy_field: bool` → one zero byte).
-const ProfileField = bcs.struct("Field", { id: bcs.Address, name: ProfileKeyBcs, value: ProfileBcs });
 const PROFILE_KEY_BYTES = ProfileKeyBcs.serialize([false]).toBytes();
 
 /** Fetches a party's profile; `Option.none()` if none is set. */
 export const getProfile = Effect.fn("getProfile")(function* (
   partyId: string,
   partyProfilePackageId: string,
-): Effect.fn.Return<Option.Option<Profile>, BcsDecodeError | SuiRpcError, SuiClient> {
-  const fieldId = deriveDynamicFieldID(
-    partyId,
-    `${partyProfilePackageId}::party_profile::ProfileKey`,
-    PROFILE_KEY_BYTES,
-  );
-  const contentOpt = yield* getOptionalObjectContent(fieldId);
-  if (Option.isNone(contentOpt)) return Option.none();
-  const profile = yield* decodeBcs(
-    { parse: (bytes: Uint8Array) => mapProfile(partyId, ProfileField.parse(bytes).value) },
-    Profile,
-    contentOpt.value.content,
-    { type: "Profile", objectId: fieldId },
-  );
-  return Option.some(profile);
+): Effect.fn.Return<Option.Option<Profile>, DecodeError | TransportError, Sui> {
+  const sui = yield* Sui;
+  const keyTag = normalizeStructTag(`${partyProfilePackageId}::party_profile::ProfileKey`);
+  const field = yield* sui.getDynamicFieldOption(ObjectId.make(partyId), { type: keyTag, bcs: PROFILE_KEY_BYTES });
+  if (Option.isNone(field)) return Option.none();
+  const valueTag = normalizeStructTag(`${partyProfilePackageId}::party_profile::Profile`);
+  const raw = yield* SuiSchema.decode(SuiSchema.bcs(ProfileBcs, valueTag), field.value.value.bcs, {
+    objectId: field.value.fieldId,
+    actualType: field.value.value.type,
+  });
+  return Option.some(mapProfile(partyId, raw));
 });
 
-// Media is a dynamic field on the party UID under an empty `MediaKey()` (same
-// implicit `dummy_field: bool` → one zero byte as the profile key).
-const MediaField = bcs.struct("Field", { id: bcs.Address, name: MediaKeyBcs, value: MediaBcs });
 const MEDIA_KEY_BYTES = MediaKeyBcs.serialize([false]).toBytes();
 
 /** Fetches a party's media (avatar + header); `Option.none()` if none is set. */
 export const getMedia = Effect.fn("getMedia")(function* (
   partyId: string,
   partyMediaPackageId: string,
-): Effect.fn.Return<Option.Option<Media>, BcsDecodeError | SuiRpcError, SuiClient> {
-  const fieldId = deriveDynamicFieldID(
-    partyId,
-    `${partyMediaPackageId}::party_media::MediaKey`,
-    MEDIA_KEY_BYTES,
-  );
-  const contentOpt = yield* getOptionalObjectContent(fieldId);
-  if (Option.isNone(contentOpt)) return Option.none();
-  const media = yield* decodeBcs(
-    { parse: (bytes: Uint8Array) => mapMedia(partyId, MediaField.parse(bytes).value) },
-    Media,
-    contentOpt.value.content,
-    { type: "Media", objectId: fieldId },
-  );
-  return Option.some(media);
+): Effect.fn.Return<Option.Option<Media>, DecodeError | TransportError, Sui> {
+  const sui = yield* Sui;
+  const keyTag = normalizeStructTag(`${partyMediaPackageId}::party_media::MediaKey`);
+  const field = yield* sui.getDynamicFieldOption(ObjectId.make(partyId), { type: keyTag, bcs: MEDIA_KEY_BYTES });
+  if (Option.isNone(field)) return Option.none();
+  const valueTag = normalizeStructTag(`${partyMediaPackageId}::party_media::Media`);
+  const raw = yield* SuiSchema.decode(SuiSchema.bcs(MediaBcs, valueTag), field.value.value.bcs, {
+    objectId: field.value.fieldId,
+    actualType: field.value.value.type,
+  });
+  return Option.some(mapMedia(partyId, raw));
 });
 
 // === Collection extension reads (roles / tags / genres / ctas) ===
 //
-// Each is a single dynamic field on the party UID under an empty positional key
-// (Move's implicit `dummy_field: bool` → one zero byte, same as the profile key).
-// Absence keeps the pre-migration policy: an empty collection, not a failure.
+// Each is a single dynamic field on the party UID under an empty positional
+// key (same implicit `dummy_field: bool` → one zero byte as the profile
+// key). Absence keeps the pre-migration policy: an empty collection, not a
+// failure.
 
 const ROLES_KEY_BYTES = RolesKeyBcs.serialize([false]).toBytes();
-const RolesField = bcs.struct("Field", { id: bcs.Address, name: RolesKeyBcs, value: bcs.vector(ArtistRoleBcs) });
+const RolesValue = bcs.vector(ArtistRoleBcs);
 
 /** The party's artist-type roles (display names), or `[]` if none are set. */
 export const getRoles = Effect.fn("getRoles")(function* (
   partyId: string,
   partyRolesPackageId: string,
-): Effect.fn.Return<string[], SuiRpcError, SuiClient> {
-  const fieldId = deriveDynamicFieldID(partyId, `${partyRolesPackageId}::party_roles::RolesKey`, ROLES_KEY_BYTES);
-  const contentOpt = yield* getOptionalObjectContent(fieldId);
-  if (Option.isNone(contentOpt)) return [];
-  return mapRoles(RolesField.parse(contentOpt.value.content).value);
+): Effect.fn.Return<string[], DecodeError | TransportError, Sui> {
+  const sui = yield* Sui;
+  const keyTag = normalizeStructTag(`${partyRolesPackageId}::party_roles::RolesKey`);
+  const field = yield* sui.getDynamicFieldOption(ObjectId.make(partyId), { type: keyTag, bcs: ROLES_KEY_BYTES });
+  if (Option.isNone(field)) return [];
+  const roles = yield* SuiSchema.decode(SuiSchema.bcs(RolesValue), field.value.value.bcs, { objectId: field.value.fieldId });
+  return mapRoles(roles);
 });
 
 const TAGS_KEY_BYTES = TagsKeyBcs.serialize([false]).toBytes();
-const TagsField = bcs.struct("Field", { id: bcs.Address, name: TagsKeyBcs, value: bcs.vector(bcs.string()) });
+const TagsValue = bcs.vector(bcs.string());
 
 /** The party's free-form tags, or `[]` if none are set. */
 export const getTags = Effect.fn("getTags")(function* (
   partyId: string,
   partyTagsPackageId: string,
-): Effect.fn.Return<string[], SuiRpcError, SuiClient> {
-  const fieldId = deriveDynamicFieldID(partyId, `${partyTagsPackageId}::party_tags::TagsKey`, TAGS_KEY_BYTES);
-  const contentOpt = yield* getOptionalObjectContent(fieldId);
-  if (Option.isNone(contentOpt)) return [];
-  return mapTags(TagsField.parse(contentOpt.value.content).value);
+): Effect.fn.Return<string[], DecodeError | TransportError, Sui> {
+  const sui = yield* Sui;
+  const keyTag = normalizeStructTag(`${partyTagsPackageId}::party_tags::TagsKey`);
+  const field = yield* sui.getDynamicFieldOption(ObjectId.make(partyId), { type: keyTag, bcs: TAGS_KEY_BYTES });
+  if (Option.isNone(field)) return [];
+  const tags = yield* SuiSchema.decode(SuiSchema.bcs(TagsValue), field.value.value.bcs, { objectId: field.value.fieldId });
+  return mapTags(tags);
 });
 
 const GENRES_KEY_BYTES = GenresKeyBcs.serialize([false]).toBytes();
-const GenresField = bcs.struct("Field", { id: bcs.Address, name: GenresKeyBcs, value: bcs.vector(bcs.Address) });
+const GenresValue = bcs.vector(bcs.Address);
 
 /** The party's genre object ids, or `[]` if none are set. */
 export const getGenres = Effect.fn("getGenres")(function* (
   partyId: string,
   partyGenrePackageId: string,
-): Effect.fn.Return<string[], SuiRpcError, SuiClient> {
-  const fieldId = deriveDynamicFieldID(partyId, `${partyGenrePackageId}::party_genre::GenresKey`, GENRES_KEY_BYTES);
-  const contentOpt = yield* getOptionalObjectContent(fieldId);
-  if (Option.isNone(contentOpt)) return [];
-  return mapGenres(GenresField.parse(contentOpt.value.content).value);
+): Effect.fn.Return<string[], DecodeError | TransportError, Sui> {
+  const sui = yield* Sui;
+  const keyTag = normalizeStructTag(`${partyGenrePackageId}::party_genre::GenresKey`);
+  const field = yield* sui.getDynamicFieldOption(ObjectId.make(partyId), { type: keyTag, bcs: GENRES_KEY_BYTES });
+  if (Option.isNone(field)) return [];
+  const genres = yield* SuiSchema.decode(SuiSchema.bcs(GenresValue), field.value.value.bcs, { objectId: field.value.fieldId });
+  return mapGenres(genres);
 });
 
 const CTAS_KEY_BYTES = CtasKeyBcs.serialize([false]).toBytes();
 // The CTA field's value is a bare `vector<Cta>` (not a wrapper struct).
-const CtasField = bcs.struct("Field", { id: bcs.Address, name: CtasKeyBcs, value: bcs.vector(CtaBcs) });
+const CtasValue = bcs.vector(CtaBcs);
 
 /** The party's ordered CTA list (position is priority), or `[]` if none is set. */
 export const getCtas = Effect.fn("getCtas")(function* (
   partyId: string,
   partyCtaPackageId: string,
-): Effect.fn.Return<Cta[], SuiRpcError, SuiClient> {
-  const fieldId = deriveDynamicFieldID(partyId, `${partyCtaPackageId}::party_cta::CtasKey`, CTAS_KEY_BYTES);
-  const contentOpt = yield* getOptionalObjectContent(fieldId);
-  if (Option.isNone(contentOpt)) return [];
-  return mapCtas(CtasField.parse(contentOpt.value.content).value).map((c) => new Cta(c));
+): Effect.fn.Return<Cta[], DecodeError | TransportError, Sui> {
+  const sui = yield* Sui;
+  const keyTag = normalizeStructTag(`${partyCtaPackageId}::party_cta::CtasKey`);
+  const field = yield* sui.getDynamicFieldOption(ObjectId.make(partyId), { type: keyTag, bcs: CTAS_KEY_BYTES });
+  if (Option.isNone(field)) return [];
+  const ctas = yield* SuiSchema.decode(SuiSchema.bcs(CtasValue), field.value.value.bcs, { objectId: field.value.fieldId });
+  return mapCtas(ctas).map((c) => new Cta(c));
 });
 
 // === Platform-link reads ===
@@ -150,26 +146,33 @@ export const getCtas = Effect.fn("getCtas")(function* (
 // enumerate the party's dynamic fields and pick out the platform-link ones,
 // identifying the platform from the `Data` type argument. Every payload `Data`
 // type is a single-`String` newtype, so `PlatformLink<Data>` serializes exactly
-// as one BCS string — parse the field value as such.
-const PlatformLinkField = bcs.struct("Field", { id: bcs.Address, name: bcs.bool(), value: bcs.string() });
+// as one BCS string — decode the field's value as such.
+const PlatformLinkValue = bcs.string();
 const PLATFORM_LINK_KEY_RE = /::platform_link::PlatformLinkKey<(.+)>$/;
 
 /** All external-platform links attached to a party (social, music, professional). */
 export const getLinks = Effect.fn("getLinks")(function* (
   partyId: string,
-): Effect.fn.Return<PlatformLink[], SuiRpcError, SuiClient> {
-  const fields = Array.from(yield* Stream.runCollect(listDynamicFields(partyId)));
+): Effect.fn.Return<PlatformLink[], DecodeError | TransportError, Sui> {
+  const sui = yield* Sui;
+  const id = ObjectId.make(partyId);
+  // The regex match below drops every entry that is not this platform's own
+  // `PlatformLinkKey<Data>` — including a foreign extension's dynamic fields
+  // on the same party UID — before a byte is read.
+  const entries = yield* Stream.runCollect(sui.streamDynamicFields(id));
   const links: PlatformLink[] = [];
-  for (const f of fields) {
-    if (typeof f.name?.type !== "string") continue;
-    const match = f.name.type.match(PLATFORM_LINK_KEY_RE);
+  for (const entry of entries) {
+    const match = entry.name.type.match(PLATFORM_LINK_KEY_RE);
     const dataType = match?.[1];
     if (!dataType) continue;
     const platform = platformForDataType(dataType);
     if (!platform) continue;
-    const contentOpt = yield* getOptionalObjectContent(f.fieldId);
-    if (Option.isNone(contentOpt)) continue;
-    links.push(buildLink(platform, PlatformLinkField.parse(contentOpt.value.content).value));
+    const field = yield* sui.getDynamicFieldOption(id, entry.name);
+    if (Option.isNone(field)) continue;
+    const value = yield* SuiSchema.decode(SuiSchema.bcs(PlatformLinkValue), field.value.value.bcs, {
+      objectId: field.value.fieldId,
+    });
+    links.push(buildLink(platform, value));
   }
   return links;
 });