@sjcrh/proteinpaint-shared 2.115.0 → 2.116.1-1

package/README.md

@@ -28,12 +28,15 @@ This package will be bundled as part of the client dependencies.
 For server builds, run `npm run build` to generate `src/*.js` from `src/*.ts` files.
 This is also automatically done as part of the `prepack` package script. 
 
-NOTE: For now, only code in `.js` files. OR, if using `.ts` files, 
-then commit the generated `.js` files, until a dev script or another approach
-can take care of the `.js` file requirement.
+NOTE: For now, only code in `.js` files. 
+
+### If using `.ts` files:
+1. commit the generated `.js` files
+2. add the js file to package.json prettier command
+keep doing this until a dev script or another approach can take care of the `.js` file requirement.
 
 ## Test
 
 ```sh
 npm test
-```
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-shared",
-  "version": "2.115.0",
+  "version": "2.116.1-1",
   "description": "ProteinPaint code that is shared between server and client-side workspaces",
   "type": "module",
   "main": "src/index.js",
@@ -9,9 +9,10 @@
     "./*": "./src/*"
   },
   "scripts": {
-    "build": "esbuild src/*.ts --platform=node --outdir=src/ --format=esm && prettier --no-semi --use-tabs --write src/urljson.js src/joinUrl.js src/doc.js",
+    "build": "esbuild src/*.ts --platform=node --outdir=src/ --format=esm && prettier --no-semi --use-tabs --write src/urljson.js src/joinUrl.js src/time.js src/doc.js",
     "prepack": "npm run build",
     "pretest": "mkdir -p test && node emitImports > test/internals-test.ts",
+    "spec:coverage": "node test/relevant.js",
     "test": "tsx test/internals-test.ts",
     "test-x": "ls src/test/*.spec* | xargs -I % bash -c '{ tsx %; sleep 0.001; }'"
   },

package/src/termdb.usecase.js

@@ -103,6 +103,22 @@ export function isUsableTerm(term, _usecase, termdbConfig, ds) {
 				if (!term.isleaf) uses.add('branch')
 			}
 			return uses
+		case 'runChart':
+			if (usecase.detail == 'date') {
+				if (term.type == 'date') {
+					uses.add('plot')
+				}
+				if (child_types.includes('date')) uses.add('branch')
+			} else if (usecase.detail == 'numeric') {
+				if (isNumericTerm(term) && term.type != 'date') {
+					uses.add('plot')
+				}
+				if (hasNumericChild(child_types)) uses.add('branch')
+			} else {
+				if (graphableTypes.has(term.type)) uses.add('plot')
+				if (!term.isleaf) uses.add('branch')
+			}
+			return uses
 		case 'numericDictTermCluster':
 			if (!usecase.detail?.exclude?.includes(term.id)) {
 				if (isNumericTerm(term)) {

package/src/time.js

@@ -1,26 +1,24 @@
 function formatElapsedTime(ms) {
-  if (typeof ms !== "number") {
-    return "Invalid time: not a number";
-  }
-  if (isNaN(ms)) {
-    return "Invalid time: NaN";
-  }
-  if (!isFinite(ms)) {
-    return ms > 0 ? "Infinite time" : "-Infinite time";
-  }
-  const absMs = Math.abs(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 (typeof ms !== 'number') {
+		return 'Invalid time: not a number'
+	}
+	if (isNaN(ms)) {
+		return 'Invalid time: NaN'
+	}
+	if (!isFinite(ms)) {
+		return ms > 0 ? 'Infinite time' : '-Infinite time'
+	}
+	const absMs = Math.abs(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`
+	}
 }
-export {
-  formatElapsedTime
-};
+export { formatElapsedTime }