@sjcrh/proteinpaint-types 2.152.1-0 → 2.153.1-2

package/dist/{chunk-HI2IT25E.js → chunk-4LZHDYI3.js}

@@ -204,8 +204,17 @@ var validGRIN2Response = (input) => {
     const $io6 = (input3) => "string" === typeof input3.label && "boolean" === typeof input3.sortable;
     const $io7 = (input3) => "string" === typeof input3.value || "number" === typeof input3.value;
     const $io8 = (input3) => "number" === typeof input3.processingTime && "number" === typeof input3.grin2Time && "number" === typeof input3.totalTime;
-    const $io9 = (input3) => (void 0 === input3.totalSamples || "number" === typeof input3.totalSamples) && (void 0 === input3.processedSamples || "number" === typeof input3.processedSamples) && (void 0 === input3.failedSamples || "number" === typeof input3.failedSamples) && (void 0 === input3.failedFiles || Array.isArray(input3.failedFiles) && input3.failedFiles.every((elem) => "object" === typeof elem && null !== elem && $io10(elem))) && (void 0 === input3.totalLesions || "number" === typeof input3.totalLesions) && (void 0 === input3.processedLesions || "number" === typeof input3.processedLesions) && (void 0 === input3.unprocessedSamples || "number" === typeof input3.unprocessedSamples);
+    const $io9 = (input3) => (void 0 === input3.totalSamples || "number" === typeof input3.totalSamples) && (void 0 === input3.processedSamples || "number" === typeof input3.processedSamples) && (void 0 === input3.failedSamples || "number" === typeof input3.failedSamples) && (void 0 === input3.failedFiles || Array.isArray(input3.failedFiles) && input3.failedFiles.every((elem) => "object" === typeof elem && null !== elem && $io10(elem))) && (void 0 === input3.totalLesions || "number" === typeof input3.totalLesions) && (void 0 === input3.processedLesions || "number" === typeof input3.processedLesions) && (void 0 === input3.unprocessedSamples || "number" === typeof input3.unprocessedSamples) && (void 0 === input3.lesionCounts || "object" === typeof input3.lesionCounts && null !== input3.lesionCounts && false === Array.isArray(input3.lesionCounts) && $io11(input3.lesionCounts));
     const $io10 = (input3) => "string" === typeof input3.sampleName && "string" === typeof input3.filePath && "string" === typeof input3.error;
+    const $io11 = (input3) => (void 0 === input3.total || "number" === typeof input3.total) && (void 0 === input3.byType || "object" === typeof input3.byType && null !== input3.byType && false === Array.isArray(input3.byType) && $io12(input3.byType));
+    const $io12 = (input3) => Object.keys(input3).every((key) => {
+      const value = input3[key];
+      if (void 0 === value)
+        return true;
+      if (RegExp(/(.*)/).test(key))
+        return "object" === typeof value && null !== value && ("number" === typeof value.count && "boolean" === typeof value.capped && "number" === typeof value.samples);
+      return true;
+    });
     return "object" === typeof input2 && null !== input2 && $io0(input2);
   };
   if (false === __is(input)) {
@@ -500,6 +509,14 @@ var validGRIN2Response = (input) => {
         path: _path2 + ".unprocessedSamples",
         expected: "(number | undefined)",
         value: input3.unprocessedSamples
+      }), void 0 === input3.lesionCounts || ("object" === typeof input3.lesionCounts && null !== input3.lesionCounts && false === Array.isArray(input3.lesionCounts) || $report(_exceptionable2, {
+        path: _path2 + ".lesionCounts",
+        expected: "(__type.o8 | undefined)",
+        value: input3.lesionCounts
+      })) && $vo11(input3.lesionCounts, _path2 + ".lesionCounts", _exceptionable2) || $report(_exceptionable2, {
+        path: _path2 + ".lesionCounts",
+        expected: "(__type.o8 | undefined)",
+        value: input3.lesionCounts
       })].every((flag) => flag);
       const $vo10 = (input3, _path2, _exceptionable2 = true) => ["string" === typeof input3.sampleName || $report(_exceptionable2, {
         path: _path2 + ".sampleName",
@@ -514,6 +531,48 @@ var validGRIN2Response = (input) => {
         expected: "string",
         value: input3.error
       })].every((flag) => flag);
+      const $vo11 = (input3, _path2, _exceptionable2 = true) => [void 0 === input3.total || "number" === typeof input3.total || $report(_exceptionable2, {
+        path: _path2 + ".total",
+        expected: "(number | undefined)",
+        value: input3.total
+      }), void 0 === input3.byType || ("object" === typeof input3.byType && null !== input3.byType && false === Array.isArray(input3.byType) || $report(_exceptionable2, {
+        path: _path2 + ".byType",
+        expected: "(Record<string, __type>.o1 | undefined)",
+        value: input3.byType
+      })) && $vo12(input3.byType, _path2 + ".byType", _exceptionable2) || $report(_exceptionable2, {
+        path: _path2 + ".byType",
+        expected: "(Record<string, __type>.o1 | undefined)",
+        value: input3.byType
+      })].every((flag) => flag);
+      const $vo12 = (input3, _path2, _exceptionable2 = true) => [false === _exceptionable2 || Object.keys(input3).map((key) => {
+        const value = input3[key];
+        if (void 0 === value)
+          return true;
+        if (RegExp(/(.*)/).test(key))
+          return ("object" === typeof value && null !== value || $report(_exceptionable2, {
+            path: _path2 + $join(key),
+            expected: "__type.o9",
+            value
+          })) && $vo13(value, _path2 + $join(key), _exceptionable2) || $report(_exceptionable2, {
+            path: _path2 + $join(key),
+            expected: "__type.o9",
+            value
+          });
+        return true;
+      }).every((flag) => flag)].every((flag) => flag);
+      const $vo13 = (input3, _path2, _exceptionable2 = true) => ["number" === typeof input3.count || $report(_exceptionable2, {
+        path: _path2 + ".count",
+        expected: "number",
+        value: input3.count
+      }), "boolean" === typeof input3.capped || $report(_exceptionable2, {
+        path: _path2 + ".capped",
+        expected: "boolean",
+        value: input3.capped
+      }), "number" === typeof input3.samples || $report(_exceptionable2, {
+        path: _path2 + ".samples",
+        expected: "number",
+        value: input3.samples
+      })].every((flag) => flag);
       return ("object" === typeof input2 && null !== input2 || $report(true, {
         path: _path + "",
         expected: "GRIN2Response",

package/dist/grin2.js

@@ -2,7 +2,7 @@ import {
   GRIN2Payload,
   validGRIN2Request,
   validGRIN2Response
-} from "./chunk-HI2IT25E.js";
+} from "./chunk-4LZHDYI3.js";
 import "./chunk-YNHC5SXO.js";
 export {
   GRIN2Payload,

package/dist/index.js

@@ -217,7 +217,7 @@ import {
   GRIN2Payload,
   validGRIN2Request,
   validGRIN2Response
-} from "./chunk-HI2IT25E.js";
+} from "./chunk-4LZHDYI3.js";
 import {
   healthcheckPayload,
   validHealthCheckRequest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-types",
-  "version": "2.152.1-0",
+  "version": "2.153.1-2",
   "type": "module",
   "description": "Shared type definitions between ProteinPaint server and client code",
   "main": "src/index.ts",
@@ -36,5 +36,10 @@
   "files": [
     "dist/*.js",
     "src"
-  ]
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/stjude/proteinpaint",
+    "directory": "server"
+  }
 }

package/src/routes/grin2.ts

@@ -166,6 +166,17 @@ export type GRIN2Response = {
 		totalLesions?: number
 		processedLesions?: number
 		unprocessedSamples?: number
+		lesionCounts?: {
+			total?: number
+			byType?: Record<
+				string, // Our key is the GRIN2 lesion type
+				{
+					count: number
+					capped: boolean
+					samples: number
+				}
+			>
+		}
 	}
 	/** Cache file name for storing GRIN2 results */
 	cacheFileName?: string