Skip to content

Commit 970ac91

Browse files
committed
chore: sync GitLab upload fix with main
2 parents 5f47f81 + ecfdda5 commit 970ac91

596 files changed

Lines changed: 28362 additions & 8512 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/desktop/src/app/DesktopAppIdentity.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ interface ElectronAppCalls {
3838
readonly setName: string[];
3939
}
4040

41-
const makeElectronAppLayer = (calls: ElectronAppCalls) =>
41+
const layerElectronApp = (calls: ElectronAppCalls) =>
4242
Layer.succeed(ElectronApp.ElectronApp, {
4343
metadata: Effect.die("unexpected metadata read"),
4444
name: Effect.succeed("T3 Code"),
@@ -70,7 +70,7 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>
7070
on: () => Effect.void,
7171
} satisfies ElectronApp.ElectronApp["Service"]);
7272

73-
const makeAssetsLayer = (png: Option.Option<string>) =>
73+
const layerAssets = (png: Option.Option<string>) =>
7474
Layer.succeed(DesktopAssets.DesktopAssets, {
7575
iconPaths: Effect.succeed({
7676
ico: Option.none(),
@@ -80,7 +80,7 @@ const makeAssetsLayer = (png: Option.Option<string>) =>
8080
resolveResourcePath: () => Effect.succeedNone,
8181
} satisfies DesktopAssets.DesktopAssets["Service"]);
8282

83-
const makeEnvironmentLayer = (overrides: TestEnvironmentInput = {}) => {
83+
const layerEnvironment = (overrides: TestEnvironmentInput = {}) => {
8484
const { env, ...environmentOverrides } = overrides;
8585
return DesktopEnvironment.layer({
8686
...defaultEnvironmentInput,
@@ -138,9 +138,9 @@ const withIdentity = <A, E, R>(
138138
Effect.succeed(input.packageJson ?? '{"t3codeCommitHash":"abcdef1234567890"}'),
139139
}),
140140
),
141-
Layer.provideMerge(makeAssetsLayer(input.pngIconPath ?? Option.none())),
142-
Layer.provideMerge(makeElectronAppLayer(calls)),
143-
Layer.provideMerge(makeEnvironmentLayer(input.environment)),
141+
Layer.provideMerge(layerAssets(input.pngIconPath ?? Option.none())),
142+
Layer.provideMerge(layerElectronApp(calls)),
143+
Layer.provideMerge(layerEnvironment(input.environment)),
144144
),
145145
),
146146
);

‎apps/desktop/src/app/DesktopAssets.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import * as DesktopAssets from "./DesktopAssets.ts";
1111
import * as DesktopConfig from "./DesktopConfig.ts";
1212
import * as DesktopEnvironment from "./DesktopEnvironment.ts";
1313

14-
const environmentLayer = DesktopEnvironment.layer({
14+
const layerEnvironment = DesktopEnvironment.layer({
1515
dirname: "/repo/apps/desktop/dist-electron",
1616
homeDirectory: "/Users/alice",
1717
platform: "darwin",
@@ -30,7 +30,7 @@ const environmentLayer = DesktopEnvironment.layer({
3030
describe("DesktopAssets", () => {
3131
it.effect("uses canonical source-tree icons for unpackaged development", () =>
3232
Effect.gen(function* () {
33-
const developmentEnvironmentLayer = DesktopEnvironment.layer({
33+
const layerDevelopmentEnvironment = DesktopEnvironment.layer({
3434
dirname: "/repo/apps/desktop/dist-electron",
3535
homeDirectory: "/Users/alice",
3636
platform: "linux",
@@ -49,13 +49,13 @@ describe("DesktopAssets", () => {
4949
),
5050
),
5151
);
52-
const fileSystemLayer = FileSystem.layerNoop({
52+
const layerFileSystem = FileSystem.layerNoop({
5353
exists: (path) => Effect.succeed(String(path).includes("/assets/dev/")),
5454
});
5555
const assets = yield* DesktopAssets.DesktopAssets.pipe(
5656
Effect.provide(
5757
DesktopAssets.layer.pipe(
58-
Layer.provide(Layer.merge(fileSystemLayer, developmentEnvironmentLayer)),
58+
Layer.provide(Layer.merge(layerFileSystem, layerDevelopmentEnvironment)),
5959
),
6060
),
6161
);
@@ -79,13 +79,13 @@ describe("DesktopAssets", () => {
7979
pathOrDescriptor: candidatePath,
8080
description: "private filesystem diagnostic",
8181
});
82-
const fileSystemLayer = FileSystem.layerNoop({
82+
const layerFileSystem = FileSystem.layerNoop({
8383
exists: (path) => (path === candidatePath ? Effect.fail(cause) : Effect.succeed(false)),
8484
});
85-
const assetsLayer = DesktopAssets.layer.pipe(
86-
Layer.provide(Layer.merge(fileSystemLayer, environmentLayer)),
85+
const layerAssets = DesktopAssets.layer.pipe(
86+
Layer.provide(Layer.merge(layerFileSystem, layerEnvironment)),
8787
);
88-
const assets = yield* DesktopAssets.DesktopAssets.pipe(Effect.provide(assetsLayer));
88+
const assets = yield* DesktopAssets.DesktopAssets.pipe(Effect.provide(layerAssets));
8989

9090
const error = yield* assets.resolveResourcePath(fileName).pipe(Effect.flip);
9191

‎apps/desktop/src/app/DesktopClerk.test.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import * as DesktopClerk from "./DesktopClerk.ts";
3838
import * as DesktopEnvironment from "./DesktopEnvironment.ts";
3939
import * as DesktopPreReadyFileSystem from "./DesktopPreReadyFileSystem.ts";
4040

41-
const makeDesktopClerkLayer = (
41+
const layerDesktopClerk = (
4242
isDevelopment = true,
4343
events: string[] = [],
4444
platform: NodeJS.Platform = "darwin",
@@ -94,7 +94,7 @@ describe("DesktopClerk", () => {
9494
});
9595

9696
return Effect.gen(function* () {
97-
yield* Effect.scoped(Layer.build(makeDesktopClerkLayer(true, events)));
97+
yield* Effect.scoped(Layer.build(layerDesktopClerk(true, events)));
9898

9999
assert.deepEqual(createClerkBridgeMock.mock.calls, [
100100
[
@@ -143,7 +143,7 @@ describe("DesktopClerk", () => {
143143
Effect.runSync(
144144
Effect.scoped(
145145
Layer.build(
146-
makeDesktopClerkLayer(isDevelopment, events, platform, DesktopPreReadyFileSystem.layer),
146+
layerDesktopClerk(isDevelopment, events, platform, DesktopPreReadyFileSystem.layer),
147147
),
148148
),
149149
);
@@ -160,7 +160,7 @@ describe("DesktopClerk", () => {
160160
});
161161

162162
return Effect.gen(function* () {
163-
const error = yield* Effect.scoped(Layer.build(makeDesktopClerkLayer())).pipe(Effect.flip);
163+
const error = yield* Effect.scoped(Layer.build(layerDesktopClerk())).pipe(Effect.flip);
164164

165165
assert.instanceOf(error, DesktopClerk.DesktopClerkBridgeInitializationError);
166166
assert.equal(error.stateDir, "/tmp/t3-state");
@@ -183,7 +183,7 @@ describe("DesktopClerk", () => {
183183
});
184184

185185
return Effect.gen(function* () {
186-
const exit = yield* Effect.exit(Effect.scoped(Layer.build(makeDesktopClerkLayer(false))));
186+
const exit = yield* Effect.exit(Effect.scoped(Layer.build(layerDesktopClerk(false))));
187187

188188
assert.equal(exit._tag, "Failure");
189189
if (exit._tag === "Failure") {
@@ -222,7 +222,7 @@ describe("DesktopClerk", () => {
222222
assert.equal(quit.mock.calls.length, 0);
223223
assert.deepEqual(registeredEvents, ["open-url", "second-instance"]);
224224
}).pipe(
225-
Effect.provide(makeDesktopClerkLayer()),
225+
Effect.provide(layerDesktopClerk()),
226226
Effect.provideService(ElectronApp.ElectronApp, electronApp),
227227
Effect.provideService(ElectronWindow.ElectronWindow, electronWindow),
228228
);
@@ -250,7 +250,7 @@ describe("DesktopClerk", () => {
250250
assert.equal(quit.mock.calls.length, 1);
251251
assert.deepEqual(registeredEvents, []);
252252
}).pipe(
253-
Effect.provide(makeDesktopClerkLayer()),
253+
Effect.provide(layerDesktopClerk()),
254254
Effect.provideService(ElectronApp.ElectronApp, electronApp),
255255
Effect.provideService(ElectronWindow.ElectronWindow, electronWindow),
256256
);
@@ -296,7 +296,7 @@ it.effect(
296296
assert.equal(event.preventDefault.mock.calls.length, 1);
297297
}).pipe(
298298
Effect.scoped,
299-
Effect.provide(makeDesktopClerkLayer()),
299+
Effect.provide(layerDesktopClerk()),
300300
Effect.provideService(ElectronApp.ElectronApp, electronApp),
301301
Effect.provideService(ElectronWindow.ElectronWindow, electronWindow),
302302
);
@@ -374,7 +374,7 @@ it.effect.each(["startup", "open-url"] as const)(
374374
assert.strictEqual(delivery?.flowId, request.flowId);
375375
assert.strictEqual(delivery?.returnUrl, request.returnUrl);
376376
}).pipe(
377-
Effect.provide(makeDesktopClerkLayer(true, [], "darwin", undefined, shell)),
377+
Effect.provide(layerDesktopClerk(true, [], "darwin", undefined, shell)),
378378
Effect.provideService(HostProcessArguments, entry === "startup" ? ["t3", link] : ["t3"]),
379379
Effect.provideService(ElectronApp.ElectronApp, electronApp),
380380
Effect.provideService(

‎apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -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

103103
describe("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
);

‎apps/desktop/src/app/DesktopEnvironment.test.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const defaultInput = {
2020
runningUnderArm64Translation: false,
2121
} satisfies DesktopEnvironment.MakeDesktopEnvironmentInput;
2222

23-
const makeEnvironmentLayer = (
23+
const layerEnvironment = (
2424
overrides: Partial<DesktopEnvironment.MakeDesktopEnvironmentInput> = {},
2525
env: Record<string, string | undefined> = {},
2626
) =>
@@ -36,8 +36,7 @@ const makeEnvironmentLayer = (
3636
const makeEnvironment = (
3737
overrides: Partial<DesktopEnvironment.MakeDesktopEnvironmentInput> = {},
3838
env: Record<string, string | undefined> = {},
39-
) =>
40-
DesktopEnvironment.DesktopEnvironment.pipe(Effect.provide(makeEnvironmentLayer(overrides, env)));
39+
) => DesktopEnvironment.DesktopEnvironment.pipe(Effect.provide(layerEnvironment(overrides, env)));
4140

4241
describe("DesktopEnvironment", () => {
4342
it.effect("derives state paths and development identity inside Effect", () =>

0 commit comments

Comments
 (0)