fixed edge cases in JS library queries

Author: raheeliftikhar5

client/packages/lowcoder/src/comps/queries/libraryQuery.tsx

@@ -12,6 +12,9 @@ import {
   MultiBaseComp,
   wrapChildAction,
   evalFunc,
+  changeValueAction,
+  multiChangeAction,
+  isDynamicSegment,
 } from "lowcoder-core";
 import {
   Dropdown,
@@ -39,6 +42,9 @@ import { toQueryView } from "./queryCompUtils";
 import { getGlobalSettings } from "comps/utils/globalSettings";
 import { QUERY_EXECUTION_ERROR, QUERY_EXECUTION_OK } from "../../constants/queryConstants";
 import type { SandBoxOption } from "lowcoder-core/src/eval/utils/evalScript";
+import { QueryLibraryApi } from "@lowcoder-ee/api/queryLibraryApi";
+import { validateResponse } from "@lowcoder-ee/api/apiUtils";
+import { JSONValue } from "@lowcoder-ee/util/jsonTypes";
 
 const NoInputsWrapper = styled.div`
   color: ${GreyTextColor};
@@ -126,6 +132,8 @@ type QueryLibraryUpdateAction = {
 const childrenMap = {
   libraryQueryId: valueComp<string>(""),
   libraryQueryRecordId: valueComp<string>("latest"),
+  libraryQueryType: valueComp<string>(""),
+  libraryQueryDSL: valueComp<JSONValue>(null),
   inputs: InputsComp,
   error: stateComp<string>(""),
 };
@@ -147,23 +155,26 @@ export const LibraryQuery = class extends LibraryQueryBase {
 
   override getView() {
     // Check if this is a JS query
-    if (this.queryInfo?.query?.compType === "js") {
+    const queryInfo = this.children.libraryQueryDSL.getView() as any;
+    const queryType = this.children.libraryQueryType.getView() as any;
+    if (queryType === "js") {
       return async (props: any) => {
         try {
           const { orgCommonSettings } = getGlobalSettings();
           const runInHost = !!orgCommonSettings?.runJavaScriptInHost;
           const timer = performance.now();
-          const script = this.queryInfo.query.comp.script || "";
+          const script = queryInfo.query.comp.script || "";
           const options: SandBoxOption = { disableLimit: runInHost };
 
           // Get input values from the inputs component and resolve any variables
           const inputValues = Object.entries(this.children.inputs.children).reduce((acc, [name, input]) => {
             // Get the raw value from the input component's text property
+            let { unevaledValue } = input.children.text;
             let value = input.children.text.getView();
-            
+
             // Resolve any variables in the value
-            if (typeof value === 'string') {
-              value = value.replace(/\{\{([^}]+)\}\}/g, (match, path) => {
+            if (typeof unevaledValue === 'string') {
+              unevaledValue = unevaledValue.replace(/\{\{([^}]+)\}\}/g, (match, path) => {
                 const parts = path.split('.');
                 let current = props.args || {};
                 for (const part of parts) {
@@ -173,17 +184,14 @@ export const LibraryQuery = class extends LibraryQueryBase {
                     return match; // Return original if path not found
                   }
                 }
-                return current?.value ?? match;
+                return current ?? match;
               });
             }
 
-            acc[name] = value;
+            acc[name] = isDynamicSegment(unevaledValue) ? value : unevaledValue;
             return acc;
           }, {} as Record<string, any>);
 
-          console.log("script: " + script);
-          console.log("inputValues: ", inputValues);
-
           const data = await evalFunc(script, inputValues, undefined, options);
           return {
             data: data,
@@ -223,10 +231,13 @@ export const LibraryQuery = class extends LibraryQueryBase {
 
   override reduce(action: CompAction): this {
     if (isMyCustomAction<QueryLibraryUpdateAction>(action, "queryLibraryUpdate")) {
-      this.queryInfo = action.value?.dsl;
+      const isJSQuery = this.children.libraryQueryType.getView() === 'js'
+      const queryDSL = isJSQuery ? action.value?.dsl : null;
+      const queryDSLValue  = this.children.libraryQueryDSL.reduce(this.children.libraryQueryDSL.changeValueAction(queryDSL))
+      
       const inputs = this.children.inputs.setInputs(action.value?.dsl?.["inputs"] ?? []);
       return setFieldsNoTypeCheck(this, {
-        children: { ...this.children, inputs: inputs },
+        children: { ...this.children, inputs: inputs, libraryQueryDSL: queryDSLValue },
         isReady: true,
       });
     }
@@ -315,7 +326,17 @@ const PropertyView = (props: { comp: InstanceType<typeof LibraryQuery> }) => {
               value: meta.libraryQueryMetaView.id,
             }))}
             value={queryId ?? queryLibraryMeta[0]?.libraryQueryMetaView.id}
-            onChange={(value) => dispatch(props.comp.changeChildAction("libraryQueryId", value))}
+            onChange={(value) => {
+              const queryDSL = queryLibraryMeta[value]?.libraryQueryMetaView || null;
+              const { datasourceType } = queryDSL as any;
+
+              props.comp.dispatch(
+                multiChangeAction({
+                  libraryQueryId: changeValueAction(value, false),
+                  libraryQueryType: changeValueAction(datasourceType, false),
+                })
+              )
+            }}
           />
         </div>
         <QueryTutorialButton