@sjcrh/proteinpaint-shared 2.147.1 → 2.149.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-shared",
-  "version": "2.147.1",
+  "version": "2.149.0",
   "description": "ProteinPaint code that is shared between server and client-side workspaces",
   "type": "module",
   "main": "src/index.js",

package/src/joinUrl.js

@@ -1,13 +1,13 @@
 function joinUrl(p1, ...p2) {
-	if (typeof p1 != 'string') throw `first argument must be string type`
-	if (!p1) throw 'blank string not allowed'
-	if (p1.indexOf('?') != -1) throw 'search string not allowed'
+	if (typeof p1 != "string") throw `first argument must be string type`
+	if (!p1) throw "blank string not allowed"
+	if (p1.indexOf("?") != -1) throw "search string not allowed"
 	let url = p1
 	for (const p of p2) {
-		if (typeof p != 'string') throw `all arguments must be string type`
-		if (!p) throw 'blank string not allowed'
-		if (url.slice(-1) != '/') url += '/'
-		url += p.startsWith('/') ? p.substring(1) : p
+		if (typeof p != "string") throw `all arguments must be string type`
+		if (!p) throw "blank string not allowed"
+		if (url.slice(-1) != "/") url += "/"
+		url += p.startsWith("/") ? p.substring(1) : p
 	}
 	return url
 }

package/src/termdb.bins.js

@@ -267,6 +267,8 @@ export function get_bin_label(bin, binconfig, valueConversion) {
 	/*
   Generate a numeric bin label given a bin configuration and an optional term valueConversion object
 */
+	if ('label' in bin) return bin.label
+
 	const bc = binconfig
 	if (!bc.binLabelFormatter) bc.binLabelFormatter = getNumDecimalsFormatter(bc)
 	if (!bin.startunbounded && !bin.stopunbounded && !('startinclusive' in bin) && !('stopinclusive' in bin)) {

package/src/termdb.initbinconfig.js

@@ -6,7 +6,7 @@ Initialize a bin configuration for a numeric dataset
     {format: 'string'}: output bin config as JSON string
 */
 export default function initBinConfig(data, opts = {}) {
-	if (data.find(d => !Number.isFinite(d))) throw 'non-numeric values found'
+	if (data.find(d => !Number.isFinite(d))) throw new Error('non-numeric values found')
 
 	let binConfig
 	const s = new Set(data)

package/src/time.js

@@ -1,15 +1,15 @@
 function formatElapsedTime(ms) {
-	if (typeof ms !== 'number') {
-		return 'Invalid time: not a number'
+	if (typeof ms !== "number") {
+		return "Invalid time: not a number"
 	}
 	if (isNaN(ms)) {
-		return 'Invalid time: NaN'
+		return "Invalid time: NaN"
 	}
 	if (!isFinite(ms)) {
-		return ms > 0 ? 'Infinite time' : '-Infinite time'
+		return ms > 0 ? "Infinite time" : "-Infinite time"
 	}
 	const absMs = Math.abs(ms)
-	const sign = ms < 0 ? '-' : ''
+	const sign = ms < 0 ? "-" : ""
 	if (absMs < 1e3) {
 		return `${sign}${absMs}ms`
 	} else if (absMs < 6e4) {

package/src/urljson.js

@@ -1,29 +1,38 @@
-import { isNumeric } from './helpers.js'
-const reserved = ['false', 'true', 'null', 'undefined']
-const delimiters = ['"', '{', '[']
+import { isNumeric } from "./helpers.js"
+const reserved = ["false", "true", "null", "undefined"]
+const delimiters = ['"', "{", "["]
 function encode(rawObject) {
 	const params = []
 	for (const [key, value] of Object.entries(rawObject)) {
-		if (typeof value == 'string' && !isNumeric(value) && !reserved.includes(value) && !delimiters.includes(value[0])) {
+		if (
+			typeof value == "string" &&
+			!isNumeric(value) &&
+			!reserved.includes(value) &&
+			!delimiters.includes(value[0])
+		) {
 			params.push(`${key}=${encodeURIComponent(value)}`)
 		} else if (value !== void 0) {
 			params.push(`${key}=${encodeURIComponent(JSON.stringify(value))}`)
 		}
 	}
-	return params.join('&')
+	return params.join("&")
 }
 function decode(query) {
 	const encoding = query.encoding
 	for (const [key, value] of Object.entries(query)) {
 		if (
-			encoding == 'json' ||
-			value == 'null' || // not new, always been
-			value == 'true' || // NEED TO FIND-REPLACE CODE THAT USES value == 'true'
-			value == 'false' || // NEED TO FIND-REPLACE CODE THAT USES value == 'false'
+			encoding == "json" ||
+			value == "null" || // not new, always been
+			value == "true" || // NEED TO FIND-REPLACE CODE THAT USES value == 'true'
+			value == "false" || // NEED TO FIND-REPLACE CODE THAT USES value == 'false'
 			isNumeric(value) || // NEED TO check
-			(typeof value == 'string' && value.startsWith('"') && value.endsWith('"')) ||
-			(typeof value == 'string' && value.startsWith('{') && value.endsWith('}')) ||
-			(value.startsWith('[') && value.endsWith(']'))
+			(typeof value == "string" &&
+				value.startsWith('"') &&
+				value.endsWith('"')) ||
+			(typeof value == "string" &&
+				value.startsWith("{") &&
+				value.endsWith("}")) ||
+			(value.startsWith("[") && value.endsWith("]"))
 		)
 			query[key] = JSON.parse(value)
 	}