@devvit/public-api 0.10.23-next-2024-07-02-c8b9ec453.0 → 0.10.23-next-2024-07-23-5e7d46268.0

package/types/context.d.ts

@@ -7,11 +7,9 @@ import type { RealtimeClient } from '../apis/realtime/RealtimeClient.js';
 import type { RedditAPIClient } from '../apis/reddit/RedditAPIClient.js';
 import type { EffectEmitter } from '../devvit/internals/blocks/EffectEmitter.js';
 import type { CacheHelper } from '../devvit/internals/cache.js';
-import type { Form, FormFunction, FormKey } from './form.js';
-import type { FormToFormValues, UseChannelResult, UseIntervalHook, UseStateResult } from './hooks.js';
+import type { UseChannelHook, UseFormHook, UseIntervalHook, UseStateResult } from './hooks.js';
 import type { KVStore } from './kvStore.js';
 import type { MediaPlugin } from './media.js';
-import type { ChannelOptions } from './realtime.js';
 import type { RedisClient } from './redis.js';
 import type { Scheduler } from './scheduler.js';
 import type { SettingsClient } from './settings.js';
@@ -127,12 +125,12 @@ export type ContextAPIClients = {
      * A hook for managing a form between Block renders.
      * This is only available within a Block Component.
      */
-    useForm: <const T extends Form | FormFunction = Form | FormFunction>(form: T, onSubmit: (values: FormToFormValues<T>) => void | Promise<void>) => FormKey;
+    useForm: UseFormHook;
     /**
      * A hook hor managing a realtime pubsub channel between Block renders.
      * This is only available within a Block Component.
      */
-    useChannel: <Message extends JSONValue = JSONValue>(options: ChannelOptions<Message>) => UseChannelResult<Message>;
+    useChannel: UseChannelHook;
 };
 /** The current app context of the event or render */
 export type Context = ContextAPIClients & BaseContext;

package/types/context.d.ts.map

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

package/types/data.d.ts

@@ -1,4 +1,4 @@
-import type { JSONObject } from '@devvit/shared-types/json.js';
-/** @deprecated Use JSONObject instead. */
-export type Data = JSONObject;
+export type Data = {
+    [key: string]: any;
+};
 //# sourceMappingURL=data.d.ts.map

package/types/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/types/data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE/D,0CAA0C;AAC1C,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/types/data.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,IAAI,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC"}

package/types/form.d.ts

@@ -1,23 +1,22 @@
 import type { FieldConfig_Boolean, FieldConfig_Number, FieldConfig_Paragraph, FieldConfig_Selection, FieldConfig_Selection_Item, FieldConfig_String } from '@devvit/protos';
 import type { Prettify } from '@devvit/shared-types/Prettify.js';
-import type { JSONObject } from '@devvit/shared-types/json.js';
-import type { FormKey } from '@devvit/shared-types/useForm.js';
+import type { Data } from './data.js';
 import type { Devvit } from '../devvit/Devvit.js';
-import type { FormToFormValues } from './index.js';
-export type { FormKey };
-export type FormValues = JSONObject;
-export type FormOnSubmitEvent<T extends Partial<JSONObject>> = {
+export type FormValues = Data;
+export type FormOnSubmitEvent = {
     /** The form values that were submitted */
-    values: T;
+    values: FormValues;
 };
-export type FormOnSubmitEventHandler<Data extends Partial<JSONObject>> = (
+/** A unique key generated by `Devvit.createForm` or the `useForm` hook. */
+export type FormKey = `form.${number}` | `form.hook.${string}.${number}`;
+export type FormOnSubmitEventHandler = (
 /** The event object containing the results of the form submission */
-event: FormOnSubmitEvent<Data>, 
+event: FormOnSubmitEvent, 
 /** The current app context of the form submission event */
 context: Devvit.Context) => void | Promise<void>;
 export type Form = {
     /** The fields that will be displayed in the form */
-    fields: readonly FormField[];
+    fields: FormField[];
     /** An optional title for the form */
     title?: string;
     /** An optional description for the form */
@@ -44,36 +43,27 @@ export type Form = {
  * });
  * ```
  * */
-export type FormFunction<T extends JSONObject = JSONObject> = (data: T) => Form;
-export type FormDefinition<T extends Form | FormFunction = Form | FormFunction> = {
+export type FormFunction = (data: Data) => Form;
+export type FormDefinition = {
     /** A form or a function that returns a form */
-    form: T;
+    form: Form | FormFunction;
     /** A callback that will be invoked when the form is submitted */
-    onSubmit: FormOnSubmitEventHandler<FormToFormValues<T>>;
+    onSubmit: FormOnSubmitEventHandler;
 };
 export type BaseField<ValueType> = {
-    /**
-     * The name of the field. This will be used as the key in the `values` object
-     * when the form is submitted.
-     */
+    /** The name of the field. This will be used as the key in the `values` object when the form is submitted */
     name: string;
     /** The label of the field. This will be displayed to the user */
     label: string;
     /** An optional help text that will be displayed below the field */
     helpText?: string | undefined;
-    /**
-     * If true the field will be required and the user will not be able to submit
-     * the form without filling it in.
-     */
+    /** If true the field will be required and the user will not be able to submit the form without filling it in */
     required?: boolean | undefined;
     /** If true the field will be disabled */
     disabled?: boolean | undefined;
     /** The default value of the field */
     defaultValue?: ValueType | undefined;
-    /**
-     * This indicates whether the field (setting) is an app level or install level
-     * setting. App setting values can be used by any installation.
-     */
+    /** This indicates whether the field (setting) is an app level or install level setting. App setting values can be used by any installation. */
     scope?: SettingScopeType | undefined;
 };
 export type SettingScopeType = 'installation' | 'app';
@@ -117,10 +107,9 @@ export type FormFieldGroup = {
     /** The label of the group that will be displayed to the user */
     label: string;
     /** The fields that will be displayed in the group */
-    fields: readonly FormField[];
+    fields: FormField[];
     /** An optional help text that will be displayed below the group */
     helpText?: string | undefined;
-    required?: never;
 };
 export type FormField = StringField | ImageField | ParagraphField | NumberField | BooleanField | SelectField | FormFieldGroup;
 //# sourceMappingURL=form.d.ts.map

package/types/form.d.ts.map

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

package/types/hooks.d.ts

@@ -1,7 +1,6 @@
-import type { JSONObject, JSONValue } from '@devvit/shared-types/json.js';
-import type { FormKey } from '@devvit/shared-types/useForm.js';
 import type { Context } from './context.js';
-import type { BooleanField, Form, FormField, FormFieldGroup, FormFunction, ImageField, NumberField, ParagraphField, SelectField, StringField } from './form.js';
+import type { Data } from './data.js';
+import type { Form, FormFunction, FormKey, FormValues } from './form.js';
 import type { ChannelOptions, ChannelStatus } from './realtime.js';
 export type Dispatch<A> = (value: A) => void;
 export type SetStateAction<S> = S | ((prevState: S) => S);
@@ -9,8 +8,8 @@ export type StateSetter<S> = Dispatch<SetStateAction<S>>;
 /** A tuple containing the current state and a function to update it */
 export type UseStateResult<S> = [S, StateSetter<S>];
 export type UseStateHook = Context['useState'];
+export type UseStateInitializer<S> = S | (() => S);
 export type AsyncUseStateInitializer<S> = () => Promise<S>;
-export type UseStateInitializer<S> = S | (() => S) | AsyncUseStateInitializer<S>;
 export type AsyncError = {
     message: string;
     details: string | null;
@@ -21,35 +20,7 @@ export type UseAsyncResult<S> = {
     error: AsyncError | null;
 };
 /** A hook that returns a form key that can be used in the `ui.showForm` */
-export type UseFormHook<T extends Form | FormFunction = Form | FormFunction> = (form: T, onSubmit: (values: FormToFormValues<T>) => void | Promise<void>) => FormKey;
-export type FormToFormValues<T extends Form | FormFunction = Form | FormFunction> = FormFieldsToFormValues<(T extends FormFunction ? ReturnType<T> : T)['fields']>;
-/**
- * Input is a FormField[], output is a
- * {fieldNameA: fieldTypeA, fieldNameB: fieldTypeB}.
- */
-type FormFieldsToFormValues<T extends readonly FormField[]> = T extends readonly [
-    infer Field extends FormField,
-    ...infer Rest extends FormField[]
-] ? FormFieldToFormValue<Field> & FormFieldsToFormValues<Rest> : JSONObject;
-/** Input is a FormField, output is a {fieldName: fieldType}. */
-type FormFieldToFormValue<T extends FormField> = T extends BooleanField ? {
-    [_ in T['name']]: boolean;
-} : T extends ImageField | ParagraphField | StringField ? FormFieldToRequiredFormValue<T, string> : T extends NumberField ? FormFieldToRequiredFormValue<T, number> : T extends SelectField ? {
-    [_ in T['name']]: string[];
-} : T extends FormFieldGroup ? FormFieldsToFormValues<T['fields']> : never;
-/**
- * Input is a FormField, output is a {fieldName: fieldType} or
- * {fieldName?: fieldType}.
- */
-type FormFieldToRequiredFormValue<T extends ImageField | ParagraphField | StringField | NumberField, V> = T extends {
-    required: true;
-} | {
-    defaultValue: boolean | number | string;
-} ? {
-    [_ in T['name']]: V;
-} : {
-    [_ in T['name']]?: V;
-};
+export type UseFormHook = (form: Form | FormFunction, onSubmit: (values: FormValues) => void | Promise<void>) => FormKey;
 /** An object that contains functions to start and stop the interval created by the `useInterval` hook */
 export type UseIntervalResult = {
     /** Start the interval */
@@ -63,16 +34,15 @@ export type UseIntervalHook = (
 callback: () => void | Promise<void>, 
 /** The delay between each callback run in milliseconds. Delay must be at least 100ms. */
 delay: number) => UseIntervalResult;
-export type UseChannelHook<Message extends JSONValue = JSONValue> = (options: ChannelOptions<Message>) => UseChannelResult<Message>;
-export type UseChannelResult<Message extends JSONValue = JSONValue> = {
+export type UseChannelHook = (options: ChannelOptions) => UseChannelResult;
+export type UseChannelResult = {
     /** Subscribe to the channel */
     subscribe(): void;
     /** Unsubscribe from the channel */
     unsubscribe(): void;
     /** Publish a message to the channel */
-    send(msg: Message): Promise<void>;
+    send(data: Data): Promise<void>;
     /** Current subscription status */
     status: ChannelStatus;
 };
-export {};
 //# sourceMappingURL=hooks.d.ts.map

package/types/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/types/hooks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/types/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnE,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;AAC7C,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1D,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzD,uEAAuE;AACvE,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAC/C,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;AACnD,MAAM,MAAM,wBAAwB,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;AAC3D,MAAM,MAAM,UAAU,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AACrE,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;IAAE,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;CAAE,CAAC;AAoB/F,2EAA2E;AAC3E,MAAM,MAAM,WAAW,GAAG,CACxB,IAAI,EAAE,IAAI,GAAG,YAAY,EACzB,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KACnD,OAAO,CAAC;AAEb,yGAAyG;AACzG,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yBAAyB;IACzB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,wBAAwB;IACxB,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB,CAAC;AAEF,uIAAuI;AACvI,MAAM,MAAM,eAAe,GAAG;AAC5B,yCAAyC;AACzC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AACpC,yFAAyF;AACzF,KAAK,EAAE,MAAM,KACV,iBAAiB,CAAC;AAUvB,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,cAAc,KAAK,gBAAgB,CAAC;AAW3E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+BAA+B;IAC/B,SAAS,IAAI,IAAI,CAAC;IAClB,mCAAmC;IACnC,WAAW,IAAI,IAAI,CAAC;IACpB,uCAAuC;IACvC,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,kCAAkC;IAClC,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC"}

package/types/realtime.d.ts

@@ -1,4 +1,4 @@
-import type { JSONValue } from '@devvit/shared-types/json.js';
+import type { Data } from './data.js';
 export declare enum ChannelStatus {
     Unknown = 0,
     Connecting = 1,
@@ -6,11 +6,11 @@ export declare enum ChannelStatus {
     Disconnecting = 3,
     Disconnected = 4
 }
-export type ChannelOptions<Message extends JSONValue = JSONValue> = {
+export type ChannelOptions = {
     /** Name of the channel */
     name: string;
     /** Called every time a message is received on this channel */
-    onMessage(msg: Message): void | undefined;
+    onMessage(data: Data): void | undefined;
     /** Optional hook to be informed when the channel has connected */
     onSubscribed?: (() => void | Promise<void>) | undefined;
     /** Optional hook to be informed when the channel has disconnected */

package/types/realtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"realtime.d.ts","sourceRoot":"","sources":["../../src/types/realtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAE9D,oBAAY,aAAa;IACvB,OAAO,IAAA;IACP,UAAU,IAAA;IACV,SAAS,IAAA;IACT,aAAa,IAAA;IACb,YAAY,IAAA;CACb;AAED,MAAM,MAAM,cAAc,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,IAAI;IAClE,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;IAC1C,kEAAkE;IAClE,YAAY,CAAC,EAAE,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IACxD,qEAAqE;IACrE,cAAc,CAAC,EAAE,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;CAC3D,CAAC"}
+{"version":3,"file":"realtime.d.ts","sourceRoot":"","sources":["../../src/types/realtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,oBAAY,aAAa;IACvB,OAAO,IAAA;IACP,UAAU,IAAA;IACV,SAAS,IAAA;IACT,aAAa,IAAA;IACb,YAAY,IAAA;CACb;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,kEAAkE;IAClE,YAAY,CAAC,EAAE,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IACxD,qEAAqE;IACrE,cAAc,CAAC,EAAE,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;CAC3D,CAAC"}

package/types/scheduler.d.ts

@@ -1,4 +1,4 @@
-import type { JSONObject } from '@devvit/shared-types/json.js';
+import type { Data } from './data.js';
 import type { Devvit } from '../devvit/Devvit.js';
 export type ScheduledJob = {
     /** ID of the scheduled job. Use this with scheduler.cancelJob to cancel the job. */
@@ -6,7 +6,7 @@ export type ScheduledJob = {
     /** The name of the scheduled job type */
     name: string;
     /** Additional data passed in by the scheduler client */
-    data: JSONObject | undefined;
+    data: Data | undefined;
     /** The Date of when this job should run */
     runAt: Date;
 };
@@ -16,23 +16,23 @@ export type ScheduledCronJob = {
     /** The name of the scheduled job type */
     name: string;
     /** Additional data passed in by the scheduler client */
-    data?: JSONObject | undefined;
+    data: Data | undefined;
     /** The cron string of when this job should run */
     cron: string;
 };
-export type ScheduledJobOptions<T extends JSONObject | undefined = JSONObject | undefined> = {
+export type ScheduledJobOptions = {
     /** The name of the scheduled job type */
     name: string;
     /** Additional data passed in by the scheduler client */
-    data?: T;
+    data?: Data | undefined;
     /** The Date of when this job should run */
     runAt: Date;
 };
-export type ScheduledCronJobOptions<T extends JSONObject | undefined = JSONObject | undefined> = {
+export type ScheduledCronJobOptions = {
     /** The name of the scheduled job type */
     name: string;
     /** Additional data passed in by the scheduler client */
-    data?: T;
+    data?: Data | undefined;
     /** The cron string of when this job should run */
     cron: string;
 };
@@ -41,7 +41,7 @@ export type ScheduledCronJobOptions<T extends JSONObject | undefined = JSONObjec
  * @param job The job to schedule
  * @returns {} The id of the scheduled job
  */
-export type RunJob<Data extends JSONObject | undefined> = (job: ScheduledJobOptions<Data> | ScheduledCronJobOptions<Data>) => Promise<string>;
+export type RunJob = (job: ScheduledJobOptions | ScheduledCronJobOptions) => Promise<string>;
 /**
  * Cancel a scheduled job
  * @param jobId The id of the job to cancel
@@ -57,7 +57,7 @@ export type Scheduler = {
      * @param job The job to schedule
      * @returns {} The id of the scheduled job
      */
-    runJob: <Data extends JSONObject | undefined>(job: ScheduledJobOptions<Data> | ScheduledCronJobOptions<Data>) => Promise<string>;
+    runJob: RunJob;
     /**
      * Cancel a scheduled job
      * @param jobId The id of the job to cancel
@@ -68,18 +68,17 @@ export type Scheduler = {
      */
     listJobs: () => Promise<(ScheduledJob | ScheduledCronJob)[]>;
 };
-export type ScheduledJobEvent<T extends JSONObject | undefined> = {
+export type ScheduledJobEvent = {
     /** The name of the scheduled job */
     name: string;
     /** Additional data passed in by the scheduler client */
-    data: T;
+    data?: Data | undefined;
 };
-export type ScheduledJobHandler<Data extends JSONObject | undefined = JSONObject | undefined> = (event: ScheduledJobEvent<Data>, context: JobContext) => void | Promise<void>;
-export type JobContext = Omit<Devvit.Context, 'ui' | 'dimensions' | 'modLog' | 'uiEnvironment'>;
-export type ScheduledJobType<Data extends JSONObject | undefined> = {
+export type ScheduledJobHandler = (event: ScheduledJobEvent, context: Omit<Devvit.Context, 'ui' | 'dimensions' | 'modLog' | 'uiEnvironment'>) => void | Promise<void>;
+export type ScheduledJobType = {
     /** The name of the scheduled job type */
     name: string;
     /** The function that will be called when the job is scheduled to run */
-    onRun: ScheduledJobHandler<Data>;
+    onRun: ScheduledJobHandler;
 };
 //# sourceMappingURL=scheduler.d.ts.map

package/types/scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/types/scheduler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/types/scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,MAAM,YAAY,GAAG;IACzB,oFAAoF;IACpF,EAAE,EAAE,MAAM,CAAC;IACX,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,wDAAwD;IACxD,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,2CAA2C;IAC3C,KAAK,EAAE,IAAI,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,oFAAoF;IACpF,EAAE,EAAE,MAAM,CAAC;IACX,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,wDAAwD;IACxD,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,wDAAwD;IACxD,IAAI,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IACxB,2CAA2C;IAC3C,KAAK,EAAE,IAAI,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,wDAAwD;IACxD,IAAI,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IACxB,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,mBAAmB,GAAG,uBAAuB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7F;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzD;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;IACrB;;OAEG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,YAAY,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;CAC9D,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,oCAAoC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,wDAAwD;IACxD,IAAI,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAChC,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,GAAG,YAAY,GAAG,QAAQ,GAAG,eAAe,CAAC,KAC5E,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE1B,MAAM,MAAM,gBAAgB,GAAG;IAC7B,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,wEAAwE;IACxE,KAAK,EAAE,mBAAmB,CAAC;CAC5B,CAAC"}

package/types/ui-client.d.ts

@@ -1,7 +1,7 @@
-import type { JSONObject } from '@devvit/shared-types/json.js';
-import type { FormKey } from '@devvit/shared-types/useForm.js';
-import type { Comment, Post, Subreddit, User } from '../apis/reddit/models/index.js';
+import type { FormKey } from './form.js';
+import type { Data } from './data.js';
 import type { Toast } from './toast.js';
+import type { Comment, Post, Subreddit, User } from '../apis/reddit/models/index.js';
 /**
  * The UI client lets your app interact with the Reddit frontend.
  * This client will only be available for capabilities that have
@@ -10,7 +10,7 @@ import type { Toast } from './toast.js';
  */
 export type UIClient = {
     /** Open a form in a modal */
-    showForm(formKey: FormKey, data?: JSONObject | undefined): void;
+    showForm(formKey: FormKey, data?: Data | undefined): void;
     /** Show a message in a toast. */
     showToast(text: string): void;
     showToast(toast: Toast): void;

package/types/ui-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-client.d.ts","sourceRoot":"","sources":["../../src/types/ui-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AACrF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,6BAA6B;IAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,CAAC;IAChE,iCAAiC;IACjC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC9B,wBAAwB;IACxB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACvC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACnC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC;CAC1E,CAAC"}
+{"version":3,"file":"ui-client.d.ts","sourceRoot":"","sources":["../../src/types/ui-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAErF;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,6BAA6B;IAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,IAAI,CAAC;IAC1D,iCAAiC;IACjC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC9B,wBAAwB;IACxB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACvC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACnC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC;CAC1E,CAAC"}

package/devvit/internals/blocks/handler/cache.d.ts

@@ -1,9 +0,0 @@
-import type { RedisClient } from '../../../../types/redis.js';
-import type { JSONValue } from '@devvit/shared-types/json.js';
-import type { CacheOptions, Clock, LocalCache } from './promise_cache.js';
-import type { RenderContext } from './RenderContext.js';
-export type CacheHelper = <T extends JSONValue>(fn: () => Promise<T>, options: CacheOptions) => Promise<T>;
-export declare function makeCache(redis: RedisClient, state: RenderContext['_state'] & {
-    __cache?: LocalCache;
-}, clock?: Clock): CacheHelper;
-//# sourceMappingURL=cache.d.ts.map

package/devvit/internals/blocks/handler/cache.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../src/devvit/internals/blocks/handler/cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,SAAS,EAC5C,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,EAAE,YAAY,KAClB,OAAO,CAAC,CAAC,CAAC,CAAC;AAEhB,wBAAgB,SAAS,CACvB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,UAAU,CAAA;CAAE,EACzD,KAAK,GAAE,KAAmB,GACzB,WAAW,CAGb"}

package/devvit/internals/blocks/handler/cache.js

@@ -1,5 +0,0 @@
-import { PromiseCache, SystemClock } from './promise_cache.js';
-export function makeCache(redis, state, clock = SystemClock) {
-    const pc = new PromiseCache(redis, state, clock);
-    return pc.cache.bind(pc);
-}

package/devvit/internals/blocks/handler/cache.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cache.test.d.ts","sourceRoot":"","sources":["../../../../../src/devvit/internals/blocks/handler/cache.test.ts"],"names":[],"mappings":""}

package/devvit/internals/blocks/handler/promise_cache.d.ts

@@ -1,67 +0,0 @@
-import type { JSONValue, RedisClient } from '../../../../index.js';
-export type CacheEntry = {
-    value: JSONValue | null;
-    expires: number;
-    error: string | null;
-    errorTime: number | null;
-    checkedAt: number;
-    errorCount: number;
-};
-export type Clock = {
-    now(): Date;
-};
-export declare const SystemClock: Clock;
-export type CacheOptions = {
-    /**
-     * Time to live in milliseconds.
-     */
-    ttl: number;
-    /**
-     * Key to use for caching.
-     */
-    key: string;
-};
-export type LocalCache = {
-    [key: string]: CacheEntry;
-};
-export declare function _namespaced(key: string): string;
-export declare function _lock(key: string): string;
-export declare const retryLimit = 3;
-export declare const clientRetryDelay = 1000;
-export declare const allowStaleFor = 30000;
-type WithLocalCache = {
-    __cache?: LocalCache;
-};
-/**
- * Refactored out into a class to allow for easier testing and clarity of purpose.
- *
- * This class is responsible for managing the caching of promises. It is a layered cache, meaning it will first check
- * the local cache, then the redis cache, and finally the source of truth. It will also handle refreshing the cache according
- * to the TTL and error handling.
- *
- * Please note that in order to prevent a stampede of requests to the source of truth, we use a lock in redis to ensure only one
- * request is made to the source of truth at a time.  If the lock is obtained, the cache will be updated and the lock will be released.
- *
- * Additionally, we use a polling mechanism to fetch the cache if the lock is not obtained.  This is to prevent unnecessary errors.
- *
- * Finally, we also want to prevent stampedes against redis for the lock election and the retries.  We use a ramping probability to ease in the
- * attempts to get the lock, and not every error will trigger a retry.
- *
- * This means that the cache will be eventually consistent, but will not be immediately consistent. This is a tradeoff we are willing to make.
- * Additionally, this means that the TTL is not precice.  The cache may be updated a bit more often than the TTL, but it will not be updated less often.
- *
- */
-export declare class PromiseCache {
-    #private;
-    constructor(redis: RedisClient, state: WithLocalCache, clock?: Clock);
-    /**
-     * This is the public API for the cache.  Call this method to cache a promise.
-     *
-     * @param closure
-     * @param options
-     * @returns
-     */
-    cache<T extends JSONValue>(closure: () => Promise<T>, options: CacheOptions): Promise<T>;
-}
-export {};
-//# sourceMappingURL=promise_cache.d.ts.map

package/devvit/internals/blocks/handler/promise_cache.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"promise_cache.d.ts","sourceRoot":"","sources":["../../../../../src/devvit/internals/blocks/handler/promise_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnE,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,IAAI,IAAI,CAAC;CACb,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAIzB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,CAAC;AAEvD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C;AACD,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzC;AAKD,eAAO,MAAM,UAAU,IAAI,CAAC;AAE5B,eAAO,MAAM,gBAAgB,OAAO,CAAC;AACrC,eAAO,MAAM,aAAa,QAAS,CAAC;AAEpC,KAAK,cAAc,GAAG;IACpB,OAAO,CAAC,EAAE,UAAU,CAAC;CACtB,CAAC;AASF;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,YAAY;;gBAUX,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,GAAE,KAAmB;IAMjF;;;;;;OAMG;IACG,KAAK,CAAC,CAAC,SAAS,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC;CA6M/F"}