Merge branch 'master' of https://github.com/brown-dash/Dash-Web into DocCreatorMenu-work

1 files changed, 11 insertions, 10 deletions

diff --git a/src/client/util/Scripting.ts b/src/client/util/Scripting.ts
index b1db0bf39..b0886a67c 100644
--- a/src/client/util/Scripting.ts
+++ b/src/client/util/Scripting.ts
@@ -48,8 +48,13 @@ export function isCompileError(toBeDetermined: CompileResult): toBeDetermined is
 
 // eslint-disable-next-line no-use-before-define
 function Run(script: string | undefined, customParams: string[], diagnostics: ts.Diagnostic[], originalScript: string, options: ScriptOptions): CompileResult {
-    const errors = diagnostics.filter(diag => diag.category === ts.DiagnosticCategory.Error);
+    const errors = diagnostics.filter(diag => diag.category === ts.DiagnosticCategory.Error).filter(diag => //
+        diag.code !== 2304 && 
+        diag.code !== 2339 && 
+        (diag.code !== 2552 ||!Object.keys(scriptingGlobals).includes(diagnostics[0].messageText.toString().match(/Cannot find name '([A-Za-z0-9$-_]+)'/)?.[1]??"-------"))
+    ); // prettier-ignore
     if ((options.typecheck !== false && errors.length) || !script) {
+        console.log('Script Compile Failed: ' + script + ' ', errors);
         return { compiled: false, errors };
     }
 
@@ -188,6 +193,7 @@ export function CompileScript(script: string, options: ScriptOptions = {}): Comp
     }, '');
     const found = ScriptField.GetScriptFieldCache(script + ':' + signature); // if already compiled, found is the result; cache set below
     if (found) return found as CompiledScript;
+    options.typecheck = true;
     const { requiredType = '', addReturn = false, params = {}, capturedVariables = {}, typecheck = true } = options;
     if (options.params && !options.params.this) options.params.this = Doc.name;
     if (options.globals) {
@@ -221,15 +227,10 @@ export function CompileScript(script: string, options: ScriptOptions = {}): Comp
     if ('this' in params || 'this' in capturedVariables) {
         paramNames.push('this');
     }
-    for (const key in params) {
-        if (key !== 'this') {
-            paramNames.push(key);
-        }
-    }
-    const paramList = paramNames.map(key => {
-        const val = params[key];
-        return `${key}: ${val}`;
-    });
+    paramNames.push(...Object.keys(params).filter(p => p !== 'this' && !Object.keys(capturedVariables).includes(p)));
+
+    const paramList = paramNames.map(key => `${key}: ${params[key] === Doc.name ? 'any' : params[key]}`);
+
     for (const key in capturedVariables) {
         if (key !== 'this') {
             const val = capturedVariables[key];