@rcsb/rcsb-saguaro-app 6.2.3 → 6.2.5-dev-js-seqcoord.1

package/lib/commonjs/RcsbFvWeb/RcsbFvModule/RcsbFvProteinSequence.js

@@ -8,12 +8,14 @@ const Assertions_1 = require("../../RcsbUtils/Helpers/Assertions");
 var assertDefined = Assertions_1.Assertions.assertDefined;
 class RcsbFvProteinSequence extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
     protectedBuild() {
-        var _a, _b, _c, _d, _e;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
             const buildConfig = this.buildConfig;
+            if (!buildConfig.from || !buildConfig.to)
+                return;
             const queryId = buildConfig.queryId;
             assertDefined(queryId);
-            const source = (_a = buildConfig.sources) !== null && _a !== void 0 ? _a : [GqlTypes_1.Source.Uniprot];
+            const source = (_a = buildConfig.sources) !== null && _a !== void 0 ? _a : [GqlTypes_1.AnnotationReference.Uniprot];
             const alignmentRequestContext = {
                 queryId: queryId,
                 from: buildConfig.from,

package/lib/commonjs/RcsbFvWeb/RcsbFvModule/RcsbFvUniprot.js

@@ -10,12 +10,12 @@ const Assertions_1 = require("../../RcsbUtils/Helpers/Assertions");
 var assertDefined = Assertions_1.Assertions.assertDefined;
 class RcsbFvUniprot extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
     protectedBuild() {
-        var _a, _b, _c, _d;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
             const buildConfig = this.buildConfig;
             const upAcc = buildConfig.upAcc;
             assertDefined(upAcc);
-            const source = [GqlTypes_1.Source.Uniprot];
+            const source = [GqlTypes_1.AnnotationReference.Uniprot];
             const alignmentRequestContext = {
                 queryId: upAcc,
                 from: GqlTypes_1.SequenceReference.Uniprot,
@@ -28,7 +28,7 @@ class RcsbFvUniprot extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
             const alignmentResponse = yield this.alignmentCollector.collect(alignmentRequestContext, (_b = buildConfig.additionalConfig) === null || _b === void 0 ? void 0 : _b.alignmentFilter);
             const trackFactory = new MsaAlignmentTrackFactory_1.MsaAlignmentTrackFactory(this.getPolymerEntityInstanceTranslator());
             const alignmentFeatures = yield collectFeatures(upAcc);
-            yield trackFactory.prepareFeatures(alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == GqlTypes_1.Type.UnobservedResidueXyz) })); }), alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == GqlTypes_1.Type.MaQaMetricLocalTypePlddt) })); }));
+            yield trackFactory.prepareFeatures(alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == GqlTypes_1.FeaturesType.UnobservedResidueXyz) })); }), alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == GqlTypes_1.FeaturesType.MaQaMetricLocalTypePlddt) })); }));
             yield this.buildAlignmentTracks(alignmentRequestContext, alignmentResponse, {
                 alignmentTrackFactory: trackFactory
             });
@@ -61,12 +61,12 @@ function collectFeatures(upAcc) {
         return yield RcsbClient_1.rcsbClient.requestRcsbPdbAnnotations({
             queryId: upAcc,
             reference: GqlTypes_1.SequenceReference.Uniprot,
-            sources: [GqlTypes_1.Source.PdbInstance],
+            sources: [GqlTypes_1.AnnotationReference.PdbInstance],
             filters: [{
-                    source: GqlTypes_1.Source.PdbInstance,
+                    source: GqlTypes_1.AnnotationReference.PdbInstance,
                     operation: GqlTypes_1.OperationType.Equals,
                     field: GqlTypes_1.FieldName.Type,
-                    values: [GqlTypes_1.Type.UnobservedResidueXyz, GqlTypes_1.Type.MaQaMetricLocalTypePlddt]
+                    values: [GqlTypes_1.FeaturesType.UnobservedResidueXyz, GqlTypes_1.FeaturesType.MaQaMetricLocalTypePlddt]
                 }]
         });
     });

package/lib/commonjs/RcsbFvWeb/RcsbFvModule/RcsbFvUniprotAlignment.js

@@ -10,8 +10,8 @@ const Assertions_1 = require("../../RcsbUtils/Helpers/Assertions");
 var assertDefined = Assertions_1.Assertions.assertDefined;
 class RcsbFvUniprotAlignment extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
     protectedBuild() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const buildConfig = this.buildConfig;
             assertDefined((_a = buildConfig.additionalConfig) === null || _a === void 0 ? void 0 : _a.page), assertDefined(buildConfig.upAcc);
             const alignmentRequestContext = {
@@ -30,14 +30,14 @@ class RcsbFvUniprotAlignment extends RcsbFvAbstractModule_1.RcsbFvAbstractModule
             const alignmentResponse = yield this.alignmentCollector.collect(alignmentRequestContext, (_g = buildConfig.additionalConfig) === null || _g === void 0 ? void 0 : _g.alignmentFilter);
             const trackFactory = new MsaAlignmentTrackFactory_1.MsaAlignmentTrackFactory(this.getPolymerEntityInstanceTranslator());
             const alignmentFeatures = yield collectFeatures(buildConfig.upAcc);
-            yield trackFactory.prepareFeatures(alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == GqlTypes_1.Type.UnobservedResidueXyz) })); }), alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == GqlTypes_1.Type.MaQaMetricLocalTypePlddt) })); }));
+            yield trackFactory.prepareFeatures(alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == GqlTypes_1.FeaturesType.UnobservedResidueXyz) })); }), alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == GqlTypes_1.FeaturesType.MaQaMetricLocalTypePlddt) })); }));
             yield this.buildAlignmentTracks(alignmentRequestContext, alignmentResponse, {
                 alignmentTrackFactory: trackFactory
             });
             const annotationsRequestContext = {
                 queryId: buildConfig.upAcc,
                 reference: GqlTypes_1.SequenceReference.Uniprot,
-                sources: [GqlTypes_1.Source.Uniprot],
+                sources: [GqlTypes_1.AnnotationReference.Uniprot],
                 annotationProcessing: (_h = buildConfig.additionalConfig) === null || _h === void 0 ? void 0 : _h.annotationProcessing,
                 externalTrackBuilder: (_j = buildConfig.additionalConfig) === null || _j === void 0 ? void 0 : _j.externalTrackBuilder
             };
@@ -63,12 +63,12 @@ function collectFeatures(upAcc) {
         return yield RcsbClient_1.rcsbClient.requestRcsbPdbAnnotations({
             queryId: upAcc,
             reference: GqlTypes_1.SequenceReference.Uniprot,
-            sources: [GqlTypes_1.Source.PdbInstance],
+            sources: [GqlTypes_1.AnnotationReference.PdbInstance],
             filters: [{
-                    source: GqlTypes_1.Source.PdbInstance,
+                    source: GqlTypes_1.AnnotationReference.PdbInstance,
                     operation: GqlTypes_1.OperationType.Equals,
                     field: GqlTypes_1.FieldName.Type,
-                    values: [GqlTypes_1.Type.UnobservedResidueXyz, GqlTypes_1.Type.MaQaMetricLocalTypePlddt]
+                    values: [GqlTypes_1.FeaturesType.UnobservedResidueXyz, GqlTypes_1.FeaturesType.MaQaMetricLocalTypePlddt]
                 }]
         });
     });

package/lib/commonjs/RcsbFvWeb/RcsbFvModule/RcsbFvUniprotEntity.js

@@ -14,8 +14,8 @@ class RcsbFvUniprotEntity extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
         this.unmodeledTrackBuilder = new UnmodeledTrackBuilder_1.UnmodeledTrackBuilder();
     }
     protectedBuild() {
-        var _a, _b, _c;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             const buildConfig = this.buildConfig;
             const upAcc = buildConfig.upAcc;
             const entityId = buildConfig.entityId;
@@ -24,7 +24,7 @@ class RcsbFvUniprotEntity extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
             const filters = [{
                     field: GqlTypes_1.FieldName.TargetId,
                     operation: GqlTypes_1.OperationType.Equals,
-                    source: GqlTypes_1.Source.PdbEntity,
+                    source: GqlTypes_1.AnnotationReference.PdbEntity,
                     values: [entityId]
                 }];
             const alignmentRequestContext = {
@@ -40,7 +40,7 @@ class RcsbFvUniprotEntity extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
             const annotationsRequestContext = {
                 queryId: upAcc,
                 reference: GqlTypes_1.SequenceReference.Uniprot,
-                sources: (additionalConfig === null || additionalConfig === void 0 ? void 0 : additionalConfig.sources) ? additionalConfig.sources : [GqlTypes_1.Source.PdbEntity, GqlTypes_1.Source.Uniprot],
+                sources: (additionalConfig === null || additionalConfig === void 0 ? void 0 : additionalConfig.sources) ? additionalConfig.sources : [GqlTypes_1.AnnotationReference.PdbEntity, GqlTypes_1.AnnotationReference.Uniprot],
                 filters: (additionalConfig === null || additionalConfig === void 0 ? void 0 : additionalConfig.filters) instanceof Array ? additionalConfig.filters.concat(filters) : filters,
                 titleSuffix: this.titleSuffix.bind(this),
                 annotationProcessing: (_b = buildConfig.additionalConfig) === null || _b === void 0 ? void 0 : _b.annotationProcessing,
@@ -65,9 +65,9 @@ class RcsbFvUniprotEntity extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
         this.rowConfigData = [this.referenceTrack].concat(this.alignmentTracks).concat(this.annotationTracks);
     }
     titleSuffix(ann, d) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.polymerEntityInstance != null && ann.source === GqlTypes_1.Source.PdbInstance) {
+            var _a;
+            if (this.polymerEntityInstance != null && ann.source === GqlTypes_1.AnnotationReference.PdbInstance) {
                 const labelAsymId = (_a = ann.target_id) === null || _a === void 0 ? void 0 : _a.split(TagDelimiter_1.TagDelimiter.instance)[1];
                 if (!labelAsymId)
                     return;

package/lib/commonjs/RcsbFvWeb/RcsbFvModule/RcsbFvUniprotInstance.js

@@ -9,26 +9,26 @@ const Assertions_1 = require("../../RcsbUtils/Helpers/Assertions");
 var assertDefined = Assertions_1.Assertions.assertDefined;
 class RcsbFvUniprotInstance extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
     protectedBuild() {
-        var _a, _b, _c;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             const buildConfig = this.buildConfig;
             const upAcc = buildConfig.upAcc;
             const entityId = buildConfig.entityId;
             const instanceId = buildConfig.instanceId;
             const additionalConfig = buildConfig.additionalConfig;
             assertDefined(entityId), assertDefined(instanceId), assertDefined(upAcc);
-            let sources = [GqlTypes_1.Source.Uniprot, GqlTypes_1.Source.PdbEntity, GqlTypes_1.Source.PdbInstance];
+            let sources = [GqlTypes_1.AnnotationReference.Uniprot, GqlTypes_1.AnnotationReference.PdbEntity, GqlTypes_1.AnnotationReference.PdbInstance];
             if (additionalConfig != null && additionalConfig.sources != null && additionalConfig.sources.length > 0)
                 sources = additionalConfig.sources;
             let filters = [{
                     field: GqlTypes_1.FieldName.TargetId,
                     operation: GqlTypes_1.OperationType.Equals,
-                    source: GqlTypes_1.Source.PdbEntity,
+                    source: GqlTypes_1.AnnotationReference.PdbEntity,
                     values: [entityId]
                 }, {
                     field: GqlTypes_1.FieldName.TargetId,
                     operation: GqlTypes_1.OperationType.Contains,
-                    source: GqlTypes_1.Source.PdbInstance,
+                    source: GqlTypes_1.AnnotationReference.PdbInstance,
                     values: [instanceId]
                 }];
             if (additionalConfig != null && additionalConfig.filters != null && additionalConfig.filters.length > 0)

package/lib/commonjs/RcsbFvWeb/RcsbFvTooltip/RcsbFvTooltip.js

@@ -60,7 +60,7 @@ class RcsbFvTooltip {
         if (d.description == null || d.description.length == 0)
             return undefined;
         const tooltipDescriptionDiv = document.createElement("div");
-        d.description.forEach(des => {
+        d.description.slice(0, 2).forEach(des => {
             const desDiv = document.createElement("div");
             desDiv.append(des);
             tooltipDescriptionDiv.append(desDiv);

package/lib/commonjs/RcsbFvWeb/RcsbFvWorkers/RcsbFvAlignmentCollectorQueue.d.ts

@@ -1,11 +1,11 @@
-import { QueryAlignmentArgs } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { QueryAlignmentsArgs } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 export declare class RcsbFvAlignmentCollectorQueue {
     private readonly nWorkers;
     private readonly workerList;
     private readonly taskQueue;
     private isQueueActive;
     constructor(nWorkers?: number);
-    sendTask(request: QueryAlignmentArgs, callback: (data: any) => void): void;
+    sendTask(request: QueryAlignmentsArgs, callback: (data: any) => void): void;
     private activateQueue;
     private recursiveExec;
     terminateWorkers(): void;

package/lib/commonjs/RcsbGraphQL/RcsbClient.d.ts

@@ -1,9 +1,10 @@
 import { RcsbQueryGroupAlignmentArguments } from "./RcsbQueryAlignment";
-import { AlignmentResponse, AnnotationFeatures, QueryAlignmentArgs, QueryAnnotationsArgs, QueryGroup_AnnotationsArgs } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceAlignments, SequenceAnnotations, QueryAlignmentsArgs, QueryAnnotationsArgs, QueryGroup_AnnotationsArgs } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { CoreAssembly, CoreEntry, CoreInterface, CorePolymerEntity, QueryAssembliesArgs, GroupPolymerEntity, QueryEntriesArgs, QueryEntryArgs, QueryInterfacesArgs, QueryPolymer_EntitiesArgs, QueryPolymer_Entity_GroupArgs, QueryPolymer_Entity_InstancesArgs, CorePolymerEntityInstance } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Yosemite/GqlTypes";
 import { GraphQLRequest } from "@rcsb/rcsb-api-tools";
 declare class RcsbClientClass {
     private readonly rcsbQueryAnnotations;
+    private readonly rcsbQueryGroupAnnotationsSummary;
     private readonly rcsbQueryGroupAnnotations;
     private readonly rcsbQueryAlignment;
     private readonly rcsbQueryGroupAlignment;
@@ -18,10 +19,11 @@ declare class RcsbClientClass {
         borrego: () => GraphQLRequest;
         yosemite: () => GraphQLRequest;
     });
-    requestRcsbPdbAnnotations(requestConfig: QueryAnnotationsArgs): Promise<Array<AnnotationFeatures>>;
-    requestRcsbPdbGroupAnnotations(requestConfig: QueryGroup_AnnotationsArgs): Promise<Array<AnnotationFeatures>>;
-    requestAlignment(requestConfig: QueryAlignmentArgs): Promise<AlignmentResponse>;
-    requestGroupAlignment(requestConfig: RcsbQueryGroupAlignmentArguments): Promise<AlignmentResponse>;
+    requestRcsbPdbAnnotations(requestConfig: QueryAnnotationsArgs): Promise<Array<SequenceAnnotations>>;
+    requestRcsbPdbGroupAnnotationsSummary(requestConfig: QueryGroup_AnnotationsArgs): Promise<Array<SequenceAnnotations>>;
+    requestRcsbPdbGroupAnnotations(requestConfig: QueryGroup_AnnotationsArgs): Promise<Array<SequenceAnnotations>>;
+    requestAlignment(requestConfig: QueryAlignmentsArgs): Promise<SequenceAlignments>;
+    requestGroupAlignment(requestConfig: RcsbQueryGroupAlignmentArguments): Promise<SequenceAlignments>;
     requestEntityInstances(requestConfig: QueryEntryArgs): Promise<CoreEntry>;
     requestMultipleEntityInstances(requestConfig: QueryPolymer_EntitiesArgs): Promise<Array<CorePolymerEntity>>;
     requestGroupInfo(requestConfig: QueryPolymer_Entity_GroupArgs): Promise<GroupPolymerEntity>;

package/lib/commonjs/RcsbGraphQL/RcsbClient.js

@@ -16,6 +16,7 @@ const RcsbQueryMultipleInstanceSequences_1 = require("./RcsbQueryMultipleInstanc
 class RcsbClientClass {
     constructor(get) {
         this.rcsbQueryAnnotations = new RcsbQueryAnnotations_1.RcsbQueryAnnotations(get.borrego);
+        this.rcsbQueryGroupAnnotationsSummary = new RcsbQueryAnnotations_1.RcsbQueryGroupAnnotationsSumary(get.borrego);
         this.rcsbQueryGroupAnnotations = new RcsbQueryAnnotations_1.RcsbQueryGroupAnnotations(get.borrego);
         this.rcsbQueryAlignment = new RcsbQueryAlignment_1.RcsbQueryAlignment(get.borrego);
         this.rcsbQueryGroupAlignment = new RcsbQueryAlignment_1.RcsbQueryGroupAlignment(get.borrego);
@@ -32,6 +33,11 @@ class RcsbClientClass {
             return yield this.rcsbQueryAnnotations.request(requestConfig);
         });
     }
+    requestRcsbPdbGroupAnnotationsSummary(requestConfig) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return yield this.rcsbQueryGroupAnnotationsSummary.request(requestConfig);
+        });
+    }
     requestRcsbPdbGroupAnnotations(requestConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return yield this.rcsbQueryGroupAnnotations.request(requestConfig);

package/lib/commonjs/RcsbGraphQL/RcsbQueryAlignment.d.ts

@@ -1,20 +1,20 @@
-import { AlignmentResponse, QueryAlignmentArgs, QueryGroup_AlignmentArgs } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceAlignments, QueryAlignmentsArgs, QueryGroup_AlignmentsArgs } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbCoreQueryInterface } from "./RcsbCoreQueryInterface";
 import { GraphQLRequest } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/GraphQLRequest";
-export declare class RcsbQueryAlignment implements RcsbCoreQueryInterface<QueryAlignmentArgs, AlignmentResponse> {
+export declare class RcsbQueryAlignment implements RcsbCoreQueryInterface<QueryAlignmentsArgs, SequenceAlignments> {
     readonly getClient: () => GraphQLRequest;
     constructor(getClient: () => GraphQLRequest);
-    request(requestConfig: QueryAlignmentArgs): Promise<AlignmentResponse>;
+    request(requestConfig: QueryAlignmentsArgs): Promise<SequenceAlignments>;
 }
-export type RcsbQueryGroupAlignmentArguments = QueryGroup_AlignmentArgs & {
+export type RcsbQueryGroupAlignmentArguments = QueryGroup_AlignmentsArgs & {
     page: {
         first: number;
-        after: string;
+        after: number;
     };
     excludeLogo?: boolean;
 };
-export declare class RcsbQueryGroupAlignment implements RcsbCoreQueryInterface<RcsbQueryGroupAlignmentArguments, AlignmentResponse> {
+export declare class RcsbQueryGroupAlignment implements RcsbCoreQueryInterface<RcsbQueryGroupAlignmentArguments, SequenceAlignments> {
     readonly getClient: () => GraphQLRequest;
     constructor(getClient: () => GraphQLRequest);
-    request(requestConfig: RcsbQueryGroupAlignmentArguments): Promise<AlignmentResponse>;
+    request(requestConfig: RcsbQueryGroupAlignmentArguments): Promise<SequenceAlignments>;
 }

package/lib/commonjs/RcsbGraphQL/RcsbQueryAlignment.js

@@ -18,7 +18,7 @@ class RcsbQueryAlignment {
                     to: requestConfig.to,
                     range: requestConfig.range
                 }, QueryAlignments_graphql_1.default);
-                return result.alignment;
+                return result.alignments;
             }
             catch (error) {
                 console.error(error);
@@ -36,7 +36,7 @@ class RcsbQueryGroupAlignment {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 const result = yield this.getClient().request({ group: requestConfig.group, groupId: requestConfig.groupId, filter: requestConfig.filter, first: requestConfig.page.first, after: requestConfig.page.after }, requestConfig.excludeLogo ? QueryGroupAlignmentsNoLogo_graphql_1.default : QueryGroupAlignments_graphql_1.default);
-                return result.group_alignment;
+                return result.group_alignments;
             }
             catch (error) {
                 console.error(error);

package/lib/commonjs/RcsbGraphQL/RcsbQueryAnnotations.d.ts

@@ -1,13 +1,18 @@
-import { AnnotationFeatures, QueryAnnotationsArgs, QueryGroup_AnnotationsArgs } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceAnnotations, QueryAnnotationsArgs, QueryGroup_AnnotationsArgs } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbCoreQueryInterface } from "./RcsbCoreQueryInterface";
 import { GraphQLRequest } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/GraphQLRequest";
-export declare class RcsbQueryAnnotations implements RcsbCoreQueryInterface<QueryAnnotationsArgs, Array<AnnotationFeatures>> {
+export declare class RcsbQueryAnnotations implements RcsbCoreQueryInterface<QueryAnnotationsArgs, Array<SequenceAnnotations>> {
     readonly getClient: () => GraphQLRequest;
     constructor(getClient: () => GraphQLRequest);
-    request(requestConfig: QueryAnnotationsArgs): Promise<Array<AnnotationFeatures>>;
+    request(requestConfig: QueryAnnotationsArgs): Promise<Array<SequenceAnnotations>>;
 }
-export declare class RcsbQueryGroupAnnotations implements RcsbCoreQueryInterface<QueryGroup_AnnotationsArgs, Array<AnnotationFeatures>> {
+export declare class RcsbQueryGroupAnnotationsSumary implements RcsbCoreQueryInterface<QueryGroup_AnnotationsArgs, Array<SequenceAnnotations>> {
     readonly getClient: () => GraphQLRequest;
     constructor(getClient: () => GraphQLRequest);
-    request(requestConfig: QueryGroup_AnnotationsArgs): Promise<Array<AnnotationFeatures>>;
+    request(requestConfig: QueryGroup_AnnotationsArgs): Promise<Array<SequenceAnnotations>>;
+}
+export declare class RcsbQueryGroupAnnotations implements RcsbCoreQueryInterface<QueryGroup_AnnotationsArgs, Array<SequenceAnnotations>> {
+    readonly getClient: () => GraphQLRequest;
+    constructor(getClient: () => GraphQLRequest);
+    request(requestConfig: QueryGroup_AnnotationsArgs): Promise<Array<SequenceAnnotations>>;
 }

package/lib/commonjs/RcsbGraphQL/RcsbQueryAnnotations.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RcsbQueryGroupAnnotations = exports.RcsbQueryAnnotations = void 0;
+exports.RcsbQueryGroupAnnotations = exports.RcsbQueryGroupAnnotationsSumary = exports.RcsbQueryAnnotations = void 0;
 const tslib_1 = require("tslib");
 const QueryAnnotations_graphql_1 = tslib_1.__importDefault(require("../RcsbQueries/Borrego/QueryAnnotations.graphql"));
+const QueryGroupAnnotationsSummary_graphql_1 = tslib_1.__importDefault(require("../RcsbQueries/Borrego/QueryGroupAnnotationsSummary.graphql"));
 const QueryGroupAnnotations_graphql_1 = tslib_1.__importDefault(require("../RcsbQueries/Borrego/QueryGroupAnnotations.graphql"));
 class RcsbQueryAnnotations {
     constructor(getClient) {
@@ -11,13 +12,7 @@ class RcsbQueryAnnotations {
     request(requestConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
-                const annotationsResponse = yield this.getClient().request({
-                    queryId: requestConfig.queryId,
-                    reference: requestConfig.reference,
-                    sources: requestConfig.sources,
-                    filters: requestConfig.filters,
-                    range: requestConfig.range
-                }, QueryAnnotations_graphql_1.default);
+                const annotationsResponse = yield this.getClient().request(requestConfig, QueryAnnotations_graphql_1.default);
                 return annotationsResponse.annotations;
             }
             catch (error) {
@@ -28,6 +23,24 @@ class RcsbQueryAnnotations {
     }
 }
 exports.RcsbQueryAnnotations = RcsbQueryAnnotations;
+class RcsbQueryGroupAnnotationsSumary {
+    constructor(getClient) {
+        this.getClient = getClient;
+    }
+    request(requestConfig) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const annotationsResponse = yield this.getClient().request(requestConfig, QueryGroupAnnotationsSummary_graphql_1.default);
+                return annotationsResponse.group_annotations_summary;
+            }
+            catch (error) {
+                console.error(error);
+                throw error;
+            }
+        });
+    }
+}
+exports.RcsbQueryGroupAnnotationsSumary = RcsbQueryGroupAnnotationsSumary;
 class RcsbQueryGroupAnnotations {
     constructor(getClient) {
         this.getClient = getClient;

package/lib/commonjs/RcsbGroupWeb/RcsbGroupBuilder.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchQueryContextManager = exports.buildResidueDistribution = exports.buildGroupContent = exports.buildGroupMembers = exports.buildGroup = exports.buildSearchRequest = void 0;
+exports.searchQueryContextManager = void 0;
+exports.buildSearchRequest = buildSearchRequest;
+exports.buildGroup = buildGroup;
+exports.buildGroupMembers = buildGroupMembers;
+exports.buildGroupContent = buildGroupContent;
+exports.buildResidueDistribution = buildResidueDistribution;
 const tslib_1 = require("tslib");
 const RcsbGroupDisplay_1 = require("./RcsbGroupView/RcsbGroupDisplay");
 const EntityGranularitySearchFacetStore_1 = require("../RcsbSeacrh/FacetStore/EntityGranularitySearchFacetStore");
@@ -10,25 +15,20 @@ function buildSearchRequest(elementId, searchQuery, returnType) {
         yield RcsbGroupDisplay_1.RcsbGroupDisplay.displayRcsbSearchStats(elementId, EntityGranularitySearchFacetStore_1.entityGranularityGroupFacetStore, searchQuery, returnType);
     });
 }
-exports.buildSearchRequest = buildSearchRequest;
 function buildGroup(elementId, groupProvenance, groupId, query, facetLayoutGrid, additionalProperties) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         yield RcsbGroupDisplay_1.RcsbGroupDisplay.displaySearchAttributes(elementId, groupProvenance, groupId, query, facetLayoutGrid, additionalProperties);
     });
 }
-exports.buildGroup = buildGroup;
 function buildGroupMembers(elementId, groupProvenance, groupId, nRows, nColumns, query) {
     RcsbGroupDisplay_1.RcsbGroupDisplay.displayGroupMembers(elementId, groupProvenance, groupId, nRows, nColumns, query);
 }
-exports.buildGroupMembers = buildGroupMembers;
 function buildGroupContent(elementId, groupProvenance, groupId, query, textConfig) {
     RcsbGroupDisplay_1.RcsbGroupDisplay.displayGroupContent(elementId, groupProvenance, groupId, query, textConfig);
 }
-exports.buildGroupContent = buildGroupContent;
 function buildResidueDistribution(elementId, granularity, rcsbId, facetLayoutGrid, chartDisplayConfig) {
     RcsbGroupDisplay_1.RcsbGroupDisplay.displayResidueDistribution(elementId, granularity, rcsbId, facetLayoutGrid, chartDisplayConfig);
 }
-exports.buildResidueDistribution = buildResidueDistribution;
 exports.searchQueryContextManager = {
     subscribe(f) {
         return SearchQueryContextManager_1.SearchQueryContextManager.subscribe(f);

package/lib/commonjs/RcsbGroupWeb/RcsbGroupView/RcsbGroupChart/GroupChartTools.js

@@ -11,8 +11,8 @@ const RcsbRequestContextManager_1 = require("../../../RcsbRequest/RcsbRequestCon
 var GroupChartMap;
 (function (GroupChartMap) {
     function getChartMap(groupProvenanceId, groupId, searchQuery) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             const facetStore = SearchQueryTools_1.SearchQueryTools.getFacetStoreFromGroupProvenance(groupProvenanceId);
             let facets = [];
             for (const service of facetStore.getServices()) {
@@ -48,8 +48,8 @@ var GroupChartMap;
     }
     GroupChartMap.getChartMap = getChartMap;
     function subtractSearchQuery(chartData, groupProvenanceId, groupId, searchQuery) {
-        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const facetStore = SearchQueryTools_1.SearchQueryTools.getFacetStoreFromGroupProvenance(groupProvenanceId);
             let subData;
             let partialFacets = [];

package/lib/commonjs/RcsbGroupWeb/RcsbGroupView/RcsbGroupChart/RcsbGroupChartComponent.js

@@ -26,8 +26,8 @@ class RcsbGroupChartComponent extends react_1.default.Component {
         }
     }
     updateState() {
-        var _a, _b, _c;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             const layout = (_a = this.props.facetLayoutGrid) !== null && _a !== void 0 ? _a : SearchQueryTools_1.SearchQueryTools.getFacetStoreFromGroupProvenance(this.props.groupProvenanceId).facetLayoutGrid;
             const chartMap = yield GroupChartTools_1.GroupChartMap.getChartMap(this.props.groupProvenanceId, this.props.groupId, this.props.searchQuery);
             if ((_b = this.props.additionalProperties) === null || _b === void 0 ? void 0 : _b.layoutConfig)

package/lib/commonjs/RcsbGroupWeb/RcsbGroupView/RcsbGroupContent/RcsbGroupContentComponent.js

@@ -21,8 +21,8 @@ class RcsbGroupContentComponent extends react_1.default.Component {
         };
     }
     componentDidMount() {
-        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             this.subscribe();
             const fullGroupMembers = (_a = (yield (0, RcsbGroupMembersComponent_1.searchRequest)(this.props.groupProvenanceId, this.props.groupId))) === null || _a === void 0 ? void 0 : _a.total_count;
             const subGroupMembers = (_b = (yield (0, RcsbGroupMembersComponent_1.searchRequest)(this.props.groupProvenanceId, this.props.groupId, this.props.searchQuery))) === null || _b === void 0 ? void 0 : _b.total_count;
@@ -47,8 +47,8 @@ class RcsbGroupContentComponent extends react_1.default.Component {
         return ((_a = this.props.displayNumber) !== null && _a !== void 0 ? _a : Operator_1.Operator.digitGrouping)(x);
     }
     updateGroupContent(o) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             const subGroupMembers = (_a = (yield (0, RcsbGroupMembersComponent_1.searchRequest)(this.props.groupProvenanceId, this.props.groupId, o.searchQuery))) === null || _a === void 0 ? void 0 : _a.total_count;
             if (subGroupMembers)
                 this.setState({ subGroupMembers, searchQuery: o.searchQuery });

package/lib/commonjs/RcsbGroupWeb/RcsbGroupView/RcsbGroupMembers/Components/Slider.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actionIcon = exports.Slider = void 0;
+exports.Slider = void 0;
+exports.actionIcon = actionIcon;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = tslib_1.__importDefault(require("react"));
@@ -22,4 +23,3 @@ exports.Slider = Slider;
 function actionIcon(action) {
     return ((0, jsx_runtime_1.jsx)("span", { style: { cursor: "pointer" }, className: "h1 user-select-none", children: action == "prev" ? "❮" : "❯" }));
 }
-exports.actionIcon = actionIcon;

package/lib/commonjs/RcsbGroupWeb/RcsbGroupView/RcsbGroupMembers/GroupMembersGrid.js

@@ -75,8 +75,8 @@ class GroupMembersGrid extends react_1.default.Component {
 }
 exports.GroupMembersGrid = GroupMembersGrid;
 function searchRequest(groupProvenanceId, groupId, start, rows, searchQuery) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return yield RcsbRequestContextManager_1.rcsbRequestCtxManager.getSearchQuery({
             query: (searchQuery === null || searchQuery === void 0 ? void 0 : searchQuery.query) ? SearchQueryTools_1.SearchQueryTools.addGroupNodeToSearchQuery(groupProvenanceId, groupId, searchQuery.query) : SearchQueryTools_1.SearchQueryTools.searchGroupQuery(groupProvenanceId, groupId),
             request_options: {

package/lib/commonjs/RcsbGroupWeb/RcsbGroupView/RcsbGroupMembers/RcsbGroupMembersComponent.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchRequest = exports.RcsbGroupMembersComponent = void 0;
+exports.RcsbGroupMembersComponent = void 0;
+exports.searchRequest = searchRequest;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = tslib_1.__importDefault(require("react"));
@@ -90,7 +91,6 @@ function searchRequest(groupProvenanceId, groupId, searchQuery) {
         });
     });
 }
-exports.searchRequest = searchRequest;
 function mod(n, p) {
     const r = n % p;
     return r < 0 ? p + r : r;

package/lib/commonjs/RcsbGroupWeb/RcsbGroupView/RcsbGroupSeacrhQuery/RcsbGroupSeacrhQueryComponent.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { GroupProvenanceId } from "@rcsb/rcsb-api-tools/build/RcsbDw/Types/DwEnums";
 import { SearchQuery } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchQueryInterface";
 export declare class SearchQueryComponentFactory {

package/lib/commonjs/RcsbGroupWeb/RcsbGroupView/RcsbResidueChart/ResidueChartTools/ResidueChartTools.js

@@ -45,8 +45,8 @@ var ResidueChartTools;
         });
     }
     function getInstanceCharts(instanceId) {
-        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const alignmentRequestContext = {
                 queryId: instanceId,
                 from: GqlTypes_1.SequenceReference.PdbInstance,
@@ -56,7 +56,7 @@ var ResidueChartTools;
             const annotationsRequestContext = {
                 queryId: instanceId,
                 reference: GqlTypes_1.SequenceReference.PdbInstance,
-                sources: [GqlTypes_1.Source.PdbEntity, GqlTypes_1.Source.PdbInstance, GqlTypes_1.Source.Uniprot, GqlTypes_1.Source.PdbInterface],
+                sources: [GqlTypes_1.AnnotationReference.PdbEntity, GqlTypes_1.AnnotationReference.PdbInstance, GqlTypes_1.AnnotationReference.Uniprot, GqlTypes_1.AnnotationReference.PdbInterface],
                 annotationGenerator: RcsbFvInterface_1.interfaceAnnotations,
                 annotationFilter: RcsbFvInterface_1.filter
             };

package/lib/commonjs/RcsbQueries/Borrego/QueryAlignments.graphql

@@ -1,12 +1,12 @@
-query QueryAlignment($queryId: String!, $from: SequenceReference, $to:SequenceReference, $range:[Int]){
-    alignment(
+query QueryAlignment($queryId: String!, $from: SequenceReference!, $to:SequenceReference!, $range:[Int!]){
+    alignments(
         queryId:$queryId
         from:$from
         to:$to
         range:$range
     ){
         query_sequence
-        target_alignment {
+        target_alignments {
             target_id
             orientation
             target_sequence

package/lib/commonjs/RcsbQueries/Borrego/QueryAnnotations.graphql

@@ -1,4 +1,10 @@
-query QueryAnnotations($queryId: String!, $reference: SequenceReference, $sources:[Source], $range:[Int], $filters: [FilterInput]){
+query QueryAnnotations(
+    $queryId: String!,
+    $reference: SequenceReference!,
+    $sources:[AnnotationReference!]!,
+    $range:[Int!],
+    $filters: [AnnotationFilterInput!]
+){
     annotations(
         queryId:$queryId
         reference:$reference