zephyr-agent 0.0.0-canary-20250513234234 → 0.0.0-canary-20250522231114
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/dist/index.d.ts +0 -1
- package/dist/index.js +1 -6
- package/dist/index.js.map +1 -1
- package/dist/lib/auth/login.d.ts +1 -7
- package/dist/lib/auth/login.js +63 -50
- package/dist/lib/auth/login.js.map +1 -1
- package/dist/lib/build-context/fs-cache-for-package-json.js +3 -0
- package/dist/lib/build-context/fs-cache-for-package-json.js.map +1 -1
- package/dist/lib/build-context/ze-package-json.type.d.ts +2 -0
- package/dist/lib/build-context/ze-util-get-git-info.js +2 -2
- package/dist/lib/build-context/ze-util-get-git-info.js.map +1 -1
- package/dist/lib/build-context/ze-util-read-package-json.js +3 -24
- package/dist/lib/build-context/ze-util-read-package-json.js.map +1 -1
- package/dist/lib/edge-actions/ze-enable-snapshot-on-pages.js +2 -2
- package/dist/lib/edge-actions/ze-enable-snapshot-on-pages.js.map +1 -1
- package/dist/lib/edge-actions/ze-upload-build-stats.js +2 -2
- package/dist/lib/edge-actions/ze-upload-build-stats.js.map +1 -1
- package/dist/lib/edge-requests/get-application-configuration.d.ts +2 -0
- package/dist/lib/edge-requests/get-application-configuration.js +41 -38
- package/dist/lib/edge-requests/get-application-configuration.js.map +1 -1
- package/dist/lib/edge-requests/get-application-hash-list.js +2 -2
- package/dist/lib/edge-requests/get-application-hash-list.js.map +1 -1
- package/dist/lib/edge-requests/get-build-id.js +2 -2
- package/dist/lib/edge-requests/get-build-id.js.map +1 -1
- package/dist/lib/http/fetch-with-retries.js +87 -28
- package/dist/lib/http/fetch-with-retries.js.map +1 -1
- package/dist/lib/http/http-request.d.ts +15 -0
- package/dist/lib/http/http-request.js +113 -0
- package/dist/lib/http/http-request.js.map +1 -0
- package/dist/lib/http/upload-envs.js +4 -6
- package/dist/lib/http/upload-envs.js.map +1 -1
- package/dist/lib/http/upload-file.js +2 -2
- package/dist/lib/http/upload-file.js.map +1 -1
- package/dist/lib/http/upload-snapshot.js +5 -9
- package/dist/lib/http/upload-snapshot.js.map +1 -1
- package/dist/lib/logging/ze-log-event.js +3 -3
- package/dist/lib/logging/ze-log-event.js.map +1 -1
- package/dist/lib/node-persist/app-deploy-result-cache.js +4 -8
- package/dist/lib/node-persist/app-deploy-result-cache.js.map +1 -1
- package/dist/lib/node-persist/application-configuration.js +4 -8
- package/dist/lib/node-persist/application-configuration.js.map +1 -1
- package/dist/lib/node-persist/fs-cache.js +5 -9
- package/dist/lib/node-persist/fs-cache.js.map +1 -1
- package/dist/lib/node-persist/hash-cache.js +6 -10
- package/dist/lib/node-persist/hash-cache.js.map +1 -1
- package/dist/lib/node-persist/partial-assets-map.js +4 -8
- package/dist/lib/node-persist/partial-assets-map.js.map +1 -1
- package/dist/lib/node-persist/session-lock.d.ts +17 -0
- package/dist/lib/node-persist/session-lock.js +97 -0
- package/dist/lib/node-persist/session-lock.js.map +1 -0
- package/dist/lib/node-persist/storage-keys.d.ts +3 -2
- package/dist/lib/node-persist/storage-keys.js +14 -2
- package/dist/lib/node-persist/storage-keys.js.map +1 -1
- package/dist/lib/node-persist/storage.d.ts +1 -0
- package/dist/lib/node-persist/storage.js +13 -0
- package/dist/lib/node-persist/storage.js.map +1 -0
- package/dist/lib/node-persist/token.js +6 -10
- package/dist/lib/node-persist/token.js.map +1 -1
- package/dist/lib/transformers/ze-build-dash-data.js +2 -1
- package/dist/lib/transformers/ze-build-dash-data.js.map +1 -1
- package/dist/package.json +5 -1
- package/dist/zephyr-engine/index.d.ts +1 -1
- package/dist/zephyr-engine/index.js +5 -2
- package/dist/zephyr-engine/index.js.map +1 -1
- package/dist/zephyr-engine/resolve_remote_dependency.js +7 -5
- package/dist/zephyr-engine/resolve_remote_dependency.js.map +1 -1
- package/package.json +6 -2
- package/dist/lib/build-context/resolve-catalog-version.d.ts +0 -24
- package/dist/lib/build-context/resolve-catalog-version.js +0 -365
- package/dist/lib/build-context/resolve-catalog-version.js.map +0 -1
- package/dist/lib/http/ze-http-request.d.ts +0 -16
- package/dist/lib/http/ze-http-request.js +0 -131
- package/dist/lib/http/ze-http-request.js.map +0 -1
|
@@ -1,365 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveCatalogVersion = resolveCatalogVersion;
|
|
4
|
-
exports.getCatalogPackages = getCatalogPackages;
|
|
5
|
-
exports.resolveCatalogDependencies = resolveCatalogDependencies;
|
|
6
|
-
const tslib_1 = require("tslib");
|
|
7
|
-
const fs = tslib_1.__importStar(require("fs"));
|
|
8
|
-
const path = tslib_1.__importStar(require("path"));
|
|
9
|
-
const logging_1 = require("../logging");
|
|
10
|
-
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
11
|
-
/** Cache for workspace config to avoid repeated file reads */
|
|
12
|
-
let workspaceConfigCache = null;
|
|
13
|
-
/** Cache for workspace packages to avoid repeated file scanning */
|
|
14
|
-
let workspacePackagesCache = null;
|
|
15
|
-
/**
|
|
16
|
-
* Reads the pnpm-workspace.yaml file to get catalog definitions
|
|
17
|
-
*
|
|
18
|
-
* @param workspacePath Optional path to the workspace file
|
|
19
|
-
* @returns The parsed pnpm workspace configuration
|
|
20
|
-
*/
|
|
21
|
-
function readWorkspaceConfig(workspacePath) {
|
|
22
|
-
if (workspaceConfigCache) {
|
|
23
|
-
return workspaceConfigCache;
|
|
24
|
-
}
|
|
25
|
-
// Try to find pnpm-workspace.yaml in current directory or parent directories
|
|
26
|
-
const searchPath = workspacePath || findWorkspaceFile();
|
|
27
|
-
if (!searchPath) {
|
|
28
|
-
(0, logging_1.ze_log)('Warning: Could not find pnpm-workspace.yaml file');
|
|
29
|
-
return {};
|
|
30
|
-
}
|
|
31
|
-
try {
|
|
32
|
-
// Using require would be simpler, but we'll use fs to read and YAML parse
|
|
33
|
-
// for more explicit error handling and to avoid needing yaml package
|
|
34
|
-
const yaml = fs.readFileSync(searchPath, 'utf8');
|
|
35
|
-
const config = parseYaml(yaml);
|
|
36
|
-
workspaceConfigCache = config;
|
|
37
|
-
return config;
|
|
38
|
-
}
|
|
39
|
-
catch (error) {
|
|
40
|
-
(0, logging_1.ze_log)('Error reading pnpm-workspace.yaml:', error);
|
|
41
|
-
return {};
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
/**
|
|
45
|
-
* Simple YAML parser for pnpm-workspace.yaml This is a basic implementation that handles
|
|
46
|
-
* the format we expect in pnpm-workspace.yaml
|
|
47
|
-
*/
|
|
48
|
-
function parseYaml(yaml) {
|
|
49
|
-
const result = {};
|
|
50
|
-
let currentSection = null;
|
|
51
|
-
let currentSubsection = null;
|
|
52
|
-
const lines = yaml.split('\n');
|
|
53
|
-
for (const line of lines) {
|
|
54
|
-
const trimmedLine = line.trim();
|
|
55
|
-
// Skip comments and empty lines
|
|
56
|
-
if (trimmedLine.startsWith('#') || !trimmedLine) {
|
|
57
|
-
continue;
|
|
58
|
-
}
|
|
59
|
-
// Check for main sections
|
|
60
|
-
if (trimmedLine.endsWith(':')) {
|
|
61
|
-
currentSection = trimmedLine.slice(0, -1);
|
|
62
|
-
if (!currentSection) {
|
|
63
|
-
currentSubsection = null;
|
|
64
|
-
}
|
|
65
|
-
if (currentSection === 'catalogs') {
|
|
66
|
-
result.catalogs = {};
|
|
67
|
-
}
|
|
68
|
-
if (currentSection === 'packages') {
|
|
69
|
-
result.packages = [];
|
|
70
|
-
}
|
|
71
|
-
// Get the catalog's name
|
|
72
|
-
if (trimmedLine.endsWith(':') && currentSection !== 'catalogs' && result.catalogs) {
|
|
73
|
-
currentSubsection = trimmedLine.trim().slice(0, -1);
|
|
74
|
-
result.catalogs[currentSubsection] = {};
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
// Parse packages section
|
|
78
|
-
if (currentSection === 'packages' && trimmedLine.startsWith('-')) {
|
|
79
|
-
const pattern = trimmedLine.slice(1).trim();
|
|
80
|
-
// Remove quotes if present
|
|
81
|
-
const cleanPattern = pattern.replace(/^['"]|['"]$/g, '');
|
|
82
|
-
if (!result.packages) {
|
|
83
|
-
result.packages = [];
|
|
84
|
-
}
|
|
85
|
-
result.packages.push(cleanPattern);
|
|
86
|
-
}
|
|
87
|
-
// Get the key and value from the line (at here should be npm dependency name)
|
|
88
|
-
if (trimmedLine.includes(':') && currentSection !== 'catalogs' && result.catalogs) {
|
|
89
|
-
if (currentSubsection) {
|
|
90
|
-
const [key, value] = trimmedLine.split(':', 2).map((part) => part.trim());
|
|
91
|
-
// remove all the double quotes and single quotes and replace them with '\'', because this is affecting the replacement
|
|
92
|
-
const cleanedKey = key.replace(/['"]/g, '');
|
|
93
|
-
result.catalogs[currentSubsection][cleanedKey] = value;
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
return result;
|
|
98
|
-
}
|
|
99
|
-
/**
|
|
100
|
-
* Finds the pnpm-workspace.yaml file by looking in the current directory and traversing
|
|
101
|
-
* up the directory tree
|
|
102
|
-
*/
|
|
103
|
-
function findWorkspaceFile() {
|
|
104
|
-
let currentDir = process.cwd();
|
|
105
|
-
const root = path.parse(currentDir).root;
|
|
106
|
-
while (currentDir !== root) {
|
|
107
|
-
const workspacePath = path.join(currentDir, 'pnpm-workspace.yaml');
|
|
108
|
-
if (fs.existsSync(workspacePath)) {
|
|
109
|
-
return workspacePath;
|
|
110
|
-
}
|
|
111
|
-
currentDir = path.dirname(currentDir);
|
|
112
|
-
}
|
|
113
|
-
return null;
|
|
114
|
-
}
|
|
115
|
-
/**
|
|
116
|
-
* Gets the workspace root directory by finding the directory containing the
|
|
117
|
-
* pnpm-workspace.yaml file
|
|
118
|
-
*/
|
|
119
|
-
function getWorkspaceRoot() {
|
|
120
|
-
const workspaceFile = findWorkspaceFile();
|
|
121
|
-
if (!workspaceFile) {
|
|
122
|
-
return null;
|
|
123
|
-
}
|
|
124
|
-
return path.dirname(workspaceFile);
|
|
125
|
-
}
|
|
126
|
-
/**
|
|
127
|
-
* Find package.json files in a directory according to glob-like patterns This is a custom
|
|
128
|
-
* implementation to replace glob.sync
|
|
129
|
-
*
|
|
130
|
-
* @param rootDir The root directory to start searching from
|
|
131
|
-
* @param includePattern The pattern to include (e.g., "libs/**")
|
|
132
|
-
* @param excludePatterns Array of patterns to exclude
|
|
133
|
-
* @returns Array of absolute paths to matching package.json files
|
|
134
|
-
*/
|
|
135
|
-
function findPackageJsonFiles(rootDir, includePattern, excludePatterns = []) {
|
|
136
|
-
const results = [];
|
|
137
|
-
// Convert glob-like pattern to regex pattern for matching
|
|
138
|
-
const patternParts = includePattern.split('/');
|
|
139
|
-
const baseDir = patternParts[0] === '**' ? '' : patternParts[0];
|
|
140
|
-
const hasDoubleGlob = includePattern.includes('**');
|
|
141
|
-
// Build the full base path
|
|
142
|
-
const basePath = path.join(rootDir, baseDir);
|
|
143
|
-
// Check if the base directory exists
|
|
144
|
-
if (!fs.existsSync(basePath) || !fs.statSync(basePath).isDirectory()) {
|
|
145
|
-
return [];
|
|
146
|
-
}
|
|
147
|
-
// Function to check if a path should be excluded
|
|
148
|
-
const isExcluded = (filePath) => {
|
|
149
|
-
const relativePath = path.relative(rootDir, filePath);
|
|
150
|
-
return excludePatterns.some((pattern) => {
|
|
151
|
-
// Remove the ! from negated patterns
|
|
152
|
-
const cleanPattern = pattern.startsWith('!') ? pattern.slice(1) : pattern;
|
|
153
|
-
// Simple string matching for exact paths or basic wildcards
|
|
154
|
-
if (cleanPattern.endsWith('/**')) {
|
|
155
|
-
const prefix = cleanPattern.slice(0, -3);
|
|
156
|
-
return relativePath.startsWith(prefix);
|
|
157
|
-
}
|
|
158
|
-
return (relativePath === cleanPattern ||
|
|
159
|
-
(cleanPattern.includes('*') &&
|
|
160
|
-
relativePath.startsWith(cleanPattern.split('*')[0])));
|
|
161
|
-
});
|
|
162
|
-
};
|
|
163
|
-
// Recursive function to find package.json files
|
|
164
|
-
const findRecursively = (dir, depth = 0) => {
|
|
165
|
-
if (isExcluded(dir)) {
|
|
166
|
-
return;
|
|
167
|
-
}
|
|
168
|
-
try {
|
|
169
|
-
const entries = fs.readdirSync(dir, { withFileTypes: true });
|
|
170
|
-
for (const entry of entries) {
|
|
171
|
-
const fullPath = path.join(dir, entry.name);
|
|
172
|
-
if (isExcluded(fullPath)) {
|
|
173
|
-
continue;
|
|
174
|
-
}
|
|
175
|
-
if (entry.isDirectory() && (hasDoubleGlob || depth < patternParts.length)) {
|
|
176
|
-
// Recurse into directories if we have ** or haven't reached max depth
|
|
177
|
-
findRecursively(fullPath, depth + 1);
|
|
178
|
-
}
|
|
179
|
-
else if (entry.name === 'package.json') {
|
|
180
|
-
results.push(fullPath);
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
catch (error) {
|
|
185
|
-
(0, logging_1.ze_log)(`Error reading directory ${dir}:`, error);
|
|
186
|
-
}
|
|
187
|
-
};
|
|
188
|
-
// Start the recursive search
|
|
189
|
-
findRecursively(basePath);
|
|
190
|
-
return results;
|
|
191
|
-
}
|
|
192
|
-
/**
|
|
193
|
-
* Finds all package.json files in the workspace based on the patterns specified in the
|
|
194
|
-
* pnpm-workspace.yaml file
|
|
195
|
-
*/
|
|
196
|
-
function findWorkspacePackages() {
|
|
197
|
-
// Return cached result if available
|
|
198
|
-
if (workspacePackagesCache) {
|
|
199
|
-
return workspacePackagesCache;
|
|
200
|
-
}
|
|
201
|
-
const workspaceRoot = getWorkspaceRoot();
|
|
202
|
-
if (!workspaceRoot) {
|
|
203
|
-
(0, logging_1.ze_log)('Warning: Could not find workspace root directory');
|
|
204
|
-
return new Map();
|
|
205
|
-
}
|
|
206
|
-
const config = readWorkspaceConfig();
|
|
207
|
-
if (!config.packages || config.packages.length === 0) {
|
|
208
|
-
(0, logging_1.ze_log)('Warning: No workspace packages defined in pnpm-workspace.yaml');
|
|
209
|
-
return new Map();
|
|
210
|
-
}
|
|
211
|
-
const packageJsonMap = new Map();
|
|
212
|
-
const includePatterns = [];
|
|
213
|
-
const excludePatterns = [];
|
|
214
|
-
// Separate include and exclude patterns
|
|
215
|
-
for (const pattern of config.packages) {
|
|
216
|
-
if (pattern.startsWith('!')) {
|
|
217
|
-
excludePatterns.push(pattern.slice(1));
|
|
218
|
-
}
|
|
219
|
-
else {
|
|
220
|
-
includePatterns.push(pattern);
|
|
221
|
-
}
|
|
222
|
-
}
|
|
223
|
-
// Process include patterns
|
|
224
|
-
for (const includePattern of includePatterns) {
|
|
225
|
-
try {
|
|
226
|
-
// Use our own file finder instead of glob
|
|
227
|
-
const packageJsonPaths = findPackageJsonFiles(workspaceRoot, includePattern, excludePatterns);
|
|
228
|
-
// Read each package.json file
|
|
229
|
-
for (const packageJsonPath of packageJsonPaths) {
|
|
230
|
-
try {
|
|
231
|
-
const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf8');
|
|
232
|
-
const packageJson = (0, zephyr_edge_contract_1.safe_json_parse)(packageJsonContent);
|
|
233
|
-
if (packageJson && packageJson.name) {
|
|
234
|
-
packageJsonMap.set(packageJson.name, packageJson);
|
|
235
|
-
}
|
|
236
|
-
}
|
|
237
|
-
catch (error) {
|
|
238
|
-
(0, logging_1.ze_log)(`Error reading package.json at ${packageJsonPath}:`, error);
|
|
239
|
-
}
|
|
240
|
-
}
|
|
241
|
-
}
|
|
242
|
-
catch (error) {
|
|
243
|
-
(0, logging_1.ze_log)(`Error processing pattern ${includePattern}:`, error);
|
|
244
|
-
}
|
|
245
|
-
}
|
|
246
|
-
// Cache the result
|
|
247
|
-
workspacePackagesCache = packageJsonMap;
|
|
248
|
-
return packageJsonMap;
|
|
249
|
-
}
|
|
250
|
-
/**
|
|
251
|
-
* Resolves a workspace:* dependency by finding the package in the workspace
|
|
252
|
-
*
|
|
253
|
-
* @param packageName The name of the package to find in the workspace
|
|
254
|
-
* @returns The version of the package, or null if not found
|
|
255
|
-
*/
|
|
256
|
-
function resolveWorkspaceVersion(packageName) {
|
|
257
|
-
var _a;
|
|
258
|
-
const workspacePackages = findWorkspacePackages();
|
|
259
|
-
if (workspacePackages.has(packageName)) {
|
|
260
|
-
return ((_a = workspacePackages.get(packageName)) === null || _a === void 0 ? void 0 : _a.version) || null;
|
|
261
|
-
}
|
|
262
|
-
return null;
|
|
263
|
-
}
|
|
264
|
-
/**
|
|
265
|
-
* Resolves a catalog dependency version string (e.g., "catalog:react18") to its actual
|
|
266
|
-
* semver version range from pnpm-workspace.yaml
|
|
267
|
-
*
|
|
268
|
-
* @param versionString The version string to resolve
|
|
269
|
-
* @param packageName Optional package name to look up specific package in catalog
|
|
270
|
-
* @returns The resolved semver version or the original version if not a catalog reference
|
|
271
|
-
*/
|
|
272
|
-
function resolveCatalogVersion(versionString, packageName) {
|
|
273
|
-
// If it's not a catalog reference, return as is
|
|
274
|
-
if (!versionString ||
|
|
275
|
-
typeof versionString !== 'string' ||
|
|
276
|
-
!versionString.startsWith('catalog:')) {
|
|
277
|
-
return versionString;
|
|
278
|
-
}
|
|
279
|
-
// Extract catalog name from format "catalog:catalogName"
|
|
280
|
-
const catalogName = versionString.substring(8); // Remove "catalog:" prefix
|
|
281
|
-
// Read workspace config to get catalog information
|
|
282
|
-
const config = readWorkspaceConfig();
|
|
283
|
-
// If no catalogs section or the specified catalog doesn't exist
|
|
284
|
-
if (!config.catalogs || !Object.keys(config.catalogs).includes(catalogName)) {
|
|
285
|
-
(0, logging_1.ze_log)(`Warning: Catalog "${catalogName}" not found in pnpm-workspace.yaml`);
|
|
286
|
-
return versionString; // Return the original version string as fallback
|
|
287
|
-
}
|
|
288
|
-
// If a package name is provided, look for that specific package in the catalog
|
|
289
|
-
if (packageName && config.catalogs[catalogName][packageName]) {
|
|
290
|
-
return config.catalogs[catalogName][packageName];
|
|
291
|
-
}
|
|
292
|
-
// Return an object representation of all versions in this catalog
|
|
293
|
-
// This is useful for module federation shared config
|
|
294
|
-
return JSON.stringify(config.catalogs[catalogName]);
|
|
295
|
-
}
|
|
296
|
-
/**
|
|
297
|
-
* Gets all packages with their versions for a specific catalog
|
|
298
|
-
*
|
|
299
|
-
* @param catalogName The name of the catalog
|
|
300
|
-
* @returns Object mapping package names to their versions, or null if catalog not found
|
|
301
|
-
*/
|
|
302
|
-
function getCatalogPackages(catalogName) {
|
|
303
|
-
// Read workspace config to get catalog information
|
|
304
|
-
const config = readWorkspaceConfig();
|
|
305
|
-
// If no catalogs section or the specified catalog doesn't exist
|
|
306
|
-
if (!config.catalogs || !Object.keys(config.catalogs).includes(catalogName)) {
|
|
307
|
-
(0, logging_1.ze_log)(`Warning: Catalog "${catalogName}" not found in pnpm-workspace.yaml`);
|
|
308
|
-
return null;
|
|
309
|
-
}
|
|
310
|
-
return config.catalogs[catalogName];
|
|
311
|
-
}
|
|
312
|
-
/**
|
|
313
|
-
* Resolves a dependency versions object, looking for catalog: references and replacing
|
|
314
|
-
* them with the actual semver version ranges
|
|
315
|
-
*
|
|
316
|
-
* @param dependencies Package dependencies object (e.g., from package.json)
|
|
317
|
-
* @returns New dependencies object with resolved versions
|
|
318
|
-
*/
|
|
319
|
-
function resolveCatalogDependencies(dependencies) {
|
|
320
|
-
if (!dependencies)
|
|
321
|
-
return {};
|
|
322
|
-
const result = {};
|
|
323
|
-
for (const [name, version] of Object.entries(dependencies)) {
|
|
324
|
-
if (version && typeof version === 'string' && version.startsWith('catalog:')) {
|
|
325
|
-
const catalogName = version.substring(8);
|
|
326
|
-
const catalogPackages = getCatalogPackages(catalogName);
|
|
327
|
-
if (catalogPackages && catalogPackages[name]) {
|
|
328
|
-
// Use the specific package version from the catalog
|
|
329
|
-
result[name] = catalogPackages[name];
|
|
330
|
-
}
|
|
331
|
-
else {
|
|
332
|
-
// If the exact package isn't in the catalog, keep the original for backward compatibility
|
|
333
|
-
result[name] = version;
|
|
334
|
-
(0, logging_1.ze_log)(`Warning: Package ${name} not found in catalog ${catalogName}, using original reference`);
|
|
335
|
-
}
|
|
336
|
-
}
|
|
337
|
-
else if (version === 'workspace:*') {
|
|
338
|
-
// Handle workspace references by finding the package in the workspace
|
|
339
|
-
const resolvedVersion = resolveWorkspaceVersion(name);
|
|
340
|
-
if (resolvedVersion) {
|
|
341
|
-
result[name] = resolvedVersion;
|
|
342
|
-
}
|
|
343
|
-
else {
|
|
344
|
-
// If the package isn't found in the workspace, keep the original
|
|
345
|
-
result[name] = version;
|
|
346
|
-
(0, logging_1.ze_log)(`Warning: Package ${name} not found in workspace, using original reference`);
|
|
347
|
-
}
|
|
348
|
-
}
|
|
349
|
-
else if (version && typeof version === 'string') {
|
|
350
|
-
// Handle normal semver
|
|
351
|
-
result[name] = version;
|
|
352
|
-
}
|
|
353
|
-
else if (version) {
|
|
354
|
-
// Handle other non-standard formats by stringifying
|
|
355
|
-
result[name] = String(version);
|
|
356
|
-
}
|
|
357
|
-
else {
|
|
358
|
-
// Fallback for edge cases
|
|
359
|
-
result[name] = '*';
|
|
360
|
-
(0, logging_1.ze_log)(`Warning: No valid version found for ${name}, it's using wildcard '*'`);
|
|
361
|
-
}
|
|
362
|
-
}
|
|
363
|
-
return result;
|
|
364
|
-
}
|
|
365
|
-
//# sourceMappingURL=resolve-catalog-version.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-catalog-version.js","sourceRoot":"","sources":["../../../src/lib/build-context/resolve-catalog-version.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
/** Http request wrapper that returns a tuple with the response data or an error. */
|
|
2
|
-
export type HttpResponse<T> = [ok: true, error: null, data: T] | [ok: false, error: Error];
|
|
3
|
-
export type UrlString = string | URL | {
|
|
4
|
-
path: string;
|
|
5
|
-
base?: string;
|
|
6
|
-
query: Record<string, string | number | boolean>;
|
|
7
|
-
};
|
|
8
|
-
/** Starts a new http request */
|
|
9
|
-
export declare class ZeHttpRequest<T = void> implements PromiseLike<HttpResponse<T>> {
|
|
10
|
-
#private;
|
|
11
|
-
then: <TResult1 = HttpResponse<T>, TResult2 = never>(onfulfilled?: ((value: HttpResponse<T>) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>;
|
|
12
|
-
/** Creates a new http request. */
|
|
13
|
-
static from<T = void>(urlStr: UrlString, options?: RequestInit, data?: string | Buffer): ZeHttpRequest<T>;
|
|
14
|
-
/** Transforms `Promise<HttpResponse<T>>` into `Promise<T>` */
|
|
15
|
-
unwrap(): Promise<T>;
|
|
16
|
-
}
|
|
@@ -1,131 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var _ZeHttpRequest_instances, _ZeHttpRequest_start, _ZeHttpRequest_url, _ZeHttpRequest_options, _ZeHttpRequest_data, _ZeHttpRequest_promise, _ZeHttpRequest_reject, _ZeHttpRequest_resolve, _ZeHttpRequest_request, _ZeHttpRequest_redact;
|
|
3
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.ZeHttpRequest = void 0;
|
|
5
|
-
const tslib_1 = require("tslib");
|
|
6
|
-
const errors_1 = require("../errors");
|
|
7
|
-
const token_1 = require("../node-persist/token");
|
|
8
|
-
const debug_1 = require("../logging/debug");
|
|
9
|
-
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
10
|
-
const fetch_with_retries_1 = require("./fetch-with-retries");
|
|
11
|
-
/** Starts a new http request */
|
|
12
|
-
class ZeHttpRequest {
|
|
13
|
-
constructor() {
|
|
14
|
-
_ZeHttpRequest_instances.add(this);
|
|
15
|
-
/** The time the request was started. */
|
|
16
|
-
_ZeHttpRequest_start.set(this, Date.now());
|
|
17
|
-
/** The URL to request. */
|
|
18
|
-
_ZeHttpRequest_url.set(this, void 0);
|
|
19
|
-
/** The options for the request. */
|
|
20
|
-
_ZeHttpRequest_options.set(this, void 0);
|
|
21
|
-
/** The data to send with the request. */
|
|
22
|
-
_ZeHttpRequest_data.set(this, void 0);
|
|
23
|
-
// private methods for resolving and rejecting the promise
|
|
24
|
-
_ZeHttpRequest_promise.set(this, (0, zephyr_edge_contract_1.PromiseWithResolvers)());
|
|
25
|
-
// promise extension
|
|
26
|
-
this.then = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").promise.then.bind(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").promise);
|
|
27
|
-
}
|
|
28
|
-
/** Creates a new http request. */
|
|
29
|
-
static from(urlStr, options = {}, data) {
|
|
30
|
-
const req = new ZeHttpRequest();
|
|
31
|
-
tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_data, data, "f");
|
|
32
|
-
tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_options, options, "f");
|
|
33
|
-
// Parse the url into a URL object
|
|
34
|
-
if (typeof urlStr === 'string') {
|
|
35
|
-
tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_url, new URL(urlStr), "f");
|
|
36
|
-
}
|
|
37
|
-
else if (urlStr instanceof URL) {
|
|
38
|
-
tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_url, urlStr, "f");
|
|
39
|
-
}
|
|
40
|
-
else {
|
|
41
|
-
tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_url, new URL(urlStr.path, urlStr.base), "f");
|
|
42
|
-
for (const [key, value] of Object.entries(urlStr.query)) {
|
|
43
|
-
tslib_1.__classPrivateFieldGet(req, _ZeHttpRequest_url, "f").searchParams.append(key, String(value));
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
const is_preview = (0, zephyr_edge_contract_1.ZE_IS_PREVIEW)();
|
|
47
|
-
const ze_api_endpoint_host = (0, zephyr_edge_contract_1.ZE_API_ENDPOINT_HOST)();
|
|
48
|
-
const zephyr_api_endpoint = (0, zephyr_edge_contract_1.ZEPHYR_API_ENDPOINT)();
|
|
49
|
-
// Add a query param hint in preview environments
|
|
50
|
-
if (is_preview && tslib_1.__classPrivateFieldGet(req, _ZeHttpRequest_url, "f").host === ze_api_endpoint_host) {
|
|
51
|
-
tslib_1.__classPrivateFieldGet(req, _ZeHttpRequest_url, "f").searchParams.set('api_host', zephyr_api_endpoint);
|
|
52
|
-
}
|
|
53
|
-
void tslib_1.__classPrivateFieldGet(req, _ZeHttpRequest_instances, "m", _ZeHttpRequest_request).call(req);
|
|
54
|
-
return req;
|
|
55
|
-
}
|
|
56
|
-
/** Transforms `Promise<HttpResponse<T>>` into `Promise<T>` */
|
|
57
|
-
async unwrap() {
|
|
58
|
-
const [ok, error, data] = await this;
|
|
59
|
-
if (!ok) {
|
|
60
|
-
throw error;
|
|
61
|
-
}
|
|
62
|
-
return data;
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
exports.ZeHttpRequest = ZeHttpRequest;
|
|
66
|
-
_ZeHttpRequest_start = new WeakMap(), _ZeHttpRequest_url = new WeakMap(), _ZeHttpRequest_options = new WeakMap(), _ZeHttpRequest_data = new WeakMap(), _ZeHttpRequest_promise = new WeakMap(), _ZeHttpRequest_instances = new WeakSet(), _ZeHttpRequest_reject = function _ZeHttpRequest_reject(error) {
|
|
67
|
-
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").resolve([false, error]);
|
|
68
|
-
}, _ZeHttpRequest_resolve = function _ZeHttpRequest_resolve(data) {
|
|
69
|
-
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").resolve([true, null, data]);
|
|
70
|
-
}, _ZeHttpRequest_request = async function _ZeHttpRequest_request() {
|
|
71
|
-
var _a, _b, _c, _d, _e;
|
|
72
|
-
try {
|
|
73
|
-
const response = await (0, fetch_with_retries_1.fetchWithRetries)(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f"), Object.assign(Object.assign({}, tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f")), { body: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_data, "f") }));
|
|
74
|
-
const resText = await response.text();
|
|
75
|
-
if (response.status === 401) {
|
|
76
|
-
// Clean the tokens and throw an error
|
|
77
|
-
await (0, token_1.cleanTokens)();
|
|
78
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_ERROR, {
|
|
79
|
-
message: 'Unauthenticated request',
|
|
80
|
-
});
|
|
81
|
-
}
|
|
82
|
-
if (response.status === 403) {
|
|
83
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_FORBIDDEN_ERROR, {
|
|
84
|
-
message: 'Unauthorized request',
|
|
85
|
-
});
|
|
86
|
-
}
|
|
87
|
-
const message = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_redact).call(this, resText);
|
|
88
|
-
if (message === 'Not Implemented') {
|
|
89
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
|
|
90
|
-
message: 'Not implemented yet. Please get in contact with our support.',
|
|
91
|
-
});
|
|
92
|
-
}
|
|
93
|
-
if (response.status === undefined) {
|
|
94
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
95
|
-
content: 'No status code found',
|
|
96
|
-
method: (_b = (_a = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : 'GET',
|
|
97
|
-
url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
|
|
98
|
-
status: -1,
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
if (!tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").pathname.includes('application/logs')) {
|
|
102
|
-
(0, debug_1.ze_log)(message);
|
|
103
|
-
}
|
|
104
|
-
// Only parses data if reply content is json
|
|
105
|
-
const resData = (_c = (0, zephyr_edge_contract_1.safe_json_parse)(resText)) !== null && _c !== void 0 ? _c : resText;
|
|
106
|
-
if (response.status >= 300) {
|
|
107
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
108
|
-
status: response.status,
|
|
109
|
-
url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
|
|
110
|
-
content: resData,
|
|
111
|
-
method: (_e = (_d = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _d === void 0 ? void 0 : _d.toUpperCase()) !== null && _e !== void 0 ? _e : 'GET',
|
|
112
|
-
});
|
|
113
|
-
}
|
|
114
|
-
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_resolve).call(this, resData);
|
|
115
|
-
}
|
|
116
|
-
catch (error) {
|
|
117
|
-
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_reject).call(this, error);
|
|
118
|
-
}
|
|
119
|
-
}, _ZeHttpRequest_redact = function _ZeHttpRequest_redact(response) {
|
|
120
|
-
var _a, _b;
|
|
121
|
-
const str = [
|
|
122
|
-
`[${tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method || 'GET'}][${tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f")}]: ${Date.now() - tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_start, "f")}ms`,
|
|
123
|
-
((_a = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_data, "f")) === null || _a === void 0 ? void 0 : _a.length) ? ` - ${(((_b = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_data, "f").length) !== null && _b !== void 0 ? _b : 0) / 1024).toFixed(2)}kb` : '',
|
|
124
|
-
response ? `Response: ${response}` : '',
|
|
125
|
-
tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f") ? `Options: ${JSON.stringify(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f"))}` : '',
|
|
126
|
-
].join('\n');
|
|
127
|
-
return str
|
|
128
|
-
.replace(/Bearer ([^"|']+)/gi, 'Bearer [REDACTED]')
|
|
129
|
-
.replace(/"?jwt"?:["|\W']{0,2}([^"|']+)(["|'])/gi, 'jwt: [REDACTED]');
|
|
130
|
-
};
|
|
131
|
-
//# sourceMappingURL=ze-http-request.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ze-http-request.js","sourceRoot":"","sources":["../../../src/lib/http/ze-http-request.ts"],"names":[],"mappings":"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"}
|