@sjcrh/proteinpaint-shared 2.170.0 → 2.170.3

package/package.json

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

package/src/fetch-helpers.js

@@ -15,8 +15,9 @@ import { encode } from './urljson.js'
 	init{headers?, body?}
 	- first two arguments are same as native fetch
 */
-export async function ezFetch(_url, init = {}) {
-	const url = mayAdjustRequest(_url, init)
+export async function ezFetch(_url, init = {}, opts = {}) {
+	const url = opts.autoMethod ? mayAdjustRequest(_url, init) : _url
+	if (typeof init.body === 'object') init.body = JSON.stringify(init.body)
 
 	return fetch(url, init).then(async r => {
 		const response = await processResponse(r)
@@ -61,10 +62,18 @@ also the caller should just call dofetch2() without a serverData{}
 rather than dofetch3
 */
 export async function processResponse(r) {
+	// if (!r.ok) {
+	//   throw new Error(`HTTP error! status: ${r.status}`)
+	// }
 	const ct = r.headers.get('content-type') // content type is always present
 	if (!ct) throw `missing response.header['content-type']`
 	if (ct.includes('/json')) {
-		return r.json()
+		const payload = await r.json()
+		// server should use a standard HTTP response status 400+, 500+
+		// so that !r.ok will already be caught when wrapping fetch with try-catch
+		// if (payload.error || payload.status == '') throw payload
+		// if (payload.status === 'error') throw payload.message || payload
+		return payload
 	}
 	if (ct.includes('/text') || ct.includes('text/')) {
 		return r.text()
@@ -73,6 +82,9 @@ export async function processResponse(r) {
 		if (ct.startsWith('multipart/form-data')) return processFormData(r)
 		else throw `cannot handle response content-type: '${ct}'`
 	}
+	if (ct == 'application/x-ndjson-nestedkey') {
+		return processNDJSON_nestedKey(r)
+	}
 	// call blob() as catch-all
 	// https://developer.mozilla.org/en-US/docs/Web/API/Response
 	return r.blob()
@@ -115,6 +127,44 @@ export async function processFormData(res) {
 	}
 }
 
+async function processNDJSON_nestedKey(r) {
+	// 1. Pipe through TextDecoder to convert bytes to text
+	const stream = r.body.pipeThrough(new TextDecoderStream())
+	const reader = stream.getReader()
+	let rootObj = {}
+
+	let buffer = ''
+
+	while (true) {
+		const { value, done } = await reader.read()
+		if (done) break
+
+		// 2. Add new chunk to buffer
+		buffer += value
+
+		// 3. Split by newline
+		let parts = buffer.split('\n')
+
+		// 4. Keep the last partial line in the buffer
+		buffer = parts.pop()
+
+		// 5. Process complete lines
+		for (const line of parts) {
+			if (line.trim()) {
+				const [keys, data] = JSON.parse(line) //; console.log(143, keys, data) // Process JSON data
+				if (!keys.length) rootObj = data
+				else {
+					const lastKey = keys.pop()
+					let target = rootObj
+					for (const k of keys) target = target[k]
+					target[lastKey] = data
+				}
+			}
+		}
+	}
+	return rootObj
+}
+
 // key: request object reference or conputed string dataName
 // value: fetch promise or response
 const dataCache = new Map()
@@ -145,6 +195,7 @@ const maxNumOfDataKeys = 360
 	  - if not provided, then a string cache data key will be computed from the request url, body, headers
 */
 export async function memFetch(url, init, opts = {}) {
+	if (typeof init.body === 'object') init.body = JSON.stringify(init.body)
 	const dataKey = opts.q || (await getDataName(url, init))
 	let result = dataCache.get(dataKey)
 

package/src/termdb.bins.js

@@ -267,6 +267,7 @@ export function get_bin_label(bin, binconfig, valueConversion) {
 	/*
   Generate a numeric bin label given a bin configuration and an optional term valueConversion object
 */
+	if (!bin) return 'missing bin.label'
 	if (bin.label) return bin.label
 
 	const bc = binconfig

package/src/termdb.initbinconfig.js

@@ -6,6 +6,8 @@ Initialize a bin configuration for a numeric dataset
     {format: 'string'}: output bin config as JSON string
 */
 export default function initBinConfig(data, opts = {}) {
+	if (!data.length)
+		return { mode: 'discrete', type: 'regular-bin', startinclusive: true, bin_size: null, first_bin: { stop: null } }
 	if (data.find(d => !Number.isFinite(d))) throw new Error('non-numeric values found')
 
 	let binConfig