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

changes in access to startNote and currentNote

Browse Source
This commit is contained in:
azivner
2018-03-06 23:04:35 -05:00
parent 6d0218cb36
commit 766a567a32
8 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/services/script.js
View File

@@ -2,21 +2,28 @@ const sql = require('./sql');
const ScriptContext = require('./script_context');
const Repository = require('./repository');
async function executeNote(note) {
if (note.isProtected || !note.isJavaScript()) {
async function executeNote(dataKey, note) {
if (!note.isJavaScript()) {
return;
}
const manualTransactionHandling = (await note.getAttributeMap()).manual_transaction_handling !== undefined;
const bundle = await getScriptBundle(note);
await executeBundle(dataKey, bundle);
}
async function executeBundle(dataKey, bundle, startNote) {
if (!startNote) {
// this is the default case, the only exception is when we want to preserve frontend startNote
startNote = bundle.note;
}
// 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(null, note, bundle.allNotes);
const ctx = new ScriptContext(dataKey, startNote, bundle.allNotes);
if (manualTransactionHandling) {
if (await bundle.note.hasAttribute('manual_transaction_handling')) {
return await execute(ctx, script, '');
}
else {
@@ -24,18 +31,25 @@ async function executeNote(note) {
}
}
async function executeScript(dataKey, script, params, startNoteId) {
/**
* This method preserves frontend startNode - that's why we start execution from currentNote and override
* bundle's startNote.
*/
async function executeScript(dataKey, script, params, startNoteId, currentNoteId) {
const repository = new Repository(dataKey);
const startNote = await repository.getNote(startNoteId);
const currentNote = await repository.getNote(currentNoteId);
const ctx = new ScriptContext(dataKey, startNote, []);
const paramsStr = getParams(params);
currentNote.content = `(${script}\r\n)(${getParams(params)})`;
currentNote.mime = 'application/javascript;env=backend';
return await sql.doInTransaction(async () => execute(ctx, script, paramsStr));
const bundle = await getScriptBundle(currentNote);
return await executeBundle(dataKey, bundle, startNote);
}
async function execute(ctx, script, paramsStr) {
return await (function() { return eval(`const api = this;const startNote = api.__startNote;\r\n(${script}\r\n)(${paramsStr})`); }.call(ctx));
return await (function() { return eval(`const apiContext = this;\r\n(${script}\r\n)(${paramsStr})`); }.call(ctx));
}
function getParams(params) {
@@ -73,6 +87,10 @@ async function getScriptBundle(note, scriptEnv, includedNoteIds = []) {
scriptEnv = note.getScriptEnv();
}
if (note.type !== 'file' && scriptEnv !== note.getScriptEnv()) {
return;
}
const bundle = {
note: note,
script: '',
@@ -86,12 +104,6 @@ async function getScriptBundle(note, scriptEnv, includedNoteIds = []) {
includedNoteIds.push(note.noteId);
bundle.script = `api.__modules['${note.noteId}'] = { __noteId: '${note.noteId}', __env: '${note.getScriptEnv()}'};`;
if (note.type !== 'file' && scriptEnv !== note.getScriptEnv()) {
return bundle;
}
const modules = [];
for (const child of await note.getChildren()) {
@@ -107,11 +119,12 @@ async function getScriptBundle(note, scriptEnv, includedNoteIds = []) {
if (note.isJavaScript()) {
bundle.script += `
await (async function(exports, module, api, startNote, currentNote` + (modules.length > 0 ? ', ' : '') +
modules.map(child => child.title).join(', ') + `) {
apiContext.modules['${note.noteId}'] = {};
await (async function(exports, module, api` + (modules.length > 0 ? ', ' : '') +
modules.map(child => sanitizeVariableName(child.title)).join(', ') + `) {
${note.content}
})({}, api.__modules['${note.noteId}'], api, api.__startNote, api.__notes['${note.noteId}']` + (modules.length > 0 ? ', ' : '') +
modules.map(mod => `api.__modules['${mod.noteId}'].exports`).join(', ') + `);
})({}, apiContext.modules['${note.noteId}'], apiContext.apis['${note.noteId}']` + (modules.length > 0 ? ', ' : '') +
modules.map(mod => `apiContext.modules['${mod.noteId}'].exports`).join(', ') + `);
`;
}
else if (note.isHtml()) {
@@ -121,6 +134,10 @@ ${note.content}
return bundle;
}
function sanitizeVariableName(str) {
return str.replace(/[^a-z0-9_]/gim, "");
}
module.exports = {
executeNote,
executeScript,