@everyprotocol/every-cli 0.1.6 → 0.1.7

package/dist/cmds/pick.js

@@ -3,14 +3,22 @@ import path from "node:path";
 import jp from "jsonpath";
 import * as _ from "lodash-es";
 import { Command } from "commander";
+import { loadMergedConfig } from "../config.js";
 const DEFAULT_DIR = "./register";
+const DEFAULT_UNIVERSE = "anvil";
 const STATIC_RULES = {
+    // config
+    "universe.id": { file: "config://universe.json", root: "$", field: "id" },
+    "universe.sreg": { file: "config://universe.json", root: "$", field: "contracts.SetRegistry" },
+    "universe.oreg": { file: "config://universe.json", root: "$", field: "contracts.OmniRegistry" },
+    "universe.kreg": { file: "config://universe.json", root: "$", field: "contracts.KindRegistry" },
+    "universe.ereg": { file: "config://universe.json", root: "$", field: "contracts.ElementRegistry" },
+    "universe.minter": { file: "config://universe.json", root: "$", field: "contracts.ObjectMinter" },
+    "universe.rpc": { file: "config://universe.json", root: "$", field: "rpc" },
+    "universe.observer": { file: "config://universe.json", root: "$", field: "observer" },
     // contract
-    "deploy.addr": {
-        file: "deploy.json",
-        root: "$",
-        field: "deployedTo",
-    },
+    "deploy.addr": { file: "deploy.json", root: "$", field: "deployedTo" },
+    "contract.addr": { file: "contract.json", root: "$", field: "deployedTo" },
     // kind
     "kind.id": { file: "kind.json", root: "$.events[?(@.name=='KindRegistered')].data", field: "id" },
     "kind.rev": { file: "kind.json", root: "$.events[?(@.name=='KindRegistered')].data.desc", field: "rev" },
@@ -99,13 +107,24 @@ export const pickCmd = new Command("pick")
     .description("Pick values from outputs")
     .argument("<keys...>", "Keys to resolve")
     .option("--from <dir>", "Output directory", DEFAULT_DIR)
+    .option("-u, --universe <name>", "Universe name", DEFAULT_UNIVERSE)
     .action(function (keys) {
-    const { from } = this.opts();
-    const dir = from || DEFAULT_DIR;
+    const { from, universe } = this.opts();
     const loadJsonCache = _.memoize((rel) => {
-        const full = path.join(dir, rel);
+        if (rel == "config://universe.json") {
+            return loadUniverseConfig(universe);
+        }
+        const full = path.join(from, rel);
         return loadJson(full);
     });
     const outputs = keys.map((key) => pickOnce(loadJsonCache, key));
     console.log(outputs.join(" "));
 });
+function loadUniverseConfig(universe) {
+    const config = loadMergedConfig();
+    const uniConf = config.universes?.[universe];
+    if (!uniConf) {
+        throw new Error(`config for universe ${universe} not found`);
+    }
+    return uniConf;
+}

package/dist/commander-patch.js

@@ -7,11 +7,10 @@ export const privateKey = new Option("-k, --private-key <key>", "Private key to
 export const foundry = new Option("-f, --foundry", "Use foundry keystores (~/.foundry/keystores)");
 export const universe = new Option("-u, --universe <universe>", "Universe name").default("anvil");
 export const network = new Option("-n, --network <network>", "Network name").default("dev");
-export const json = new Option("-j, --json [file]", "Output result as JSON to stdout or file, implies --quiet");
+export const json = new Option("-j, --json [file]", "Output result as JSON to stdout or file");
 export const quiet = new Option("-q, --quiet", "Suppress info messages");
-export const noQuiet = new Option("--no-quiet", "Force info messages even when --json is set");
 export const keystoreOptions = [account, password, passwordFile, foundry];
-export const outputOptions = [json, quiet, noQuiet];
+export const outputOptions = [json, quiet];
 export const writeOptions = [universe, account, password, passwordFile, foundry];
 Command.prototype.addCommands = function (commands) {
     commands.forEach((cmd) => this.addCommand(cmd));
@@ -29,7 +28,7 @@ Command.prototype.addKeystoreOptions = function () {
     return this.addOptions([account, password, passwordFile, foundry]);
 };
 Command.prototype.addOutputOptions = function () {
-    return this.addOptions([json, quiet, noQuiet]);
+    return this.addOptions([json, quiet]);
 };
 Command.prototype.addWriteOptions = function () {
     return this.addKeystoreOptions().addOption(universe);

package/dist/logger.js

@@ -5,7 +5,7 @@ export class Logger {
     quiet;
     json;
     constructor(opts = {}) {
-        this.quiet = opts.quiet ?? !!opts.json;
+        this.quiet = opts.quiet ?? false;
         this.json = opts.json ?? false;
     }
     log(...args) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@everyprotocol/every-cli",
   "type": "module",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "files": [
     "dist/",
     "abis/",