@apollo-annotation/cli 1.1.1 → 1.1.2

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 (161) hide show
  1. package/README.md +133 -87
  2. package/dist/ApolloConf.d.ts.map +1 -1
  3. package/dist/ApolloConf.js +14 -3
  4. package/dist/ApolloConf.js.map +1 -1
  5. package/dist/baseCommand.d.ts +37 -1
  6. package/dist/baseCommand.d.ts.map +1 -1
  7. package/dist/baseCommand.js +226 -9
  8. package/dist/baseCommand.js.map +1 -1
  9. package/dist/commands/assembly/add-from-fasta.d.ts +8 -8
  10. package/dist/commands/assembly/add-from-fasta.d.ts.map +1 -1
  11. package/dist/commands/assembly/add-from-fasta.js +20 -16
  12. package/dist/commands/assembly/add-from-fasta.js.map +1 -1
  13. package/dist/commands/assembly/add-from-gff.d.ts +5 -5
  14. package/dist/commands/assembly/add-from-gff.d.ts.map +1 -1
  15. package/dist/commands/assembly/add-from-gff.js +2 -4
  16. package/dist/commands/assembly/add-from-gff.js.map +1 -1
  17. package/dist/commands/assembly/check.d.ts +3 -3
  18. package/dist/commands/assembly/check.d.ts.map +1 -1
  19. package/dist/commands/assembly/check.js +10 -48
  20. package/dist/commands/assembly/check.js.map +1 -1
  21. package/dist/commands/assembly/delete.d.ts +2 -2
  22. package/dist/commands/assembly/delete.d.ts.map +1 -1
  23. package/dist/commands/assembly/delete.js +4 -5
  24. package/dist/commands/assembly/delete.js.map +1 -1
  25. package/dist/commands/assembly/get.d.ts +1 -1
  26. package/dist/commands/assembly/get.d.ts.map +1 -1
  27. package/dist/commands/assembly/get.js +3 -5
  28. package/dist/commands/assembly/get.js.map +1 -1
  29. package/dist/commands/assembly/sequence.d.ts +4 -4
  30. package/dist/commands/assembly/sequence.d.ts.map +1 -1
  31. package/dist/commands/assembly/sequence.js +9 -29
  32. package/dist/commands/assembly/sequence.js.map +1 -1
  33. package/dist/commands/change/get.d.ts +1 -1
  34. package/dist/commands/change/get.d.ts.map +1 -1
  35. package/dist/commands/change/get.js +3 -5
  36. package/dist/commands/change/get.js.map +1 -1
  37. package/dist/commands/config.d.ts +4 -4
  38. package/dist/commands/config.d.ts.map +1 -1
  39. package/dist/commands/config.js +12 -19
  40. package/dist/commands/config.js.map +1 -1
  41. package/dist/commands/export/gff3.d.ts +2 -2
  42. package/dist/commands/export/gff3.d.ts.map +1 -1
  43. package/dist/commands/export/gff3.js +4 -26
  44. package/dist/commands/export/gff3.js.map +1 -1
  45. package/dist/commands/feature/add-child.d.ts +4 -4
  46. package/dist/commands/feature/add-child.d.ts.map +1 -1
  47. package/dist/commands/feature/add-child.js +6 -32
  48. package/dist/commands/feature/add-child.js.map +1 -1
  49. package/dist/commands/feature/add.d.ts +7 -18
  50. package/dist/commands/feature/add.d.ts.map +1 -1
  51. package/dist/commands/feature/add.js +4 -57
  52. package/dist/commands/feature/add.js.map +1 -1
  53. package/dist/commands/feature/check.d.ts +3 -2
  54. package/dist/commands/feature/check.d.ts.map +1 -1
  55. package/dist/commands/feature/check.js +16 -35
  56. package/dist/commands/feature/check.js.map +1 -1
  57. package/dist/commands/feature/copy.d.ts +4 -4
  58. package/dist/commands/feature/copy.d.ts.map +1 -1
  59. package/dist/commands/feature/copy.js +6 -32
  60. package/dist/commands/feature/copy.js.map +1 -1
  61. package/dist/commands/feature/delete.d.ts +4 -3
  62. package/dist/commands/feature/delete.d.ts.map +1 -1
  63. package/dist/commands/feature/delete.js +25 -46
  64. package/dist/commands/feature/delete.js.map +1 -1
  65. package/dist/commands/feature/edit-attribute.d.ts +4 -4
  66. package/dist/commands/feature/edit-attribute.d.ts.map +1 -1
  67. package/dist/commands/feature/edit-attribute.js +4 -24
  68. package/dist/commands/feature/edit-attribute.js.map +1 -1
  69. package/dist/commands/feature/edit-coords.d.ts +3 -3
  70. package/dist/commands/feature/edit-coords.d.ts.map +1 -1
  71. package/dist/commands/feature/edit-coords.js +4 -24
  72. package/dist/commands/feature/edit-coords.js.map +1 -1
  73. package/dist/commands/feature/edit-type.d.ts +2 -2
  74. package/dist/commands/feature/edit-type.d.ts.map +1 -1
  75. package/dist/commands/feature/edit-type.js +4 -24
  76. package/dist/commands/feature/edit-type.js.map +1 -1
  77. package/dist/commands/feature/edit.d.ts +1 -1
  78. package/dist/commands/feature/edit.d.ts.map +1 -1
  79. package/dist/commands/feature/edit.js +2 -18
  80. package/dist/commands/feature/edit.js.map +1 -1
  81. package/dist/commands/feature/get-id.d.ts +1 -1
  82. package/dist/commands/feature/get-id.d.ts.map +1 -1
  83. package/dist/commands/feature/get-id.js +5 -15
  84. package/dist/commands/feature/get-id.js.map +1 -1
  85. package/dist/commands/feature/get-indexed-id.d.ts +3 -3
  86. package/dist/commands/feature/get-indexed-id.d.ts.map +1 -1
  87. package/dist/commands/feature/get-indexed-id.js +3 -20
  88. package/dist/commands/feature/get-indexed-id.js.map +1 -1
  89. package/dist/commands/feature/get.d.ts +4 -4
  90. package/dist/commands/feature/get.d.ts.map +1 -1
  91. package/dist/commands/feature/get.js +4 -21
  92. package/dist/commands/feature/get.js.map +1 -1
  93. package/dist/commands/feature/import.d.ts +4 -4
  94. package/dist/commands/feature/import.d.ts.map +1 -1
  95. package/dist/commands/feature/import.js +4 -21
  96. package/dist/commands/feature/import.js.map +1 -1
  97. package/dist/commands/feature/search.d.ts +2 -2
  98. package/dist/commands/feature/search.d.ts.map +1 -1
  99. package/dist/commands/feature/search.js +9 -28
  100. package/dist/commands/feature/search.js.map +1 -1
  101. package/dist/commands/file/delete.d.ts +2 -1
  102. package/dist/commands/file/delete.d.ts.map +1 -1
  103. package/dist/commands/file/delete.js +12 -21
  104. package/dist/commands/file/delete.js.map +1 -1
  105. package/dist/commands/file/download.d.ts +2 -2
  106. package/dist/commands/file/download.d.ts.map +1 -1
  107. package/dist/commands/file/download.js +3 -7
  108. package/dist/commands/file/download.js.map +1 -1
  109. package/dist/commands/file/get.d.ts +1 -1
  110. package/dist/commands/file/get.d.ts.map +1 -1
  111. package/dist/commands/file/get.js +2 -4
  112. package/dist/commands/file/get.js.map +1 -1
  113. package/dist/commands/file/upload.d.ts +4 -4
  114. package/dist/commands/file/upload.d.ts.map +1 -1
  115. package/dist/commands/file/upload.js +3 -7
  116. package/dist/commands/file/upload.js.map +1 -1
  117. package/dist/commands/jbrowse/desktop.d.ts +4 -4
  118. package/dist/commands/jbrowse/get-config.d.ts.map +1 -1
  119. package/dist/commands/jbrowse/get-config.js +1 -7
  120. package/dist/commands/jbrowse/get-config.js.map +1 -1
  121. package/dist/commands/jbrowse/set-config.d.ts +1 -1
  122. package/dist/commands/jbrowse/set-config.d.ts.map +1 -1
  123. package/dist/commands/jbrowse/set-config.js +1 -19
  124. package/dist/commands/jbrowse/set-config.js.map +1 -1
  125. package/dist/commands/login.d.ts +5 -5
  126. package/dist/commands/login.d.ts.map +1 -1
  127. package/dist/commands/login.js +8 -7
  128. package/dist/commands/login.js.map +1 -1
  129. package/dist/commands/logout.d.ts.map +1 -1
  130. package/dist/commands/logout.js +2 -6
  131. package/dist/commands/logout.js.map +1 -1
  132. package/dist/commands/refseq/add-alias.d.ts +2 -2
  133. package/dist/commands/refseq/add-alias.d.ts.map +1 -1
  134. package/dist/commands/refseq/add-alias.js +2 -21
  135. package/dist/commands/refseq/add-alias.js.map +1 -1
  136. package/dist/commands/refseq/get.d.ts +1 -1
  137. package/dist/commands/refseq/get.d.ts.map +1 -1
  138. package/dist/commands/refseq/get.js +3 -5
  139. package/dist/commands/refseq/get.js.map +1 -1
  140. package/dist/commands/status.d.ts.map +1 -1
  141. package/dist/commands/status.js +2 -6
  142. package/dist/commands/status.js.map +1 -1
  143. package/dist/commands/user/get.d.ts +2 -2
  144. package/dist/commands/user/get.d.ts.map +1 -1
  145. package/dist/commands/user/get.js +1 -4
  146. package/dist/commands/user/get.js.map +1 -1
  147. package/dist/fileCommand.d.ts +2 -1
  148. package/dist/fileCommand.d.ts.map +1 -1
  149. package/dist/fileCommand.js +18 -11
  150. package/dist/fileCommand.js.map +1 -1
  151. package/dist/test/test.js +154 -30
  152. package/dist/test/test.js.map +1 -1
  153. package/dist/test/utils.d.ts.map +1 -1
  154. package/dist/test/utils.js +15 -2
  155. package/dist/test/utils.js.map +1 -1
  156. package/dist/utils.d.ts +1 -21
  157. package/dist/utils.d.ts.map +1 -1
  158. package/dist/utils.js +1 -234
  159. package/dist/utils.js.map +1 -1
  160. package/oclif.manifest.json +820 -532
  161. package/package.json +14 -15
@@ -1 +1 @@
1
- {"version":3,"file":"get-config.js","sourceRoot":"","sources":["../../../src/commands/jbrowse/get-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAA6B;IAClE,MAAM,CAAC,OAAO,GAAG,uCAAuC,CAAA;IACxD,MAAM,CAAC,WAAW,GAChB,sEAAsE,CAAA;IAExE,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,4BAA4B;YACzC,OAAO,EAAE,mDAAmD;SAC7D;KACF,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QAErC,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,WAAW,EAClB,qBAAqB,CACtB,CAAA;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;QAC1D,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAW,CAAA;QAC9C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACzC,CAAC"}
1
+ {"version":3,"file":"get-config.js","sourceRoot":"","sources":["../../../src/commands/jbrowse/get-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAA6B;IAClE,MAAM,CAAC,OAAO,GAAG,uCAAuC,CAAA;IACxD,MAAM,CAAC,WAAW,GAChB,sEAAsE,CAAA;IAExE,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,4BAA4B;YACzC,OAAO,EAAE,mDAAmD;SAC7D;KACF,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAW,CAAA;QAC9D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACzC,CAAC"}
@@ -7,7 +7,7 @@ export default class SetConfig extends BaseCommand<typeof SetConfig> {
7
7
  command: string;
8
8
  }[];
9
9
  static args: {
10
- inputFile: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
10
+ inputFile: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
11
11
  };
12
12
  run(): Promise<void>;
13
13
  }
@@ -1 +1 @@
1
- {"version":3,"file":"set-config.d.ts","sourceRoot":"","sources":["../../../src/commands/jbrowse/set-config.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW,CAAC,OAAO,SAAS,CAAC;IAClE,MAAM,CAAC,OAAO,SAA8B;IAC5C,MAAM,CAAC,WAAW,SAC0C;IAE5D,MAAM,CAAC,QAAQ;;;QAKd;IAED,MAAM,CAAC,IAAI;;MAKV;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAoC3B"}
1
+ {"version":3,"file":"set-config.d.ts","sourceRoot":"","sources":["../../../src/commands/jbrowse/set-config.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW,CAAC,OAAO,SAAS,CAAC;IAClE,MAAM,CAAC,OAAO,SAA8B;IAC5C,MAAM,CAAC,WAAW,SAC0C;IAE5D,MAAM,CAAC,QAAQ;;;QAKd;IAED,MAAM,CAAC,IAAI;;MAKV;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkB3B"}
@@ -1,9 +1,6 @@
1
1
  import * as fs from 'node:fs';
2
2
  import { Args } from '@oclif/core';
3
- import { Agent, fetch } from 'undici';
4
- import { ConfigError } from '../../ApolloConf.js';
5
3
  import { BaseCommand } from '../../baseCommand.js';
6
- import { createFetchErrorMessage, localhostToAddress } from '../../utils.js';
7
4
  export default class SetConfig extends BaseCommand {
8
5
  static summary = 'Set JBrowse configuration';
9
6
  static description = 'Set JBrowse configuration in Apollo collaboration server';
@@ -24,7 +21,6 @@ export default class SetConfig extends BaseCommand {
24
21
  if (!fs.existsSync(args.inputFile)) {
25
22
  this.error(`File ${args.inputFile} does not exist`);
26
23
  }
27
- const access = await this.getAccess();
28
24
  const filehandle = await fs.promises.open(args.inputFile);
29
25
  const fileContent = await filehandle.readFile({ encoding: 'utf8' });
30
26
  await filehandle.close();
@@ -32,21 +28,7 @@ export default class SetConfig extends BaseCommand {
32
28
  typeName: 'ImportJBrowseConfigChange',
33
29
  newJBrowseConfig: JSON.parse(fileContent),
34
30
  };
35
- const auth = {
36
- method: 'POST',
37
- body: JSON.stringify(change),
38
- headers: {
39
- Authorization: `Bearer ${access.accessToken}`,
40
- 'Content-Type': 'application/json',
41
- },
42
- dispatcher: new Agent({ headersTimeout: 60 * 60 * 1000 }),
43
- };
44
- const url = new URL(localhostToAddress(`${access.address}/changes`));
45
- const response = await fetch(url, auth);
46
- if (!response.ok) {
47
- const errorMessage = await createFetchErrorMessage(response, 'Failed to add JBrowse configuration');
48
- throw new ConfigError(errorMessage);
49
- }
31
+ await this.post('changes', JSON.stringify(change));
50
32
  }
51
33
  }
52
34
  //# sourceMappingURL=set-config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"set-config.js","sourceRoot":"","sources":["../../../src/commands/jbrowse/set-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAA;AAM7B,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,KAAK,EAAoB,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAE5E,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAA6B;IAClE,MAAM,CAAC,OAAO,GAAG,2BAA2B,CAAA;IAC5C,MAAM,CAAC,WAAW,GAChB,0DAA0D,CAAA;IAE5D,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,4BAA4B;YACzC,OAAO,EAAE,iDAAiD;SAC3D;KACF,CAAA;IAED,MAAM,CAAC,IAAI,GAAG;QACZ,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC;YACrB,WAAW,EAAE,4BAA4B;YACzC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAE5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,SAAS,iBAAiB,CAAC,CAAA;QACrD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QACrC,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACzD,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;QACnE,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;QAExB,MAAM,MAAM,GAAwC;YAClD,QAAQ,EAAE,2BAA2B;YACrC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAkB;SAC3D,CAAA;QAED,MAAM,IAAI,GAAgB;YACxB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;YAC5B,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,MAAM,CAAC,WAAW,EAAE;gBAC7C,cAAc,EAAE,kBAAkB;aACnC;YACD,UAAU,EAAE,IAAI,KAAK,CAAC,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;SAC1D,CAAA;QACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC,CAAA;QACpE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,YAAY,GAAG,MAAM,uBAAuB,CAChD,QAAQ,EACR,qCAAqC,CACtC,CAAA;YACD,MAAM,IAAI,WAAW,CAAC,YAAY,CAAC,CAAA;QACrC,CAAC;IACH,CAAC"}
1
+ {"version":3,"file":"set-config.js","sourceRoot":"","sources":["../../../src/commands/jbrowse/set-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAA;AAM7B,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAElC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAA6B;IAClE,MAAM,CAAC,OAAO,GAAG,2BAA2B,CAAA;IAC5C,MAAM,CAAC,WAAW,GAChB,0DAA0D,CAAA;IAE5D,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,4BAA4B;YACzC,OAAO,EAAE,iDAAiD;SAC3D;KACF,CAAA;IAED,MAAM,CAAC,IAAI,GAAG;QACZ,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC;YACrB,WAAW,EAAE,4BAA4B;YACzC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAE5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,SAAS,iBAAiB,CAAC,CAAA;QACrD,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACzD,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;QACnE,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;QAExB,MAAM,MAAM,GAAwC;YAClD,QAAQ,EAAE,2BAA2B;YACrC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAkB;SAC3D,CAAA;QAED,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IACpD,CAAC"}
@@ -7,11 +7,11 @@ export default class Login extends BaseCommand<typeof Login> {
7
7
  command: string;
8
8
  }[];
9
9
  static flags: {
10
- address: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
11
- username: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
12
- password: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
13
- force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
14
- port: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
10
+ address: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
11
+ username: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
12
+ password: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
13
+ force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
14
+ port: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
15
15
  };
16
16
  run(): Promise<void>;
17
17
  private checkUserAlreadyLoggedIn;
@@ -1 +1 @@
1
- {"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAa/C,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,MAAM,CAAC,OAAO,SAAoB;IAClC,MAAM,CAAC,WAAW,SAGwF;IAE1G,MAAM,CAAC,QAAQ;;;QAUd;IAED,MAAM,CAAC,KAAK;;;;;;MAyBX;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAsDnB,wBAAwB;YAkBxB,cAAc;YAwBd,eAAe;YAmBf,0BAA0B;CAwDzC"}
1
+ {"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAY/C,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,MAAM,CAAC,OAAO,SAAoB;IAClC,MAAM,CAAC,WAAW,SAGwF;IAE1G,MAAM,CAAC,QAAQ;;;QAUd;IAED,MAAM,CAAC,KAAK;;;;;;MAyBX;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAkDnB,wBAAwB;YAmBxB,cAAc;YAwBd,eAAe;YAmBf,0BAA0B;CAwDzC"}
@@ -3,14 +3,14 @@
3
3
  /* eslint-disable @typescript-eslint/no-unnecessary-condition */
4
4
  import EventEmitter from 'node:events';
5
5
  import * as http from 'node:http';
6
- import path from 'node:path';
7
6
  import * as querystring from 'node:querystring';
7
+ import { confirm } from '@inquirer/prompts';
8
8
  import { Errors, Flags, ux } from '@oclif/core';
9
9
  import open from 'open';
10
10
  import { fetch } from 'undici';
11
- import { ApolloConf, KEYS } from '../ApolloConf.js';
11
+ import { KEYS } from '../ApolloConf.js';
12
12
  import { BaseCommand } from '../baseCommand.js';
13
- import { basicCheckConfig, createFetchErrorMessage, localhostToAddress, waitFor, } from '../utils.js';
13
+ import { createFetchErrorMessage, localhostToAddress, waitFor, } from '../utils.js';
14
14
  export default class Login extends BaseCommand {
15
15
  static summary = 'Login to Apollo';
16
16
  static description = 'Use the provided credentials to obtain and save the token to access Apollo. \
@@ -53,10 +53,8 @@ need to execute this command again unless the token has expired. To setup a new
53
53
  };
54
54
  async run() {
55
55
  const { flags } = await this.parse(Login);
56
- const configFile = flags['config-file'] ?? path.join(this.config.configDir, 'config.yml');
57
56
  const profileName = flags.profile ?? process.env.APOLLO_PROFILE ?? 'default';
58
- basicCheckConfig(configFile, profileName);
59
- const config = new ApolloConf(configFile);
57
+ const config = this.getConfig();
60
58
  const accessType = config.get(`${profileName}.accessType`);
61
59
  const address = flags.address ?? config.get(`${profileName}.address`);
62
60
  if (address === undefined) {
@@ -101,7 +99,10 @@ need to execute this command again unless the token has expired. To setup a new
101
99
  if (!accessToken) {
102
100
  return;
103
101
  }
104
- const reAuthenticate = await ux.confirm("You're already logged. Do you want to re-authenticate? (y/n)");
102
+ const reAuthenticate = await confirm({
103
+ message: "You're already logged in. Do you want to re-authenticate?",
104
+ default: true,
105
+ });
105
106
  if (!reAuthenticate) {
106
107
  this.exit(0);
107
108
  }
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,2DAA2D;AAC3D,gEAAgE;AAChE,OAAO,YAAY,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAE9B,OAAO,EAAmB,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAEL,uBAAuB,EACvB,kBAAkB,EAClB,OAAO,GACR,MAAM,aAAa,CAAA;AAMpB,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAyB;IAC1D,MAAM,CAAC,OAAO,GAAG,iBAAiB,CAAA;IAClC,MAAM,CAAC,WAAW,GAChB;;4GAEwG,CAAA;IAE1G,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EACT,6GAA6G;YAC/G,OAAO,EAAE,qCAAqC;SAC/C;QACD;YACE,WAAW,EAAE,iCAAiC;YAC9C,OAAO,EAAE,0DAA0D;SACpE;KACF,CAAA;IAED,MAAM,CAAC,KAAK,GAAG;QACb,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0BAA0B;YACvC,QAAQ,EAAE,KAAK;SAChB,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,yBAAyB;YACtC,QAAQ,EAAE,KAAK;SAChB,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,yBAAyB;YACtC,QAAQ,EAAE,KAAK;SAChB,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,2DAA2D;SACzE,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;YAClB,WAAW,EACT,kFAAkF;YACpF,OAAO,EAAE,IAAI;SACd,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAEzC,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,SAAS,CAAA;QAC5E,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;QAC/B,MAAM,UAAU,GAAW,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,aAAa,CAAW,CAAA;QAC5E,MAAM,OAAO,GACX,KAAK,CAAC,OAAO,IAAK,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,UAAU,CAAY,CAAA;QACnE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAC7C,CAAC;QAED,IAAI,eAAe,GAAoB,EAAE,WAAW,EAAE,EAAE,EAAE,CAAA;QAC1D,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;gBACjB,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;YAC1D,CAAC;YACD,IAAI,UAAU,KAAK,MAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC1D,MAAM,QAAQ,GACZ,KAAK,CAAC,QAAQ;oBACb,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,eAAe,CAAY,CAAA;gBACvD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;oBAC3B,IAAI,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAA;gBACjD,CAAC;gBACD,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YAChE,CAAC;iBAAM,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;gBAClC,eAAe,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;YACvD,CAAC;iBAAM,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBACpC,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;YACrC,CAAC;iBAAM,CAAC;gBACN,eAAe,GAAG,MAAM,IAAI,CAAC,0BAA0B,CACrD,OAAO,EACP,UAAU,EACV,KAAK,CAAC,IAAI,CACX,CAAA;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IACE,CAAC,KAAK,YAAY,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC;gBAChE,KAAK,YAAY,MAAM,CAAC,SAAS,EACjC,CAAC;gBACD,OAAM;YACR,CAAC;YACD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,cAAc,EAAE,eAAe,CAAC,WAAW,CAAC,CAAA;IACvE,CAAC;IAEO,KAAK,CAAC,wBAAwB,CACpC,eAA2B,EAC3B,WAAmB;QAEnB,MAAM,WAAW,GAAW,eAAe,CAAC,GAAG,CAC7C,GAAG,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE,CAC3B,CAAA;QACX,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAM;QACR,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC;YACnC,OAAO,EAAE,2DAA2D;YACpE,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QACF,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,OAAe,EACf,QAAgB;QAEhB,MAAM,GAAG,GAAG,kBAAkB,CAAC,GAAG,OAAO,YAAY,CAAC,CAAA;QACtD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;SACnC,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,YAAY,GAAG,MAAM,uBAAuB,CAChD,QAAQ,EACR,uBAAuB,CACxB,CAAA;YACD,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAA;QAC/B,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QACjC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC;YAC9D,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,KAAe,EAAE,CAAA;QAC7C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChE,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,OAAe;QAC3C,MAAM,GAAG,GAAG,kBAAkB,CAAC,GAAG,OAAO,wBAAwB,CAAC,CAAA;QAClE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAChD,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,YAAY,GAAG,MAAM,uBAAuB,CAChD,QAAQ,EACR,wBAAwB,CACzB,CAAA;YACD,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAA;QAC/B,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QACjC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC;YAC9D,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,KAAe,EAAE,CAAA;QAC7C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChE,CAAC;IAEO,KAAK,CAAC,0BAA0B,CACtC,OAAe,EACf,UAAkB,EAClB,IAAY;QAEZ,MAAM,YAAY,GAAG,GAAG,CAAA;QACxB,uDAAuD;QACvD,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAA;QAClC,MAAM,SAAS,GAAG,oCAAoC,CAAA;QACtD,MAAM,MAAM,GAAG,IAAI;aAChB,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACzB,IAAI,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBACvC,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAC/B,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,YAAY,GAAG,EAAE,EAAE,CAAC,CACzC,CAAA;gBACD,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;gBAC/B,GAAG,CAAC,GAAG,CACL,yEAAyE,CAC1E,CAAA;gBACD,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAA;gBACjB,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,CAAA;gBACrB,MAAM,CAAC,KAAK,EAAE,CAAA;YAChB,CAAC;iBAAM,CAAC;gBACN,sCAAsC;gBACtC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;gBACtB,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;YAC3D,CAAC;QACH,CAAC,CAAC;aACD,MAAM,CAAC,IAAI,CAAC,CAAA;QAEf,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YAC7B,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACrC,IAAI,CAAC,WAAW,CACd,wBAAwB,IAAI,+HAA+H,CAC5J,CAAA;gBACD,mDAAmD;gBACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACjB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;gBAC3B,mDAAmD;gBACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACjB,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,4EAA4E;QAC5E,MAAM,oBAAoB,GAAG,GAAG,OAAO,oBAAoB,UAAU,kCAAkC,IAAI,GAAG,YAAY,EAAE,CAAA;QAC5H,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAA;QAChC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAE7C,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,OAAO,CACpC,SAAS,EACT,OAAO,CACR,CAAA;QAED,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAA;IACtC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../src/commands/logout.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,OAAO,SAAqB;IACnC,MAAM,CAAC,WAAW,SAC+C;IAEjE,MAAM,CAAC,QAAQ;;;QASd;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAWlC"}
1
+ {"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../src/commands/logout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,OAAO,SAAqB;IACnC,MAAM,CAAC,WAAW,SAC+C;IAEjE,MAAM,CAAC,QAAQ;;;QASd;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAQlC"}
@@ -1,7 +1,5 @@
1
- import path from 'node:path';
2
- import { ApolloConf, KEYS } from '../ApolloConf.js';
1
+ import { KEYS } from '../ApolloConf.js';
3
2
  import { BaseCommand } from '../baseCommand.js';
4
- import { basicCheckConfig } from '../utils.js';
5
3
  export default class Logout extends BaseCommand {
6
4
  static summary = 'Logout of Apollo';
7
5
  static description = 'Logout by removing the access token from the selected profile';
@@ -18,9 +16,7 @@ export default class Logout extends BaseCommand {
18
16
  async run() {
19
17
  const { flags } = await this.parse(Logout);
20
18
  const profileName = flags.profile ?? process.env.APOLLO_PROFILE ?? 'default';
21
- const configFile = flags['config-file'] ?? path.join(this.config.configDir, 'config.yml');
22
- basicCheckConfig(configFile, profileName);
23
- const config = new ApolloConf(configFile);
19
+ const config = this.getConfig();
24
20
  config.delete(`${profileName}.${KEYS.accessToken}`);
25
21
  }
26
22
  }
@@ -1 +1 @@
1
- {"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/commands/logout.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE9C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAA0B;IAC5D,MAAM,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACnC,MAAM,CAAC,WAAW,GAChB,+DAA+D,CAAA;IAEjE,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,yBAAyB;YACtC,OAAO,EAAE,qCAAqC;SAC/C;QACD;YACE,WAAW,EAAE,yBAAyB;YACtC,OAAO,EAAE,0DAA0D;SACpE;KACF,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAE1C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,SAAS,CAAA;QAE5E,MAAM,UAAU,GACd,KAAK,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;QACxE,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QACzC,MAAM,MAAM,GAAe,IAAI,UAAU,CAAC,UAAU,CAAC,CAAA;QACrD,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;IACrD,CAAC"}
1
+ {"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/commands/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAA0B;IAC5D,MAAM,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACnC,MAAM,CAAC,WAAW,GAChB,+DAA+D,CAAA;IAEjE,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,yBAAyB;YACtC,OAAO,EAAE,qCAAqC;SAC/C;QACD;YACE,WAAW,EAAE,yBAAyB;YACtC,OAAO,EAAE,0DAA0D;SACpE;KACF,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAE1C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,SAAS,CAAA;QAE5E,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;QAC/B,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;IACrD,CAAC"}
@@ -7,10 +7,10 @@ export default class AddRefNameAlias extends BaseCommand<typeof AddRefNameAlias>
7
7
  command: string;
8
8
  }[];
9
9
  static args: {
10
- 'input-file': import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
10
+ 'input-file': import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
11
11
  };
12
12
  static flags: {
13
- assembly: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
13
+ assembly: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
14
14
  };
15
15
  run(): Promise<void>;
16
16
  }
@@ -1 +1 @@
1
- {"version":3,"file":"add-alias.d.ts","sourceRoot":"","sources":["../../../src/commands/refseq/add-alias.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAOlD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,WAAW,CACtD,OAAO,eAAe,CACvB;IACC,MAAM,CAAC,OAAO,SAA2C;IACzD,MAAM,CAAC,WAAW,SACsN;IAExO,MAAM,CAAC,QAAQ;;;QAKd;IAED,MAAM,CAAC,IAAI;;MAKV;IAED,MAAM,CAAC,KAAK;;MAMX;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA4D3B"}
1
+ {"version":3,"file":"add-alias.d.ts","sourceRoot":"","sources":["../../../src/commands/refseq/add-alias.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,WAAW,CACtD,OAAO,eAAe,CACvB;IACC,MAAM,CAAC,OAAO,SAA2C;IACzD,MAAM,CAAC,WAAW,SACsN;IAExO,MAAM,CAAC,QAAQ;;;QAKd;IAED,MAAM,CAAC,IAAI;;MAKV;IAED,MAAM,CAAC,KAAK;;MAMX;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAqC3B"}
@@ -1,9 +1,6 @@
1
1
  import * as fs from 'node:fs';
2
2
  import { Args, Flags } from '@oclif/core';
3
- import { Agent, fetch } from 'undici';
4
- import { ConfigError } from '../../ApolloConf.js';
5
3
  import { BaseCommand } from '../../baseCommand.js';
6
- import { createFetchErrorMessage, localhostToAddress, queryApollo, } from '../../utils.js';
7
4
  export default class AddRefNameAlias extends BaseCommand {
8
5
  static summary = 'Add reference name aliases from a file';
9
6
  static description = 'Reference name aliasing is a process to make chromosomes that are named slightly differently but which refer to the same thing render properly. This command reads a file with reference name aliases and adds them to the database.';
@@ -31,7 +28,6 @@ export default class AddRefNameAlias extends BaseCommand {
31
28
  if (!fs.existsSync(args['input-file'])) {
32
29
  this.error(`File ${args['input-file']} does not exist`);
33
30
  }
34
- const access = await this.getAccess();
35
31
  const filehandle = await fs.promises.open(args['input-file']);
36
32
  const fileContent = await filehandle.readFile({ encoding: 'utf8' });
37
33
  await filehandle.close();
@@ -41,8 +37,7 @@ export default class AddRefNameAlias extends BaseCommand {
41
37
  const [refName, ...aliases] = line.split('\t');
42
38
  refNameAliases.push({ refName, aliases });
43
39
  }
44
- const assemblies = await queryApollo(access.address, access.accessToken, 'assemblies');
45
- const json = (await assemblies.json());
40
+ const json = (await this.get('assemblies'));
46
41
  const assembly = json.find((x) => 'name' in x && x.name === flags.assembly);
47
42
  const assemblyId = assembly && '_id' in assembly ? assembly._id : undefined;
48
43
  if (!assemblyId) {
@@ -53,21 +48,7 @@ export default class AddRefNameAlias extends BaseCommand {
53
48
  assembly: assemblyId,
54
49
  refSeqAliases: refNameAliases,
55
50
  };
56
- const auth = {
57
- method: 'POST',
58
- body: JSON.stringify(change),
59
- headers: {
60
- Authorization: `Bearer ${access.accessToken}`,
61
- 'Content-Type': 'application/json',
62
- },
63
- dispatcher: new Agent({ headersTimeout: 60 * 60 * 1000 }),
64
- };
65
- const url = new URL(localhostToAddress(`${access.address}/changes`));
66
- const response = await fetch(url, auth);
67
- if (!response.ok) {
68
- const errorMessage = await createFetchErrorMessage(response, 'Failed to add reference name aliases');
69
- throw new ConfigError(errorMessage);
70
- }
51
+ await this.post('changes', JSON.stringify(change));
71
52
  this.log(`Reference name aliases added successfully to assembly ${flags.assembly}`);
72
53
  }
73
54
  }
@@ -1 +1 @@
1
- {"version":3,"file":"add-alias.js","sourceRoot":"","sources":["../../../src/commands/refseq/add-alias.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-alias.js","sourceRoot":"","sources":["../../../src/commands/refseq/add-alias.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAA;AAG7B,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,WAE5C;IACC,MAAM,CAAC,OAAO,GAAG,wCAAwC,CAAA;IACzD,MAAM,CAAC,WAAW,GAChB,sOAAsO,CAAA;IAExO,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,6BAA6B;YAC1C,OAAO,EAAE,6DAA6D;SACvE;KACF,CAAA;IAED,MAAM,CAAC,IAAI,GAAG;QACZ,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC;YACxB,WAAW,EAAE,0BAA0B;YACvC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IAED,MAAM,CAAC,KAAK,GAAG;QACb,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,yBAAyB;YACtC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAEzD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;QACzD,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAA;QAC7D,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;QACnE,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;QACxB,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAErC,MAAM,cAAc,GAAG,EAAE,CAAA;QACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAC9C,cAAc,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;QAC3C,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAa,CAAA;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC3E,MAAM,UAAU,GAAG,QAAQ,IAAI,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;QAE3E,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,CAAC,QAAQ,YAAY,CAAC,CAAA;QACpD,CAAC;QAED,MAAM,MAAM,GAAkC;YAC5C,QAAQ,EAAE,wBAAwB;YAClC,QAAQ,EAAE,UAAoB;YAC9B,aAAa,EAAE,cAAc;SAC9B,CAAA;QAED,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;QAClD,IAAI,CAAC,GAAG,CACN,yDAAyD,KAAK,CAAC,QAAQ,EAAE,CAC1E,CAAA;IACH,CAAC"}
@@ -7,7 +7,7 @@ export default class Get extends BaseCommand<typeof Get> {
7
7
  command: string;
8
8
  }[];
9
9
  static flags: {
10
- assembly: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
10
+ assembly: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
11
11
  };
12
12
  run(): Promise<void>;
13
13
  }
@@ -1 +1 @@
1
- {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/commands/refseq/get.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACtD,MAAM,CAAC,OAAO,SAA4B;IAC1C,MAAM,CAAC,WAAW,SAGc;IAEhC,MAAM,CAAC,QAAQ;;;QASd;IAED,MAAM,CAAC,KAAK;;MAOX;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA6BlC"}
1
+ {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/commands/refseq/get.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACtD,MAAM,CAAC,OAAO,SAA4B;IAC1C,MAAM,CAAC,WAAW,SAGc;IAEhC,MAAM,CAAC,QAAQ;;;QASd;IAED,MAAM,CAAC,KAAK;;MAOX;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkBlC"}
@@ -1,6 +1,6 @@
1
1
  import { Flags } from '@oclif/core';
2
2
  import { BaseCommand } from '../../baseCommand.js';
3
- import { convertAssemblyNameToId, idReader, queryApollo } from '../../utils.js';
3
+ import { idReader } from '../../utils.js';
4
4
  export default class Get extends BaseCommand {
5
5
  static summary = 'Get reference sequences';
6
6
  static description = 'Output the reference sequences in one or more assemblies in json format. \
@@ -25,14 +25,12 @@ Use `assembly sequence` for that.';
25
25
  };
26
26
  async run() {
27
27
  const { flags } = await this.parse(Get);
28
- const access = await this.getAccess();
29
- const refSeqs = await queryApollo(access.address, access.accessToken, 'refSeqs');
30
- const json = (await refSeqs.json());
28
+ const json = (await this.get('refSeqs'));
31
29
  let keep = json;
32
30
  if (flags.assembly !== undefined) {
33
31
  keep = [];
34
32
  const assembly = await idReader(flags.assembly);
35
- const assemblyIds = await convertAssemblyNameToId(access.address, access.accessToken, assembly);
33
+ const assemblyIds = await this.convertAssemblyNameToId(assembly);
36
34
  for (const x of json) {
37
35
  if (assemblyIds.includes(x['assembly'])) {
38
36
  keep.push(x);
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/refseq/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE/E,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAuB;IACtD,MAAM,CAAC,OAAO,GAAG,yBAAyB,CAAA;IAC1C,MAAM,CAAC,WAAW,GAChB;;kCAE8B,CAAA;IAEhC,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,gCAAgC;YAC7C,OAAO,EAAE,qCAAqC;SAC/C;QACD;YACE,WAAW,EAAE,sCAAsC;YACnD,OAAO,EAAE,iDAAiD;SAC3D;KACF,CAAA;IAED,MAAM,CAAC,KAAK,GAAG;QACb,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,IAAI;YACd,WAAW,EACT,sFAAsF;SACzF,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QAErC,MAAM,OAAO,GAAa,MAAM,WAAW,CACzC,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,WAAW,EAClB,SAAS,CACV,CAAA;QACD,MAAM,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAa,CAAA;QAE/C,IAAI,IAAI,GAAG,IAAI,CAAA;QACf,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACjC,IAAI,GAAG,EAAE,CAAA;YACT,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAC/C,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAC/C,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,WAAW,EAClB,QAAQ,CACT,CAAA;YACD,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;gBACrB,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,UAA4B,CAAC,CAAC,EAAE,CAAC;oBAC1D,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBACd,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACzC,CAAC"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/refseq/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAuB;IACtD,MAAM,CAAC,OAAO,GAAG,yBAAyB,CAAA;IAC1C,MAAM,CAAC,WAAW,GAChB;;kCAE8B,CAAA;IAEhC,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,gCAAgC;YAC7C,OAAO,EAAE,qCAAqC;SAC/C;QACD;YACE,WAAW,EAAE,sCAAsC;YACnD,OAAO,EAAE,iDAAiD;SAC3D;KACF,CAAA;IAED,MAAM,CAAC,KAAK,GAAG;QACb,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,IAAI;YACd,WAAW,EACT,sFAAsF;SACzF,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEvC,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAa,CAAA;QAEpD,IAAI,IAAI,GAAG,IAAI,CAAA;QACf,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACjC,IAAI,GAAG,EAAE,CAAA;YACT,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAC/C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAA;YAChE,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;gBACrB,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,UAA4B,CAAC,CAAC,EAAE,CAAC;oBAC1D,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBACd,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACzC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,OAAO,SAA+B;IAC7C,MAAM,CAAC,WAAW,SAGoD;IAEzD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAmBlC"}
1
+ {"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,OAAO,SAA+B;IAC7C,MAAM,CAAC,WAAW,SAGoD;IAEzD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAelC"}
@@ -1,8 +1,6 @@
1
1
  /* eslint-disable @typescript-eslint/no-unnecessary-condition */
2
- import path from 'node:path';
3
- import { ApolloConf, KEYS } from '../ApolloConf.js';
2
+ import { KEYS } from '../ApolloConf.js';
4
3
  import { BaseCommand } from '../baseCommand.js';
5
- import { basicCheckConfig } from '../utils.js';
6
4
  export default class Status extends BaseCommand {
7
5
  static summary = 'View authentication status';
8
6
  static description = 'This command returns "<profile>: Logged in" if the selected profile \
@@ -11,9 +9,7 @@ Note that this command does not check the validity of the access token.';
11
9
  async run() {
12
10
  const { flags } = await this.parse(Status);
13
11
  const profileName = flags.profile ?? process.env.APOLLO_PROFILE ?? 'default';
14
- const configFile = flags['config-file'] ?? path.join(this.config.configDir, 'config.yml');
15
- basicCheckConfig(configFile, profileName);
16
- const config = new ApolloConf(configFile);
12
+ const config = this.getConfig();
17
13
  const accessToken = config.get(`${profileName}.${KEYS.accessToken}`);
18
14
  if (accessToken === undefined || accessToken.trim() === '') {
19
15
  this.log(`${profileName}: Logged out`);
@@ -1 +1 @@
1
- {"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE9C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAA0B;IAC5D,MAAM,CAAC,OAAO,GAAG,4BAA4B,CAAA;IAC7C,MAAM,CAAC,WAAW,GAChB;;wEAEoE,CAAA;IAE/D,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAE1C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,SAAS,CAAA;QAE5E,MAAM,UAAU,GACd,KAAK,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;QACxE,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QAEzC,MAAM,MAAM,GAAe,IAAI,UAAU,CAAC,UAAU,CAAC,CAAA;QACrD,MAAM,WAAW,GAAW,MAAM,CAAC,GAAG,CACpC,GAAG,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE,CAC3B,CAAA;QACX,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAC3D,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,cAAc,CAAC,CAAA;QACxC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,aAAa,CAAC,CAAA;QACvC,CAAC;IACH,CAAC"}
1
+ {"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAA0B;IAC5D,MAAM,CAAC,OAAO,GAAG,4BAA4B,CAAA;IAC7C,MAAM,CAAC,WAAW,GAChB;;wEAEoE,CAAA;IAE/D,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAE1C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,SAAS,CAAA;QAE5E,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;QAC/B,MAAM,WAAW,GAAW,MAAM,CAAC,GAAG,CACpC,GAAG,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE,CAC3B,CAAA;QACX,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAC3D,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,cAAc,CAAC,CAAA;QACxC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,aAAa,CAAC,CAAA;QACvC,CAAC;IACH,CAAC"}
@@ -7,8 +7,8 @@ export default class Get extends BaseCommand<typeof Get> {
7
7
  command: string;
8
8
  }[];
9
9
  static flags: {
10
- username: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
11
- role: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
10
+ username: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
11
+ role: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
12
12
  };
13
13
  run(): Promise<void>;
14
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/commands/user/get.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACtD,MAAM,CAAC,OAAO,SAAsB;IACpC,MAAM,CAAC,WAAW,SAC6D;IAE/E,MAAM,CAAC,QAAQ;;;QAcd;IAED,MAAM,CAAC,KAAK;;;MASX;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAwBlC"}
1
+ {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/commands/user/get.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACtD,MAAM,CAAC,OAAO,SAAsB;IACpC,MAAM,CAAC,WAAW,SAC6D;IAE/E,MAAM,CAAC,QAAQ;;;QAcd;IAED,MAAM,CAAC,KAAK;;;MASX;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBlC"}
@@ -1,6 +1,5 @@
1
1
  import { Flags } from '@oclif/core';
2
2
  import { BaseCommand } from '../../baseCommand.js';
3
- import { queryApollo } from '../../utils.js';
4
3
  export default class Get extends BaseCommand {
5
4
  static summary = 'Get list of users';
6
5
  static description = 'If set, filters username and role must be both satisfied to return an entry';
@@ -30,9 +29,7 @@ export default class Get extends BaseCommand {
30
29
  };
31
30
  async run() {
32
31
  const { flags } = await this.parse(Get);
33
- const access = await this.getAccess();
34
- const users = await queryApollo(access.address, access.accessToken, 'users');
35
- const json = (await users.json());
32
+ const json = (await this.get('users'));
36
33
  const out = [];
37
34
  for (const x of json) {
38
35
  if ((flags.username === undefined ||
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/user/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAuB;IACtD,MAAM,CAAC,OAAO,GAAG,mBAAmB,CAAA;IACpC,MAAM,CAAC,WAAW,GAChB,6EAA6E,CAAA;IAE/E,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,cAAc;YAC3B,OAAO,EAAE,8CAA8C;SACxD;QACD;YACE,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,8CAA8C;SACxD;QACD;YACE,WAAW,EAAE,0BAA0B;YACvC,OAAO,EACL,sFAAsF;SACzF;KACF,CAAA;IAED,MAAM,CAAC,KAAK,GAAG;QACb,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,oBAAoB;SAClC,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0BAA0B;SACxC,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QAErC,MAAM,KAAK,GAAa,MAAM,WAAW,CACvC,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,WAAW,EAClB,OAAO,CACR,CAAA;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,CAAa,CAAA;QAC7C,MAAM,GAAG,GAAa,EAAE,CAAA;QACxB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,IACE,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS;gBAC3B,CAAC,CAAC,UAA4B,CAAC,KAAK,KAAK,CAAC,QAAQ,CAAC;gBACrD,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,MAAwB,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,EACxE,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACb,CAAC;QACH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACxC,CAAC"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/user/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAuB;IACtD,MAAM,CAAC,OAAO,GAAG,mBAAmB,CAAA;IACpC,MAAM,CAAC,WAAW,GAChB,6EAA6E,CAAA;IAE/E,MAAM,CAAC,QAAQ,GAAG;QAChB;YACE,WAAW,EAAE,cAAc;YAC3B,OAAO,EAAE,8CAA8C;SACxD;QACD;YACE,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,8CAA8C;SACxD;QACD;YACE,WAAW,EAAE,0BAA0B;YACvC,OAAO,EACL,sFAAsF;SACzF;KACF,CAAA;IAED,MAAM,CAAC,KAAK,GAAG;QACb,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,oBAAoB;SAClC,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0BAA0B;SACxC,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEvC,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAa,CAAA;QAClD,MAAM,GAAG,GAAa,EAAE,CAAA;QACxB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,IACE,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS;gBAC3B,CAAC,CAAC,UAA4B,CAAC,KAAK,KAAK,CAAC,QAAQ,CAAC;gBACrD,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,MAAwB,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,EACxE,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACb,CAAC;QACH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACxC,CAAC"}
@@ -1,6 +1,7 @@
1
1
  import { BaseCommand } from './baseCommand.js';
2
2
  export declare abstract class FileCommand extends BaseCommand<typeof FileCommand> {
3
3
  init(): Promise<void>;
4
- uploadFile(address: string, accessToken: string, file: string, type: string, isGzip: boolean): Promise<string>;
4
+ uploadFile(file: string, type: string, isGzip: boolean): Promise<string>;
5
+ isFileId(x: string): Promise<boolean>;
5
6
  }
6
7
  //# sourceMappingURL=fileCommand.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"fileCommand.d.ts","sourceRoot":"","sources":["../src/fileCommand.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AA4B9C,8BAAsB,WAAY,SAAQ,WAAW,CAAC,OAAO,WAAW,CAAC;IAC1D,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,UAAU,CACrB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,CAAC;CAsDnB"}
1
+ {"version":3,"file":"fileCommand.d.ts","sourceRoot":"","sources":["../src/fileCommand.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AA4B9C,8BAAsB,WAAY,SAAQ,WAAW,CAAC,OAAO,WAAW,CAAC;IAC1D,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,UAAU,CACrB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,CAAC;IAsDZ,QAAQ,CAAC,CAAC,EAAE,MAAM;CAYzB"}
@@ -2,10 +2,9 @@ import * as fs from 'node:fs';
2
2
  import path from 'node:path';
3
3
  import { Transform, pipeline, } from 'node:stream';
4
4
  import { SingleBar } from 'cli-progress';
5
- import { Agent, fetch } from 'undici';
6
- import { ConfigError } from './ApolloConf.js';
5
+ import { Headers } from 'undici';
7
6
  import { BaseCommand } from './baseCommand.js';
8
- import { createFetchErrorMessage, localhostToAddress } from './utils.js';
7
+ import { createFetchErrorMessage } from './utils.js';
9
8
  class ProgressTransform extends Transform {
10
9
  size = 0;
11
10
  progressBar;
@@ -23,7 +22,7 @@ export class FileCommand extends BaseCommand {
23
22
  async init() {
24
23
  await super.init();
25
24
  }
26
- async uploadFile(address, accessToken, file, type, isGzip) {
25
+ async uploadFile(file, type, isGzip) {
27
26
  const filehandle = await fs.promises.open(file);
28
27
  const { size } = await filehandle.stat();
29
28
  const stream = filehandle.createReadStream();
@@ -37,7 +36,6 @@ export class FileCommand extends BaseCommand {
37
36
  }
38
37
  });
39
38
  const headers = new Headers({
40
- Authorization: `Bearer ${accessToken}`,
41
39
  'Content-Type': type,
42
40
  'Content-Length': String(size),
43
41
  });
@@ -48,19 +46,16 @@ export class FileCommand extends BaseCommand {
48
46
  method: 'POST',
49
47
  body,
50
48
  duplex: 'half',
51
- dispatcher: new Agent({ headersTimeout: 60 * 60 * 1000 }),
52
49
  headers,
53
50
  };
54
51
  const fileName = path.basename(file);
55
- const url = new URL(localhostToAddress(`${address}/files`));
56
- url.searchParams.set('name', fileName);
57
- url.searchParams.set('type', type);
52
+ const searchParams = new URLSearchParams({ name: fileName, type });
58
53
  progressBar.start(size, 0);
59
54
  try {
60
- const response = await fetch(url, init);
55
+ const response = await this.fetch(`files?${searchParams.toString()}`, init);
61
56
  if (!response.ok) {
62
57
  const errorMessage = await createFetchErrorMessage(response, 'uploadFile failed');
63
- throw new ConfigError(errorMessage);
58
+ throw new Error(errorMessage);
64
59
  }
65
60
  const json = (await response.json());
66
61
  return json['_id'];
@@ -73,5 +68,17 @@ export class FileCommand extends BaseCommand {
73
68
  progressBar.stop();
74
69
  }
75
70
  }
71
+ async isFileId(x) {
72
+ if (x.length != 24) {
73
+ return false;
74
+ }
75
+ const json = (await this.get('files'));
76
+ for (const fileDoc of json) {
77
+ if (fileDoc['_id'] === x) {
78
+ return true;
79
+ }
80
+ }
81
+ return false;
82
+ }
76
83
  }
77
84
  //# sourceMappingURL=fileCommand.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fileCommand.js","sourceRoot":"","sources":["../src/fileCommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fileCommand.js","sourceRoot":"","sources":["../src/fileCommand.ts"],"names":[],"mappings":"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"}