@rcsb/rcsb-saguaro-app 6.3.5 → 6.3.7-dev-js-seqcoord.14

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.js

@@ -1,10 +1,9 @@
 import { __awaiter } from "tslib";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
-import { FieldName, GroupReference, OperationType, Source, Type } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { FieldName, GroupReference, OperationType, AnnotationReference, FeaturesType } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { MsaAlignmentTrackFactory } from "../RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/MsaAlignmentTrackFactory";
 import { Assertions } from "../../RcsbUtils/Helpers/Assertions";
 var assertDefined = Assertions.assertDefined;
-import { TagDelimiter } from "@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter";
 import { Operator } from "../../RcsbUtils/Helpers/Operator";
 import { rcsbRequestCtxManager } from "../../RcsbRequest/RcsbRequestContextManager";
 export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
@@ -27,16 +26,15 @@ export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
                 sequencePrefix: (_f = (_e = buildConfig.additionalConfig) === null || _e === void 0 ? void 0 : _e.sequencePrefix) !== null && _f !== void 0 ? _f : "",
                 externalTrackBuilder: (_g = buildConfig.additionalConfig) === null || _g === void 0 ? void 0 : _g.externalTrackBuilder
             };
-            collectNextPage(alignmentRequestContext, this.alignmentCollector, this.annotationCollector).then(() => console.log("Next page ready"));
             const alignmentResponse = yield this.alignmentCollector.collect(alignmentRequestContext, (_h = buildConfig.additionalConfig) === null || _h === void 0 ? void 0 : _h.alignmentFilter);
             const trackFactory = new MsaAlignmentTrackFactory(this.getPolymerEntityInstanceTranslator());
-            const targetList = uniqueTargetList(alignmentResponse);
+            const targetList = yield uniqueTargetList(alignmentResponse);
             const alignmentFeatures = yield collectFeatures({
                 groupId: buildConfig.groupId,
                 externalTrackBuilder: (_j = buildConfig.additionalConfig) === null || _j === void 0 ? void 0 : _j.externalTrackBuilder,
                 targetList
             }, this.annotationCollector);
-            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) == 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) == 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) == 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) == FeaturesType.MaQaMetricLocalTypePlddt) })); }));
             yield this.buildAlignmentTracks(alignmentRequestContext, alignmentResponse, {
                 alignmentTrackFactory: trackFactory
             });
@@ -52,50 +50,38 @@ export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
         });
     }
 }
-function collectNextPage(alignmentRequestContext, alignmentCollector, annotationCollector) {
+function uniqueTargetList(alignmentResponse) {
     return __awaiter(this, void 0, void 0, function* () {
-        const alignmentResponse = yield alignmentCollector.collect(Object.assign(Object.assign({}, alignmentRequestContext), { excludeLogo: true, page: {
-                first: alignmentRequestContext.page.first,
-                after: (parseInt(alignmentRequestContext.page.after) + alignmentRequestContext.page.first).toString()
-            } }));
-        const targetList = uniqueTargetList(alignmentResponse);
-        if (alignmentRequestContext.groupId) {
-            const alignmentFeatures = yield collectFeatures({
-                groupId: alignmentRequestContext.groupId,
-                targetList
-            }, annotationCollector);
-            const featureTargetList = Operator.uniqueValues(alignmentFeatures.map(af => { var _a; return TagDelimiter.parseInstance((_a = af.target_id) !== null && _a !== void 0 ? _a : "").entryId; }));
-            Operator.arrayChunk(featureTargetList, 100).forEach(ids => rcsbRequestCtxManager.getEntryProperties(ids));
-        }
+        var _a, _b;
+        const entityIds = Operator.uniqueValues((_b = (_a = alignmentResponse.target_alignments) === null || _a === void 0 ? void 0 : _a.map(ta => {
+            assertDefined(ta === null || ta === void 0 ? void 0 : ta.target_id);
+            return ta.target_id;
+        })) !== null && _b !== void 0 ? _b : []);
+        const instanceIds = (yield rcsbRequestCtxManager.getEntityProperties(entityIds)).map(e => e.rcsbId);
+        return Operator.uniqueValues(instanceIds !== null && instanceIds !== void 0 ? instanceIds : []);
     });
 }
-function uniqueTargetList(alignmentResponse) {
-    var _a, _b;
-    return Operator.uniqueValues((_b = (_a = alignmentResponse.target_alignment) === null || _a === void 0 ? void 0 : _a.map(ta => {
-        assertDefined(ta === null || ta === void 0 ? void 0 : ta.target_id);
-        return TagDelimiter.parseEntity(ta.target_id).entryId;
-    })) !== null && _b !== void 0 ? _b : []);
-}
 function collectFeatures(annotationsContext, annotationCollector) {
     return __awaiter(this, void 0, void 0, function* () {
-        const annotationsRequestContext = {
-            histogram: false,
-            groupId: annotationsContext.groupId,
-            group: GroupReference.SequenceIdentity,
-            sources: [Source.PdbInstance],
-            filters: [{
-                    source: Source.PdbInstance,
-                    operation: OperationType.Equals,
-                    field: FieldName.Type,
-                    values: [Type.UnobservedResidueXyz, Type.MaQaMetricLocalTypePlddt]
-                }, {
-                    source: Source.PdbInstance,
-                    operation: OperationType.Contains,
-                    field: FieldName.TargetId,
-                    values: annotationsContext.targetList
-                }],
-            externalTrackBuilder: annotationsContext.externalTrackBuilder
-        };
-        return yield annotationCollector.collect(annotationsRequestContext);
+        return yield annotationCollector.collect(Object.assign(Object.assign({}, buildGroupAnnotationQuery(annotationsContext)), { isSummary: false, externalTrackBuilder: annotationsContext.externalTrackBuilder }));
     });
 }
+function buildGroupAnnotationQuery(annotationsContext) {
+    return {
+        group: GroupReference.SequenceIdentity,
+        groupId: annotationsContext.groupId,
+        sources: [AnnotationReference.PdbInstance],
+        filters: [{
+                source: AnnotationReference.PdbInstance,
+                operation: OperationType.Equals,
+                field: FieldName.Type,
+                values: [FeaturesType.UnobservedResidueXyz, FeaturesType.MaQaMetricLocalTypePlddt]
+            }, {
+                source: AnnotationReference.PdbInstance,
+                operation: OperationType.Equals,
+                field: FieldName.TargetId,
+                values: annotationsContext.targetList
+            }]
+    };
+}
+//# sourceMappingURL=RcsbFvGroupAlignment.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvGroupAlignment.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAnnotation.js

@@ -8,7 +8,7 @@ const annotationConfigMap = acm;
 export class RcsbFvGroupAnnotation extends RcsbFvAbstractModule {
     protectedBuild() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             const buildConfig = this.buildConfig;
             assertDefined(buildConfig.group), assertDefined(buildConfig.groupId), assertDefined((_a = buildConfig.additionalConfig) === null || _a === void 0 ? void 0 : _a.page);
             const alignmentRequestContext = {
@@ -31,10 +31,11 @@ export class RcsbFvGroupAnnotation extends RcsbFvAbstractModule {
             const annotationsRequestContext = {
                 group: buildConfig.group,
                 groupId: buildConfig.groupId,
-                sources: (_h = buildConfig.additionalConfig) === null || _h === void 0 ? void 0 : _h.sources,
-                filters: (_j = buildConfig.additionalConfig) === null || _j === void 0 ? void 0 : _j.filters,
-                annotationProcessing: (_k = buildConfig.additionalConfig) === null || _k === void 0 ? void 0 : _k.annotationProcessing,
-                externalTrackBuilder: (_l = buildConfig.additionalConfig) === null || _l === void 0 ? void 0 : _l.externalTrackBuilder
+                isSummary: typeof ((_h = buildConfig.additionalConfig) === null || _h === void 0 ? void 0 : _h.isAnnotationsGroupSummary) === "boolean" ? buildConfig.additionalConfig.isAnnotationsGroupSummary : true,
+                sources: (_k = (_j = buildConfig.additionalConfig) === null || _j === void 0 ? void 0 : _j.sources) !== null && _k !== void 0 ? _k : [],
+                filters: (_l = buildConfig.additionalConfig) === null || _l === void 0 ? void 0 : _l.filters,
+                annotationProcessing: (_m = buildConfig.additionalConfig) === null || _m === void 0 ? void 0 : _m.annotationProcessing,
+                externalTrackBuilder: (_o = buildConfig.additionalConfig) === null || _o === void 0 ? void 0 : _o.externalTrackBuilder
             };
             const annotationsFeatures = yield this.annotationCollector.collect(annotationsRequestContext);
             yield this.buildAnnotationsTrack(annotationsRequestContext, annotationsFeatures, annotationConfigMap);
@@ -50,3 +51,4 @@ export class RcsbFvGroupAnnotation extends RcsbFvAbstractModule {
         this.rowConfigData = this.referenceTrack ? [this.referenceTrack].concat(this.alignmentTracks).concat(this.annotationTracks) : this.alignmentTracks.concat(this.annotationTracks);
     }
 }
+//# sourceMappingURL=RcsbFvGroupAnnotation.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAnnotation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvGroupAnnotation.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAnnotation.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvInstance.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { SequenceReference, Source } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceReference, AnnotationReference } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 import { buriedResidues, buriedResiduesFilter } from "../../RcsbUtils/TrackGenerators/BuriedResidues";
 import { SequenceTrackFactory } from "../RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/SequenceTrackFactory";
@@ -13,7 +13,7 @@ export class RcsbFvInstance extends RcsbFvAbstractModule {
             const buildConfig = this.buildConfig;
             const instanceId = buildConfig.instanceId;
             assertDefined(instanceId);
-            const source = [Source.PdbEntity, Source.PdbInstance, Source.Uniprot];
+            const source = [AnnotationReference.PdbEntity, AnnotationReference.PdbInstance, AnnotationReference.Uniprot];
             const alignmentRequestContext = {
                 queryId: instanceId,
                 from: SequenceReference.PdbInstance,
@@ -50,3 +50,4 @@ export class RcsbFvInstance extends RcsbFvAbstractModule {
                     this.alignmentTracks.concat(this.annotationTracks);
     }
 }
+//# sourceMappingURL=RcsbFvInstance.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvInstance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvInstance.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvInstance.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvInterface.d.ts

@@ -1,4 +1,4 @@
-import { AnnotationFeatures } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceAnnotations } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 export declare class RcsbFvInterface extends RcsbFvAbstractModule {
     private instanceId;
@@ -8,5 +8,5 @@ export declare class RcsbFvInterface extends RcsbFvAbstractModule {
     private titleSuffix;
     private trackTitle;
 }
-export declare function interfaceAnnotations(annotations: Array<AnnotationFeatures>): Promise<Array<AnnotationFeatures>>;
-export declare function filter(ann: Array<AnnotationFeatures>): Promise<Array<AnnotationFeatures>>;
+export declare function interfaceAnnotations(annotations: Array<SequenceAnnotations>): Promise<Array<SequenceAnnotations>>;
+export declare function filter(ann: Array<SequenceAnnotations>): Promise<Array<SequenceAnnotations>>;

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvInterface.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { SequenceReference, Source } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceReference, AnnotationReference } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 import * as acm from "../../RcsbAnnotationConfig/RcsbAnnotationConfig.ac.json";
 import { buriedResidues, buriedResiduesFilter } from "../../RcsbUtils/TrackGenerators/BuriedResidues";
@@ -20,7 +20,7 @@ export class RcsbFvInterface extends RcsbFvAbstractModule {
             const instanceId = buildConfig.instanceId;
             assertDefined(instanceId);
             this.instanceId = instanceId;
-            const source = [Source.PdbEntity, Source.PdbInstance, Source.Uniprot, Source.PdbInterface];
+            const source = [AnnotationReference.PdbEntity, AnnotationReference.PdbInstance, AnnotationReference.Uniprot, AnnotationReference.PdbInterface];
             const alignmentRequestContext = {
                 queryId: instanceId,
                 from: SequenceReference.PdbInstance,
@@ -62,7 +62,7 @@ export class RcsbFvInterface extends RcsbFvAbstractModule {
     typeSuffix(ann, d) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (ann.source === Source.PdbInterface && ((_a = ann.target_identifiers) === null || _a === void 0 ? void 0 : _a.interface_id)) {
+            if (ann.source === AnnotationReference.PdbInterface && ((_a = ann.target_identifiers) === null || _a === void 0 ? void 0 : _a.interface_id)) {
                 return ann.target_identifiers.interface_id + "|" + ann.target_identifiers.interface_partner_index;
             }
         });
@@ -70,26 +70,28 @@ export class RcsbFvInterface extends RcsbFvAbstractModule {
     titleSuffix(rcsbContext) {
         return ((ann, d) => __awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (ann.source === Source.PdbInterface) {
-                if (!ann.target_id)
+            if (ann.source === AnnotationReference.PdbInterface) {
+                if (!ann.target_id || !ann.target_identifiers)
                     return "";
                 const interfaceTranslate = yield rcsbRequestCtxManager.getInterfaceToInstance(ann.target_id);
                 const chain = this.instanceId.split(TagDelimiter.instance)[1];
-                const chPair = interfaceTranslate.getInstances(ann.target_id);
+                const interfaceId = TagDelimiter.getInterfaceId(ann.target_identifiers);
+                const chPair = interfaceTranslate.getInstances(interfaceId);
                 if (!chPair)
                     return "";
                 const asym = chPair[0] == chain ? chPair[1] : chPair[0];
                 const auth = (yield rcsbRequestCtxManager.getEntityToInstance(this.instanceId.split(TagDelimiter.instance)[0])).translateAsymToAuth(asym);
-                const operators = interfaceTranslate.getOperatorIds(ann.target_id);
+                const operators = interfaceTranslate.getOperatorIds(interfaceId);
                 let partnerOperator = "";
-                if (operators && ((_a = ann.target_identifiers) === null || _a === void 0 ? void 0 : _a.interface_partner_index) && rcsbContext && Array.isArray(rcsbContext.operatorIds)) {
-                    const opIndex = operators[ann.target_identifiers.interface_partner_index].map(o => o.join("-")).indexOf(rcsbContext.operatorIds.join("-"));
+                const partner_idx = (_a = ann.target_identifiers) === null || _a === void 0 ? void 0 : _a.interface_partner_index;
+                if (operators && typeof partner_idx == "number" && rcsbContext && Array.isArray(rcsbContext.operatorIds)) {
+                    const opIndex = operators[partner_idx].map(o => o.join("-")).indexOf(rcsbContext.operatorIds.join("-"));
                     if (opIndex < 0) {
                         console.error(`Operator Id ${rcsbContext.operatorIds.join("-")} not found in [[${operators[0]}],[${operators[1]}]]`);
                         console.error(ann.target_identifiers);
                     }
                     else {
-                        partnerOperator = TagDelimiter.operatorComposition + operators[1 - ann.target_identifiers.interface_partner_index][opIndex].join(TagDelimiter.operatorComposition);
+                        partnerOperator = TagDelimiter.operatorComposition + operators[1 - partner_idx][opIndex].join(TagDelimiter.operatorComposition);
                     }
                 }
                 return (asym == auth ? asym : `${asym}[auth ${auth}]`) + partnerOperator;
@@ -98,7 +100,7 @@ export class RcsbFvInterface extends RcsbFvAbstractModule {
     }
     trackTitle(ann, d) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (ann.source === Source.PdbInterface && d.type === FeatureType.BurialFraction) {
+            if (ann.source === AnnotationReference.PdbInterface && d.type === FeatureType.BurialFraction) {
                 return "BINDING CHAIN ";
             }
         });
@@ -121,3 +123,4 @@ export function filter(ann) {
         resolve(burialFractionFilter(buriedResiduesFilter(ann)));
     });
 }
+//# sourceMappingURL=RcsbFvInterface.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvInterface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvInterface.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvInterface.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvModuleInterface.d.ts

@@ -1,6 +1,6 @@
 import { RcsbFvBoardConfigInterface, RcsbFvRowConfigInterface } from "@rcsb/rcsb-saguaro/lib/RcsbFv/RcsbFvConfig/RcsbFvConfigInterface";
 import { RcsbFv } from "@rcsb/rcsb-saguaro/lib/RcsbFv/RcsbFv";
-import { AlignmentResponse, Feature, FilterInput, GroupReference, SequenceReference, Source, TargetAlignment } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceAlignments, Features, AnnotationFilterInput, GroupReference, SequenceReference, AnnotationReference, TargetAlignments } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { PolymerEntityInstanceTranslate } from "../../RcsbUtils/Translators/PolymerEntityInstanceTranslate";
 import { AnnotationCollectorInterface, AnnotationProcessingInterface, AnnotationsCollectConfig } from "../../RcsbCollectTools/AnnotationCollector/AnnotationCollectorInterface";
 import { ExternalTrackBuilderInterface } from "../../RcsbCollectTools/FeatureTools/ExternalTrackBuilderInterface";
@@ -22,8 +22,8 @@ export type RcsbContextType = Partial<{
     operatorIds: Array<string>;
 }>;
 export interface RcsbFvAdditionalConfig {
-    sources?: Array<Source>;
-    filters?: Array<FilterInput>;
+    sources?: Array<AnnotationReference>;
+    filters?: Array<AnnotationFilterInput>;
     alignmentFilter?: Array<string>;
     hideAlignments?: boolean;
     bottomAlignments?: boolean;
@@ -33,12 +33,12 @@ export interface RcsbFvAdditionalConfig {
     externalTrackBuilder?: ExternalTrackBuilderInterface;
     page?: {
         first: number;
-        after: string;
+        after: number;
     };
     excludeLogo?: boolean;
     rcsbContext?: RcsbContextType;
     trackConfigModifier?: {
-        alignment?: (alignmentContext: AlignmentRequestContextType, targetAlignment: TargetAlignment, alignmentResponse: AlignmentResponse, alignmentIndex: number) => Promise<Partial<RcsbFvRowConfigInterface>>;
+        alignment?: (alignmentContext: AlignmentRequestContextType, targetAlignment: TargetAlignments, alignmentResponse: SequenceAlignments, alignmentIndex: number) => Promise<Partial<RcsbFvRowConfigInterface>>;
         annotations?: (trackManager: TrackManagerInterface) => Promise<Partial<RcsbFvRowConfigInterface>>;
     };
     externalUiComponents?: {
@@ -46,13 +46,14 @@ export interface RcsbFvAdditionalConfig {
         replace?: UiComponentType<any>[];
     };
     dataProvider?: RcsbModuleDataProviderInterface;
+    isAnnotationsGroupSummary?: boolean;
 }
 export interface RcsbModuleDataProviderInterface {
     alignments?: {
         collector: AlignmentCollectorInterface;
         context: AlignmentCollectConfig;
         trackFactories?: {
-            alignmentTrackFactory?: TrackFactoryInterface<[AlignmentRequestContextType, TargetAlignment]>;
+            alignmentTrackFactory?: TrackFactoryInterface<[AlignmentRequestContextType, TargetAlignments]>;
             sequenceTrackFactory?: TrackFactoryInterface<[AlignmentRequestContextType, string]>;
         };
     };
@@ -67,7 +68,7 @@ export interface RcsbFvModuleBuildInterface {
     queryId?: string;
     from?: SequenceReference;
     to?: SequenceReference;
-    sources?: Array<Source>;
+    sources?: Array<AnnotationReference>;
     entityId?: string;
     instanceId?: string;
     upAcc?: string;
@@ -95,8 +96,8 @@ export interface RcsbFvModulePublicInterface<P extends {
     [k: string]: any;
 } = {}> {
     getTargets(): Promise<Array<string>>;
-    getAlignmentResponse(): Promise<AlignmentResponse>;
-    getFeatures(): Promise<Array<Feature>>;
+    getAlignmentResponse(): Promise<SequenceAlignments>;
+    getFeatures(): Promise<Array<Features>>;
     getAnnotationConfigData(): Promise<Array<RcsbFvRowConfigInterface<P, S, R, M>>>;
     getFv(): RcsbFv<P, S, R, M>;
     wait(): Promise<void>;

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvModuleInterface.js

@@ -1 +1,2 @@
 export {};
+//# sourceMappingURL=RcsbFvModuleInterface.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvModuleInterface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvModuleInterface.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvModuleInterface.ts"],"names":[],"mappings":""}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvPairwiseAlignment.js

@@ -19,3 +19,4 @@ export class RcsbFvPairwiseAlignment extends RcsbFvAbstractModule {
     concatAlignmentAndAnnotationTracks() {
     }
 }
+//# sourceMappingURL=RcsbFvPairwiseAlignment.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvPairwiseAlignment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvPairwiseAlignment.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvPairwiseAlignment.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAC,wBAAwB,EAAC,MAAM,iEAAiE,CAAC;AACzG,OAAO,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;AAC9D,IAAO,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;AAEhD,MAAM,OAAO,uBAAwB,SAAQ,oBAAoB;IAE7C,cAAc;;;YAC1B,MAAM,WAAW,GAA+B,IAAI,CAAC,WAAW,CAAC;YACjE,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,GAAG,GAA6B,IAAI,wBAAwB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACpF,MAAM,MAAM,mBACR,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE,EACvB,WAAW,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,IACvC,MAAA,WAAW,CAAC,gBAAgB,0CAAE,WAAW,CAC/C,CAAC;YACF,IAAI,CAAC,eAAe,mCAAQ,IAAI,CAAC,eAAe,GAAK,MAAM,CAAC,CAAC;YAC7D,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC;YACjH,OAAO,KAAK,CAAC,CAAC;QAClB,CAAC;KAAA;IAES,kCAAkC;IAC5C,CAAC;CAEJ"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvProteinSequence.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { Source } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { AnnotationReference } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 import { Assertions } from "../../RcsbUtils/Helpers/Assertions";
 var assertDefined = Assertions.assertDefined;
@@ -8,9 +8,11 @@ export class RcsbFvProteinSequence extends RcsbFvAbstractModule {
         return __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 : [Source.Uniprot];
+            const source = (_a = buildConfig.sources) !== null && _a !== void 0 ? _a : [AnnotationReference.Uniprot];
             const alignmentRequestContext = {
                 queryId: queryId,
                 from: buildConfig.from,
@@ -48,3 +50,4 @@ export class RcsbFvProteinSequence extends RcsbFvAbstractModule {
         }
     }
 }
+//# sourceMappingURL=RcsbFvProteinSequence.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvProteinSequence.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvProteinSequence.ts"],"names":[],"mappings":";AAAA,OAAO,EAGH,mBAAmB,EACtB,MAAM,+DAA+D,CAAC;AACvE,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAI5D,OAAO,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;AAC9D,IAAO,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;AAEhD,MAAM,OAAO,qBAAsB,SAAQ,oBAAoB;IAE3C,cAAc;;;YAC1B,MAAM,WAAW,GAA+B,IAAI,CAAC,WAAW,CAAC;YACjE,IAAG,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE;gBACnC,OAAO;YAEX,MAAM,OAAO,GAAuB,WAAW,CAAC,OAAO,CAAC;YACxD,aAAa,CAAC,OAAO,CAAC,CAAC;YACvB,MAAM,MAAM,GAA+B,MAAA,WAAW,CAAC,OAAO,mCAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAChG,MAAM,uBAAuB,GAA8B;gBACvD,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,EAAE,EAAE,WAAW,CAAC,EAAE;gBAClB,cAAc,EAAC,IAAI;gBACnB,oBAAoB,EAAE,MAAA,WAAW,CAAC,gBAAgB,0CAAE,oBAAoB;aAC3E,CAAC;YACF,MAAM,iBAAiB,GAAuB,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAA,WAAW,CAAC,gBAAgB,0CAAE,eAAe,CAAC,CAAC;YAC5J,MAAM,IAAI,CAAC,oBAAoB,CAAC,uBAAuB,EAAE,iBAAiB,CAAC,CAAC;YAE5E,MAAM,yBAAyB,GAA6B;gBACxD,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,WAAW,CAAC,IAAI;gBAC3B,OAAO,EAAC,MAAM;gBACd,oBAAoB,EAAC,MAAA,WAAW,CAAC,gBAAgB,0CAAE,oBAAoB;gBACvE,oBAAoB,EAAE,MAAA,WAAW,CAAC,gBAAgB,0CAAE,oBAAoB;aAC3E,CAAC;YACF,MAAM,mBAAmB,GAA0B,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;YACrH,MAAM,IAAI,CAAC,qBAAqB,CAAC,yBAAyB,EAAC,mBAAmB,CAAC,CAAC;YAEhF,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;YACjF,IAAI,CAAC,eAAe,CAAC,WAAW,GAAG,IAAI,CAAC;YACxC,OAAO,KAAK,CAAC,CAAC;QAClB,CAAC;KAAA;IAES,kCAAkC;;QACxC,MAAM,WAAW,GAA+B,IAAI,CAAC,WAAW,CAAC;QACjE,IAAG,MAAA,WAAW,CAAC,gBAAgB,0CAAE,cAAc,EAAC,CAAC;YAC7C,IAAI,CAAC,aAAa,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC7E,CAAC;aAAK,IAAG,MAAA,WAAW,CAAC,gBAAgB,0CAAE,gBAAgB,EAAC,CAAC;YACrD,IAAI,CAAC,aAAa,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC1G,CAAC;aAAI,CAAC;YACF,IAAI,CAAC,aAAa,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC1G,CAAC;IACL,CAAC;CAEJ"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvUniprot.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { FieldName, OperationType, SequenceReference, Source, Type } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { FieldName, OperationType, SequenceReference, AnnotationReference, FeaturesType } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 import { rcsbClient } from "../../RcsbGraphQL/RcsbClient";
 import { MsaAlignmentTrackFactory } from "../RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/MsaAlignmentTrackFactory";
@@ -12,7 +12,7 @@ export class RcsbFvUniprot extends RcsbFvAbstractModule {
             const buildConfig = this.buildConfig;
             const upAcc = buildConfig.upAcc;
             assertDefined(upAcc);
-            const source = [Source.Uniprot];
+            const source = [AnnotationReference.Uniprot];
             const alignmentRequestContext = {
                 queryId: upAcc,
                 from: SequenceReference.Uniprot,
@@ -25,7 +25,7 @@ export class RcsbFvUniprot extends RcsbFvAbstractModule {
             const alignmentResponse = yield this.alignmentCollector.collect(alignmentRequestContext, (_b = buildConfig.additionalConfig) === null || _b === void 0 ? void 0 : _b.alignmentFilter);
             const trackFactory = new 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) == 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) == 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) == 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) == FeaturesType.MaQaMetricLocalTypePlddt) })); }));
             yield this.buildAlignmentTracks(alignmentRequestContext, alignmentResponse, {
                 alignmentTrackFactory: trackFactory
             });
@@ -57,13 +57,14 @@ function collectFeatures(upAcc) {
         return yield rcsbClient.requestRcsbPdbAnnotations({
             queryId: upAcc,
             reference: SequenceReference.Uniprot,
-            sources: [Source.PdbInstance],
+            sources: [AnnotationReference.PdbInstance],
             filters: [{
-                    source: Source.PdbInstance,
+                    source: AnnotationReference.PdbInstance,
                     operation: OperationType.Equals,
                     field: FieldName.Type,
-                    values: [Type.UnobservedResidueXyz, Type.MaQaMetricLocalTypePlddt]
+                    values: [FeaturesType.UnobservedResidueXyz, FeaturesType.MaQaMetricLocalTypePlddt]
                 }]
         });
     });
 }
+//# sourceMappingURL=RcsbFvUniprot.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvUniprot.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvUniprot.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvUniprotAlignment.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { FieldName, GroupReference, OperationType, SequenceReference, Source, Type } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { FieldName, GroupReference, OperationType, SequenceReference, AnnotationReference, FeaturesType } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 import { rcsbClient } from "../../RcsbGraphQL/RcsbClient";
 import { MsaAlignmentTrackFactory } from "../RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/MsaAlignmentTrackFactory";
@@ -27,14 +27,14 @@ export class RcsbFvUniprotAlignment extends RcsbFvAbstractModule {
             const alignmentResponse = yield this.alignmentCollector.collect(alignmentRequestContext, (_g = buildConfig.additionalConfig) === null || _g === void 0 ? void 0 : _g.alignmentFilter);
             const trackFactory = new 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) == 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) == 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) == 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) == FeaturesType.MaQaMetricLocalTypePlddt) })); }));
             yield this.buildAlignmentTracks(alignmentRequestContext, alignmentResponse, {
                 alignmentTrackFactory: trackFactory
             });
             const annotationsRequestContext = {
                 queryId: buildConfig.upAcc,
                 reference: SequenceReference.Uniprot,
-                sources: [Source.Uniprot],
+                sources: [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
             };
@@ -59,13 +59,14 @@ function collectFeatures(upAcc) {
         return yield rcsbClient.requestRcsbPdbAnnotations({
             queryId: upAcc,
             reference: SequenceReference.Uniprot,
-            sources: [Source.PdbInstance],
+            sources: [AnnotationReference.PdbInstance],
             filters: [{
-                    source: Source.PdbInstance,
+                    source: AnnotationReference.PdbInstance,
                     operation: OperationType.Equals,
                     field: FieldName.Type,
-                    values: [Type.UnobservedResidueXyz, Type.MaQaMetricLocalTypePlddt]
+                    values: [FeaturesType.UnobservedResidueXyz, FeaturesType.MaQaMetricLocalTypePlddt]
                 }]
         });
     });
 }
+//# sourceMappingURL=RcsbFvUniprotAlignment.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvUniprotAlignment.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvUniprotAlignment.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvUniprotEntity.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { FieldName, OperationType, SequenceReference, Source } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { FieldName, OperationType, SequenceReference, AnnotationReference } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 import { Assertions } from "../../RcsbUtils/Helpers/Assertions";
 var assertDefined = Assertions.assertDefined;
@@ -21,7 +21,7 @@ export class RcsbFvUniprotEntity extends RcsbFvAbstractModule {
             const filters = [{
                     field: FieldName.TargetId,
                     operation: OperationType.Equals,
-                    source: Source.PdbEntity,
+                    source: AnnotationReference.PdbEntity,
                     values: [entityId]
                 }];
             const alignmentRequestContext = {
@@ -37,7 +37,7 @@ export class RcsbFvUniprotEntity extends RcsbFvAbstractModule {
             const annotationsRequestContext = {
                 queryId: upAcc,
                 reference: SequenceReference.Uniprot,
-                sources: (additionalConfig === null || additionalConfig === void 0 ? void 0 : additionalConfig.sources) ? additionalConfig.sources : [Source.PdbEntity, Source.Uniprot],
+                sources: (additionalConfig === null || additionalConfig === void 0 ? void 0 : additionalConfig.sources) ? additionalConfig.sources : [AnnotationReference.PdbEntity, 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,
@@ -64,7 +64,7 @@ export class RcsbFvUniprotEntity extends RcsbFvAbstractModule {
     titleSuffix(ann, d) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (this.polymerEntityInstance != null && ann.source === Source.PdbInstance) {
+            if (this.polymerEntityInstance != null && ann.source === AnnotationReference.PdbInstance) {
                 const labelAsymId = (_a = ann.target_id) === null || _a === void 0 ? void 0 : _a.split(TagDelimiter.instance)[1];
                 if (!labelAsymId)
                     return;
@@ -74,3 +74,4 @@ export class RcsbFvUniprotEntity extends RcsbFvAbstractModule {
         });
     }
 }
+//# sourceMappingURL=RcsbFvUniprotEntity.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvUniprotEntity.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvUniprotEntity.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvUniprotInstance.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { FieldName, OperationType, SequenceReference, Source } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { FieldName, OperationType, SequenceReference, AnnotationReference } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 import { buriedResidues, buriedResiduesFilter } from "../../RcsbUtils/TrackGenerators/BuriedResidues";
 import { Assertions } from "../../RcsbUtils/Helpers/Assertions";
@@ -14,18 +14,18 @@ export class RcsbFvUniprotInstance extends RcsbFvAbstractModule {
             const instanceId = buildConfig.instanceId;
             const additionalConfig = buildConfig.additionalConfig;
             assertDefined(entityId), assertDefined(instanceId), assertDefined(upAcc);
-            let sources = [Source.Uniprot, Source.PdbEntity, Source.PdbInstance];
+            let sources = [AnnotationReference.Uniprot, AnnotationReference.PdbEntity, AnnotationReference.PdbInstance];
             if (additionalConfig != null && additionalConfig.sources != null && additionalConfig.sources.length > 0)
                 sources = additionalConfig.sources;
             let filters = [{
                     field: FieldName.TargetId,
                     operation: OperationType.Equals,
-                    source: Source.PdbEntity,
+                    source: AnnotationReference.PdbEntity,
                     values: [entityId]
                 }, {
                     field: FieldName.TargetId,
                     operation: OperationType.Contains,
-                    source: Source.PdbInstance,
+                    source: AnnotationReference.PdbInstance,
                     values: [instanceId]
                 }];
             if (additionalConfig != null && additionalConfig.filters != null && additionalConfig.filters.length > 0)
@@ -61,3 +61,4 @@ export class RcsbFvUniprotInstance extends RcsbFvAbstractModule {
         this.rowConfigData = [this.referenceTrack].concat(this.alignmentTracks).concat(this.annotationTracks);
     }
 }
+//# sourceMappingURL=RcsbFvUniprotInstance.js.map