Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

#125, basic infrastructure for scripts attached to notes via relations

Browse Source
This commit is contained in:
azivner
2018-07-29 16:06:13 +02:00
parent ededc063df
commit 170d317589
8 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/script.js
View File

@@ -14,7 +14,7 @@ async function executeNote(note) {
await executeBundle(bundle);
}
async function executeBundle(bundle, startNote) {
async function executeBundle(bundle, startNote, targetNote = null) {
if (!startNote) {
// this is the default case, the only exception is when we want to preserve frontend startNote
startNote = bundle.note;
@@ -23,7 +23,7 @@ async function executeBundle(bundle, startNote) {
// last \r\n is necessary if script contains line comment on its last line
const script = "async function() {\r\n" + bundle.script + "\r\n}";
const ctx = new ScriptContext(startNote, bundle.allNotes);
const ctx = new ScriptContext(startNote, bundle.allNotes, targetNote);
if (await bundle.note.hasLabel('manualTransactionHandling')) {
return await execute(ctx, script, '');
@@ -37,9 +37,10 @@ async function executeBundle(bundle, startNote) {
* This method preserves frontend startNode - that's why we start execution from currentNote and override
* bundle's startNote.
*/
async function executeScript(script, params, startNoteId, currentNoteId) {
async function executeScript(script, params, startNoteId, currentNoteId, targetNoteId) {
const startNote = await repository.getNote(startNoteId);
const currentNote = await repository.getNote(currentNoteId);
const targetNote = await repository.getNote(targetNoteId);
currentNote.content = `return await (${script}\r\n)(${getParams(params)})`;
currentNote.type = 'code';
@@ -47,7 +48,7 @@ async function executeScript(script, params, startNoteId, currentNoteId) {
const bundle = await getScriptBundle(currentNote);
return await executeBundle(bundle, startNote);
return await executeBundle(bundle, startNote, targetNote);
}
async function execute(ctx, script, paramsStr) {