@jbrowse/plugin-legacy-jbrowse 2.5.0 → 2.6.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 (101) hide show
  1. package/dist/GuessNCList/index.js +0 -1
  2. package/dist/JBrowse1Connection/configSchema.js +0 -1
  3. package/dist/JBrowse1Connection/index.js +0 -1
  4. package/dist/JBrowse1Connection/jb1ConfigLoad.js +0 -1
  5. package/dist/JBrowse1Connection/jb1ConfigParse.js +1 -2
  6. package/dist/JBrowse1Connection/jb1ToJb2.js +2 -3
  7. package/dist/JBrowse1Connection/model.d.ts +13 -1
  8. package/dist/JBrowse1Connection/model.js +40 -19
  9. package/dist/JBrowse1Connection/types.js +0 -1
  10. package/dist/JBrowse1Connection/util.d.ts +1 -0
  11. package/dist/JBrowse1Connection/util.js +4 -7
  12. package/dist/JBrowse1TextSearchAdapter/HttpMap.js +0 -1
  13. package/dist/JBrowse1TextSearchAdapter/JBrowse1TextSearchAdapter.js +0 -1
  14. package/dist/JBrowse1TextSearchAdapter/configSchema.js +0 -1
  15. package/dist/JBrowse1TextSearchAdapter/index.js +0 -1
  16. package/dist/NCListAdapter/NCListAdapter.js +0 -1
  17. package/dist/NCListAdapter/NCListFeature.js +1 -3
  18. package/dist/NCListAdapter/configSchema.js +0 -1
  19. package/dist/NCListAdapter/index.js +0 -1
  20. package/dist/index.js +0 -1
  21. package/esm/GuessNCList/index.js +0 -1
  22. package/esm/JBrowse1Connection/configSchema.js +0 -1
  23. package/esm/JBrowse1Connection/index.js +0 -1
  24. package/esm/JBrowse1Connection/jb1ConfigLoad.js +0 -1
  25. package/esm/JBrowse1Connection/jb1ConfigParse.js +1 -2
  26. package/esm/JBrowse1Connection/jb1ToJb2.js +2 -3
  27. package/esm/JBrowse1Connection/model.d.ts +13 -1
  28. package/esm/JBrowse1Connection/model.js +18 -20
  29. package/esm/JBrowse1Connection/types.js +0 -1
  30. package/esm/JBrowse1Connection/util.d.ts +1 -0
  31. package/esm/JBrowse1Connection/util.js +4 -7
  32. package/esm/JBrowse1TextSearchAdapter/HttpMap.js +0 -1
  33. package/esm/JBrowse1TextSearchAdapter/JBrowse1TextSearchAdapter.js +0 -1
  34. package/esm/JBrowse1TextSearchAdapter/configSchema.js +0 -1
  35. package/esm/JBrowse1TextSearchAdapter/index.js +0 -1
  36. package/esm/NCListAdapter/NCListAdapter.js +0 -1
  37. package/esm/NCListAdapter/NCListFeature.js +1 -3
  38. package/esm/NCListAdapter/configSchema.js +0 -1
  39. package/esm/NCListAdapter/index.js +0 -1
  40. package/esm/index.js +0 -1
  41. package/package.json +3 -4
  42. package/dist/GuessNCList/index.js.map +0 -1
  43. package/dist/JBrowse1Connection/configSchema.js.map +0 -1
  44. package/dist/JBrowse1Connection/index.js.map +0 -1
  45. package/dist/JBrowse1Connection/jb1ConfigLoad.js.map +0 -1
  46. package/dist/JBrowse1Connection/jb1ConfigParse.js.map +0 -1
  47. package/dist/JBrowse1Connection/jb1ToJb2.js.map +0 -1
  48. package/dist/JBrowse1Connection/model.js.map +0 -1
  49. package/dist/JBrowse1Connection/types.js.map +0 -1
  50. package/dist/JBrowse1Connection/util.js.map +0 -1
  51. package/dist/JBrowse1TextSearchAdapter/HttpMap.js.map +0 -1
  52. package/dist/JBrowse1TextSearchAdapter/JBrowse1TextSearchAdapter.js.map +0 -1
  53. package/dist/JBrowse1TextSearchAdapter/configSchema.js.map +0 -1
  54. package/dist/JBrowse1TextSearchAdapter/index.js.map +0 -1
  55. package/dist/NCListAdapter/NCListAdapter.js.map +0 -1
  56. package/dist/NCListAdapter/NCListFeature.js.map +0 -1
  57. package/dist/NCListAdapter/configSchema.js.map +0 -1
  58. package/dist/NCListAdapter/index.js.map +0 -1
  59. package/dist/index.js.map +0 -1
  60. package/esm/GuessNCList/index.js.map +0 -1
  61. package/esm/JBrowse1Connection/configSchema.js.map +0 -1
  62. package/esm/JBrowse1Connection/index.js.map +0 -1
  63. package/esm/JBrowse1Connection/jb1ConfigLoad.js.map +0 -1
  64. package/esm/JBrowse1Connection/jb1ConfigParse.js.map +0 -1
  65. package/esm/JBrowse1Connection/jb1ToJb2.js.map +0 -1
  66. package/esm/JBrowse1Connection/model.js.map +0 -1
  67. package/esm/JBrowse1Connection/types.js.map +0 -1
  68. package/esm/JBrowse1Connection/util.js.map +0 -1
  69. package/esm/JBrowse1TextSearchAdapter/HttpMap.js.map +0 -1
  70. package/esm/JBrowse1TextSearchAdapter/JBrowse1TextSearchAdapter.js.map +0 -1
  71. package/esm/JBrowse1TextSearchAdapter/configSchema.js.map +0 -1
  72. package/esm/JBrowse1TextSearchAdapter/index.js.map +0 -1
  73. package/esm/NCListAdapter/NCListAdapter.js.map +0 -1
  74. package/esm/NCListAdapter/NCListFeature.js.map +0 -1
  75. package/esm/NCListAdapter/configSchema.js.map +0 -1
  76. package/esm/NCListAdapter/index.js.map +0 -1
  77. package/esm/index.js.map +0 -1
  78. package/src/GuessNCList/index.ts +0 -27
  79. package/src/JBrowse1Connection/configSchema.ts +0 -42
  80. package/src/JBrowse1Connection/index.ts +0 -20
  81. package/src/JBrowse1Connection/jb1ConfigLoad.ts +0 -342
  82. package/src/JBrowse1Connection/jb1ConfigParse.ts +0 -423
  83. package/src/JBrowse1Connection/jb1ToJb2.ts +0 -529
  84. package/src/JBrowse1Connection/model.tsx +0 -77
  85. package/src/JBrowse1Connection/types.ts +0 -105
  86. package/src/JBrowse1Connection/util.ts +0 -151
  87. package/src/JBrowse1TextSearchAdapter/HttpMap.test.ts +0 -49
  88. package/src/JBrowse1TextSearchAdapter/HttpMap.ts +0 -100
  89. package/src/JBrowse1TextSearchAdapter/JBrowse1TextSearchAdapter.test.ts +0 -101
  90. package/src/JBrowse1TextSearchAdapter/JBrowse1TextSearchAdapter.ts +0 -100
  91. package/src/JBrowse1TextSearchAdapter/configSchema.ts +0 -44
  92. package/src/JBrowse1TextSearchAdapter/index.ts +0 -18
  93. package/src/NCListAdapter/NCListAdapter.test.ts +0 -58
  94. package/src/NCListAdapter/NCListAdapter.ts +0 -92
  95. package/src/NCListAdapter/NCListFeature.ts +0 -95
  96. package/src/NCListAdapter/__snapshots__/NCListAdapter.test.ts.snap +0 -30671
  97. package/src/NCListAdapter/configSchema.ts +0 -32
  98. package/src/NCListAdapter/index.ts +0 -16
  99. package/src/__snapshots__/index.test.ts.snap +0 -16
  100. package/src/index.test.ts +0 -35
  101. package/src/index.ts +0 -17
@@ -17,4 +17,3 @@ exports.default = (pluginManager) => {
17
17
  };
18
18
  });
19
19
  };
20
- //# sourceMappingURL=index.js.map
@@ -33,4 +33,3 @@ const JBrowse1Connection = (0, configuration_1.ConfigurationSchema)('JBrowse1Con
33
33
  baseConfiguration: models_1.baseConnectionConfig,
34
34
  });
35
35
  exports.default = JBrowse1Connection;
36
- //# sourceMappingURL=configSchema.js.map
@@ -17,4 +17,3 @@ exports.default = (pluginManager) => {
17
17
  url: '//jbrowse.org/',
18
18
  }));
19
19
  };
20
- //# sourceMappingURL=index.js.map
@@ -291,4 +291,3 @@ function validateConfig(config) {
291
291
  throw new Error('Must provide a `baseUrl` in configuration');
292
292
  }
293
293
  }
294
- //# sourceMappingURL=jb1ConfigLoad.js.map
@@ -58,7 +58,7 @@ function parse(text, url) {
58
58
  }
59
59
  // parse numbers if it looks numeric
60
60
  else if (/^[+-]?[\d.,]+([eE][-+]?\d+)?$/.test(value)) {
61
- parsedValue = parseFloat(value.replace(/,/g, ''));
61
+ parsedValue = parseFloat(value.replaceAll(',', ''));
62
62
  }
63
63
  else {
64
64
  parsedValue = value;
@@ -377,4 +377,3 @@ function synthesizeTrackStoreConfig(mainConf, trackConfig) {
377
377
  // connect it to the track conf
378
378
  trackConfig.store = storeConf.name;
379
379
  }
380
- //# sourceMappingURL=jb1ConfigParse.js.map
@@ -28,8 +28,8 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
28
28
  }
29
29
  const resolveUrlTemplate = (urlTemplate) => {
30
30
  return new URL(urlTemplate, `${dataRoot}/`).href
31
- .replace(/%7B/gi, '{')
32
- .replace(/%7D/gi, '}');
31
+ .replaceAll(/%7B/gi, '{')
32
+ .replaceAll(/%7D/gi, '}');
33
33
  };
34
34
  const urlTemplate = resolveUrlTemplate(jb1TrackConfig.urlTemplate);
35
35
  if (storeClass) {
@@ -414,4 +414,3 @@ function refSeqAdapterFromConfig(refSeqsData) {
414
414
  features,
415
415
  };
416
416
  }
417
- //# sourceMappingURL=jb1ToJb2.js.map
@@ -2,6 +2,18 @@ import PluginManager from '@jbrowse/core/PluginManager';
2
2
  export default function (pluginManager: PluginManager): import("mobx-state-tree").IModelType<{
3
3
  name: import("mobx-state-tree").ISimpleType<string>;
4
4
  tracks: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IAnyModelType>;
5
+ configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
6
+ name: {
7
+ type: string;
8
+ defaultValue: string;
9
+ description: string;
10
+ };
11
+ assemblyNames: {
12
+ type: string;
13
+ defaultValue: never[];
14
+ description: string;
15
+ };
16
+ }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "connectionId">>;
5
17
  } & {
6
18
  configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
7
19
  dataDirLocation: {
@@ -49,5 +61,5 @@ export default function (pluginManager: PluginManager): import("mobx-state-tree"
49
61
  } & import("mobx-state-tree").IStateTreeNode<import("@jbrowse/core/configuration").AnyConfigurationSchemaType>)[]): import("mobx-state-tree").IMSTArray<import("mobx-state-tree").IAnyModelType> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IAnyModelType>>;
50
62
  clear(): void;
51
63
  } & {
52
- connect(): void;
64
+ connect(): Promise<void>;
53
65
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
@@ -1,4 +1,27 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
27
  };
@@ -7,9 +30,8 @@ const configuration_1 = require("@jbrowse/core/configuration");
7
30
  const util_1 = require("@jbrowse/core/util");
8
31
  const models_1 = require("@jbrowse/core/pluggableElementTypes/models");
9
32
  const mobx_state_tree_1 = require("mobx-state-tree");
33
+ // locals
10
34
  const configSchema_1 = __importDefault(require("./configSchema"));
11
- const jb1ConfigLoad_1 = require("./jb1ConfigLoad");
12
- const jb1ToJb2_1 = require("./jb1ToJb2");
13
35
  function default_1(pluginManager) {
14
36
  return mobx_state_tree_1.types
15
37
  .compose('JBrowse1Connection', (0, models_1.BaseConnectionModelFactory)(pluginManager), mobx_state_tree_1.types.model({
@@ -17,17 +39,19 @@ function default_1(pluginManager) {
17
39
  type: mobx_state_tree_1.types.literal('JBrowse1Connection'),
18
40
  }))
19
41
  .actions(self => ({
20
- connect() {
21
- const dataDirLocation = (0, configuration_1.readConfObject)(self.configuration, 'dataDirLocation');
42
+ async connect() {
43
+ var _a;
22
44
  const session = (0, util_1.getSession)(self);
23
- (0, jb1ConfigLoad_1.fetchJb1)(dataDirLocation)
24
- .then(config => {
25
- var _a;
26
- const assemblyName = (0, configuration_1.readConfObject)(self.configuration, 'assemblyNames')[0];
45
+ try {
46
+ const dataDirLocation = (0, configuration_1.getConf)(self, 'dataDirLocation');
47
+ const { fetchJb1 } = await Promise.resolve().then(() => __importStar(require('./jb1ConfigLoad')));
48
+ const { convertTrackConfig } = await Promise.resolve().then(() => __importStar(require('./jb1ToJb2')));
49
+ const config = await fetchJb1(dataDirLocation);
50
+ const assemblyName = (0, configuration_1.getConf)(self, 'assemblyNames')[0];
27
51
  if (!assemblyName) {
28
52
  throw new Error('assembly name required for JBrowse 1 connection');
29
53
  }
30
- const assemblyConf = session.assemblies.find(assembly => (0, configuration_1.readConfObject)(assembly, 'name') === assemblyName);
54
+ const assemblyConf = session.assemblies.find(a => (0, configuration_1.readConfObject)(a, 'name') === assemblyName);
31
55
  if (!assemblyConf) {
32
56
  throw new Error(`Assembly "${assemblyName}" not found`);
33
57
  }
@@ -36,21 +60,18 @@ function default_1(pluginManager) {
36
60
  'adapter',
37
61
  ]);
38
62
  // @ts-expect-error
39
- const jb2Tracks = (_a = config.tracks) === null || _a === void 0 ? void 0 : _a.map(jb1Track => {
40
- const jb2Track = (0, jb1ToJb2_1.convertTrackConfig)(jb1Track, config.dataRoot || '', sequenceAdapter);
41
- // @ts-expect-error
42
- jb2Track.assemblyNames = [assemblyName];
43
- return jb2Track;
44
- });
63
+ const jb2Tracks = (_a = config.tracks) === null || _a === void 0 ? void 0 : _a.map(jb1Track => ({
64
+ ...convertTrackConfig(jb1Track, config.dataRoot || '', sequenceAdapter),
65
+ assemblyNames: [assemblyName],
66
+ }));
45
67
  self.setTrackConfs(jb2Tracks);
46
- })
47
- .catch(error => {
68
+ }
69
+ catch (error) {
48
70
  console.error(error);
49
71
  session.notify(`There was a problem connecting to the JBrowse 1 data directory "${self.name}". Please make sure you have entered a valid location. The error that was thrown is: "${error}"`, 'error');
50
72
  session.breakConnection(self.configuration);
51
- });
73
+ }
52
74
  },
53
75
  }));
54
76
  }
55
77
  exports.default = default_1;
56
- //# sourceMappingURL=model.js.map
@@ -1,3 +1,2 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=types.js.map
@@ -8,6 +8,7 @@ type Obj = Record<string, any>;
8
8
  export declare function deepUpdate(a: Obj, b: Obj): Obj;
9
9
  /**
10
10
  * replace variables in a template string with values
11
+ *
11
12
  * @param template - String with variable names in curly brackets
12
13
  * e.g., `http://foo/{bar}?arg={baz.foo}`
13
14
  * @param fillWith - object with attribute-value mappings
@@ -31,6 +31,7 @@ function deepUpdate(a, b) {
31
31
  exports.deepUpdate = deepUpdate;
32
32
  /**
33
33
  * replace variables in a template string with values
34
+ *
34
35
  * @param template - String with variable names in curly brackets
35
36
  * e.g., `http://foo/{bar}?arg={baz.foo}`
36
37
  * @param fillWith - object with attribute-value mappings
@@ -39,14 +40,11 @@ exports.deepUpdate = deepUpdate;
39
40
  * e.g., 'htp://foo/someurl?arg=valueforbaz'
40
41
  */
41
42
  function fillTemplate(template, fillWith) {
42
- return template.replace(/{([\s\w.]+)}/g, (match, varName) => {
43
- varName = varName.replace(/\s+/g, ''); // remove all whitespace
43
+ return template.replaceAll(/{([\s\w.]+)}/g, (match, varName) => {
44
+ varName = varName.replaceAll(/\s+/g, '');
44
45
  const fill = (0, get_value_1.default)(fillWith, varName);
45
46
  if (fill !== undefined) {
46
- if (typeof fill === 'function') {
47
- return fill(varName);
48
- }
49
- return fill;
47
+ return typeof fill === 'function' ? fill(varName) : fill;
50
48
  }
51
49
  if (fillWith.callback) {
52
50
  // @ts-expect-error
@@ -143,4 +141,3 @@ function mixin(dest, source, copyFunc) {
143
141
  }
144
142
  return dest; // Object
145
143
  }
146
- //# sourceMappingURL=util.js.map
@@ -92,4 +92,3 @@ class HttpMap {
92
92
  }
93
93
  }
94
94
  exports.default = HttpMap;
95
- //# sourceMappingURL=HttpMap.js.map
@@ -63,4 +63,3 @@ class JBrowse1TextSearchAdapter extends BaseAdapter_1.BaseAdapter {
63
63
  freeResources() { }
64
64
  }
65
65
  exports.default = JBrowse1TextSearchAdapter;
66
- //# sourceMappingURL=JBrowse1TextSearchAdapter.js.map
@@ -38,4 +38,3 @@ exports.default = (0, configuration_1.ConfigurationSchema)('JBrowse1TextSearchAd
38
38
  */
39
39
  explicitIdentifier: 'textSearchAdapterId',
40
40
  });
41
- //# sourceMappingURL=configSchema.js.map
@@ -15,4 +15,3 @@ exports.default = (pluginManager) => {
15
15
  description: 'A JBrowse 1 text search adapter',
16
16
  }));
17
17
  };
18
- //# sourceMappingURL=index.js.map
@@ -63,4 +63,3 @@ class NCListAdapter extends BaseAdapter_1.BaseFeatureDataAdapter {
63
63
  freeResources() { }
64
64
  }
65
65
  exports.default = NCListAdapter;
66
- //# sourceMappingURL=NCListAdapter.js.map
@@ -23,8 +23,7 @@ class NCListFeature {
23
23
  jb1TagToJb2Tag(tag) {
24
24
  const t = tag.toLowerCase();
25
25
  // @ts-expect-error
26
- const mapped = jb1ToJb2[t] || t;
27
- return mapped;
26
+ return jb1ToJb2[t] || t;
28
27
  }
29
28
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
30
29
  get(attrName) {
@@ -78,4 +77,3 @@ class NCListFeature {
78
77
  }
79
78
  }
80
79
  exports.default = NCListFeature;
81
- //# sourceMappingURL=NCListFeature.js.map
@@ -26,4 +26,3 @@ const NCListAdapter = (0, configuration_1.ConfigurationSchema)('NCListAdapter',
26
26
  },
27
27
  }, { explicitlyTyped: true });
28
28
  exports.default = NCListAdapter;
29
- //# sourceMappingURL=configSchema.js.map
@@ -36,4 +36,3 @@ exports.default = (pluginManager) => {
36
36
  getAdapterClass: () => Promise.resolve().then(() => __importStar(require('./NCListAdapter'))).then(r => r.default),
37
37
  }));
38
38
  };
39
- //# sourceMappingURL=index.js.map
package/dist/index.js CHANGED
@@ -21,4 +21,3 @@ class LegacyJBrowsePlugin extends Plugin_1.default {
21
21
  }
22
22
  }
23
23
  exports.default = LegacyJBrowsePlugin;
24
- //# sourceMappingURL=index.js.map
@@ -15,4 +15,3 @@ export default (pluginManager) => {
15
15
  };
16
16
  });
17
17
  };
18
- //# sourceMappingURL=index.js.map
@@ -31,4 +31,3 @@ const JBrowse1Connection = ConfigurationSchema('JBrowse1Connection', {
31
31
  baseConfiguration: baseConnectionConfig,
32
32
  });
33
33
  export default JBrowse1Connection;
34
- //# sourceMappingURL=configSchema.js.map
@@ -12,4 +12,3 @@ export default (pluginManager) => {
12
12
  url: '//jbrowse.org/',
13
13
  }));
14
14
  };
15
- //# sourceMappingURL=index.js.map
@@ -284,4 +284,3 @@ function validateConfig(config) {
284
284
  throw new Error('Must provide a `baseUrl` in configuration');
285
285
  }
286
286
  }
287
- //# sourceMappingURL=jb1ConfigLoad.js.map
@@ -50,7 +50,7 @@ function parse(text, url) {
50
50
  }
51
51
  // parse numbers if it looks numeric
52
52
  else if (/^[+-]?[\d.,]+([eE][-+]?\d+)?$/.test(value)) {
53
- parsedValue = parseFloat(value.replace(/,/g, ''));
53
+ parsedValue = parseFloat(value.replaceAll(',', ''));
54
54
  }
55
55
  else {
56
56
  parsedValue = value;
@@ -368,4 +368,3 @@ function synthesizeTrackStoreConfig(mainConf, trackConfig) {
368
368
  // connect it to the track conf
369
369
  trackConfig.store = storeConf.name;
370
370
  }
371
- //# sourceMappingURL=jb1ConfigParse.js.map
@@ -25,8 +25,8 @@ export function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
25
25
  }
26
26
  const resolveUrlTemplate = (urlTemplate) => {
27
27
  return new URL(urlTemplate, `${dataRoot}/`).href
28
- .replace(/%7B/gi, '{')
29
- .replace(/%7D/gi, '}');
28
+ .replaceAll(/%7B/gi, '{')
29
+ .replaceAll(/%7D/gi, '}');
30
30
  };
31
31
  const urlTemplate = resolveUrlTemplate(jb1TrackConfig.urlTemplate);
32
32
  if (storeClass) {
@@ -409,4 +409,3 @@ function refSeqAdapterFromConfig(refSeqsData) {
409
409
  features,
410
410
  };
411
411
  }
412
- //# sourceMappingURL=jb1ToJb2.js.map
@@ -2,6 +2,18 @@ import PluginManager from '@jbrowse/core/PluginManager';
2
2
  export default function (pluginManager: PluginManager): import("mobx-state-tree").IModelType<{
3
3
  name: import("mobx-state-tree").ISimpleType<string>;
4
4
  tracks: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IAnyModelType>;
5
+ configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
6
+ name: {
7
+ type: string;
8
+ defaultValue: string;
9
+ description: string;
10
+ };
11
+ assemblyNames: {
12
+ type: string;
13
+ defaultValue: never[];
14
+ description: string;
15
+ };
16
+ }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "connectionId">>;
5
17
  } & {
6
18
  configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
7
19
  dataDirLocation: {
@@ -49,5 +61,5 @@ export default function (pluginManager: PluginManager): import("mobx-state-tree"
49
61
  } & import("mobx-state-tree").IStateTreeNode<import("@jbrowse/core/configuration").AnyConfigurationSchemaType>)[]): import("mobx-state-tree").IMSTArray<import("mobx-state-tree").IAnyModelType> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IAnyModelType>>;
50
62
  clear(): void;
51
63
  } & {
52
- connect(): void;
64
+ connect(): Promise<void>;
53
65
  }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
@@ -1,10 +1,9 @@
1
- import { ConfigurationReference, readConfObject, } from '@jbrowse/core/configuration';
1
+ import { ConfigurationReference, getConf, readConfObject, } from '@jbrowse/core/configuration';
2
2
  import { getSession } from '@jbrowse/core/util';
3
3
  import { BaseConnectionModelFactory } from '@jbrowse/core/pluggableElementTypes/models';
4
4
  import { types } from 'mobx-state-tree';
5
+ // locals
5
6
  import configSchema from './configSchema';
6
- import { fetchJb1 } from './jb1ConfigLoad';
7
- import { convertTrackConfig } from './jb1ToJb2';
8
7
  export default function (pluginManager) {
9
8
  return types
10
9
  .compose('JBrowse1Connection', BaseConnectionModelFactory(pluginManager), types.model({
@@ -12,17 +11,19 @@ export default function (pluginManager) {
12
11
  type: types.literal('JBrowse1Connection'),
13
12
  }))
14
13
  .actions(self => ({
15
- connect() {
16
- const dataDirLocation = readConfObject(self.configuration, 'dataDirLocation');
14
+ async connect() {
15
+ var _a;
17
16
  const session = getSession(self);
18
- fetchJb1(dataDirLocation)
19
- .then(config => {
20
- var _a;
21
- const assemblyName = readConfObject(self.configuration, 'assemblyNames')[0];
17
+ try {
18
+ const dataDirLocation = getConf(self, 'dataDirLocation');
19
+ const { fetchJb1 } = await import('./jb1ConfigLoad');
20
+ const { convertTrackConfig } = await import('./jb1ToJb2');
21
+ const config = await fetchJb1(dataDirLocation);
22
+ const assemblyName = getConf(self, 'assemblyNames')[0];
22
23
  if (!assemblyName) {
23
24
  throw new Error('assembly name required for JBrowse 1 connection');
24
25
  }
25
- const assemblyConf = session.assemblies.find(assembly => readConfObject(assembly, 'name') === assemblyName);
26
+ const assemblyConf = session.assemblies.find(a => readConfObject(a, 'name') === assemblyName);
26
27
  if (!assemblyConf) {
27
28
  throw new Error(`Assembly "${assemblyName}" not found`);
28
29
  }
@@ -31,20 +32,17 @@ export default function (pluginManager) {
31
32
  'adapter',
32
33
  ]);
33
34
  // @ts-expect-error
34
- const jb2Tracks = (_a = config.tracks) === null || _a === void 0 ? void 0 : _a.map(jb1Track => {
35
- const jb2Track = convertTrackConfig(jb1Track, config.dataRoot || '', sequenceAdapter);
36
- // @ts-expect-error
37
- jb2Track.assemblyNames = [assemblyName];
38
- return jb2Track;
39
- });
35
+ const jb2Tracks = (_a = config.tracks) === null || _a === void 0 ? void 0 : _a.map(jb1Track => ({
36
+ ...convertTrackConfig(jb1Track, config.dataRoot || '', sequenceAdapter),
37
+ assemblyNames: [assemblyName],
38
+ }));
40
39
  self.setTrackConfs(jb2Tracks);
41
- })
42
- .catch(error => {
40
+ }
41
+ catch (error) {
43
42
  console.error(error);
44
43
  session.notify(`There was a problem connecting to the JBrowse 1 data directory "${self.name}". Please make sure you have entered a valid location. The error that was thrown is: "${error}"`, 'error');
45
44
  session.breakConnection(self.configuration);
46
- });
45
+ }
47
46
  },
48
47
  }));
49
48
  }
50
- //# sourceMappingURL=model.js.map
@@ -1,2 +1 @@
1
1
  export {};
2
- //# sourceMappingURL=types.js.map
@@ -8,6 +8,7 @@ type Obj = Record<string, any>;
8
8
  export declare function deepUpdate(a: Obj, b: Obj): Obj;
9
9
  /**
10
10
  * replace variables in a template string with values
11
+ *
11
12
  * @param template - String with variable names in curly brackets
12
13
  * e.g., `http://foo/{bar}?arg={baz.foo}`
13
14
  * @param fillWith - object with attribute-value mappings
@@ -22,6 +22,7 @@ export function deepUpdate(a, b) {
22
22
  }
23
23
  /**
24
24
  * replace variables in a template string with values
25
+ *
25
26
  * @param template - String with variable names in curly brackets
26
27
  * e.g., `http://foo/{bar}?arg={baz.foo}`
27
28
  * @param fillWith - object with attribute-value mappings
@@ -30,14 +31,11 @@ export function deepUpdate(a, b) {
30
31
  * e.g., 'htp://foo/someurl?arg=valueforbaz'
31
32
  */
32
33
  export function fillTemplate(template, fillWith) {
33
- return template.replace(/{([\s\w.]+)}/g, (match, varName) => {
34
- varName = varName.replace(/\s+/g, ''); // remove all whitespace
34
+ return template.replaceAll(/{([\s\w.]+)}/g, (match, varName) => {
35
+ varName = varName.replaceAll(/\s+/g, '');
35
36
  const fill = getValue(fillWith, varName);
36
37
  if (fill !== undefined) {
37
- if (typeof fill === 'function') {
38
- return fill(varName);
39
- }
40
- return fill;
38
+ return typeof fill === 'function' ? fill(varName) : fill;
41
39
  }
42
40
  if (fillWith.callback) {
43
41
  // @ts-expect-error
@@ -132,4 +130,3 @@ function mixin(dest, source, copyFunc) {
132
130
  }
133
131
  return dest; // Object
134
132
  }
135
- //# sourceMappingURL=util.js.map
@@ -86,4 +86,3 @@ export default class HttpMap {
86
86
  .replace('-', 'n');
87
87
  }
88
88
  }
89
- //# sourceMappingURL=HttpMap.js.map
@@ -57,4 +57,3 @@ export default class JBrowse1TextSearchAdapter extends BaseAdapter {
57
57
  }
58
58
  freeResources() { }
59
59
  }
60
- //# sourceMappingURL=JBrowse1TextSearchAdapter.js.map
@@ -36,4 +36,3 @@ export default ConfigurationSchema('JBrowse1TextSearchAdapter', {
36
36
  */
37
37
  explicitIdentifier: 'textSearchAdapterId',
38
38
  });
39
- //# sourceMappingURL=configSchema.js.map
@@ -10,4 +10,3 @@ export default (pluginManager) => {
10
10
  description: 'A JBrowse 1 text search adapter',
11
11
  }));
12
12
  };
13
- //# sourceMappingURL=index.js.map
@@ -57,4 +57,3 @@ export default class NCListAdapter extends BaseFeatureDataAdapter {
57
57
  */
58
58
  freeResources() { }
59
59
  }
60
- //# sourceMappingURL=NCListAdapter.js.map
@@ -21,8 +21,7 @@ export default class NCListFeature {
21
21
  jb1TagToJb2Tag(tag) {
22
22
  const t = tag.toLowerCase();
23
23
  // @ts-expect-error
24
- const mapped = jb1ToJb2[t] || t;
25
- return mapped;
24
+ return jb1ToJb2[t] || t;
26
25
  }
27
26
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
28
27
  get(attrName) {
@@ -75,4 +74,3 @@ export default class NCListFeature {
75
74
  return data;
76
75
  }
77
76
  }
78
- //# sourceMappingURL=NCListFeature.js.map
@@ -24,4 +24,3 @@ const NCListAdapter = ConfigurationSchema('NCListAdapter', {
24
24
  },
25
25
  }, { explicitlyTyped: true });
26
26
  export default NCListAdapter;
27
- //# sourceMappingURL=configSchema.js.map
@@ -8,4 +8,3 @@ export default (pluginManager) => {
8
8
  getAdapterClass: () => import('./NCListAdapter').then(r => r.default),
9
9
  }));
10
10
  };
11
- //# sourceMappingURL=index.js.map
package/esm/index.js CHANGED
@@ -15,4 +15,3 @@ export default class LegacyJBrowsePlugin extends Plugin {
15
15
  JBrowse1ConnectionF(pluginManager);
16
16
  }
17
17
  }
18
- //# sourceMappingURL=index.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jbrowse/plugin-legacy-jbrowse",
3
- "version": "2.5.0",
3
+ "version": "2.6.2",
4
4
  "description": "JBrowse 2 plugin for connecting to and reading JBrowse 1 data",
5
5
  "keywords": [
6
6
  "jbrowse",
@@ -20,7 +20,6 @@
20
20
  "main": "dist/index.js",
21
21
  "files": [
22
22
  "dist",
23
- "src",
24
23
  "esm"
25
24
  ],
26
25
  "scripts": {
@@ -33,7 +32,7 @@
33
32
  "useSrc": "node ../../scripts/useSrc.js",
34
33
  "prebuild": "npm run clean",
35
34
  "build:esm": "tsc --build tsconfig.build.esm.json",
36
- "build:es5": "tsc --build tsconfig.build.es5.json",
35
+ "build:commonjs": "tsc --build tsconfig.build.commonjs.json",
37
36
  "clean": "rimraf dist esm *.tsbuildinfo"
38
37
  },
39
38
  "dependencies": {
@@ -56,5 +55,5 @@
56
55
  "distModule": "esm/index.js",
57
56
  "srcModule": "src/index.ts",
58
57
  "module": "esm/index.js",
59
- "gitHead": "d1ca073996d008f0fe9a52f7c1a47ae649dcfdaf"
58
+ "gitHead": "bbea587a402d9974acdd804a33f4b77f31a2fd5f"
60
59
  }
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/GuessNCList/index.ts"],"names":[],"mappings":";;AACA,sDAAuE;AAGvE,kBAAe,CAAC,aAA4B,EAAE,EAAE;IAC9C,aAAa,CAAC,mBAAmB,CAC/B,8BAA8B,EAC9B,CAAC,cAA8B,EAAE,EAAE;QACjC,OAAO,CACL,IAAkB,EAClB,KAAoB,EACpB,WAAoB,EACpB,EAAE;YACF,MAAM,UAAU,GAAG,oBAAoB,CAAA;YACvC,MAAM,WAAW,GAAG,eAAe,CAAA;YACnC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;YAClC,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,WAAW,KAAK,WAAW,EAAE;gBAC5D,OAAO;oBACL,IAAI,EAAE,WAAW;oBACjB,eAAe,EAAE,IAAI;iBACtB,CAAA;aACF;YACD,OAAO,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAA;QACjD,CAAC,CAAA;IACH,CAAC,CACF,CAAA;AACH,CAAC,CAAA"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../src/JBrowse1Connection/configSchema.ts"],"names":[],"mappings":";;AAAA,uEAAiF;AACjF,+DAAiE;AAEjE;;GAEG;AACH,SAAS,CAAC,KAAI,CAAC,CAAC,wDAAwD;AAExE,MAAM,kBAAkB,GAAG,IAAA,mCAAmB,EAC5C,oBAAoB,EACpB;IACE;;OAEG;IACH,eAAe,EAAE;QACf,IAAI,EAAE,cAAc;QACpB,YAAY,EAAE;YACZ,GAAG,EAAE,iCAAiC;YACtC,YAAY,EAAE,aAAa;SAC5B;QACD,WAAW,EACT,oGAAoG;KACvG;IACD;;OAEG;IACH,aAAa,EAAE;QACb,WAAW,EACT,0EAA0E;QAC5E,IAAI,EAAE,aAAa;QACnB,YAAY,EAAE,EAAE;KACjB;CACF,EACD;IACE;;OAEG;IACH,iBAAiB,EAAE,6BAAoB;CACxC,CACF,CAAA;AAED,kBAAe,kBAAkB,CAAA"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/JBrowse1Connection/index.ts"],"names":[],"mappings":";;;;;AACA,wGAA+E;AAE/E,SAAS;AACT,oDAAkC;AAClC,kEAAyC;AAEzC,kBAAe,CAAC,aAA4B,EAAE,EAAE;IAC9C,aAAa,CAAC,iBAAiB,CAC7B,GAAG,EAAE,CACH,IAAI,wBAAc,CAAC;QACjB,IAAI,EAAE,oBAAoB;QAC1B,YAAY,EAAZ,sBAAY;QACZ,UAAU,EAAE,IAAA,eAAY,EAAC,aAAa,CAAC;QACvC,WAAW,EAAE,gBAAgB;QAC7B,WAAW,EAAE,4BAA4B;QACzC,GAAG,EAAE,gBAAgB;KACtB,CAAC,CACL,CAAA;AACH,CAAC,CAAA"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"jb1ConfigLoad.js","sourceRoot":"","sources":["../../src/JBrowse1Connection/jb1ConfigLoad.ts"],"names":[],"mappings":"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"}