@dxos/cli 0.1.52 → 0.1.53-main.00be1a9

package/dist/src/util/test-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-util.d.ts","sourceRoot":"","sources":["../../../src/util/test-util.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,UAAU,YAAmB,MAAM,OAAO,MAAM,oBAK5D,CAAC"}
+{"version":3,"file":"test-util.d.ts","sourceRoot":"","sources":["../../../src/util/test-util.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,QAAQ,QAAiF,CAAC;AAEvG,eAAO,MAAM,UAAU,YAAmB,MAAM,OAAO,MAAM,oBAO5D,CAAC"}

package/dist/src/util/test-util.js

@@ -5,15 +5,24 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCommand = void 0;
+exports.runCommand = exports.BIN_PATH = void 0;
+const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
-const node_path_1 = __importDefault(require("node:path"));
-const exec_1 = require("./exec");
+const node_path_1 = require("node:path");
+const node_util_1 = require("node:util");
+const pkg_up_1 = __importDefault(require("pkg-up"));
+const async_1 = require("@dxos/async");
+const debug_1 = require("@dxos/debug");
+exports.BIN_PATH = (0, node_path_1.join)((0, node_path_1.dirname)((_a = pkg_up_1.default.sync({ cwd: __dirname })) !== null && _a !== void 0 ? _a : (0, debug_1.failUndefined)()), 'bin', 'run');
 const runCommand = async (command, cwd) => {
-    const bin = node_path_1.default.join(__dirname, '../../bin/run');
     (0, node_fs_1.mkdirSync)(cwd, { recursive: true });
-    return await (0, exec_1.exec)(`${bin} ${command}`, { cwd, shell: false });
+    const { stdout, stderr } = await (0, async_1.asyncTimeout)((0, node_util_1.promisify)(node_child_process_1.exec)(`${exports.BIN_PATH} ${command}`, { cwd: __dirname }), 20000);
+    if (stderr) {
+        throw new Error(stderr);
+    }
+    return stdout;
 };
 exports.runCommand = runCommand;
 //# sourceMappingURL=test-util.js.map

package/dist/src/util/test-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-util.js","sourceRoot":"","sources":["../../../src/util/test-util.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,qCAAoC;AACpC,0DAA6B;AAE7B,iCAA8B;AAEvB,MAAM,UAAU,GAAG,KAAK,EAAE,OAAe,EAAE,GAAW,EAAE,EAAE;IAC/D,MAAM,GAAG,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAClD,IAAA,mBAAS,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpC,OAAO,MAAM,IAAA,WAAI,EAAC,GAAG,GAAG,IAAI,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AAChE,CAAC,CAAC;AALW,QAAA,UAAU,cAKrB"}
+{"version":3,"file":"test-util.js","sourceRoot":"","sources":["../../../src/util/test-util.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;AAEF,2DAA0C;AAC1C,qCAAoC;AACpC,yCAA0C;AAC1C,yCAAsC;AACtC,oDAA2B;AAE3B,uCAA2C;AAC3C,uCAA4C;AAE/B,QAAA,QAAQ,GAAG,IAAA,gBAAI,EAAC,IAAA,mBAAO,EAAC,MAAA,gBAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,mCAAI,IAAA,qBAAa,GAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAEhG,MAAM,UAAU,GAAG,KAAK,EAAE,OAAe,EAAE,GAAW,EAAE,EAAE;IAC/D,IAAA,mBAAS,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,oBAAY,EAAC,IAAA,qBAAS,EAAC,yBAAI,CAAC,CAAC,GAAG,gBAAQ,IAAI,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,EAAE,KAAM,CAAC,CAAC;IACrH,IAAI,MAAM,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;KACzB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAPW,QAAA,UAAU,cAOrB"}

package/dist/src/util/tunnel/tunnel-rpc-peer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-rpc-peer.d.ts","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"AAQA,OAAO,EAAW,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAKnE,qBAAa,aAAa;IASZ,OAAO,CAAC,QAAQ,CAAC,IAAI;IARjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmC;IACxD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;gBAEP,IAAI,EAAE,MAAM;IAqDzC,IAAI,GAAG,IAAI,MAAM,CAEhB;IAEK,KAAK;CAOZ"}
+{"version":3,"file":"tunnel-rpc-peer.d.ts","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAW,KAAK,EAAE,MAAM,aAAa,CAAC;AAG7C,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAGnE,qBAAa,aAAa;IASZ,OAAO,CAAC,QAAQ,CAAC,IAAI;IARjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmC;IACxD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;gBAEP,IAAI,EAAE,MAAM;IAqDzC,IAAI,GAAG,IAAI,MAAM,CAEhB;IAEK,KAAK;CAOZ"}

package/dist/src/util/tunnel/tunnel-rpc-peer.js

@@ -8,12 +8,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TunnelRpcPeer = void 0;
 // TODO(egorgripasov): Factor out.
-const debug_1 = __importDefault(require("debug"));
 const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
 const async_1 = require("@dxos/async");
+const log_1 = require("@dxos/log");
 const protocols_1 = require("@dxos/protocols");
 const rpc_1 = require("@dxos/rpc");
-const log = (0, debug_1.default)('dxos:cli:tunnel-rpc-peer');
 class TunnelRpcPeer {
     constructor(_url) {
         this._url = _url;
@@ -25,7 +24,7 @@ class TunnelRpcPeer {
         this._socket.onopen = async () => {
             try {
                 await this._rpc.open();
-                log(`RPC open ${this._url}`);
+                (0, log_1.log)(`RPC open ${this._url}`, {}, { file: "packages/devtools/cli/src/util/tunnel/tunnel-rpc-peer.ts", line: 28, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
                 this.connected.emit();
                 this._connectTrigger.wake();
             }
@@ -34,7 +33,7 @@ class TunnelRpcPeer {
             }
         };
         this._socket.onclose = async () => {
-            log(`Disconnected ${this._url}`);
+            (0, log_1.log)(`Disconnected ${this._url}`, {}, { file: "packages/devtools/cli/src/util/tunnel/tunnel-rpc-peer.ts", line: 37, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
             this.disconnected.emit();
             try {
                 await this._rpc.close();
@@ -45,7 +44,7 @@ class TunnelRpcPeer {
         };
         this._socket.onerror = (event) => {
             var _a;
-            log(`Publisher socket error ${this._url} ${event.message}`);
+            (0, log_1.log)(`Publisher socket error ${this._url} ${event.message}`, {}, { file: "packages/devtools/cli/src/util/tunnel/tunnel-rpc-peer.ts", line: 47, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
             this.error.emit((_a = event.error) !== null && _a !== void 0 ? _a : new Error(event.message));
         };
         this._rpc = (0, rpc_1.createProtoRpcPeer)({

package/dist/src/util/tunnel/tunnel-rpc-peer.js.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tunnel-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"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"}

package/dist/src/util/util.d.ts

@@ -1,4 +1,4 @@
-import { Space } from '@dxos/client';
+import { Space } from '@dxos/client/echo';
 import { PublicKey } from '@dxos/keys';
 export declare const maybeTruncateKey: (key: PublicKey, truncate?: boolean) => string;
 export declare const safeParseInt: (value: string | undefined, defaultValue?: number) => number | undefined;

package/dist/src/util/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,eAAO,MAAM,gBAAgB,QAAS,SAAS,+BAAkE,CAAC;AAElH,eAAO,MAAM,YAAY,UAAW,MAAM,GAAG,SAAS,iBAAiB,MAAM,KAAG,MAAM,GAAG,SAOxF,CAAC;AAMF,eAAO,MAAM,WAAW,WAAkB,KAAK,EAAE,iBAgBhD,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,eAAO,MAAM,gBAAgB,QAAS,SAAS,+BAAkE,CAAC;AAElH,eAAO,MAAM,YAAY,UAAW,MAAM,GAAG,SAAS,iBAAiB,MAAM,KAAG,MAAM,GAAG,SAOxF,CAAC;AAMF,eAAO,MAAM,WAAW,WAAkB,KAAK,EAAE,iBAiBhD,CAAC"}

package/dist/src/util/util.js

@@ -21,6 +21,7 @@ exports.safeParseInt = safeParseInt;
 // Spaces
 //
 const selectSpace = async (spaces) => {
+    await Promise.all(spaces.map((space) => space.waitUntilReady()));
     // eslint-disable-next-line no-eval
     const inquirer = (await eval('import("inquirer")')).default;
     const { key } = await inquirer.prompt([

package/dist/src/util/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAGF,uCAA0C;AAGnC,MAAM,gBAAgB,GAAG,CAAC,GAAc,EAAE,QAAQ,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;AAArG,QAAA,gBAAgB,oBAAqF;AAE3G,MAAM,YAAY,GAAG,CAAC,KAAyB,EAAE,YAAqB,EAAsB,EAAE;IACnG,IAAI;QACF,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC,CAAC;QAChC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;KACpC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,YAAY,CAAC;KACrB;AACH,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB;AAEF,EAAE;AACF,SAAS;AACT,EAAE;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,MAAe,EAAE,EAAE;IACnD,mCAAmC;IACnC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC;IAC5D,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;QACpC;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC9B,IAAI,EAAE,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;gBAC5D,KAAK,EAAE,KAAK,CAAC,GAAG;aACjB,CAAC,CAAC;SACJ;KACF,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAhBW,QAAA,WAAW,eAgBtB"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAGF,uCAA0C;AAGnC,MAAM,gBAAgB,GAAG,CAAC,GAAc,EAAE,QAAQ,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;AAArG,QAAA,gBAAgB,oBAAqF;AAE3G,MAAM,YAAY,GAAG,CAAC,KAAyB,EAAE,YAAqB,EAAsB,EAAE;IACnG,IAAI;QACF,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC,CAAC;QAChC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;KACpC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,YAAY,CAAC;KACrB;AACH,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB;AAEF,EAAE;AACF,SAAS;AACT,EAAE;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,MAAe,EAAE,EAAE;IACnD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IACjE,mCAAmC;IACnC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC;IAC5D,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;QACpC;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC9B,IAAI,EAAE,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;gBAC5D,KAAK,EAAE,KAAK,CAAC,GAAG;aACjB,CAAC,CAAC;SACJ;KACF,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAjBW,QAAA,WAAW,eAiBtB"}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.52",
+  "version": "0.1.53-main.00be1a9",
   "commands": {
     "agent:list": {
       "id": "agent:list",
@@ -151,8 +151,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -250,8 +249,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -326,8 +324,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -584,8 +581,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -746,8 +742,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -759,8 +754,7 @@
         "verbose": {
           "name": "verbose",
           "type": "boolean",
-          "char": "v",
-          "description": "Verbose output",
+          "description": "Verbose output.",
           "allowNo": false
         },
         "profile": {
@@ -953,20 +947,27 @@
       },
       "args": {}
     },
-    "function:dev": {
-      "id": "function:dev",
-      "description": "Functions dev server.",
+    "function:dev-server": {
+      "id": "function:dev-server",
+      "description": "Development server.",
       "strict": true,
       "pluginName": "@dxos/cli",
       "pluginAlias": "@dxos/cli",
       "pluginType": "core",
-      "aliases": [],
+      "aliases": [
+        "function:dev"
+      ],
+      "examples": [
+        {
+          "description": "Run with TypeScript support.",
+          "command": "dx function dev-server -r ts-node/register --verbose"
+        }
+      ],
       "flags": {
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -1023,9 +1024,18 @@
           "name": "require",
           "type": "option",
           "multiple": true,
+          "default": [
+            "ts-node/register"
+          ],
           "aliases": [
             "r"
           ]
+        },
+        "manifest": {
+          "name": "manifest",
+          "type": "option",
+          "multiple": false,
+          "default": "functions.yml"
         }
       },
       "args": {}
@@ -1037,6 +1047,7 @@
       "pluginName": "@dxos/cli",
       "pluginAlias": "@dxos/cli",
       "pluginType": "core",
+      "state": "deprecated",
       "aliases": [],
       "flags": {
         "json": {
@@ -1112,6 +1123,7 @@
       "pluginName": "@dxos/cli",
       "pluginAlias": "@dxos/cli",
       "pluginType": "core",
+      "state": "deprecated",
       "aliases": [],
       "flags": {
         "json": {
@@ -1181,6 +1193,7 @@
       "pluginName": "@dxos/cli",
       "pluginAlias": "@dxos/cli",
       "pluginType": "core",
+      "state": "deprecated",
       "aliases": [],
       "flags": {
         "json": {
@@ -1405,8 +1418,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -1624,8 +1636,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -1719,8 +1730,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -1794,8 +1804,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -1936,8 +1945,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2083,8 +2091,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2152,8 +2159,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2226,8 +2232,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2307,8 +2312,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2449,8 +2453,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2665,8 +2668,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2753,8 +2755,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {
@@ -2828,8 +2829,7 @@
         "json": {
           "name": "json",
           "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
+          "description": "Output as JSON.",
           "allowNo": false
         },
         "dry-run": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/cli",
-  "version": "0.1.52",
+  "version": "0.1.53-main.00be1a9",
   "description": "DXOS CLI",
   "keywords": [
     "dxos",
@@ -23,18 +23,17 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@faker-js/faker": "^7.3.0",
-    "@oclif/core": "^2.6.5",
-    "@oclif/plugin-help": "^5.2.8",
-    "@oclif/plugin-plugins": "^2.4.3",
+    "@oclif/core": "^2.9.4",
+    "@oclif/plugin-help": "^5.2.14",
+    "@oclif/plugin-plugins": "^3.1.8",
     "@octokit/core": "^4.0.4",
     "chalk": "^4.1.0",
     "cli-progress": "^3.11.2",
     "date-fns": "^2.29.3",
-    "debug": "^4.3.3",
     "do-wrapper": "^4.5.1",
     "fs-extra": "^8.1.0",
     "get-folder-size": "^2.0.1",
+    "git-rev-sync": "^3.0.2",
     "inquirer": "^8.2.0",
     "ipfs-http-client": "~56.0.1",
     "isomorphic-ws": "^4.0.1",
@@ -45,37 +44,33 @@
     "pkg-up": "^3.1.0",
     "react": "^18.2.0",
     "tempy": "^1.0.1",
+    "tiny-invariant": "^1.3.1",
     "uuid": "^8.3.2",
     "ws": "^7.4.4",
-    "@dxos/agent": "0.1.52",
-    "@dxos/async": "0.1.52",
-    "@dxos/bare-template": "0.1.52",
-    "@dxos/client": "0.1.52",
-    "@dxos/client-protocol": "0.1.52",
-    "@dxos/client-services": "0.1.52",
-    "@dxos/codec-protobuf": "0.1.52",
-    "@dxos/config": "0.1.52",
-    "@dxos/context": "0.1.52",
-    "@dxos/debug": "0.1.52",
-    "@dxos/functions": "0.1.52",
-    "@dxos/hello-template": "0.1.52",
-    "@dxos/keys": "0.1.52",
-    "@dxos/log": "0.1.52",
-    "@dxos/observable-object": "0.1.52",
-    "@dxos/plate": "0.1.52",
-    "@dxos/protocols": "0.1.52",
-    "@dxos/rpc": "0.1.52",
-    "@dxos/sentry": "0.1.52",
-    "@dxos/tasks-template": "0.1.52",
-    "@dxos/telemetry": "0.1.52",
-    "@dxos/util": "0.1.52",
-    "@dxos/websocket-rpc": "0.1.52"
+    "@dxos/agent": "0.1.53-main.00be1a9",
+    "@dxos/async": "0.1.53-main.00be1a9",
+    "@dxos/bare-template": "0.1.53-main.00be1a9",
+    "@dxos/client": "0.1.53-main.00be1a9",
+    "@dxos/client-protocol": "0.1.53-main.00be1a9",
+    "@dxos/codec-protobuf": "0.1.53-main.00be1a9",
+    "@dxos/config": "0.1.53-main.00be1a9",
+    "@dxos/context": "0.1.53-main.00be1a9",
+    "@dxos/debug": "0.1.53-main.00be1a9",
+    "@dxos/functions": "0.1.53-main.00be1a9",
+    "@dxos/hello-template": "0.1.53-main.00be1a9",
+    "@dxos/log": "0.1.53-main.00be1a9",
+    "@dxos/plate": "0.1.53-main.00be1a9",
+    "@dxos/protocols": "0.1.53-main.00be1a9",
+    "@dxos/rpc": "0.1.53-main.00be1a9",
+    "@dxos/sentry": "0.1.53-main.00be1a9",
+    "@dxos/tasks-template": "0.1.53-main.00be1a9",
+    "@dxos/telemetry": "0.1.53-main.00be1a9",
+    "@dxos/util": "0.1.53-main.00be1a9",
+    "@dxos/websocket-rpc": "0.1.53-main.00be1a9"
   },
   "devDependencies": {
-    "@oclif/test": "^2.3.11",
+    "@oclif/test": "^2.3.31",
     "@types/cli-progress": "^3.11.0",
-    "@types/debug": "^4.1.7",
-    "@types/faker": "^5.5.9",
     "@types/fs-extra": "^9.0.4",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash.defaultsdeep": "^4.6.6",
@@ -96,10 +91,14 @@
     "bin": "dx",
     "dirname": "dx",
     "commands": "./dist/src/commands",
+    "hooks": {
+      "command_not_found": "./dist/src/hooks/command-not-found"
+    },
     "plugins": [
       "@oclif/plugin-help",
       "@oclif/plugin-plugins"
     ],
+    "helpClass": "./dist/src/help",
     "topicSeparator": " ",
     "topics": {
       "config": {

package/dist/src/commands/function/dev.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../../src/commands/function/dev.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACtD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IAEtD,OAAgB,KAAK;;;;;;;;MAGnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAe1B"}

package/dist/src/commands/function/dev.js

@@ -1,33 +0,0 @@
-"use strict";
-//
-// Copyright 2023 DXOS.org
-//
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
-const node_path_1 = require("node:path");
-const functions_1 = require("@dxos/functions");
-const base_command_1 = require("../../base-command");
-class Dev extends base_command_1.BaseCommand {
-    async run() {
-        var _a;
-        for (const requirePath of (_a = this.flags.require) !== null && _a !== void 0 ? _a : []) {
-            require(requirePath);
-        }
-        await this.execWithClient(async (client) => {
-            await (0, functions_1.runFunctions)({
-                client,
-                functionsDirectory: (0, node_path_1.join)(process.cwd(), 'src/functions'),
-            });
-            // Hang forever.
-            await new Promise(() => { });
-        });
-    }
-}
-Dev.enableJsonFlag = true;
-Dev.description = 'Functions dev server.';
-Dev.flags = {
-    ...base_command_1.BaseCommand.flags,
-    require: core_1.Flags.string({ multiple: true, aliases: ['r'] }),
-};
-exports.default = Dev;
-//# sourceMappingURL=dev.js.map

package/dist/src/commands/function/dev.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/commands/function/dev.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,sCAAoC;AACpC,yCAAiC;AAEjC,+CAA+C;AAE/C,qDAAiD;AAEjD,MAAqB,GAAI,SAAQ,0BAAuB;IAStD,KAAK,CAAC,GAAG;;QACP,KAAK,MAAM,WAAW,IAAI,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,mCAAI,EAAE,EAAE;YAClD,OAAO,CAAC,WAAW,CAAC,CAAC;SACtB;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACzC,MAAM,IAAA,wBAAY,EAAC;gBACjB,MAAM;gBACN,kBAAkB,EAAE,IAAA,gBAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC;aACzD,CAAC,CAAC;YAEH,gBAAgB;YAChB,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;;AAtBe,kBAAc,GAAG,IAAI,CAAC;AACtB,eAAW,GAAG,uBAAuB,CAAC;AAEtC,SAAK,GAAG;IACtB,GAAG,0BAAW,CAAC,KAAK;IACpB,OAAO,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;CAC1D,CAAC;kBAPiB,GAAG"}