@sjcrh/proteinpaint-types 2.139.0 → 2.140.1-0

package/dist/{chunk-VHEL5P6L.js → chunk-WMI4VKU3.js}

@@ -20,15 +20,24 @@ var GRIN2Payload = {
 var validGRIN2Request = (input) => {
   const errors = [];
   const __is = (input2) => {
+    const $join = import_typia.createValidate.join;
     const $io0 = (input3) => "string" === typeof input3.genome && "string" === typeof input3.dslabel && true && (void 0 === input3.snvindelOptions || "object" === typeof input3.snvindelOptions && null !== input3.snvindelOptions && false === Array.isArray(input3.snvindelOptions) && $io1(input3.snvindelOptions)) && (void 0 === input3.cnvOptions || "object" === typeof input3.cnvOptions && null !== input3.cnvOptions && false === Array.isArray(input3.cnvOptions) && $io2(input3.cnvOptions)) && (void 0 === input3.fusionOptions || "object" === typeof input3.fusionOptions && null !== input3.fusionOptions && false === Array.isArray(input3.fusionOptions) && $io3(input3.fusionOptions));
     const $io1 = (input3) => (void 0 === input3.minTotalDepth || "number" === typeof input3.minTotalDepth) && (void 0 === input3.minAltAlleleCount || "number" === typeof input3.minAltAlleleCount) && (void 0 === input3.consequences || Array.isArray(input3.consequences) && input3.consequences.every((elem) => "string" === typeof elem)) && (void 0 === input3.hyperMutator || "number" === typeof input3.hyperMutator);
-    const $io2 = (input3) => (void 0 === input3.lossThreshold || "number" === typeof input3.lossThreshold) && (void 0 === input3.gainThreshold || "number" === typeof input3.gainThreshold) && (void 0 === input3.maxSegLength || "number" === typeof input3.maxSegLength) && (void 0 === input3.minSegLength || "number" === typeof input3.minSegLength) && (void 0 === input3.hyperMutator || "number" === typeof input3.hyperMutator);
-    const $io3 = (input3) => (void 0 === input3.fusionTypes || Array.isArray(input3.fusionTypes) && input3.fusionTypes.every((elem) => "gene-gene" === elem || "gene-intergenic" === elem || "readthrough" === elem)) && (void 0 === input3.minConfidence || "number" === typeof input3.minConfidence);
+    const $io2 = (input3) => (void 0 === input3.lossThreshold || "number" === typeof input3.lossThreshold) && (void 0 === input3.gainThreshold || "number" === typeof input3.gainThreshold) && (void 0 === input3.maxSegLength || "number" === typeof input3.maxSegLength) && (void 0 === input3.hyperMutator || "number" === typeof input3.hyperMutator);
+    const $io3 = (input3) => Object.keys(input3).every((key) => {
+      const value = input3[key];
+      if (void 0 === value)
+        return true;
+      if (RegExp(/(.*)/).test(key))
+        return true;
+      return true;
+    });
     return "object" === typeof input2 && null !== input2 && $io0(input2);
   };
   if (false === __is(input)) {
     const $report = import_typia.createValidate.report(errors);
     ((input2, _path, _exceptionable = true) => {
+      const $join = import_typia.createValidate.join;
       const $vo0 = (input3, _path2, _exceptionable2 = true) => ["string" === typeof input3.genome || $report(_exceptionable2, {
         path: _path2 + ".genome",
         expected: "string",
@@ -99,32 +108,19 @@ var validGRIN2Request = (input) => {
         path: _path2 + ".maxSegLength",
         expected: "(number | undefined)",
         value: input3.maxSegLength
-      }), void 0 === input3.minSegLength || "number" === typeof input3.minSegLength || $report(_exceptionable2, {
-        path: _path2 + ".minSegLength",
-        expected: "(number | undefined)",
-        value: input3.minSegLength
       }), void 0 === input3.hyperMutator || "number" === typeof input3.hyperMutator || $report(_exceptionable2, {
         path: _path2 + ".hyperMutator",
         expected: "(number | undefined)",
         value: input3.hyperMutator
       })].every((flag) => flag);
-      const $vo3 = (input3, _path2, _exceptionable2 = true) => [void 0 === input3.fusionTypes || (Array.isArray(input3.fusionTypes) || $report(_exceptionable2, {
-        path: _path2 + ".fusionTypes",
-        expected: '(Array<"gene-gene" | "gene-intergenic" | "readthrough"> | undefined)',
-        value: input3.fusionTypes
-      })) && input3.fusionTypes.map((elem, _index2) => "gene-gene" === elem || "gene-intergenic" === elem || "readthrough" === elem || $report(_exceptionable2, {
-        path: _path2 + ".fusionTypes[" + _index2 + "]",
-        expected: '("gene-gene" | "gene-intergenic" | "readthrough")',
-        value: elem
-      })).every((flag) => flag) || $report(_exceptionable2, {
-        path: _path2 + ".fusionTypes",
-        expected: '(Array<"gene-gene" | "gene-intergenic" | "readthrough"> | undefined)',
-        value: input3.fusionTypes
-      }), void 0 === input3.minConfidence || "number" === typeof input3.minConfidence || $report(_exceptionable2, {
-        path: _path2 + ".minConfidence",
-        expected: "(number | undefined)",
-        value: input3.minConfidence
-      })].every((flag) => flag);
+      const $vo3 = (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 true;
+        return true;
+      }).every((flag) => flag)].every((flag) => flag);
       return ("object" === typeof input2 && null !== input2 || $report(true, {
         path: _path + "",
         expected: "GRIN2Request",

package/dist/grin2.js

@@ -2,7 +2,7 @@ import {
   GRIN2Payload,
   validGRIN2Request,
   validGRIN2Response
-} from "./chunk-VHEL5P6L.js";
+} from "./chunk-WMI4VKU3.js";
 import "./chunk-CNSSF43V.js";
 export {
   GRIN2Payload,

package/dist/index.js

@@ -172,7 +172,7 @@ import {
   GRIN2Payload,
   validGRIN2Request,
   validGRIN2Response
-} from "./chunk-VHEL5P6L.js";
+} from "./chunk-WMI4VKU3.js";
 import {
   healthcheckPayload,
   validHealthCheckRequest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-types",
-  "version": "2.139.0",
+  "version": "2.140.1-0",
   "type": "module",
   "description": "Shared type definitions between ProteinPaint server and client code",
   "main": "src/index.ts",

package/src/dataset.ts

@@ -1592,7 +1592,7 @@ type Tw = {
 	/** short hand for using either id (dict term) or term{} */
 	id?: string
 	term?: object
-	q: unknown
+	q?: unknown
 	/** quick fix for generating URL links in mds3 tk sample table! adhoc design. may move to tw.term.baseURL and not specific to mds3 tk
 	 */
 	baseURL?: string

package/src/routes/grin2.ts

@@ -18,7 +18,7 @@ export type GRIN2Request = {
 	dslabel: string
 
 	/** Filter from existing PP infrastructure */
-	filter: any // Filter object passed to get_samples(filter, ds)
+	filter?: any // Filter object passed to get_samples(filter, ds)
 
 	/** Options for filtering SNV/indel file content */
 	snvindelOptions?: {
@@ -40,18 +40,14 @@ export type GRIN2Request = {
 		gainThreshold?: number // Default: 0.3
 		/** Maximum segment length to include (0 = no filter) */
 		maxSegLength?: number // Default: 0
-		/** Minimum segment length to include (0 = no filter) */
-		minSegLength?: number // Default: 0
 		/** Hypermutator max cut off for CNVs per case */
 		hyperMutator?: number // Default: 500
 	}
 
 	/** Options for filtering fusion file content */
 	fusionOptions?: {
-		/** Filter by fusion type */
-		fusionTypes?: ('gene-gene' | 'gene-intergenic' | 'readthrough')[]
-		/** Minimum confidence score (0-1) */
-		minConfidence?: number // Default: 0.7
+		/** Placeholder - fusion filtering options to be implemented */
+		[key: string]: any
 	}
 }
 

package/src/terms/geneExpression.ts

@@ -1,4 +1,4 @@
-import type { TermWrapper } from './tw.ts'
+import type { TermWrapper } from './updated-types.ts'
 import type { NumericTerm, NumericQ } from './numeric.ts'
 import type { TermSettingInstance } from '../termsetting.ts'
 
@@ -18,6 +18,7 @@ export type GeneExpressionQ = NumericQ & {
 export type GeneExpressionTW = TermWrapper & {
 	q: GeneExpressionQ
 	term: GeneExpressionTerm
+	type: 'NumTWRegularBin' | 'NumTWCustomBin' | 'NumTWCont' | 'NumTWSpline'
 }
 
 export type GeneExpressionTerm = NumericTerm & {