@ankhorage/studio 0.21.0 → 0.24.0
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/contractGuards.d.ts +2 -2
- package/dist/contractGuards.d.ts.map +1 -1
- package/dist/contractGuards.js +2 -562
- package/dist/contractGuards.js.map +1 -1
- package/dist/core/StudioProvider.js +8 -8
- package/dist/core/StudioProvider.js.map +1 -1
- package/dist/host/auth/projectAuthHealthService.d.ts +1 -2
- package/dist/host/auth/projectAuthHealthService.d.ts.map +1 -1
- package/dist/host/auth/projectAuthHealthService.js +2 -10
- package/dist/host/auth/projectAuthHealthService.js.map +1 -1
- package/dist/host/auth/projectAuthRuntimeDiagnostics.d.ts.map +1 -1
- package/dist/host/auth/projectAuthRuntimeDiagnostics.js +9 -44
- package/dist/host/auth/projectAuthRuntimeDiagnostics.js.map +1 -1
- package/dist/host/createStudioHost.js +1 -1
- package/dist/host/dataSources/studioExternalApiService.d.ts +1 -2
- package/dist/host/dataSources/studioExternalApiService.d.ts.map +1 -1
- package/dist/host/dataSources/studioExternalApiService.js +3 -11
- package/dist/host/dataSources/studioExternalApiService.js.map +1 -1
- package/dist/host/http/server.d.ts.map +1 -1
- package/dist/host/http/server.js +25 -94
- package/dist/host/http/server.js.map +1 -1
- package/dist/host/layout/templates/rootLayout.d.ts.map +1 -1
- package/dist/host/layout/templates/rootLayout.js +1 -2
- package/dist/host/layout/templates/rootLayout.js.map +1 -1
- package/dist/host/orchestrator/infraSession.d.ts +15 -0
- package/dist/host/orchestrator/infraSession.d.ts.map +1 -0
- package/dist/host/orchestrator/infraSession.js +45 -0
- package/dist/host/orchestrator/infraSession.js.map +1 -0
- package/dist/host/orchestrator/moduleManager.d.ts +3 -8
- package/dist/host/orchestrator/moduleManager.d.ts.map +1 -1
- package/dist/host/orchestrator/moduleManager.js +13 -14
- package/dist/host/orchestrator/moduleManager.js.map +1 -1
- package/dist/host/orchestrator/projectManager.d.ts +11 -28
- package/dist/host/orchestrator/projectManager.d.ts.map +1 -1
- package/dist/host/orchestrator/projectManager.js +55 -167
- package/dist/host/orchestrator/projectManager.js.map +1 -1
- package/dist/host/orchestrator/projectStore.d.ts +7 -5
- package/dist/host/orchestrator/projectStore.d.ts.map +1 -1
- package/dist/host/orchestrator/projectStore.js +60 -88
- package/dist/host/orchestrator/projectStore.js.map +1 -1
- package/dist/host/orchestrator/studioInfraUp.d.ts.map +1 -1
- package/dist/host/orchestrator/studioInfraUp.js +7 -4
- package/dist/host/orchestrator/studioInfraUp.js.map +1 -1
- package/dist/host/secrets/projectSecretService.d.ts +1 -1
- package/dist/host/secrets/projectSecretService.d.ts.map +1 -1
- package/dist/host/secrets/projectSecretService.js +10 -4
- package/dist/host/secrets/projectSecretService.js.map +1 -1
- package/dist/host/secrets/resolveProjectSecretDatabaseUrl.d.ts +1 -6
- package/dist/host/secrets/resolveProjectSecretDatabaseUrl.d.ts.map +1 -1
- package/dist/host/secrets/resolveProjectSecretDatabaseUrl.js +12 -63
- package/dist/host/secrets/resolveProjectSecretDatabaseUrl.js.map +1 -1
- package/dist/host/secrets/trustedOAuthInfraEnvironment.d.ts +2 -2
- package/dist/host/secrets/trustedOAuthInfraEnvironment.d.ts.map +1 -1
- package/dist/host/secrets/trustedOAuthInfraEnvironment.js +1 -1
- package/dist/host/secrets/trustedOAuthInfraEnvironment.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/manifestState.d.ts.map +1 -1
- package/dist/manifestState.js +4 -3
- package/dist/manifestState.js.map +1 -1
- package/dist/studioAdminRouteModel.d.ts +6 -1
- package/dist/studioAdminRouteModel.d.ts.map +1 -1
- package/dist/studioAdminRouteModel.js +105 -1
- package/dist/studioAdminRouteModel.js.map +1 -1
- package/dist/studioRuntimeApi.d.ts +1 -1
- package/dist/studioRuntimeApi.d.ts.map +1 -1
- package/dist/studioRuntimeApi.js +6 -13
- package/dist/studioRuntimeApi.js.map +1 -1
- package/dist/ui/admin/AnkhAdminPage.d.ts.map +1 -1
- package/dist/ui/admin/AnkhAdminPage.js +13 -2
- package/dist/ui/admin/AnkhAdminPage.js.map +1 -1
- package/dist/ui/admin/AnkhAdminShell.js +1 -1
- package/dist/ui/admin/AnkhAdminShell.js.map +1 -1
- package/dist/ui/admin/pages/AuthAdminPage.js +2 -2
- package/dist/ui/admin/pages/AuthAdminPage.js.map +1 -1
- package/dist/ui/admin/pages/ThemeAdminPage.d.ts.map +1 -1
- package/dist/ui/admin/pages/ThemeAdminPage.js +8 -47
- package/dist/ui/admin/pages/ThemeAdminPage.js.map +1 -1
- package/dist/ui/admin/pages/ThemeColorsAdminPage.d.ts +3 -0
- package/dist/ui/admin/pages/ThemeColorsAdminPage.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeColorsAdminPage.js +36 -0
- package/dist/ui/admin/pages/ThemeColorsAdminPage.js.map +1 -0
- package/dist/ui/admin/pages/ThemeModeEditorSelector.d.ts +3 -0
- package/dist/ui/admin/pages/ThemeModeEditorSelector.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeModeEditorSelector.js +30 -0
- package/dist/ui/admin/pages/ThemeModeEditorSelector.js.map +1 -0
- package/dist/ui/admin/pages/ThemeNumericTokensAdminPage.d.ts +6 -0
- package/dist/ui/admin/pages/ThemeNumericTokensAdminPage.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeNumericTokensAdminPage.js +80 -0
- package/dist/ui/admin/pages/ThemeNumericTokensAdminPage.js.map +1 -0
- package/dist/ui/admin/pages/ThemeRecipeAdminPage.d.ts +7 -0
- package/dist/ui/admin/pages/ThemeRecipeAdminPage.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeRecipeAdminPage.js +45 -0
- package/dist/ui/admin/pages/ThemeRecipeAdminPage.js.map +1 -0
- package/dist/ui/admin/pages/ThemeRecipeCatalog.d.ts +3 -0
- package/dist/ui/admin/pages/ThemeRecipeCatalog.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeRecipeCatalog.js +24 -0
- package/dist/ui/admin/pages/ThemeRecipeCatalog.js.map +1 -0
- package/dist/ui/admin/pages/ThemeRecipeFieldEditor.d.ts +11 -0
- package/dist/ui/admin/pages/ThemeRecipeFieldEditor.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeRecipeFieldEditor.js +41 -0
- package/dist/ui/admin/pages/ThemeRecipeFieldEditor.js.map +1 -0
- package/dist/ui/admin/pages/ThemeTokenAction.d.ts +6 -0
- package/dist/ui/admin/pages/ThemeTokenAction.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeTokenAction.js +20 -0
- package/dist/ui/admin/pages/ThemeTokenAction.js.map +1 -0
- package/dist/ui/admin/pages/ThemeTypographyAdminPage.d.ts +3 -0
- package/dist/ui/admin/pages/ThemeTypographyAdminPage.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeTypographyAdminPage.js +13 -0
- package/dist/ui/admin/pages/ThemeTypographyAdminPage.js.map +1 -0
- package/dist/ui/admin/pages/ThemeTypographyHeadingEditor.d.ts +3 -0
- package/dist/ui/admin/pages/ThemeTypographyHeadingEditor.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeTypographyHeadingEditor.js +61 -0
- package/dist/ui/admin/pages/ThemeTypographyHeadingEditor.js.map +1 -0
- package/dist/ui/admin/pages/ThemeTypographySizeEditor.d.ts +3 -0
- package/dist/ui/admin/pages/ThemeTypographySizeEditor.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeTypographySizeEditor.js +52 -0
- package/dist/ui/admin/pages/ThemeTypographySizeEditor.js.map +1 -0
- package/dist/ui/admin/pages/ThemeTypographyWeightEditor.d.ts +3 -0
- package/dist/ui/admin/pages/ThemeTypographyWeightEditor.d.ts.map +1 -0
- package/dist/ui/admin/pages/ThemeTypographyWeightEditor.js +54 -0
- package/dist/ui/admin/pages/ThemeTypographyWeightEditor.js.map +1 -0
- package/dist/ui/admin/pages/adminThemeModel.d.ts.map +1 -1
- package/dist/ui/admin/pages/adminThemeModel.js +1 -2
- package/dist/ui/admin/pages/adminThemeModel.js.map +1 -1
- package/dist/ui/admin/pages/themeRecipeAuthoringModel.d.ts +10 -0
- package/dist/ui/admin/pages/themeRecipeAuthoringModel.d.ts.map +1 -0
- package/dist/ui/admin/pages/themeRecipeAuthoringModel.js +20 -0
- package/dist/ui/admin/pages/themeRecipeAuthoringModel.js.map +1 -0
- package/dist/ui/admin/pages/themeRecipeTokenOptions.d.ts +15 -0
- package/dist/ui/admin/pages/themeRecipeTokenOptions.d.ts.map +1 -0
- package/dist/ui/admin/pages/themeRecipeTokenOptions.js +16 -0
- package/dist/ui/admin/pages/themeRecipeTokenOptions.js.map +1 -0
- package/dist/ui/admin/pages/themeTokenAuthoringModel.d.ts +25 -0
- package/dist/ui/admin/pages/themeTokenAuthoringModel.d.ts.map +1 -0
- package/dist/ui/admin/pages/themeTokenAuthoringModel.js +52 -0
- package/dist/ui/admin/pages/themeTokenAuthoringModel.js.map +1 -0
- package/dist/ui/admin/pages/useActiveThemeAdmin.d.ts +11 -0
- package/dist/ui/admin/pages/useActiveThemeAdmin.d.ts.map +1 -0
- package/dist/ui/admin/pages/useActiveThemeAdmin.js +21 -0
- package/dist/ui/admin/pages/useActiveThemeAdmin.js.map +1 -0
- package/package.json +5 -5
- package/dist/host/orchestrator/infraGenerator.d.ts +0 -35
- package/dist/host/orchestrator/infraGenerator.d.ts.map +0 -1
- package/dist/host/orchestrator/infraGenerator.js +0 -135
- package/dist/host/orchestrator/infraGenerator.js.map +0 -1
- package/dist/host/orchestrator/infraRuntime.d.ts +0 -46
- package/dist/host/orchestrator/infraRuntime.d.ts.map +0 -1
- package/dist/host/orchestrator/infraRuntime.js +0 -185
- package/dist/host/orchestrator/infraRuntime.js.map +0 -1
- package/dist/host/orchestrator/infraValidation.d.ts +0 -3
- package/dist/host/orchestrator/infraValidation.d.ts.map +0 -1
- package/dist/host/orchestrator/infraValidation.js +0 -59
- package/dist/host/orchestrator/infraValidation.js.map +0 -1
- package/dist/host/orchestrator/projectDeletion.d.ts +0 -20
- package/dist/host/orchestrator/projectDeletion.d.ts.map +0 -1
- package/dist/host/orchestrator/projectDeletion.js +0 -191
- package/dist/host/orchestrator/projectDeletion.js.map +0 -1
|
@@ -8,6 +8,13 @@ export class ProjectManifestNotFoundError extends Error {
|
|
|
8
8
|
this.name = 'ProjectManifestNotFoundError';
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
+
export class ObsoleteStudioManifestError extends Error {
|
|
12
|
+
constructor(projectId, filePath) {
|
|
13
|
+
super(`Project '${projectId}' contains obsolete parallel Studio state at '${filePath}'. ` +
|
|
14
|
+
'Remove that file explicitly before continuing; ankh.config.json is now the sole manifest truth.');
|
|
15
|
+
this.name = 'ObsoleteStudioManifestError';
|
|
16
|
+
}
|
|
17
|
+
}
|
|
11
18
|
export class ProjectStore {
|
|
12
19
|
rootPath;
|
|
13
20
|
constructor(rootPath) {
|
|
@@ -19,7 +26,7 @@ export class ProjectStore {
|
|
|
19
26
|
getManifestPath(projectId) {
|
|
20
27
|
return path.join(this.getProjectPath(projectId), 'ankh.config.json');
|
|
21
28
|
}
|
|
22
|
-
|
|
29
|
+
getObsoleteStudioManifestPath(projectId) {
|
|
23
30
|
return path.join(this.getProjectPath(projectId), '.ankh', 'studio.manifest.json');
|
|
24
31
|
}
|
|
25
32
|
async listProjects() {
|
|
@@ -29,49 +36,8 @@ export class ProjectStore {
|
|
|
29
36
|
const dirs = entries
|
|
30
37
|
.filter((entry) => entry.isDirectory() && entry.name !== 'studio')
|
|
31
38
|
.map((entry) => entry.name);
|
|
32
|
-
const results = await Promise.all(dirs.map(async (id) =>
|
|
33
|
-
|
|
34
|
-
const projectPath = getProjectPath(this.rootPath, id);
|
|
35
|
-
const pkgJsonPath = path.join(projectPath, 'package.json');
|
|
36
|
-
const ankhConfigPath = path.join(projectPath, 'ankh.config.json');
|
|
37
|
-
const hasPkg = await exists(pkgJsonPath);
|
|
38
|
-
if (!hasPkg)
|
|
39
|
-
return null;
|
|
40
|
-
if (!(await exists(ankhConfigPath))) {
|
|
41
|
-
return null;
|
|
42
|
-
}
|
|
43
|
-
try {
|
|
44
|
-
const manifest = parseProjectSummaryManifest(JSON.parse(await fs.readFile(ankhConfigPath, 'utf8')));
|
|
45
|
-
const activeTheme = resolveActiveTheme(manifest);
|
|
46
|
-
return {
|
|
47
|
-
id,
|
|
48
|
-
name: manifest.metadata.name,
|
|
49
|
-
path: projectPath,
|
|
50
|
-
version: manifest.metadata.version,
|
|
51
|
-
isAnkhApp: true,
|
|
52
|
-
category: manifest.metadata.category,
|
|
53
|
-
created: manifest.metadata.created,
|
|
54
|
-
updated: manifest.metadata.updated,
|
|
55
|
-
activeTheme,
|
|
56
|
-
activeThemeMode: manifest.activeThemeMode,
|
|
57
|
-
};
|
|
58
|
-
}
|
|
59
|
-
catch {
|
|
60
|
-
return null;
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
catch {
|
|
64
|
-
// If getProjectPath throws or any other unexpected error occurs for a single project,
|
|
65
|
-
// treat it as an unlistable project and skip it. This preserves robustness:
|
|
66
|
-
// problematic projects are ignored while valid ones are still listed.
|
|
67
|
-
//
|
|
68
|
-
// The outer try/catch still provides a catch-all that returns [] if a
|
|
69
|
-
// top-level failure occurs (e.g. reading the apps directory itself fails).
|
|
70
|
-
return null;
|
|
71
|
-
}
|
|
72
|
-
}));
|
|
73
|
-
// Filter out nulls (skipped projects)
|
|
74
|
-
return results.filter((p) => p !== null);
|
|
39
|
+
const results = await Promise.all(dirs.map(async (id) => this.readProjectSummary(id)));
|
|
40
|
+
return results.filter((project) => project !== null);
|
|
75
41
|
}
|
|
76
42
|
catch {
|
|
77
43
|
return [];
|
|
@@ -88,63 +54,70 @@ export class ProjectStore {
|
|
|
88
54
|
if (!(await exists(projectPath))) {
|
|
89
55
|
throw new Error(`Project '${projectId}' not found.`);
|
|
90
56
|
}
|
|
57
|
+
await this.assertNoObsoleteStudioManifest(projectId);
|
|
91
58
|
if (await exists(manifestPath)) {
|
|
92
59
|
return parseReadableAppManifest(JSON.parse(await fs.readFile(manifestPath, 'utf8')));
|
|
93
60
|
}
|
|
94
61
|
throw new ProjectManifestNotFoundError(projectId);
|
|
95
62
|
}
|
|
96
|
-
async readStudioManifest(projectId) {
|
|
97
|
-
const studioManifestPath = this.getStudioManifestPath(projectId);
|
|
98
|
-
if (await exists(studioManifestPath)) {
|
|
99
|
-
return parseReadableAppManifest(JSON.parse(await fs.readFile(studioManifestPath, 'utf8')));
|
|
100
|
-
}
|
|
101
|
-
return this.readManifest(projectId);
|
|
102
|
-
}
|
|
103
|
-
async hasStudioManifest(projectId) {
|
|
104
|
-
return exists(this.getStudioManifestPath(projectId));
|
|
105
|
-
}
|
|
106
63
|
async writeManifest(projectId, manifest) {
|
|
107
64
|
const projectPath = this.getProjectPath(projectId);
|
|
108
|
-
const manifestPath = this.getManifestPath(projectId);
|
|
109
65
|
if (!(await exists(projectPath))) {
|
|
110
66
|
throw new Error(`Project '${projectId}' not found.`);
|
|
111
67
|
}
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
...manifest.metadata,
|
|
116
|
-
slug: projectId,
|
|
117
|
-
updated: new Date().toISOString(),
|
|
118
|
-
},
|
|
119
|
-
};
|
|
120
|
-
await writeJsonAtomic(manifestPath, updated);
|
|
68
|
+
await this.assertNoObsoleteStudioManifest(projectId);
|
|
69
|
+
const updated = normalizeManifestForProject(projectId, manifest);
|
|
70
|
+
await writeJsonAtomic(this.getManifestPath(projectId), updated);
|
|
121
71
|
return updated;
|
|
122
72
|
}
|
|
123
|
-
async
|
|
124
|
-
const
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
73
|
+
async mutateManifest(projectId, updater) {
|
|
74
|
+
const current = await this.readManifest(projectId);
|
|
75
|
+
return this.writeManifest(projectId, updater(current));
|
|
76
|
+
}
|
|
77
|
+
async readProjectSummary(id) {
|
|
78
|
+
try {
|
|
79
|
+
const projectPath = getProjectPath(this.rootPath, id);
|
|
80
|
+
if (!(await exists(path.join(projectPath, 'package.json'))))
|
|
81
|
+
return null;
|
|
82
|
+
const manifestPath = path.join(projectPath, 'ankh.config.json');
|
|
83
|
+
if (!(await exists(manifestPath)))
|
|
84
|
+
return null;
|
|
85
|
+
const manifest = parseProjectSummaryManifest(JSON.parse(await fs.readFile(manifestPath, 'utf8')));
|
|
86
|
+
const activeTheme = resolveActiveTheme(manifest);
|
|
87
|
+
return {
|
|
88
|
+
id,
|
|
89
|
+
name: manifest.metadata.name,
|
|
90
|
+
path: projectPath,
|
|
91
|
+
version: manifest.metadata.version,
|
|
92
|
+
isAnkhApp: true,
|
|
93
|
+
category: manifest.metadata.category,
|
|
94
|
+
created: manifest.metadata.created,
|
|
95
|
+
updated: manifest.metadata.updated,
|
|
96
|
+
activeTheme,
|
|
97
|
+
activeThemeMode: manifest.activeThemeMode,
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
catch {
|
|
101
|
+
return null;
|
|
128
102
|
}
|
|
129
|
-
const updated = {
|
|
130
|
-
...manifest,
|
|
131
|
-
metadata: {
|
|
132
|
-
...manifest.metadata,
|
|
133
|
-
slug: projectId,
|
|
134
|
-
updated: new Date().toISOString(),
|
|
135
|
-
},
|
|
136
|
-
};
|
|
137
|
-
await fs.mkdir(path.dirname(studioManifestPath), { recursive: true });
|
|
138
|
-
await writeJsonAtomic(studioManifestPath, updated);
|
|
139
|
-
return updated;
|
|
140
103
|
}
|
|
141
|
-
async
|
|
142
|
-
const
|
|
143
|
-
if (await exists(
|
|
144
|
-
|
|
104
|
+
async assertNoObsoleteStudioManifest(projectId) {
|
|
105
|
+
const obsoletePath = this.getObsoleteStudioManifestPath(projectId);
|
|
106
|
+
if (await exists(obsoletePath)) {
|
|
107
|
+
throw new ObsoleteStudioManifestError(projectId, obsoletePath);
|
|
145
108
|
}
|
|
146
109
|
}
|
|
147
110
|
}
|
|
111
|
+
function normalizeManifestForProject(projectId, manifest) {
|
|
112
|
+
return {
|
|
113
|
+
...manifest,
|
|
114
|
+
metadata: {
|
|
115
|
+
...manifest.metadata,
|
|
116
|
+
slug: projectId,
|
|
117
|
+
updated: new Date().toISOString(),
|
|
118
|
+
},
|
|
119
|
+
};
|
|
120
|
+
}
|
|
148
121
|
function parseProjectSummaryManifest(value) {
|
|
149
122
|
if (!isAppManifest(value)) {
|
|
150
123
|
throw new Error('Project manifest does not contain canonical Studio metadata.');
|
|
@@ -164,9 +137,9 @@ function resolveActiveTheme(manifest) {
|
|
|
164
137
|
}
|
|
165
138
|
return activeTheme;
|
|
166
139
|
}
|
|
167
|
-
async function exists(
|
|
140
|
+
async function exists(filePath) {
|
|
168
141
|
try {
|
|
169
|
-
await fs.access(
|
|
142
|
+
await fs.access(filePath);
|
|
170
143
|
return true;
|
|
171
144
|
}
|
|
172
145
|
catch {
|
|
@@ -176,8 +149,7 @@ async function exists(p) {
|
|
|
176
149
|
async function writeJsonAtomic(filePath, value) {
|
|
177
150
|
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
178
151
|
const temporaryPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
|
|
179
|
-
await fs.writeFile(temporaryPath, `${JSON.stringify(value, null, 2)}
|
|
180
|
-
`, 'utf8');
|
|
152
|
+
await fs.writeFile(temporaryPath, `${JSON.stringify(value, null, 2)}\n`, 'utf8');
|
|
181
153
|
await fs.rename(temporaryPath, filePath);
|
|
182
154
|
}
|
|
183
155
|
//# sourceMappingURL=projectStore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectStore.js","sourceRoot":"","sources":["../../../src/host/orchestrator/projectStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,MAAM,OAAO,4BAA6B,SAAQ,KAAK;IACrD,YAAY,SAAiB;QAC3B,KAAK,CAAC,YAAY,SAAS,0CAA0C,CAAC,CAAC;QACvE,IAAI,CAAC,IAAI,GAAG,8BAA8B,CAAC;IAC7C,CAAC;CACF;AAED,MAAM,OAAO,YAAY;IACM;IAA7B,YAA6B,QAAgB;QAAhB,aAAQ,GAAR,QAAQ,CAAQ;IAAG,CAAC;IAEzC,cAAc,CAAC,SAAiB;QACtC,OAAO,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAClD,CAAC;IAEO,eAAe,CAAC,SAAiB;QACvC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACvE,CAAC;IAEO,
|
|
1
|
+
{"version":3,"file":"projectStore.js","sourceRoot":"","sources":["../../../src/host/orchestrator/projectStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"studioInfraUp.d.ts","sourceRoot":"","sources":["../../../src/host/orchestrator/studioInfraUp.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"studioInfraUp.d.ts","sourceRoot":"","sources":["../../../src/host/orchestrator/studioInfraUp.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGvD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;IACtF,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9F,QAAQ,CAAC,YAAY,EACjB;QACE,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC;KAC1B,GACD;QACE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC;QACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACzB,CAAC;CACP;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,cAAc,CAAC,EAAE,0BAA0B,CAAC;CACtD,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAgD/B"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { runProjectInfrastructureLifecycle } from '@ankhorage/infra/project';
|
|
1
2
|
import { resolveTrustedOAuthInfraEnvironmentForUp, } from '../secrets/trustedOAuthInfraEnvironment';
|
|
2
|
-
import { registerProjectInfraPortForwardOwner
|
|
3
|
+
import { registerProjectInfraPortForwardOwner } from './infraSession';
|
|
4
|
+
import { getProjectPath } from './projectPaths';
|
|
3
5
|
export async function upProjectInfrastructure(args) {
|
|
4
6
|
const regenerated = await args.projectManager.regenerateInfrastructure(args.projectId);
|
|
5
7
|
if (regenerated.skipped) {
|
|
@@ -19,9 +21,10 @@ export async function upProjectInfrastructure(args) {
|
|
|
19
21
|
workspaceRoot: args.workspaceRoot,
|
|
20
22
|
...(args.secretResolver ? { secretResolver: args.secretResolver } : {}),
|
|
21
23
|
});
|
|
22
|
-
|
|
23
|
-
|
|
24
|
+
const projectPath = getProjectPath(args.workspaceRoot, args.projectId);
|
|
25
|
+
await runProjectInfrastructureLifecycle({
|
|
24
26
|
projectId: args.projectId,
|
|
27
|
+
projectPath,
|
|
25
28
|
target: status.target,
|
|
26
29
|
script: 'up',
|
|
27
30
|
env: {
|
|
@@ -30,8 +33,8 @@ export async function upProjectInfrastructure(args) {
|
|
|
30
33
|
},
|
|
31
34
|
});
|
|
32
35
|
await registerProjectInfraPortForwardOwner({
|
|
33
|
-
rootPath: args.workspaceRoot,
|
|
34
36
|
projectId: args.projectId,
|
|
37
|
+
projectPath,
|
|
35
38
|
target: status.target,
|
|
36
39
|
});
|
|
37
40
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"studioInfraUp.js","sourceRoot":"","sources":["../../../src/host/orchestrator/studioInfraUp.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wCAAwC,GAEzC,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,oCAAoC,EAAE,
|
|
1
|
+
{"version":3,"file":"studioInfraUp.js","sourceRoot":"","sources":["../../../src/host/orchestrator/studioInfraUp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,0BAA0B,CAAC;AAE7E,OAAO,EACL,wCAAwC,GAEzC,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,oCAAoC,EAAE,MAAM,gBAAgB,CAAC;AAEtE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAgBhD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,IAK7C;IACC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvF,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QACxB,OAAO;YACL,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,WAAW;YACX,YAAY,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;SAClC,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjF,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,CAAC,SAAS,6DAA6D,CACxF,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,wCAAwC,CAAC;QAClE,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxE,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAEvE,MAAM,iCAAiC,CAAC;QACtC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,WAAW;QACX,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE,IAAI;QACZ,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,GAAG,YAAY,CAAC,GAAG;SACpB;KACF,CAAC,CAAC;IACH,MAAM,oCAAoC,CAAC;QACzC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,WAAW;QACX,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB,CAAC,CAAC;IAEH,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,WAAW;QACX,YAAY,EAAE,YAAY,CAAC,QAAQ;YACjC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE;YACjD,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE;KACxB,CAAC;AACJ,CAAC"}
|
|
@@ -7,7 +7,7 @@ export interface ProjectSecretServiceOptions {
|
|
|
7
7
|
readonly projectManager: ProjectManager;
|
|
8
8
|
readonly workspaceRoot: string;
|
|
9
9
|
readonly createClient?: (databaseUrl: string) => BunSupabaseVaultClient;
|
|
10
|
-
readonly resolveDatabaseUrl?: (projectPath: string) => Promise<string>;
|
|
10
|
+
readonly resolveDatabaseUrl?: (projectPath: string, target: string) => Promise<string>;
|
|
11
11
|
}
|
|
12
12
|
export interface ConfigureOAuthProviderInput {
|
|
13
13
|
readonly projectId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSecretService.d.ts","sourceRoot":"","sources":["../../../src/host/secrets/projectSecretService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAIL,KAAK,cAAc,EACnB,KAAK,aAAa,EAIlB,KAAK,iBAAiB,EACvB,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAA2B,KAAK,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACnG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAErE,OAAO,EACL,KAAK,sBAAsB,EAE5B,MAAM,0BAA0B,CAAC;AAGlC,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,sBAAsB,CAAC;IACxE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"projectSecretService.d.ts","sourceRoot":"","sources":["../../../src/host/secrets/projectSecretService.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export class ProjectSecretService {
|
|
|
25
25
|
this.createClient = options.createClient ?? createBunSupabaseVaultClient;
|
|
26
26
|
this.resolveDatabaseUrl =
|
|
27
27
|
options.resolveDatabaseUrl ??
|
|
28
|
-
((projectPath) => resolveProjectSecretDatabaseUrl({ projectPath }));
|
|
28
|
+
((projectPath, target) => resolveProjectSecretDatabaseUrl({ projectPath, target }));
|
|
29
29
|
}
|
|
30
30
|
list(input) {
|
|
31
31
|
return this.withAdapter(input.projectId, (adapter) => adapter.list({
|
|
@@ -88,7 +88,10 @@ export class ProjectSecretService {
|
|
|
88
88
|
try {
|
|
89
89
|
const manifest = await this.readEditableManifest(input.projectId);
|
|
90
90
|
const projectPath = getProjectPath(this.workspaceRoot, input.projectId);
|
|
91
|
-
const
|
|
91
|
+
const infraStatus = await this.projectManager.getInfrastructureStatus(input.projectId);
|
|
92
|
+
if (!infraStatus.target)
|
|
93
|
+
throw new Error('Project infrastructure target is unavailable.');
|
|
94
|
+
const databaseUrl = await this.resolveDatabaseUrl(projectPath, infraStatus.target);
|
|
92
95
|
client = this.createClient(databaseUrl);
|
|
93
96
|
const adapter = createInfraSecretStoreAdapter({
|
|
94
97
|
manifest: manifest.infra,
|
|
@@ -197,7 +200,7 @@ export class ProjectSecretService {
|
|
|
197
200
|
}
|
|
198
201
|
async readEditableManifest(projectId) {
|
|
199
202
|
try {
|
|
200
|
-
return await this.projectManager.
|
|
203
|
+
return await this.projectManager.getProjectManifest(projectId);
|
|
201
204
|
}
|
|
202
205
|
catch {
|
|
203
206
|
return this.projectManager.getProjectManifest(projectId);
|
|
@@ -208,7 +211,10 @@ export class ProjectSecretService {
|
|
|
208
211
|
try {
|
|
209
212
|
const manifest = await this.readEditableManifest(projectId);
|
|
210
213
|
const projectPath = getProjectPath(this.workspaceRoot, projectId);
|
|
211
|
-
const
|
|
214
|
+
const infraStatus = await this.projectManager.getInfrastructureStatus(projectId);
|
|
215
|
+
if (!infraStatus.target)
|
|
216
|
+
throw new Error('Project infrastructure target is unavailable.');
|
|
217
|
+
const databaseUrl = await this.resolveDatabaseUrl(projectPath, infraStatus.target);
|
|
212
218
|
client = this.createClient(databaseUrl);
|
|
213
219
|
const adapter = createInfraSecretStoreAdapter({
|
|
214
220
|
manifest: manifest.infra,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSecretService.js","sourceRoot":"","sources":["../../../src/host/secrets/projectSecretService.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,MAAM,sBAAsB,CAAC;AAClF,OAAO,EACL,kBAAkB,GASnB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EACL,kCAAkC,EAClC,kCAAkC,GACnC,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,uBAAuB,EAAkC,MAAM,0BAA0B,CAAC;AAEnG,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAEL,4BAA4B,GAC7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AA6CpF,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IACvC,IAAI,CAAS;IAEtB,YAAY,IAAyD;QACnE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;CACF;AAED,MAAM,OAAO,oBAAoB;IACd,cAAc,CAAiB;IAC/B,aAAa,CAAS;IACtB,YAAY,CAAkD;IAC9D,kBAAkB,
|
|
1
|
+
{"version":3,"file":"projectSecretService.js","sourceRoot":"","sources":["../../../src/host/secrets/projectSecretService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,7 @@
|
|
|
1
1
|
export interface ResolveProjectSecretDatabaseUrlInput {
|
|
2
2
|
readonly projectPath: string;
|
|
3
|
+
readonly target: string;
|
|
3
4
|
readonly processEnvironment?: Readonly<Record<string, string | undefined>>;
|
|
4
5
|
}
|
|
5
|
-
/**
|
|
6
|
-
* Resolves the trusted database bootstrap URL without consulting the app manifest.
|
|
7
|
-
*
|
|
8
|
-
* Project-local values are read only from the generated, untracked Minikube environment file.
|
|
9
|
-
* There is deliberately no plaintext project-file fallback.
|
|
10
|
-
*/
|
|
11
6
|
export declare function resolveProjectSecretDatabaseUrl(input: ResolveProjectSecretDatabaseUrlInput): Promise<string>;
|
|
12
7
|
//# sourceMappingURL=resolveProjectSecretDatabaseUrl.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveProjectSecretDatabaseUrl.d.ts","sourceRoot":"","sources":["../../../src/host/secrets/resolveProjectSecretDatabaseUrl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolveProjectSecretDatabaseUrl.d.ts","sourceRoot":"","sources":["../../../src/host/secrets/resolveProjectSecretDatabaseUrl.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,oCAAoC;IACnD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,kBAAkB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;CAC5E;AAED,wBAAsB,+BAA+B,CACnD,KAAK,EAAE,oCAAoC,GAC1C,OAAO,CAAC,MAAM,CAAC,CAiBjB"}
|
|
@@ -1,68 +1,17 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
const DATABASE_URL_KEYS = [
|
|
4
|
-
'ANKH_SECRET_STORE_DATABASE_URL',
|
|
5
|
-
'SUPABASE_DB_URL',
|
|
6
|
-
'POSTGRES_URL',
|
|
7
|
-
'DB_URL',
|
|
8
|
-
'DATABASE_URL',
|
|
9
|
-
];
|
|
10
|
-
/**
|
|
11
|
-
* Resolves the trusted database bootstrap URL without consulting the app manifest.
|
|
12
|
-
*
|
|
13
|
-
* Project-local values are read only from the generated, untracked Minikube environment file.
|
|
14
|
-
* There is deliberately no plaintext project-file fallback.
|
|
15
|
-
*/
|
|
1
|
+
import { resolveProjectInfrastructureDatabaseUrl } from '@ankhorage/infra/project';
|
|
2
|
+
const TRUSTED_HOST_DATABASE_URL_KEY = 'ANKH_SECRET_STORE_DATABASE_URL';
|
|
16
3
|
export async function resolveProjectSecretDatabaseUrl(input) {
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const
|
|
23
|
-
|
|
4
|
+
const rawTrustedHostValue = input.processEnvironment?.[TRUSTED_HOST_DATABASE_URL_KEY] ??
|
|
5
|
+
process.env.ANKH_SECRET_STORE_DATABASE_URL;
|
|
6
|
+
const trustedHostValue = typeof rawTrustedHostValue === 'string' ? rawTrustedHostValue.trim() : undefined;
|
|
7
|
+
if (trustedHostValue)
|
|
8
|
+
return trustedHostValue;
|
|
9
|
+
const projectValue = await resolveProjectInfrastructureDatabaseUrl({
|
|
10
|
+
projectPath: input.projectPath,
|
|
11
|
+
target: input.target,
|
|
12
|
+
});
|
|
24
13
|
if (projectValue)
|
|
25
14
|
return projectValue;
|
|
26
|
-
throw new Error('Supabase Vault database access is not configured. Run
|
|
27
|
-
}
|
|
28
|
-
function readFirstValue(environment) {
|
|
29
|
-
for (const key of DATABASE_URL_KEYS) {
|
|
30
|
-
const value = environment[key]?.trim();
|
|
31
|
-
if (value)
|
|
32
|
-
return value;
|
|
33
|
-
}
|
|
34
|
-
return null;
|
|
35
|
-
}
|
|
36
|
-
async function readEnvFile(filePath) {
|
|
37
|
-
try {
|
|
38
|
-
const content = await fs.readFile(filePath, 'utf8');
|
|
39
|
-
const environment = {};
|
|
40
|
-
for (const line of content.split(/\r?\n/u)) {
|
|
41
|
-
const trimmed = line.trim();
|
|
42
|
-
if (!trimmed || trimmed.startsWith('#'))
|
|
43
|
-
continue;
|
|
44
|
-
const separator = trimmed.indexOf('=');
|
|
45
|
-
if (separator <= 0)
|
|
46
|
-
continue;
|
|
47
|
-
const key = trimmed.slice(0, separator).trim();
|
|
48
|
-
const value = trimmed
|
|
49
|
-
.slice(separator + 1)
|
|
50
|
-
.trim()
|
|
51
|
-
.replace(/^['"]|['"]$/gu, '');
|
|
52
|
-
environment[key] = value;
|
|
53
|
-
}
|
|
54
|
-
return environment;
|
|
55
|
-
}
|
|
56
|
-
catch (error) {
|
|
57
|
-
if (isMissingFileError(error))
|
|
58
|
-
return {};
|
|
59
|
-
throw error;
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
function isMissingFileError(error) {
|
|
63
|
-
return (typeof error === 'object' &&
|
|
64
|
-
error !== null &&
|
|
65
|
-
'code' in error &&
|
|
66
|
-
error.code === 'ENOENT');
|
|
15
|
+
throw new Error('Supabase Vault database access is not configured. Run Infra Up or set ANKH_SECRET_STORE_DATABASE_URL in the trusted Studio host environment.');
|
|
67
16
|
}
|
|
68
17
|
//# sourceMappingURL=resolveProjectSecretDatabaseUrl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveProjectSecretDatabaseUrl.js","sourceRoot":"","sources":["../../../src/host/secrets/resolveProjectSecretDatabaseUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"resolveProjectSecretDatabaseUrl.js","sourceRoot":"","sources":["../../../src/host/secrets/resolveProjectSecretDatabaseUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uCAAuC,EAAE,MAAM,0BAA0B,CAAC;AAEnF,MAAM,6BAA6B,GAAG,gCAAgC,CAAC;AAQvE,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,KAA2C;IAE3C,MAAM,mBAAmB,GACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC,6BAA6B,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC;IAC7C,MAAM,gBAAgB,GACpB,OAAO,mBAAmB,KAAK,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACnF,IAAI,gBAAgB;QAAE,OAAO,gBAAgB,CAAC;IAE9C,MAAM,YAAY,GAAG,MAAM,uCAAuC,CAAC;QACjE,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,CAAC,CAAC;IACH,IAAI,YAAY;QAAE,OAAO,YAAY,CAAC;IAEtC,MAAM,IAAI,KAAK,CACb,8IAA8I,CAC/I,CAAC;AACJ,CAAC"}
|
|
@@ -16,13 +16,13 @@ export type TrustedOAuthInfraEnvironmentForUpResult = {
|
|
|
16
16
|
};
|
|
17
17
|
export declare function resolveTrustedOAuthInfraEnvironmentForUp(args: {
|
|
18
18
|
readonly projectId: string;
|
|
19
|
-
readonly projectManager: Pick<ProjectManager, '
|
|
19
|
+
readonly projectManager: Pick<ProjectManager, 'getProjectManifest'>;
|
|
20
20
|
readonly workspaceRoot: string;
|
|
21
21
|
readonly secretResolver?: TrustedOAuthSecretResolver;
|
|
22
22
|
}): Promise<TrustedOAuthInfraEnvironmentForUpResult>;
|
|
23
23
|
export declare function resolveTrustedOAuthInfraEnvironment(args: {
|
|
24
24
|
readonly projectId: string;
|
|
25
|
-
readonly projectManager: Pick<ProjectManager, '
|
|
25
|
+
readonly projectManager: Pick<ProjectManager, 'getProjectManifest'>;
|
|
26
26
|
readonly workspaceRoot: string;
|
|
27
27
|
readonly secretResolver?: TrustedOAuthSecretResolver;
|
|
28
28
|
}): Promise<Record<string, string | undefined>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trustedOAuthInfraEnvironment.d.ts","sourceRoot":"","sources":["../../../src/host/secrets/trustedOAuthInfraEnvironment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAErF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAGrE,MAAM,WAAW,0BAA0B;IACzC,OAAO,CAAC,KAAK,EAAE;QACb,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,CAAC;CAC/C;AAED,MAAM,MAAM,uCAAuC,GAC/C;IACE,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAClD,GACD;IACE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC;IACxB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AASN,wBAAsB,wCAAwC,CAAC,IAAI,EAAE;IACnE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"trustedOAuthInfraEnvironment.d.ts","sourceRoot":"","sources":["../../../src/host/secrets/trustedOAuthInfraEnvironment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAErF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAGrE,MAAM,WAAW,0BAA0B;IACzC,OAAO,CAAC,KAAK,EAAE;QACb,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,CAAC;CAC/C;AAED,MAAM,MAAM,uCAAuC,GAC/C;IACE,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAClD,GACD;IACE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC;IACxB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AASN,wBAAsB,wCAAwC,CAAC,IAAI,EAAE;IACnE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;IACpE,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,cAAc,CAAC,EAAE,0BAA0B,CAAC;CACtD,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAgBnD;AAED,wBAAsB,mCAAmC,CAAC,IAAI,EAAE;IAC9D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;IACpE,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,cAAc,CAAC,EAAE,0BAA0B,CAAC;CACtD,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAuD9C"}
|
|
@@ -68,7 +68,7 @@ export async function resolveTrustedOAuthInfraEnvironment(args) {
|
|
|
68
68
|
}
|
|
69
69
|
async function readCurrentManifest(projectId, projectManager) {
|
|
70
70
|
try {
|
|
71
|
-
return await projectManager.
|
|
71
|
+
return await projectManager.getProjectManifest(projectId);
|
|
72
72
|
}
|
|
73
73
|
catch {
|
|
74
74
|
return projectManager.getProjectManifest(projectId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trustedOAuthInfraEnvironment.js","sourceRoot":"","sources":["../../../src/host/secrets/trustedOAuthInfraEnvironment.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,uCAAwC,SAAQ,KAAK;IACzD,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,yCAAyC,CAAC;IACxD,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,wCAAwC,CAAC,IAK9D;IACC,IAAI,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,KAAK;YACf,GAAG,EAAE,MAAM,mCAAmC,CAAC,IAAI,CAAC;SACrD,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,uCAAuC,EAAE,CAAC;YAC7D,OAAO;gBACL,QAAQ,EAAE,IAAI;gBACd,GAAG,EAAE,EAAE;gBACP,MAAM,EAAE,KAAK,CAAC,OAAO;aACtB,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mCAAmC,CAAC,IAKzD;IACC,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAChF,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO;QACnD,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,KAAK,CAAC;QACtF,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEtC,MAAM,cAAc,GAClB,IAAI,CAAC,cAAc;QACnB,IAAI,oBAAoB,CAAC;YACvB,cAAc,EAAE,IAAI,CAAC,cAAgC;YACrD,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,2BAA2B,QAAQ,CAAC,EAAE,sCAAsC,CAAC,CAAC;QAChG,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC;YAC1C,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,GAAG,EAAE,QAAQ,CAAC,cAAc;SAC7B,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBACxC,MAAM,IAAI,uCAAuC,CAC/C,2DAA2D,QAAQ,CAAC,EAAE,SAAS,QAAQ,CAAC,cAAc,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CACnI,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,KAAK,CACb,6DAA6D,QAAQ,CAAC,EAAE,SAAS,QAAQ,CAAC,cAAc,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CACrI,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;QAC/C,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrE,MAAM,IAAI,KAAK,CACb,2CAA2C,QAAQ,CAAC,EAAE,SAAS,QAAQ,CAAC,cAAc,kDAAkD,CACzI,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,QAAQ,CAAC,EAAE;aAC1B,WAAW,EAAE;aACb,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC;aAC5B,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,mBAAmB,QAAQ,CAAC,EAAE,8CAA8C,CAAC,CAAC;QAChG,CAAC;QAED,GAAG,CAAC,mBAAmB,SAAS,YAAY,CAAC,GAAG,QAAQ,CAAC;QACzD,GAAG,CAAC,mBAAmB,SAAS,SAAS,CAAC,GAAG,YAAY,CAAC;IAC5D,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,SAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"trustedOAuthInfraEnvironment.js","sourceRoot":"","sources":["../../../src/host/secrets/trustedOAuthInfraEnvironment.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,uCAAwC,SAAQ,KAAK;IACzD,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,yCAAyC,CAAC;IACxD,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,wCAAwC,CAAC,IAK9D;IACC,IAAI,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,KAAK;YACf,GAAG,EAAE,MAAM,mCAAmC,CAAC,IAAI,CAAC;SACrD,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,uCAAuC,EAAE,CAAC;YAC7D,OAAO;gBACL,QAAQ,EAAE,IAAI;gBACd,GAAG,EAAE,EAAE;gBACP,MAAM,EAAE,KAAK,CAAC,OAAO;aACtB,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mCAAmC,CAAC,IAKzD;IACC,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAChF,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO;QACnD,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,KAAK,CAAC;QACtF,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEtC,MAAM,cAAc,GAClB,IAAI,CAAC,cAAc;QACnB,IAAI,oBAAoB,CAAC;YACvB,cAAc,EAAE,IAAI,CAAC,cAAgC;YACrD,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,2BAA2B,QAAQ,CAAC,EAAE,sCAAsC,CAAC,CAAC;QAChG,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC;YAC1C,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,GAAG,EAAE,QAAQ,CAAC,cAAc;SAC7B,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBACxC,MAAM,IAAI,uCAAuC,CAC/C,2DAA2D,QAAQ,CAAC,EAAE,SAAS,QAAQ,CAAC,cAAc,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CACnI,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,KAAK,CACb,6DAA6D,QAAQ,CAAC,EAAE,SAAS,QAAQ,CAAC,cAAc,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CACrI,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;QAC/C,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrE,MAAM,IAAI,KAAK,CACb,2CAA2C,QAAQ,CAAC,EAAE,SAAS,QAAQ,CAAC,cAAc,kDAAkD,CACzI,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,QAAQ,CAAC,EAAE;aAC1B,WAAW,EAAE;aACb,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC;aAC5B,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,mBAAmB,QAAQ,CAAC,EAAE,8CAA8C,CAAC,CAAC;QAChG,CAAC;QAED,GAAG,CAAC,mBAAmB,SAAS,YAAY,CAAC,GAAG,QAAQ,CAAC;QACzD,GAAG,CAAC,mBAAmB,SAAS,SAAS,CAAC,GAAG,YAAY,CAAC;IAC5D,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,SAAiB,EACjB,cAA0D;IAE1D,IAAI,CAAC;QACH,OAAO,MAAM,cAAc,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,cAAc,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACtD,CAAC;AACH,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -24,9 +24,9 @@ export type StudioScreenId = string;
|
|
|
24
24
|
export type StudioModuleId = string;
|
|
25
25
|
export type StudioSaveStatus = 'idle' | 'saving' | 'saved' | 'error';
|
|
26
26
|
export type StudioPanelId = 'layers';
|
|
27
|
-
export type StudioAdminRouteId = 'overview' | 'screens' | 'screen-detail' | 'modules' | 'module-detail' | 'apis' | 'api-data-sources' | 'api-operations' | 'auth' | 'auth-providers' | 'auth-routes' | 'auth-profile' | 'secrets' | 'theme' | 'bindings' | 'properties';
|
|
28
|
-
export type StudioAdminStaticRoutePath = '/ankh' | '/ankh/screens' | '/ankh/modules' | '/ankh/apis' | '/ankh/apis/data-sources' | '/ankh/apis/operations' | '/ankh/auth' | '/ankh/auth/providers' | '/ankh/auth/routes' | '/ankh/auth/profile' | '/ankh/secrets' | '/ankh/theme';
|
|
29
|
-
export type StudioAdminRoutePath = StudioAdminStaticRoutePath | `/ankh/screens/${string}` | `/ankh/modules/${string}` | `/ankh/bindings/${string}` | `/ankh/properties/${string}`;
|
|
27
|
+
export type StudioAdminRouteId = 'overview' | 'screens' | 'screen-detail' | 'modules' | 'module-detail' | 'apis' | 'api-data-sources' | 'api-operations' | 'auth' | 'auth-providers' | 'auth-routes' | 'auth-profile' | 'secrets' | 'theme' | 'theme-colors' | 'theme-typography' | 'theme-spacing' | 'theme-radii' | 'theme-shadows' | 'theme-component' | 'theme-pattern' | 'bindings' | 'properties';
|
|
28
|
+
export type StudioAdminStaticRoutePath = '/ankh' | '/ankh/screens' | '/ankh/modules' | '/ankh/apis' | '/ankh/apis/data-sources' | '/ankh/apis/operations' | '/ankh/auth' | '/ankh/auth/providers' | '/ankh/auth/routes' | '/ankh/auth/profile' | '/ankh/secrets' | '/ankh/theme' | '/ankh/theme/colors' | '/ankh/theme/typography' | '/ankh/theme/spacing' | '/ankh/theme/radii' | '/ankh/theme/shadows';
|
|
29
|
+
export type StudioAdminRoutePath = StudioAdminStaticRoutePath | `/ankh/screens/${string}` | `/ankh/modules/${string}` | `/ankh/theme/components/${string}` | `/ankh/theme/patterns/${string}` | `/ankh/bindings/${string}` | `/ankh/properties/${string}`;
|
|
30
30
|
export type StudioManifest = AppManifest;
|
|
31
31
|
export type ThemeUpdates = Partial<Omit<ThemeConfig, 'light' | 'dark'>> & {
|
|
32
32
|
light?: Partial<ThemeModeConfig>;
|