refactor: resolve comments

Author: doc-han

packages/cli/src/util/load-plan.ts

@@ -193,7 +193,6 @@ const importGlobals = async (
 ) => {
   const fnStr = plan.workflow?.globals;
   if (fnStr && isPath(fnStr)) {
-    // FIXME: fetchFile function isn't generic enough
     plan.workflow.globals = await fetchFile(
       { id: '', fileType: 'globals', rootDir, filePath: fnStr },
       log

packages/lexicon/core.d.ts

@@ -35,7 +35,7 @@ export type Workflow = {
   // (gets applied to every configuration object)
   credentials?: Record<string, any>;
 
-  // a path to a file where functions are defined!
+  // a path to a file where functions are defined
   globals?: string;
 };
 

packages/runtime/src/execute/expression.ts

@@ -52,10 +52,12 @@ export default (
       const timeout = plan.options?.timeout ?? ctx.opts.defaultRunTimeoutMs;
 
       // prepare global functions to be injected into execution context
-      let funcs = {};
-      if (plan.workflow?.globals)
-        funcs = await prepareGlobals(plan.workflow.globals);
-      const globals = { ...opts.globals, ...funcs };
+      const globals = {
+        ...opts.globals,
+        ...(plan.workflow?.globals
+          ? await prepareGlobals(plan.workflow.globals)
+          : {}),
+      };
 
       // Setup an execution context
       const context = buildContext(input, { ...opts, globals });
@@ -255,15 +257,14 @@ const prepareGlobals = async (
 ): Promise<GlobalsModule> => {
   if (typeof source === 'string' && !!source.trim()) {
     const context = vm.createContext({ console: opts.logger });
-    const funcs = await loadModule(source || '', {
+    return await loadModule(source || '', {
       context,
     }).catch((e) => {
       // mostly syntax errors
       // repackage errors and throw
-      e.message = `(inside globals) ${e.message}`;
+      e.message = `[globals] ${e.message}`;
       throw e;
     });
-    return funcs;
   }
   return {};
 };