fix: extra transformer preview and type err

openblocks-dev · Feb 9, 2023 · bcc2dc4 · bcc2dc4
1 parent d3c1429
commit bcc2dc4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/client/packages/openblocks-core/lib/index.cjs b/client/packages/openblocks-core/lib/index.cjs
@@ -1507,7 +1507,7 @@ function evalFunction(unevaledValue, context, methods, isAsync) {
             if (runInHost === void 0) { runInHost = false; }
             return evalFunc(unevaledValue.startsWith("return")
                 ? unevaledValue + "\n"
-                : "return function(){'use strict'; " + unevaledValue + "\n}()", args ? __assign(__assign({}, context), args) : context, methods, { disableLimit: runInHost }, isAsync);
+                : "return ".concat(isAsync ? "async " : "", "function(){'use strict'; ").concat(unevaledValue, "\n}()"), args ? __assign(__assign({}, context), args) : context, methods, { disableLimit: runInHost }, isAsync);
         });
     }
     catch (err) {

diff --git a/client/packages/openblocks-core/lib/index.js b/client/packages/openblocks-core/lib/index.js
@@ -1499,7 +1499,7 @@ function evalFunction(unevaledValue, context, methods, isAsync) {
             if (runInHost === void 0) { runInHost = false; }
             return evalFunc(unevaledValue.startsWith("return")
                 ? unevaledValue + "\n"
-                : "return function(){'use strict'; " + unevaledValue + "\n}()", args ? __assign(__assign({}, context), args) : context, methods, { disableLimit: runInHost }, isAsync);
+                : "return ".concat(isAsync ? "async " : "", "function(){'use strict'; ").concat(unevaledValue, "\n}()"), args ? __assign(__assign({}, context), args) : context, methods, { disableLimit: runInHost }, isAsync);
         });
     }
     catch (err) {

diff --git a/client/packages/openblocks-core/src/eval/utils/string2Fn.tsx b/client/packages/openblocks-core/src/eval/utils/string2Fn.tsx
@@ -165,7 +165,7 @@ export function evalFunction(
       evalFunc(
         unevaledValue.startsWith("return")
           ? unevaledValue + "\n"
-          : "return function(){'use strict'; " + unevaledValue + "\n}()",
+          : `return ${isAsync ? "async " : ""}function(){'use strict'; ${unevaledValue}\n}()`,
         args ? { ...context, ...args } : context,
         methods,
         { disableLimit: runInHost },

diff --git a/client/packages/openblocks/src/constants/queryConstants.ts b/client/packages/openblocks/src/constants/queryConstants.ts
@@ -31,7 +31,7 @@ export type DatasourceType =
 
 export type ResourceType = DatasourceType | "js" | "libraryQuery" | "view";
 
-export const QueryMap: Record<ResourceType, MultiCompConstructor> = {
+export const QueryMap = {
   js: JSQuery,
   mysql: SQLQuery,
   restApi: HttpQuery,