@jbrowse/core 2.17.0 → 3.0.0

package/assemblyManager/assemblyManager.js

@@ -3,24 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const mobx_state_tree_1 = require("mobx-state-tree");
 const mobx_1 = require("mobx");
-// locals
-const util_1 = require("../util");
+const mobx_state_tree_1 = require("mobx-state-tree");
 const configuration_1 = require("../configuration");
+const util_1 = require("../util");
 const assembly_1 = __importDefault(require("./assembly"));
-/**
- * #stateModel AssemblyManager
- */
 function assemblyManagerFactory(conf, pm) {
     return mobx_state_tree_1.types
         .model({
-        /**
-         * #property
-         * this is automatically managed by an autorun which looks in the parent
-         * session.assemblies, session.sessionAssemblies, and
-         * session.temporaryAssemblies
-         */
         assemblies: mobx_state_tree_1.types.array((0, assembly_1.default)(conf, pm)),
     })
         .views(self => ({
@@ -35,26 +25,13 @@ function assemblyManagerFactory(conf, pm) {
         },
     }))
         .views(self => ({
-        /**
-         * #method
-         */
         get(asmName) {
             return self.assemblyNameMap[asmName];
         },
-        /**
-         * #getter
-         */
         get assemblyNamesList() {
             return this.assemblyList.map(asm => asm.name);
         },
-        /**
-         * #getter
-         * looks at jbrowse.assemblies, session.sessionAssemblies, and
-         * session.temporaryAssemblies to load from
-         */
         get assemblyList() {
-            // name is the explicit identifier and can be accessed without getConf,
-            // hence the union with {name:string}
             const { jbrowse: { assemblies }, session: { sessionAssemblies = [], temporaryAssemblies = [] } = {}, } = (0, mobx_state_tree_1.getParent)(self);
             return [
                 ...assemblies,
@@ -67,11 +44,6 @@ function assemblyManagerFactory(conf, pm) {
         },
     }))
         .views(self => ({
-        /**
-         * #method
-         * use this method instead of assemblyManager.get(assemblyName)
-         * to get an assembly with regions loaded
-         */
         async waitForAssembly(assemblyName) {
             if (!assemblyName) {
                 throw new Error('no assembly name supplied to waitForAssembly');
@@ -83,7 +55,6 @@ function assemblyManagerFactory(conf, pm) {
                     assembly = self.get(assemblyName);
                 }
                 catch (e) {
-                    // ignore
                 }
             }
             if (!assembly) {
@@ -92,14 +63,10 @@ function assemblyManagerFactory(conf, pm) {
             await assembly.load();
             await (0, util_1.when)(() => !!(assembly.regions && assembly.refNameAliases) || !!assembly.error);
             if (assembly.error) {
-                // eslint-disable-next-line @typescript-eslint/only-throw-error
                 throw assembly.error;
             }
             return assembly;
         },
-        /**
-         * #method
-         */
         async getRefNameMapForAdapter(adapterConf, assemblyName, opts) {
             if (assemblyName) {
                 const asm = await this.waitForAssembly(assemblyName);
@@ -107,9 +74,6 @@ function assemblyManagerFactory(conf, pm) {
             }
             return {};
         },
-        /**
-         * #method
-         */
         async getReverseRefNameMapForAdapter(adapterConf, assemblyName, opts) {
             if (assemblyName) {
                 const asm = await this.waitForAssembly(assemblyName);
@@ -117,9 +81,6 @@ function assemblyManagerFactory(conf, pm) {
             }
             return {};
         },
-        /**
-         * #method
-         */
         isValidRefName(refName, assemblyName) {
             const assembly = self.get(assemblyName);
             if (assembly) {
@@ -144,25 +105,9 @@ function assemblyManagerFactory(conf, pm) {
                 }
             }, { fireImmediately: true, name: 'assemblyManagerAfterAttach' }));
         },
-        /**
-         * #action
-         * private: you would generally want to add to manipulate
-         * jbrowse.assemblies, session.sessionAssemblies, or
-         * session.temporaryAssemblies instead of using this directly
-         */
         removeAssembly(asm) {
             self.assemblies.remove(asm);
         },
-        /**
-         * #action
-         * private: you would generally want to add to manipulate
-         * jbrowse.assemblies, session.sessionAssemblies, or
-         * session.temporaryAssemblies instead of using this directly
-         *
-         * this can take an active instance of an assembly, in which case it is
-         * referred to, or it can take an identifier e.g. assembly name, which is
-         * used as a reference. snapshots cannot be used
-         */
         addAssembly(configuration) {
             self.assemblies.push({ configuration });
         },

package/configuration/configurationSchema.d.ts

@@ -1,7 +1,7 @@
-import { IAnyType } from 'mobx-state-tree';
-import { ConfigSlotDefinition } from './configurationSlot';
-import { AnyConfigurationSchemaType } from './types';
-export type { AnyConfigurationSchemaType, AnyConfigurationModel, AnyConfigurationSlot, AnyConfigurationSlotType, } from './types';
+import type { ConfigSlotDefinition } from './configurationSlot';
+import type { AnyConfigurationSchemaType } from './types';
+import type { IAnyType } from 'mobx-state-tree';
+export type { AnyConfigurationModel, AnyConfigurationSchemaType, AnyConfigurationSlot, AnyConfigurationSlotType, } from './types';
 export interface ConfigurationSchemaDefinition {
     [n: string]: ConfigSlotDefinition | ConfigurationSchemaDefinition | string | number | IAnyType;
 }

package/configuration/configurationSchema.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigurationSchema = ConfigurationSchema;
 exports.ConfigurationReference = ConfigurationReference;
 const mobx_state_tree_1 = require("mobx-state-tree");
-const mst_1 = require("../util/types/mst");
 const configurationSlot_1 = __importDefault(require("./configurationSlot"));
 const util_1 = require("./util");
+const mst_1 = require("../util/types/mst");
 function isEmptyObject(thing) {
     return (typeof thing === 'object' &&
         !Array.isArray(thing) &&
@@ -23,8 +23,6 @@ function preprocessConfigurationSchemaArguments(modelName, inputSchemaDefinition
     if (typeof modelName !== 'string') {
         throw new Error('first arg must be string name of the model that this config schema goes with');
     }
-    // if we have a base configuration schema that we are
-    // extending, grab the slot definitions from that
     let schemaDefinition = inputSchemaDefinition;
     let options = inputOptions;
     if ((_a = inputOptions.baseConfiguration) === null || _a === void 0 ? void 0 : _a.jbrowseSchemaDefinition) {
@@ -41,7 +39,6 @@ function preprocessConfigurationSchemaArguments(modelName, inputSchemaDefinition
     return { schemaDefinition, options };
 }
 function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
-    // now assemble the MST model of the configuration schema
     const modelDefinition = {};
     let identifier;
     if (options.explicitlyTyped) {
@@ -81,8 +78,6 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
     Object.entries(schemaDefinition).forEach(([slotName, slotDefinition]) => {
         if (((0, mobx_state_tree_1.isType)(slotDefinition) && (0, mobx_state_tree_1.isLateType)(slotDefinition)) ||
             (0, util_1.isConfigurationSchemaType)(slotDefinition)) {
-            // this is either an MST late() type (which we assume to be a sub-configuration),
-            // or an actual sub-configuration
             modelDefinition[slotName] = slotDefinition;
         }
         else if (typeof slotDefinition === 'string' ||
@@ -90,7 +85,6 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
             volatileConstants[slotName] = slotDefinition;
         }
         else if (typeof slotDefinition === 'object') {
-            // this is a slot definition
             if (!slotDefinition.type) {
                 throw new Error(`no type set for config slot ${modelName}.${slotName}`);
             }
@@ -120,7 +114,7 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
         },
     }));
     if (Object.keys(volatileConstants).length) {
-        completeModel = completeModel.volatile(( /* self */) => volatileConstants);
+        completeModel = completeModel.volatile(() => volatileConstants);
     }
     if (options.actions) {
         completeModel = completeModel.actions(options.actions);
@@ -139,7 +133,6 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
     completeModel = completeModel.postProcessSnapshot(snap => {
         const newSnap = {};
         let matchesDefault = true;
-        // let keyCount = 0
         for (const [key, value] of Object.entries(snap)) {
             if (matchesDefault) {
                 if (typeof defaultSnap[key] === 'object' && typeof value === 'object') {
@@ -155,7 +148,6 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
                 volatileConstants[key] === undefined &&
                 !isEmptyObject(value) &&
                 !isEmptyArray(value)) {
-                // keyCount += 1
                 newSnap[key] = value;
             }
         }
@@ -172,15 +164,11 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
 function ConfigurationSchema(modelName, inputSchemaDefinition, inputOptions) {
     const { schemaDefinition, options } = preprocessConfigurationSchemaArguments(modelName, inputSchemaDefinition, inputOptions);
     const schemaType = makeConfigurationSchemaModel(modelName, schemaDefinition, options);
-    // saving a couple of jbrowse-specific things in the type object. hope nobody gets mad.
     schemaType.isJBrowseConfigurationSchema = true;
     schemaType.jbrowseSchemaDefinition = schemaDefinition;
     schemaType.jbrowseSchemaOptions = options;
     return schemaType;
 }
 function ConfigurationReference(schemaType) {
-    // we cast this to SCHEMATYPE, because the reference *should* behave just
-    // like the object it points to. It won't be undefined (this is a
-    // `reference`, not a `safeReference`)
     return mobx_state_tree_1.types.union(mobx_state_tree_1.types.reference(schemaType), schemaType);
 }

package/configuration/configurationSlot.d.ts

@@ -1,22 +1,11 @@
-import { IAnyModelType, IAnyComplexType } from 'mobx-state-tree';
+import type { IAnyComplexType, IAnyModelType } from 'mobx-state-tree';
 export interface ConfigSlotDefinition {
-    /** human-readable description of the slot's meaning */
     description?: string;
-    /** custom base MST model for the slot's value */
     model?: IAnyModelType | IAnyComplexType;
-    /** name of the type of slot, e.g. "string", "number", "stringArray" */
     type: string;
-    /** default value of the slot */
     defaultValue: any;
-    /** parameter names of the function callback */
     contextVariable?: string[];
 }
-/**
- * builds a MST model for a configuration slot
- *
- * @param slotName -
- * @param  definition -
- */
 export default function ConfigSlot(slotName: string, { description, model, type, defaultValue, contextVariable, }: ConfigSlotDefinition): import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IModelType<{
     name: import("mobx-state-tree").ISimpleType<string>;
     description: import("mobx-state-tree").ISimpleType<string>;
@@ -28,7 +17,7 @@ export default function ConfigSlot(slotName: string, { description, model, type,
     readonly isCallback: boolean;
 } & {
     readonly expr: any;
-    readonly valueJSON: string | any[] | Record<string, any> | undefined;
+    readonly valueJSON: any[] | Record<string, any> | string | undefined;
 } & {
     set(newVal: any): void;
     reset(): void;

package/configuration/configurationSlot.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = ConfigSlot;
 const mobx_state_tree_1 = require("mobx-state-tree");
+const util_1 = require("../util");
 const jexlStrings_1 = require("../util/jexlStrings");
 const mst_1 = require("../util/types/mst");
-const util_1 = require("../util");
-function isValidColorString( /* str */) {
-    // TODO: check all the crazy cases for whether it's a valid HTML/CSS color string
+function isValidColorString() {
     return true;
 }
 const typeModels = {
@@ -22,7 +21,6 @@ const typeModels = {
     fileLocation: mst_1.FileLocation,
     frozen: mobx_state_tree_1.types.frozen(),
 };
-// default values we use if the defaultValue is malformed or does not work
 const fallbackDefaults = {
     stringArray: [],
     stringArrayMap: {},
@@ -50,14 +48,12 @@ const objectJSON = (self) => ({
         },
     },
 });
-// custom actions for modifying the value models
 const typeModelExtensions = {
     fileLocation: objectJSON,
     number: literalJSON,
     integer: literalJSON,
     boolean: literalJSON,
     frozen: objectJSON,
-    // special actions for working with stringArray slots
     stringArray: (self) => ({
         views: {
             get valueJSON() {
@@ -128,21 +124,10 @@ const typeModelExtensions = {
         },
     }),
 };
-// const FunctionStringType = types.refinement(
-//   'FunctionString',
-//   types.string,
-//   str => functionRegexp.test(str),
-// )
 const JexlStringType = mobx_state_tree_1.types.refinement('JexlString', mobx_state_tree_1.types.string, str => str.startsWith('jexl:'));
 function json(value) {
     return (value === null || value === void 0 ? void 0 : value.toJSON) ? value.toJSON() : `"${value}"`;
 }
-/**
- * builds a MST model for a configuration slot
- *
- * @param slotName -
- * @param  definition -
- */
 function ConfigSlot(slotName, { description = '', model, type, defaultValue, contextVariable = [], }) {
     if (!type) {
         throw new Error('type name required');
@@ -156,8 +141,6 @@ function ConfigSlot(slotName, { description = '', model, type, defaultValue, con
     if (defaultValue === undefined) {
         throw new Error("no 'defaultValue' provided");
     }
-    // if the `type` is something like `color`, then the model name
-    // here will be `ColorConfigSlot`
     const configSlotModelName = `${slotName
         .charAt(0)
         .toUpperCase()}${slotName.slice(1)}ConfigSlot`;
@@ -179,20 +162,14 @@ function ConfigSlot(slotName, { description = '', model, type, defaultValue, con
         .views(self => ({
         get expr() {
             if (self.isCallback) {
-                // compile as jexl function
                 const { pluginManager } = (0, util_1.getEnv)(self);
-                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
                 if (!pluginManager && typeof jest === 'undefined') {
                     console.warn('no pluginManager detected on config env (if you dynamically instantiate a config, for example in renderProps for your display model, check that you add the env argument)');
                 }
-                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
                 return (0, jexlStrings_1.stringToJexlExpression)(String(self.value), pluginManager === null || pluginManager === void 0 ? void 0 : pluginManager.jexl);
             }
             return { evalSync: () => self.value };
         },
-        // JS representation of the value of this slot, suitable
-        // for embedding in either JSON or a JS function string.
-        // many of the data types override this in typeModelExtensions
         get valueJSON() {
             if (self.isCallback) {
                 return undefined;
@@ -233,7 +210,6 @@ function ConfigSlot(slotName, { description = '', model, type, defaultValue, con
             if (!self.isCallback) {
                 return;
             }
-            // try calling it with no arguments
             try {
                 const funcResult = self.expr.evalSync();
                 if (funcResult !== undefined) {
@@ -242,20 +218,14 @@ function ConfigSlot(slotName, { description = '', model, type, defaultValue, con
                 }
             }
             catch (e) {
-                /* ignore */
             }
             self.value = defaultValue;
-            // if it is still a callback (happens if the defaultValue is a
-            // callback), then use the last-resort fallback default
-            // if defaultValue has jexl: string, run this part
             if (!(type in fallbackDefaults)) {
                 throw new Error(`no fallbackDefault defined for type ${type}`);
             }
             self.value = fallbackDefaults[type];
         },
     }));
-    // if there are any type-specific extensions (views or actions)
-    //  to the slot, add those in
     if (typeModelExtensions[type]) {
         slot = slot.extend(typeModelExtensions[type]);
     }

package/configuration/index.d.ts

@@ -1,3 +1,3 @@
-export { ConfigurationSchema, ConfigurationReference, } from './configurationSchema';
-export type { AnyConfigurationSchemaType, AnyConfigurationModel, AnyConfigurationSlot, AnyConfigurationSlotType, AnyConfiguration, } from './types';
+export { ConfigurationReference, ConfigurationSchema, } from './configurationSchema';
+export type { AnyConfiguration, AnyConfigurationModel, AnyConfigurationSchemaType, AnyConfigurationSlot, AnyConfigurationSlotType, } from './types';
 export * from './util';

package/configuration/index.js

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigurationReference = exports.ConfigurationSchema = void 0;
+exports.ConfigurationSchema = exports.ConfigurationReference = void 0;
 var configurationSchema_1 = require("./configurationSchema");
-Object.defineProperty(exports, "ConfigurationSchema", { enumerable: true, get: function () { return configurationSchema_1.ConfigurationSchema; } });
 Object.defineProperty(exports, "ConfigurationReference", { enumerable: true, get: function () { return configurationSchema_1.ConfigurationReference; } });
+Object.defineProperty(exports, "ConfigurationSchema", { enumerable: true, get: function () { return configurationSchema_1.ConfigurationSchema; } });
 __exportStar(require("./util"), exports);

package/configuration/types.d.ts

@@ -1,6 +1,6 @@
-import type { IStateTreeNode, Instance, SnapshotOut } from 'mobx-state-tree';
-import type { ConfigurationSchemaType, ConfigurationSchemaOptions } from './configurationSchema';
+import type { ConfigurationSchemaOptions, ConfigurationSchemaType } from './configurationSchema';
 import type ConfigSlot from './configurationSlot';
+import type { IStateTreeNode, Instance, SnapshotOut } from 'mobx-state-tree';
 export type GetOptions<SCHEMA> = SCHEMA extends ConfigurationSchemaType<any, infer OPTIONS> ? OPTIONS : never;
 export type GetBase<SCHEMA> = SCHEMA extends undefined ? never : GetOptions<SCHEMA> extends ConfigurationSchemaOptions<undefined, any> ? undefined : GetOptions<SCHEMA> extends ConfigurationSchemaOptions<infer BASE extends AnyConfigurationSchemaType, any> ? BASE : never;
 export type GetExplicitIdentifier<SCHEMA> = GetOptions<SCHEMA> extends ConfigurationSchemaOptions<any, infer EXPLICIT_IDENTIFIER extends string> ? EXPLICIT_IDENTIFIER : never;
@@ -10,6 +10,5 @@ export type AnyConfigurationSchemaType = ConfigurationSchemaType<any, any>;
 export type AnyConfigurationModel = Instance<AnyConfigurationSchemaType>;
 export type AnyConfigurationSlotType = ReturnType<typeof ConfigSlot>;
 export type AnyConfigurationSlot = Instance<AnyConfigurationSlotType>;
-/** any configuration model, or snapshot thereof */
 export type AnyConfiguration = AnyConfigurationModel | SnapshotOut<AnyConfigurationModel>;
 export type ConfigurationModel<SCHEMA extends AnyConfigurationSchemaType> = Instance<SCHEMA>;

package/configuration/util.d.ts

@@ -1,32 +1,8 @@
-import { AnyConfigurationModel, AnyConfigurationSchemaType, ConfigurationSlotName, ConfigurationSchemaForModel } from './types';
-/**
- * given a configuration model (an instance of a ConfigurationSchema),
- * read the configuration variable at the given path
- *
- * @param model - instance of ConfigurationSchema
- * @param slotPaths - array of paths to read
- * @param args - extra arguments e.g. for a feature callback,
- *  will be sent to each of the slotNames
- */
+import type { AnyConfigurationModel, AnyConfigurationSchemaType, ConfigurationSchemaForModel, ConfigurationSlotName } from './types';
 export declare function readConfObject<CONFMODEL extends AnyConfigurationModel>(confObject: CONFMODEL, slotPath?: ConfigurationSlotName<ConfigurationSchemaForModel<CONFMODEL>> | string[], args?: Record<string, unknown>): any;
-/**
- * helper method for readConfObject, reads the config from a mst model
- *
- * @param model - object containing a 'configuration' member
- * @param slotPaths - array of paths to read
- * @param args - extra arguments e.g. for a feature callback,
- *   will be sent to each of the slotNames
- */
 export declare function getConf<CONFMODEL extends AnyConfigurationModel>(model: {
     configuration: CONFMODEL;
 }, slotPath?: Parameters<typeof readConfObject<CONFMODEL>>[1], args?: Parameters<typeof readConfObject<CONFMODEL>>[2]): any;
-/**
- * given a union of explicitly typed configuration schema types,
- * extract an array of the type names contained in the union
- *
- * @param unionType -
- * @returns Array of type names contained in the union
- */
 export declare function getTypeNamesFromExplicitlyTypedUnion(maybeUnionType: unknown): string[];
 export declare function isBareConfigurationSchemaType(thing: unknown): thing is AnyConfigurationSchemaType;
 export declare function isConfigurationSchemaType(thing: unknown): thing is AnyConfigurationSchemaType;

package/configuration/util.js

@@ -9,22 +9,12 @@ exports.isConfigurationModel = isConfigurationModel;
 exports.isConfigurationSlotType = isConfigurationSlotType;
 const mobx_state_tree_1 = require("mobx-state-tree");
 const mst_reflection_1 = require("../util/mst-reflection");
-/**
- * given a configuration model (an instance of a ConfigurationSchema),
- * read the configuration variable at the given path
- *
- * @param model - instance of ConfigurationSchema
- * @param slotPaths - array of paths to read
- * @param args - extra arguments e.g. for a feature callback,
- *  will be sent to each of the slotNames
- */
 function readConfObject(confObject, slotPath, args = {}) {
     if (!slotPath) {
-        return JSON.parse(JSON.stringify((0, mobx_state_tree_1.getSnapshot)(confObject)));
+        return structuredClone((0, mobx_state_tree_1.getSnapshot)(confObject));
     }
-    if (typeof slotPath === 'string') {
+    else if (typeof slotPath === 'string') {
         let slot = confObject[slotPath];
-        // check for the subconf being a map if we don't find it immediately
         if (!slot &&
             (0, mobx_state_tree_1.isStateTreeNode)(confObject) &&
             (0, mobx_state_tree_1.isMapType)((0, mobx_state_tree_1.getType)(confObject))) {
@@ -32,28 +22,19 @@ function readConfObject(confObject, slotPath, args = {}) {
         }
         if (!slot) {
             return undefined;
-            // if we want to be very strict about config slots, we could uncomment the below
-            // instead of returning undefined
-            //
-            // const modelType = getType(model)
-            // const schemaType = model.configuration && getType(model.configuration)
-            // throw new Error(
-            //   `no slot "${slotName}" found in ${modelType.name} configuration (${
-            //     schemaType.name
-            //   })`,
-            // )
         }
-        const val = slot.expr ? slot.expr.evalSync(args) : slot;
-        return (0, mobx_state_tree_1.isStateTreeNode)(val)
-            ? JSON.parse(JSON.stringify((0, mobx_state_tree_1.getSnapshot)(val)))
-            : val;
+        else {
+            const val = slot.expr ? slot.expr.evalSync(args) : slot;
+            return (0, mobx_state_tree_1.isStateTreeNode)(val)
+                ? JSON.parse(JSON.stringify((0, mobx_state_tree_1.getSnapshot)(val)))
+                : val;
+        }
     }
-    if (Array.isArray(slotPath)) {
+    else if (Array.isArray(slotPath)) {
         const slotName = slotPath[0];
         if (slotPath.length > 1) {
             const newPath = slotPath.slice(1);
             let subConf = confObject[slotName];
-            // check for the subconf being a map if we don't find it immediately
             if (!subConf &&
                 (0, mobx_state_tree_1.isStateTreeNode)(confObject) &&
                 (0, mobx_state_tree_1.isMapType)((0, mobx_state_tree_1.getType)(confObject))) {
@@ -65,14 +46,6 @@ function readConfObject(confObject, slotPath, args = {}) {
     }
     throw new TypeError('slotPath must be a string or array');
 }
-/**
- * helper method for readConfObject, reads the config from a mst model
- *
- * @param model - object containing a 'configuration' member
- * @param slotPaths - array of paths to read
- * @param args - extra arguments e.g. for a feature callback,
- *   will be sent to each of the slotNames
- */
 function getConf(model, slotPath, args) {
     const { configuration } = model;
     if (isConfigurationModel(configuration)) {
@@ -80,17 +53,9 @@ function getConf(model, slotPath, args) {
     }
     throw new TypeError('cannot getConf on this model, it has no configuration');
 }
-/**
- * given a union of explicitly typed configuration schema types,
- * extract an array of the type names contained in the union
- *
- * @param unionType -
- * @returns Array of type names contained in the union
- */
 function getTypeNamesFromExplicitlyTypedUnion(maybeUnionType) {
     if ((0, mobx_state_tree_1.isType)(maybeUnionType)) {
         maybeUnionType = (0, mst_reflection_1.resolveLateType)(maybeUnionType);
-        // @ts-expect-error
         if ((0, mobx_state_tree_1.isUnionType)(maybeUnionType)) {
             const typeNames = [];
             (0, mst_reflection_1.getUnionSubTypes)(maybeUnionType).forEach(type => {
@@ -101,7 +66,6 @@ function getTypeNamesFromExplicitlyTypedUnion(maybeUnionType) {
                     typeName = [def.type];
                 }
                 if (!typeName[0]) {
-                    // debugger
                     throw new Error(`invalid config schema type ${type}`);
                 }
                 typeNames.push(...typeName);
@@ -118,7 +82,6 @@ function isBareConfigurationSchemaType(thing) {
                 thing.name.includes('ConfigurationSchema'))) {
             return true;
         }
-        // if it's a late type, assume its a config schema
         if ((0, mobx_state_tree_1.isLateType)(thing)) {
             return true;
         }
@@ -129,26 +92,26 @@ function isConfigurationSchemaType(thing) {
     if (!(0, mobx_state_tree_1.isType)(thing)) {
         return false;
     }
-    // written as a series of if-statements instead of a big logical OR
-    // because this construction gives much better debugging backtraces.
-    // also, note that the order of these statements matters, because
-    // for example some union types are also optional types
-    if (isBareConfigurationSchemaType(thing)) {
+    else if (isBareConfigurationSchemaType(thing)) {
         return true;
     }
-    if ((0, mobx_state_tree_1.isUnionType)(thing)) {
+    else if ((0, mobx_state_tree_1.isUnionType)(thing)) {
         return (0, mst_reflection_1.getUnionSubTypes)(thing).every(t => isConfigurationSchemaType(t) || t.name === 'undefined');
     }
-    if ((0, mobx_state_tree_1.isOptionalType)(thing) && isConfigurationSchemaType((0, mst_reflection_1.getSubType)(thing))) {
+    else if ((0, mobx_state_tree_1.isOptionalType)(thing) &&
+        isConfigurationSchemaType((0, mst_reflection_1.getSubType)(thing))) {
         return true;
     }
-    if ((0, mobx_state_tree_1.isArrayType)(thing) && isConfigurationSchemaType((0, mst_reflection_1.getSubType)(thing))) {
+    else if ((0, mobx_state_tree_1.isArrayType)(thing) &&
+        isConfigurationSchemaType((0, mst_reflection_1.getSubType)(thing))) {
         return true;
     }
-    if ((0, mobx_state_tree_1.isMapType)(thing) && isConfigurationSchemaType((0, mst_reflection_1.getSubType)(thing))) {
+    else if ((0, mobx_state_tree_1.isMapType)(thing) && isConfigurationSchemaType((0, mst_reflection_1.getSubType)(thing))) {
         return true;
     }
-    return false;
+    else {
+        return false;
+    }
 }
 function isConfigurationModel(thing) {
     return (0, mobx_state_tree_1.isStateTreeNode)(thing) && isConfigurationSchemaType((0, mobx_state_tree_1.getType)(thing));

package/data_adapters/BaseAdapter/BaseAdapter.d.ts

@@ -1,7 +1,7 @@
-import { AnyConfigurationModel } from '../../configuration';
-import { getSubAdapterType } from '../dataAdapterCache';
-import { AugmentedRegion as Region } from '../../util/types';
-import PluginManager from '../../PluginManager';
+import type PluginManager from '../../PluginManager';
+import type { AnyConfigurationModel } from '../../configuration';
+import type { AugmentedRegion as Region } from '../../util/types';
+import type { getSubAdapterType } from '../dataAdapterCache';
 export declare abstract class BaseAdapter {
     config: AnyConfigurationModel;
     getSubAdapter?: getSubAdapterType | undefined;
@@ -9,16 +9,6 @@ export declare abstract class BaseAdapter {
     id: string;
     static capabilities: string[];
     constructor(config?: AnyConfigurationModel, getSubAdapter?: getSubAdapterType | undefined, pluginManager?: PluginManager | undefined);
-    /**
-     * Same as `readConfObject(this.config, arg)`.
-     * Note: Does not offer the same TS type checking as `readConfObject`,
-     * consider using that instead.
-     */
     getConf(arg: string | string[]): any;
-    /**
-     * Called to provide a hint that data tied to a certain region will not be
-     * needed for the foreseeable future and can be purged from caches, etc
-     * @param region - Region
-     */
     abstract freeResources(region: Region): void;
 }

package/data_adapters/BaseAdapter/BaseAdapter.js

@@ -5,18 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseAdapter = void 0;
 const mobx_state_tree_1 = require("mobx-state-tree");
-// locals
 const configuration_1 = require("../../configuration");
 const idMaker_1 = __importDefault(require("../../util/idMaker"));
-const configuration_2 = require("../../configuration");
-const EmptyConfig = (0, configuration_2.ConfigurationSchema)('empty', {});
+const EmptyConfig = (0, configuration_1.ConfigurationSchema)('empty', {});
 class BaseAdapter {
     constructor(config = EmptyConfig.create(), getSubAdapter, pluginManager) {
         this.config = config;
         this.getSubAdapter = getSubAdapter;
         this.pluginManager = pluginManager;
-        // note: we use switch on jest here for more simple feature IDs
-        // in test environment
         if (typeof jest === 'undefined') {
             const data = (0, mobx_state_tree_1.isStateTreeNode)(config) ? (0, mobx_state_tree_1.getSnapshot)(config) : config;
             this.id = `${(0, idMaker_1.default)(data)}`;
@@ -25,11 +21,6 @@ class BaseAdapter {
             this.id = 'test';
         }
     }
-    /**
-     * Same as `readConfObject(this.config, arg)`.
-     * Note: Does not offer the same TS type checking as `readConfObject`,
-     * consider using that instead.
-     */
     getConf(arg) {
         return (0, configuration_1.readConfObject)(this.config, arg);
     }