changed EditableViews to support oneline and multiline. Also added transformer UI to allow documents to be entered. changed transformer to write doc id's, not variables.. made schema view support oneline and fixed bug with docdecoration hader occluding things invisibly. updated web pages to be zoomable and for its anchors to update web page and scroll location properly. made autolinkanchor directly go to target on click.

1 files changed, 18 insertions, 12 deletions

diff --git a/src/client/util/Scripting.ts b/src/client/util/Scripting.ts
index f17a98616..70c2e3842 100644
--- a/src/client/util/Scripting.ts
+++ b/src/client/util/Scripting.ts
@@ -7,8 +7,6 @@
 import * as typescriptlib from '!!raw-loader!./type_decls.d';
 import * as ts from 'typescript';
 import { Doc, Field } from '../../fields/Doc';
-import { ToScriptString } from '../../fields/FieldSymbols';
-import { ObjectField } from '../../fields/ObjectField';
 import { RefField } from '../../fields/RefField';
 import { ScriptField } from '../../fields/ScriptField';
 import { scriptingGlobals, ScriptingGlobals } from './ScriptingGlobals';
@@ -60,7 +58,14 @@ function Run(script: string | undefined, customParams: string[], diagnostics: an
     // let fieldTypes = [Doc, ImageField, PdfField, VideoField, AudioField, List, RichTextField, ScriptField, ComputedField, CompileScript];
     // let paramNames = ["Docs", ...fieldTypes.map(fn => fn.name)];
     // let params: any[] = [Docs, ...fieldTypes];
-    const compiledFunction = new Function(...paramNames, `return ${script}`);
+    const compiledFunction = (() => {
+        try {
+            return new Function(...paramNames, `return ${script}`);
+        } catch {
+            return undefined;
+        }
+    })();
+    if (!compiledFunction) return { compiled: false, errors };
     const { capturedVariables = {} } = options;
     const run = (args: { [name: string]: any } = {}, onError?: (e: any) => void, errorVal?: any): ScriptResult => {
         const argsArray: any[] = [];
@@ -155,7 +160,7 @@ export type Traverser = (node: ts.Node, indentation: string) => boolean | void;
 export type TraverserParam = Traverser | { onEnter: Traverser; onLeave: Traverser };
 export type Transformer = {
     transformer: ts.TransformerFactory<ts.SourceFile>;
-    getVars?: () => { capturedVariables: { [name: string]: Field } };
+    getVars?: () => { [name: string]: Field };
 };
 export interface ScriptOptions {
     requiredType?: string; // does function required a typed return value
@@ -205,16 +210,17 @@ export function CompileScript(script: string, options: ScriptOptions = {}): Comp
     if (options.transformer) {
         const sourceFile = ts.createSourceFile('script.ts', script, ts.ScriptTarget.ES2015, true);
         const result = ts.transform(sourceFile, [options.transformer.transformer]);
-        if (options.transformer.getVars) {
-            const newCaptures = options.transformer.getVars();
+        const newCaptures = options.transformer.getVars?.();
+        if (Object.keys(newCaptures ?? {}).length) {
             // tslint:disable-next-line: prefer-object-spread
-            options.capturedVariables = Object.assign(capturedVariables, newCaptures.capturedVariables) as any;
+            //options.capturedVariables = Object.assign(capturedVariables, newCaptures!) as any;
+
+            const transformed = result.transformed;
+            const printer = ts.createPrinter({
+                newLine: ts.NewLineKind.LineFeed,
+            });
+            script = printer.printFile(transformed[0]);
         }
-        const transformed = result.transformed;
-        const printer = ts.createPrinter({
-            newLine: ts.NewLineKind.LineFeed,
-        });
-        script = printer.printFile(transformed[0]);
         result.dispose();
     }
     const paramNames: string[] = [];