fix: obtain jq wrap/pair from annotation

biothings · Oct 13, 2023 · 549e415 · 549e415
1 parent 8d7b437
commit 549e415
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -32,12 +32,12 @@ export class Transformer {
     //   console.log(`WE DONT DO THE OP ${api}, ${this.data.edge.query_operation}`)
     // }
 
-    if (this.data.edge.query_operation?.transformer?.pair_jq || this.data.edge.query_operation?.transformer?.wrap_jq) {
+    if (this.data.edge.query_operation?.transformer?.jq) {
       // console.log("WE DO THE OP", this.data.edge.query_operation.transformer)
       this.tf = new JQTransformer(this.data, {
         ...this.config,
-        wrap: this.data.edge.query_operation.transformer.wrap_jq,
-        pair: this.data.edge.query_operation.transformer.pair_jq,
+        wrap: this.data.edge.query_operation.transformer.jq.wrap,
+        pair: this.data.edge.query_operation.transformer.jq.pair,
       });
     } else if (tags.includes("bte-trapi")) {
       this.tf = new TRAPITransformer(this.data, this.config);

diff --git a/src/types.ts b/src/types.ts
@@ -15,8 +15,12 @@ interface XBTEParametersObject {
 }
 
 interface TransformerObject {
-    wrap_jq?: string;
-    pair_jq?: string;
+  wrap?: string;
+  pair?: string;
+}
+
+interface TransformerSet {
+  [transformerPattern: string]: TransformerObject;
 }
 
 interface QueryOperationInterface {
@@ -29,7 +33,7 @@ interface QueryOperationInterface {
   request_body: object;
   supportBatch: boolean;
   inputSeparator: string;
-  transformer: TransformerObject;
+  transformer: TransformerSet;
 }
 
 interface SmartAPIKGOperationObject {
@@ -58,6 +62,6 @@ export interface BTEQueryObject {
 }
 
 export interface JQVariable {
-    name: string;
-    value: string;
-}
+  name: string;
+  value: string;
+}