@gaganref/confect-alchemy 10.3.1-fork.95 → 10.6.0-fork.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/Backend.d.ts.map +1 -1
- package/dist/Backend.js +2 -3
- package/dist/Backend.js.map +1 -1
- package/dist/Code.d.ts +16 -3
- package/dist/Code.d.ts.map +1 -1
- package/dist/Code.js +13 -3
- package/dist/Code.js.map +1 -1
- package/dist/Confect.d.ts.map +1 -1
- package/dist/Confect.js +1 -2
- package/dist/Convex.d.ts.map +1 -1
- package/dist/Convex.js +3 -4
- package/dist/ConvexClient.d.ts +14 -4
- package/dist/ConvexClient.d.ts.map +1 -1
- package/dist/ConvexClient.js +44 -36
- package/dist/ConvexClient.js.map +1 -1
- package/dist/DeployKey.d.ts +22 -12
- package/dist/DeployKey.d.ts.map +1 -1
- package/dist/DeployKey.js +41 -29
- package/dist/DeployKey.js.map +1 -1
- package/dist/Deployment.d.ts +19 -10
- package/dist/Deployment.d.ts.map +1 -1
- package/dist/Deployment.js +22 -19
- package/dist/Deployment.js.map +1 -1
- package/dist/EnvironmentVariables.d.ts +23 -31
- package/dist/EnvironmentVariables.d.ts.map +1 -1
- package/dist/EnvironmentVariables.js +21 -20
- package/dist/EnvironmentVariables.js.map +1 -1
- package/dist/Project.d.ts +15 -10
- package/dist/Project.d.ts.map +1 -1
- package/dist/Project.js +23 -22
- package/dist/Project.js.map +1 -1
- package/dist/Providers.d.ts +3 -1
- package/dist/Providers.d.ts.map +1 -1
- package/dist/Providers.js +19 -18
- package/dist/Providers.js.map +1 -1
- package/dist/_virtual/_rolldown/runtime.js +5 -6
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/internal/CodeDeployment.d.ts +6 -1
- package/dist/internal/CodeDeployment.d.ts.map +1 -1
- package/dist/internal/CodeDeployment.js +10 -8
- package/dist/internal/CodeDeployment.js.map +1 -1
- package/dist/internal/CommandRunner.d.ts +6 -1
- package/dist/internal/CommandRunner.d.ts.map +1 -1
- package/dist/internal/CommandRunner.js +11 -9
- package/dist/internal/CommandRunner.js.map +1 -1
- package/dist/internal/FileLock.d.ts +7 -3
- package/dist/internal/FileLock.d.ts.map +1 -1
- package/dist/internal/FileLock.js +10 -8
- package/dist/internal/FileLock.js.map +1 -1
- package/dist/internal/Lifecycle.d.ts +3 -1
- package/dist/internal/Lifecycle.d.ts.map +1 -1
- package/dist/internal/Lifecycle.js +3 -4
- package/dist/internal/Lifecycle.js.map +1 -1
- package/dist/internal/LocalBackend.d.ts +7 -3
- package/dist/internal/LocalBackend.d.ts.map +1 -1
- package/dist/internal/LocalBackend.js +26 -18
- package/dist/internal/LocalBackend.js.map +1 -1
- package/dist/internal/LocalSidecar.d.ts +4 -1
- package/dist/internal/LocalSidecar.d.ts.map +1 -1
- package/dist/internal/LocalSidecar.js +4 -2
- package/dist/internal/LocalSidecar.js.map +1 -1
- package/dist/internal/Loopback.d.ts.map +1 -1
- package/dist/internal/Loopback.js +1 -2
- package/dist/internal/MountInit.d.ts +5 -1
- package/dist/internal/MountInit.d.ts.map +1 -1
- package/dist/internal/MountInit.js +5 -4
- package/dist/internal/MountInit.js.map +1 -1
- package/dist/internal/PushLock.d.ts +7 -3
- package/dist/internal/PushLock.d.ts.map +1 -1
- package/dist/internal/PushLock.js +7 -6
- package/dist/internal/PushLock.js.map +1 -1
- package/dist/internal/ResourceIdentity.d.ts.map +1 -1
- package/dist/internal/ResourceIdentity.js +5 -3
- package/dist/internal/ResourceIdentity.js.map +1 -1
- package/dist/internal/UserCache.d.ts +2 -0
- package/dist/internal/UserCache.d.ts.map +1 -1
- package/dist/internal/UserCache.js +5 -4
- package/dist/internal/UserCache.js.map +1 -1
- package/dist/internal/Zip.d.ts +5 -1
- package/dist/internal/Zip.d.ts.map +1 -1
- package/dist/internal/Zip.js +9 -8
- package/dist/internal/Zip.js.map +1 -1
- package/package.json +5 -5
- package/src/Backend.ts +7 -6
- package/src/Code.ts +11 -0
- package/src/ConvexClient.ts +87 -74
- package/src/DeployKey.ts +73 -44
- package/src/Deployment.ts +50 -37
- package/src/EnvironmentVariables.ts +30 -27
- package/src/Project.ts +42 -41
- package/src/Providers.ts +2 -0
- package/src/index.ts +3 -0
- package/src/internal/CodeDeployment.ts +17 -11
- package/src/internal/CommandRunner.ts +27 -26
- package/src/internal/FileLock.ts +15 -12
- package/src/internal/Lifecycle.ts +11 -7
- package/src/internal/LocalBackend.ts +45 -39
- package/src/internal/LocalSidecar.ts +3 -0
- package/src/internal/MountInit.ts +8 -6
- package/src/internal/PushLock.ts +13 -11
- package/src/internal/ResourceIdentity.ts +12 -5
- package/src/internal/UserCache.ts +13 -4
- package/src/internal/Zip.ts +13 -8
package/dist/Project.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { ConvexClient } from "./ConvexClient.js";
|
|
2
|
-
import { checkpointCreate, shouldAdopt } from "./internal/Lifecycle.js";
|
|
3
2
|
import { resourceName } from "./internal/ResourceIdentity.js";
|
|
3
|
+
import { checkpointCreate, shouldAdopt } from "./internal/Lifecycle.js";
|
|
4
4
|
import * as Effect from "effect/Effect";
|
|
5
5
|
import * as Provider from "alchemy/Provider";
|
|
6
6
|
import { Resource } from "alchemy/Resource";
|
|
7
7
|
import * as Schema from "effect/Schema";
|
|
8
|
+
import * as Array from "effect/Array";
|
|
8
9
|
import { OwnedBySomeoneElse, Unowned } from "alchemy/AdoptPolicy";
|
|
9
10
|
import { isResolved } from "alchemy/Diff";
|
|
10
|
-
|
|
11
|
+
// src/Project.ts
|
|
11
12
|
const Project = Resource("Convex.Project", { defaultRemovalPolicy: "retain" });
|
|
12
13
|
var ProjectTeamChange = class extends Schema.TaggedError()("ProjectTeamChange", {
|
|
13
14
|
projectId: Schema.Finite,
|
|
@@ -16,7 +17,7 @@ var ProjectTeamChange = class extends Schema.TaggedError()("ProjectTeamChange",
|
|
|
16
17
|
}) {};
|
|
17
18
|
var AmbiguousProject = class extends Schema.TaggedError()("AmbiguousProject", {
|
|
18
19
|
teamId: Schema.Finite,
|
|
19
|
-
|
|
20
|
+
projectName: Schema.String,
|
|
20
21
|
projectIds: Schema.Array(Schema.Finite)
|
|
21
22
|
}) {};
|
|
22
23
|
const provider = Effect.gen(function* () {
|
|
@@ -28,25 +29,26 @@ const provider = Effect.gen(function* () {
|
|
|
28
29
|
slug: project.slug
|
|
29
30
|
});
|
|
30
31
|
const find = Effect.fn("Project.find")(function* (teamId, name) {
|
|
31
|
-
const
|
|
32
|
-
|
|
32
|
+
const projects = yield* client.listProjects(teamId);
|
|
33
|
+
const matches = Array.filter(projects, (project) => project.name === name);
|
|
34
|
+
if (matches.length > 1) return yield* AmbiguousProject.make({
|
|
33
35
|
teamId,
|
|
34
|
-
name,
|
|
35
|
-
projectIds:
|
|
36
|
+
projectName: name,
|
|
37
|
+
projectIds: Array.map(matches, (project) => project.id)
|
|
36
38
|
});
|
|
37
39
|
return matches[0];
|
|
38
40
|
});
|
|
39
41
|
return {
|
|
40
42
|
diff: Effect.fn("Project.diff")(function* ({ news, output }) {
|
|
41
|
-
if (!isResolved(news) ||
|
|
42
|
-
if (output.teamId !== news.teamId) return yield*
|
|
43
|
+
if (!isResolved(news) || output === void 0) return;
|
|
44
|
+
if (output.teamId !== news.teamId) return yield* ProjectTeamChange.make({
|
|
43
45
|
projectId: output.projectId,
|
|
44
46
|
teamId: output.teamId,
|
|
45
47
|
requestedTeamId: news.teamId
|
|
46
48
|
});
|
|
47
49
|
const project = yield* client.getProject(output.projectId).pipe(Effect.catchTag("ConvexNotFound", () => Effect.void));
|
|
48
|
-
if (
|
|
49
|
-
if (project.teamId !== news.teamId) return yield*
|
|
50
|
+
if (project === void 0) return { action: "update" };
|
|
51
|
+
if (project.teamId !== news.teamId) return yield* ProjectTeamChange.make({
|
|
50
52
|
projectId: project.id,
|
|
51
53
|
teamId: project.teamId,
|
|
52
54
|
requestedTeamId: news.teamId
|
|
@@ -54,31 +56,31 @@ const provider = Effect.gen(function* () {
|
|
|
54
56
|
if ((news.name ?? output.name) !== project.name) return { action: "update" };
|
|
55
57
|
}),
|
|
56
58
|
read: Effect.fn("Project.read")(function* ({ fqn, instanceId, olds, output }) {
|
|
57
|
-
if (output) {
|
|
59
|
+
if (output !== void 0) {
|
|
58
60
|
const project = yield* client.getProject(output.projectId).pipe(Effect.catchTag("ConvexNotFound", () => Effect.void));
|
|
59
|
-
return project ? attributes(project) : void 0;
|
|
61
|
+
return project !== void 0 ? attributes(project) : void 0;
|
|
60
62
|
}
|
|
61
63
|
if (olds.teamId === void 0) return;
|
|
62
64
|
const project = yield* find(olds.teamId, olds.name ?? (yield* resourceName("project", fqn, instanceId)));
|
|
63
|
-
return project ? Unowned(attributes(project)) : void 0;
|
|
65
|
+
return project !== void 0 ? Unowned(attributes(project)) : void 0;
|
|
64
66
|
}),
|
|
65
67
|
reconcile: Effect.fn("Project.reconcile")(function* ({ fqn, instanceId, news, output }) {
|
|
66
|
-
if (
|
|
67
|
-
if (output && output.teamId !== news.teamId) return yield*
|
|
68
|
+
if (output === void 0) yield* checkpointCreate(fqn, instanceId, news);
|
|
69
|
+
if (output !== void 0 && output.teamId !== news.teamId) return yield* ProjectTeamChange.make({
|
|
68
70
|
projectId: output.projectId,
|
|
69
71
|
teamId: output.teamId,
|
|
70
72
|
requestedTeamId: news.teamId
|
|
71
73
|
});
|
|
72
|
-
let project = output ? yield* client.getProject(output.projectId).pipe(Effect.catchTag("ConvexNotFound", () => Effect.void)) : void 0;
|
|
74
|
+
let project = output !== void 0 ? yield* client.getProject(output.projectId).pipe(Effect.catchTag("ConvexNotFound", () => Effect.void)) : void 0;
|
|
73
75
|
const name = news.name ?? output?.name ?? (yield* resourceName("project", fqn, instanceId));
|
|
74
|
-
if (
|
|
76
|
+
if (project === void 0) {
|
|
75
77
|
const existing = yield* find(news.teamId, name);
|
|
76
|
-
if (existing && !(yield* shouldAdopt(fqn))) return yield* new OwnedBySomeoneElse({
|
|
78
|
+
if (existing !== void 0 && !(yield* shouldAdopt(fqn))) return yield* new OwnedBySomeoneElse({
|
|
77
79
|
message: "An existing project requires explicit adoption.",
|
|
78
80
|
resourceType: Project.Type,
|
|
79
81
|
physicalName: name
|
|
80
82
|
});
|
|
81
|
-
if (existing) {
|
|
83
|
+
if (existing !== void 0) {
|
|
82
84
|
project = existing;
|
|
83
85
|
yield* checkpointCreate(fqn, instanceId, news, attributes(existing));
|
|
84
86
|
} else {
|
|
@@ -86,7 +88,7 @@ const provider = Effect.gen(function* () {
|
|
|
86
88
|
project = yield* client.getProject(created.id);
|
|
87
89
|
}
|
|
88
90
|
}
|
|
89
|
-
if (project.teamId !== news.teamId) return yield*
|
|
91
|
+
if (project.teamId !== news.teamId) return yield* ProjectTeamChange.make({
|
|
90
92
|
projectId: project.id,
|
|
91
93
|
teamId: project.teamId,
|
|
92
94
|
requestedTeamId: news.teamId
|
|
@@ -117,7 +119,6 @@ const localProvider = Effect.succeed({
|
|
|
117
119
|
});
|
|
118
120
|
const layer = Provider.effect(Project, provider);
|
|
119
121
|
const localLayer = Provider.effect(Project, localProvider);
|
|
120
|
-
//#endregion
|
|
121
122
|
export { AmbiguousProject, Project, ProjectTeamChange, layer, localLayer, localProvider, provider };
|
|
122
123
|
|
|
123
124
|
//# sourceMappingURL=Project.js.map
|
package/dist/Project.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Project.js","names":[],"sources":["../src/Project.ts"],"sourcesContent":["import { OwnedBySomeoneElse, Unowned } from \"alchemy/AdoptPolicy\";\nimport { isResolved } from \"alchemy/Diff\";\nimport * as Provider from \"alchemy/Provider\";\nimport { Resource } from \"alchemy/Resource\";\nimport * as Effect from \"effect/Effect\";\nimport * as Schema from \"effect/Schema\";\n\nimport { ConvexClient } from \"./ConvexClient.js\";\nimport type { Providers } from \"./Providers.js\";\nimport { resourceName } from \"./internal/ResourceIdentity.js\";\nimport { checkpointCreate, shouldAdopt } from \"./internal/Lifecycle.js\";\n\nexport interface ProjectProps {\n readonly teamId: number;\n readonly name?: string;\n}\n\nexport interface ProjectAttributes {\n readonly projectId: number;\n readonly teamId: number;\n readonly name: string;\n readonly slug: string;\n}\n\nexport type Project = Resource<\n \"Convex.Project\",\n ProjectProps,\n ProjectAttributes,\n never,\n Providers\n>;\nexport const Project = Resource<Project>(\"Convex.Project\", {\n defaultRemovalPolicy: \"retain\",\n});\n\nexport class ProjectTeamChange extends Schema.TaggedError<ProjectTeamChange>()(\n \"ProjectTeamChange\",\n {\n projectId: Schema.Finite,\n teamId: Schema.Finite,\n requestedTeamId: Schema.Finite,\n },\n) {}\n\nexport class AmbiguousProject extends Schema.TaggedError<AmbiguousProject>()(\n \"AmbiguousProject\",\n {\n teamId: Schema.Finite,\n name: Schema.String,\n projectIds: Schema.Array(Schema.Finite),\n },\n) {}\n\nexport const provider = Effect.gen(function* () {\n const client = yield* ConvexClient;\n const attributes = (project: {\n id: number;\n teamId: number;\n name: string;\n slug: string;\n }): ProjectAttributes => ({\n projectId: project.id,\n teamId: project.teamId,\n name: project.name,\n slug: project.slug,\n });\n const find = Effect.fn(\"Project.find\")(function* (\n teamId: number,\n name: string,\n ) {\n const matches = (yield* client.listProjects(teamId)).filter(\n (project) => project.name === name,\n );\n if (matches.length > 1)\n return yield* new AmbiguousProject({\n teamId,\n name,\n projectIds: matches.map((project) => project.id),\n });\n return matches[0];\n });\n return {\n diff: Effect.fn(\"Project.diff\")(function* ({ news, output }) {\n if (!isResolved(news) || !output) return;\n if (output.teamId !== news.teamId)\n return yield* new ProjectTeamChange({\n projectId: output.projectId,\n teamId: output.teamId,\n requestedTeamId: news.teamId,\n });\n const project = yield* client\n .getProject(output.projectId)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.void));\n if (!project) return { action: \"update\" };\n if (project.teamId !== news.teamId)\n return yield* new ProjectTeamChange({\n projectId: project.id,\n teamId: project.teamId,\n requestedTeamId: news.teamId,\n });\n if ((news.name ?? output.name) !== project.name)\n return { action: \"update\" };\n }),\n read: Effect.fn(\"Project.read\")(function* ({\n fqn,\n instanceId,\n olds,\n output,\n }) {\n if (output) {\n const project = yield* client\n .getProject(output.projectId)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.void));\n return project ? attributes(project) : undefined;\n }\n if (olds.teamId === undefined) return;\n const project = yield* find(\n olds.teamId,\n olds.name ?? (yield* resourceName(\"project\", fqn, instanceId)),\n );\n return project ? Unowned(attributes(project)) : undefined;\n }),\n reconcile: Effect.fn(\"Project.reconcile\")(function* ({\n fqn,\n instanceId,\n news,\n output,\n }) {\n if (!output) yield* checkpointCreate(fqn, instanceId, news);\n if (output && output.teamId !== news.teamId)\n return yield* new ProjectTeamChange({\n projectId: output.projectId,\n teamId: output.teamId,\n requestedTeamId: news.teamId,\n });\n let project = output\n ? yield* client\n .getProject(output.projectId)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.void))\n : undefined;\n const name =\n news.name ??\n output?.name ??\n (yield* resourceName(\"project\", fqn, instanceId));\n if (!project) {\n const existing = yield* find(news.teamId, name);\n if (existing && !(yield* shouldAdopt(fqn)))\n return yield* new OwnedBySomeoneElse({\n message: \"An existing project requires explicit adoption.\",\n resourceType: Project.Type,\n physicalName: name,\n });\n if (existing) {\n project = existing;\n yield* checkpointCreate(fqn, instanceId, news, attributes(existing));\n } else {\n const created = yield* client.createProject(news.teamId, {\n projectName: name,\n });\n project = yield* client.getProject(created.id);\n }\n }\n if (project.teamId !== news.teamId)\n return yield* new ProjectTeamChange({\n projectId: project.id,\n teamId: project.teamId,\n requestedTeamId: news.teamId,\n });\n if (project.name !== name)\n project = yield* client.updateProject(project.id, {\n name,\n });\n return attributes(project);\n }),\n delete: Effect.fn(\"Project.delete\")(function* ({ output }) {\n yield* client\n .deleteProject(output.projectId)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.void));\n }),\n } satisfies Provider.ProviderServiceInput<Project>;\n});\n\n/**\n * Under `alchemy dev` a project needs no Convex account: it is a fixed local\n * identity that local deployments ignore.\n */\nexport const localProvider = Effect.succeed({\n reconcile: Effect.fn(\"Project.localReconcile\")(function* ({\n fqn,\n instanceId,\n news,\n }) {\n const name = news.name ?? (yield* resourceName(\"project\", fqn, instanceId));\n return {\n projectId: 0,\n teamId: news.teamId,\n name,\n slug: name,\n } satisfies ProjectAttributes;\n }),\n delete: () => Effect.void,\n} satisfies Provider.ProviderServiceInput<Project>);\n\nexport const layer = Provider.effect(Project, provider);\nexport const localLayer = Provider.effect(Project, localProvider);\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Project.js","names":[],"sources":["../src/Project.ts"],"sourcesContent":["import { OwnedBySomeoneElse, Unowned } from \"alchemy/AdoptPolicy\";\nimport { isResolved } from \"alchemy/Diff\";\nimport * as Provider from \"alchemy/Provider\";\nimport { Resource } from \"alchemy/Resource\";\nimport * as Effect from \"effect/Effect\";\nimport * as Schema from \"effect/Schema\";\n\nimport { ConvexClient } from \"./ConvexClient.js\";\nimport type { Providers } from \"./Providers.js\";\nimport { resourceName } from \"./internal/ResourceIdentity.js\";\nimport { checkpointCreate, shouldAdopt } from \"./internal/Lifecycle.js\";\nimport * as Array from \"effect/Array\";\n\nexport interface ProjectProps {\n readonly teamId: number;\n readonly name?: string;\n}\n\nexport interface ProjectAttributes {\n readonly projectId: number;\n readonly teamId: number;\n readonly name: string;\n readonly slug: string;\n}\n\nexport type Project = Resource<\n \"Convex.Project\",\n ProjectProps,\n ProjectAttributes,\n never,\n Providers\n>;\nexport const Project = Resource<Project>(\"Convex.Project\", {\n defaultRemovalPolicy: \"retain\",\n});\n\nexport class ProjectTeamChange extends Schema.TaggedError<\n ProjectTeamChange,\n { readonly brand: unique symbol }\n>()(\"ProjectTeamChange\", {\n projectId: Schema.Finite,\n teamId: Schema.Finite,\n requestedTeamId: Schema.Finite,\n}) {}\n\nexport class AmbiguousProject extends Schema.TaggedError<\n AmbiguousProject,\n { readonly brand: unique symbol }\n>()(\"AmbiguousProject\", {\n teamId: Schema.Finite,\n projectName: Schema.String,\n projectIds: Schema.Array(Schema.Finite),\n}) {}\n\nexport const provider = Effect.gen(function* () {\n const client = yield* ConvexClient;\n const attributes = (project: {\n id: number;\n teamId: number;\n name: string;\n slug: string;\n }): ProjectAttributes => ({\n projectId: project.id,\n teamId: project.teamId,\n name: project.name,\n slug: project.slug,\n });\n const find = Effect.fn(\"Project.find\")(function* (\n teamId: number,\n name: string,\n ) {\n const projects = yield* client.listProjects(teamId);\n const matches = Array.filter(projects, (project) => project.name === name);\n if (matches.length > 1)\n return yield* AmbiguousProject.make({\n teamId,\n projectName: name,\n projectIds: Array.map(matches, (project) => project.id),\n });\n return matches[0];\n });\n return {\n diff: Effect.fn(\"Project.diff\")(function* ({ news, output }) {\n if (!isResolved(news) || output === undefined) return;\n if (output.teamId !== news.teamId)\n return yield* ProjectTeamChange.make({\n projectId: output.projectId,\n teamId: output.teamId,\n requestedTeamId: news.teamId,\n });\n const project = yield* client\n .getProject(output.projectId)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.void));\n if (project === undefined) return { action: \"update\" };\n if (project.teamId !== news.teamId)\n return yield* ProjectTeamChange.make({\n projectId: project.id,\n teamId: project.teamId,\n requestedTeamId: news.teamId,\n });\n if ((news.name ?? output.name) !== project.name)\n return { action: \"update\" };\n }),\n read: Effect.fn(\"Project.read\")(function* ({\n fqn,\n instanceId,\n olds,\n output,\n }) {\n if (output !== undefined) {\n const project = yield* client\n .getProject(output.projectId)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.void));\n return project !== undefined ? attributes(project) : undefined;\n }\n if (olds.teamId === undefined) return;\n const project = yield* find(\n olds.teamId,\n olds.name ?? (yield* resourceName(\"project\", fqn, instanceId)),\n );\n return project !== undefined ? Unowned(attributes(project)) : undefined;\n }),\n reconcile: Effect.fn(\"Project.reconcile\")(function* ({\n fqn,\n instanceId,\n news,\n output,\n }) {\n if (output === undefined) yield* checkpointCreate(fqn, instanceId, news);\n if (output !== undefined && output.teamId !== news.teamId)\n return yield* ProjectTeamChange.make({\n projectId: output.projectId,\n teamId: output.teamId,\n requestedTeamId: news.teamId,\n });\n let project =\n output !== undefined\n ? yield* client\n .getProject(output.projectId)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.void))\n : undefined;\n const name =\n news.name ??\n output?.name ??\n (yield* resourceName(\"project\", fqn, instanceId));\n if (project === undefined) {\n const existing = yield* find(news.teamId, name);\n if (existing !== undefined && !(yield* shouldAdopt(fqn)))\n return yield* new OwnedBySomeoneElse({\n message: \"An existing project requires explicit adoption.\",\n resourceType: Project.Type,\n physicalName: name,\n });\n if (existing !== undefined) {\n project = existing;\n yield* checkpointCreate(fqn, instanceId, news, attributes(existing));\n } else {\n const created = yield* client.createProject(news.teamId, {\n projectName: name,\n });\n project = yield* client.getProject(created.id);\n }\n }\n if (project.teamId !== news.teamId)\n return yield* ProjectTeamChange.make({\n projectId: project.id,\n teamId: project.teamId,\n requestedTeamId: news.teamId,\n });\n if (project.name !== name)\n project = yield* client.updateProject(project.id, {\n name,\n });\n return attributes(project);\n }),\n delete: Effect.fn(\"Project.delete\")(function* ({ output }) {\n yield* client\n .deleteProject(output.projectId)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.void));\n }),\n } satisfies Provider.ProviderServiceInput<Project>;\n});\n\n/**\n * Under `alchemy dev` a project needs no Convex account: it is a fixed local\n * identity that local deployments ignore.\n */\nexport const localProvider = Effect.succeed({\n reconcile: Effect.fn(\"Project.localReconcile\")(function* ({\n fqn,\n instanceId,\n news,\n }) {\n const name = news.name ?? (yield* resourceName(\"project\", fqn, instanceId));\n return {\n projectId: 0,\n teamId: news.teamId,\n name,\n slug: name,\n } satisfies ProjectAttributes;\n }),\n delete: () => Effect.void,\n} satisfies Provider.ProviderServiceInput<Project>);\n\nexport const layer = Provider.effect(Project, provider);\nexport const localLayer = Provider.effect(Project, localProvider);\n"],"mappings":"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"}
|
package/dist/Providers.d.ts
CHANGED
|
@@ -9,9 +9,11 @@ export declare class Providers extends Providers_base {
|
|
|
9
9
|
* `alchemy deploy` resolves each resource to its cloud provider; `alchemy dev`
|
|
10
10
|
* resolves the same resources to local providers backed by a local Convex
|
|
11
11
|
* backend, so one stack definition serves both.
|
|
12
|
+
*
|
|
13
|
+
* @stability unstable
|
|
12
14
|
*/
|
|
13
15
|
export declare const providers: (options?: {
|
|
14
16
|
readonly token?: Redacted.Redacted<string>;
|
|
15
|
-
}) => Layer.Layer<Providers, never, import("alchemy
|
|
17
|
+
}) => Layer.Layer<Providers, never, import("alchemy").AlchemyContext | import("alchemy/Artifacts").ArtifactStore | import("effect/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/FileSystem").FileSystem | import("effect/http/HttpClient").HttpClient | import("effect/Path").Path | import("effect/crypto/SecureRandom").SecureRandom | import("alchemy").Stack>;
|
|
16
18
|
export {};
|
|
17
19
|
//# sourceMappingURL=Providers.d.ts.map
|
package/dist/Providers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Providers.d.ts","
|
|
1
|
+
{"version":3,"file":"Providers.d.ts","sources":["../src/Providers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;;AAWtC,qBAAa,SAAU,SAAQ,cAE9B;CAAG;AAEJ;;;;;;;GAOG;AACH,eAAO,MAAM,SAAS,aAAc;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC5C,qXAwCE,CAAC"}
|
package/dist/Providers.js
CHANGED
|
@@ -1,22 +1,24 @@
|
|
|
1
|
-
import { layer } from "./
|
|
2
|
-
import { layer as layer$1 } from "./
|
|
3
|
-
import { layer as layer$2 } from "./
|
|
4
|
-
import {
|
|
5
|
-
import { EnvironmentVariables, layer as layer$4, localLayer as localLayer$
|
|
6
|
-
import { Project, layer as layer$5, localLayer as localLayer$
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
1
|
+
import { Code, layer, localLayer } from "./Code.js";
|
|
2
|
+
import { layer as layer$1 } from "./ConvexClient.js";
|
|
3
|
+
import { Deployment, layer as layer$2, localLayer as localLayer$1 } from "./Deployment.js";
|
|
4
|
+
import { DeployKey, layer as layer$3, localLayer as localLayer$2 } from "./DeployKey.js";
|
|
5
|
+
import { EnvironmentVariables, layer as layer$4, localLayer as localLayer$3 } from "./EnvironmentVariables.js";
|
|
6
|
+
import { Project, layer as layer$5, localLayer as localLayer$4 } from "./Project.js";
|
|
7
|
+
import { layer as layer$6 } from "./internal/CommandRunner.js";
|
|
8
|
+
import { layer as layer$7 } from "./internal/PushLock.js";
|
|
9
9
|
import * as Provider from "alchemy/Provider";
|
|
10
10
|
import * as Layer from "effect/Layer";
|
|
11
11
|
import * as FetchHttpClient from "effect/http/FetchHttpClient";
|
|
12
12
|
import * as ProviderLayer from "alchemy/Local/ProviderLayer";
|
|
13
|
-
|
|
13
|
+
// src/Providers.ts
|
|
14
14
|
var Providers = class extends Provider.ProviderCollection()("@confect/alchemy/Providers") {};
|
|
15
15
|
/**
|
|
16
16
|
* Register Convex resources without eagerly resolving management credentials.
|
|
17
17
|
* `alchemy deploy` resolves each resource to its cloud provider; `alchemy dev`
|
|
18
18
|
* resolves the same resources to local providers backed by a local Convex
|
|
19
19
|
* backend, so one stack definition serves both.
|
|
20
|
+
*
|
|
21
|
+
* @stability unstable
|
|
20
22
|
*/
|
|
21
23
|
const providers = (options) => Layer.effect(Providers, Provider.collection([
|
|
22
24
|
Project,
|
|
@@ -26,21 +28,20 @@ const providers = (options) => Layer.effect(Providers, Provider.collection([
|
|
|
26
28
|
Code
|
|
27
29
|
])).pipe(Layer.provide(Layer.mergeAll(ProviderLayer.dual(Project, {
|
|
28
30
|
live: () => layer$5,
|
|
29
|
-
local: () => localLayer$
|
|
31
|
+
local: () => localLayer$4
|
|
30
32
|
}), ProviderLayer.dual(Deployment, {
|
|
31
|
-
live: () => layer$
|
|
32
|
-
local: () => localLayer$
|
|
33
|
+
live: () => layer$2,
|
|
34
|
+
local: () => localLayer$1
|
|
33
35
|
}), ProviderLayer.dual(DeployKey, {
|
|
34
|
-
live: () => layer$
|
|
35
|
-
local: () => localLayer$
|
|
36
|
+
live: () => layer$3,
|
|
37
|
+
local: () => localLayer$2
|
|
36
38
|
}), ProviderLayer.dual(EnvironmentVariables, {
|
|
37
39
|
live: () => layer$4,
|
|
38
|
-
local: () => localLayer$
|
|
40
|
+
local: () => localLayer$3
|
|
39
41
|
}), ProviderLayer.dual(Code, {
|
|
40
|
-
live: () => layer
|
|
42
|
+
live: () => layer,
|
|
41
43
|
local: () => localLayer
|
|
42
|
-
}))), Layer.provide(layer(options).pipe(Layer.provide(FetchHttpClient.layer))), Layer.provide(layer$
|
|
43
|
-
//#endregion
|
|
44
|
+
}))), Layer.provide(layer$1(options).pipe(Layer.provide(FetchHttpClient.layer))), Layer.provide(layer$6), Layer.provide(layer$7()));
|
|
44
45
|
export { Providers, providers };
|
|
45
46
|
|
|
46
47
|
//# sourceMappingURL=Providers.js.map
|
package/dist/Providers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Providers.js","names":["Project.Project","Deployment.Deployment","DeployKey.DeployKey","EnvironmentVariables.EnvironmentVariables","Code.Code","Project.layer","Project.localLayer","Deployment.layer","Deployment.localLayer","DeployKey.layer","DeployKey.localLayer","EnvironmentVariables.layer","EnvironmentVariables.localLayer","Code.layer","Code.localLayer","ConvexClient.layer","CommandRunner.layer","PushLock.layer"],"sources":["../src/Providers.ts"],"sourcesContent":["import * as ProviderLayer from \"alchemy/Local/ProviderLayer\";\nimport * as Provider from \"alchemy/Provider\";\nimport type * as Redacted from \"effect/Redacted\";\nimport * as Layer from \"effect/Layer\";\nimport * as FetchHttpClient from \"effect/http/FetchHttpClient\";\nimport * as Code from \"./Code.js\";\nimport * as ConvexClient from \"./ConvexClient.js\";\nimport * as Deployment from \"./Deployment.js\";\nimport * as DeployKey from \"./DeployKey.js\";\nimport * as EnvironmentVariables from \"./EnvironmentVariables.js\";\nimport * as Project from \"./Project.js\";\nimport * as CommandRunner from \"./internal/CommandRunner.js\";\nimport * as PushLock from \"./internal/PushLock.js\";\n\nexport class Providers extends Provider.ProviderCollection<Providers>()(\n \"@confect/alchemy/Providers\",\n) {}\n\n/**\n * Register Convex resources without eagerly resolving management credentials.\n * `alchemy deploy` resolves each resource to its cloud provider; `alchemy dev`\n * resolves the same resources to local providers backed by a local Convex\n * backend, so one stack definition serves both.\n */\nexport const providers = (options?: {\n readonly token?: Redacted.Redacted<string>;\n}) =>\n Layer.effect(\n Providers,\n Provider.collection([\n Project.Project,\n Deployment.Deployment,\n DeployKey.DeployKey,\n EnvironmentVariables.EnvironmentVariables,\n Code.Code,\n ]),\n ).pipe(\n Layer.provide(\n Layer.mergeAll(\n ProviderLayer.dual(Project.Project, {\n live: () => Project.layer,\n local: () => Project.localLayer,\n }),\n ProviderLayer.dual(Deployment.Deployment, {\n live: () => Deployment.layer,\n local: () => Deployment.localLayer,\n }),\n ProviderLayer.dual(DeployKey.DeployKey, {\n live: () => DeployKey.layer,\n local: () => DeployKey.localLayer,\n }),\n ProviderLayer.dual(EnvironmentVariables.EnvironmentVariables, {\n live: () => EnvironmentVariables.layer,\n local: () => EnvironmentVariables.localLayer,\n }),\n ProviderLayer.dual(Code.Code, {\n live: () => Code.layer,\n local: () => Code.localLayer,\n }),\n ),\n ),\n Layer.provide(\n ConvexClient.layer(options).pipe(Layer.provide(FetchHttpClient.layer)),\n ),\n Layer.provide(CommandRunner.layer),\n Layer.provide(PushLock.layer()),\n );\n"],"mappings":";;;;;;;;;;;;;AAcA,IAAa,YAAb,cAA+B,SAAS,mBAA8B,CAAC,CACrE,4BACF,CAAC,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"Providers.js","names":["Project.Project","Deployment.Deployment","DeployKey.DeployKey","EnvironmentVariables.EnvironmentVariables","Code.Code","Project.layer","Project.localLayer","Deployment.layer","Deployment.localLayer","DeployKey.layer","DeployKey.localLayer","EnvironmentVariables.layer","EnvironmentVariables.localLayer","Code.layer","Code.localLayer","ConvexClient.layer","CommandRunner.layer","PushLock.layer"],"sources":["../src/Providers.ts"],"sourcesContent":["import * as ProviderLayer from \"alchemy/Local/ProviderLayer\";\nimport * as Provider from \"alchemy/Provider\";\nimport type * as Redacted from \"effect/Redacted\";\nimport * as Layer from \"effect/Layer\";\nimport * as FetchHttpClient from \"effect/http/FetchHttpClient\";\nimport * as Code from \"./Code.js\";\nimport * as ConvexClient from \"./ConvexClient.js\";\nimport * as Deployment from \"./Deployment.js\";\nimport * as DeployKey from \"./DeployKey.js\";\nimport * as EnvironmentVariables from \"./EnvironmentVariables.js\";\nimport * as Project from \"./Project.js\";\nimport * as CommandRunner from \"./internal/CommandRunner.js\";\nimport * as PushLock from \"./internal/PushLock.js\";\n\nexport class Providers extends Provider.ProviderCollection<Providers>()(\n \"@confect/alchemy/Providers\",\n) {}\n\n/**\n * Register Convex resources without eagerly resolving management credentials.\n * `alchemy deploy` resolves each resource to its cloud provider; `alchemy dev`\n * resolves the same resources to local providers backed by a local Convex\n * backend, so one stack definition serves both.\n *\n * @stability unstable\n */\nexport const providers = (options?: {\n readonly token?: Redacted.Redacted<string>;\n}) =>\n Layer.effect(\n Providers,\n Provider.collection([\n Project.Project,\n Deployment.Deployment,\n DeployKey.DeployKey,\n EnvironmentVariables.EnvironmentVariables,\n Code.Code,\n ]),\n ).pipe(\n Layer.provide(\n Layer.mergeAll(\n ProviderLayer.dual(Project.Project, {\n live: () => Project.layer,\n local: () => Project.localLayer,\n }),\n ProviderLayer.dual(Deployment.Deployment, {\n live: () => Deployment.layer,\n local: () => Deployment.localLayer,\n }),\n ProviderLayer.dual(DeployKey.DeployKey, {\n live: () => DeployKey.layer,\n local: () => DeployKey.localLayer,\n }),\n ProviderLayer.dual(EnvironmentVariables.EnvironmentVariables, {\n live: () => EnvironmentVariables.layer,\n local: () => EnvironmentVariables.localLayer,\n }),\n ProviderLayer.dual(Code.Code, {\n live: () => Code.layer,\n local: () => Code.localLayer,\n }),\n ),\n ),\n Layer.provide(\n ConvexClient.layer(options).pipe(Layer.provide(FetchHttpClient.layer)),\n ),\n Layer.provide(CommandRunner.layer),\n Layer.provide(PushLock.layer()),\n );\n"],"mappings":";;;;;;;;;;;;;AAcA,IAAa,YAAb,cAA+B,SAAS,mBAA8B,CAAC,CACrE,4BACF,CAAC,CAAC,CAAC;;;;;;;;;AAUH,MAAa,aAAa,YAGxB,MAAM,OACJ,WACA,SAAS,WAAW;CAClBA;CACAC;CACAC;CACAC;CACAC;AACF,CAAC,CACH,CAAC,CAAC,KACA,MAAM,QACJ,MAAM,SACJ,cAAc,KAAKJ,SAAiB;CAClC,YAAYK;CACZ,aAAaC;AACf,CAAC,GACD,cAAc,KAAKL,YAAuB;CACxC,YAAYM;CACZ,aAAaC;AACf,CAAC,GACD,cAAc,KAAKN,WAAqB;CACtC,YAAYO;CACZ,aAAaC;AACf,CAAC,GACD,cAAc,KAAKP,sBAA2C;CAC5D,YAAYQ;CACZ,aAAaC;AACf,CAAC,GACD,cAAc,KAAKR,MAAW;CAC5B,YAAYS;CACZ,aAAaC;AACf,CAAC,CACH,CACF,GACA,MAAM,QACJC,QAAmB,OAAO,CAAC,CAAC,KAAK,MAAM,QAAQ,gBAAgB,KAAK,CAAC,CACvE,GACA,MAAM,QAAQC,OAAmB,GACjC,MAAM,QAAQC,QAAe,CAAC,CAChC"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
|
-
|
|
1
|
+
// \0rolldown/runtime.js
|
|
2
2
|
var __defProp = Object.defineProperty;
|
|
3
|
-
var __exportAll = (all,
|
|
4
|
-
let target = {};
|
|
3
|
+
var __exportAll = (all, flags) => {
|
|
4
|
+
let target = Object.setPrototypeOf({}, null);
|
|
5
5
|
for (var name in all) __defProp(target, name, {
|
|
6
6
|
get: all[name],
|
|
7
7
|
enumerable: true
|
|
8
8
|
});
|
|
9
|
-
if (!
|
|
10
|
-
return target;
|
|
9
|
+
if (!(flags & 1)) __defProp(target, Symbol.toStringTag, { value: "Module" });
|
|
10
|
+
return flags & 2 ? target : Object.preventExtensions(target);
|
|
11
11
|
};
|
|
12
|
-
//#endregion
|
|
13
12
|
export { __exportAll };
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -8,9 +8,14 @@ import * as MountInit from "./MountInit.js";
|
|
|
8
8
|
import { PushLock } from "./PushLock.js";
|
|
9
9
|
declare const InvalidDeploymentTarget_base: Schema.Class<InvalidDeploymentTarget, Schema.TaggedStruct<"InvalidDeploymentTarget", {
|
|
10
10
|
readonly reason: Schema.Literals<readonly ["deployment", "deployKey"]>;
|
|
11
|
-
}>, import("effect/Cause").YieldableError
|
|
11
|
+
}>, import("effect/Cause").YieldableError & {
|
|
12
|
+
readonly brand: unique symbol;
|
|
13
|
+
}>;
|
|
12
14
|
export declare class InvalidDeploymentTarget extends InvalidDeploymentTarget_base {
|
|
13
15
|
}
|
|
16
|
+
/**
|
|
17
|
+
* @internal
|
|
18
|
+
*/
|
|
14
19
|
export declare const deploy: (props: CodeProps, mode?: ProviderMode | undefined) => Effect.Effect<{
|
|
15
20
|
name: string;
|
|
16
21
|
url: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeDeployment.d.ts","
|
|
1
|
+
{"version":3,"file":"CodeDeployment.d.ts","sources":["../../src/internal/CodeDeployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAGpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAmB,MAAM,oBAAoB,CAAC;AAEpE,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;;;;oBAIrB,OAAO,MAAM;;AAFjC,qBAAa,uBAAwB,SAAQ,4BAK3C;CAAG;AAoDL;;GAEG;AACH,eAAO,MAAM,MAAM;;;sQA4BjB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { isOrigin } from "./Loopback.js";
|
|
2
1
|
import { CommandRunner } from "./CommandRunner.js";
|
|
2
|
+
import { isOrigin } from "./Loopback.js";
|
|
3
3
|
import { run } from "./MountInit.js";
|
|
4
4
|
import { PushLock } from "./PushLock.js";
|
|
5
5
|
import * as Effect from "effect/Effect";
|
|
@@ -7,14 +7,14 @@ import * as Path from "effect/Path";
|
|
|
7
7
|
import * as Redacted from "effect/Redacted";
|
|
8
8
|
import * as Schema from "effect/Schema";
|
|
9
9
|
import * as Result from "effect/Result";
|
|
10
|
-
|
|
10
|
+
// src/internal/CodeDeployment.ts
|
|
11
11
|
var InvalidDeploymentTarget = class extends Schema.TaggedError()("InvalidDeploymentTarget", { reason: Schema.Literals(["deployment", "deployKey"]) }) {};
|
|
12
12
|
const deploymentName = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
|
|
13
13
|
const cloudTarget = (props) => {
|
|
14
14
|
const { name, url } = props.deployment;
|
|
15
|
-
if (!deploymentName.test(name) || !new RegExp(`^https://${name}(?:\\.[a-z]{2}-[a-z]+-[0-9]+)?\\.convex\\.cloud$`).test(url)) return Result.fail(
|
|
15
|
+
if (!deploymentName.test(name) || !new RegExp(`^https://${name}(?:\\.[a-z]{2}-[a-z]+-[0-9]+)?\\.convex\\.cloud$`).test(url)) return Result.fail(InvalidDeploymentTarget.make({ reason: "deployment" }));
|
|
16
16
|
const key = /^(?:dev|prod|preview|custom):([a-z0-9]+(?:-[a-z0-9]+)*)\|[a-zA-Z0-9+/=_-]+$/.exec(Redacted.value(props.deployKey));
|
|
17
|
-
if (
|
|
17
|
+
if (key === null || key[1] !== name) return Result.fail(InvalidDeploymentTarget.make({ reason: "deployKey" }));
|
|
18
18
|
return Result.succeed({
|
|
19
19
|
_tag: "Cloud",
|
|
20
20
|
deploymentName: name,
|
|
@@ -23,9 +23,9 @@ const cloudTarget = (props) => {
|
|
|
23
23
|
};
|
|
24
24
|
const localTarget = (props) => {
|
|
25
25
|
const { name, url } = props.deployment;
|
|
26
|
-
if (!deploymentName.test(name) || !isOrigin(url)) return Result.fail(
|
|
26
|
+
if (!deploymentName.test(name) || !isOrigin(url)) return Result.fail(InvalidDeploymentTarget.make({ reason: "deployment" }));
|
|
27
27
|
const key = /^([a-z0-9]+(?:-[a-z0-9]+)*)\|[0-9a-f]+$/.exec(Redacted.value(props.deployKey));
|
|
28
|
-
if (
|
|
28
|
+
if (key === null || key[1] !== name) return Result.fail(InvalidDeploymentTarget.make({ reason: "deployKey" }));
|
|
29
29
|
return Result.succeed({
|
|
30
30
|
_tag: "SelfHosted",
|
|
31
31
|
deploymentName: name,
|
|
@@ -37,13 +37,16 @@ const targets = {
|
|
|
37
37
|
live: cloudTarget,
|
|
38
38
|
local: localTarget
|
|
39
39
|
};
|
|
40
|
+
/**
|
|
41
|
+
* @internal
|
|
42
|
+
*/
|
|
40
43
|
const deploy = Effect.fn("Code.deploy")(function* (props, mode = "live") {
|
|
41
44
|
const target = yield* Effect.fromResult(targets[mode](props));
|
|
42
45
|
const runner = yield* CommandRunner;
|
|
43
46
|
const lock = yield* PushLock;
|
|
44
47
|
const path = yield* Path.Path;
|
|
45
48
|
yield* lock.withLock(target.deploymentName, Effect.gen(function* () {
|
|
46
|
-
if (props.prepare) yield* runner.prepare(props.prepare, props.cwd);
|
|
49
|
+
if (props.prepare !== void 0) yield* runner.prepare(props.prepare, props.cwd);
|
|
47
50
|
yield* runner.deploy(target, props.cwd);
|
|
48
51
|
yield* run(props.deployment.url, props.deployKey, path.resolve(props.cwd ?? "."));
|
|
49
52
|
}));
|
|
@@ -52,7 +55,6 @@ const deploy = Effect.fn("Code.deploy")(function* (props, mode = "live") {
|
|
|
52
55
|
url: props.deployment.url
|
|
53
56
|
};
|
|
54
57
|
});
|
|
55
|
-
//#endregion
|
|
56
58
|
export { InvalidDeploymentTarget, deploy };
|
|
57
59
|
|
|
58
60
|
//# sourceMappingURL=CodeDeployment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeDeployment.js","names":["Loopback.isOrigin","MountInit.run"],"sources":["../../src/internal/CodeDeployment.ts"],"sourcesContent":["import type { ProviderMode } from \"alchemy/ProviderMode\";\nimport * as Effect from \"effect/Effect\";\nimport * as Path from \"effect/Path\";\nimport * as Redacted from \"effect/Redacted\";\nimport * as Result from \"effect/Result\";\nimport * as Schema from \"effect/Schema\";\nimport type { CodeProps } from \"../Code.js\";\nimport { CommandRunner, type PushTarget } from \"./CommandRunner.js\";\nimport * as Loopback from \"./Loopback.js\";\nimport * as MountInit from \"./MountInit.js\";\nimport { PushLock } from \"./PushLock.js\";\n\nexport class InvalidDeploymentTarget extends Schema.TaggedError
|
|
1
|
+
{"version":3,"file":"CodeDeployment.js","names":["Loopback.isOrigin","MountInit.run"],"sources":["../../src/internal/CodeDeployment.ts"],"sourcesContent":["import type { ProviderMode } from \"alchemy/ProviderMode\";\nimport * as Effect from \"effect/Effect\";\nimport * as Path from \"effect/Path\";\nimport * as Redacted from \"effect/Redacted\";\nimport * as Result from \"effect/Result\";\nimport * as Schema from \"effect/Schema\";\nimport type { CodeProps } from \"../Code.js\";\nimport { CommandRunner, type PushTarget } from \"./CommandRunner.js\";\nimport * as Loopback from \"./Loopback.js\";\nimport * as MountInit from \"./MountInit.js\";\nimport { PushLock } from \"./PushLock.js\";\n\nexport class InvalidDeploymentTarget extends Schema.TaggedError<\n InvalidDeploymentTarget,\n { readonly brand: unique symbol }\n>()(\"InvalidDeploymentTarget\", {\n reason: Schema.Literals([\"deployment\", \"deployKey\"]),\n}) {}\n\nconst deploymentName = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;\n\nconst cloudTarget = (\n props: CodeProps,\n): Result.Result<PushTarget, InvalidDeploymentTarget> => {\n const { name, url } = props.deployment;\n if (\n !deploymentName.test(name) ||\n !new RegExp(\n `^https://${name}(?:\\\\.[a-z]{2}-[a-z]+-[0-9]+)?\\\\.convex\\\\.cloud$`,\n ).test(url)\n )\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployment\" }));\n const key =\n /^(?:dev|prod|preview|custom):([a-z0-9]+(?:-[a-z0-9]+)*)\\|[a-zA-Z0-9+/=_-]+$/.exec(\n Redacted.value(props.deployKey),\n );\n if (key === null || key[1] !== name)\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployKey\" }));\n return Result.succeed({\n _tag: \"Cloud\",\n deploymentName: name,\n deployKey: props.deployKey,\n });\n};\n\nconst localTarget = (\n props: CodeProps,\n): Result.Result<PushTarget, InvalidDeploymentTarget> => {\n const { name, url } = props.deployment;\n if (!deploymentName.test(name) || !Loopback.isOrigin(url))\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployment\" }));\n const key = /^([a-z0-9]+(?:-[a-z0-9]+)*)\\|[0-9a-f]+$/.exec(\n Redacted.value(props.deployKey),\n );\n if (key === null || key[1] !== name)\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployKey\" }));\n return Result.succeed({\n _tag: \"SelfHosted\",\n deploymentName: name,\n url,\n adminKey: props.deployKey,\n });\n};\n\nconst targets = { live: cloudTarget, local: localTarget } satisfies Record<\n ProviderMode,\n (props: CodeProps) => Result.Result<PushTarget, InvalidDeploymentTarget>\n>;\n\n/**\n * @internal\n */\nexport const deploy = Effect.fn(\"Code.deploy\")(function* (\n props: CodeProps,\n mode: ProviderMode = \"live\",\n) {\n const target = yield* Effect.fromResult(targets[mode](props));\n const runner = yield* CommandRunner;\n const lock = yield* PushLock;\n const path = yield* Path.Path;\n yield* lock.withLock(\n target.deploymentName,\n Effect.gen(function* () {\n if (props.prepare !== undefined)\n yield* runner.prepare(props.prepare, props.cwd);\n yield* runner.deploy(target, props.cwd);\n // WORKAROUND: Convex has no component `init` or install `args` in a\n // stable release, so each push runs every mount's `init` itself, inside\n // the lock so no other push lands between this code and its `init`.\n // Delete this step at gaganref/confect#18's trigger: a stable `convex`\n // release with `init` and `args`, and an open-source backend that\n // accepts them. CHANGES.md lists what else goes with it.\n yield* MountInit.run(\n props.deployment.url,\n props.deployKey,\n path.resolve(props.cwd ?? \".\"),\n );\n }),\n );\n return { name: props.deployment.name, url: props.deployment.url };\n});\n"],"mappings":";;;;;;;;;;AAYA,IAAa,0BAAb,cAA6C,OAAO,YAGlD,CAAC,CAAC,2BAA2B,EAC7B,QAAQ,OAAO,SAAS,CAAC,cAAc,WAAW,CAAC,EACrD,CAAC,CAAC,CAAC,CAAC;AAEJ,MAAM,iBAAiB;AAEvB,MAAM,eACJ,UACuD;CACvD,MAAM,EAAE,MAAM,QAAQ,MAAM;CAC5B,IACE,CAAC,eAAe,KAAK,IAAI,KACzB,CAAC,IAAI,OACH,YAAY,KAAK,iDACnB,CAAC,CAAC,KAAK,GAAG,GAEV,OAAO,OAAO,KAAK,wBAAwB,KAAK,EAAE,QAAQ,aAAa,CAAC,CAAC;CAC3E,MAAM,MACJ,8EAA8E,KAC5E,SAAS,MAAM,MAAM,SAAS,CAChC;CACF,IAAI,QAAQ,QAAQ,IAAI,OAAO,MAC7B,OAAO,OAAO,KAAK,wBAAwB,KAAK,EAAE,QAAQ,YAAY,CAAC,CAAC;CAC1E,OAAO,OAAO,QAAQ;EACpB,MAAM;EACN,gBAAgB;EAChB,WAAW,MAAM;CACnB,CAAC;AACH;AAEA,MAAM,eACJ,UACuD;CACvD,MAAM,EAAE,MAAM,QAAQ,MAAM;CAC5B,IAAI,CAAC,eAAe,KAAK,IAAI,KAAK,CAACA,SAAkB,GAAG,GACtD,OAAO,OAAO,KAAK,wBAAwB,KAAK,EAAE,QAAQ,aAAa,CAAC,CAAC;CAC3E,MAAM,MAAM,0CAA0C,KACpD,SAAS,MAAM,MAAM,SAAS,CAChC;CACA,IAAI,QAAQ,QAAQ,IAAI,OAAO,MAC7B,OAAO,OAAO,KAAK,wBAAwB,KAAK,EAAE,QAAQ,YAAY,CAAC,CAAC;CAC1E,OAAO,OAAO,QAAQ;EACpB,MAAM;EACN,gBAAgB;EAChB;EACA,UAAU,MAAM;CAClB,CAAC;AACH;AAEA,MAAM,UAAU;CAAE,MAAM;CAAa,OAAO;AAAY;;;;AAQxD,MAAa,SAAS,OAAO,GAAG,aAAa,CAAC,CAAC,WAC7C,OACA,OAAqB,QACrB;CACA,MAAM,SAAS,OAAO,OAAO,WAAW,QAAQ,KAAK,CAAC,KAAK,CAAC;CAC5D,MAAM,SAAS,OAAO;CACtB,MAAM,OAAO,OAAO;CACpB,MAAM,OAAO,OAAO,KAAK;CACzB,OAAO,KAAK,SACV,OAAO,gBACP,OAAO,IAAI,aAAa;EACtB,IAAI,MAAM,YAAY,KAAA,GACpB,OAAO,OAAO,QAAQ,MAAM,SAAS,MAAM,GAAG;EAChD,OAAO,OAAO,OAAO,QAAQ,MAAM,GAAG;EAOtC,OAAOC,IACL,MAAM,WAAW,KACjB,MAAM,WACN,KAAK,QAAQ,MAAM,OAAO,GAAG,CAC/B;CACF,CAAC,CACH;CACA,OAAO;EAAE,MAAM,MAAM,WAAW;EAAM,KAAK,MAAM,WAAW;CAAI;AAClE,CAAC"}
|
|
@@ -29,7 +29,9 @@ declare const CommandError_base: Schema.Class<CommandError, Schema.TaggedStruct<
|
|
|
29
29
|
readonly operation: Schema.Literals<readonly ["prepare", "deploy"]>;
|
|
30
30
|
readonly reason: Schema.Literals<readonly ["configuration", "spawn", "exit"]>;
|
|
31
31
|
readonly exitCode: Schema.optionalKey<Schema.Finite>;
|
|
32
|
-
}>, import("effect/Cause").YieldableError
|
|
32
|
+
}>, import("effect/Cause").YieldableError & {
|
|
33
|
+
readonly brand: unique symbol;
|
|
34
|
+
}>;
|
|
33
35
|
export declare class CommandError extends CommandError_base {
|
|
34
36
|
}
|
|
35
37
|
declare const CommandRunner_base: Context.ServiceClass<CommandRunner, "@confect/alchemy/internal/CommandRunner", {
|
|
@@ -50,6 +52,9 @@ export declare const processEnvironment: Config.Config<{
|
|
|
50
52
|
TMPDIR: string;
|
|
51
53
|
TEMP: string;
|
|
52
54
|
}>;
|
|
55
|
+
/**
|
|
56
|
+
* @internal
|
|
57
|
+
*/
|
|
53
58
|
export declare const layer: Layer.Layer<CommandRunner, never, ChildProcessSpawner.ChildProcessSpawner | FileSystem.FileSystem | Path.Path>;
|
|
54
59
|
export {};
|
|
55
60
|
//# sourceMappingURL=CommandRunner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandRunner.d.ts","
|
|
1
|
+
{"version":3,"file":"CommandRunner.d.ts","sources":["../../src/internal/CommandRunner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAgB,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAEnE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACtC;AAED;;;GAGG;AACH,MAAM,MAAM,UAAU,GAClB;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC/C,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAC;;;;;;oBASc,OAAO,MAAM;;AAFjC,qBAAa,YAAa,SAAQ,iBAOhC;CAAG;;sBAKiB,CAChB,OAAO,EAAE,cAAc,EACvB,GAAG,CAAC,EAAE,MAAM,KACT,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC;qBACrB,CACf,MAAM,EAAE,UAAU,EAClB,GAAG,CAAC,EAAE,MAAM,KACT,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC;;AAV1C,qBAAa,aAAc,SAAQ,kBAYW;CAAG;AAEjD;;;GAGG;AACH,eAAO,MAAM,kBAAkB;;;;;;;EAa7B,CAAC;AAiDH;;GAEG;AACH,eAAO,MAAM,KAAK,gHA0HjB,CAAC"}
|
|
@@ -7,7 +7,7 @@ import * as Context from "effect/Context";
|
|
|
7
7
|
import * as Redacted from "effect/Redacted";
|
|
8
8
|
import * as Schema from "effect/Schema";
|
|
9
9
|
import { ChildProcess, ChildProcessSpawner } from "effect/process";
|
|
10
|
-
|
|
10
|
+
// src/internal/CommandRunner.ts
|
|
11
11
|
const selection = (target) => target._tag === "Cloud" ? `CONVEX_DEPLOY_KEY=${Redacted.value(target.deployKey)}\n` : `CONVEX_SELF_HOSTED_URL=${target.url}\nCONVEX_SELF_HOSTED_ADMIN_KEY=${Redacted.value(target.adminKey)}\n`;
|
|
12
12
|
var CommandError = class extends Schema.TaggedError()("CommandError", {
|
|
13
13
|
operation: Schema.Literals(["prepare", "deploy"]),
|
|
@@ -32,7 +32,7 @@ const processEnvironment = Config.all({
|
|
|
32
32
|
TEMP: Config.String("TEMP").pipe(Config.withDefault(""))
|
|
33
33
|
});
|
|
34
34
|
const packageBin = Effect.fn("CommandRunner.packageBin")(function* (fs, path, cwd, packageName, binName) {
|
|
35
|
-
const invalid = () =>
|
|
35
|
+
const invalid = () => CommandError.make({
|
|
36
36
|
operation: packageName === "convex" ? "deploy" : "prepare",
|
|
37
37
|
reason: "configuration"
|
|
38
38
|
});
|
|
@@ -42,7 +42,7 @@ const packageBin = Effect.fn("CommandRunner.packageBin")(function* (fs, path, cw
|
|
|
42
42
|
if (yield* fs.exists(manifestPath).pipe(Effect.mapError(invalid))) {
|
|
43
43
|
const manifest = yield* fs.readFileString(manifestPath).pipe(Effect.flatMap(Schema.decodeEffect(Schema.fromJsonString(Schema.Struct({ bin: Schema.Union([Schema.String, Schema.Record(Schema.String, Schema.String)]) })))), Effect.mapError(invalid));
|
|
44
44
|
const relative = typeof manifest.bin === "string" ? manifest.bin : manifest.bin[binName];
|
|
45
|
-
if (
|
|
45
|
+
if (relative === void 0 || relative === "") return yield* invalid();
|
|
46
46
|
return path.resolve(path.dirname(manifestPath), relative);
|
|
47
47
|
}
|
|
48
48
|
const parent = path.dirname(directory);
|
|
@@ -50,6 +50,9 @@ const packageBin = Effect.fn("CommandRunner.packageBin")(function* (fs, path, cw
|
|
|
50
50
|
directory = parent;
|
|
51
51
|
}
|
|
52
52
|
});
|
|
53
|
+
/**
|
|
54
|
+
* @internal
|
|
55
|
+
*/
|
|
53
56
|
const layer = Layer.effect(CommandRunner, Effect.gen(function* () {
|
|
54
57
|
const fs = yield* FileSystem.FileSystem;
|
|
55
58
|
const path = yield* Path.Path;
|
|
@@ -62,11 +65,11 @@ const layer = Layer.effect(CommandRunner, Effect.gen(function* () {
|
|
|
62
65
|
stdin: "ignore",
|
|
63
66
|
stdout: "ignore",
|
|
64
67
|
stderr: "ignore"
|
|
65
|
-
})).pipe(Effect.mapError(() =>
|
|
68
|
+
})).pipe(Effect.mapError(() => CommandError.make({
|
|
66
69
|
operation,
|
|
67
70
|
reason: "spawn"
|
|
68
71
|
})));
|
|
69
|
-
if (code !== 0) return yield*
|
|
72
|
+
if (code !== 0) return yield* CommandError.make({
|
|
70
73
|
operation,
|
|
71
74
|
reason: "exit",
|
|
72
75
|
exitCode: Number(code)
|
|
@@ -80,7 +83,7 @@ const layer = Layer.effect(CommandRunner, Effect.gen(function* () {
|
|
|
80
83
|
return CommandRunner.of({
|
|
81
84
|
prepare: Effect.fn("CommandRunner.prepare")(function* (command, cwd = process.cwd()) {
|
|
82
85
|
const directory = path.resolve(cwd);
|
|
83
|
-
const env = yield* environment.pipe(Effect.mapError(() =>
|
|
86
|
+
const env = yield* environment.pipe(Effect.mapError(() => CommandError.make({
|
|
84
87
|
operation: "prepare",
|
|
85
88
|
reason: "configuration"
|
|
86
89
|
})));
|
|
@@ -92,7 +95,7 @@ const layer = Layer.effect(CommandRunner, Effect.gen(function* () {
|
|
|
92
95
|
deploy: Effect.fn("CommandRunner.deploy")(function* (target, cwd = process.cwd()) {
|
|
93
96
|
const directory = path.resolve(cwd);
|
|
94
97
|
const bin = yield* packageBin(fs, path, directory, "convex", "convex");
|
|
95
|
-
const env = yield* environment.pipe(Effect.mapError(() =>
|
|
98
|
+
const env = yield* environment.pipe(Effect.mapError(() => CommandError.make({
|
|
96
99
|
operation: "deploy",
|
|
97
100
|
reason: "configuration"
|
|
98
101
|
})));
|
|
@@ -113,14 +116,13 @@ const layer = Layer.effect(CommandRunner, Effect.gen(function* () {
|
|
|
113
116
|
LOCALAPPDATA: temp,
|
|
114
117
|
XDG_CONFIG_HOME: temp
|
|
115
118
|
});
|
|
116
|
-
}).pipe(Effect.mapError((error) => Schema.is(CommandError)(error) ? error :
|
|
119
|
+
}).pipe(Effect.mapError((error) => Schema.is(CommandError)(error) ? error : CommandError.make({
|
|
117
120
|
operation: "deploy",
|
|
118
121
|
reason: "configuration"
|
|
119
122
|
}))));
|
|
120
123
|
})
|
|
121
124
|
});
|
|
122
125
|
}));
|
|
123
|
-
//#endregion
|
|
124
126
|
export { CommandError, CommandRunner, layer, processEnvironment };
|
|
125
127
|
|
|
126
128
|
//# sourceMappingURL=CommandRunner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandRunner.js","names":[],"sources":["../../src/internal/CommandRunner.ts"],"sourcesContent":["import * as Config from \"effect/Config\";\nimport * as Context from \"effect/Context\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Layer from \"effect/Layer\";\nimport * as Path from \"effect/Path\";\nimport * as Redacted from \"effect/Redacted\";\nimport * as Schema from \"effect/Schema\";\nimport { ChildProcess, ChildProcessSpawner } from \"effect/process\";\n\nexport interface PrepareCommand {\n readonly command: string;\n readonly args: ReadonlyArray<string>;\n}\n\n/**\n * Where a push goes: a cloud deployment through its deploy key, or a local\n * backend through the CLI's self-hosted target and its admin key.\n */\nexport type PushTarget =\n | {\n readonly _tag: \"Cloud\";\n readonly deploymentName: string;\n readonly deployKey: Redacted.Redacted<string>;\n }\n | {\n readonly _tag: \"SelfHosted\";\n readonly deploymentName: string;\n readonly url: string;\n readonly adminKey: Redacted.Redacted<string>;\n };\n\nconst selection = (target: PushTarget) =>\n target._tag === \"Cloud\"\n ? `CONVEX_DEPLOY_KEY=${Redacted.value(target.deployKey)}\\n`\n : `CONVEX_SELF_HOSTED_URL=${target.url}\\nCONVEX_SELF_HOSTED_ADMIN_KEY=${Redacted.value(target.adminKey)}\\n`;\n\nexport class CommandError extends Schema.TaggedError<CommandError>()(\n \"CommandError\",\n {\n operation: Schema.Literals([\"prepare\", \"deploy\"]),\n reason: Schema.Literals([\"configuration\", \"spawn\", \"exit\"]),\n exitCode: Schema.optionalKey(Schema.Finite),\n },\n) {}\n\nexport class CommandRunner extends Context.Service<\n CommandRunner,\n {\n readonly prepare: (\n command: PrepareCommand,\n cwd?: string,\n ) => Effect.Effect<void, CommandError>;\n readonly deploy: (\n target: PushTarget,\n cwd?: string,\n ) => Effect.Effect<void, CommandError>;\n }\n>()(\"@confect/alchemy/internal/CommandRunner\") {}\n\n/**\n * The ambient variables a child process needs to run on every platform; the\n * rest of the parent environment, credentials included, is withheld.\n */\nexport const processEnvironment = Config.all({\n PATH: Config.String(\"PATH\").pipe(\n Config.orElse(() => Config.String(\"Path\")),\n Config.withDefault(\"\"),\n ),\n HOME: Config.String(\"HOME\").pipe(Config.withDefault(\"\")),\n USERPROFILE: Config.String(\"USERPROFILE\").pipe(Config.withDefault(\"\")),\n SystemRoot: Config.String(\"SystemRoot\").pipe(\n Config.orElse(() => Config.String(\"SYSTEMROOT\")),\n Config.withDefault(\"\"),\n ),\n TMPDIR: Config.String(\"TMPDIR\").pipe(Config.withDefault(\"\")),\n TEMP: Config.String(\"TEMP\").pipe(Config.withDefault(\"\")),\n});\n\nconst packageBin = Effect.fn(\"CommandRunner.packageBin\")(function* (\n fs: FileSystem.FileSystem,\n path: Path.Path,\n cwd: string,\n packageName: string,\n binName: string,\n) {\n const invalid = () =>\n new CommandError({\n operation: packageName === \"convex\" ? \"deploy\" : \"prepare\",\n reason: \"configuration\",\n });\n let directory = cwd;\n while (true) {\n const manifestPath = path.join(\n directory,\n \"node_modules\",\n packageName,\n \"package.json\",\n );\n if (yield* fs.exists(manifestPath).pipe(Effect.mapError(invalid))) {\n const manifest = yield* fs.readFileString(manifestPath).pipe(\n Effect.flatMap(\n Schema.decodeEffect(\n Schema.fromJsonString(\n Schema.Struct({\n bin: Schema.Union([\n Schema.String,\n Schema.Record(Schema.String, Schema.String),\n ]),\n }),\n ),\n ),\n ),\n Effect.mapError(invalid),\n );\n const relative =\n typeof manifest.bin === \"string\" ? manifest.bin : manifest.bin[binName];\n if (!relative) return yield* invalid();\n return path.resolve(path.dirname(manifestPath), relative);\n }\n const parent = path.dirname(directory);\n if (parent === directory) return yield* invalid();\n directory = parent;\n }\n});\n\nexport const layer = Layer.effect(\n CommandRunner,\n Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;\n const run = Effect.fn(\"CommandRunner.run\")(function* (\n operation: \"prepare\" | \"deploy\",\n command: string,\n args: ReadonlyArray<string>,\n cwd: string,\n env: Record<string, string | undefined>,\n ) {\n const code = yield* spawner\n .exitCode(\n ChildProcess.make(command, args, {\n cwd,\n env,\n extendEnv: false,\n stdin: \"ignore\",\n stdout: \"ignore\",\n stderr: \"ignore\",\n }),\n )\n .pipe(\n Effect.mapError(\n () => new CommandError({ operation, reason: \"spawn\" }),\n ),\n );\n if (code !== 0)\n return yield* new CommandError({\n operation,\n reason: \"exit\",\n exitCode: Number(code),\n });\n });\n const environment = processEnvironment.pipe(\n Effect.map((env) => ({ ...env, CI: \"true\", DO_NOT_TRACK: \"1\" })),\n );\n return CommandRunner.of({\n prepare: Effect.fn(\"CommandRunner.prepare\")(function* (\n command,\n cwd = process.cwd(),\n ) {\n const directory = path.resolve(cwd);\n const env = yield* environment.pipe(\n Effect.mapError(\n () =>\n new CommandError({\n operation: \"prepare\",\n reason: \"configuration\",\n }),\n ),\n );\n if (command.command === \"confect\") {\n const bin = yield* packageBin(\n fs,\n path,\n directory,\n \"@confect/cli\",\n \"confect\",\n );\n yield* run(\n \"prepare\",\n process.execPath,\n [bin, ...command.args],\n directory,\n env,\n );\n } else {\n yield* run(\"prepare\", command.command, command.args, directory, env);\n }\n }),\n deploy: Effect.fn(\"CommandRunner.deploy\")(function* (\n target,\n cwd = process.cwd(),\n ) {\n const directory = path.resolve(cwd);\n const bin = yield* packageBin(fs, path, directory, \"convex\", \"convex\");\n const env = yield* environment.pipe(\n Effect.mapError(\n () =>\n new CommandError({\n operation: \"deploy\",\n reason: \"configuration\",\n }),\n ),\n );\n yield* Effect.scoped(\n Effect.gen(function* () {\n const temp = yield* fs.makeTempDirectoryScoped({\n prefix: \"confect-deploy-\",\n });\n const envFile = path.join(temp, \"deployment.env\");\n yield* fs.writeFileString(envFile, selection(target), {\n mode: 0o600,\n });\n yield* run(\n \"deploy\",\n process.execPath,\n [bin, \"deploy\", \"--yes\", \"--env-file\", envFile],\n directory,\n {\n ...env,\n HOME: temp,\n USERPROFILE: temp,\n LOCALAPPDATA: temp,\n XDG_CONFIG_HOME: temp,\n },\n );\n }).pipe(\n Effect.mapError((error) =>\n Schema.is(CommandError)(error)\n ? error\n : new CommandError({\n operation: \"deploy\",\n reason: \"configuration\",\n }),\n ),\n ),\n );\n }),\n });\n }),\n);\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CommandRunner.js","names":[],"sources":["../../src/internal/CommandRunner.ts"],"sourcesContent":["import * as Config from \"effect/Config\";\nimport * as Context from \"effect/Context\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Layer from \"effect/Layer\";\nimport * as Path from \"effect/Path\";\nimport * as Redacted from \"effect/Redacted\";\nimport * as Schema from \"effect/Schema\";\nimport { ChildProcess, ChildProcessSpawner } from \"effect/process\";\n\nexport interface PrepareCommand {\n readonly command: string;\n readonly args: ReadonlyArray<string>;\n}\n\n/**\n * Where a push goes: a cloud deployment through its deploy key, or a local\n * backend through the CLI's self-hosted target and its admin key.\n */\nexport type PushTarget =\n | {\n readonly _tag: \"Cloud\";\n readonly deploymentName: string;\n readonly deployKey: Redacted.Redacted<string>;\n }\n | {\n readonly _tag: \"SelfHosted\";\n readonly deploymentName: string;\n readonly url: string;\n readonly adminKey: Redacted.Redacted<string>;\n };\n\nconst selection = (target: PushTarget) =>\n target._tag === \"Cloud\"\n ? `CONVEX_DEPLOY_KEY=${Redacted.value(target.deployKey)}\\n`\n : `CONVEX_SELF_HOSTED_URL=${target.url}\\nCONVEX_SELF_HOSTED_ADMIN_KEY=${Redacted.value(target.adminKey)}\\n`;\n\nexport class CommandError extends Schema.TaggedError<\n CommandError,\n { readonly brand: unique symbol }\n>()(\"CommandError\", {\n operation: Schema.Literals([\"prepare\", \"deploy\"]),\n reason: Schema.Literals([\"configuration\", \"spawn\", \"exit\"]),\n exitCode: Schema.optionalKey(Schema.Finite),\n}) {}\n\nexport class CommandRunner extends Context.Service<\n CommandRunner,\n {\n readonly prepare: (\n command: PrepareCommand,\n cwd?: string,\n ) => Effect.Effect<void, CommandError>;\n readonly deploy: (\n target: PushTarget,\n cwd?: string,\n ) => Effect.Effect<void, CommandError>;\n }\n>()(\"@confect/alchemy/internal/CommandRunner\") {}\n\n/**\n * The ambient variables a child process needs to run on every platform; the\n * rest of the parent environment, credentials included, is withheld.\n */\nexport const processEnvironment = Config.all({\n PATH: Config.String(\"PATH\").pipe(\n Config.orElse(() => Config.String(\"Path\")),\n Config.withDefault(\"\"),\n ),\n HOME: Config.String(\"HOME\").pipe(Config.withDefault(\"\")),\n USERPROFILE: Config.String(\"USERPROFILE\").pipe(Config.withDefault(\"\")),\n SystemRoot: Config.String(\"SystemRoot\").pipe(\n Config.orElse(() => Config.String(\"SYSTEMROOT\")),\n Config.withDefault(\"\"),\n ),\n TMPDIR: Config.String(\"TMPDIR\").pipe(Config.withDefault(\"\")),\n TEMP: Config.String(\"TEMP\").pipe(Config.withDefault(\"\")),\n});\n\nconst packageBin = Effect.fn(\"CommandRunner.packageBin\")(function* (\n fs: FileSystem.FileSystem,\n path: Path.Path,\n cwd: string,\n packageName: string,\n binName: string,\n) {\n const invalid = () =>\n CommandError.make({\n operation: packageName === \"convex\" ? \"deploy\" : \"prepare\",\n reason: \"configuration\",\n });\n let directory = cwd;\n while (true) {\n const manifestPath = path.join(\n directory,\n \"node_modules\",\n packageName,\n \"package.json\",\n );\n if (yield* fs.exists(manifestPath).pipe(Effect.mapError(invalid))) {\n const manifest = yield* fs.readFileString(manifestPath).pipe(\n Effect.flatMap(\n Schema.decodeEffect(\n Schema.fromJsonString(\n Schema.Struct({\n bin: Schema.Union([\n Schema.String,\n Schema.Record(Schema.String, Schema.String),\n ]),\n }),\n ),\n ),\n ),\n Effect.mapError(invalid),\n );\n const relative =\n typeof manifest.bin === \"string\" ? manifest.bin : manifest.bin[binName];\n if (relative === undefined || relative === \"\") return yield* invalid();\n return path.resolve(path.dirname(manifestPath), relative);\n }\n const parent = path.dirname(directory);\n if (parent === directory) return yield* invalid();\n directory = parent;\n }\n});\n\n/**\n * @internal\n */\nexport const layer = Layer.effect(\n CommandRunner,\n Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;\n const run = Effect.fn(\"CommandRunner.run\")(function* (\n operation: \"prepare\" | \"deploy\",\n command: string,\n args: ReadonlyArray<string>,\n cwd: string,\n env: Record<string, string | undefined>,\n ) {\n const code = yield* spawner\n .exitCode(\n ChildProcess.make(command, args, {\n cwd,\n env,\n extendEnv: false,\n stdin: \"ignore\",\n stdout: \"ignore\",\n stderr: \"ignore\",\n }),\n )\n .pipe(\n Effect.mapError(() =>\n CommandError.make({ operation, reason: \"spawn\" }),\n ),\n );\n if (code !== 0)\n return yield* CommandError.make({\n operation,\n reason: \"exit\",\n exitCode: Number(code),\n });\n });\n const environment = processEnvironment.pipe(\n Effect.map((env) => ({ ...env, CI: \"true\", DO_NOT_TRACK: \"1\" })),\n );\n return CommandRunner.of({\n prepare: Effect.fn(\"CommandRunner.prepare\")(function* (\n command,\n cwd = process.cwd(),\n ) {\n const directory = path.resolve(cwd);\n const env = yield* environment.pipe(\n Effect.mapError(() =>\n CommandError.make({\n operation: \"prepare\",\n reason: \"configuration\",\n }),\n ),\n );\n if (command.command === \"confect\") {\n const bin = yield* packageBin(\n fs,\n path,\n directory,\n \"@confect/cli\",\n \"confect\",\n );\n yield* run(\n \"prepare\",\n process.execPath,\n [bin, ...command.args],\n directory,\n env,\n );\n } else {\n yield* run(\"prepare\", command.command, command.args, directory, env);\n }\n }),\n deploy: Effect.fn(\"CommandRunner.deploy\")(function* (\n target,\n cwd = process.cwd(),\n ) {\n const directory = path.resolve(cwd);\n const bin = yield* packageBin(fs, path, directory, \"convex\", \"convex\");\n const env = yield* environment.pipe(\n Effect.mapError(() =>\n CommandError.make({\n operation: \"deploy\",\n reason: \"configuration\",\n }),\n ),\n );\n yield* Effect.scoped(\n Effect.gen(function* () {\n const temp = yield* fs.makeTempDirectoryScoped({\n prefix: \"confect-deploy-\",\n });\n const envFile = path.join(temp, \"deployment.env\");\n yield* fs.writeFileString(envFile, selection(target), {\n mode: 0o600,\n });\n yield* run(\n \"deploy\",\n process.execPath,\n [bin, \"deploy\", \"--yes\", \"--env-file\", envFile],\n directory,\n {\n ...env,\n HOME: temp,\n USERPROFILE: temp,\n LOCALAPPDATA: temp,\n XDG_CONFIG_HOME: temp,\n },\n );\n }).pipe(\n Effect.mapError((error) =>\n Schema.is(CommandError)(error)\n ? error\n : CommandError.make({\n operation: \"deploy\",\n reason: \"configuration\",\n }),\n ),\n ),\n );\n }),\n });\n }),\n);\n"],"mappings":"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"}
|