99import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime" ;
1010import type { AssetResource , EnvironmentId } from "@t3tools/contracts" ;
1111import { AsyncResult } from "effect/reactivity" ;
12- import { useCallback , useMemo } from "react" ;
1312
1413import { assetEnvironment } from "~/state/assets" ;
1514import { useFilesystemReadAccess } from "~/state/filesystem" ;
@@ -46,12 +45,12 @@ export function useAssetUrlRefresh(
4645 reportFailure : false ,
4746 refresh : true ,
4847 } ) ;
49- return useCallback ( async ( ) => {
48+ return async ( ) => {
5049 if ( environmentId === null || resource === null || httpBaseUrl === null ) return null ;
5150 const result = await refresh ( { environmentId, input : { resource } } ) ;
5251 if ( result . _tag === "Failure" ) throw squashAtomCommandFailure ( result ) ;
5352 return resolveAssetUrl ( httpBaseUrl , result . value . relativeUrl ) ;
54- } , [ environmentId , resource , refresh , httpBaseUrl ] ) ;
53+ } ;
5554}
5655
5756export function useAssetUrls (
@@ -60,39 +59,38 @@ export function useAssetUrls(
6059) : ReadonlyArray < string | null > {
6160 const preparedConnection = usePreparedConnection ( environmentId ) ;
6261 const { canReadFiles } = useFilesystemReadAccess ( environmentId ) ;
63- const allowedResources = useMemo (
64- ( ) =>
65- canReadFiles
66- ? resources
67- : resources . filter (
68- ( resource ) =>
69- resource . _tag !== "workspace-file" &&
70- resource . _tag !== "media-file" &&
71- resource . _tag !== "draft-workspace-file" ,
72- ) ,
73- [ canReadFiles , resources ] ,
74- ) ;
62+ const allowedResources = canReadFiles
63+ ? resources
64+ : resources . filter ( ( resource ) => ! isFileResource ( resource ) ) ;
7565 const results = useAtomValue (
7666 assetEnvironment . createUrls ( {
7767 environmentId,
7868 resources : allowedResources ,
7969 } ) ,
8070 ) ;
81- return useMemo ( ( ) => {
82- if ( preparedConnection . _tag === "None" ) return resources . map ( ( ) => null ) ;
83- let resultIndex = 0 ;
84- return resources . map ( ( resource ) => {
85- if (
86- ! canReadFiles &&
87- ( resource . _tag === "workspace-file" ||
88- resource . _tag === "media-file" ||
89- resource . _tag === "draft-workspace-file" )
90- )
91- return null ;
92- const result = results [ resultIndex ++ ] ;
93- return result && AsyncResult . isSuccess ( result )
71+ if ( preparedConnection . _tag === "None" ) return resources . map ( ( ) => null ) ;
72+ const urls : Array < string | null > = [ ] ;
73+ let resultIndex = 0 ;
74+ for ( const resource of resources ) {
75+ if ( ! canReadFiles && isFileResource ( resource ) ) {
76+ urls . push ( null ) ;
77+ continue ;
78+ }
79+ const result = results [ resultIndex ] ;
80+ resultIndex += 1 ;
81+ urls . push (
82+ result && AsyncResult . isSuccess ( result )
9483 ? resolveAssetUrl ( preparedConnection . value . httpBaseUrl , result . value . relativeUrl )
95- : null ;
96- } ) ;
97- } , [ canReadFiles , preparedConnection , resources , results ] ) ;
84+ : null ,
85+ ) ;
86+ }
87+ return urls ;
88+ }
89+
90+ function isFileResource ( resource : AssetResource ) : boolean {
91+ return (
92+ resource . _tag === "workspace-file" ||
93+ resource . _tag === "media-file" ||
94+ resource . _tag === "draft-workspace-file"
95+ ) ;
9896}
0 commit comments