fix code execution params name clobbering, and make variable access s…

…lightly safer
RelevanceAI · May 16, 2023 · 082d25d · 082d25d
1 parent 9017863
commit 082d25d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/chain.ts b/src/chain.ts
@@ -1,4 +1,10 @@
-import { UnwrapVariable, Variable, createVariable, toPath } from "./variable";
+import {
+  UnwrapVariable,
+  Variable,
+  createVariable,
+  toOptionalPath,
+  toPath,
+} from "./variable";
 import { API, APIAuthDetails } from "./api";
 import {
   AllowedTransformationId,
@@ -133,7 +139,7 @@ export class Chain<
 
   public code<
     CodeParams extends Record<string, Variable<any>>,
-    Fn extends (params: CodeParams) => any
+    Fn extends (params: UnwrapVariable<CodeParams>) => any
   >(
     params: CodeParams,
     fn: Fn
@@ -142,16 +148,16 @@ export class Chain<
   } {
     const paramsObjectContent = Object.entries(params)
       .map(([key, variable]) => {
-        return `${JSON.stringify(key)}: ${toPath(variable)}`;
+        return `${JSON.stringify(key)}: ${toOptionalPath(variable)}`;
       })
       .join(",");
 
     const fnString = fn.toString();
 
     const codeAsIIFE = `
 return (() => {
-  const params = { ${paramsObjectContent} };
-  return (${fnString})(params);
+  const _$$params = { ${paramsObjectContent} };
+  return (${fnString})(_$$params);
 })();`.trim();
 
     return this.step("js_code_transformation", {

diff --git a/src/variable.ts b/src/variable.ts
@@ -60,3 +60,7 @@ export const isVariable = (value: any): value is Variable<any> => {
 export const toPath = (variable: Variable<unknown>): string => {
   return variable[VARIABLE_INTERNAL].path;
 };
+
+export const toOptionalPath = (variable: Variable<unknown>): string => {
+  return toPath(variable).split(".").join("?.");
+};