3 files changed, 14 insertions, 12 deletions
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index e60f7553f..6fb97d70c 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -30,7 +30,7 @@ import { ComputedField, ScriptField } from './ScriptField';
 import { BoolCast, Cast, DocCast, FieldValue, NumCast, StrCast, ToConstructor } from './Types';
 import { AudioField, CsvField, ImageField, PdfField, VideoField, WebField } from './URLField';
 import { containedFieldChangedHandler, deleteProperty, GetEffectiveAcl, getField, getter, makeEditable, makeReadOnly, setter, SharingPermissions } from './util';
-import JSZip = require('jszip');
+import * as JSZip from 'jszip';
 export const LinkedTo = '-linkedTo';
 export namespace Field {
     export function toKeyValueString(doc: Doc, key: string): string {
@@ -816,6 +816,7 @@ export namespace Doc {
     }
 
     export function FindReferences(infield: Doc | List<any>, references: Set<Doc>, system: boolean | undefined) {
+        if (infield instanceof Promise) return;
         if (!(infield instanceof Doc)) {
             infield.forEach(val => (val instanceof Doc || val instanceof List) && FindReferences(val, references, system));
             return;
@@ -1201,14 +1202,14 @@ export namespace Doc {
         return !doc
             ? undefined
             : doc.isTemplateDoc
-            ? doc
-            : Cast(doc.dragFactory, Doc, null)?.isTemplateDoc
-            ? doc.dragFactory
-            : Cast(Doc.Layout(doc), Doc, null)?.isTemplateDoc
-            ? Cast(Doc.Layout(doc), Doc, null).resolvedDataDoc
-                ? Doc.Layout(doc).proto
-                : Doc.Layout(doc)
-            : undefined;
+              ? doc
+              : Cast(doc.dragFactory, Doc, null)?.isTemplateDoc
+                ? doc.dragFactory
+                : Cast(Doc.Layout(doc), Doc, null)?.isTemplateDoc
+                  ? Cast(Doc.Layout(doc), Doc, null).resolvedDataDoc
+                      ? Doc.Layout(doc).proto
+                      : Doc.Layout(doc)
+                  : undefined;
     }
 
     export function deiconifyView(doc: Doc) {
diff --git a/src/fields/Schema.ts b/src/fields/Schema.ts
index f035eeb0d..f5e64ae1f 100644
--- a/src/fields/Schema.ts
+++ b/src/fields/Schema.ts
@@ -94,6 +94,7 @@ export function makeStrictInterface<T extends Interface>(schema: T): (doc: Doc)
 }
 
 export function createSchema<T extends Interface>(schema: T): T & { proto: ToConstructor<Doc> } {
+    return undefined as any;
     (schema as any).proto = Doc;
     return schema as any;
 }
diff --git a/src/fields/ScriptField.ts b/src/fields/ScriptField.ts
index cd07a8885..62690a9fb 100644
--- a/src/fields/ScriptField.ts
+++ b/src/fields/ScriptField.ts
@@ -15,7 +15,7 @@ function optional(propSchema: PropSchema) {
     return custom(
         value => {
             if (value !== undefined) {
-                return propSchema.serializer(value);
+                return propSchema.serializer(value, '', undefined); // this function only takes one parameter, but I think its typescript typings are messed up to take 3
             }
             return SKIP;
         },
@@ -97,7 +97,7 @@ export class ScriptField extends ObjectField {
     constructor(script: CompiledScript | undefined, setterscript?: CompiledScript, rawscript?: string) {
         super();
 
-        const captured = script?.options.capturedVariables;
+        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())));
         }
@@ -151,7 +151,7 @@ export class ComputedField extends ScriptField {
     _lastComputedResult: any;
     //TODO maybe add an observable cache based on what is passed in for doc, considering there shouldn't really be that many possible values for doc
     value = computedFn((doc: Doc) => this._valueOutsideReaction(doc));
-    _valueOutsideReaction = (doc: Doc) => (this._lastComputedResult = this.script.run({ this: doc, self: doc, value: '', _last_: this._lastComputedResult, _readOnly_: true }, console.log).result);
+    _valueOutsideReaction = (doc: Doc) => (this._lastComputedResult = this.script.compiled && this.script.run({ this: doc, self: doc, value: '', _last_: this._lastComputedResult, _readOnly_: true }, console.log).result);
 
     [ToValue](doc: Doc) {
         return ComputedField.toValue(doc, this);