From cfa31b87f1c2a6597ed3cfb6a777126c58ace665 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Tue, 2 Aug 2022 16:28:18 -0400
Subject: Adjusted ScriptFields to have a rawScript, and updated ScrptingBoxes
 to create a scriptField even for scripts that don't compile.  Updated
 CurrentUserUtils setup functions for clicks.   Fixed TemplateMenu to work
 again.

---
 src/fields/ScriptField.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/fields/ScriptField.ts')

diff --git a/src/fields/ScriptField.ts b/src/fields/ScriptField.ts
index 2b4b1ef4c..68fb45987 100644
--- a/src/fields/ScriptField.ts
+++ b/src/fields/ScriptField.ts
@@ -81,6 +81,8 @@ async function deserializeScript(script: ScriptField) {
 @scriptingGlobal
 @Deserializable('script', deserializeScript)
 export class ScriptField extends ObjectField {
+    @serializable
+    readonly rawscript: string | undefined;
     @serializable(object(scriptSchema))
     readonly script: CompiledScript;
     @serializable(object(scriptSchema))
@@ -94,15 +96,16 @@ export class ScriptField extends ObjectField {
         return this._scriptFieldCache.get(field);
     }
 
-    constructor(script: CompiledScript, setterscript?: CompiledScript) {
+    constructor(script: CompiledScript | undefined, setterscript?: CompiledScript, rawscript?: string) {
         super();
 
         const captured = script?.options.capturedVariables;
         if (captured) {
             this.captures = new List<string>(Object.keys(captured).map(key => key + ':' + (captured[key] instanceof Doc ? 'ID->' + (captured[key] as Doc)[Id] : captured[key].toString())));
         }
+        this.rawscript = rawscript;
         this.setterscript = setterscript;
-        this.script = script;
+        this.script = script ?? (CompileScript('false') as CompiledScript);
     }
 
     //     init(callback: (res: Field) => any) {
@@ -127,7 +130,7 @@ export class ScriptField extends ObjectField {
     //     }
 
     [Copy](): ObjectField {
-        return new ScriptField(this.script, this.setterscript);
+        return new ScriptField(this.script, this.setterscript, this.rawscript);
     }
     toString() {
         return `${this.script.originalScript} + ${this.setterscript?.originalScript}`;
@@ -175,7 +178,7 @@ export class ComputedField extends ScriptField {
     _valueOutsideReaction = (doc: Doc) => (this._lastComputedResult = this.script.run({ this: doc, self: Cast(doc.rootDocument, Doc, null) || doc, _last_: this._lastComputedResult, _readOnly_: true }, console.log).result);
 
     [Copy](): ObjectField {
-        return new ComputedField(this.script, this.setterscript);
+        return new ComputedField(this.script, this.setterscript, this.rawscript);
     }
 
     public static MakeScript(script: string, params: object = {}) {
-- 
cgit v1.2.3-70-g09d2