diff options
Diffstat (limited to 'src/fields')
| -rw-r--r-- | src/fields/Doc.ts | 5 | ||||
| -rw-r--r-- | src/fields/ScriptField.ts | 44 | ||||
| -rw-r--r-- | src/fields/Types.ts | 7 |
3 files changed, 24 insertions, 32 deletions
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts index 8a5491b4b..0b9a8b3fe 100644 --- a/src/fields/Doc.ts +++ b/src/fields/Doc.ts @@ -520,7 +520,8 @@ export namespace Doc { Doc.SetLayout(alias, Doc.MakeAlias(layout)); } alias.aliasOf = doc; - alias.title = ComputedField.MakeFunction(`renameAlias(this, ${Doc.GetProto(doc).aliasNumber = NumCast(Doc.GetProto(doc).aliasNumber) + 1})`); + alias.aliasNumber = Doc.GetProto(doc).aliasNumber = NumCast(Doc.GetProto(doc).aliasNumber) + 1; + alias.title = ComputedField.MakeFunction(`renameAlias(this)`); alias.author = Doc.CurrentUserEmail; Doc.AddDocToList(Doc.GetProto(doc)[DataSym], "aliases", alias); @@ -1391,7 +1392,7 @@ export namespace Doc { } Scripting.addGlobal(function idToDoc(id: string): any { return DocServer.GetCachedRefField(id); }); -Scripting.addGlobal(function renameAlias(doc: any, n: any) { return StrCast(Doc.GetProto(doc).title).replace(/\([0-9]*\)/, "") + `(${n})`; }); +Scripting.addGlobal(function renameAlias(doc: any) { return StrCast(Doc.GetProto(doc).title).replace(/\([0-9]*\)/, "") + `(${doc.aliasNumber})`; }); Scripting.addGlobal(function getProto(doc: any) { return Doc.GetProto(doc); }); Scripting.addGlobal(function getDocTemplate(doc?: any) { return Doc.getDocTemplate(doc); }); Scripting.addGlobal(function getAlias(doc: any) { return Doc.MakeAlias(doc); }); diff --git a/src/fields/ScriptField.ts b/src/fields/ScriptField.ts index bd93bf5fb..85cd73dfe 100644 --- a/src/fields/ScriptField.ts +++ b/src/fields/ScriptField.ts @@ -40,28 +40,9 @@ const scriptSchema = createSimpleSchema({ }); async function deserializeScript(script: ScriptField) { - if (script.script.originalScript === 'copyDragFactory(this.dragFactory)') { - return (script as any).script = (ScriptField.GetCopyOfDragFactory ?? (ScriptField.GetCopyOfDragFactory = ScriptField.MakeFunction('copyDragFactory(this.dragFactory)')))?.script; - } - if (script.script.originalScript === 'links(self)') { - return (script as any).script = (ScriptField.LinksSelf ?? (ScriptField.LinksSelf = ComputedField.MakeFunction('links(self)')))?.script; - } - if (script.script.originalScript === 'openOnRight(copyDragFactory(this.dragFactory))') { - return (script as any).script = (ScriptField.OpenOnRight ?? (ScriptField.OpenOnRight = ComputedField.MakeFunction('openOnRight(copyDragFactory(this.dragFactory))')))?.script; - } - if (script.script.originalScript === 'deiconifyView(self)') { - return (script as any).script = (ScriptField.DeiconifyView ?? (ScriptField.DeiconifyView = ComputedField.MakeFunction('deiconifyView(self)')))?.script; - } - if (script.script.originalScript === 'convertToButtons(dragData)') { - return (script as any).script = (ScriptField.ConvertToButtons ?? (ScriptField.ConvertToButtons = ComputedField.MakeFunction('convertToButtons(dragData)', { dragData: "DocumentDragData" })))?.script; - } - if (script.script.originalScript === 'IsNoviceMode()') { - return (script as any).script = (ScriptField.NoviceMode ?? (ScriptField.NoviceMode = ComputedField.MakeFunction('IsNoviceMode()')))?.script; - } - if (script.script.originalScript === `selectMainMenu(self)`) { - return (script as any).script = (ScriptField.SelectMenu ?? (ScriptField.SelectMenu = ComputedField.MakeFunction('selectMainMenu(self)')))?.script; - } const captures: ProxyField<Doc> = (script as any).captures; + const cache = captures ? undefined : ScriptField.GetScriptFieldCache(script.script.originalScript); + if (cache) return (script as any).script = cache; if (captures) { const doc = (await captures.value())!; const captured: any = {}; @@ -75,6 +56,7 @@ async function deserializeScript(script: ScriptField) { throw new Error("Couldn't compile loaded script"); } (script as any).script = comp; + !captures && ScriptField._scriptFieldCache.set(script.script.originalScript, comp); if (script.setterscript) { const compset = CompileScript(script.setterscript?.originalScript, script.setterscript.options); if (!compset.compiled) { @@ -95,13 +77,9 @@ export class ScriptField extends ObjectField { @serializable(autoObject()) private captures?: ProxyField<Doc>; - public static GetCopyOfDragFactory: Opt<ScriptField>; - public static LinksSelf: Opt<ScriptField>; - public static OpenOnRight: Opt<ScriptField>; - public static DeiconifyView: Opt<ScriptField>; - public static ConvertToButtons: Opt<ScriptField>; - public static NoviceMode: Opt<ScriptField>; - public static SelectMenu: Opt<ScriptField>; + public static _scriptFieldCache: Map<string, Opt<CompiledScript>> = new Map(); + public static GetScriptFieldCache(field: string) { return this._scriptFieldCache.get(field); } + constructor(script: CompiledScript, setterscript?: CompiledScript) { super(); @@ -150,7 +128,13 @@ export class ScriptField extends ObjectField { } public static CompileScript(script: string, params: object = {}, addReturn = false, capturedVariables?: { [name: string]: Field }) { const compiled = CompileScript(script, { - params: { this: Doc?.name || "Doc", self: Doc?.name || "Doc", _last_: "any", ...params }, + params: { + this: Doc?.name || "Doc", // this is the doc that executes the script + self: Doc?.name || "Doc", // self is the root doc of the doc that executes the script + _last_: "any", // _last_ is the previous value of a computed field when it is being triggered to re-run. + _readOnly_: "boolean", // _readOnly_ is set when a computed field is executed to indicate that it should not have mobx side-effects. used for checking the value of a set function (see FontIconBox) + ...params + }, typecheck: false, editable: true, addReturn: addReturn, @@ -175,7 +159,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: Cast(doc.rootDocument, Doc, null) || doc, _last_: this._lastComputedResult }, console.log).result; + _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 { diff --git a/src/fields/Types.ts b/src/fields/Types.ts index 3d784448d..220a30fe4 100644 --- a/src/fields/Types.ts +++ b/src/fields/Types.ts @@ -3,6 +3,7 @@ import { List } from "./List"; import { RefField } from "./RefField"; import { DateField } from "./DateField"; import { ScriptField } from "./ScriptField"; +import { URLField, WebField, ImageField } from "./URLField"; export type ToType<T extends InterfaceValue> = T extends "string" ? string : @@ -91,6 +92,12 @@ export function DateCast(field: FieldResult) { export function ScriptCast(field: FieldResult, defaultVal: ScriptField | null = null) { return Cast(field, ScriptField, defaultVal); } +export function WebCast(field: FieldResult, defaultVal: WebField | null = null) { + return Cast(field, WebField, defaultVal); +} +export function ImageCast(field: FieldResult, defaultVal: ImageField | null = null) { + return Cast(field, ImageField, defaultVal); +} type WithoutList<T extends Field> = T extends List<infer R> ? (R extends RefField ? (R | Promise<R>)[] : R[]) : T; |