diff options
author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-06-01 11:38:34 +0530 |
---|---|---|
committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-06-01 11:38:34 +0530 |
commit | 371da92bbdb9ba3c117ec663aafd230cc0b323ba (patch) | |
tree | ddf388a46952cda7971b5109edcd5ca0a34179f5 /src/fields/ScriptField.ts | |
parent | 9f64b56310c0345e97014f418129c9883ab56e89 (diff) | |
parent | 9b0ba3940ec9b718cbffb945298095bd2ddcedb9 (diff) |
resolving conflicts
Diffstat (limited to 'src/fields/ScriptField.ts')
-rw-r--r-- | src/fields/ScriptField.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fields/ScriptField.ts b/src/fields/ScriptField.ts index 5192af407..fc7f9ca80 100644 --- a/src/fields/ScriptField.ts +++ b/src/fields/ScriptField.ts @@ -155,7 +155,7 @@ export class ComputedField extends ScriptField { public static MakeInterpolated(fieldKey: string, interpolatorKey: string) { const getField = ScriptField.CompileScript(`getIndexVal(self['${fieldKey}-indexed'], self.${interpolatorKey})`, {}, true, {}); const setField = ScriptField.CompileScript(`(self['${fieldKey}-indexed'])[self.${interpolatorKey}] = value`, { value: "any" }, true, {}); - return getField.compiled && setField.compiled ? new ComputedField(getField, setField) : undefined; + return getField.compiled ? new ComputedField(getField, setField?.compiled ? setField : undefined) : undefined; } } |