@dxos/cli 0.8.2-main.f11618f → 0.8.2-staging.7ac8446

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/dist/src/commands/debug/generate.js +2 -2
  2. package/dist/src/commands/debug/generate.js.map +1 -1
  3. package/dist/src/commands/function/upload.d.ts +2 -7
  4. package/dist/src/commands/function/upload.d.ts.map +1 -1
  5. package/dist/src/commands/function/upload.js +97 -104
  6. package/dist/src/commands/function/upload.js.map +1 -1
  7. package/dist/src/commands/halo/credential/list.d.ts +0 -1
  8. package/dist/src/commands/halo/credential/list.d.ts.map +1 -1
  9. package/dist/src/commands/halo/credential/list.js +16 -25
  10. package/dist/src/commands/halo/credential/list.js.map +1 -1
  11. package/dist/src/commands/space/list.d.ts +0 -1
  12. package/dist/src/commands/space/list.d.ts.map +1 -1
  13. package/dist/src/commands/space/list.js +3 -7
  14. package/dist/src/commands/space/list.js.map +1 -1
  15. package/dist/src/components/SpaceTable.d.ts.map +1 -1
  16. package/dist/src/components/SpaceTable.js +4 -7
  17. package/dist/src/components/SpaceTable.js.map +1 -1
  18. package/dist/src/help.d.ts.map +1 -1
  19. package/dist/src/help.js +1 -6
  20. package/dist/src/help.js.map +1 -1
  21. package/dist/src/util/index.d.ts +0 -1
  22. package/dist/src/util/index.d.ts.map +1 -1
  23. package/dist/src/util/index.js +0 -1
  24. package/dist/src/util/index.js.map +1 -1
  25. package/oclif.manifest.json +334 -472
  26. package/package.json +25 -25
  27. package/dist/src/commands/function/watch.d.ts +0 -29
  28. package/dist/src/commands/function/watch.d.ts.map +0 -1
  29. package/dist/src/commands/function/watch.js +0 -130
  30. package/dist/src/commands/function/watch.js.map +0 -1
  31. package/dist/src/util/function/bundle.d.ts +0 -5
  32. package/dist/src/util/function/bundle.d.ts.map +0 -1
  33. package/dist/src/util/function/bundle.js +0 -13
  34. package/dist/src/util/function/bundle.js.map +0 -1
  35. package/dist/src/util/function/index.d.ts +0 -3
  36. package/dist/src/util/function/index.d.ts.map +0 -1
  37. package/dist/src/util/function/index.js +0 -6
  38. package/dist/src/util/function/index.js.map +0 -1
  39. package/dist/src/util/function/lookup.d.ts +0 -19
  40. package/dist/src/util/function/lookup.d.ts.map +0 -1
  41. package/dist/src/util/function/lookup.js +0 -14
  42. package/dist/src/util/function/lookup.js.map +0 -1
@@ -4,7 +4,7 @@
4
4
  import { Flags } from '@oclif/core';
5
5
  import { sleep } from '@dxos/async';
6
6
  import { ARG_SPACE_KEYS } from '@dxos/cli-base';
7
- import { live } from '@dxos/client/echo';
7
+ import { create } from '@dxos/client/echo';
8
8
  import { faker } from '@dxos/random';
9
9
  import { BaseCommand } from '../../base';
10
10
  // TODO(burdon): Testing plugin (vs. debug)?
@@ -22,7 +22,7 @@ class Generate extends BaseCommand {
22
22
  var _a;
23
23
  const space = await this.getSpace(client, this.args.key);
24
24
  for (let i = 0; i < this.flags.objects; i++) {
25
- space === null || space === void 0 ? void 0 : space.db.add(live({ type, title: faker.lorem.word() }));
25
+ space === null || space === void 0 ? void 0 : space.db.add(create({ type, title: faker.lorem.word() }));
26
26
  await space.db.flush();
27
27
  await pause();
28
28
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/commands/debug/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/commands/debug/generate.ts"],"names":[],"mappings":"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"}
@@ -5,9 +5,9 @@ export default class Upload extends BaseCommand<typeof Upload> {
5
5
  static flags: {
6
6
  name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
7
7
  version: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
8
- composerScript: import("@oclif/core/interfaces").BooleanFlag<boolean>;
9
- functionId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
10
8
  spaceKey: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
9
+ objectId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
10
+ functionId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
11
11
  json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
12
12
  verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
13
13
  'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
@@ -23,11 +23,6 @@ export default class Upload extends BaseCommand<typeof Upload> {
23
23
  file: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
24
24
  };
25
25
  run(): Promise<any>;
26
- private _loadScript;
27
- private _loadFunctionObject;
28
- private _upload;
29
- private _updateFunctionObject;
30
- private _updateComposerScript;
31
26
  private _getNextVersion;
32
27
  }
33
28
  //# sourceMappingURL=upload.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAKzC,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IAEtD,OAAgB,KAAK;;;;;;;;;;;;;;;;MAOnB;IAEF,OAAgB,IAAI;;MAElB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;YAwBX,WAAW;YAgBX,mBAAmB;YAcnB,OAAO;IAsBrB,OAAO,CAAC,qBAAqB;YAgBf,qBAAqB;YA6BrB,eAAe;CAW9B"}
1
+ {"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAIzC,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IAEtD,OAAgB,KAAK;;;;;;;;;;;;;;;;MAUnB;IAEF,OAAgB,IAAI;;MAElB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;YA+GX,eAAe;CAW9B"}
@@ -3,117 +3,117 @@
3
3
  //
4
4
  import { Args, Flags } from '@oclif/core';
5
5
  import fs from 'node:fs';
6
- import { basename } from 'node:path';
7
- import path from 'path';
8
6
  import { asyncTimeout } from '@dxos/async';
9
- import { CollectionType } from '@dxos/cli-composer';
10
- import { makeRef } from '@dxos/client/echo';
11
- import { live, getMeta } from '@dxos/client/echo';
12
- import { incrementSemverPatch, setUserFunctionUrlInMetadata, uploadWorkerFunction, makeFunctionUrl, FunctionType, ScriptType, } from '@dxos/functions';
7
+ import { Filter, loadObjectReferences, makeRef } from '@dxos/client/echo';
8
+ import { create, getMeta } from '@dxos/client/echo';
9
+ import { getUserFunctionUrlInMetadata, incrementSemverPatch, setUserFunctionUrlInMetadata, uploadWorkerFunction, FunctionType, ScriptType, } from '@dxos/functions';
13
10
  import { invariant } from '@dxos/invariant';
14
11
  import { TextType } from '@dxos/schema';
15
12
  import { BaseCommand } from '../../base';
16
- import { bundleScript, findFunctionByDeploymentId } from '../../util';
17
13
  // TODO: move to cli-composer
18
14
  class Upload extends BaseCommand {
19
15
  async run() {
20
- const { scriptFileContent, bundledScript } = await this._loadScript();
21
- return this.execWithSpace(async ({ client, space }) => {
22
- client.addTypes([FunctionType]);
23
- const identity = client.halo.identity.get();
24
- invariant(identity, 'Identity not available');
25
- const existingFunctionObject = await this._loadFunctionObject(space);
26
- const uploadResult = await this._upload(client, space, existingFunctionObject, bundledScript);
27
- const functionObject = this._updateFunctionObject(space, existingFunctionObject, uploadResult);
28
- if (this.flags.composerScript) {
29
- await this._updateComposerScript(client, space, functionObject, basename(this.args.file), scriptFileContent);
30
- }
31
- }, { spaceKeys: this.flags.spaceKey ? [this.flags.spaceKey] : undefined });
32
- }
33
- async _loadScript() {
34
- var _a, _b;
35
- let scriptFileContent;
16
+ let scriptContent;
36
17
  try {
37
- scriptFileContent = fs.readFileSync(this.args.file, 'utf8');
18
+ scriptContent = fs.readFileSync(this.args.file, 'utf8');
38
19
  }
39
20
  catch (err) {
40
21
  this.error(`Error reading file ${this.args.file}: ${err.message}`);
41
22
  }
42
- const bundleResult = await bundleScript(scriptFileContent);
43
- if (bundleResult.error || !bundleResult.bundle) {
44
- this.error(`Error bundling script ${this.args.file}: ${(_b = (_a = bundleResult.error) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : 'empty output'}`);
45
- }
46
- return { scriptFileContent, bundledScript: bundleResult.bundle };
47
- }
48
- async _loadFunctionObject(space) {
49
- const matchingFunction = await findFunctionByDeploymentId(space, this.flags.functionId);
50
- if (this.flags.functionId && !matchingFunction) {
51
- this.warn(`Function ECHO object not found for ${this.flags.functionId}`);
52
- }
53
- if (this.flags.verbose && matchingFunction) {
54
- this.log(`Function ECHO object found, ID: ${matchingFunction.id}`);
55
- }
56
- return matchingFunction;
57
- }
58
- async _upload(client, space, functionObject, bundledSource) {
59
- let result;
60
- try {
61
- result = await asyncTimeout(uploadWorkerFunction({
62
- client,
63
- spaceId: space.id,
64
- version: await this._getNextVersion(functionObject),
65
- functionId: this.flags.functionId,
66
- name: this.flags.name,
67
- source: bundledSource,
68
- }), 10000);
69
- invariant(result.functionId, 'Upload failed.');
70
- this.log(`Uploaded function ${result.functionId}, version ${result.version}`);
71
- return result;
72
- }
73
- catch (err) {
74
- this.error(err.message);
75
- }
76
- }
77
- _updateFunctionObject(space, existingObject, uploadResult) {
78
- var _a;
79
- let functionObject = existingObject;
80
- if (!functionObject) {
81
- const name = path.basename(this.args.file, path.extname(this.args.file));
82
- functionObject = space.db.add(live(FunctionType, { name, version: uploadResult.version }));
83
- }
84
- functionObject.name = (_a = this.flags.name) !== null && _a !== void 0 ? _a : functionObject.name;
85
- functionObject.version = uploadResult.version;
86
- setUserFunctionUrlInMetadata(getMeta(functionObject), makeFunctionUrl(space.id, uploadResult));
87
- return functionObject;
88
- }
89
- async _updateComposerScript(client, space, functionObject, scriptFileName, scriptFileContent) {
90
- var _a;
91
- client.addTypes([ScriptType, TextType]);
92
- if (functionObject.source) {
93
- const script = await functionObject.source.load();
94
- const source = await script.source.load();
95
- source.content = scriptFileContent;
96
- if (this.flags.verbose) {
97
- this.log(`Updated source of ${script.id}`);
23
+ const handleUpload = async ({ client, space }) => {
24
+ invariant(space, 'Has to provide a space');
25
+ client.addTypes([ScriptType, TextType]);
26
+ const identity = client.halo.identity.get();
27
+ invariant(identity, 'Identity not available');
28
+ let existingFunctionId;
29
+ let existingObject;
30
+ let functionUrlFromExistingObject;
31
+ if (this.flags.functionId) {
32
+ existingFunctionId = this.flags.functionId;
98
33
  }
99
- }
100
- else {
101
- const sourceObj = space.db.add(live(TextType, { content: scriptFileContent }));
102
- const obj = space.db.add(live(ScriptType, { name: (_a = this.flags.name) !== null && _a !== void 0 ? _a : scriptFileName, source: makeRef(sourceObj) }));
103
- functionObject.source = makeRef(obj);
104
- await makeObjectNavigableInComposer(client, space, obj);
105
- if (this.flags.verbose) {
106
- this.log(`Created object, ID: ${obj.id}`);
34
+ // Find existing object and functionId in metadata if it exists
35
+ if (this.flags.objectId) {
36
+ const qr = await space.db.query(Filter.schema(ScriptType)).run();
37
+ existingObject = qr.objects.find((o) => o.id === this.flags.objectId);
38
+ if (!existingObject) {
39
+ this.error(`Object not found: ${this.flags.spaceKey}/${this.flags.objectId}`);
40
+ }
41
+ functionUrlFromExistingObject = await getUserFunctionUrlInMetadata(getMeta(existingObject));
42
+ if (functionUrlFromExistingObject) {
43
+ existingFunctionId = functionUrlFromExistingObject.split('/').at(-1);
44
+ if (existingFunctionId !== this.flags.functionId) {
45
+ this.warn(`provided functionId ${this.flags.functionId} does not match existing functionId ${existingFunctionId}, using existing functionId`);
46
+ }
47
+ }
48
+ if (this.flags.verbose) {
49
+ this.log(`Uploading to existing FunctionId ${existingFunctionId} read from ${this.flags.spaceKey}/${this.flags.objectId}`);
50
+ }
51
+ }
52
+ let result;
53
+ try {
54
+ result = await asyncTimeout(uploadWorkerFunction({
55
+ client,
56
+ spaceId: space.id,
57
+ version: await this._getNextVersion(space, existingFunctionId),
58
+ functionId: existingFunctionId,
59
+ name: this.flags.name,
60
+ source: scriptContent,
61
+ }), 5000);
62
+ invariant(result.functionId, 'Upload failed.');
63
+ this.log(`Uploaded function: ${result.functionId}`);
64
+ }
65
+ catch (err) {
66
+ this.error(err.message);
107
67
  }
68
+ // If we haven't been provided an ECHO space/object, we're done.
69
+ if (!space) {
70
+ return;
71
+ }
72
+ if (existingObject) {
73
+ // Update existing object
74
+ await loadObjectReferences(existingObject, (obj) => obj.source);
75
+ if (!existingObject.source) {
76
+ this.error('Object source not found');
77
+ }
78
+ existingObject.source.target.content = scriptContent;
79
+ if (this.flags.verbose) {
80
+ this.log(`Updated source in ${this.flags.spaceKey}/${this.flags.objectId} (${existingObject.source.target.id})`);
81
+ }
82
+ if (!functionUrlFromExistingObject) {
83
+ setUserFunctionUrlInMetadata(getMeta(existingObject), `/${space.id}/${result.functionId}`);
84
+ }
85
+ else {
86
+ if (existingFunctionId !== result.functionId) {
87
+ this.error('functionId mismatch');
88
+ }
89
+ }
90
+ }
91
+ else {
92
+ // Create new object
93
+ // TODO: make object navigable in Composer.
94
+ const sourceObj = space.db.add(create(TextType, { content: scriptContent }));
95
+ const obj = space.db.add(create(ScriptType, { name: this.flags.name, source: makeRef(sourceObj) }));
96
+ setUserFunctionUrlInMetadata(getMeta(obj), result.functionId);
97
+ if (this.flags.verbose) {
98
+ this.log(`Created object: ${this.flags.spaceKey}/${obj.id}`);
99
+ }
100
+ }
101
+ };
102
+ if (this.flags.spaceKey) {
103
+ return await this.execWithSpace(async ({ client, space }) => await handleUpload({ client, space }), {
104
+ spaceKeys: [this.flags.spaceKey],
105
+ });
108
106
  }
107
+ return await this.execWithClient(async ({ client }) => await handleUpload({ client }));
109
108
  }
110
- async _getNextVersion(functionObject) {
111
- var _a;
109
+ async _getNextVersion(space, functionId) {
110
+ var _a, _b;
112
111
  if (this.flags.version) {
113
112
  return this.flags.version;
114
113
  }
115
- if (functionObject) {
116
- return incrementSemverPatch((_a = functionObject === null || functionObject === void 0 ? void 0 : functionObject.version) !== null && _a !== void 0 ? _a : '0.0.0');
114
+ if (functionId) {
115
+ const { objects } = await space.db.query(Filter.schema(FunctionType, { id: functionId })).run();
116
+ return incrementSemverPatch((_b = (_a = objects[0]) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : '0.0.0');
117
117
  }
118
118
  return '0.0.1';
119
119
  }
@@ -124,22 +124,15 @@ Upload.flags = {
124
124
  ...BaseCommand.flags,
125
125
  name: Flags.string({ description: 'Function name.' }),
126
126
  version: Flags.string({ description: 'Function version.' }),
127
- composerScript: Flags.boolean({ description: 'Loads the script into composer.' }),
128
- functionId: Flags.string({ description: 'Existing UserFunction ID to update.' }),
129
127
  spaceKey: Flags.string({ description: 'Space key to create/update Script source in.' }),
128
+ objectId: Flags.string({ description: 'Existing Script Object ID to update.' }),
129
+ functionId: Flags.string({
130
+ description: 'Existing UserFunction ID to update.',
131
+ conflict: ['objectId', 'spaceKey'],
132
+ }),
130
133
  };
131
134
  Upload.args = {
132
135
  file: Args.string({ required: true }),
133
136
  };
134
137
  export default Upload;
135
- const makeObjectNavigableInComposer = async (client, space, obj) => {
136
- const collection = space.properties['dxos.org/type/Collection'];
137
- if (collection) {
138
- client.addTypes([CollectionType]);
139
- const composerCollection = await collection.load();
140
- if (composerCollection) {
141
- composerCollection.objects.push(makeRef(obj));
142
- }
143
- }
144
- };
145
138
  //# sourceMappingURL=upload.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,6 @@ export default class List extends BaseCommand<typeof List> {
6
6
  type: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
7
7
  timeout: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
8
8
  delay: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
9
- space: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
10
9
  extended: import("@oclif/core/interfaces").BooleanFlag<boolean>;
11
10
  json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
12
11
  verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
@@ -1 +1 @@
1
- {"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../../src/commands/halo/credential/list.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA4B;IACvD,OAAgB,KAAK;;;;;yBATX,wBAAwB;;;;;;;;;;MA0BhC;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAkC1B"}
1
+ {"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../../src/commands/halo/credential/list.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA4B;IACvD,OAAgB,KAAK;;;;yBARX,wBAAwB;;;;;;;;;;MAsBhC;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CA2B1B"}
@@ -3,33 +3,27 @@
3
3
  //
4
4
  import { Flags } from '@oclif/core';
5
5
  import { sleep, Trigger } from '@dxos/async';
6
- import { mapCredentials, printCredentials, TABLE_FLAGS } from '@dxos/cli-base';
6
+ import { printCredentials, mapCredentials, TABLE_FLAGS } from '@dxos/cli-base';
7
7
  import { BaseCommand } from '../../../base';
8
8
  class List extends BaseCommand {
9
9
  async run() {
10
10
  return await this.execWithClient(async ({ client }) => {
11
- let credentials;
12
- if (!this.flags.space) {
13
- const identity = client.halo.identity;
14
- if (!identity) {
15
- this.catch('Profile not initialized.');
16
- }
17
- // Wait for at least one credential before returning a result.
18
- const trigger = new Trigger();
19
- client.halo.credentials.subscribe((credentials) => {
20
- if (credentials.length > 0) {
21
- trigger.wake();
22
- }
23
- });
24
- await trigger.wait({ timeout: this.flags.timeout });
25
- // Even if we wait for a single credential, we're still likely to miss credentials unless we wait some more.
26
- await sleep(this.flags.delay);
27
- credentials = client.halo.queryCredentials({ type: this.flags.type });
28
- }
29
- else {
30
- const space = await this.getSpaceById(client, this.flags.space, { wait: false });
31
- credentials = await space.internal.getCredentials();
11
+ const identity = client.halo.identity;
12
+ if (!identity) {
13
+ this.catch('Profile not initialized.');
32
14
  }
15
+ // Wait for at least one credential before returning a result.
16
+ const trigger = new Trigger();
17
+ client.halo.credentials.subscribe((credentials) => {
18
+ if (credentials.length > 0) {
19
+ trigger.wake();
20
+ }
21
+ });
22
+ await trigger.wait({ timeout: this.flags.timeout });
23
+ // Even if we wait for a single credential, we're still likely to miss credentials unless we wait some more.
24
+ await sleep(this.flags.delay);
25
+ const credentials = client.halo.queryCredentials({ type: this.flags.type });
26
+ console.log(credentials);
33
27
  if (this.flags.json) {
34
28
  return mapCredentials(credentials);
35
29
  }
@@ -55,9 +49,6 @@ List.flags = {
55
49
  description: 'Delay in milliseconds before listing.',
56
50
  default: 250,
57
51
  }),
58
- space: Flags.string({
59
- description: 'Space ID of the space to show credentials from. By default, shows halo credentials.',
60
- }),
61
52
  };
62
53
  export default List;
63
54
  //# sourceMappingURL=list.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../src/commands/halo/credential/list.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG/E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAqB,IAAK,SAAQ,WAAwB;IAsBxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACpD,IAAI,WAAyB,CAAC;YAE9B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;gBACtB,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;gBACtC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBACzC,CAAC;gBAED,8DAA8D;gBAC9D,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC9B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE;oBAChD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC3B,OAAO,CAAC,IAAI,EAAE,CAAC;oBACjB,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAEpD,4GAA4G;gBAC5G,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC9B,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;gBACjF,WAAW,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;YACtD,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBACpB,OAAO,cAAc,CAAC,WAAW,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AAtDe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,wBAAwB,CAAC;AACvC,UAAK,GAAG;IACtB,GAAG,WAAW,CAAC,KAAK;IACpB,GAAG,WAAW;IACd,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM;KACpB,CAAC;IACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;QACrB,WAAW,EAAE,0EAA0E;QACvF,OAAO,EAAE,GAAG;KACb,CAAC;IACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;QACnB,WAAW,EAAE,uCAAuC;QACpD,OAAO,EAAE,GAAG;KACb,CAAC;IACF,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;QAClB,WAAW,EAAE,qFAAqF;KACnG,CAAC;CACH,CAAC;eApBiB,IAAI"}
1
+ {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../src/commands/halo/credential/list.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAqB,IAAK,SAAQ,WAAwB;IAmBxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACpD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;YACtC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;YACzC,CAAC;YAED,8DAA8D;YAC9D,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE;gBAChD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAEpD,4GAA4G;YAC5G,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YAC5E,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACzB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBACpB,OAAO,cAAc,CAAC,WAAW,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AA5Ce,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,wBAAwB,CAAC;AACvC,UAAK,GAAG;IACtB,GAAG,WAAW,CAAC,KAAK;IACpB,GAAG,WAAW;IACd,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM;KACpB,CAAC;IACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;QACrB,WAAW,EAAE,0EAA0E;QACvF,OAAO,EAAE,GAAG;KACb,CAAC;IACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;QACnB,WAAW,EAAE,uCAAuC;QACpD,OAAO,EAAE,GAAG;KACb,CAAC;CACH,CAAC;eAjBiB,IAAI"}
@@ -5,7 +5,6 @@ export default class List extends BaseCommand<typeof List> {
5
5
  static description: string;
6
6
  static flags: {
7
7
  live: import("@oclif/core/interfaces").BooleanFlag<boolean>;
8
- noWait: import("@oclif/core/interfaces").BooleanFlag<boolean>;
9
8
  timeout: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
10
9
  extended: import("@oclif/core/interfaces").BooleanFlag<boolean>;
11
10
  json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
@@ -1 +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;;;;yBAXX,wBAAwB;;;;;;;;;;MA0BhC;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAkBnB,gBAAgB,CAAC,MAAM,EAAE,MAAM;CAkDtC"}
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;;;yBAXX,wBAAwB;;;;;;;;;;MAsBhC;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAkBnB,gBAAgB,CAAC,MAAM,EAAE,MAAM;CAkDtC"}
@@ -9,12 +9,12 @@ import { BaseCommand } from '../../base';
9
9
  class List extends BaseCommand {
10
10
  async run() {
11
11
  return await this.execWithClient(async ({ client }) => {
12
- const spaces = await this.getSpaces(client, { wait: !this.flags.noWait });
12
+ const spaces = await this.getSpaces(client, { wait: true });
13
13
  if (this.flags.json) {
14
14
  return mapSpaces(spaces);
15
15
  }
16
16
  else {
17
- await printSpaces(spaces, this.flags);
17
+ printSpaces(spaces, this.flags);
18
18
  if (this.flags.live) {
19
19
  // TODO(burdon): Use https://www.npmjs.com/package/ansi-escapes to reset screen.
20
20
  console.clear();
@@ -31,7 +31,7 @@ class List extends BaseCommand {
31
31
  const update = new Event();
32
32
  update.debounce(1000).on(ctx, async () => {
33
33
  console.clear();
34
- await printSpaces(spaces, this.flags);
34
+ printSpaces(spaces, this.flags);
35
35
  });
36
36
  const subscribeToSpaceUpdate = (space) => {
37
37
  const sub1 = space.pipeline.subscribe({
@@ -76,10 +76,6 @@ List.flags = {
76
76
  live: Flags.boolean({
77
77
  description: 'Live update.',
78
78
  }),
79
- // TODO(dmaretskyi): Inverted flags?
80
- noWait: Flags.boolean({
81
- description: 'Do not wait for spaces to be ready.',
82
- }),
83
79
  timeout: Flags.integer({
84
80
  description: 'Timeout (ms).',
85
81
  default: 1000,
@@ -1 +1 @@
1
- {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/space/list.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/space/list.ts"],"names":[],"mappings":"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"}
@@ -1 +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;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,CA2BhE,CAAC"}
1
+ {"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"}
@@ -13,16 +13,13 @@ export const SpaceTable = ({ client, interval = 1000 }) => {
13
13
  const timer = setInterval(() => handleRefresh(), Math.min(100, interval));
14
14
  return () => clearInterval(timer);
15
15
  }, [client, interval]);
16
- const handleRefresh = async () => {
16
+ const handleRefresh = () => {
17
17
  const spaces = client.spaces.get();
18
- const data = await mapSpaces(spaces, { truncateKeys: true });
19
- setData(data.map(({ key, state, name, members, objects, startup }) => ({
18
+ const data = mapSpaces(spaces, { truncateKeys: true });
19
+ setData(data.map(({ key, open, objects }) => ({
20
20
  key,
21
- state,
22
- name,
23
- members,
21
+ open,
24
22
  objects,
25
- startup,
26
23
  })));
27
24
  };
28
25
  if (!data.length) {
@@ -1 +1 @@
1
- {"version":3,"file":"SpaceTable.js","sourceRoot":"","sources":["../../../src/components/SpaceTable.tsx"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,KAAK,EAAE,EAAE,SAAS,EAAW,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAA8C,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE,EAAE;IACnG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAoB,EAAE,CAAC,CAAC;IACxD,SAAS,CAAC,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,KAAK,IAAI,EAAE;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7D,OAAO,CACL,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7D,GAAG;YACH,KAAK;YACL,IAAI;YACJ,OAAO;YACP,OAAO;YACP,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,oBAAC,KAAK,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;AAC/B,CAAC,CAAC"}
1
+ {"version":3,"file":"SpaceTable.js","sourceRoot":"","sources":["../../../src/components/SpaceTable.tsx"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,KAAK,EAAE,EAAE,SAAS,EAAW,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAA8C,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE,EAAE;IACnG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAoB,EAAE,CAAC,CAAC;IACxD,SAAS,CAAC,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,SAAS,CAAC,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,oBAAC,KAAK,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;AAC/B,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/help.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAKnC,eAAO,MAAM,MAAM,QAK6D,CAAC;AAEjF,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,IAAI;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE;CAyBvC"}
1
+ {"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/help.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAKnC,eAAO,MAAM,MAAM,QAK6D,CAAC;AAEjF,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,IAAI;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE;CAqBvC"}
package/dist/src/help.js CHANGED
@@ -17,12 +17,7 @@ export default class CustomHelp extends Help {
17
17
  }
18
18
  const warnings = [];
19
19
  if (process.env.NODE_ENV === 'development') {
20
- let branch = '';
21
- try {
22
- branch = `(${rev.branch()} #${rev.short()})`;
23
- }
24
- catch (_a) { }
25
- warnings.push(chalk `{blue NODE_ENV}: {red ${process.env.NODE_ENV}}${branch}`);
20
+ warnings.push(chalk `{blue NODE_ENV}: {red ${process.env.NODE_ENV}} (${rev.branch()} #${rev.short()})`);
26
21
  }
27
22
  if (process.env.DX_PROFILE) {
28
23
  warnings.push(chalk `{blue DX_PROFILE}: {green ${process.env.DX_PROFILE}}`);
@@ -1 +1 @@
1
- {"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/help.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,cAAc,CAAC;AAE/B,mEAAmE;AACnE,MAAM,CAAC,MAAM,MAAM,GACjB,8EAA8E;IAC9E,0EAA0E;IAC1E,0EAA0E;IAC1E,0EAA0E;IAC1E,8EAA8E,CAAC;AAEjF,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,IAAI;IACjC,KAAK,CAAC,QAAQ,CAAC,IAAc;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAED,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;YAC3C,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,CAAC;gBACH,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC;YAC/C,CAAC;YAAC,WAAM,CAAC,CAAA,CAAC;YACV,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAA,yBAAyB,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,MAAM,EAAE,CAAC,CAAC;QAChF,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAA,6BAA6B,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,CAAC;QAED,MAAM,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF"}
1
+ {"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/help.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,cAAc,CAAC;AAE/B,mEAAmE;AACnE,MAAM,CAAC,MAAM,MAAM,GACjB,8EAA8E;IAC9E,0EAA0E;IAC1E,0EAA0E;IAC1E,0EAA0E;IAC1E,8EAA8E,CAAC;AAEjF,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,IAAI;IACjC,KAAK,CAAC,QAAQ,CAAC,IAAc;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAED,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;YAC3C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAA,yBAAyB,OAAO,CAAC,GAAG,CAAC,QAAQ,MAAM,GAAG,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACzG,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAA,6BAA6B,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,CAAC;QAED,MAAM,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF"}
@@ -2,5 +2,4 @@ export * from './provider';
2
2
  export * from './publish';
3
3
  export * from './supervisor';
4
4
  export * from './tunnel';
5
- export * from './function';
6
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"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;AACzB,cAAc,YAAY,CAAC"}
1
+ {"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"}
@@ -5,5 +5,4 @@ export * from './provider';
5
5
  export * from './publish';
6
6
  export * from './supervisor';
7
7
  export * from './tunnel';
8
- export * from './function';
9
8
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC"}