@dxos/cli 0.5.8-next.4b7fabd → 0.5.9-main.079a532

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

@@ -10,28 +10,29 @@ 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 services_1 = require("@dxos/protocols/proto/dxos/client/services");
 const base_1 = require("../../base");
-const util_1 = require("../../util");
 class Share 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);
-            // TODO(burdon): Timeout error not propagated.
-            const authMethod = this.flags['no-auth'] ? services_1.Invitation.AuthMethod.NONE : undefined;
+            const authMethod = this.flags.auth ? services_1.Invitation.AuthMethod.SHARED_SECRET : services_1.Invitation.AuthMethod.NONE;
             const observable = space.share({
                 authMethod,
-                multiUse: this.flags.multiple,
                 timeout: this.flags.timeout,
                 persistent: this.flags.persistent,
                 lifetime: this.flags.lifetime,
+                multiUse: this.flags.multiple,
             });
-            const invitationSuccess = (0, util_1.hostInvitation)({
+            core_1.ux.action.start('Waiting for peer to connect');
+            await (0, cli_base_1.hostInvitation)({
                 observable,
                 callbacks: {
                     onConnecting: async () => {
+                        core_1.ux.action.stop();
                         const invitation = observable.get();
                         const invitationCode = invitations_1.InvitationEncoder.encode(invitation);
                         if (authMethod !== services_1.Invitation.AuthMethod.NONE) {
@@ -41,8 +42,6 @@ class Share extends base_1.BaseCommand {
                         if (this.flags.open) {
                             const url = new URL(this.flags.host);
                             url.searchParams.append('spaceInvitationCode', invitations_1.InvitationEncoder.encode(invitation));
-                            // TODO: remove after the demo
-                            url.searchParams.append('migrateSpace', 'true');
                             (0, node_child_process_1.spawn)('open', [url.toString()]);
                         }
                         else {
@@ -50,23 +49,13 @@ class Share extends base_1.BaseCommand {
                         }
                     },
                 },
-                waitForSuccess: false,
             });
-            if (!this.flags['no-wait']) {
-                // TODO(burdon): Display joined peer?
-                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;
-            }
+            core_1.ux.stdout((0, chalk_1.default) `{green OK}`);
         });
     }
 }
 Share.description = 'Create space invitation.';
-Share.args = base_1.ARG_SPACE_KEYS;
+Share.args = cli_base_1.ARG_SPACE_KEYS;
 Share.flags = {
     ...base_1.BaseCommand.flags,
     multiple: core_1.Flags.boolean({
@@ -87,11 +76,10 @@ Share.flags = {
         description: 'Application Host URL.',
         default: 'https://composer.space',
     }),
-    'no-auth': core_1.Flags.boolean({
+    auth: core_1.Flags.boolean({
         description: 'Skip authentication challenge.',
-    }),
-    'no-wait': core_1.Flags.boolean({
-        description: "Don't wait for a peer to connect before exiting CLI",
+        default: true,
+        allowNo: true,
     }),
 };
 exports.default = Share;

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

@@ -1 +1 @@
-{"version":3,"file":"share.js","sourceRoot":"","sources":["../../../../src/commands/space/share.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"share.js","sourceRoot":"","sources":["../../../../src/commands/space/share.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAC1B,qDAAgD;AAChD,2DAA2C;AAE3C,6CAAgE;AAChE,0DAA6D;AAC7D,yEAAwE;AAExE,qCAAyC;AAEzC,MAAqB,KAAM,SAAQ,kBAAyB;IA8B1D,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,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAU,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,qBAAU,CAAC,UAAU,CAAC,IAAI,CAAC;YACtG,MAAM,UAAU,GAAG,KAAM,CAAC,KAAK,CAAC;gBAC9B,UAAU;gBACV,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;gBAC3B,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU;gBACjC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAC7B,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;aAC9B,CAAC,CAAC;YAEH,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,IAAA,yBAAc,EAAC;gBACnB,UAAU;gBACV,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE;wBACvB,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;wBACjB,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;wBACpC,MAAM,cAAc,GAAG,+BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;wBAC5D,IAAI,UAAU,KAAK,qBAAU,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;4BAC9C,IAAA,uBAAI,EAAC,UAAU,CAAC,QAAS,CAAC,CAAC;4BAC3B,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,mBAAmB,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,0BAA0B,CAAC,CAAC;wBACxF,CAAC;wBAED,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;4BACpB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;4BACrC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,qBAAqB,EAAE,+BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;4BACrF,IAAA,0BAAK,EAAC,MAAM,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;wBAClC,CAAC;6BAAM,CAAC;4BACN,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,wBAAwB,cAAc,EAAE,CAAC,CAAC;wBAC1D,CAAC;oBACH,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,YAAY,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;;AApEe,iBAAW,GAAG,0BAA0B,CAAC;AACzC,UAAI,GAAG,yBAAc,CAAC;AACtB,WAAK,GAAG;IACtB,GAAG,kBAAW,CAAC,KAAK;IACpB,QAAQ,EAAE,YAAK,CAAC,OAAO,CAAC;QACtB,WAAW,EAAE,eAAe;KAC7B,CAAC;IACF,QAAQ,EAAE,YAAK,CAAC,OAAO,CAAC;QACtB,WAAW,EAAE,uCAAuC;QACpD,OAAO,EAAE,KAAK;KACf,CAAC;IACF,UAAU,EAAE,YAAK,CAAC,OAAO,CAAC;QACxB,WAAW,EAAE,6CAA6C;QAC1D,OAAO,EAAE,IAAI;KACd,CAAC;IACF,IAAI,EAAE,YAAK,CAAC,OAAO,CAAC;QAClB,WAAW,EAAE,+BAA+B;KAC7C,CAAC;IACF,IAAI,EAAE,YAAK,CAAC,MAAM,CAAC;QACjB,WAAW,EAAE,uBAAuB;QACpC,OAAO,EAAE,wBAAwB;KAClC,CAAC;IACF,IAAI,EAAE,YAAK,CAAC,OAAO,CAAC;QAClB,WAAW,EAAE,gCAAgC;QAC7C,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,IAAI;KACd,CAAC;CACH,CAAC;kBA5BiB,KAAK"}

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

@@ -5,15 +5,15 @@ import { BaseCommand } from '../../base';
 export default class Tunnel extends BaseCommand<typeof Tunnel> {
     static flags: {
         name: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        extended: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'dry-run': 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>;
-        '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>;
+        target: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        agent: 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/tunnel/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tunnel/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAU5D,OAAgB,KAAK;;;;;;;;;;;;;MAQnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAS1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tunnel/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAU5D,OAAgB,KAAK;;;;;;;;;;;;;MASnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAS1B"}

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

@@ -5,6 +5,7 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
+const cli_base_1 = require("@dxos/cli-base");
 const invariant_1 = require("@dxos/invariant");
 const keys_1 = require("@dxos/keys");
 const util_1 = require("@dxos/util");
@@ -35,6 +36,7 @@ _a = Tunnel;
 })();
 Tunnel.flags = {
     ...base_1.BaseCommand.flags,
+    ...cli_base_1.TABLE_FLAGS,
     name: core_1.Flags.string({
         description: 'Tunnel name',
         async default() {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/tunnel/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAA0C;AAE1C,+CAA4C;AAC5C,qCAAuC;AACvC,qCAAsC;AAEtC,qCAAyC;AACzC,qCAA8D;AAE9D;;GAEG;AACH,MAAqB,MAAO,SAAQ,kBAA0B;IAoB5D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAqB,EAAE,EAAE;YAClE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC,CAAC;YACjF,IAAA,qBAAS,EAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;YAC7C,IAAA,mBAAY,EAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC;;;AA3BD;IACE,GAAK,KAAK,GAAG,YAAY,CAAC;IAC1B,GAAK,cAAc,GAAG,IAAI,CAAC;IAC3B,GAAK,WAAW,GAAG,wCAAwC,CAAC;IAC5D,GAAK,IAAI,GAAG;QACV,OAAO,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;KAC3F,CAAC;AACJ,CAAC,GAAA,CAAA;AAEe,YAAK,GAAG;IACtB,GAAG,kBAAW,CAAC,KAAK;IACpB,IAAI,EAAE,YAAK,CAAC,MAAM,CAAC;QACjB,WAAW,EAAE,aAAa;QAC1B,KAAK,CAAC,OAAO;YACX,OAAO,IAAA,eAAQ,EAAC,gBAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACtC,CAAC;KACF,CAAC;CACH,AARoB,CAQnB;kBAlBiB,MAAM"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/tunnel/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAA0C;AAE1C,6CAA6C;AAC7C,+CAA4C;AAC5C,qCAAuC;AACvC,qCAAsC;AAEtC,qCAAyC;AACzC,qCAA8D;AAE9D;;GAEG;AACH,MAAqB,MAAO,SAAQ,kBAA0B;IAqB5D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAqB,EAAE,EAAE;YAClE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC,CAAC;YACjF,IAAA,qBAAS,EAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;YAC7C,IAAA,mBAAY,EAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC;;;AA5BD;IACE,GAAK,KAAK,GAAG,YAAY,CAAC;IAC1B,GAAK,cAAc,GAAG,IAAI,CAAC;IAC3B,GAAK,WAAW,GAAG,wCAAwC,CAAC;IAC5D,GAAK,IAAI,GAAG;QACV,OAAO,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;KAC3F,CAAC;AACJ,CAAC,GAAA,CAAA;AAEe,YAAK,GAAG;IACtB,GAAG,kBAAW,CAAC,KAAK;IACpB,GAAG,sBAAW;IACd,IAAI,EAAE,YAAK,CAAC,MAAM,CAAC;QACjB,WAAW,EAAE,aAAa;QAC1B,KAAK,CAAC,OAAO;YACX,OAAO,IAAA,eAAQ,EAAC,gBAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACtC,CAAC;KACF,CAAC;CACH,AAToB,CASnB;kBAnBiB,MAAM"}

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

@@ -3,6 +3,19 @@ import { BaseCommand } from '../../base';
  * @deprecated
  */
 export default class List extends BaseCommand<typeof List> {
+    static flags: {
+        extended: 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>;
+        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>;
+        'json-log': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'json-logfile': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+    };
     run(): Promise<any>;
 }
 //# sourceMappingURL=list.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/tunnel/list.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IAOlD,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAQ1B"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/tunnel/list.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IAOxD,OAAgB,KAAK;;;;;;;;;;;;MAGnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAQ1B"}

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

@@ -4,6 +4,7 @@
 //
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
+const cli_base_1 = require("@dxos/cli-base");
 const base_1 = require("../../base");
 const util_1 = require("../../util");
 /**
@@ -25,5 +26,9 @@ _a = List;
     _a.enableJsonFlag = true;
     _a.description = 'List tunnels.';
 })();
+List.flags = {
+    ...base_1.BaseCommand.flags,
+    ...cli_base_1.TABLE_FLAGS,
+};
 exports.default = List;
 //# sourceMappingURL=list.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/tunnel/list.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,qCAAyC;AACzC,qCAA8D;AAE9D;;GAEG;AACH,MAAqB,IAAK,SAAQ,kBAAwB;IAOxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAqB,EAAE,EAAE;YAClE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAChD,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,IAAA,mBAAY,EAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;;AAdC;IACE,GAAK,KAAK,GAAG,YAAY,CAAC;IAC1B,GAAK,cAAc,GAAG,IAAI,CAAC;IAC3B,GAAK,WAAW,GAAG,eAAe,CAAC;AACrC,CAAC,GAAA,CAAA;kBALkB,IAAI"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/tunnel/list.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,6CAA6C;AAE7C,qCAAyC;AACzC,qCAA8D;AAE9D;;GAEG;AACH,MAAqB,IAAK,SAAQ,kBAAwB;IAYxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAqB,EAAE,EAAE;YAClE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAChD,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,IAAA,mBAAY,EAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;;AAlBD;IACE,GAAK,KAAK,GAAG,YAAY,CAAC;IAC1B,GAAK,cAAc,GAAG,IAAI,CAAC;IAC3B,GAAK,WAAW,GAAG,eAAe,CAAC;AACrC,CAAC,GAAA,CAAA;AAEe,UAAK,GAAG;IACtB,GAAG,kBAAW,CAAC,KAAK;IACpB,GAAG,sBAAW;CACf,AAHoB,CAGnB;kBAViB,IAAI"}

package/dist/src/components/SpaceTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SpaceTable.d.ts","sourceRoot":"","sources":["../../../src/components/SpaceTable.tsx"],"names":[],"mappings":"AAKA,OAAc,EAAa,KAAK,EAAE,EAAY,MAAM,OAAO,CAAC;AAE5D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,EAAE,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAwBhE,CAAC"}
+{"version":3,"file":"SpaceTable.d.ts","sourceRoot":"","sources":["../../../src/components/SpaceTable.tsx"],"names":[],"mappings":"AAKA,OAAc,EAAa,KAAK,EAAE,EAAY,MAAM,OAAO,CAAC;AAG5D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,EAAE,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAwBhE,CAAC"}

package/dist/src/components/SpaceTable.js

@@ -32,7 +32,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpaceTable = void 0;
 const ink_table_1 = __importDefault(require("ink-table"));
 const react_1 = __importStar(require("react"));
-const util_1 = require("../util");
+const cli_base_1 = require("@dxos/cli-base");
 /**
  * Spaces list table.
  */
@@ -44,7 +44,7 @@ const SpaceTable = ({ client, interval = 1000 }) => {
     }, [client, interval]);
     const handleRefresh = () => {
         const spaces = client.spaces.get();
-        const data = (0, util_1.mapSpaces)(spaces, { truncateKeys: true });
+        const data = (0, cli_base_1.mapSpaces)(spaces, { truncateKeys: true });
         setData(data.map(({ key, open, objects }) => ({
             key,
             open,

package/dist/src/components/SpaceTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpaceTable.js","sourceRoot":"","sources":["../../../src/components/SpaceTable.tsx"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,0DAA8B;AAC9B,+CAA4D;AAI5D,kCAAoC;AAEpC;;GAEG;AACI,MAAM,UAAU,GAA8C,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE,EAAE;IACnG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAoB,EAAE,CAAC,CAAC;IACxD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1E,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEvB,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,IAAA,gBAAS,EAAC,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,OAAO,CACL,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YACpC,GAAG;YACH,IAAI;YACJ,OAAO;SACR,CAAC,CAAC,CACJ,CAAC;IACJ,CAAC,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,8BAAC,mBAAK,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;AAC/B,CAAC,CAAC;AAxBW,QAAA,UAAU,cAwBrB"}
+{"version":3,"file":"SpaceTable.js","sourceRoot":"","sources":["../../../src/components/SpaceTable.tsx"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,0DAA8B;AAC9B,+CAA4D;AAE5D,6CAA2C;AAG3C;;GAEG;AACI,MAAM,UAAU,GAA8C,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE,EAAE;IACnG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAoB,EAAE,CAAC,CAAC;IACxD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1E,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEvB,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,IAAA,oBAAS,EAAC,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,OAAO,CACL,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YACpC,GAAG;YACH,IAAI;YACJ,OAAO;SACR,CAAC,CAAC,CACJ,CAAC;IACJ,CAAC,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,8BAAC,mBAAK,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;AAC/B,CAAC,CAAC;AAxBW,QAAA,UAAU,cAwBrB"}

package/dist/src/index.d.ts

@@ -1,2 +1,3 @@
 export { run } from '@oclif/core';
+export * from './base';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,cAAc,QAAQ,CAAC"}

package/dist/src/index.js

@@ -2,8 +2,23 @@
 //
 // Copyright 2022 DXOS.org
 //
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 var core_1 = require("@oclif/core");
 Object.defineProperty(exports, "run", { enumerable: true, get: function () { return core_1.run; } });
+__exportStar(require("./base"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,oCAAkC;AAAzB,2FAAA,GAAG,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;AAEF,oCAAkC;AAAzB,2FAAA,GAAG,OAAA;AAEZ,yCAAuB"}

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

@@ -1,12 +1,5 @@
-export * from './agents';
-export * from './credentials';
-export * from './devices';
-export * from './invitations';
-export * from './json';
-export * from './keys';
+export * from './provider';
 export * from './publish';
-export * from './spaces';
 export * from './supervisor';
-export * from './testing';
 export * from './tunnel';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AAIA,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC"}

package/dist/src/util/index.js

@@ -17,15 +17,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./agents"), exports);
-__exportStar(require("./credentials"), exports);
-__exportStar(require("./devices"), exports);
-__exportStar(require("./invitations"), exports);
-__exportStar(require("./json"), exports);
-__exportStar(require("./keys"), exports);
+__exportStar(require("./provider"), exports);
 __exportStar(require("./publish"), exports);
-__exportStar(require("./spaces"), exports);
 __exportStar(require("./supervisor"), exports);
-__exportStar(require("./testing"), exports);
 __exportStar(require("./tunnel"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,2CAAyB;AACzB,gDAA8B;AAC9B,4CAA0B;AAC1B,gDAA8B;AAC9B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,2CAAyB;AACzB,+CAA6B;AAC7B,4CAA0B;AAC1B,2CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,6CAA2B;AAC3B,4CAA0B;AAC1B,+CAA6B;AAC7B,2CAAyB"}

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

@@ -1,3 +1,3 @@
-export * from './provider';
 export * from './digital-ocean';
+export * from './provider';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/util/provider/index.ts"],"names":[],"mappings":"AAIA,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/util/provider/index.ts"],"names":[],"mappings":"AAIA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC"}

package/dist/src/util/provider/index.js

@@ -17,6 +17,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./provider"), exports);
 __exportStar(require("./digital-ocean"), exports);
+__exportStar(require("./provider"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/util/provider/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,6CAA2B;AAC3B,kDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/util/provider/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,kDAAgC;AAChC,6CAA2B"}

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

@@ -1,3 +1,4 @@
+import { type TableFlags } from '@dxos/cli-base';
 export declare const KUBE_TAG = "kube";
 export declare const DEFAULT_PROVIDER = "digitalocean";
 export interface KubeDeployOptions {
@@ -22,5 +23,5 @@ export declare const mapKubes: (kubes: KUBE[]) => {
     key: string;
     ipAddress: string;
 }[];
-export declare const printKubes: (kubes: KUBE[], flags?: {}) => void;
+export declare const printKubes: (kubes: KUBE[], flags?: TableFlags) => void;
 //# sourceMappingURL=provider.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../../src/util/provider/provider.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,IAAI,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,eAAO,MAAM,QAAQ,UAAW,IAAI,EAAE;;;GAKrC,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,IAAI,EAAE,qBAevC,CAAC"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../../src/util/provider/provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAS,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAExD,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,IAAI,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,eAAO,MAAM,QAAQ,UAAW,IAAI,EAAE;;;GAKrC,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,IAAI,EAAE,UAAS,UAAU,SAe1D,CAAC"}

package/dist/src/util/provider/provider.js

@@ -5,6 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printKubes = exports.mapKubes = exports.DEFAULT_PROVIDER = exports.KUBE_TAG = void 0;
 const core_1 = require("@oclif/core");
+const cli_base_1 = require("@dxos/cli-base");
 exports.KUBE_TAG = 'kube';
 exports.DEFAULT_PROVIDER = 'digitalocean';
 const mapKubes = (kubes) => {
@@ -15,16 +16,14 @@ const mapKubes = (kubes) => {
 };
 exports.mapKubes = mapKubes;
 const printKubes = (kubes, flags = {}) => {
-    core_1.ux.table((0, exports.mapKubes)(kubes), {
+    core_1.ux.stdout((0, cli_base_1.table)((0, exports.mapKubes)(kubes), {
         key: {
             header: 'hostname',
         },
         ipAddress: {
             header: 'ip address',
         },
-    }, {
-        ...flags,
-    });
+    }, flags));
 };
 exports.printKubes = printKubes;
 //# sourceMappingURL=provider.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../src/util/provider/provider.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAAiC;AAEpB,QAAA,QAAQ,GAAG,MAAM,CAAC;AAElB,QAAA,gBAAgB,GAAG,cAAc,CAAC;AAuBxC,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,EAAE;IACxC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1B,GAAG,EAAE,IAAI,CAAC,QAAQ;QAClB,SAAS,EAAE,IAAI,CAAC,SAAS;KAC1B,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AALW,QAAA,QAAQ,YAKnB;AAEK,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE;IACtD,SAAE,CAAC,KAAK,CACN,IAAA,gBAAQ,EAAC,KAAK,CAAC,EACf;QACE,GAAG,EAAE;YACH,MAAM,EAAE,UAAU;SACnB;QACD,SAAS,EAAE;YACT,MAAM,EAAE,YAAY;SACrB;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,UAAU,cAerB"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../src/util/provider/provider.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAAiC;AAEjC,6CAAwD;AAE3C,QAAA,QAAQ,GAAG,MAAM,CAAC;AAElB,QAAA,gBAAgB,GAAG,cAAc,CAAC;AAuBxC,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,EAAE;IACxC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1B,GAAG,EAAE,IAAI,CAAC,QAAQ;QAClB,SAAS,EAAE,IAAI,CAAC,SAAS;KAC1B,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AALW,QAAA,QAAQ,YAKnB;AAEK,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,QAAoB,EAAE,EAAE,EAAE;IAClE,SAAE,CAAC,MAAM,CACP,IAAA,gBAAK,EACH,IAAA,gBAAQ,EAAC,KAAK,CAAC,EACf;QACE,GAAG,EAAE;YACH,MAAM,EAAE,UAAU;SACnB;QACD,SAAS,EAAE;YACT,MAAM,EAAE,YAAY;SACrB;KACF,EACD,KAAK,CACN,CACF,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,UAAU,cAerB"}

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

@@ -1,3 +1,4 @@
+import { type TableOptions } from '@dxos/cli-base';
 import type { ConfigProto } from '@dxos/config';
 export type PackageModule = NonNullable<NonNullable<ConfigProto['package']>['modules']>[0];
 export type PackageRepo = NonNullable<NonNullable<ConfigProto['package']>['repos']>[0];
@@ -6,5 +7,5 @@ export declare const mapModules: (modules: PackageModule[]) => Promise<{
     key: string | undefined;
     bundle: string;
 }[]>;
-export declare const printModules: (modules: PackageModule[], flags?: {}) => Promise<void>;
+export declare const printModules: (modules: PackageModule[], flags?: TableOptions) => Promise<void>;
 //# sourceMappingURL=common.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3F,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvF,MAAM,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAE/D,eAAO,MAAM,UAAU,YAAmB,aAAa,EAAE;;;IAMxD,CAAC;AAEF,eAAO,MAAM,YAAY,YAAmB,aAAa,EAAE,8BAe1D,CAAC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":"AAMA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3F,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvF,MAAM,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAE/D,eAAO,MAAM,UAAU,YAAmB,aAAa,EAAE;;;IAMxD,CAAC;AAEF,eAAO,MAAM,YAAY,YAAmB,aAAa,EAAE,UAAS,YAAY,kBAe/E,CAAC"}

package/dist/src/util/publish/common.js

@@ -28,6 +28,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printModules = exports.mapModules = void 0;
 const core_1 = require("@oclif/core");
+const cli_base_1 = require("@dxos/cli-base");
 const mapModules = async (modules) => {
     const { CID } = await Promise.resolve().then(() => __importStar(require('kubo-rpc-client')));
     return modules.map((mod) => ({
@@ -37,16 +38,14 @@ const mapModules = async (modules) => {
 };
 exports.mapModules = mapModules;
 const printModules = async (modules, flags = {}) => {
-    core_1.ux.table(await (0, exports.mapModules)(modules), {
+    core_1.ux.stdout((0, cli_base_1.table)(await (0, exports.mapModules)(modules), {
         key: {
             header: 'name',
         },
         bundle: {
             header: 'bundle',
         },
-    }, {
-        ...flags,
-    });
+    }, flags));
 };
 exports.printModules = printModules;
 //# sourceMappingURL=common.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,sCAAiC;AAS1B,MAAM,UAAU,GAAG,KAAK,EAAE,OAAwB,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,EAAE,GAAG,wDAAa,iBAAiB,GAAC,CAAC;IAChD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,EAAE,GAAG,CAAC,IAAI;QACb,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAO,CAAC,CAAC,QAAQ,EAAE;KAC3C,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,YAAY,GAAG,KAAK,EAAE,OAAwB,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE;IACzE,SAAE,CAAC,KAAK,CACN,MAAM,IAAA,kBAAU,EAAC,OAAO,CAAC,EACzB;QACE,GAAG,EAAE;YACH,MAAM,EAAE,MAAM;SACf;QACD,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;SACjB;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,YAAY,gBAevB"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,sCAAiC;AAEjC,6CAA0D;AAQnD,MAAM,UAAU,GAAG,KAAK,EAAE,OAAwB,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,EAAE,GAAG,wDAAa,iBAAiB,GAAC,CAAC;IAChD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,EAAE,GAAG,CAAC,IAAI;QACb,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAO,CAAC,CAAC,QAAQ,EAAE;KAC3C,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,YAAY,GAAG,KAAK,EAAE,OAAwB,EAAE,QAAsB,EAAE,EAAE,EAAE;IACvF,SAAE,CAAC,MAAM,CACP,IAAA,gBAAK,EACH,MAAM,IAAA,kBAAU,EAAC,OAAO,CAAC,EACzB;QACE,GAAG,EAAE;YACH,MAAM,EAAE,MAAM;SACf;QACD,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;SACjB;KACF,EACD,KAAK,CACN,CACF,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,YAAY,gBAevB"}

package/dist/src/util/publish/ipfs-upload.d.ts

@@ -3,7 +3,6 @@ interface UploadOptions {
     progress?: (bytes: number, path?: string) => void;
     pin?: boolean;
 }
-export declare const importESM: Function;
 export declare const uploadToIPFS: (ipfsClient: KuboRPCClient, path: string, options?: UploadOptions) => Promise<CID>;
 export {};
 //# sourceMappingURL=ipfs-upload.d.ts.map

package/dist/src/util/publish/ipfs-upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ipfs-upload.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG/D,UAAU,aAAa;IACrB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAGD,eAAO,MAAM,SAAS,UAA0D,CAAC;AAEjF,eAAO,MAAM,YAAY,eAAsB,aAAa,QAAQ,MAAM,YAAY,aAAa,KAAG,QAAQ,GAAG,CA2ChH,CAAC"}
+{"version":3,"file":"ipfs-upload.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAK/D,UAAU,aAAa;IACrB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAGD,eAAO,MAAM,YAAY,eAAsB,aAAa,QAAQ,MAAM,YAAY,aAAa,KAAG,QAAQ,GAAG,CA2ChH,CAAC"}

package/dist/src/util/publish/ipfs-upload.js

@@ -6,13 +6,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadToIPFS = exports.importESM = void 0;
+exports.uploadToIPFS = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
-// eslint-disable-next-line no-new-func
-exports.importESM = new Function('modulePath', 'return import(modulePath)');
+const cli_base_1 = require("@dxos/cli-base");
+// TODO(burdon): Generalize.
 const uploadToIPFS = async (ipfsClient, path, options) => {
-    const { globSource } = await (0, exports.importESM)('kubo-rpc-client');
+    const { globSource } = await (0, cli_base_1.importESM)('kubo-rpc-client');
     if (!fs_1.default.existsSync(path)) {
         throw new Error(`File or directory does not exist: ${path}}`);
     }

package/dist/src/util/publish/ipfs-upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"ipfs-upload.js","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,4CAAoB;AAEpB,+BAA4B;AAO5B,uCAAuC;AAC1B,QAAA,SAAS,GAAG,IAAI,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC,CAAC;AAE1E,MAAM,YAAY,GAAG,KAAK,EAAE,UAAyB,EAAE,IAAY,EAAE,OAAuB,EAAgB,EAAE;IACnH,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,iBAAS,EAAC,iBAAiB,CAAC,CAAC;IAC1D,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAI,GAAG,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,EAAE,GAAG,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAC/C,IAAI,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YACnE,QAAQ;YACR,GAAG;YACH,iBAAiB,EAAE,IAAI;SACxB,CAAC,EAAE,CAAC;YACH,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,YAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC1C,MAAM,YAAY,GAAG,EAAE,CAAC;gBACxB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACnD,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC3B,CAAC;gBAED,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAClD,MAAM,YAAY,GAAG,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAC/C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;oBACxC,MAAM,IAAI,KAAK,CAAC,uBAAuB,EAAE;wBACvC,KAAK,EAAE;4BACL,IAAI,EAAE,QAAQ;4BACd,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;4BACxB,SAAS,EAAE,YAAY,CAAC,MAAM;4BAC9B,UAAU,EAAE,aAAa,CAAC,MAAM;yBACjC;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,kCAAkC;IACxE,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACzD,OAAO,SAAS,CAAC,GAAG,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AA3CW,QAAA,YAAY,gBA2CvB"}
+{"version":3,"file":"ipfs-upload.js","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,4CAAoB;AAEpB,+BAA4B;AAE5B,6CAA2C;AAO3C,4BAA4B;AACrB,MAAM,YAAY,GAAG,KAAK,EAAE,UAAyB,EAAE,IAAY,EAAE,OAAuB,EAAgB,EAAE;IACnH,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,oBAAS,EAAC,iBAAiB,CAAC,CAAC;IAC1D,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAI,GAAG,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,EAAE,GAAG,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAC/C,IAAI,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YACnE,QAAQ;YACR,GAAG;YACH,iBAAiB,EAAE,IAAI;SACxB,CAAC,EAAE,CAAC;YACH,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,YAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC1C,MAAM,YAAY,GAAG,EAAE,CAAC;gBACxB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACnD,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC3B,CAAC;gBAED,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAClD,MAAM,YAAY,GAAG,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAC/C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;oBACxC,MAAM,IAAI,KAAK,CAAC,uBAAuB,EAAE;wBACvC,KAAK,EAAE;4BACL,IAAI,EAAE,QAAQ;4BACd,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;4BACxB,SAAS,EAAE,YAAY,CAAC,MAAM;4BAC9B,UAAU,EAAE,aAAa,CAAC,MAAM;yBACjC;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,kCAAkC;IACxE,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACzD,OAAO,SAAS,CAAC,GAAG,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AA3CW,QAAA,YAAY,gBA2CvB"}

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

@@ -10,6 +10,5 @@ interface PublishOptions {
     pin?: boolean;
 }
 export declare const publish: ({ verbose, timeout, path, pin, log, config, module }: PublishOptions) => Promise<any>;
-export declare const createIpfsClient: (config: Config, timeout?: string | number) => Promise<any>;
 export {};
 //# sourceMappingURL=publish.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAa3D,UAAU,cAAc;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,OAAO,yDAAgE,cAAc,KAAG,QAAQ,GAAG,CAiC/G,CAAC;AAGF,eAAO,MAAM,gBAAgB,WAAkB,MAAM,YAAY,MAAM,GAAG,MAAM,iBA2B/E,CAAC"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAa3D,UAAU,cAAc;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,OAAO,yDAAgE,cAAc,KAAG,QAAQ,GAAG,CAiC/G,CAAC"}

package/dist/src/util/publish/publish.js

@@ -6,16 +6,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createIpfsClient = exports.publish = void 0;
+exports.publish = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const cli_progress_1 = __importDefault(require("cli-progress"));
 const fs_1 = __importDefault(require("fs"));
 const get_folder_size_1 = __importDefault(require("get-folder-size"));
-// import { type CID } from 'kubo-rpc-client';
 const path_1 = require("path");
 const util_1 = require("util");
+const cli_base_1 = require("@dxos/cli-base");
 const invariant_1 = require("@dxos/invariant");
-const log_1 = require("@dxos/log");
 const ipfs_upload_1 = require("./ipfs-upload");
 const DEFAULT_OUTDIR = 'out';
 const getFolderSize = (0, util_1.promisify)(get_folder_size_1.default);
@@ -27,7 +26,7 @@ const encodeName = (name) => name.replaceAll(':', '/');
 const publish = async ({ verbose, timeout, path, pin, log, config, module }) => {
     var _a, _b;
     (0, invariant_1.invariant)(module.name, 'Module name is required to publish.');
-    log(`Publishing module ${chalk_1.default.bold(module.name)} ...`, {}, { file: "packages/devtools/cli/src/util/publish/publish.ts", line: 42, 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) });
+    log(`Publishing module ${chalk_1.default.bold(module.name)} ...`);
     const moduleOut = `out/${encodeName(module.name)}`;
     const outdir = (_b = path !== null && path !== void 0 ? path : (_a = module.build) === null || _a === void 0 ? void 0 : _a.outdir) !== null && _b !== void 0 ? _b : (fs_1.default.existsSync(moduleOut) ? moduleOut : DEFAULT_OUTDIR);
     const publishFolder = (0, path_1.join)(process.cwd(), outdir);
@@ -39,8 +38,8 @@ const publish = async ({ verbose, timeout, path, pin, log, config, module }) =>
     verbose && progress.start(total, 0);
     let cid;
     try {
-        const ipfsClient = await (0, exports.createIpfsClient)(config, timeout);
-        log('Uploading...', { folder: publishFolder, server: ipfsClient.getEndpointConfig().host }, { file: "packages/devtools/cli/src/util/publish/publish.ts", line: 57, 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) });
+        const ipfsClient = await (0, cli_base_1.createIpfsClient)(config, timeout);
+        log('Uploading...', { folder: publishFolder, server: ipfsClient.getEndpointConfig().host });
         cid = await (0, ipfs_upload_1.uploadToIPFS)(ipfsClient, publishFolder, {
             progress: verbose ? (bytes) => progress.update(bytes) : undefined,
             pin,
@@ -53,37 +52,8 @@ const publish = async ({ verbose, timeout, path, pin, log, config, module }) =>
     }
     verbose && progress.update(total);
     verbose && progress.stop();
-    log(`Published module ${chalk_1.default.bold(module.name)}. IPFS cid: ${cid.toString()}`, {}, { file: "packages/devtools/cli/src/util/publish/publish.ts", line: 71, 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) });
+    log(`Published module ${chalk_1.default.bold(module.name)}. IPFS cid: ${cid.toString()}`);
     return cid;
 };
 exports.publish = publish;
-// TODO(nf): make CLI support dx-env.yml
-const createIpfsClient = async (config, timeout) => {
-    var _a;
-    const { create } = await (0, ipfs_upload_1.importESM)('kubo-rpc-client');
-    const serverAuthSecret = (_a = process.env.IPFS_API_SECRET) !== null && _a !== void 0 ? _a : config === null || config === void 0 ? void 0 : config.get('runtime.services.ipfs.serverAuthSecret');
-    let authorizationHeader;
-    if (serverAuthSecret) {
-        const splitSecret = serverAuthSecret.split(':');
-        switch (splitSecret[0]) {
-            case 'basic':
-                authorizationHeader = 'Basic ' + Buffer.from(splitSecret[1] + ':' + splitSecret[2]).toString('base64');
-                break;
-            case 'bearer':
-                authorizationHeader = 'Bearer ' + splitSecret[1];
-                break;
-            default:
-                throw new Error(`Unsupported authType: ${splitSecret[0]}`);
-        }
-    }
-    const server = config === null || config === void 0 ? void 0 : config.get('runtime.services.ipfs.server');
-    (0, invariant_1.invariant)(server, 'Missing IPFS Server.');
-    (0, log_1.log)('connecting to IPFS server', { server }, { file: "packages/devtools/cli/src/util/publish/publish.ts", line: 97, 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) });
-    return create({
-        url: server,
-        timeout: timeout || '1m',
-        ...(authorizationHeader ? { headers: { authorization: authorizationHeader } } : {}),
-    });
-};
-exports.createIpfsClient = createIpfsClient;
 //# sourceMappingURL=publish.js.map