@dxos/cli 0.5.8-main.f69e6e4 → 0.5.8-next.4b7fabd

package/dist/src/commands/halo/share.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../../../src/commands/halo/share.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAsC;IAEjE,OAAgB,KAAK;;;;;;;;;;;;;;;;MAsBnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAqC1B"}
+{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../../../src/commands/halo/share.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAsC;IAEjE,OAAgB,KAAK;;;;;;;;;;;;;;;;;MAuBnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAgD1B"}

package/dist/src/commands/halo/share.js

@@ -10,25 +10,27 @@ const core_1 = require("@oclif/core");
 const chalk_1 = __importDefault(require("chalk"));
 const node_clipboardy_1 = require("node-clipboardy");
 const node_child_process_1 = require("node:child_process");
-const cli_base_1 = require("@dxos/cli-base");
 const invitations_1 = require("@dxos/client/invitations");
 const base_1 = require("../../base");
+const util_1 = require("../../util");
 class Share extends base_1.BaseCommand {
     async run() {
-        return await this.execWithClient(async ({ client }) => {
-            const authMethod = this.flags.auth ? invitations_1.Invitation.AuthMethod.SHARED_SECRET : invitations_1.Invitation.AuthMethod.NONE;
+        return await this.execWithClient(async (client) => {
+            if (!client.halo.identity.get()) {
+                this.log((0, chalk_1.default) `{red Profile not initialized.}`);
+                return {};
+            }
+            const authMethod = this.flags['no-auth'] ? invitations_1.Invitation.AuthMethod.NONE : undefined;
             const observable = client.halo.share({
                 authMethod,
                 timeout: this.flags.timeout,
                 persistent: this.flags.persistent,
                 lifetime: this.flags.lifetime,
             });
-            core_1.ux.action.start('Waiting for peer to connect');
-            await (0, cli_base_1.hostInvitation)({
+            const invitationSuccess = (0, util_1.hostInvitation)({
                 observable,
                 callbacks: {
                     onConnecting: async () => {
-                        core_1.ux.action.stop();
                         const invitation = observable.get();
                         const invitationCode = invitations_1.InvitationEncoder.encode(invitation);
                         if (authMethod !== invitations_1.Invitation.AuthMethod.NONE) {
@@ -45,8 +47,17 @@ class Share extends base_1.BaseCommand {
                         }
                     },
                 },
+                waitForSuccess: false,
             });
-            core_1.ux.stdout((0, chalk_1.default) `{green OK}`);
+            if (!this.flags['no-wait']) {
+                core_1.ux.action.start('Waiting for peer to connect');
+                await invitationSuccess;
+                core_1.ux.action.stop();
+                core_1.ux.log((0, chalk_1.default) `{green Joined successfully.}`);
+            }
+            else {
+                await invitationSuccess;
+            }
         });
     }
 }
@@ -69,10 +80,11 @@ Share.flags = {
         description: 'Application Host URL.',
         default: 'https://composer.space',
     }),
-    auth: core_1.Flags.boolean({
+    'no-auth': core_1.Flags.boolean({
         description: 'Skip authentication challenge.',
-        default: true,
-        allowNo: true,
+    }),
+    'no-wait': core_1.Flags.boolean({
+        description: "Don't wait for a peer to connect before exiting CLI.",
     }),
 };
 exports.default = Share;

package/dist/src/commands/halo/share.js.map

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

package/dist/src/commands/halo/update.d.ts

@@ -4,13 +4,14 @@ export default class Update extends BaseCommand<typeof Update> {
     static flags: {
         displayName: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         config: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
         target: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        agent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'no-agent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'no-wait': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'json-log': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'json-logfile': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     };

package/dist/src/commands/halo/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/commands/halo/update.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,WAAW,SAA8B;IACzD,OAAgB,KAAK;;;;;;;;;;;;MAGnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAsB1B"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/commands/halo/update.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAIzC,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,WAAW,SAA8B;IACzD,OAAgB,KAAK;;;;;;;;;;;;;MAGnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAsB1B"}

package/dist/src/commands/halo/update.js

@@ -9,14 +9,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const chalk_1 = __importDefault(require("chalk"));
 const async_1 = require("@dxos/async");
-const cli_base_1 = require("@dxos/cli-base");
 const base_1 = require("../../base");
+const errors_1 = require("../../errors");
+const timeouts_1 = require("../../timeouts");
 class Update extends base_1.BaseCommand {
     async run() {
-        return await this.execWithClient(async ({ client }) => {
+        return await this.execWithClient(async (client) => {
             var _a;
             // TODO(mykola): Hack to wait for identity with `client.halo.identity.wait()`.
-            await (0, async_1.asyncTimeout)(client.spaces.isReady.wait(), cli_base_1.IDENTITY_WAIT_TIMEOUT, new cli_base_1.IdentityWaitTimeoutError());
+            await (0, async_1.asyncTimeout)(client.spaces.isReady.wait(), timeouts_1.IDENTITY_WAIT_TIMEOUT, new errors_1.IdentityWaitTimeoutError());
             const identity = client.halo.identity.get();
             if (!identity) {
                 // TODO(burdon): Error if called twice with no halo.

package/dist/src/commands/halo/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/halo/update.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAoC;AACpC,kDAA0B;AAE1B,uCAA2C;AAC3C,6CAAiF;AAEjF,qCAAyC;AAEzC,MAAqB,MAAO,SAAQ,kBAA0B;IAO5D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;;YACpD,8EAA8E;YAC9E,MAAM,IAAA,oBAAY,EAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,gCAAqB,EAAE,IAAI,mCAAwB,EAAE,CAAC,CAAC;YACxG,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAE5C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,oDAAoD;gBACpD,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,iCAAiC,CAAC,CAAC;gBACjD,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAEtB,MAAM,WAAW,GAAG,MAAM,CAAA,MAAA,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,0CAAE,aAAa,CAAC;gBAChF,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW;aACpC,CAAC,CAAA,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;YAE3C,OAAO,WAAW,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;;AA3Be,kBAAW,GAAG,0BAA0B,CAAC;AACzC,YAAK,GAAG;IACtB,GAAG,kBAAW,CAAC,KAAK;IACpB,WAAW,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;CAC/D,CAAC;kBALiB,MAAM"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/halo/update.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAoC;AACpC,kDAA0B;AAE1B,uCAA2C;AAG3C,qCAAyC;AACzC,yCAAwD;AACxD,6CAAuD;AAEvD,MAAqB,MAAO,SAAQ,kBAA0B;IAO5D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;;YACxD,8EAA8E;YAC9E,MAAM,IAAA,oBAAY,EAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,gCAAqB,EAAE,IAAI,iCAAwB,EAAE,CAAC,CAAC;YACxG,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAE5C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,oDAAoD;gBACpD,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,iCAAiC,CAAC,CAAC;gBACjD,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAEtB,MAAM,WAAW,GAAG,MAAM,CAAA,MAAA,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,0CAAE,aAAa,CAAC;gBAChF,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW;aACpC,CAAC,CAAA,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;YAE3C,OAAO,WAAW,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;;AA3Be,kBAAW,GAAG,0BAA0B,CAAC;AACzC,YAAK,GAAG;IACtB,GAAG,kBAAW,CAAC,KAAK;IACpB,WAAW,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;CAC/D,CAAC;kBALiB,MAAM"}

package/dist/src/commands/reset/index.d.ts

@@ -5,13 +5,14 @@ export default class Reset extends BaseCommand<typeof Reset> {
         force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'default-config': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         config: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
         target: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        agent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'no-agent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'no-wait': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'json-log': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'json-logfile': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     };

package/dist/src/commands/reset/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/reset/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,WAAW,SAAsB;IACjD,OAAgB,KAAK;;;;;;;;;;;;;MAUnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CA8D1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/reset/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,WAAW,SAAsB;IACjD,OAAgB,KAAK;;;;;;;;;;;;;;MAUnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAuD1B"}

package/dist/src/commands/reset/index.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = __importDefault(require("fs"));
-const inquirer_1 = __importDefault(require("inquirer"));
 const client_protocol_1 = require("@dxos/client-protocol");
 const base_1 = require("../../base");
 class Reset extends base_1.BaseCommand {
@@ -32,16 +31,8 @@ class Reset extends base_1.BaseCommand {
         if (storage && storage !== (0, client_protocol_1.getProfilePath)(client_protocol_1.DX_DATA, profile)) {
             this.warn((0, chalk_1.default) `The storage path does not match the default:\n- config: {yellow ${storage}}\n- expected: {green ${(0, client_protocol_1.getProfilePath)(client_protocol_1.DX_DATA, profile)}}`);
         }
-        let dryRun = this.flags['dry-run'];
-        if (!dryRun && !this.flags.force) {
-            const { confirm } = await inquirer_1.default.prompt({
-                type: 'confirm',
-                name: 'confirm',
-                default: false,
-                message: (0, chalk_1.default) `{red Delete all data? {white (Profile: ${profile})}}`,
-            });
-            dryRun = !confirm;
-        }
+        const dryRun = this.flags['dry-run'] ||
+            !(this.flags.force || (await core_1.ux.confirm((0, chalk_1.default) `\n{red Delete all data? {white (Profile: ${profile})}}`)));
         if (!dryRun) {
             await this.execWithDaemon(async (daemon) => {
                 await daemon.stop(this.flags.profile, { force: this.flags.force });

package/dist/src/commands/reset/index.js.map

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

package/dist/src/commands/shell/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/shell/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,WAAW,SAAwB;IAE7C,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAY3B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/shell/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,WAAW,SAAwB;IAE7C,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAY3B"}

package/dist/src/commands/shell/index.js

@@ -2,18 +2,14 @@
 //
 // Copyright 2022 DXOS.org
 //
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const inquirer_1 = __importDefault(require("inquirer"));
 const base_1 = require("../../base");
 class Shell extends base_1.BaseCommand {
     async run() {
         while (true) {
             // https://github.com/oclif/cli-ux
-            const { command } = await inquirer_1.default.prompt({ name: 'command' });
+            const command = await core_1.ux.prompt('');
             if (command === 'quit') {
                 break;
             }

package/dist/src/commands/shell/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/shell/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAkC;AAClC,wDAAgC;AAEhC,qCAAyC;AAEzC,MAAqB,KAAM,SAAQ,kBAAyB;IAG1D,KAAK,CAAC,GAAG;QACP,OAAO,IAAI,EAAE,CAAC;YACZ,kCAAkC;YAClC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAsB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;YACpF,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;gBACvB,MAAM;YACR,CAAC;YAED,iDAAiD;YACjD,MAAM,IAAA,UAAG,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;;AAbe,iBAAW,GAAG,oBAAoB,CAAC;kBADhC,KAAK"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/shell/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,sCAAsC;AAEtC,qCAAyC;AAEzC,MAAqB,KAAM,SAAQ,kBAAyB;IAG1D,KAAK,CAAC,GAAG;QACP,OAAO,IAAI,EAAE,CAAC;YACZ,kCAAkC;YAClC,MAAM,OAAO,GAAG,MAAM,SAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACpC,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;gBACvB,MAAM;YACR,CAAC;YAED,iDAAiD;YACjD,MAAM,IAAA,UAAG,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;;AAbe,iBAAW,GAAG,oBAAoB,CAAC;kBADhC,KAAK"}

package/dist/src/commands/space/close.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"close.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/close.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,WAAW,SAAkB;IAC7C,OAAgB,IAAI;;MAAkB;IAEhC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAO1B"}
+{"version":3,"file":"close.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/close.ts"],"names":[],"mappings":"AAMA,OAAO,EAAkB,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,WAAW,SAAkB;IAC7C,OAAgB,IAAI;;MAAkB;IAEhC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAO1B"}

package/dist/src/commands/space/close.js

@@ -3,18 +3,17 @@
 // Copyright 2022 DXOS.org
 //
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_base_1 = require("@dxos/cli-base");
 const base_1 = require("../../base");
 class Close extends base_1.BaseCommand {
     async run() {
         const { key } = this.args;
-        return await this.execWithClient(async ({ client }) => {
+        return await this.execWithClient(async (client) => {
             const space = await this.getSpace(client, key, false);
             await space.close();
         });
     }
 }
 Close.description = 'Close space.';
-Close.args = cli_base_1.ARG_SPACE_KEYS;
+Close.args = base_1.ARG_SPACE_KEYS;
 exports.default = Close;
 //# sourceMappingURL=close.js.map

package/dist/src/commands/space/close.js.map

@@ -1 +1 @@
-{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../../src/commands/space/close.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,6CAAgD;AAEhD,qCAAyC;AAEzC,MAAqB,KAAM,SAAQ,kBAAyB;IAI1D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACpD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YACtD,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;;AATe,iBAAW,GAAG,cAAc,CAAC;AAC7B,UAAI,GAAG,yBAAc,CAAC;kBAFnB,KAAK"}
+{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../../src/commands/space/close.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAIF,qCAAyD;AAEzD,MAAqB,KAAM,SAAQ,kBAAyB;IAI1D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YACtD,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;;AATe,iBAAW,GAAG,cAAc,CAAC;AAC7B,UAAI,GAAG,qBAAc,CAAC;kBAFnB,KAAK"}

package/dist/src/commands/space/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/create.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAmB;IAC9C,OAAgB,IAAI;;MAA2B;IAEzC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAa1B"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/create.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAmB;IAC9C,OAAgB,IAAI;;MAA2B;IAEzC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAgB1B"}

package/dist/src/commands/space/create.js

@@ -8,20 +8,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const chalk_1 = __importDefault(require("chalk"));
-const cli_base_1 = require("@dxos/cli-base");
 const base_1 = require("../../base");
+const util_1 = require("../../util");
 class Create extends base_1.BaseCommand {
     async run() {
-        return await this.execWithClient(async ({ client }) => {
+        return await this.execWithClient(async (client) => {
             const space = await client.spaces.create();
-            await (0, cli_base_1.waitForSpace)(space, this.flags.timeout, (err) => this.catch(err));
+            await (0, util_1.waitForSpace)(space, this.flags.timeout, (err) => this.catch(err));
             space.properties.name = this.args.name;
-            core_1.ux.stdout((0, chalk_1.default) `{green Created}: ${space.key.truncate()}`);
+            core_1.ux.log((0, chalk_1.default) `{green Created}: ${space.key.truncate()}`);
             return {
                 key: space.key,
                 name: space.properties.name,
             };
-        });
+        }, { halo: true });
     }
 }
 Create.enableJsonFlag = true;

package/dist/src/commands/space/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/space/create.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAuC;AACvC,kDAA0B;AAE1B,6CAA8C;AAE9C,qCAAyC;AAEzC,MAAqB,MAAO,SAAQ,kBAA0B;IAK5D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACpD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC3C,MAAM,IAAA,uBAAY,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YACxE,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAEvC,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,oBAAoB,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC3D,OAAO;gBACL,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI;aAC5B,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;;AAhBe,qBAAc,GAAG,IAAI,CAAC;AACtB,kBAAW,GAAG,eAAe,CAAC;AAC9B,WAAI,GAAG,EAAE,IAAI,EAAE,WAAI,CAAC,MAAM,EAAE,EAAE,CAAC;kBAH5B,MAAM"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/space/create.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAuC;AACvC,kDAA0B;AAI1B,qCAAyC;AACzC,qCAA0C;AAE1C,MAAqB,MAAO,SAAQ,kBAA0B;IAK5D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAC9B,KAAK,EAAE,MAAc,EAAE,EAAE;YACvB,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC3C,MAAM,IAAA,mBAAY,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YACxE,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAEvC,SAAE,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,oBAAoB,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACxD,OAAO;gBACL,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI;aAC5B,CAAC;QACJ,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;IACJ,CAAC;;AAnBe,qBAAc,GAAG,IAAI,CAAC;AACtB,kBAAW,GAAG,eAAe,CAAC;AAC9B,WAAI,GAAG,EAAE,IAAI,EAAE,WAAI,CAAC,MAAM,EAAE,EAAE,CAAC;kBAH5B,MAAM"}

package/dist/src/commands/space/epoch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"epoch.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/epoch.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAuB;IAClD,OAAgB,IAAI;;MAAkB;IAEhC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAO1B"}
+{"version":3,"file":"epoch.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/epoch.ts"],"names":[],"mappings":"AAMA,OAAO,EAAkB,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAuB;IAClD,OAAgB,IAAI;;MAAkB;IAEhC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAO1B"}

package/dist/src/commands/space/epoch.js

@@ -3,12 +3,11 @@
 // Copyright 2022 DXOS.org
 //
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_base_1 = require("@dxos/cli-base");
 const base_1 = require("../../base");
 class Epoch extends base_1.BaseCommand {
     async run() {
         const { key } = this.args;
-        return await this.execWithClient(async ({ client }) => {
+        return await this.execWithClient(async (client) => {
             const space = await this.getSpace(client, key);
             await space.internal.createEpoch();
         });
@@ -16,6 +15,6 @@ class Epoch extends base_1.BaseCommand {
 }
 Epoch.enableJsonFlag = true;
 Epoch.description = 'Create new epoch.';
-Epoch.args = cli_base_1.ARG_SPACE_KEYS;
+Epoch.args = base_1.ARG_SPACE_KEYS;
 exports.default = Epoch;
 //# sourceMappingURL=epoch.js.map

package/dist/src/commands/space/epoch.js.map

@@ -1 +1 @@
-{"version":3,"file":"epoch.js","sourceRoot":"","sources":["../../../../src/commands/space/epoch.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,6CAAgD;AAEhD,qCAAyC;AAEzC,MAAqB,KAAM,SAAQ,kBAAyB;IAK1D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACpD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;;AAVe,oBAAc,GAAG,IAAI,CAAC;AACtB,iBAAW,GAAG,mBAAmB,CAAC;AAClC,UAAI,GAAG,yBAAc,CAAC;kBAHnB,KAAK"}
+{"version":3,"file":"epoch.js","sourceRoot":"","sources":["../../../../src/commands/space/epoch.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAIF,qCAAyD;AAEzD,MAAqB,KAAM,SAAQ,kBAAyB;IAK1D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM,KAAK,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;;AAVe,oBAAc,GAAG,IAAI,CAAC;AACtB,iBAAW,GAAG,mBAAmB,CAAC;AAClC,UAAI,GAAG,qBAAc,CAAC;kBAHnB,KAAK"}

package/dist/src/commands/space/info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/info.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAsB;IACjD,OAAgB,IAAI;;MAAkB;IAEhC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAc1B"}
+{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/info.ts"],"names":[],"mappings":"AAMA,OAAO,EAAkB,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAsB;IACjD,OAAgB,IAAI;;MAAkB;IAEhC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAc1B"}

package/dist/src/commands/space/info.js

@@ -3,12 +3,11 @@
 // Copyright 2022 DXOS.org
 //
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_base_1 = require("@dxos/cli-base");
 const base_1 = require("../../base");
 class Info extends base_1.BaseCommand {
     async run() {
         const { key } = this.args;
-        return await this.execWithClient(async ({ client }) => {
+        return await this.execWithClient(async (client) => {
             const space = await this.getSpace(client, key, false);
             // await space.waitUntilReady();
             // TODO(burdon): Factor out info (from diagnostics).
@@ -24,6 +23,6 @@ class Info extends base_1.BaseCommand {
 }
 Info.enableJsonFlag = true;
 Info.description = 'Show space info.';
-Info.args = cli_base_1.ARG_SPACE_KEYS;
+Info.args = base_1.ARG_SPACE_KEYS;
 exports.default = Info;
 //# sourceMappingURL=info.js.map

package/dist/src/commands/space/info.js.map

@@ -1 +1 @@
-{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../../src/commands/space/info.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,6CAAgD;AAEhD,qCAAyC;AAEzC,MAAqB,IAAK,SAAQ,kBAAwB;IAKxD,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACpD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YACtD,gCAAgC;YAChC,oDAAoD;YACpD,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AAjBe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,kBAAkB,CAAC;AACjC,SAAI,GAAG,yBAAc,CAAC;kBAHnB,IAAI"}
+{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../../src/commands/space/info.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAIF,qCAAyD;AAEzD,MAAqB,IAAK,SAAQ,kBAAwB;IAKxD,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YACtD,gCAAgC;YAChC,oDAAoD;YACpD,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AAjBe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,kBAAkB,CAAC;AACjC,SAAI,GAAG,qBAAc,CAAC;kBAHnB,IAAI"}

package/dist/src/commands/space/join.d.ts

@@ -6,13 +6,14 @@ export default class Join extends BaseCommand<typeof Join> {
         invitation: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         secret: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         config: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
         target: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        agent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'no-agent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'no-wait': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'json-log': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'json-logfile': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     };

package/dist/src/commands/space/join.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/join.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IACtD,OAAgB,KAAK;;;;;;;;;;;;;MAQnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAkD1B"}
+{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/join.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IACtD,OAAgB,KAAK;;;;;;;;;;;;;;MAQnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAwC1B"}

package/dist/src/commands/space/join.js

@@ -8,43 +8,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const chalk_1 = __importDefault(require("chalk"));
-const inquirer_1 = __importDefault(require("inquirer"));
 const async_1 = require("@dxos/async");
-const cli_base_1 = require("@dxos/cli-base");
 const base_1 = require("../../base");
+const util_1 = require("../../util");
 class Join extends base_1.BaseCommand {
     async run() {
-        return await this.execWithClient(async ({ client }) => {
+        return await this.execWithClient(async (client) => {
             var _a;
             let { invitation: encoded, secret } = this.flags;
             if (!encoded) {
-                const { invitation } = await inquirer_1.default.prompt({
-                    name: 'invitation',
-                    message: 'Invitation',
-                });
-                encoded = invitation;
+                encoded = await core_1.ux.prompt((0, chalk_1.default) `\n{blue Invitation}`);
             }
             if (encoded.startsWith('http') || encoded.startsWith('socket')) {
                 const searchParams = new URLSearchParams(encoded.substring(encoded.lastIndexOf('?')));
                 encoded = (_a = searchParams.get('spaceInvitationCode')) !== null && _a !== void 0 ? _a : encoded; // TODO(burdon): Const.
             }
+            core_1.ux.log('');
             core_1.ux.action.start('Waiting for peer to connect');
             const done = new async_1.Trigger();
             // TODO(burdon): Error code if joining same space (don't throw!)
-            const invitation = await (0, cli_base_1.acceptInvitation)({
+            const invitation = await (0, util_1.acceptInvitation)({
                 observable: client.spaces.join(encoded),
                 callbacks: {
                     onConnecting: async () => core_1.ux.action.stop(),
-                    onReadyForAuth: async () => {
-                        if (!secret) {
-                            const { secret } = await inquirer_1.default.prompt({
-                                name: 'secret',
-                                message: (0, chalk_1.default) `\n{red Secret}`,
-                            });
-                            return secret;
-                        }
-                        return secret;
-                    },
+                    onReadyForAuth: async () => secret !== null && secret !== void 0 ? secret : core_1.ux.prompt((0, chalk_1.default) `\n{red Secret}`),
                     onSuccess: async () => {
                         done.wake();
                     },
@@ -54,7 +41,8 @@ class Join extends base_1.BaseCommand {
             // TODO(burdon): Race condition.
             await (0, async_1.sleep)(1000);
             const space = client.spaces.get(invitation.spaceKey);
-            core_1.ux.stdout((0, chalk_1.default) `{green Joined successfully.}`);
+            core_1.ux.log();
+            core_1.ux.log((0, chalk_1.default) `{green Joined successfully.}`);
             return {
                 key: space.key,
             };

package/dist/src/commands/space/join.js.map

@@ -1 +1 @@
-{"version":3,"file":"join.js","sourceRoot":"","sources":["../../../../src/commands/space/join.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAC1B,wDAAgC;AAEhC,uCAA6C;AAC7C,6CAAkD;AAElD,qCAAyC;AAEzC,MAAqB,IAAK,SAAQ,kBAAwB;IAaxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;;YACpD,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACjD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAyB;oBACnE,IAAI,EAAE,YAAY;oBAClB,OAAO,EAAE,YAAY;iBACtB,CAAC,CAAC;gBACH,OAAO,GAAG,UAAU,CAAC;YACvB,CAAC;YAED,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/D,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtF,OAAO,GAAG,MAAA,YAAY,CAAC,GAAG,CAAC,qBAAqB,CAAC,mCAAI,OAAO,CAAC,CAAC,uBAAuB;YACvF,CAAC;YAED,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,IAAI,eAAO,EAAE,CAAC;YAC3B,gEAAgE;YAChE,MAAM,UAAU,GAAG,MAAM,IAAA,2BAAgB,EAAC;gBACxC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAQ,CAAC;gBACxC,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE;oBAC1C,cAAc,EAAE,KAAK,IAAI,EAAE;wBACzB,IAAI,CAAC,MAAM,EAAE,CAAC;4BACZ,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAqB;gCAC3D,IAAI,EAAE,QAAQ;gCACd,OAAO,EAAE,IAAA,eAAK,EAAA,gBAAgB;6BAC/B,CAAC,CAAC;4BACH,OAAO,MAAM,CAAC;wBAChB,CAAC;wBACD,OAAO,MAAM,CAAC;oBAChB,CAAC;oBACD,SAAS,EAAE,KAAK,IAAI,EAAE;wBACpB,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,gCAAgC;YAChC,MAAM,IAAA,aAAK,EAAC,IAAI,CAAC,CAAC;YAClB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,QAAS,CAAE,CAAC;YACvD,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,8BAA8B,CAAC,CAAC;YAE/C,OAAO;gBACL,GAAG,EAAE,KAAK,CAAC,GAAG;aACf,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;;AA7De,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,uBAAuB,CAAC;AACtC,UAAK,GAAG;IACtB,GAAG,kBAAW,CAAC,KAAK;IACpB,UAAU,EAAE,YAAK,CAAC,MAAM,CAAC;QACvB,WAAW,EAAE,iBAAiB;KAC/B,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACnB,WAAW,EAAE,mBAAmB;KACjC,CAAC;CACH,CAAC;kBAXiB,IAAI"}
+{"version":3,"file":"join.js","sourceRoot":"","sources":["../../../../src/commands/space/join.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAE1B,uCAA6C;AAG7C,qCAAyC;AACzC,qCAA8C;AAE9C,MAAqB,IAAK,SAAQ,kBAAwB;IAaxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;;YACxD,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACjD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,GAAG,MAAM,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,qBAAqB,CAAC,CAAC;YACxD,CAAC;YAED,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/D,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtF,OAAO,GAAG,MAAA,YAAY,CAAC,GAAG,CAAC,qBAAqB,CAAC,mCAAI,OAAO,CAAC,CAAC,uBAAuB;YACvF,CAAC;YAED,SAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACX,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,IAAI,eAAO,EAAE,CAAC;YAC3B,gEAAgE;YAChE,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAgB,EAAC;gBACxC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAQ,CAAC;gBACxC,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE;oBAC1C,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,gBAAgB,CAAC;oBACtE,SAAS,EAAE,KAAK,IAAI,EAAE;wBACpB,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,gCAAgC;YAChC,MAAM,IAAA,aAAK,EAAC,IAAI,CAAC,CAAC;YAClB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,QAAS,CAAE,CAAC;YAEvD,SAAE,CAAC,GAAG,EAAE,CAAC;YACT,SAAE,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,8BAA8B,CAAC,CAAC;YAE5C,OAAO;gBACL,GAAG,EAAE,KAAK,CAAC,GAAG;aACf,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;;AAnDe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,uBAAuB,CAAC;AACtC,UAAK,GAAG;IACtB,GAAG,kBAAW,CAAC,KAAK;IACpB,UAAU,EAAE,YAAK,CAAC,MAAM,CAAC;QACvB,WAAW,EAAE,iBAAiB;KAC/B,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACnB,WAAW,EAAE,mBAAmB;KACjC,CAAC;CACH,CAAC;kBAXiB,IAAI"}

package/dist/src/commands/space/list.d.ts

@@ -6,14 +6,22 @@ export default class List extends BaseCommand<typeof List> {
     static flags: {
         live: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
+        columns: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        csv: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         extended: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        filter: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'no-header': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'no-truncate': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        sort: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         config: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         target: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        agent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'no-agent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'no-wait': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'json-log': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'json-logfile': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     };

package/dist/src/commands/space/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/list.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAkB;IAC7C,OAAgB,KAAK;;;;;;;;;;;;;MAWnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAkBnB,gBAAgB,CAAC,MAAM,EAAE,MAAM;CAkDtC"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/list.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAkB;IAC7C,OAAgB,KAAK;;;;;;;;;;;;;;;;;;;;;MAWnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAkBnB,gBAAgB,CAAC,MAAM,EAAE,MAAM;CAkDtC"}

package/dist/src/commands/space/list.js

@@ -5,18 +5,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const async_1 = require("@dxos/async");
-const cli_base_1 = require("@dxos/cli-base");
 const context_1 = require("@dxos/context");
 const base_1 = require("../../base");
+const util_1 = require("../../util");
 class List extends base_1.BaseCommand {
     async run() {
-        return await this.execWithClient(async ({ client }) => {
+        return await this.execWithClient(async (client) => {
             const spaces = await this.getSpaces(client, { wait: true });
             if (this.flags.json) {
-                return (0, cli_base_1.mapSpaces)(spaces);
+                return (0, util_1.mapSpaces)(spaces);
             }
             else {
-                (0, cli_base_1.printSpaces)(spaces, this.flags);
+                (0, util_1.printSpaces)(spaces, this.flags);
                 if (this.flags.live) {
                     // TODO(burdon): Use https://www.npmjs.com/package/ansi-escapes to reset screen.
                     console.clear();
@@ -33,7 +33,7 @@ class List extends base_1.BaseCommand {
         const update = new async_1.Event();
         update.debounce(1000).on(ctx, async () => {
             console.clear();
-            (0, cli_base_1.printSpaces)(spaces, this.flags);
+            (0, util_1.printSpaces)(spaces, this.flags);
         });
         const subscribeToSpaceUpdate = (space) => {
             const sub1 = space.pipeline.subscribe({
@@ -74,7 +74,7 @@ List.enableJsonFlag = true;
 List.description = 'List spaces.';
 List.flags = {
     ...base_1.BaseCommand.flags,
-    ...cli_base_1.TABLE_FLAGS,
+    ...core_1.ux.table.flags(),
     live: core_1.Flags.boolean({
         description: 'Live update.',
     }),

package/dist/src/commands/space/list.js.map

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