@typeberry/jam 0.2.0-5746fdc → 0.2.0-79dc2d4

package/bootstrap-network.mjs

@@ -24033,44 +24033,40 @@ var GpVersion;
     GpVersion["V0_6_7"] = "0.6.7";
     GpVersion["V0_7_0"] = "0.7.0";
     GpVersion["V0_7_1"] = "0.7.1";
-    GpVersion["V0_7_2"] = "0.7.2-preview";
+    GpVersion["V0_7_2"] = "0.7.2";
 })(GpVersion || (GpVersion = {}));
 var TestSuite;
 (function (TestSuite) {
     TestSuite["W3F_DAVXY"] = "w3f-davxy";
     TestSuite["JAMDUNA"] = "jamduna";
 })(TestSuite || (TestSuite = {}));
+const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
-const DEFAULT_VERSION = GpVersion.V0_7_1;
+const DEFAULT_VERSION = GpVersion.V0_7_2;
 const env = typeof process === "undefined" ? {} : process.env;
 let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
 let CURRENT_SUITE = parseCurrentSuite(env.TEST_SUITE) ?? DEFAULT_SUITE;
-const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 function parseCurrentVersion(env) {
     if (env === undefined) {
         return undefined;
     }
-    switch (env) {
-        case GpVersion.V0_6_7:
-        case GpVersion.V0_7_0:
-        case GpVersion.V0_7_1:
-        case GpVersion.V0_7_2:
-            return env;
-        default:
-            throw new Error(`Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`);
+    for (const v of Object.values(GpVersion)) {
+        if (env === v) {
+            return v;
+        }
     }
+    throw new Error(`Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`);
 }
 function parseCurrentSuite(env) {
     if (env === undefined) {
         return undefined;
     }
-    switch (env) {
-        case TestSuite.W3F_DAVXY:
-        case TestSuite.JAMDUNA:
-            return env;
-        default:
-            throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`);
+    for (const s of Object.values(TestSuite)) {
+        if (env === s) {
+            return s;
+        }
     }
+    throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`);
 }
 class Compatibility {
     static override(version) {
@@ -24231,6 +24227,13 @@ class WithDebug {
         return debug_inspect(this);
     }
 }
+function lazyInspect(obj) {
+    return {
+        toString() {
+            return debug_inspect(obj);
+        },
+    };
+}
 
 ;// CONCATENATED MODULE: ./packages/core/utils/dev.ts
 const dev_env = typeof process === "undefined" ? {} : process.env;
@@ -31321,7 +31324,7 @@ const DEV_CONFIG = "dev";
 const DEFAULT_CONFIG = "default";
 const NODE_DEFAULTS = {
     name: isBrowser() ? "browser" : external_node_os_default().hostname(),
-    config: DEFAULT_CONFIG,
+    config: [DEFAULT_CONFIG],
     pvm: PvmBackend.BuiltIn,
 };
 /** Chain spec chooser. */
@@ -31374,25 +31377,137 @@ class NodeConfiguration {
         this.authorship = authorship;
     }
 }
-function loadConfig(configPath) {
-    if (configPath === DEFAULT_CONFIG) {
-        logger.log `🔧 Loading DEFAULT config`;
-        return parseFromJson(configs.default, NodeConfiguration.fromJson);
-    }
-    if (configPath === DEV_CONFIG) {
-        logger.log `🔧 Loading DEV config`;
-        return parseFromJson(configs.dev, NodeConfiguration.fromJson);
+function loadConfig(config, withRelPath) {
+    logger.log `🔧 Loading config`;
+    let mergedJson = {};
+    for (const entry of config) {
+        logger.log `🔧 Applying '${entry}'`;
+        if (entry === DEV_CONFIG) {
+            mergedJson = structuredClone(configs.dev); // clone to avoid mutating the original config. not doing a merge since dev and default should theoretically replace all properties.
+            continue;
+        }
+        if (entry === DEFAULT_CONFIG) {
+            mergedJson = structuredClone(configs.default);
+            continue;
+        }
+        // try to parse as JSON
+        try {
+            const parsed = JSON.parse(entry);
+            deepMerge(mergedJson, parsed);
+            continue;
+        }
+        catch { }
+        // if not, try to load as file
+        if (entry.indexOf("=") === -1 && entry.endsWith(".json")) {
+            try {
+                const configFile = fs.readFileSync(withRelPath(entry), "utf8");
+                const parsed = JSON.parse(configFile);
+                deepMerge(mergedJson, parsed);
+            }
+            catch (e) {
+                throw new Error(`Unable to load config from ${entry}: ${e}`);
+            }
+        }
+        else {
+            // finally try to process as a pseudo-jq query
+            try {
+                processQuery(mergedJson, entry, withRelPath);
+            }
+            catch (e) {
+                throw new Error(`Error while processing '${entry}': ${e}`);
+            }
+        }
     }
     try {
-        logger.log `🔧 Loading config from ${configPath}`;
-        const configFile = fs.readFileSync(configPath, "utf8");
-        const parsed = JSON.parse(configFile);
-        return parseFromJson(parsed, NodeConfiguration.fromJson);
+        const parsed = parseFromJson(mergedJson, NodeConfiguration.fromJson);
+        logger.log `🔧 Config ready`;
+        return parsed;
     }
     catch (e) {
-        throw new Error(`Unable to load config file from ${configPath}: ${e}`);
+        throw new Error(`Unable to parse config: ${e}`);
     }
 }
+function deepMerge(target, source) {
+    if (!isJsonObject(source)) {
+        throw new Error(`Expected object, got ${source}`);
+    }
+    for (const key in source) {
+        if (isJsonObject(source[key])) {
+            if (!isJsonObject(target[key])) {
+                target[key] = {};
+            }
+            deepMerge(target[key], source[key]);
+        }
+        else {
+            target[key] = source[key];
+        }
+    }
+}
+/**
+ * Caution: updates input directly.
+ * Processes a pseudo-jq query. Syntax:
+ * .path.to.value = { ... } - updates value with the specified object by replacement
+ * .path.to.value += { ... } - updates value with the specified object by merging
+ * .path.to.value = file.json - updates value with the contents of file.json
+ * .path.to.value += file.json - merges the contents of file.json onto value
+ */
+function processQuery(input, query, withRelPath) {
+    const queryParts = query.split("=");
+    if (queryParts.length === 2) {
+        let [path, value] = queryParts.map((part) => part.trim());
+        let merge = false;
+        // detect += syntax
+        if (path.endsWith("+")) {
+            merge = true;
+            path = path.slice(0, -1);
+        }
+        let parsedValue;
+        if (value.endsWith(".json")) {
+            try {
+                const configFile = fs.readFileSync(withRelPath(value), "utf8");
+                const parsed = JSON.parse(configFile);
+                parsedValue = parsed;
+            }
+            catch (e) {
+                throw new Error(`Unable to load config from ${value}: ${e}`);
+            }
+        }
+        else {
+            try {
+                parsedValue = JSON.parse(value);
+            }
+            catch (e) {
+                throw new Error(`Unrecognized syntax '${value}': ${e}`);
+            }
+        }
+        let pathParts = path.split(".");
+        // allow leading dot in path
+        if (pathParts[0] === "") {
+            pathParts = pathParts.slice(1);
+        }
+        let target = input;
+        for (let i = 0; i < pathParts.length; i++) {
+            const part = pathParts[i];
+            if (!isJsonObject(target[part])) {
+                target[part] = {};
+            }
+            if (i === pathParts.length - 1) {
+                if (merge) {
+                    deepMerge(target[part], parsedValue);
+                }
+                else {
+                    target[part] = parsedValue;
+                }
+                return;
+            }
+            target = target[part];
+        }
+    }
+    throw new Error("Unrecognized syntax.");
+}
+function isJsonObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 ;// CONCATENATED MODULE: ./packages/jam/config-node/index.ts