zephyr-agent 0.0.44 → 0.0.45
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/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-read-package-json.js +3 -24
- package/dist/lib/build-context/ze-util-read-package-json.js.map +1 -1
- package/dist/package.json +1 -1
- package/package.json +2 -2
|
@@ -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"}
|
|
@@ -7,6 +7,8 @@ export interface ZePackageJson {
|
|
|
7
7
|
name: string;
|
|
8
8
|
version: string;
|
|
9
9
|
dependencies?: Record<string, string>;
|
|
10
|
+
/** Zephyr:dependencies in package.json */
|
|
11
|
+
['zephyr:dependencies']?: Record<string, string>;
|
|
10
12
|
zephyrDependencies?: Record<string, ZeDependency>;
|
|
11
13
|
/** OptionalDependencies in package.json */
|
|
12
14
|
optionalDependencies?: Record<string, string>;
|
|
@@ -8,7 +8,6 @@ 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 fs_cache_for_package_json_1 = require("./fs-cache-for-package-json");
|
|
12
11
|
const ze_util_parse_ze_dependencies_1 = require("./ze-util-parse-ze-dependencies");
|
|
13
12
|
/**
|
|
14
13
|
* Retrieves and parses the package.json file from the given context path or current
|
|
@@ -36,18 +35,6 @@ async function getPackageJson(context) {
|
|
|
36
35
|
catch (error) {
|
|
37
36
|
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_NOT_FOUND, `Invalid starting path: ${context}. Error: ${error}`);
|
|
38
37
|
}
|
|
39
|
-
// Check the cache first
|
|
40
|
-
try {
|
|
41
|
-
const cached = await (0, fs_cache_for_package_json_1.getPackageJsonCache)(startingPath);
|
|
42
|
-
if (cached) {
|
|
43
|
-
(0, logging_1.ze_log)('Using cached package.json for path', startingPath);
|
|
44
|
-
return cached;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
catch (error) {
|
|
48
|
-
// Cache errors are not fatal, just log and continue
|
|
49
|
-
(0, logging_1.ze_log)('Cache retrieval error', error);
|
|
50
|
-
}
|
|
51
38
|
// Find nearest package.json
|
|
52
39
|
let nearest_package_json;
|
|
53
40
|
try {
|
|
@@ -66,7 +53,6 @@ async function getPackageJson(context) {
|
|
|
66
53
|
// Parse and validate package.json
|
|
67
54
|
try {
|
|
68
55
|
const { json, path: packageJsonPath } = nearest_package_json;
|
|
69
|
-
// todo: split parsed package json into parsed and resulting, where resulting is of type ZePackageJson
|
|
70
56
|
const parsed_package_json = (0, zephyr_edge_contract_1.safe_json_parse)(json);
|
|
71
57
|
if (!parsed_package_json) {
|
|
72
58
|
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_NOT_VALID, `Invalid JSON in package.json at: ${packageJsonPath}`);
|
|
@@ -78,16 +64,9 @@ async function getPackageJson(context) {
|
|
|
78
64
|
if (!parsed_package_json.version) {
|
|
79
65
|
throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_PACKAGE_JSON_MUST_HAVE_NAME_VERSION, `Missing 'version' field in package.json at: ${packageJsonPath}`);
|
|
80
66
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
// Cache the result
|
|
85
|
-
try {
|
|
86
|
-
await (0, fs_cache_for_package_json_1.setPackageJsonCache)(startingPath, parsed_package_json);
|
|
87
|
-
}
|
|
88
|
-
catch (cacheError) {
|
|
89
|
-
// Cache errors are not fatal, just log and continue
|
|
90
|
-
(0, logging_1.ze_log)('Cache storage error', cacheError);
|
|
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);
|
|
91
70
|
}
|
|
92
71
|
(0, logging_1.ze_log)('Successfully parsed package.json', {
|
|
93
72
|
name: parsed_package_json.name,
|
|
@@ -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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"}
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-agent",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.45",
|
|
4
4
|
"description": "Zephyr plugin agent",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"socket.io-client": "^4.7.5",
|
|
39
39
|
"tslib": "^2.8.1",
|
|
40
40
|
"uuid": "^8.3.2",
|
|
41
|
-
"zephyr-edge-contract": "0.0.
|
|
41
|
+
"zephyr-edge-contract": "0.0.45"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@jest/globals": "^29.7.0",
|