@jbrowse/plugin-rdf 2.17.0 → 2.18.0

package/dist/SPARQLAdapter/SPARQLAdapter.d.ts

@@ -1,10 +1,11 @@
-import { BaseFeatureDataAdapter, BaseOptions } from '@jbrowse/core/data_adapters/BaseAdapter';
-import { NoAssemblyRegion } from '@jbrowse/core/util/types';
-import { Feature } from '@jbrowse/core/util/simpleFeature';
-import { Instance } from 'mobx-state-tree';
-import PluginManager from '@jbrowse/core/PluginManager';
-import { getSubAdapterType } from '@jbrowse/core/data_adapters/dataAdapterCache';
+import { BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
 import type MyConfigSchema from './configSchema';
+import type PluginManager from '@jbrowse/core/PluginManager';
+import type { BaseOptions } from '@jbrowse/core/data_adapters/BaseAdapter';
+import type { getSubAdapterType } from '@jbrowse/core/data_adapters/dataAdapterCache';
+import type { Feature } from '@jbrowse/core/util/simpleFeature';
+import type { NoAssemblyRegion } from '@jbrowse/core/util/types';
+import type { Instance } from 'mobx-state-tree';
 export default class SPARQLAdapter extends BaseFeatureDataAdapter {
     private endpoint;
     private queryTemplate;

package/dist/SPARQLAdapter/SPARQLAdapter.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const configuration_1 = require("@jbrowse/core/configuration");
 const BaseAdapter_1 = require("@jbrowse/core/data_adapters/BaseAdapter");
 const rxjs_1 = require("@jbrowse/core/util/rxjs");
 const simpleFeature_1 = __importDefault(require("@jbrowse/core/util/simpleFeature"));
 const string_template_1 = __importDefault(require("string-template"));
-const configuration_1 = require("@jbrowse/core/configuration");
 class SPARQLAdapter extends BaseAdapter_1.BaseFeatureDataAdapter {
     constructor(config, getSubAdapter, pluginManager) {
         super(config, getSubAdapter, pluginManager);
@@ -17,7 +17,7 @@ class SPARQLAdapter extends BaseAdapter_1.BaseFeatureDataAdapter {
         this.refNamesQueryTemplate = (0, configuration_1.readConfObject)(config, 'refNamesQueryTemplate');
         this.configRefNames = (0, configuration_1.readConfObject)(config, 'refNames');
     }
-    async getRefNames(opts = {}) {
+    async getRefNames(opts) {
         if (this.refNames) {
             return this.refNames;
         }
@@ -36,21 +36,23 @@ class SPARQLAdapter extends BaseAdapter_1.BaseFeatureDataAdapter {
             const filledTemplate = encodeURIComponent((0, string_template_1.default)(this.queryTemplate, query));
             const { refName } = query;
             const results = await this.querySparql(filledTemplate, opts);
-            this.resultsToFeatures(results, refName).forEach(feature => {
+            const features = this.resultsToFeatures(results, refName);
+            for (const feature of features) {
                 observer.next(feature);
-            });
+            }
             observer.complete();
-        }, opts.signal);
+        }, opts.stopToken);
     }
-    async querySparql(query, opts) {
+    async querySparql(query, _opts) {
         let additionalQueryParams = '';
         if (this.additionalQueryParams.length) {
             additionalQueryParams = `&${this.additionalQueryParams.join('&')}`;
         }
-        const signal = opts === null || opts === void 0 ? void 0 : opts.signal;
-        const response = await fetch(`${this.endpoint}?query=${query}${additionalQueryParams}`, {
-            headers: { accept: 'application/json,application/sparql-results+json' },
-            signal,
+        const url = `${this.endpoint}?query=${query}${additionalQueryParams}`;
+        const response = await fetch(url, {
+            headers: {
+                accept: 'application/json,application/sparql-results+json',
+            },
         });
         return response.json();
     }
@@ -105,7 +107,6 @@ class SPARQLAdapter extends BaseAdapter_1.BaseFeatureDataAdapter {
                 };
             });
         });
-        // resolve subfeatures, keeping only top-level features in seenFeatures
         for (const [uniqueId, f] of Object.entries(seenFeatures)) {
             const pid = f.data.parentUniqueId;
             f.data.parentUniqueId = undefined;
@@ -163,6 +164,6 @@ class SPARQLAdapter extends BaseAdapter_1.BaseFeatureDataAdapter {
         }
         return true;
     }
-    freeResources( /* { region } */) { }
+    freeResources() { }
 }
 exports.default = SPARQLAdapter;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import Plugin from '@jbrowse/core/Plugin';
-import PluginManager from '@jbrowse/core/PluginManager';
+import type PluginManager from '@jbrowse/core/PluginManager';
 export default class RdfPlugin extends Plugin {
     name: string;
     install(pluginManager: PluginManager): void;

package/dist/index.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const AdapterType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/AdapterType"));
 const Plugin_1 = __importDefault(require("@jbrowse/core/Plugin"));
-const SPARQLAdapter_1 = require("./SPARQLAdapter");
+const AdapterType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/AdapterType"));
 const tracks_1 = require("@jbrowse/core/util/tracks");
+const SPARQLAdapter_1 = require("./SPARQLAdapter");
 class RdfPlugin extends Plugin_1.default {
     constructor() {
         super(...arguments);

package/esm/SPARQLAdapter/SPARQLAdapter.d.ts

@@ -1,10 +1,11 @@
-import { BaseFeatureDataAdapter, BaseOptions } from '@jbrowse/core/data_adapters/BaseAdapter';
-import { NoAssemblyRegion } from '@jbrowse/core/util/types';
-import { Feature } from '@jbrowse/core/util/simpleFeature';
-import { Instance } from 'mobx-state-tree';
-import PluginManager from '@jbrowse/core/PluginManager';
-import { getSubAdapterType } from '@jbrowse/core/data_adapters/dataAdapterCache';
+import { BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
 import type MyConfigSchema from './configSchema';
+import type PluginManager from '@jbrowse/core/PluginManager';
+import type { BaseOptions } from '@jbrowse/core/data_adapters/BaseAdapter';
+import type { getSubAdapterType } from '@jbrowse/core/data_adapters/dataAdapterCache';
+import type { Feature } from '@jbrowse/core/util/simpleFeature';
+import type { NoAssemblyRegion } from '@jbrowse/core/util/types';
+import type { Instance } from 'mobx-state-tree';
 export default class SPARQLAdapter extends BaseFeatureDataAdapter {
     private endpoint;
     private queryTemplate;

package/esm/SPARQLAdapter/SPARQLAdapter.js

@@ -1,8 +1,8 @@
-import { BaseFeatureDataAdapter, } from '@jbrowse/core/data_adapters/BaseAdapter';
+import { readConfObject } from '@jbrowse/core/configuration';
+import { BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
 import { ObservableCreate } from '@jbrowse/core/util/rxjs';
 import SimpleFeature from '@jbrowse/core/util/simpleFeature';
 import format from 'string-template';
-import { readConfObject } from '@jbrowse/core/configuration';
 export default class SPARQLAdapter extends BaseFeatureDataAdapter {
     constructor(config, getSubAdapter, pluginManager) {
         super(config, getSubAdapter, pluginManager);
@@ -12,7 +12,7 @@ export default class SPARQLAdapter extends BaseFeatureDataAdapter {
         this.refNamesQueryTemplate = readConfObject(config, 'refNamesQueryTemplate');
         this.configRefNames = readConfObject(config, 'refNames');
     }
-    async getRefNames(opts = {}) {
+    async getRefNames(opts) {
         if (this.refNames) {
             return this.refNames;
         }
@@ -31,21 +31,23 @@ export default class SPARQLAdapter extends BaseFeatureDataAdapter {
             const filledTemplate = encodeURIComponent(format(this.queryTemplate, query));
             const { refName } = query;
             const results = await this.querySparql(filledTemplate, opts);
-            this.resultsToFeatures(results, refName).forEach(feature => {
+            const features = this.resultsToFeatures(results, refName);
+            for (const feature of features) {
                 observer.next(feature);
-            });
+            }
             observer.complete();
-        }, opts.signal);
+        }, opts.stopToken);
     }
-    async querySparql(query, opts) {
+    async querySparql(query, _opts) {
         let additionalQueryParams = '';
         if (this.additionalQueryParams.length) {
             additionalQueryParams = `&${this.additionalQueryParams.join('&')}`;
         }
-        const signal = opts === null || opts === void 0 ? void 0 : opts.signal;
-        const response = await fetch(`${this.endpoint}?query=${query}${additionalQueryParams}`, {
-            headers: { accept: 'application/json,application/sparql-results+json' },
-            signal,
+        const url = `${this.endpoint}?query=${query}${additionalQueryParams}`;
+        const response = await fetch(url, {
+            headers: {
+                accept: 'application/json,application/sparql-results+json',
+            },
         });
         return response.json();
     }
@@ -100,7 +102,6 @@ export default class SPARQLAdapter extends BaseFeatureDataAdapter {
                 };
             });
         });
-        // resolve subfeatures, keeping only top-level features in seenFeatures
         for (const [uniqueId, f] of Object.entries(seenFeatures)) {
             const pid = f.data.parentUniqueId;
             f.data.parentUniqueId = undefined;
@@ -158,5 +159,5 @@ export default class SPARQLAdapter extends BaseFeatureDataAdapter {
         }
         return true;
     }
-    freeResources( /* { region } */) { }
+    freeResources() { }
 }

package/esm/index.d.ts

@@ -1,5 +1,5 @@
 import Plugin from '@jbrowse/core/Plugin';
-import PluginManager from '@jbrowse/core/PluginManager';
+import type PluginManager from '@jbrowse/core/PluginManager';
 export default class RdfPlugin extends Plugin {
     name: string;
     install(pluginManager: PluginManager): void;

package/esm/index.js

@@ -1,7 +1,7 @@
-import AdapterType from '@jbrowse/core/pluggableElementTypes/AdapterType';
 import Plugin from '@jbrowse/core/Plugin';
-import { AdapterClass as SPARQLAdapterClass, configSchema as sparqlAdapterConfigSchema, } from './SPARQLAdapter';
+import AdapterType from '@jbrowse/core/pluggableElementTypes/AdapterType';
 import { getFileName } from '@jbrowse/core/util/tracks';
+import { AdapterClass as SPARQLAdapterClass, configSchema as sparqlAdapterConfigSchema, } from './SPARQLAdapter';
 export default class RdfPlugin extends Plugin {
     constructor() {
         super(...arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/plugin-rdf",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "JBrowse 2 RDF resources",
   "keywords": [
     "jbrowse",
@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eed30b5e671f8f7823652d7cecc51aa89226de46"
+  "gitHead": "c344ea60099cb7e460b77f15808946b24a7eee74"
 }