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

refactoring of getModules function

Browse Source
This commit is contained in:
azivner
2018-03-04 12:06:35 -05:00
parent 7a865a9081
commit d239ef2956
3 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/services/script.js
View File

@@ -8,12 +8,12 @@ async function executeNote(note) {
const manualTransactionHandling = (await note.getAttributeMap()).manual_transaction_handling !== undefined;
const modules = await getModules([note], []);
const bundle = await getScriptBundle(note);
// last \r\n is necessary if script contains line comment on its last line
const script = "async function() {\r\n" + modules.script + "\r\n}";
const script = "async function() {\r\n" + bundle.script + "\r\n}";
const ctx = new ScriptContext(null, note, module.allModules);
const ctx = new ScriptContext(null, note, bundle.allNotes);
if (manualTransactionHandling) {
return await execute(ctx, script, '');
@@ -31,8 +31,6 @@ async function executeScript(dataKey, script, params) {
}
async function execute(ctx, script, paramsStr) {
console.log(`const api = this; (${script})(${paramsStr})`);
return await (function() { return eval(`const api = this;\r\n(${script})(${paramsStr})`); }.call(ctx));
}
@@ -107,47 +105,45 @@ async function getNoteScript(note) {
}
/**
* @param includedNoteIds - if multiple child note scripts reference same dependency (child note),
* it will be included just once
*/
async function getModules(children, includedNoteIds) {
const modules = [];
let allModules = [];
let script = '';
for (const child of children) {
if (!child.isJavaScript()) {
continue;
}
modules.push(child);
if (includedNoteIds.includes(child.noteId)) {
continue;
}
includedNoteIds.push(child.noteId);
const children = await getModules(await child.getChildren(), includedNoteIds);
allModules = allModules.concat(children.allModules);
script += children.script;
script += `
api.__modules['${child.noteId}'] = {};
await (async function(module, api, startNote, currentNote` + (children.modules.length > 0 ? ', ' : '') +
children.modules.map(child => child.title).join(', ') + `) {
${child.content}
})(api.__modules['${child.noteId}'], api, api.__startNote, api.__notes['${child.noteId}']` + (children.modules.length > 0 ? ', ' : '') +
children.modules.map(child => `api.__modules['${child.noteId}'].exports`).join(', ') + `);
`;
async function getScriptBundle(note, includedNoteIds = []) {
if (!note.isJavaScript()) {
return;
}
allModules = allModules.concat(modules);
const bundle = {
note: note,
script: '',
allNotes: [note]
};
return { script, modules, allModules };
if (includedNoteIds.includes(note.noteId)) {
return bundle;
}
includedNoteIds.push(note.noteId);
const modules = [];
for (const child of await note.getChildren()) {
const childBundle = await getScriptBundle(child, includedNoteIds);
if (childBundle) {
modules.push(childBundle.note);
bundle.script += childBundle.script;
bundle.allNotes = bundle.allNotes.concat(childBundle.allNotes);
}
}
bundle.script += `
api.__modules['${note.noteId}'] = {};
await (async function(module, api, startNote, currentNote` + (modules.length > 0 ? ', ' : '') +
modules.map(child => 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(', ') + `);
`;
return bundle;
}
module.exports = {