fix: extra transformer preview and type err

sarike · sarike · commit bcc2dc41fac3 · 2023-02-09T19:35:26.000+08:00
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,

Original file line number	Diff line number	Diff line change
`@@ -1507,7 +1507,7 @@ function evalFunction(unevaledValue, context, methods, isAsync) {`
`1507`	`1507`	`if (runInHost === void 0) { runInHost = false; }`
`1508`	`1508`	`return evalFunc(unevaledValue.startsWith("return")`
`1509`	`1509`	`? unevaledValue + "\n"`
`1510`		`- : "return function(){'use strict'; " + unevaledValue + "\n}()", args ? __assign(__assign({}, context), args) : context, methods, { disableLimit: runInHost }, isAsync);`
	`1510`	`+ : "return ".concat(isAsync ? "async " : "", "function(){'use strict'; ").concat(unevaledValue, "\n}()"), args ? __assign(__assign({}, context), args) : context, methods, { disableLimit: runInHost }, isAsync);`
`1511`	`1511`	`});`
`1512`	`1512`	`}`
`1513`	`1513`	`catch (err) {`
Original file line number	Diff line number	Diff line change
`@@ -1499,7 +1499,7 @@ function evalFunction(unevaledValue, context, methods, isAsync) {`
`1499`	`1499`	`if (runInHost === void 0) { runInHost = false; }`
`1500`	`1500`	`return evalFunc(unevaledValue.startsWith("return")`
`1501`	`1501`	`? unevaledValue + "\n"`
`1502`		`- : "return function(){'use strict'; " + unevaledValue + "\n}()", args ? __assign(__assign({}, context), args) : context, methods, { disableLimit: runInHost }, isAsync);`
	`1502`	`+ : "return ".concat(isAsync ? "async " : "", "function(){'use strict'; ").concat(unevaledValue, "\n}()"), args ? __assign(__assign({}, context), args) : context, methods, { disableLimit: runInHost }, isAsync);`
`1503`	`1503`	`});`
`1504`	`1504`	`}`
`1505`	`1505`	`catch (err) {`