zephyr-agent 0.0.0-canary-20250513050029 → 0.0.0-canary-20250514220856
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/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 +8 -0
- package/dist/lib/build-context/ze-util-parse-ze-dependencies.d.ts +22 -0
- package/dist/lib/build-context/ze-util-parse-ze-dependencies.js +44 -0
- package/dist/lib/build-context/ze-util-parse-ze-dependencies.js.map +1 -0
- package/dist/lib/build-context/ze-util-read-package-json.d.ts +12 -0
- package/dist/lib/build-context/ze-util-read-package-json.js +68 -19
- package/dist/lib/build-context/ze-util-read-package-json.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/transformers/ze-build-dash-data.js +2 -1
- package/dist/lib/transformers/ze-build-dash-data.js.map +1 -1
- package/dist/package.json +3 -1
- package/dist/zephyr-engine/index.d.ts +2 -2
- package/dist/zephyr-engine/index.js +11 -6
- 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 +4 -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/index.d.ts
CHANGED
|
@@ -7,7 +7,6 @@ export { buildAssetsMap, type ZeBuildAssetsMap, } from './lib/transformers/ze-bu
|
|
|
7
7
|
export { zeBuildDashData } from './lib/transformers/ze-build-dash-data';
|
|
8
8
|
export { zeBuildAssets } from './lib/transformers/ze-build-assets';
|
|
9
9
|
export { DEFAULT_AUTH_COMPLETION_TIMEOUT_MS, TOKEN_EXPIRY } from './lib/auth/auth-flags';
|
|
10
|
-
export { resolveCatalogVersion, resolveCatalogDependencies, getCatalogPackages, } from './lib/build-context/resolve-catalog-version';
|
|
11
10
|
export { ZephyrEngine, is_zephyr_dependency_pair, type ZeDependencyPair, type ZephyrDependencies, type ZephyrEngineOptions, readPackageJson, } from './zephyr-engine';
|
|
12
11
|
export type { ZeResolvedDependency } from './zephyr-engine/resolve_remote_dependency';
|
|
13
12
|
export type { Platform } from './zephyr-engine';
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.readPackageJson = exports.is_zephyr_dependency_pair = exports.ZephyrEngine = exports.
|
|
3
|
+
exports.readPackageJson = exports.is_zephyr_dependency_pair = exports.ZephyrEngine = exports.TOKEN_EXPIRY = exports.DEFAULT_AUTH_COMPLETION_TIMEOUT_MS = exports.zeBuildAssets = exports.zeBuildDashData = exports.buildAssetsMap = exports.logFn = exports.ze_log = exports.ZeErrors = exports.ZephyrError = exports.savePartialAssetMap = exports.removePartialAssetMap = exports.getPartialAssetMap = exports.resolveIndexHtml = exports.onIndexHtmlResolved = void 0;
|
|
4
4
|
// hack for angular
|
|
5
5
|
var resolve_index_html_1 = require("./lib/hacks/resolve-index-html");
|
|
6
6
|
Object.defineProperty(exports, "onIndexHtmlResolved", { enumerable: true, get: function () { return resolve_index_html_1.onIndexHtmlResolved; } });
|
|
@@ -30,11 +30,6 @@ Object.defineProperty(exports, "zeBuildAssets", { enumerable: true, get: functio
|
|
|
30
30
|
var auth_flags_1 = require("./lib/auth/auth-flags");
|
|
31
31
|
Object.defineProperty(exports, "DEFAULT_AUTH_COMPLETION_TIMEOUT_MS", { enumerable: true, get: function () { return auth_flags_1.DEFAULT_AUTH_COMPLETION_TIMEOUT_MS; } });
|
|
32
32
|
Object.defineProperty(exports, "TOKEN_EXPIRY", { enumerable: true, get: function () { return auth_flags_1.TOKEN_EXPIRY; } });
|
|
33
|
-
// Catalog related exports
|
|
34
|
-
var resolve_catalog_version_1 = require("./lib/build-context/resolve-catalog-version");
|
|
35
|
-
Object.defineProperty(exports, "resolveCatalogVersion", { enumerable: true, get: function () { return resolve_catalog_version_1.resolveCatalogVersion; } });
|
|
36
|
-
Object.defineProperty(exports, "resolveCatalogDependencies", { enumerable: true, get: function () { return resolve_catalog_version_1.resolveCatalogDependencies; } });
|
|
37
|
-
Object.defineProperty(exports, "getCatalogPackages", { enumerable: true, get: function () { return resolve_catalog_version_1.getCatalogPackages; } });
|
|
38
33
|
// Zephyr Edge is the main class which should be used
|
|
39
34
|
var zephyr_engine_1 = require("./zephyr-engine");
|
|
40
35
|
Object.defineProperty(exports, "ZephyrEngine", { enumerable: true, get: function () { return zephyr_engine_1.ZephyrEngine; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mBAAmB;AACnB,qEAAuF;AAA9E,yHAAA,mBAAmB,OAAA;AAAE,sHAAA,gBAAgB,OAAA;AAC9C,sBAAsB;AACtB,4EAI+C;AAH7C,wHAAA,kBAAkB,OAAA;AAClB,2HAAA,qBAAqB,OAAA;AACrB,yHAAA,mBAAmB,OAAA;AAGrB,SAAS;AACT,uCAAqD;AAA5C,qGAAA,WAAW,OAAA;AAAE,kGAAA,QAAQ,OAAA;AAE9B,SAAS;AACT,yCAAuC;AAA9B,iGAAA,MAAM,OAAA;AACf,2DAAmD;AAA1C,qGAAA,KAAK,OAAA;AAEd,uBAAuB;AACvB,8EAGgD;AAF9C,qHAAA,cAAc,OAAA;AAGhB,4EAAwE;AAA/D,qHAAA,eAAe,OAAA;AACxB,sEAAmE;AAA1D,gHAAA,aAAa,OAAA;AAEtB,uBAAuB;AACvB,oDAAyF;AAAhF,gIAAA,kCAAkC,OAAA;AAAE,0GAAA,YAAY,OAAA;AAEzD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mBAAmB;AACnB,qEAAuF;AAA9E,yHAAA,mBAAmB,OAAA;AAAE,sHAAA,gBAAgB,OAAA;AAC9C,sBAAsB;AACtB,4EAI+C;AAH7C,wHAAA,kBAAkB,OAAA;AAClB,2HAAA,qBAAqB,OAAA;AACrB,yHAAA,mBAAmB,OAAA;AAGrB,SAAS;AACT,uCAAqD;AAA5C,qGAAA,WAAW,OAAA;AAAE,kGAAA,QAAQ,OAAA;AAE9B,SAAS;AACT,yCAAuC;AAA9B,iGAAA,MAAM,OAAA;AACf,2DAAmD;AAA1C,qGAAA,KAAK,OAAA;AAEd,uBAAuB;AACvB,8EAGgD;AAF9C,qHAAA,cAAc,OAAA;AAGhB,4EAAwE;AAA/D,qHAAA,eAAe,OAAA;AACxB,sEAAmE;AAA1D,gHAAA,aAAa,OAAA;AAEtB,uBAAuB;AACvB,oDAAyF;AAAhF,gIAAA,kCAAkC,OAAA;AAAE,0GAAA,YAAY,OAAA;AAEzD,qDAAqD;AACrD,iDAOyB;AANvB,6GAAA,YAAY,OAAA;AACZ,0HAAA,yBAAyB,OAAA;AAIzB,gHAAA,eAAe,OAAA"}
|
|
@@ -5,6 +5,9 @@ exports.setPackageJsonCache = setPackageJsonCache;
|
|
|
5
5
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
6
6
|
const fs_cache_1 = require("../node-persist/fs-cache");
|
|
7
7
|
const cache_prefix = 'package_json';
|
|
8
|
+
// todo: persisting package.json cache should be done in a way it stores path to package.json file
|
|
9
|
+
// and not the content of the package.json file
|
|
10
|
+
// or store last modified time of the file
|
|
8
11
|
async function getPackageJsonCache(startingPath) {
|
|
9
12
|
const cache_key = `${cache_prefix}:${startingPath}`;
|
|
10
13
|
const cached = await (0, fs_cache_1.getCache)(cache_key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-cache-for-package-json.js","sourceRoot":"","sources":["../../../src/lib/build-context/fs-cache-for-package-json.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"fs-cache-for-package-json.js","sourceRoot":"","sources":["../../../src/lib/build-context/fs-cache-for-package-json.ts"],"names":[],"mappings":";;AASA,kDAOC;AAED,kDAMC;AAxBD,+DAAuD;AAEvD,uDAA+D;AAE/D,MAAM,YAAY,GAAG,cAAc,CAAC;AAEpC,kGAAkG;AAClG,+CAA+C;AAC/C,0CAA0C;AACnC,KAAK,UAAU,mBAAmB,CACvC,YAAoB;IAEpB,MAAM,SAAS,GAAG,GAAG,YAAY,IAAI,YAAY,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,SAAS,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,OAAO,IAAA,sCAAe,EAAgB,MAAM,CAAC,CAAC;AAChD,CAAC;AAEM,KAAK,UAAU,mBAAmB,CACvC,YAAoB,EACpB,mBAAkC;IAElC,MAAM,SAAS,GAAG,GAAG,YAAY,IAAI,YAAY,EAAE,CAAC;IACpD,MAAM,IAAA,oBAAS,EAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;AAClE,CAAC"}
|
|
@@ -1,7 +1,15 @@
|
|
|
1
|
+
export interface ZeDependency {
|
|
2
|
+
version: string;
|
|
3
|
+
registry?: string;
|
|
4
|
+
app_uid?: string;
|
|
5
|
+
}
|
|
1
6
|
export interface ZePackageJson {
|
|
2
7
|
name: string;
|
|
3
8
|
version: string;
|
|
4
9
|
dependencies?: Record<string, string>;
|
|
10
|
+
/** Zephyr:dependencies in package.json */
|
|
11
|
+
['zephyr:dependencies']?: Record<string, string>;
|
|
12
|
+
zephyrDependencies?: Record<string, ZeDependency>;
|
|
5
13
|
/** OptionalDependencies in package.json */
|
|
6
14
|
optionalDependencies?: Record<string, string>;
|
|
7
15
|
/** PeerDependencies in package.json */
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Parses Zephyr dependency entries from package.json and transforms them into structured
|
|
3
|
+
* format. Dependencies can be specified in various formats:
|
|
4
|
+
*
|
|
5
|
+
* - Standard semver: "^1.0.0"
|
|
6
|
+
* - Zephyr remote with tag: "zephyr:remote_app_uid@latest"
|
|
7
|
+
* - Zephyr with semver: "zephyr:^1.0.0"
|
|
8
|
+
*
|
|
9
|
+
* @param ze_dependencies - Object with dependency name as key and version/reference as
|
|
10
|
+
* value
|
|
11
|
+
* @returns Parsed zephyr dependencies with structured information
|
|
12
|
+
*/
|
|
13
|
+
import type { ZeDependency } from './ze-package-json.type';
|
|
14
|
+
export declare function parseZeDependencies(ze_dependencies: Record<string, string>): Record<string, ZeDependency>;
|
|
15
|
+
/**
|
|
16
|
+
* Parses a single dependency value into a structured ZeDependency object.
|
|
17
|
+
*
|
|
18
|
+
* @param key - The dependency name
|
|
19
|
+
* @param value - The dependency version or reference string
|
|
20
|
+
* @returns Structured dependency information
|
|
21
|
+
*/
|
|
22
|
+
export declare function parseZeDependency(key: string, value: string): ZeDependency;
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseZeDependencies = parseZeDependencies;
|
|
4
|
+
exports.parseZeDependency = parseZeDependency;
|
|
5
|
+
function parseZeDependencies(ze_dependencies) {
|
|
6
|
+
return Object.fromEntries(Object.entries(ze_dependencies).map(([key, value]) => [
|
|
7
|
+
key,
|
|
8
|
+
parseZeDependency(key, value),
|
|
9
|
+
]));
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Parses a single dependency value into a structured ZeDependency object.
|
|
13
|
+
*
|
|
14
|
+
* @param key - The dependency name
|
|
15
|
+
* @param value - The dependency version or reference string
|
|
16
|
+
* @returns Structured dependency information
|
|
17
|
+
*/
|
|
18
|
+
function parseZeDependency(key, value) {
|
|
19
|
+
// Default dependency structure
|
|
20
|
+
const dependency = {
|
|
21
|
+
version: value,
|
|
22
|
+
registry: 'zephyr',
|
|
23
|
+
app_uid: key,
|
|
24
|
+
};
|
|
25
|
+
let reference = value;
|
|
26
|
+
// if reference variable has ':' then cut it off and store dependency.registry
|
|
27
|
+
if (reference.includes(':')) {
|
|
28
|
+
const refference_parts = reference.split(':');
|
|
29
|
+
dependency.registry = refference_parts[0];
|
|
30
|
+
reference = refference_parts[1];
|
|
31
|
+
}
|
|
32
|
+
// Check if it contains a remote app_uid with a tag (e.g., "remote_app_uid@latest")
|
|
33
|
+
if (reference.includes('@')) {
|
|
34
|
+
const [remoteAppUid, tag] = reference.split('@');
|
|
35
|
+
dependency.app_uid = remoteAppUid;
|
|
36
|
+
dependency.version = tag;
|
|
37
|
+
}
|
|
38
|
+
// If it's a semver specification (contains ^, ~, >, <, or =)
|
|
39
|
+
else {
|
|
40
|
+
dependency.version = reference;
|
|
41
|
+
}
|
|
42
|
+
return dependency;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=ze-util-parse-ze-dependencies.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ze-util-parse-ze-dependencies.js","sourceRoot":"","sources":["../../../src/lib/build-context/ze-util-parse-ze-dependencies.ts"],"names":[],"mappings":";;AAcA,kDASC;AASD,8CA4BC;AA9CD,SAAgB,mBAAmB,CACjC,eAAuC;IAEvC,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACpD,GAAG;QACH,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC;KAC9B,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,GAAW,EAAE,KAAa;IAC1D,+BAA+B;IAC/B,MAAM,UAAU,GAAiB;QAC/B,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,GAAG;KACb,CAAC;IAEF,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,8EAA8E;IAC9E,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9C,UAAU,CAAC,QAAQ,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAC1C,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,mFAAmF;IACnF,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjD,UAAU,CAAC,OAAO,GAAG,YAAY,CAAC;QAClC,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC;IAC3B,CAAC;IACD,6DAA6D;SACxD,CAAC;QACJ,UAAU,CAAC,OAAO,GAAG,SAAS,CAAC;IACjC,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -1,2 +1,14 @@
|
|
|
1
1
|
import type { ZePackageJson } from './ze-package-json.type';
|
|
2
|
+
/**
|
|
3
|
+
* Retrieves and parses the package.json file from the given context path or current
|
|
4
|
+
* working directory. The function will search for the nearest package.json file in the
|
|
5
|
+
* directory tree, validate its contents, and cache the result to improve performance.
|
|
6
|
+
*
|
|
7
|
+
* @param context - The starting path to search for package.json. If undefined, uses
|
|
8
|
+
* current working directory.
|
|
9
|
+
* @returns {Promise<ZePackageJson>} A Promise that resolves to the parsed package.json
|
|
10
|
+
* content.
|
|
11
|
+
* @throws {ZephyrError} If the package.json cannot be found, parsed, or has missing
|
|
12
|
+
* required fields.
|
|
13
|
+
*/
|
|
2
14
|
export declare function getPackageJson(context: string | undefined): Promise<ZePackageJson>;
|
|
@@ -8,29 +8,78 @@ const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
|
8
8
|
const errors_1 = require("../errors");
|
|
9
9
|
const logging_1 = require("../logging");
|
|
10
10
|
const find_nearest_package_json_1 = require("./find-nearest-package-json");
|
|
11
|
-
const
|
|
11
|
+
const ze_util_parse_ze_dependencies_1 = require("./ze-util-parse-ze-dependencies");
|
|
12
|
+
/**
|
|
13
|
+
* Retrieves and parses the package.json file from the given context path or current
|
|
14
|
+
* working directory. The function will search for the nearest package.json file in the
|
|
15
|
+
* directory tree, validate its contents, and cache the result to improve performance.
|
|
16
|
+
*
|
|
17
|
+
* @param context - The starting path to search for package.json. If undefined, uses
|
|
18
|
+
* current working directory.
|
|
19
|
+
* @returns {Promise<ZePackageJson>} A Promise that resolves to the parsed package.json
|
|
20
|
+
* content.
|
|
21
|
+
* @throws {ZephyrError} If the package.json cannot be found, parsed, or has missing
|
|
22
|
+
* required fields.
|
|
23
|
+
*/
|
|
12
24
|
async function getPackageJson(context) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
25
|
+
// Determine the starting path
|
|
26
|
+
let startingPath;
|
|
27
|
+
try {
|
|
28
|
+
startingPath = context || process.cwd();
|
|
29
|
+
// If the path is a file, move up one directory level
|
|
30
|
+
if (startingPath && node_fs_1.default.statSync(startingPath).isFile()) {
|
|
31
|
+
startingPath = (0, node_path_1.resolve)(startingPath, '..');
|
|
32
|
+
}
|
|
33
|
+
(0, logging_1.ze_log)('getPackageJson searching from path', startingPath);
|
|
16
34
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
return cached;
|
|
20
|
-
const nearest_package_json = await (0, find_nearest_package_json_1.find_nearest_package_json)(startingPath);
|
|
21
|
-
if (!nearest_package_json) {
|
|
22
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_NOT_FOUND);
|
|
35
|
+
catch (error) {
|
|
36
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_NOT_FOUND, `Invalid starting path: ${context}. Error: ${error}`);
|
|
23
37
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
38
|
+
// Find nearest package.json
|
|
39
|
+
let nearest_package_json;
|
|
40
|
+
try {
|
|
41
|
+
nearest_package_json = await (0, find_nearest_package_json_1.find_nearest_package_json)(startingPath);
|
|
42
|
+
if (!nearest_package_json) {
|
|
43
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_NOT_FOUND, `No package.json found starting from: ${startingPath}`);
|
|
44
|
+
}
|
|
45
|
+
(0, logging_1.ze_log)('Found package.json at', nearest_package_json.path);
|
|
28
46
|
}
|
|
29
|
-
|
|
30
|
-
|
|
47
|
+
catch (error) {
|
|
48
|
+
if (error instanceof errors_1.ZephyrError) {
|
|
49
|
+
throw error; // Re-throw existing ZephyrError
|
|
50
|
+
}
|
|
51
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_NOT_FOUND, `Error finding package.json from path: ${startingPath}. Error: ${error}`);
|
|
52
|
+
}
|
|
53
|
+
// Parse and validate package.json
|
|
54
|
+
try {
|
|
55
|
+
const { json, path: packageJsonPath } = nearest_package_json;
|
|
56
|
+
const parsed_package_json = (0, zephyr_edge_contract_1.safe_json_parse)(json);
|
|
57
|
+
if (!parsed_package_json) {
|
|
58
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_NOT_VALID, `Invalid JSON in package.json at: ${packageJsonPath}`);
|
|
59
|
+
}
|
|
60
|
+
// Validate required fields
|
|
61
|
+
if (!parsed_package_json.name) {
|
|
62
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_MUST_HAVE_NAME_VERSION, `Missing 'name' field in package.json at: ${packageJsonPath}`);
|
|
63
|
+
}
|
|
64
|
+
if (!parsed_package_json.version) {
|
|
65
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_MUST_HAVE_NAME_VERSION, `Missing 'version' field in package.json at: ${packageJsonPath}`);
|
|
66
|
+
}
|
|
67
|
+
const zephyr_dependencies = parsed_package_json['zephyr:dependencies'];
|
|
68
|
+
if (zephyr_dependencies) {
|
|
69
|
+
parsed_package_json.zephyrDependencies = (0, ze_util_parse_ze_dependencies_1.parseZeDependencies)(zephyr_dependencies);
|
|
70
|
+
}
|
|
71
|
+
(0, logging_1.ze_log)('Successfully parsed package.json', {
|
|
72
|
+
name: parsed_package_json.name,
|
|
73
|
+
version: parsed_package_json.version,
|
|
74
|
+
path: packageJsonPath,
|
|
75
|
+
});
|
|
76
|
+
return parsed_package_json;
|
|
77
|
+
}
|
|
78
|
+
catch (error) {
|
|
79
|
+
if (error instanceof errors_1.ZephyrError) {
|
|
80
|
+
throw error; // Re-throw existing ZephyrError
|
|
81
|
+
}
|
|
82
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_NOT_VALID, `Error processing package.json: ${error}`);
|
|
31
83
|
}
|
|
32
|
-
(0, logging_1.ze_log)('package json found', parsed_package_json);
|
|
33
|
-
await (0, fs_cache_for_package_json_1.setPackageJsonCache)(startingPath, parsed_package_json);
|
|
34
|
-
return parsed_package_json;
|
|
35
84
|
}
|
|
36
85
|
//# sourceMappingURL=ze-util-read-package-json.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-util-read-package-json.js","sourceRoot":"","sources":["../../../src/lib/build-context/ze-util-read-package-json.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ze-util-read-package-json.js","sourceRoot":"","sources":["../../../src/lib/build-context/ze-util-read-package-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,41 +1,100 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.fetchWithRetries = fetchWithRetries;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const errors_1 = require("../errors");
|
|
6
|
+
const axios_1 = require("axios");
|
|
7
|
+
const axios_2 = tslib_1.__importDefault(require("axios"));
|
|
8
|
+
const axios_retry_1 = tslib_1.__importDefault(require("axios-retry"));
|
|
5
9
|
async function fetchWithRetries(url, options = {}, retries = 3) {
|
|
6
|
-
var _a, _b, _c, _d, _e
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
10
|
+
var _a, _b, _c, _d, _e;
|
|
11
|
+
try {
|
|
12
|
+
// Create a custom axios instance for this request
|
|
13
|
+
const axiosInstance = axios_2.default.create();
|
|
14
|
+
// Configure axios-retry
|
|
15
|
+
(0, axios_retry_1.default)(axiosInstance, {
|
|
16
|
+
retries,
|
|
17
|
+
retryDelay: axios_retry_1.default.exponentialDelay,
|
|
18
|
+
retryCondition: (error) => {
|
|
19
|
+
// Retry on network errors
|
|
20
|
+
if (!error.response) {
|
|
21
|
+
const networkError = error.code || error.message || '';
|
|
22
|
+
return networkError === 'EPIPE' || networkError.includes('network');
|
|
23
|
+
}
|
|
24
|
+
// Retry on server errors (5xx)
|
|
25
|
+
return error.response.status >= 500;
|
|
26
|
+
},
|
|
27
|
+
});
|
|
28
|
+
// Convert fetch options to axios options
|
|
29
|
+
const axiosConfig = Object.assign({ method: (_a = options.method) !== null && _a !== void 0 ? _a : 'GET', data: options.body }, (options.signal ? { signal: options.signal } : {}));
|
|
30
|
+
if (options.headers) {
|
|
31
|
+
// Convert HeadersInit to a format compatible with axios headers
|
|
32
|
+
if (options.headers instanceof Headers) {
|
|
33
|
+
// Convert Headers object to record
|
|
34
|
+
const headersRecord = {};
|
|
35
|
+
options.headers.forEach((value, key) => {
|
|
36
|
+
headersRecord[key] = value;
|
|
37
|
+
});
|
|
38
|
+
axiosConfig.headers = headersRecord;
|
|
39
|
+
}
|
|
40
|
+
else if (Array.isArray(options.headers)) {
|
|
41
|
+
// Convert header entries array to record
|
|
42
|
+
const headersRecord = {};
|
|
43
|
+
options.headers.forEach(([key, value]) => {
|
|
44
|
+
headersRecord[key] = value;
|
|
45
|
+
});
|
|
46
|
+
axiosConfig.headers = headersRecord;
|
|
17
47
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
48
|
+
else {
|
|
49
|
+
// Already a record object
|
|
50
|
+
axiosConfig.headers = options.headers;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
// Make the request with retries
|
|
54
|
+
const response = await axiosInstance(url.toString(), axiosConfig);
|
|
55
|
+
// Convert axios response to fetch Response interface
|
|
56
|
+
return {
|
|
57
|
+
ok: response.status >= 200 && response.status < 300,
|
|
58
|
+
status: response.status,
|
|
59
|
+
headers: new Headers(Object.entries(response.headers).reduce((acc, [key, value]) => {
|
|
60
|
+
if (value !== undefined) {
|
|
61
|
+
acc[key] = typeof value === 'string' ? value : String(value);
|
|
62
|
+
}
|
|
63
|
+
return acc;
|
|
64
|
+
}, {})),
|
|
65
|
+
text: async () => typeof response.data === 'string'
|
|
66
|
+
? response.data
|
|
67
|
+
: JSON.stringify(response.data) || '',
|
|
68
|
+
json: async () => response.data,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
// Handle errors after all retries have been exhausted
|
|
73
|
+
if (error instanceof axios_1.AxiosError && error.response) {
|
|
74
|
+
// Client errors (4xx)
|
|
75
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
76
|
+
status: error.response.status,
|
|
77
|
+
url: url.toString(),
|
|
78
|
+
content: error.response.data,
|
|
79
|
+
method: (_c = (_b = options.method) === null || _b === void 0 ? void 0 : _b.toUpperCase()) !== null && _c !== void 0 ? _c : 'GET',
|
|
21
80
|
});
|
|
22
81
|
}
|
|
23
|
-
//
|
|
24
|
-
if (
|
|
25
|
-
|
|
82
|
+
// Unknown errors
|
|
83
|
+
if (error instanceof axios_1.AxiosError &&
|
|
84
|
+
(error.code === 'EPIPE' || (error.message && error.message.includes('network')))) {
|
|
85
|
+
// Max retries reached for network error
|
|
86
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
87
|
+
status: -1,
|
|
88
|
+
url: url.toString(),
|
|
89
|
+
content: 'Max retries reached for network error',
|
|
90
|
+
method: (_e = (_d = options.method) === null || _d === void 0 ? void 0 : _d.toUpperCase()) !== null && _e !== void 0 ? _e : 'GET',
|
|
91
|
+
});
|
|
26
92
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
method: (_e = (_d = options.method) === null || _d === void 0 ? void 0 : _d.toUpperCase()) !== null && _e !== void 0 ? _e : 'GET',
|
|
93
|
+
// Other unknown errors
|
|
94
|
+
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
|
|
95
|
+
message: 'Unknown error occurred',
|
|
96
|
+
cause: error,
|
|
32
97
|
});
|
|
33
98
|
}
|
|
34
|
-
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
|
|
35
|
-
status: -1,
|
|
36
|
-
url: url.toString(),
|
|
37
|
-
content: 'Max retries reached',
|
|
38
|
-
method: (_g = (_f = options.method) === null || _f === void 0 ? void 0 : _f.toUpperCase()) !== null && _g !== void 0 ? _g : 'GET',
|
|
39
|
-
});
|
|
40
99
|
}
|
|
41
100
|
//# sourceMappingURL=fetch-with-retries.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-with-retries.js","sourceRoot":"","sources":["../../../src/lib/http/fetch-with-retries.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"fetch-with-retries.js","sourceRoot":"","sources":["../../../src/lib/http/fetch-with-retries.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.zeBuildDashData = zeBuildDashData;
|
|
4
4
|
const errors_1 = require("../errors");
|
|
5
5
|
async function zeBuildDashData(zephyr_engine) {
|
|
6
|
+
var _a, _b;
|
|
6
7
|
const snapshotId = await zephyr_engine.snapshotId;
|
|
7
8
|
const buildId = await zephyr_engine.build_id;
|
|
8
9
|
if (!snapshotId) {
|
|
@@ -36,7 +37,7 @@ async function zeBuildDashData(zephyr_engine) {
|
|
|
36
37
|
overrides: [],
|
|
37
38
|
consumes: [],
|
|
38
39
|
modules: [],
|
|
39
|
-
remotes: [],
|
|
40
|
+
remotes: (_b = (_a = zephyr_engine.federated_dependencies) === null || _a === void 0 ? void 0 : _a.map((r) => r.name)) !== null && _b !== void 0 ? _b : [],
|
|
40
41
|
tags: [],
|
|
41
42
|
project: '',
|
|
42
43
|
metadata: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-build-dash-data.js","sourceRoot":"","sources":["../../../src/lib/transformers/ze-build-dash-data.ts"],"names":[],"mappings":";;AAIA,0CAuDC;AAzDD,sCAAkD;AAE3C,KAAK,UAAU,eAAe,CACnC,aAA2B
|
|
1
|
+
{"version":3,"file":"ze-build-dash-data.js","sourceRoot":"","sources":["../../../src/lib/transformers/ze-build-dash-data.ts"],"names":[],"mappings":";;AAIA,0CAuDC;AAzDD,sCAAkD;AAE3C,KAAK,UAAU,eAAe,CACnC,aAA2B;;IAE3B,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC;IAClD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC;IAC7C,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,yBAAyB,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,gBAAgB,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,eAAe,GAAG,aAAa,CAAC,eAAe,CAAC;IACtD,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC;IAEpC,MAAM,GAAG,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC;IAC5C,MAAM,GAAG,GAAG,aAAa,CAAC,qBAAqB,CAAC;IAChD,MAAM,IAAI,GAAG,aAAa,CAAC,qBAAqB,CAAC,IAAI,CAAC;IAEtD,MAAM,EACJ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EACR,SAAS,EAAE,SAAS,GACrB,GAAG,MAAM,aAAa,CAAC,yBAAyB,CAAC;IAElD,MAAM,MAAM,GAAG,sBAAsB,CAAC;IAEtC,OAAO;QACL,EAAE,EAAE,eAAe;QACnB,IAAI;QACJ,WAAW,EAAE,EAAE;QACf,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE;QAClC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE;YAC1B,OAAO;SACR,CAAC;QACF,OAAO,EAAE,UAAU;QACnB,GAAG;QACH,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,YAAY,EAAE,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,YAAY,CAAC;QAC9D,eAAe,EAAE,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,eAAe,CAAC;QACpE,oBAAoB,EAAE,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,oBAAoB,CAAC;QAC9E,gBAAgB,EAAE,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,gBAAgB,CAAC;QAEtE,SAAS,EAAE,EAAE;QACb,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,MAAA,MAAA,aAAa,CAAC,sBAAsB,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,mCAAI,EAAE;QACvE,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,EAAE;QACX,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,gBAAgB;QACxB,IAAI,EAAE,KAAK;KACZ,CAAC;AACJ,CAAC;AAOD,SAAS,sBAAsB,CAC7B,MAA0C;IAE1C,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;AAC9E,CAAC"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.46",
|
|
4
4
|
"description": "Zephyr plugin agent",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,6 +33,8 @@
|
|
|
33
33
|
"test": "nx test zephyr-agent"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
+
"axios": "^1.9.0",
|
|
37
|
+
"axios-retry": "^4.5.0",
|
|
36
38
|
"cloudflare": "^3.4.0",
|
|
37
39
|
"debug": "^4.3.4",
|
|
38
40
|
"git-url-parse": "^15.0.0",
|
|
@@ -24,7 +24,7 @@ export interface BuildProperties {
|
|
|
24
24
|
}
|
|
25
25
|
export declare function is_zephyr_dependency_pair(dep: ZeDependencyPair | undefined | null): dep is ZeDependencyPair;
|
|
26
26
|
export declare function is_zephyr_resolved_dependency(dep: ZeResolvedDependency | null): dep is ZeResolvedDependency;
|
|
27
|
-
type ZephyrEngineBuilderTypes = 'webpack' | 'rspack' | 'repack' | 'vite' | 'rollup' | '
|
|
27
|
+
type ZephyrEngineBuilderTypes = 'webpack' | 'rspack' | 'repack' | 'vite' | 'rollup' | 'parcel' | 'unknown';
|
|
28
28
|
export interface ZephyrEngineOptions {
|
|
29
29
|
context: string | undefined;
|
|
30
30
|
builder: ZephyrEngineBuilderTypes;
|
|
@@ -71,7 +71,7 @@ export declare class ZephyrEngine {
|
|
|
71
71
|
* @param platform, Atm this is React Native specific to resolve correct platform `ios`
|
|
72
72
|
* or `android`
|
|
73
73
|
*/
|
|
74
|
-
resolve_remote_dependencies(deps: ZeDependencyPair[]
|
|
74
|
+
resolve_remote_dependencies(deps: ZeDependencyPair[]): Promise<ZeResolvedDependency[] | null>;
|
|
75
75
|
start_new_build(): Promise<void>;
|
|
76
76
|
build_finished(): Promise<void>;
|
|
77
77
|
upload_assets(props: {
|
|
@@ -110,24 +110,29 @@ class ZephyrEngine {
|
|
|
110
110
|
* @param platform, Atm this is React Native specific to resolve correct platform `ios`
|
|
111
111
|
* or `android`
|
|
112
112
|
*/
|
|
113
|
-
async resolve_remote_dependencies(deps
|
|
113
|
+
async resolve_remote_dependencies(deps) {
|
|
114
|
+
const ze_dependencies = this.npmProperties.zephyrDependencies;
|
|
115
|
+
const platform = this.env.target;
|
|
114
116
|
if (!deps) {
|
|
115
117
|
return null;
|
|
116
118
|
}
|
|
117
|
-
(0, logging_1.ze_log)('resolve_remote_dependencies.deps', deps, 'platform', platform);
|
|
119
|
+
(0, logging_1.ze_log)('resolve_remote_dependencies.deps', deps, 'platform', platform, 'ze_dependencies', ze_dependencies);
|
|
118
120
|
const tasks = deps.map(async (dep) => {
|
|
121
|
+
var _a, _b, _c, _d, _e;
|
|
119
122
|
const [app_name, project_name, org_name] = dep.name.split('.', 3);
|
|
123
|
+
const ze_dependency = ze_dependencies === null || ze_dependencies === void 0 ? void 0 : ze_dependencies[dep.name];
|
|
124
|
+
const [ze_app_name, ze_project_name, ze_org_name] = (_b = (_a = ze_dependency === null || ze_dependency === void 0 ? void 0 : ze_dependency.app_uid) === null || _a === void 0 ? void 0 : _a.split('.')) !== null && _b !== void 0 ? _b : [];
|
|
120
125
|
// Key might be only the app name
|
|
121
126
|
const dep_application_uid = (0, zephyr_edge_contract_1.createApplicationUid)({
|
|
122
|
-
org:
|
|
123
|
-
project:
|
|
124
|
-
name: app_name,
|
|
127
|
+
org: (_c = ze_org_name !== null && ze_org_name !== void 0 ? ze_org_name : org_name) !== null && _c !== void 0 ? _c : this.gitProperties.app.org,
|
|
128
|
+
project: (_d = ze_project_name !== null && ze_project_name !== void 0 ? ze_project_name : project_name) !== null && _d !== void 0 ? _d : this.gitProperties.app.project,
|
|
129
|
+
name: ze_app_name !== null && ze_app_name !== void 0 ? ze_app_name : app_name,
|
|
125
130
|
});
|
|
126
131
|
// if default url is url - set as default, if not use app remote_host as default
|
|
127
132
|
// if default url is not url - send it as a semver to deps resolution
|
|
128
133
|
const tuple = await zephyr_edge_contract_1.ZeUtils.PromiseTuple((0, resolve_remote_dependency_1.resolve_remote_dependency)({
|
|
129
134
|
application_uid: dep_application_uid,
|
|
130
|
-
version: dep.version,
|
|
135
|
+
version: (_e = ze_dependency === null || ze_dependency === void 0 ? void 0 : ze_dependency.version) !== null && _e !== void 0 ? _e : dep.version,
|
|
131
136
|
platform,
|
|
132
137
|
}));
|
|
133
138
|
// If you couldn't resolve remote dependency, skip replacing it
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/zephyr-engine/index.ts"],"names":[],"mappings":";;;AAwDA,8DAIC;AAED,sEAIC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/zephyr-engine/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resolve_remote_dependency = resolve_remote_dependency;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const zephyr_edge_contract_1 = require("zephyr-edge-contract");
|
|
5
6
|
const token_1 = require("../lib/node-persist/token");
|
|
6
7
|
const errors_1 = require("../lib/errors");
|
|
7
8
|
const logging_1 = require("../lib/logging");
|
|
9
|
+
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
8
10
|
async function resolve_remote_dependency({ application_uid, version, platform, }) {
|
|
9
11
|
const resolveDependency = new URL(`${zephyr_edge_contract_1.ze_api_gateway.resolve}/${encodeURIComponent(application_uid)}/${encodeURIComponent(version)}`, (0, zephyr_edge_contract_1.ZE_API_ENDPOINT)());
|
|
10
12
|
if (platform) {
|
|
@@ -13,8 +15,7 @@ async function resolve_remote_dependency({ application_uid, version, platform, }
|
|
|
13
15
|
try {
|
|
14
16
|
(0, logging_1.ze_log)('URL for resolving dependency:', resolveDependency.toString());
|
|
15
17
|
const token = await (0, token_1.getToken)();
|
|
16
|
-
const res = await
|
|
17
|
-
method: 'GET',
|
|
18
|
+
const res = await axios_1.default.get(resolveDependency.toString(), {
|
|
18
19
|
headers: {
|
|
19
20
|
'Content-Type': 'application/json',
|
|
20
21
|
Authorization: `Bearer ${token}`,
|
|
@@ -22,7 +23,8 @@ async function resolve_remote_dependency({ application_uid, version, platform, }
|
|
|
22
23
|
},
|
|
23
24
|
});
|
|
24
25
|
const [appName, projectName, orgName] = application_uid.split('.');
|
|
25
|
-
|
|
26
|
+
// Check response status
|
|
27
|
+
if (res.status < 200 || res.status >= 300) {
|
|
26
28
|
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_RESOLVE_REMOTES, {
|
|
27
29
|
appUid: application_uid,
|
|
28
30
|
appName,
|
|
@@ -31,11 +33,11 @@ async function resolve_remote_dependency({ application_uid, version, platform, }
|
|
|
31
33
|
data: {
|
|
32
34
|
url: resolveDependency.toString(),
|
|
33
35
|
version,
|
|
34
|
-
error:
|
|
36
|
+
error: res.data,
|
|
35
37
|
},
|
|
36
38
|
});
|
|
37
39
|
}
|
|
38
|
-
const response =
|
|
40
|
+
const response = res.data;
|
|
39
41
|
if (response.value) {
|
|
40
42
|
(0, logging_1.ze_log)('resolved dependency:', response.value, 'application_uid: ', application_uid, 'version: ', version);
|
|
41
43
|
return Object.assign({}, response.value, { version, platform });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve_remote_dependency.js","sourceRoot":"","sources":["../../src/zephyr-engine/resolve_remote_dependency.ts"],"names":[],"mappings":";;AAgBA,8DA4EC
|
|
1
|
+
{"version":3,"file":"resolve_remote_dependency.js","sourceRoot":"","sources":["../../src/zephyr-engine/resolve_remote_dependency.ts"],"names":[],"mappings":";;AAgBA,8DA4EC;;AA5FD,+DAAuE;AACvE,qDAAqD;AACrD,0CAAsD;AACtD,4CAAwC;AACxC,0DAA0B;AAYnB,KAAK,UAAU,yBAAyB,CAAC,EAC9C,eAAe,EACf,OAAO,EACP,QAAQ,GAKT;IACC,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,GAAG,qCAAc,CAAC,OAAO,IAAI,kBAAkB,CAAC,eAAe,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE,EACjG,IAAA,sCAAe,GAAE,CAClB,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACb,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,CAAC;QACH,IAAA,gBAAM,EAAC,+BAA+B,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,MAAM,IAAA,gBAAQ,GAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE;YACxD,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,KAAK,EAAE;gBAChC,MAAM,EAAE,kBAAkB;aAC3B;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEnE,wBAAwB;QACxB,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YAC1C,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,mBAAmB,EAAE;gBAClD,MAAM,EAAE,eAAe;gBACvB,OAAO;gBACP,WAAW;gBACX,OAAO;gBACP,IAAI,EAAE;oBACJ,GAAG,EAAE,iBAAiB,CAAC,QAAQ,EAAE;oBACjC,OAAO;oBACP,KAAK,EAAE,GAAG,CAAC,IAAI;iBAChB;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC;QAE1B,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACnB,IAAA,gBAAM,EACJ,sBAAsB,EACtB,QAAQ,CAAC,KAAK,EACd,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,OAAO,CACR,CAAC;YACF,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,mBAAmB,EAAE;YAClD,MAAM,EAAE,eAAe;YACvB,OAAO;YACP,WAAW;YACX,OAAO;YACP,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE;SAC5B,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,oBAAW;YAAE,MAAM,KAAK,CAAC;QAE9C,MAAM,IAAI,oBAAW,CAAC,iBAAQ,CAAC,wCAAwC,EAAE;YACvE,IAAI,EAAE,EAAE,OAAO,EAAE;YACjB,KAAK;SACN,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.0.0-canary-
|
|
3
|
+
"version": "0.0.0-canary-20250514220856",
|
|
4
4
|
"description": "Zephyr plugin agent",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -28,6 +28,8 @@
|
|
|
28
28
|
"main": "dist/index.js",
|
|
29
29
|
"types": "dist/index.d.ts",
|
|
30
30
|
"dependencies": {
|
|
31
|
+
"axios": "^1.9.0",
|
|
32
|
+
"axios-retry": "^4.5.0",
|
|
31
33
|
"cloudflare": "^3.4.0",
|
|
32
34
|
"debug": "^4.3.4",
|
|
33
35
|
"git-url-parse": "^15.0.0",
|
|
@@ -38,7 +40,7 @@
|
|
|
38
40
|
"socket.io-client": "^4.7.5",
|
|
39
41
|
"tslib": "^2.8.1",
|
|
40
42
|
"uuid": "^8.3.2",
|
|
41
|
-
"zephyr-edge-contract": "0.0.0-canary-
|
|
43
|
+
"zephyr-edge-contract": "0.0.0-canary-20250514220856"
|
|
42
44
|
},
|
|
43
45
|
"devDependencies": {
|
|
44
46
|
"@jest/globals": "^29.7.0",
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Resolves a catalog dependency version string (e.g., "catalog:react18") to its actual
|
|
3
|
-
* semver version range from pnpm-workspace.yaml
|
|
4
|
-
*
|
|
5
|
-
* @param versionString The version string to resolve
|
|
6
|
-
* @param packageName Optional package name to look up specific package in catalog
|
|
7
|
-
* @returns The resolved semver version or the original version if not a catalog reference
|
|
8
|
-
*/
|
|
9
|
-
export declare function resolveCatalogVersion(versionString: string, packageName?: string): string;
|
|
10
|
-
/**
|
|
11
|
-
* Gets all packages with their versions for a specific catalog
|
|
12
|
-
*
|
|
13
|
-
* @param catalogName The name of the catalog
|
|
14
|
-
* @returns Object mapping package names to their versions, or null if catalog not found
|
|
15
|
-
*/
|
|
16
|
-
export declare function getCatalogPackages(catalogName: string): Record<string, string> | null;
|
|
17
|
-
/**
|
|
18
|
-
* Resolves a dependency versions object, looking for catalog: references and replacing
|
|
19
|
-
* them with the actual semver version ranges
|
|
20
|
-
*
|
|
21
|
-
* @param dependencies Package dependencies object (e.g., from package.json)
|
|
22
|
-
* @returns New dependencies object with resolved versions
|
|
23
|
-
*/
|
|
24
|
-
export declare function resolveCatalogDependencies(dependencies: Record<string, string> | undefined): Record<string, string>;
|
|
@@ -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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"}
|