Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/real-cats-rest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@stackflow/react": major
"@stackflow/config": major
---

Remove data loader cache
15 changes: 4 additions & 11 deletions config/src/ActivityLoader.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
import type { ActivityLoaderArgs } from "./ActivityLoaderArgs";
import type { RegisteredActivityName } from "./RegisteredActivityName";

export type ActivityLoader<ActivityName extends RegisteredActivityName> = {
(args: ActivityLoaderArgs<ActivityName>): any;
loaderCacheMaxAge?: number;
};
export type ActivityLoader<ActivityName extends RegisteredActivityName> = (
args: ActivityLoaderArgs<ActivityName>,
) => any;

export function loader<ActivityName extends RegisteredActivityName>(
loaderFn: (args: ActivityLoaderArgs<ActivityName>) => any,
options?: {
loaderCacheMaxAge?: number;
},
): ActivityLoader<ActivityName> {
return Object.assign(
(args: ActivityLoaderArgs<ActivityName>) => loaderFn(args),
options,
);
return (args: ActivityLoaderArgs<ActivityName>) => loaderFn(args);
}
46 changes: 0 additions & 46 deletions integrations/react/src/future/stackflow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ export type StackflowOutput = {
stepActions: StepActions<ActivityBaseParams>;
};

const DEFAULT_LOADER_CACHE_MAX_AGE = 1000 * 30;

export function stackflow<
T extends ActivityDefinition<RegisteredActivityName>,
R extends {
Expand All @@ -60,17 +58,7 @@ export function stackflow<
>;
},
>(input: StackflowInput<T, R>): StackflowOutput {
const loaderDataCacheMap = new Map<string, { params: {}; data: unknown }[]>();
const loadData = (activityName: string, activityParams: {}) => {
const cache = loaderDataCacheMap.get(activityName);
const cacheEntry = cache?.find((entry) =>
isEqual(entry.params, activityParams),
);

if (cacheEntry) {
return cacheEntry.data;
}

const activityConfig = input.config.activities.find(
(activity) => activity.name === activityName,
);
Expand All @@ -83,40 +71,6 @@ export function stackflow<
params: activityParams,
config: input.config,
});
const newCacheEntry = {
params: activityParams,
data: loaderData,
};

if (cache) {
cache.push(newCacheEntry);
} else {
loaderDataCacheMap.set(activityName, [newCacheEntry]);
}

const clearCache = () => {
const cache = loaderDataCacheMap.get(activityName);

if (!cache) return;

loaderDataCacheMap.set(
activityName,
cache.filter((entry) => entry !== newCacheEntry),
);
};
const clearCacheAfterMaxAge = () => {
setTimeout(
clearCache,
activityConfig.loader?.loaderCacheMaxAge ??
DEFAULT_LOADER_CACHE_MAX_AGE,
);
};

Promise.resolve(loaderData).then(clearCacheAfterMaxAge, (error) => {
clearCache();

throw error;
});

return loaderData;
};
Expand Down
Loading