@@ -28,7 +28,7 @@ const encodeLegacySavedEnvironments = Schema.encodeEffect(
2828 Schema . Struct ( { version : Schema . Literal ( 1 ) , records : Schema . Array ( Schema . Unknown ) } ) ,
2929 ) ,
3030) ;
31- function makeSafeStorageLayer ( available : boolean , failDecrypt : Ref . Ref < boolean > | null = null ) {
31+ function layerSafeStorageFor ( available : boolean , failDecrypt : Ref . Ref < boolean > | null = null ) {
3232 return Layer . succeed ( ElectronSafeStorage . ElectronSafeStorage , {
3333 isEncryptionAvailable : Effect . succeed ( available ) ,
3434 encryptString : ( value ) => Effect . succeed ( textEncoder . encode ( `encrypted:${ value } ` ) ) ,
@@ -50,13 +50,13 @@ function makeSafeStorageLayer(available: boolean, failDecrypt: Ref.Ref<boolean>
5050 } satisfies ElectronSafeStorage . ElectronSafeStorage [ "Service" ] ) ;
5151}
5252
53- function makeLayer (
53+ function layerFor (
5454 baseDir : string ,
5555 encryptionAvailable = true ,
5656 failDecrypt : Ref . Ref < boolean > | null = null ,
5757 fileSystemLayer : Layer . Layer < FileSystem . FileSystem > = NodeServices . layer ,
5858) {
59- const environmentLayer = DesktopEnvironment . layer ( {
59+ const layerEnvironment = DesktopEnvironment . layer ( {
6060 dirname : "/repo/apps/desktop/src" ,
6161 homeDirectory : baseDir ,
6262 platform : "darwin" ,
@@ -71,20 +71,20 @@ function makeLayer(
7171 Layer . mergeAll ( NodeServices . layer , DesktopConfig . layerTest ( { T3CODE_HOME : baseDir } ) ) ,
7272 ) ,
7373 ) ;
74- const safeStorageLayer = makeSafeStorageLayer ( encryptionAvailable , failDecrypt ) ;
75- const dependencies = Layer . mergeAll (
76- environmentLayer ,
77- safeStorageLayer ,
74+ const layerSafeStorage = layerSafeStorageFor ( encryptionAvailable , failDecrypt ) ;
75+ const layerDependencies = Layer . mergeAll (
76+ layerEnvironment ,
77+ layerSafeStorage ,
7878 NodeServices . layer ,
7979 fileSystemLayer ,
8080 ) ;
81- const savedEnvironmentsLayer = DesktopSavedEnvironments . layer . pipe (
82- Layer . provideMerge ( dependencies ) ,
81+ const layerSavedEnvironments = DesktopSavedEnvironments . layer . pipe (
82+ Layer . provideMerge ( layerDependencies ) ,
8383 ) ;
8484
8585 return DesktopConnectionCatalogStore . layer . pipe (
86- Layer . provideMerge ( savedEnvironmentsLayer ) ,
87- Layer . provideMerge ( dependencies ) ,
86+ Layer . provideMerge ( layerSavedEnvironments ) ,
87+ Layer . provideMerge ( layerDependencies ) ,
8888 ) ;
8989}
9090
@@ -97,7 +97,7 @@ const withStore = <A, E, R>(
9797 const baseDir = yield * fileSystem . makeTempDirectoryScoped ( {
9898 prefix : "t3-desktop-connection-catalog-test-" ,
9999 } ) ;
100- return yield * effect . pipe ( Effect . provide ( makeLayer ( baseDir , encryptionAvailable ) ) ) ;
100+ return yield * effect . pipe ( Effect . provide ( layerFor ( baseDir , encryptionAvailable ) ) ) ;
101101 } ) . pipe ( Effect . provide ( NodeServices . layer ) , Effect . scoped ) ;
102102
103103describe ( "DesktopConnectionCatalogStore" , ( ) => {
@@ -280,14 +280,14 @@ describe("DesktopConnectionCatalogStore", () => {
280280 method : "readFileString" ,
281281 pathOrDescriptor : path . join ( baseDir , "userdata" , "connection-catalog.json" ) ,
282282 } ) ;
283- const fileSystemLayer = Layer . succeed (
283+ const layerFileSystem = Layer . succeed (
284284 FileSystem . FileSystem ,
285285 FileSystem . makeNoop ( {
286286 readFileString : ( ) => Effect . fail ( permissionError ) ,
287287 } ) ,
288288 ) ;
289289 const store = yield * DesktopConnectionCatalogStore . DesktopConnectionCatalogStore . pipe (
290- Effect . provide ( makeLayer ( baseDir , true , null , fileSystemLayer ) ) ,
290+ Effect . provide ( layerFor ( baseDir , true , null , layerFileSystem ) ) ,
291291 ) ;
292292
293293 const error = yield * store . get . pipe ( Effect . flip ) ;
@@ -318,14 +318,14 @@ describe("DesktopConnectionCatalogStore", () => {
318318 method : "makeDirectory" ,
319319 pathOrDescriptor : path . join ( baseDir , "userdata" ) ,
320320 } ) ;
321- const fileSystemLayer = Layer . succeed (
321+ const layerFileSystem = Layer . succeed (
322322 FileSystem . FileSystem ,
323323 FileSystem . makeNoop ( {
324324 makeDirectory : ( ) => Effect . fail ( permissionError ) ,
325325 } ) ,
326326 ) ;
327327 const store = yield * DesktopConnectionCatalogStore . DesktopConnectionCatalogStore . pipe (
328- Effect . provide ( makeLayer ( baseDir , true , null , fileSystemLayer ) ) ,
328+ Effect . provide ( layerFor ( baseDir , true , null , layerFileSystem ) ) ,
329329 ) ;
330330
331331 const error = yield * store . set ( "{}" ) . pipe ( Effect . flip ) ;
@@ -413,7 +413,7 @@ describe("DesktopConnectionCatalogStore", () => {
413413 prefix : "t3-desktop-connection-catalog-test-" ,
414414 } ) ;
415415 const failDecrypt = yield * Ref . make ( false ) ;
416- const layer = makeLayer ( baseDir , true , failDecrypt ) ;
416+ const layer = layerFor ( baseDir , true , failDecrypt ) ;
417417 const store = yield * DesktopConnectionCatalogStore . DesktopConnectionCatalogStore . pipe (
418418 Effect . provide ( layer ) ,
419419 ) ;
0 commit comments