@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":"ApolloConf.d.ts","sourceRoot":"","sources":["../src/ApolloConf.ts"],"names":[],"mappings":"AAIA,OAAO,IAAI,MAAM,MAAM,CAAA;AAMvB,qBAAa,WAAY,SAAQ,KAAK;CAAG;AAEzC,oBAAY,IAAI;IACd,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,WAAW,gBAAgB;IAC3B,YAAY,iBAAiB;CAC9B;AA4CD,wBAAgB,UAAU,IAAI,MAAM,EAAE,CAMrC;AAED,qBAAa,UAAW,SAAQ,IAAI;gBACtB,UAAU,EAAE,MAAM;IA2B9B,IAAI,KAAK,4BAOR;IAED,IAAI,KAAK,CAAC,QAAQ,yBAAA,EAMjB;IAEM,eAAe,IAAI,MAAM,EAAE;IAI3B,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAO/C,SAAS,CAAC,WAAW,EAAE,MAAM;;;;CAoB3C"}
1
+ {"version":3,"file":"ApolloConf.d.ts","sourceRoot":"","sources":["../src/ApolloConf.ts"],"names":[],"mappings":"AAIA,OAAO,IAAI,MAAM,MAAM,CAAA;AAOvB,qBAAa,WAAY,SAAQ,KAAK;CAAG;AAEzC,oBAAY,IAAI;IACd,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,WAAW,gBAAgB;IAC3B,YAAY,iBAAiB;CAC9B;AA4CD,wBAAgB,UAAU,IAAI,MAAM,EAAE,CAMrC;AAED,qBAAa,UAAW,SAAQ,IAAI;gBACtB,UAAU,EAAE,MAAM;IA2B9B,IAAI,KAAK,4BAOR;IAED,IAAI,KAAK,CAAC,QAAQ,yBAAA,EAMjB;IAEM,eAAe,IAAI,MAAM,EAAE;IAI3B,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAO/C,SAAS,CAAC,WAAW,EAAE,MAAM;;;;CA+B3C"}
@@ -3,8 +3,9 @@ import fs from 'node:fs';
3
3
  import path from 'node:path';
4
4
  import Conf from 'conf';
5
5
  import Joi from 'joi';
6
+ import { fetch } from 'undici';
6
7
  import YAML from 'yaml';
7
- import { checkProfileExists, queryApollo } from './utils.js';
8
+ import { createFetchErrorMessage, localhostToAddress } from './utils.js';
8
9
  export class ConfigError extends Error {
9
10
  }
10
11
  export var KEYS;
@@ -108,7 +109,6 @@ export class ApolloConf extends Conf {
108
109
  this.set(`${profileName}.accessType`, accessType);
109
110
  }
110
111
  async getAccess(profileName) {
111
- checkProfileExists(profileName, this);
112
112
  const address = this.get(`${profileName}.address`);
113
113
  if (address.trim() === '') {
114
114
  throw new ConfigError(`Profile "${profileName}" has no address. Please run "apollo config" to set it up.`);
@@ -117,7 +117,18 @@ export class ApolloConf extends Conf {
117
117
  if (accessToken.trim() === '') {
118
118
  throw new ConfigError(`Profile "${profileName}" has no access token. Please run "apollo login" to set it up.`);
119
119
  }
120
- await queryApollo(address, accessToken, 'assemblies');
120
+ const auth = {
121
+ headers: {
122
+ Authorization: `Bearer ${accessToken}`,
123
+ 'Content-Type': 'application/json',
124
+ },
125
+ };
126
+ const url = new URL(localhostToAddress(`${address}/assemblies`));
127
+ const response = await fetch(url, auth);
128
+ if (!response.ok) {
129
+ const errorMessage = await createFetchErrorMessage(response, 'getAccess failed');
130
+ throw new ConfigError(errorMessage);
131
+ }
121
132
  return { address, accessToken };
122
133
  }
123
134
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ApolloConf.js","sourceRoot":"","sources":["../src/ApolloConf.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ApolloConf.js","sourceRoot":"","sources":["../src/ApolloConf.ts"],"names":[],"mappings":"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"}
@@ -1,22 +1,58 @@
1
1
  import { Command, type Interfaces } from '@oclif/core';
2
+ import { Agent, type RequestInit, type Response, type BodyInit } from 'undici';
3
+ import { ApolloConf } from './ApolloConf.js';
4
+ import type { AnnotationFeatureSnapshot } from '@apollo-annotation/mst';
5
+ import type { SerializedAddAssemblyAndFeaturesFromFileChange, SerializedAddAssemblyFromExternalChange, SerializedAddAssemblyFromFileChange } from '@apollo-annotation/shared';
6
+ interface AssemblyResponse {
7
+ _id: string;
8
+ name: string;
9
+ aliases?: string[];
10
+ }
11
+ export declare class CheckError extends Error {
12
+ }
2
13
  export type Flags<T extends typeof Command> = Interfaces.InferredFlags<(typeof BaseCommand)['baseFlags'] & T['flags']>;
3
14
  export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
4
15
  export declare abstract class BaseCommand<T extends typeof Command> extends Command {
5
16
  static baseFlags: {
6
17
  profile: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
7
18
  'config-file': Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
19
+ timeout: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
8
20
  };
9
21
  protected flags: Flags<T>;
10
22
  protected args: Args<T>;
23
+ protected apolloConfig: ApolloConf;
11
24
  init(): Promise<void>;
12
- private getConfig;
25
+ protected getConfig(): ApolloConf;
13
26
  getAccess(): Promise<{
14
27
  address: string;
15
28
  accessToken: string;
16
29
  }>;
30
+ getDispatcher(): Agent;
31
+ private getURL;
32
+ private getHeaders;
33
+ check(response: Response): Promise<Response>;
34
+ fetchWithoutCheck(endpoint: string, requestInit?: RequestInit, opts?: {
35
+ json?: boolean;
36
+ }): Promise<Response>;
37
+ fetch(endpoint: string, requestInit?: RequestInit, opts?: {
38
+ json?: boolean;
39
+ }): Promise<Response>;
40
+ post(endpoint: string, body: BodyInit, requestInit?: RequestInit): Promise<unknown>;
41
+ get(endpoint: string, requestInit?: RequestInit): Promise<unknown>;
17
42
  protected catch(err: Error & {
18
43
  exitCode?: number;
19
44
  }): Promise<unknown>;
20
45
  protected finally(_: Error | undefined): Promise<unknown>;
46
+ assemblyNameToIdDict(): Promise<Record<string, string | undefined>>;
47
+ convertAssemblyNameToId(namesOrIds: string[], verbose?: boolean, removeDuplicates?: boolean): Promise<string[]>;
48
+ getAssembly(assemblyNameOrId: string): Promise<AssemblyResponse>;
49
+ getRefseqId(refseqNameOrId?: string, inAssemblyNameOrId?: string): Promise<string[]>;
50
+ getFeatureById(id: string): Promise<AnnotationFeatureSnapshot>;
51
+ deleteAssembly(assemblyId: string): Promise<void>;
52
+ submitAssembly(body: SerializedAddAssemblyFromFileChange | SerializedAddAssemblyFromExternalChange | SerializedAddAssemblyAndFeaturesFromFileChange, force: boolean): Promise<object>;
53
+ checkNameToIdDict(): Promise<Record<string, string | undefined>>;
54
+ convertCheckNameToId(namesOrIds: string[]): Promise<string[]>;
55
+ getAssemblyFromRefseq(refSeq: string): Promise<string>;
21
56
  }
57
+ export {};
22
58
  //# sourceMappingURL=baseCommand.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"baseCommand.d.ts","sourceRoot":"","sources":["../src/baseCommand.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAK7D,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,aAAa,CACpE,CAAC,OAAO,WAAW,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAC/C,CAAA;AACD,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;AAC/E,8BAAsB,WAAW,CAAC,CAAC,SAAS,OAAO,OAAO,CAAE,SAAQ,OAAO;IACzE,MAAM,CAAC,SAAS;;;MAOf;IAED,SAAS,CAAC,KAAK,EAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IAC1B,SAAS,CAAC,IAAI,EAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IAEX,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAYlC,OAAO,CAAC,SAAS;IAOJ,SAAS,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;cAS3D,KAAK,CAAC,GAAG,EAAE,KAAK,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;cAO3D,OAAO,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;CAIhE"}
1
+ {"version":3,"file":"baseCommand.d.ts","sourceRoot":"","sources":["../src/baseCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAG7D,OAAO,EACL,KAAK,EAEL,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,QAAQ,EAEd,MAAM,QAAQ,CAAA;AAEf,OAAO,EAAE,UAAU,EAAe,MAAM,iBAAiB,CAAA;AAMzD,OAAO,KAAK,EACV,yBAAyB,EAE1B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EACV,8CAA8C,EAC9C,uCAAuC,EACvC,mCAAmC,EAEpC,MAAM,2BAA2B,CAAA;AAElC,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB;AAED,qBAAa,UAAW,SAAQ,KAAK;CAAG;AAExC,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,aAAa,CACpE,CAAC,OAAO,WAAW,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAC/C,CAAA;AACD,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;AAC/E,8BAAsB,WAAW,CAAC,CAAC,SAAS,OAAO,OAAO,CAAE,SAAQ,OAAO;IACzE,MAAM,CAAC,SAAS;;;;MAWf;IAED,SAAS,CAAC,KAAK,EAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IAC1B,SAAS,CAAC,IAAI,EAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IACxB,SAAS,CAAC,YAAY,EAAG,UAAU,CAAA;IAEtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BlC,SAAS,CAAC,SAAS,IAAI,UAAU;IAIpB,SAAS,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAS3E,aAAa;YAMC,MAAM;YAKN,UAAU;IAUX,KAAK,CAAC,QAAQ,EAAE,QAAQ;IAWxB,iBAAiB,CAC5B,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,WAAW,EACzB,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE;IAad,KAAK,CAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,WAAW,EACzB,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE;IAKd,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,QAAQ,EACd,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,OAAO,CAAC;IAUN,GAAG,CACd,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,OAAO,CAAC;cASH,KAAK,CAAC,GAAG,EAAE,KAAK,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;cAO3D,OAAO,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAKzD,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IASnE,uBAAuB,CAC3B,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,UAAO,EACd,gBAAgB,UAAO,GACtB,OAAO,CAAC,MAAM,EAAE,CAAC;IAkBd,WAAW,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkBhE,WAAW,CACf,cAAc,CAAC,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,MAAM,EAAE,CAAC;IA0Cd,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAI9D,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjD,cAAc,CAClB,IAAI,EACA,mCAAmC,GACnC,uCAAuC,GACvC,8CAA8C,EAClD,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,MAAM,CAAC;IAoCZ,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAUhE,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAe7D,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAK7D"}
@@ -1,7 +1,13 @@
1
1
  import path from 'node:path';
2
+ import { stderr } from 'node:process';
2
3
  import { Command, Flags } from '@oclif/core';
3
- import { ApolloConf } from './ApolloConf.js';
4
- import { checkConfigfileExists } from './utils.js';
4
+ import { ObjectId } from 'bson';
5
+ import ms, {} from 'ms';
6
+ import { Agent, fetch, Headers, } from 'undici';
7
+ import { ApolloConf, ConfigError } from './ApolloConf.js';
8
+ import { createFetchErrorMessage, filterJsonList, localhostToAddress, } from './utils.js';
9
+ export class CheckError extends Error {
10
+ }
5
11
  export class BaseCommand extends Command {
6
12
  static baseFlags = {
7
13
  profile: Flags.string({
@@ -10,9 +16,14 @@ export class BaseCommand extends Command {
10
16
  'config-file': Flags.string({
11
17
  description: 'Use this config file (mostly for testing)',
12
18
  }),
19
+ timeout: Flags.string({
20
+ description: 'Timeout for each request to the server',
21
+ default: '1h',
22
+ }),
13
23
  };
14
24
  flags;
15
25
  args;
26
+ apolloConfig;
16
27
  async init() {
17
28
  await super.init();
18
29
  const { args, flags } = await this.parse({
@@ -23,19 +34,82 @@ export class BaseCommand extends Command {
23
34
  });
24
35
  this.flags = flags;
25
36
  this.args = args;
26
- }
27
- getConfig(configFile) {
37
+ let { 'config-file': configFile } = this.flags;
28
38
  configFile ??= path.join(this.config.configDir, 'config.yml');
29
- checkConfigfileExists(configFile);
30
- const config = new ApolloConf(configFile);
31
- return config;
39
+ const apolloConfig = new ApolloConf(configFile);
40
+ const { profile } = this.flags;
41
+ const profileName = process.env.APOLLO_PROFILE ?? profile ?? 'default';
42
+ if (this.id !== 'config' &&
43
+ !apolloConfig.getProfileNames().includes(profileName)) {
44
+ throw new ConfigError(`Profile "${profileName}" does not exist. Please run "apollo config" to set this profile up or choose a different profile`);
45
+ }
46
+ this.apolloConfig = apolloConfig;
47
+ }
48
+ getConfig() {
49
+ return this.apolloConfig;
32
50
  }
33
51
  async getAccess() {
34
- const { 'config-file': configFile, profile } = this.flags;
35
- const config = this.getConfig(configFile);
52
+ const { profile } = this.flags;
53
+ const config = this.getConfig();
36
54
  const profileName = process.env.APOLLO_PROFILE ?? profile ?? 'default';
37
55
  return config.getAccess(profileName);
38
56
  }
57
+ getDispatcher() {
58
+ const { timeout } = this.flags;
59
+ const timeoutMs = ms(timeout);
60
+ return new Agent({ headersTimeout: timeoutMs });
61
+ }
62
+ async getURL(endpoint) {
63
+ const { address } = await this.getAccess();
64
+ return new URL(endpoint, localhostToAddress(address));
65
+ }
66
+ async getHeaders(options, json = false) {
67
+ const { accessToken } = await this.getAccess();
68
+ const headers = new Headers(options?.headers);
69
+ headers.set('authorization', `Bearer ${accessToken}`);
70
+ if (json) {
71
+ headers.set('Content-Type', 'application/json');
72
+ }
73
+ return headers;
74
+ }
75
+ async check(response) {
76
+ if (!response.ok) {
77
+ const errorMessage = await createFetchErrorMessage(response, `Request to "${response.url}" failed`);
78
+ throw new Error(errorMessage);
79
+ }
80
+ return response;
81
+ }
82
+ async fetchWithoutCheck(endpoint, requestInit, opts) {
83
+ const url = await this.getURL(endpoint);
84
+ const headers = await this.getHeaders(requestInit, opts?.json);
85
+ const dispatcher = this.getDispatcher();
86
+ const optionsWithAuth = {
87
+ ...requestInit,
88
+ dispatcher,
89
+ headers,
90
+ };
91
+ return fetch(url, optionsWithAuth);
92
+ }
93
+ async fetch(endpoint, requestInit, opts) {
94
+ return this.check(await this.fetchWithoutCheck(endpoint, requestInit, opts));
95
+ }
96
+ async post(endpoint, body, requestInit) {
97
+ const optionsWithAuth = {
98
+ ...requestInit,
99
+ body,
100
+ method: 'POST',
101
+ };
102
+ const response = await this.fetch(endpoint, optionsWithAuth, { json: true });
103
+ return response.json();
104
+ }
105
+ async get(endpoint, requestInit) {
106
+ const optionsWithAuth = {
107
+ ...requestInit,
108
+ method: 'GET',
109
+ };
110
+ const response = await this.fetch(endpoint, optionsWithAuth, { json: true });
111
+ return response.json();
112
+ }
39
113
  async catch(err) {
40
114
  if (err.cause instanceof Error) {
41
115
  console.error(err.cause);
@@ -46,5 +120,148 @@ export class BaseCommand extends Command {
46
120
  // called after run and catch regardless of whether or not the command errored
47
121
  return super.finally(_);
48
122
  }
123
+ async assemblyNameToIdDict() {
124
+ const ja = (await this.get('assemblies'));
125
+ const nameToId = {};
126
+ for (const x of ja) {
127
+ nameToId[x['name']] = x['_id'];
128
+ }
129
+ return nameToId;
130
+ }
131
+ async convertAssemblyNameToId(namesOrIds, verbose = true, removeDuplicates = true) {
132
+ const nameToId = await this.assemblyNameToIdDict();
133
+ let ids = [];
134
+ for (const x of namesOrIds) {
135
+ if (nameToId[x] !== undefined) {
136
+ ids.push(nameToId[x]);
137
+ }
138
+ else if (Object.values(nameToId).includes(x)) {
139
+ ids.push(x);
140
+ }
141
+ else if (verbose) {
142
+ stderr.write(`Warning: Omitting unknown assembly: "${x}"\n`);
143
+ }
144
+ }
145
+ if (removeDuplicates) {
146
+ ids = [...new Set(ids)];
147
+ }
148
+ return ids;
149
+ }
150
+ async getAssembly(assemblyNameOrId) {
151
+ if (ObjectId.isValid(assemblyNameOrId)) {
152
+ return this.get(`assemblies/${assemblyNameOrId}`);
153
+ }
154
+ const assemblies = (await this.get('assemblies'));
155
+ for (const assembly of assemblies) {
156
+ if (assembly.name === assemblyNameOrId ||
157
+ assembly.aliases?.includes(assemblyNameOrId)) {
158
+ return assembly;
159
+ }
160
+ }
161
+ throw new Error(`Could not find assembly: "${assemblyNameOrId}"`);
162
+ }
163
+ async getRefseqId(refseqNameOrId, inAssemblyNameOrId) {
164
+ if (refseqNameOrId === undefined && inAssemblyNameOrId === undefined) {
165
+ throw new Error('Please provide refseq and/or assembly');
166
+ }
167
+ inAssemblyNameOrId ??= '';
168
+ let assemblyId = [];
169
+ if (inAssemblyNameOrId !== '') {
170
+ assemblyId = await this.convertAssemblyNameToId([inAssemblyNameOrId]);
171
+ if (assemblyId.length !== 1) {
172
+ throw new Error(`Assembly name or assembly id returned ${assemblyId.length} assemblies instead of just one`);
173
+ }
174
+ }
175
+ const refSeqs = (await this.get('refSeqs'));
176
+ const refseqIds = [];
177
+ const nAssemblies = new Set();
178
+ for (const x of refSeqs) {
179
+ const aid = x['assembly'];
180
+ const rid = x['_id'];
181
+ const rname = x['name'];
182
+ if (refseqNameOrId === rid ||
183
+ refseqNameOrId === rname ||
184
+ refseqNameOrId === undefined) {
185
+ if (inAssemblyNameOrId === '' || assemblyId.includes(aid)) {
186
+ refseqIds.push(rid);
187
+ nAssemblies.add(aid);
188
+ }
189
+ else {
190
+ //
191
+ }
192
+ }
193
+ if (nAssemblies.size > 1) {
194
+ throw new Error(`Sequence name "${refseqNameOrId}" found in more than one assembly`);
195
+ }
196
+ }
197
+ return refseqIds;
198
+ }
199
+ async getFeatureById(id) {
200
+ return this.get(`features/${id}`);
201
+ }
202
+ async deleteAssembly(assemblyId) {
203
+ const body = {
204
+ typeName: 'DeleteAssemblyChange',
205
+ assembly: assemblyId,
206
+ };
207
+ await this.post('changes', JSON.stringify(body));
208
+ }
209
+ async submitAssembly(body, force) {
210
+ let assemblies = (await this.get('assemblies'));
211
+ for (const x of assemblies) {
212
+ const addedAssemblies = 'changes' in body ? body.changes : [body];
213
+ for (const addedAssembly of addedAssemblies) {
214
+ if (x.name === addedAssembly.assemblyName) {
215
+ if (force) {
216
+ await this.deleteAssembly(x._id);
217
+ }
218
+ else {
219
+ throw new Error(`Error: Assembly "${addedAssembly.assemblyName}" already exists`);
220
+ }
221
+ }
222
+ }
223
+ }
224
+ await this.post('changes', JSON.stringify(body));
225
+ assemblies = (await this.get('assemblies'));
226
+ for (const x of assemblies) {
227
+ const addedAssemblies = 'changes' in body ? body.changes : [body];
228
+ for (const addedAssembly of addedAssemblies) {
229
+ if (x.name === addedAssembly.assemblyName) {
230
+ return x;
231
+ }
232
+ }
233
+ }
234
+ throw new Error(`Failed to retrieve assembly from ${body.assembly}`);
235
+ }
236
+ async checkNameToIdDict() {
237
+ const ja = (await this.get('checks/types')); // Not sure if CheckResultSnapshot is the right interface
238
+ const nameToId = {};
239
+ for (const x of ja) {
240
+ const { _id, name } = x; // x['name' as keyof typeof x]
241
+ nameToId[name] = _id; // x['_id' as keyof typeof x]
242
+ }
243
+ return nameToId;
244
+ }
245
+ async convertCheckNameToId(namesOrIds) {
246
+ const nameToId = await this.checkNameToIdDict();
247
+ const ids = [];
248
+ for (const x of namesOrIds) {
249
+ if (nameToId[x] !== undefined) {
250
+ ids.push(nameToId[x]);
251
+ }
252
+ else if (Object.values(nameToId).includes(x)) {
253
+ ids.push(x);
254
+ }
255
+ else {
256
+ throw new CheckError(`Check name or id "${x}" not found`);
257
+ }
258
+ }
259
+ return ids;
260
+ }
261
+ async getAssemblyFromRefseq(refSeq) {
262
+ const refSeqs = (await this.get('refSeqs'));
263
+ const refJson = filterJsonList(refSeqs, [refSeq], '_id');
264
+ return refJson[0]['assembly'];
265
+ }
49
266
  }
50
267
  //# sourceMappingURL=baseCommand.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"baseCommand.js","sourceRoot":"","sources":["../src/baseCommand.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAmB,MAAM,aAAa,CAAA;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAMlD,MAAM,OAAgB,WAAsC,SAAQ,OAAO;IACzE,MAAM,CAAC,SAAS,GAAG;QACjB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,WAAW,EAAE,mCAAmC;SACjD,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,WAAW,EAAE,2CAA2C;SACzD,CAAC;KACH,CAAA;IAES,KAAK,CAAW;IAChB,IAAI,CAAU;IAEjB,KAAK,CAAC,IAAI;QACf,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAClB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YACvC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YACtB,SAAS,EAAG,KAAK,CAAC,IAA2B,CAAC,SAAS;YACvD,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACpB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;SACzB,CAAC,CAAA;QACF,IAAI,CAAC,KAAK,GAAG,KAAiB,CAAA;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAe,CAAA;IAC7B,CAAC;IAEO,SAAS,CAAC,UAA8B;QAC9C,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;QAC7D,qBAAqB,CAAC,UAAU,CAAC,CAAA;QACjC,MAAM,MAAM,GAAe,IAAI,UAAU,CAAC,UAAU,CAAC,CAAA;QACrD,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,SAAS;QACpB,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QACzD,MAAM,MAAM,GAAe,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QAErD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,IAAI,SAAS,CAAA;QAEtE,OAAO,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IACtC,CAAC;IAES,KAAK,CAAC,KAAK,CAAC,GAAkC;QACtD,IAAI,GAAG,CAAC,KAAK,YAAY,KAAK,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAC1B,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACzB,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,CAAoB;QAC1C,8EAA8E;QAC9E,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IACzB,CAAC"}
1
+ {"version":3,"file":"baseCommand.js","sourceRoot":"","sources":["../src/baseCommand.ts"],"names":[],"mappings":"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"}
@@ -7,16 +7,16 @@ export default class AddFasta extends FileCommand {
7
7
  command: string;
8
8
  }[];
9
9
  static args: {
10
- input: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
10
+ input: 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 | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
14
- force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
15
- editable: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
16
- fai: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
17
- gzi: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
18
- gzip: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
19
- decompressed: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
13
+ assembly: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
14
+ force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
15
+ editable: import("@oclif/core/interfaces").BooleanFlag<boolean>;
16
+ fai: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
17
+ gzi: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
18
+ gzip: import("@oclif/core/interfaces").BooleanFlag<boolean>;
19
+ decompressed: import("@oclif/core/interfaces").BooleanFlag<boolean>;
20
20
  };
21
21
  run(): Promise<void>;
22
22
  }
@@ -1 +1 @@
1
- {"version":3,"file":"add-from-fasta.d.ts","sourceRoot":"","sources":["../../../src/commands/assembly/add-from-fasta.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAC/C,MAAM,CAAC,OAAO,SAAwC;IACtD,MAAM,CAAC,WAAW,SAGiC;IAEnD,MAAM,CAAC,QAAQ;;;QAiBd;IAED,MAAM,CAAC,IAAI;;MAUV;IAED,MAAM,CAAC,KAAK;;;;;;;;MAkCX;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAyIlC"}
1
+ {"version":3,"file":"add-from-fasta.d.ts","sourceRoot":"","sources":["../../../src/commands/assembly/add-from-fasta.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAC/C,MAAM,CAAC,OAAO,SAAwC;IACtD,MAAM,CAAC,WAAW,SAGiC;IAEnD,MAAM,CAAC,QAAQ;;;QAiBd;IAED,MAAM,CAAC,IAAI;;MAUV;IAED,MAAM,CAAC,KAAK;;;;;;;;MAkCX;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkGlC"}
@@ -4,7 +4,6 @@ import path from 'node:path';
4
4
  import { Args, Flags } from '@oclif/core';
5
5
  import { ObjectId } from 'bson';
6
6
  import { FileCommand } from '../../fileCommand.js';
7
- import { isFileId, submitAssembly } from '../../utils.js';
8
7
  export default class AddFasta extends FileCommand {
9
8
  static summary = 'Add a new assembly from fasta input';
10
9
  static description = `Add new assembly. The input fasta may be:
@@ -69,9 +68,8 @@ often has unintended side effects.',
69
68
  };
70
69
  async run() {
71
70
  const { args, flags } = await this.parse(AddFasta);
72
- const access = await this.getAccess();
73
71
  const assemblyName = flags.assembly ?? path.basename(args.input);
74
- const fastaIsFileId = await isFileId(args.input, access.address, access.accessToken);
72
+ const fastaIsFileId = await this.isFileId(args.input);
75
73
  const isExternal = isValidHttpUrl(args.input);
76
74
  let body;
77
75
  if (isExternal) {
@@ -79,14 +77,20 @@ often has unintended side effects.',
79
77
  this.error(`External fasta files are not editable. The -e/--editable has been set with an external input file.`);
80
78
  }
81
79
  const fai = flags.fai ?? `${args.input}.fai`;
82
- const faiExists = await fetch(fai);
83
- if (!faiExists.ok) {
84
- this.error(`Index file ${fai} does not exist`);
80
+ const faiResponse = await this.fetchWithoutCheck(fai, { method: 'HEAD' });
81
+ if (faiResponse.status === 404) {
82
+ this.error(`Index file does not exist: ${fai}`);
83
+ }
84
+ else if (!faiResponse.ok) {
85
+ this.error(`Could not access index file ${fai}`);
85
86
  }
86
87
  const gzi = flags.gzi ?? `${args.input}.gzi`;
87
- const gziExists = await fetch(gzi);
88
- if (!gziExists.ok) {
89
- this.error(`Index file ${gzi} does not exist`);
88
+ const gziResponse = await this.fetchWithoutCheck(gzi, { method: 'HEAD' });
89
+ if (gziResponse.status === 404) {
90
+ this.error(`Index file does not exist: ${gzi}`);
91
+ }
92
+ else if (!gziResponse.ok) {
93
+ this.error(`Could not access index file ${gzi}`);
90
94
  }
91
95
  body = {
92
96
  assemblyName,
@@ -108,7 +112,7 @@ often has unintended side effects.',
108
112
  }
109
113
  const fileId = fastaIsFileId
110
114
  ? args.input
111
- : await this.uploadFile(access.address, access.accessToken, args.input, 'text/x-fasta', isGzip);
115
+ : await this.uploadFile(args.input, 'text/x-fasta', isGzip);
112
116
  body = {
113
117
  assemblyName,
114
118
  fileIds: { fa: fileId },
@@ -119,8 +123,8 @@ often has unintended side effects.',
119
123
  else {
120
124
  const gzi = flags.gzi ?? `${args.input}.gzi`;
121
125
  const fai = flags.fai ?? `${args.input}.fai`;
122
- const gziIsFileId = await isFileId(gzi, access.address, access.accessToken);
123
- const faiIsFileId = await isFileId(fai, access.address, access.accessToken);
126
+ const gziIsFileId = await this.isFileId(gzi);
127
+ const faiIsFileId = await this.isFileId(fai);
124
128
  if (!fs.existsSync(gzi) && !gziIsFileId && !flags.editable) {
125
129
  this.error(`Only bgzip'd and indexed fasta files are supported unless option -e/--editable is set. "${gzi}" is neither a file or a file id`);
126
130
  }
@@ -129,13 +133,13 @@ often has unintended side effects.',
129
133
  }
130
134
  const faId = fastaIsFileId
131
135
  ? args.input
132
- : await this.uploadFile(access.address, access.accessToken, args.input, 'application/x-bgzip-fasta', true);
136
+ : await this.uploadFile(args.input, 'application/x-bgzip-fasta', true);
133
137
  const faiId = faiIsFileId
134
138
  ? fai
135
- : await this.uploadFile(access.address, access.accessToken, fai, 'text/x-fai', false);
139
+ : await this.uploadFile(fai, 'text/x-fai', false);
136
140
  const gziId = gziIsFileId
137
141
  ? gzi
138
- : await this.uploadFile(access.address, access.accessToken, gzi, 'application/x-gzi', false);
142
+ : await this.uploadFile(gzi, 'application/x-gzi', false);
139
143
  body = {
140
144
  assemblyName,
141
145
  typeName: 'AddAssemblyFromFileChange',
@@ -143,7 +147,7 @@ often has unintended side effects.',
143
147
  assembly: new ObjectId().toHexString(),
144
148
  };
145
149
  }
146
- const rec = await submitAssembly(access.address, access.accessToken, body, flags.force);
150
+ const rec = await this.submitAssembly(body, flags.force);
147
151
  this.log(JSON.stringify(rec, null, 2));
148
152
  }
149
153
  }
@@ -1 +1 @@
1
- {"version":3,"file":"add-from-fasta.js","sourceRoot":"","sources":["../../../src/commands/assembly/add-from-fasta.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-from-fasta.js","sourceRoot":"","sources":["../../../src/commands/assembly/add-from-fasta.ts"],"names":[],"mappings":"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"}
@@ -7,13 +7,13 @@ export default class AddGff extends FileCommand {
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 | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
14
- 'omit-features': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
15
- force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
16
- 'no-strict': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
13
+ assembly: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
14
+ 'omit-features': import("@oclif/core/interfaces").BooleanFlag<boolean>;
15
+ force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
16
+ 'no-strict': import("@oclif/core/interfaces").BooleanFlag<boolean>;
17
17
  };
18
18
  run(): Promise<void>;
19
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"add-from-gff.d.ts","sourceRoot":"","sources":["../../../src/commands/assembly/add-from-gff.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW;IAC7C,MAAM,CAAC,OAAO,SAA0C;IACxD,MAAM,CAAC,WAAW,SACiG;IAEnH,MAAM,CAAC,QAAQ;;;QAUd;IAED,MAAM,CAAC,IAAI;;MAKV;IAED,MAAM,CAAC,KAAK;;;;;MAiBX;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA4ClC"}
1
+ {"version":3,"file":"add-from-gff.d.ts","sourceRoot":"","sources":["../../../src/commands/assembly/add-from-gff.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW;IAC7C,MAAM,CAAC,OAAO,SAA0C;IACxD,MAAM,CAAC,WAAW,SACiG;IAEnH,MAAM,CAAC,QAAQ;;;QAUd;IAED,MAAM,CAAC,IAAI;;MAKV;IAED,MAAM,CAAC,KAAK;;;;;MAiBX;IAEY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAmClC"}