@sjcrh/proteinpaint-shared 2.162.0 → 2.163.1

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@sjcrh/proteinpaint-shared",
-  "version": "2.162.0",
+  "version": "2.163.1",
   "description": "ProteinPaint code that is shared between server and client-side workspaces",
   "type": "module",
   "main": "src/index.js",
   "exports": {
     ".": "./src/index.js",
+    "./*.ts": "./src/*.ts_SHOULD_BE_js",
     "./*": "./src/*"
   },
   "scripts": {

package/src/index.js

@@ -15,6 +15,7 @@ export * from './termdb.bins.js'
 export * from './termdb.initbinconfig.js'
 export * from './termdb.usecase.js'
 export * from './terms.js'
+export * from './time.js'
 export * from './tree.js'
 // do `npm run esm` to generate .js file from .ts file
 export * from './urljson.js'

package/src/termdb.usecase.js

@@ -154,6 +154,11 @@ export function isUsableTerm(term, _usecase, termdbConfig, ds) {
 			}
 			return uses
 
+		case 'numericTermCollections':
+			if (usecase.detail?.termIds?.includes(term.id)) uses.add('plot')
+			if (usecase.detail?.branchIds?.includes(term.id)) uses.add('branch')
+			return uses
+
 		case 'profileForms':
 			if (!term.isleaf) {
 				const ancestors = term.id.split('__').length //depends on using the __ naming convension!

package/src/time.js

@@ -1,9 +1,8 @@
-function formatElapsedTime(ms) {
-	if (typeof ms !== "number") {
-		return "Invalid time: not a number"
-	}
-	if (isNaN(ms)) {
-		return "Invalid time: NaN"
+function formatElapsedTime(ms, precision = 2) {
+	if (typeof ms !== "number" || isNaN(ms)) {
+		return typeof ms !== "number"
+			? "Invalid time: not a number"
+			: "Invalid time: NaN"
 	}
 	if (!isFinite(ms)) {
 		return ms > 0 ? "Infinite time" : "-Infinite time"
@@ -12,13 +11,12 @@ function formatElapsedTime(ms) {
 	const sign = ms < 0 ? "-" : ""
 	if (absMs < 1e3) {
 		return `${sign}${absMs}ms`
-	} else if (absMs < 6e4) {
-		const seconds = (absMs / 1e3).toFixed(2)
-		return `${sign}${seconds}s`
-	} else {
-		const minutes = Math.floor(absMs / 6e4)
-		const seconds = ((absMs % 6e4) / 1e3).toFixed(2)
-		return `${sign}${minutes}m ${seconds}s`
 	}
+	if (absMs < 6e4) {
+		return `${sign}${(absMs / 1e3).toFixed(precision)}s`
+	}
+	const minutes = Math.floor(absMs / 6e4)
+	const seconds = ((absMs % 6e4) / 1e3).toFixed(precision)
+	return `${sign}${minutes}m ${seconds}s`
 }
 export { formatElapsedTime }