Merge pull request #2504 from alexandrustefan/develop

New Search Engine implementation + minor fix on DocumentPage.js

Desktop/UI/Globals.js

@@ -1,4 +1,4 @@
-
+/* Root object*/
 /* Root objects*/
 let UI = {
     projects: {},
@@ -13,3 +13,4 @@ We will use this to load functions originally intended for Nodejs
 */
 let exports = {}
 
+

Platform/WebServer/externalScripts/flexsearch.bundle.js

@@ -0,0 +1,33 @@
+/**!
+ * FlexSearch.js v0.7.2 (Bundle)
+ * Copyright 2018-2021 Nextapps GmbH
+ * Author: Thomas Wilkerling
+ * Licence: Apache-2.0
+ * https://github.com/nextapps-de/flexsearch
+ */
+(function _f(self){'use strict';try{if(module)self=module}catch(e){}self._factory=_f;var t;function u(a){return"undefined"!==typeof a?a:!0}function aa(a){const b=Array(a);for(let c=0;c<a;c++)b[c]=v();return b}function v(){return Object.create(null)}function ba(a,b){return b.length-a.length}function x(a){return"string"===typeof a}function C(a){return"object"===typeof a}function D(a){return"function"===typeof a};function ca(a,b){var c=da;if(a&&(b&&(a=E(a,b)),this.H&&(a=E(a,this.H)),this.J&&1<a.length&&(a=E(a,this.J)),c||""===c)){a=a.split(c);if(this.filter){b=this.filter;c=a.length;const d=[];for(let e=0,f=0;e<c;e++){const g=a[e];g&&!b[g]&&(d[f++]=g)}a=d}return a}return a}const da=/[\p{Z}\p{S}\p{P}\p{C}]+/u,ea=/[\u0300-\u036f]/g;
+function fa(a,b){const c=Object.keys(a),d=c.length,e=[];let f="",g=0;for(let h=0,k,m;h<d;h++)k=c[h],(m=a[k])?(e[g++]=F(b?"(?!\\b)"+k+"(\\b|_)":k),e[g++]=m):f+=(f?"|":"")+k;f&&(e[g++]=F(b?"(?!\\b)("+f+")(\\b|_)":"("+f+")"),e[g]="");return e}function E(a,b){for(let c=0,d=b.length;c<d&&(a=a.replace(b[c],b[c+1]),a);c+=2);return a}function F(a){return new RegExp(a,"g")}function ha(a){let b="",c="";for(let d=0,e=a.length,f;d<e;d++)(f=a[d])!==c&&(b+=c=f);return b};var ja={encode:ia,F:!1,G:""};function ia(a){return ca.call(this,a.toLowerCase(),!1)};const ka={},G={};function la(a){I(a,"add");I(a,"append");I(a,"search");I(a,"update");I(a,"remove")}function I(a,b){a[b+"Async"]=function(){const c=this,d=arguments;var e=d[d.length-1];let f;D(e)&&(f=e,delete d[d.length-1]);e=new Promise(function(g){setTimeout(function(){c.async=!0;const h=c[b].apply(c,d);c.async=!1;g(h)})});return f?(e.then(f),this):e}};function ma(a,b,c,d){const e=a.length;let f=[],g,h,k=0;d&&(d=[]);for(let m=e-1;0<=m;m--){const n=a[m],w=n.length,q=v();let r=!g;for(let l=0;l<w;l++){const p=n[l],z=p.length;if(z)for(let B=0,A,y;B<z;B++)if(y=p[B],g){if(g[y]){if(!m)if(c)c--;else if(f[k++]=y,k===b)return f;if(m||d)q[y]=1;r=!0}if(d&&(h[y]=(A=h[y])?++A:A=1,A<e)){const H=d[A-2]||(d[A-2]=[]);H[H.length]=y}}else q[y]=1}if(d)g||(h=q);else if(!r)return[];g=q}if(d)for(let m=d.length-1,n,w;0<=m;m--){n=d[m];w=n.length;for(let q=0,r;q<w;q++)if(r=
+n[q],!g[r]){if(c)c--;else if(f[k++]=r,k===b)return f;g[r]=1}}return f}function na(a,b){const c=v(),d=v(),e=[];for(let f=0;f<a.length;f++)c[a[f]]=1;for(let f=0,g;f<b.length;f++){g=b[f];for(let h=0,k;h<g.length;h++)k=g[h],c[k]&&!d[k]&&(d[k]=1,e[e.length]=k)}return e};function J(a){this.l=!0!==a&&a;this.cache=v();this.h=[]}function oa(a,b,c){C(a)&&(a=a.query);let d=this.cache.get(a);d||(d=this.search(a,b,c),this.cache.set(a,d));return d}J.prototype.set=function(a,b){if(!this.cache[a]){var c=this.h.length;c===this.l?delete this.cache[this.h[c-1]]:c++;for(--c;0<c;c--)this.h[c]=this.h[c-1];this.h[0]=a}this.cache[a]=b};J.prototype.get=function(a){const b=this.cache[a];if(this.l&&b&&(a=this.h.indexOf(a))){const c=this.h[a-1];this.h[a-1]=this.h[a];this.h[a]=c}return b};const qa={memory:{charset:"latin:extra",D:3,B:4,m:!1},performance:{D:3,B:3,s:!1,context:{depth:2,D:1}},match:{charset:"latin:extra",G:"reverse"},score:{charset:"latin:advanced",D:20,B:3,context:{depth:3,D:9}},"default":{}};function ra(a,b,c,d,e,f){setTimeout(function(){const g=a(c,JSON.stringify(f));g&&g.then?g.then(function(){b.export(a,b,c,d,e+1)}):b.export(a,b,c,d,e+1)})};function K(a,b){if(!(this instanceof K))return new K(a);var c;if(a){x(a)?a=qa[a]:(c=a.preset)&&(a=Object.assign({},c[c],a));c=a.charset;var d=a.lang;x(c)&&(-1===c.indexOf(":")&&(c+=":default"),c=G[c]);x(d)&&(d=ka[d])}else a={};let e,f,g=a.context||{};this.encode=a.encode||c&&c.encode||ia;this.register=b||v();this.D=e=a.resolution||9;this.G=b=c&&c.G||a.tokenize||"strict";this.depth="strict"===b&&g.depth;this.l=u(g.bidirectional);this.s=f=u(a.optimize);this.m=u(a.fastupdate);this.B=a.minlength||1;this.C=
+a.boost;this.map=f?aa(e):v();this.A=e=g.resolution||1;this.h=f?aa(e):v();this.F=c&&c.F||a.rtl;this.H=(b=a.matcher||d&&d.H)&&fa(b,!1);this.J=(b=a.stemmer||d&&d.J)&&fa(b,!0);if(c=b=a.filter||d&&d.filter){c=b;d=v();for(let h=0,k=c.length;h<k;h++)d[c[h]]=1;c=d}this.filter=c;this.cache=(b=a.cache)&&new J(b)}t=K.prototype;t.append=function(a,b){return this.add(a,b,!0)};
+t.add=function(a,b,c,d){if(b&&(a||0===a)){if(!d&&!c&&this.register[a])return this.update(a,b);b=this.encode(b);if(d=b.length){const m=v(),n=v(),w=this.depth,q=this.D;for(let r=0;r<d;r++){let l=b[this.F?d-1-r:r];var e=l.length;if(l&&e>=this.B&&(w||!n[l])){var f=L(q,d,r),g="";switch(this.G){case "full":if(3<e){for(f=0;f<e;f++)for(var h=e;h>f;h--)if(h-f>=this.B){var k=L(q,d,r,e,f);g=l.substring(f,h);M(this,n,g,k,a,c)}break}case "reverse":if(2<e){for(h=e-1;0<h;h--)g=l[h]+g,g.length>=this.B&&M(this,n,
+g,L(q,d,r,e,h),a,c);g=""}case "forward":if(1<e){for(h=0;h<e;h++)g+=l[h],g.length>=this.B&&M(this,n,g,f,a,c);break}default:if(this.C&&(f=Math.min(f/this.C(b,l,r)|0,q-1)),M(this,n,l,f,a,c),w&&1<d&&r<d-1)for(e=v(),g=this.A,f=l,h=Math.min(w+1,d-r),e[f]=1,k=1;k<h;k++)if((l=b[this.F?d-1-r-k:r+k])&&l.length>=this.B&&!e[l]){e[l]=1;const p=this.l&&l>f;M(this,m,p?f:l,L(g+(d/2>g?0:1),d,r,h-1,k-1),a,c,p?l:f)}}}}this.m||(this.register[a]=1)}}return this};
+function L(a,b,c,d,e){return c&&1<a?b+(d||0)<=a?c+(e||0):(a-1)/(b+(d||0))*(c+(e||0))+1|0:0}function M(a,b,c,d,e,f,g){let h=g?a.h:a.map;if(!b[c]||g&&!b[c][g])a.s&&(h=h[d]),g?(b=b[c]||(b[c]=v()),b[g]=1,h=h[g]||(h[g]=v())):b[c]=1,h=h[c]||(h[c]=[]),a.s||(h=h[d]||(h[d]=[])),f&&-1!==h.indexOf(e)||(h[h.length]=e,a.m&&(a=a.register[e]||(a.register[e]=[]),a[a.length]=h))}
+t.search=function(a,b,c){c||(!b&&C(a)?(c=a,a=c.query):C(b)&&(c=b));let d=[],e;let f,g=0;if(c){b=c.limit;g=c.offset||0;var h=c.context;f=c.suggest}if(a&&(a=this.encode(a),e=a.length,1<e)){c=v();var k=[];for(let n=0,w=0,q;n<e;n++)if((q=a[n])&&q.length>=this.B&&!c[q])if(this.s||f||this.map[q])k[w++]=q,c[q]=1;else return d;a=k;e=a.length}if(!e)return d;b||(b=100);h=this.depth&&1<e&&!1!==h;c=0;let m;h?(m=a[0],c=1):1<e&&a.sort(ba);for(let n,w;c<e;c++){w=a[c];h?(n=sa(this,d,f,b,g,2===e,w,m),f&&!1===n&&d.length||
+(m=w)):n=sa(this,d,f,b,g,1===e,w);if(n)return n;if(f&&c===e-1){k=d.length;if(!k){if(h){h=0;c=-1;continue}return d}if(1===k)return ta(d[0],b,g)}}return ma(d,b,g,f)};
+function sa(a,b,c,d,e,f,g,h){let k=[],m=h?a.h:a.map;a.s||(m=ua(m,g,h,a.l));if(m){let n=0;const w=Math.min(m.length,h?a.A:a.D);for(let q=0,r=0,l,p;q<w;q++)if(l=m[q])if(a.s&&(l=ua(l,g,h,a.l)),e&&l&&f&&(p=l.length,p<=e?(e-=p,l=null):(l=l.slice(e),e=0)),l&&(k[n++]=l,f&&(r+=l.length,r>=d)))break;if(n){if(f)return ta(k,d,0);b[b.length]=k;return}}return!c&&k}function ta(a,b,c){a=1===a.length?a[0]:[].concat.apply([],a);return c||a.length>b?a.slice(c,c+b):a}
+function ua(a,b,c,d){c?(d=d&&b>c,a=(a=a[d?b:c])&&a[d?c:b]):a=a[b];return a}t.contain=function(a){return!!this.register[a]};t.update=function(a,b){return this.remove(a).add(a,b)};
+t.remove=function(a,b){const c=this.register[a];if(c){if(this.m)for(let d=0,e;d<c.length;d++)e=c[d],e.splice(e.indexOf(a),1);else N(this.map,a,this.D,this.s),this.depth&&N(this.h,a,this.A,this.s);b||delete this.register[a];if(this.cache){b=this.cache;for(let d=0,e,f;d<b.h.length;d++)f=b.h[d],e=b.cache[f],-1!==e.indexOf(a)&&(b.h.splice(d--,1),delete b.cache[f])}}return this};
+function N(a,b,c,d,e){let f=0;if(a.constructor===Array)if(e)b=a.indexOf(b),-1!==b?1<a.length&&(a.splice(b,1),f++):f++;else{e=Math.min(a.length,c);for(let g=0,h;g<e;g++)if(h=a[g])f=N(h,b,c,d,e),d||f||delete a[g]}else for(let g in a)(f=N(a[g],b,c,d,e))||delete a[g];return f}t.searchCache=oa;
+t.export=function(a,b,c,d,e){let f,g;switch(e||(e=0)){case 0:f="reg";if(this.m){g=v();for(let h in this.register)g[h]=1}else g=this.register;break;case 1:f="cfg";g={doc:0,opt:this.s?1:0};break;case 2:f="map";g=this.map;break;case 3:f="ctx";g=this.h;break;default:return}ra(a,b||this,c?c+"."+f:f,d,e,g);return!0};t.import=function(a,b){if(b)switch(x(b)&&(b=JSON.parse(b)),a){case "cfg":this.s=!!b.opt;break;case "reg":this.m=!1;this.register=b;break;case "map":this.map=b;break;case "ctx":this.h=b}};la(K.prototype);function va(a){a=a.data;var b=self._index;const c=a.args;var d=a.task;switch(d){case "init":d=a.options||{};a=a.factory;b=d.encode;d.cache=!1;b&&0===b.indexOf("function")&&(d.encode=Function("return "+b)());a?(Function("return "+a)()(self),self._index=new self.FlexSearch.Index(d),delete self.FlexSearch):self._index=new K(d);break;default:a=a.id,b=b[d].apply(b,c),postMessage("search"===d?{id:a,msg:b}:{id:a})}};let wa=0;function O(a){if(!(this instanceof O))return new O(a);var b;a?D(b=a.encode)&&(a.encode=b.toString()):a={};(b=(self||window)._factory)&&(b=b.toString());const c=self.exports,d=this;this.o=xa(b,c,a.worker);this.h=v();if(this.o){if(c)this.o.on("message",function(e){d.h[e.id](e.msg);delete d.h[e.id]});else this.o.onmessage=function(e){e=e.data;d.h[e.id](e.msg);delete d.h[e.id]};this.o.postMessage({task:"init",factory:b,options:a})}}P("add");P("append");P("search");P("update");P("remove");
+function P(a){O.prototype[a]=O.prototype[a+"Async"]=function(){const b=this,c=[].slice.call(arguments);var d=c[c.length-1];let e;D(d)&&(e=d,c.splice(c.length-1,1));d=new Promise(function(f){setTimeout(function(){b.h[++wa]=f;b.o.postMessage({task:a,id:wa,args:c})})});return e?(d.then(e),this):d}}
+function xa(a,b,c){let d;try{d=b?eval('new (require("worker_threads")["Worker"])("../dist/node/node.js")'):a?new Worker(URL.createObjectURL(new Blob(["onmessage="+va.toString()],{type:"text/javascript"}))):new Worker(x(c)?c:"worker/worker.js",{type:"module"})}catch(e){}return d};function Q(a){if(!(this instanceof Q))return new Q(a);var b=a.document||a.doc||a,c;this.K=[];this.h=[];this.A=[];this.register=v();this.key=(c=b.key||b.id)&&S(c,this.A)||"id";this.m=u(a.fastupdate);this.C=(c=b.store)&&!0!==c&&[];this.store=c&&v();this.I=(c=b.tag)&&S(c,this.A);this.l=c&&v();this.cache=(c=a.cache)&&new J(c);a.cache=!1;this.o=a.worker;this.async=!1;c=v();let d=b.index||b.field||b;x(d)&&(d=[d]);for(let e=0,f,g;e<d.length;e++)f=d[e],x(f)||(g=f,f=f.field),g=C(g)?Object.assign({},a,g):a,
+this.o&&(c[f]=new O(g),c[f].o||(this.o=!1)),this.o||(c[f]=new K(g,this.register)),this.K[e]=S(f,this.A),this.h[e]=f;if(this.C)for(a=b.store,x(a)&&(a=[a]),b=0;b<a.length;b++)this.C[b]=S(a[b],this.A);this.index=c}function S(a,b){const c=a.split(":");let d=0;for(let e=0;e<c.length;e++)a=c[e],0<=a.indexOf("[]")&&(a=a.substring(0,a.length-2))&&(b[d]=!0),a&&(c[d++]=a);d<c.length&&(c.length=d);return 1<d?c:c[0]}function T(a,b){if(x(b))a=a[b];else for(let c=0;a&&c<b.length;c++)a=a[b[c]];return a}
+function U(a,b,c,d,e){a=a[e];if(d===c.length-1)b[e]=a;else if(a)if(a.constructor===Array)for(b=b[e]=Array(a.length),e=0;e<a.length;e++)U(a,b,c,d,e);else b=b[e]||(b[e]=v()),e=c[++d],U(a,b,c,d,e)}function V(a,b,c,d,e,f,g,h){if(a=a[g])if(d===b.length-1){if(a.constructor===Array){if(c[d]){for(b=0;b<a.length;b++)e.add(f,a[b],!0,!0);return}a=a.join(" ")}e.add(f,a,h,!0)}else if(a.constructor===Array)for(g=0;g<a.length;g++)V(a,b,c,d,e,f,g,h);else g=b[++d],V(a,b,c,d,e,f,g,h)}t=Q.prototype;
+t.add=function(a,b,c){C(a)&&(b=a,a=T(b,this.key));if(b&&(a||0===a)){if(!c&&this.register[a])return this.update(a,b);for(let d=0,e,f;d<this.h.length;d++)f=this.h[d],e=this.K[d],x(e)&&(e=[e]),V(b,e,this.A,0,this.index[f],a,e[0],c);if(this.I){let d=T(b,this.I),e=v();x(d)&&(d=[d]);for(let f=0,g,h;f<d.length;f++)if(g=d[f],!e[g]&&(e[g]=1,h=this.l[g]||(this.l[g]=[]),!c||-1===h.indexOf(a)))if(h[h.length]=a,this.m){const k=this.register[a]||(this.register[a]=[]);k[k.length]=h}}if(this.store&&(!c||!this.store[a])){let d;
+if(this.C){d=v();for(let e=0,f;e<this.C.length;e++)f=this.C[e],x(f)?d[f]=b[f]:U(b,d,f,0,f[0])}this.store[a]=d||b}}return this};t.append=function(a,b){return this.add(a,b,!0)};t.update=function(a,b){return this.remove(a).add(a,b)};
+t.remove=function(a){C(a)&&(a=T(a,this.key));if(this.register[a]){for(var b=0;b<this.h.length&&(this.index[this.h[b]].remove(a,!this.o),!this.m);b++);if(this.I&&!this.m)for(let c in this.l){b=this.l[c];const d=b.indexOf(a);-1!==d&&(1<b.length?b.splice(d,1):delete this.l[c])}this.store&&delete this.store[a];delete this.register[a]}return this};
+t.search=function(a,b,c,d){c||(!b&&C(a)?(c=a,a=c.query):C(b)&&(c=b,b=0));let e=[],f=[],g,h,k,m,n,w,q=0;if(c)if(c.constructor===Array)k=c,c=null;else{k=(g=c.pluck)||c.index||c.field;m=c.tag;h=this.store&&c.enrich;n="and"===c.bool;b=c.limit||100;w=c.offset||0;if(m&&(x(m)&&(m=[m]),!a)){for(let l=0,p;l<m.length;l++)if(p=ya.call(this,m[l],b,w,h))e[e.length]=p,q++;return q?e:[]}x(k)&&(k=[k])}k||(k=this.h);n=n&&(1<k.length||m&&1<m.length);const r=!d&&(this.o||this.async)&&[];for(let l=0,p,z,B;l<k.length;l++){let A;
+z=k[l];x(z)||(A=z,z=z.field);if(r)r[l]=this.index[z].searchAsync(a,b,A||c);else{d?p=d[l]:p=this.index[z].search(a,b,A||c);B=p&&p.length;if(m&&B){const y=[];let H=0;n&&(y[0]=[p]);for(let X=0,pa,R;X<m.length;X++)if(pa=m[X],B=(R=this.l[pa])&&R.length)H++,y[y.length]=n?[R]:R;H&&(p=n?ma(y,b||100,w||0):na(p,y),B=p.length)}if(B)f[q]=z,e[q++]=p;else if(n)return[]}}if(r){const l=this;return new Promise(function(p){Promise.all(r).then(function(z){p(l.search(a,b,c,z))})})}if(!q)return[];if(g&&(!h||!this.store))return e[0];
+for(let l=0,p;l<f.length;l++){p=e[l];p.length&&h&&(p=za.call(this,p));if(g)return p;e[l]={field:f[l],result:p}}return e};function ya(a,b,c,d){let e=this.l[a],f=e&&e.length-c;if(f&&0<f){if(f>b||c)e=e.slice(c,c+b);d&&(e=za.call(this,e));return{tag:a,result:e}}}function za(a){const b=Array(a.length);for(let c=0,d;c<a.length;c++)d=a[c],b[c]={id:d,doc:this.store[d]};return b}t.contain=function(a){return!!this.register[a]};t.get=function(a){return this.store[a]};t.set=function(a,b){this.store[a]=b;return this};
+t.searchCache=oa;t.export=function(a,b,c,d,e){e||(e=0);d||(d=0);if(d<this.h.length){const f=this.h[d],g=this.index[f];b=this;setTimeout(function(){g.export(a,b,e?f.replace(":","-"):"",d,e++)||(d++,e=1,b.export(a,b,f,d,e))})}else{let f;switch(e){case 1:c="tag";f=this.l;break;case 2:c="store";f=this.store;break;default:return}ra(a,this,c,d,e,f)}};
+t.import=function(a,b){if(b)switch(x(b)&&(b=JSON.parse(b)),a){case "tag":this.l=b;break;case "reg":this.m=!1;this.register=b;for(let d=0,e;d<this.h.length;d++)e=this.index[this.h[d]],e.register=b,e.m=!1;break;case "store":this.store=b;break;default:a=a.split(".");const c=a[0];a=a[1];c&&a&&this.index[c].import(a,b)}};la(Q.prototype);var Ba={encode:Aa,F:!1,G:""};const Ca=[F("[\u00e0\u00e1\u00e2\u00e3\u00e4\u00e5]"),"a",F("[\u00e8\u00e9\u00ea\u00eb]"),"e",F("[\u00ec\u00ed\u00ee\u00ef]"),"i",F("[\u00f2\u00f3\u00f4\u00f5\u00f6\u0151]"),"o",F("[\u00f9\u00fa\u00fb\u00fc\u0171]"),"u",F("[\u00fd\u0177\u00ff]"),"y",F("\u00f1"),"n",F("[\u00e7c]"),"k",F("\u00df"),"s",F(" & ")," and "];function Aa(a){var b=a;b.normalize&&(b=b.normalize("NFD").replace(ea,""));return ca.call(this,b.toLowerCase(),!a.normalize&&Ca)};var Ea={encode:Da,F:!1,G:"strict"};const Fa=/[^a-z0-9]+/,Ga={b:"p",v:"f",w:"f",z:"s",x:"s","\u00df":"s",d:"t",n:"m",c:"k",g:"k",j:"k",q:"k",i:"e",y:"e",u:"o"};function Da(a){a=Aa.call(this,a).join(" ");const b=[];if(a){const c=a.split(Fa),d=c.length;for(let e=0,f,g=0;e<d;e++)if((a=c[e])&&(!this.filter||!this.filter[a])){f=a[0];let h=Ga[f]||f,k=h;for(let m=1;m<a.length;m++){f=a[m];const n=Ga[f]||f;n&&n!==k&&(h+=n,k=n)}b[g++]=h}}return b};var Ia={encode:Ha,F:!1,G:""};const Ja=[F("ae"),"a",F("oe"),"o",F("sh"),"s",F("th"),"t",F("ph"),"f",F("pf"),"f",F("(?![aeo])h(?![aeo])"),"",F("(?!^[aeo])h(?!^[aeo])"),""];function Ha(a,b){a&&(a=Da.call(this,a).join(" "),2<a.length&&(a=E(a,Ja)),b||(1<a.length&&(a=ha(a)),a&&(a=a.split(" "))));return a};var La={encode:Ka,F:!1,G:""};const Ma=F("(?!\\b)[aeo]");function Ka(a){a&&(a=Ha.call(this,a,!0),1<a.length&&(a=a.replace(Ma,"")),1<a.length&&(a=ha(a)),a&&(a=a.split(" ")));return a};G["latin:default"]=ja;G["latin:simple"]=Ba;G["latin:balance"]=Ea;G["latin:advanced"]=Ia;G["latin:extra"]=La;const W=self;let Y;const Z={Index:K,Document:Q,Worker:O,registerCharset:function(a,b){G[a]=b},registerLanguage:function(a,b){ka[a]=b}};(Y=W.define)&&Y.amd?Y([],function(){return Z}):W.exports?W.exports=Z:W.FlexSearch=Z;}(this));

Platform/WebServer/index.html

@@ -17,6 +17,7 @@
     <script type="text/javascript" src="AppPreLoader.js"></script>
     <script src="externalScripts/CCapture.all.min.js"></script>
     <script src="externalScripts/prism.js"></script>
+    <script src="externalScripts/flexsearch.bundle.js"></script>
 
     <script type="text/javascript">
         function loadApp() {

PlatformRoot.js

@@ -53,6 +53,7 @@ SA.nodeModules = {
     lookpath: require('lookpath'),
     process: require('process'),
     childProcess: require('child_process')
+
 }
 /*
 Check if we are starting from a particular workspace.

Projects/Education/UI/Spaces/Docs-Space/DocumentPage.js

@@ -68,7 +68,7 @@ function newFoundationsDocsDocumentPage() {
                 let template = {
                     updated: true,
                     type: UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.type,
-                    definition: { text: "Write the definition for this " + UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.category + "." },
+                    definition: {text: "Write the definition for this " + UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.category + "."},
                     paragraphs: [
                         {
                             style: "Text",
@@ -119,7 +119,9 @@ function newFoundationsDocsDocumentPage() {
             if (UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.nodeId !== undefined) {
                 node = await UI.projects.foundations.spaces.designSpace.workspace.getNodeById(UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.nodeId)
             }
-            if (node === undefined) { return }
+            if (node === undefined) {
+                return
+            }
 
             node.payload.floatingObject.unCollapseParent()
             setTimeout(positionAtNode, 0000, node)
@@ -147,7 +149,7 @@ function newFoundationsDocsDocumentPage() {
 
             /* Title */
             let titleLabel = thisObject.docsSchemaDocument.type
-            HTML = HTML + '<div id="docs-main-title-div" class="docs-title-table"><div class="docs-table-cell"><h2 class="docs-h2" id="' + UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.type.toLowerCase().replace(' ', '-') + '" > '  + titleLabel + '</h2></div><div id="projectImageDiv" class="docs-image-container"/></div></div>'
+            HTML = HTML + '<div id="docs-main-title-div" class="docs-title-table"><div class="docs-table-cell"><h2 class="docs-h2" id="' + UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.type.toLowerCase().replace(' ', '-') + '" > ' + titleLabel + '</h2></div><div id="projectImageDiv" class="docs-image-container"/></div></div>'
 
             if (thisObject.docsSchemaDocument.deleted === true) {
                 let key = 'auto-generated-flag-paragraph'
@@ -563,7 +565,8 @@ function newFoundationsDocsDocumentPage() {
                             includedSchemaDocument = SCHEMAS_BY_PROJECT.get(project).map.docsBookSchema.get(type)
                             break
                         }
-                        default: return 'Category (' + category + ') is not valid. Use Node, Concept, Topic, Review or Book instead.'
+                        default:
+                            return 'Category (' + category + ') is not valid. Use Node, Concept, Topic, Review or Book instead.'
                     }
                     if (includedSchemaDocument === undefined) {
                         return category + ' document ' + type + ' not found at project ' + project
@@ -642,7 +645,6 @@ function newFoundationsDocsDocumentPage() {
                     let introText = splittedChapterText[4]
 
 
-
                     if (project === undefined || category === undefined || chapterNumber === undefined || chapterName === undefined) {
                         return 'Chapter paragraph style Syntax Error. Some of the required parameters are undefined. Check the Docs Chapter Style Syntax. This error message will disappear as soon as you fix the problem.'
                     }
@@ -843,15 +845,20 @@ function newFoundationsDocsDocumentPage() {
                 function addProjectImage() {
                     let imageName = UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.project.toLowerCase().replaceAll(' ', '-')
                     let imageElement = UI.projects.foundations.spaces.designSpace.getIconByProjectAndName(UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.project, imageName)
-                    imageElement.width = "50"
-                    imageElement.height = "50"
+                    if (imageElement !== undefined) {
+                        imageElement.width = "50"
+                        imageElement.height = "50"
 
-                    let projectImageDiv = document.getElementById('projectImageDiv')
-                    projectImageDiv.appendChild(imageElement)
+
+                        let projectImageDiv = document.getElementById('projectImageDiv')
+                        projectImageDiv.appendChild(imageElement)
+                    }
                 }
 
                 function addMenuItemsImages() {
-                    if (appSchemaDocument === undefined || appSchemaDocument.menuItems === undefined) { return }
+                    if (appSchemaDocument === undefined || appSchemaDocument.menuItems === undefined) {
+                        return
+                    }
                     for (let i = 0; i < appSchemaDocument.menuItems.length; i++) {
                         let menuItem = appSchemaDocument.menuItems[i]
                         let collectionImage = getIcon(appSchemaDocument.menuItems[i].relatedUiObjectProject, appSchemaDocument.menuItems[i].actionProject)
@@ -867,7 +874,7 @@ function newFoundationsDocsDocumentPage() {
                         parentElement.replaceChild(imageElement, dummyImage)
 
                         function getIcon(relatedUiObjectProject, actionProject) {
-                            let project 
+                            let project
                             if (menuItem.relatedUiObject !== undefined) {
                                 if (relatedUiObjectProject !== undefined) {
                                     project = relatedUiObjectProject
@@ -892,7 +899,9 @@ function newFoundationsDocsDocumentPage() {
                 }
 
                 function addChildrenNodesPropertiesImages() {
-                    if (appSchemaDocument === undefined || appSchemaDocument.childrenNodesProperties === undefined) { return }
+                    if (appSchemaDocument === undefined || appSchemaDocument.childrenNodesProperties === undefined) {
+                        return
+                    }
                     for (let i = 0; i < appSchemaDocument.childrenNodesProperties.length; i++) {
                         let childrenNodesProperty = appSchemaDocument.childrenNodesProperties[i]
                         let collectionImage = getIcon()
@@ -918,7 +927,9 @@ function newFoundationsDocsDocumentPage() {
                 }
 
                 function addAttachingAndReferencingRulesImages() {
-                    if (appSchemaDocument === undefined) { return }
+                    if (appSchemaDocument === undefined) {
+                        return
+                    }
 
                     if (appSchemaDocument.attachingRules !== undefined) {
                         if (appSchemaDocument.attachingRules.compatibleTypes !== undefined) {
@@ -944,10 +955,14 @@ function newFoundationsDocsDocumentPage() {
                     function imageForTheseNodes(nodeList, additionToKey) {
                         for (let i = 0; i < nodeList.length; i++) {
                             let listItem = nodeList[i]
-                            if (listItem === "") { continue }
+                            if (listItem === "") {
+                                continue
+                            }
 
                             let collectionImage = getIcon()
-                            if (collectionImage === undefined) { continue }
+                            if (collectionImage === undefined) {
+                                continue
+                            }
                             let imageElement = collectionImage.cloneNode()
 
                             imageElement.className = "docs-collapsible-image"
@@ -971,9 +986,13 @@ function newFoundationsDocsDocumentPage() {
                 }
 
                 function addConfigurationImages() {
-                    if (appSchemaDocument === undefined) { return }
+                    if (appSchemaDocument === undefined) {
+                        return
+                    }
                     let configImageElementArray = document.getElementsByClassName('docs-configuration-property-image')
-                    if (configImageElementArray === undefined) { return }
+                    if (configImageElementArray === undefined) {
+                        return
+                    }
 
                     /* 
                     We need to create our own array otherwise while replacing the childElement
@@ -1014,7 +1033,9 @@ function newFoundationsDocsDocumentPage() {
                     */
                     let paragraph
                     let key = 'auto-generated-paragraph-' + autoGeneratedParagraphIndex
-                    if (appSchemaDocument === undefined || appSchemaDocument.menuItems === undefined || appSchemaDocument.menuItems.length === 0) { return }
+                    if (appSchemaDocument === undefined || appSchemaDocument.menuItems === undefined || appSchemaDocument.menuItems.length === 0) {
+                        return
+                    }
 
                     paragraph = {
                         style: "Title",
@@ -1054,7 +1075,8 @@ function newFoundationsDocsDocumentPage() {
                     }
                     paragraph = {
                         style: "Success",
-                        text: "When a menu item is grayed out, it means that " + appSchemaDocument.type + " already has the required child type that the menu item may add, and only that child is allowed for that case. "                    }
+                        text: "When a menu item is grayed out, it means that " + appSchemaDocument.type + " already has the required child type that the menu item may add, and only that child is allowed for that case. "
+                    }
                     renderParagraph(paragraph, key)
                     autoGeneratedParagraphIndex++
                 }
@@ -1066,7 +1088,9 @@ function newFoundationsDocsDocumentPage() {
                     let paragraph
                     let key = 'auto-generated-paragraph-' + autoGeneratedParagraphIndex
 
-                    if (appSchemaDocument === undefined || appSchemaDocument.childrenNodesProperties === undefined || appSchemaDocument.childrenNodesProperties.length === 0) { return }
+                    if (appSchemaDocument === undefined || appSchemaDocument.childrenNodesProperties === undefined || appSchemaDocument.childrenNodesProperties.length === 0) {
+                        return
+                    }
 
                     paragraph = {
                         style: "Title",
@@ -1114,7 +1138,9 @@ function newFoundationsDocsDocumentPage() {
                     */
                     let paragraph
                     let key = 'auto-generated-paragraph-' + autoGeneratedParagraphIndex
-                    if (appSchemaDocument === undefined || (appSchemaDocument.attachingRules === undefined && appSchemaDocument.referencingRules === undefined)) { return }
+                    if (appSchemaDocument === undefined || (appSchemaDocument.attachingRules === undefined && appSchemaDocument.referencingRules === undefined)) {
+                        return
+                    }
 
                     paragraph = {
                         style: "Title",
@@ -1157,7 +1183,9 @@ function newFoundationsDocsDocumentPage() {
                     function listAllTheseNodes(nodeList, additionToKey) {
                         for (let i = 0; i < nodeList.length; i++) {
                             let listItem = nodeList[i]
-                            if (listItem === "") { continue }
+                            if (listItem === "") {
+                                continue
+                            }
                             HTML = HTML + '<button id="docs-' + additionToKey + '-' + i + '" type="button" class="docs-non-collapsible-element"><img>' + UI.projects.education.utilities.docs.addToolTips(listItem, UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.type) + '</button>'
                         }
                     }
@@ -1169,7 +1197,9 @@ function newFoundationsDocsDocumentPage() {
                     */
                     let paragraph
                     let key = 'auto-generated-paragraph-' + autoGeneratedParagraphIndex
-                    if (appSchemaDocument === undefined || (appSchemaDocument.referencingRules === undefined && appSchemaDocument.referencingRules === undefined)) { return }
+                    if (appSchemaDocument === undefined || (appSchemaDocument.referencingRules === undefined && appSchemaDocument.referencingRules === undefined)) {
+                        return
+                    }
 
                     paragraph = {
                         style: "Title",
@@ -1212,7 +1242,9 @@ function newFoundationsDocsDocumentPage() {
                     function listAllTheseNodes(nodeList, additionToKey) {
                         for (let i = 0; i < nodeList.length; i++) {
                             let listItem = nodeList[i]
-                            if (listItem === "") { continue }
+                            if (listItem === "") {
+                                continue
+                            }
                             HTML = HTML + '<button id="docs-' + additionToKey + '-' + i + '" type="button" class="docs-non-collapsible-element"><img>' + UI.projects.education.utilities.docs.addToolTips(listItem, UI.projects.education.spaces.docsSpace.currentDocumentBeingRendered.type) + '</button>'
                         }
                     }
@@ -1224,7 +1256,9 @@ function newFoundationsDocsDocumentPage() {
                     */
                     let paragraph
                     let key = 'auto-generated-paragraph-' + autoGeneratedParagraphIndex
-                    if (appSchemaDocument === undefined || appSchemaDocument.editors === undefined || appSchemaDocument.editors.config !== true) { return }
+                    if (appSchemaDocument === undefined || appSchemaDocument.editors === undefined || appSchemaDocument.editors.config !== true) {
+                        return
+                    }
                     paragraph = {
                         style: "Subtitle",
                         text: "Initial Values"
@@ -1232,7 +1266,9 @@ function newFoundationsDocsDocumentPage() {
                     renderParagraph(paragraph, key)
                     autoGeneratedParagraphIndex++
 
-                    if (appSchemaDocument.initialValues === undefined || appSchemaDocument.initialValues.config === undefined) { return }
+                    if (appSchemaDocument.initialValues === undefined || appSchemaDocument.initialValues.config === undefined) {
+                        return
+                    }
 
                     paragraph = {
                         style: "Text",
@@ -1296,6 +1332,7 @@ function newFoundationsDocsDocumentPage() {
                     }
                     /* Third Step: we will display the list of properties and the sample values */
                     propertyMap.forEach(displayProperty)
+
                     function displayProperty(valueArray, mapKey, map) {
 
                         let name = UI.projects.foundations.utilities.strings.fromCamelCaseToUpperWithSpaces(mapKey)
@@ -1324,7 +1361,9 @@ function newFoundationsDocsDocumentPage() {
                     */
                     let paragraph
                     let key = 'auto-generated-paragraph-' + autoGeneratedParagraphIndex
-                    if (appSchemaDocument === undefined || appSchemaDocument.editors === undefined || appSchemaDocument.editors.code !== true) { return }
+                    if (appSchemaDocument === undefined || appSchemaDocument.editors === undefined || appSchemaDocument.editors.code !== true) {
+                        return
+                    }
                     paragraph = {
                         style: "Title",
                         text: "" + appSchemaDocument.type + " Code"
@@ -1338,7 +1377,9 @@ function newFoundationsDocsDocumentPage() {
                     renderParagraph(paragraph, key)
                     autoGeneratedParagraphIndex++
 
-                    if (appSchemaDocument.initialValues === undefined || appSchemaDocument.initialValues.code === undefined) { return }
+                    if (appSchemaDocument.initialValues === undefined || appSchemaDocument.initialValues.code === undefined) {
+                        return
+                    }
 
                     paragraph = {
                         style: "Subtitle",
@@ -1398,8 +1439,11 @@ function newFoundationsDocsDocumentPage() {
                     /* Third Step: we will display the list of properties and the sample values */
                     let exampleCounter = 1
                     codeMap.forEach(displayProperty)
+
                     function displayProperty(code, mapKey, map) {
-                        if (exampleCounter > 10) { return }
+                        if (exampleCounter > 10) {
+                            return
+                        }
                         HTML = HTML + '<button id="docs-code-example-' + exampleCounter + '" type="button" class="docs-collapsible-element">' + 'Example #' + exampleCounter + '</button>'
                         HTML = HTML + '<div class="docs-collapsible-code-content">'
                         exampleCounter++
@@ -1420,7 +1464,9 @@ function newFoundationsDocsDocumentPage() {
                     */
                     let paragraph
                     let key = 'auto-generated-paragraph-' + autoGeneratedParagraphIndex
-                    if (appSchemaDocument === undefined || appSchemaDocument.editors === undefined || appSchemaDocument.editors.formula !== true) { return }
+                    if (appSchemaDocument === undefined || appSchemaDocument.editors === undefined || appSchemaDocument.editors.formula !== true) {
+                        return
+                    }
                     paragraph = {
                         style: "Title",
                         text: "" + appSchemaDocument.type + " Formula"
@@ -1434,7 +1480,9 @@ function newFoundationsDocsDocumentPage() {
                     renderParagraph(paragraph, key)
                     autoGeneratedParagraphIndex++
 
-                    if (appSchemaDocument.initialValues === undefined || appSchemaDocument.initialValues.code === undefined) { return }
+                    if (appSchemaDocument.initialValues === undefined || appSchemaDocument.initialValues.code === undefined) {
+                        return
+                    }
 
                     paragraph = {
                         style: "Subtitle",
@@ -1494,8 +1542,11 @@ function newFoundationsDocsDocumentPage() {
                     /* Third Step: we will display the list of properties and the sample values */
                     let exampleCounter = 1
                     codeMap.forEach(displayProperty)
+
                     function displayProperty(code, mapKey, map) {
-                        if (exampleCounter > 10) { return }
+                        if (exampleCounter > 10) {
+                            return
+                        }
                         HTML = HTML + '<button id="docs-code-example-' + exampleCounter + '" type="button" class="docs-collapsible-element">' + 'Example #' + exampleCounter + '</button>'
                         HTML = HTML + '<div class="docs-collapsible-code-content">'
                         exampleCounter++
@@ -1800,9 +1851,15 @@ function newFoundationsDocsDocumentPage() {
                 let levels = splittedParams[2]
 
                 appSchemaDocument = SCHEMAS_BY_PROJECT.get(project).map.appSchema.get(type)
-                if (appSchemaDocument === undefined) { return }
-                if (isNaN(levels) === true) { return }
-                if (levels > MAX_COLUMNS) { return }
+                if (appSchemaDocument === undefined) {
+                    return
+                }
+                if (isNaN(levels) === true) {
+                    return
+                }
+                if (levels > MAX_COLUMNS) {
+                    return
+                }
 
                 let contentMatrix = []
 
@@ -1824,7 +1881,9 @@ function newFoundationsDocsDocumentPage() {
 
                 function scanHierarchy(schemaDocument, project, currentColumn, lastChild) {
 
-                    if (schemaDocument === undefined) { return }
+                    if (schemaDocument === undefined) {
+                        return
+                    }
 
                     currentRow++
 
@@ -1848,7 +1907,9 @@ function newFoundationsDocsDocumentPage() {
                         matrixRow[currentColumn - 1] = FORK
                     }
 
-                    if (schemaDocument.childrenNodesProperties === undefined) { return }
+                    if (schemaDocument.childrenNodesProperties === undefined) {
+                        return
+                    }
 
                     for (let i = 0; i < schemaDocument.childrenNodesProperties.length; i++) {
                         let property = schemaDocument.childrenNodesProperties[i]
@@ -2029,7 +2090,8 @@ function newFoundationsDocsDocumentPage() {
         let collapsibleElementsArray = document.getElementsByClassName("docs-collapsible-element")
 
         for (let i = 0; i < collapsibleElementsArray.length; i++) {
-            collapsibleElementsArray[i].removeEventListener("click", function () { })
+            collapsibleElementsArray[i].removeEventListener("click", function () {
+            })
         }
     }
 

Projects/Education/UI/Spaces/Docs-Space/SearchEngine.js

@@ -1,6 +1,7 @@
 function newFoundationsDocsSearchEngine() {
     let thisObject = {
         docsIndex: undefined,
+        documentIndex: undefined,
         setUpSearchEngine: setUpSearchEngine,
         initialize: initialize,
         finalize: finalize
@@ -10,15 +11,28 @@ function newFoundationsDocsSearchEngine() {
 
     function initialize() {
         thisObject.docsIndex = []
+        thisObject.documentIndex = new FlexSearch.Document({
+            preset: "performance",
+            worker: true,
+            encoder: "advanced",
+            tokenize: "forward",
+            document: {
+                index: [
+                    "docsSchemaDocument:type",
+                    "text",
+                ],
+                store: true
+            },
+        })
     }
 
+
     function finalize() {
         thisObject.docsIndex = undefined
     }
 
     function setUpSearchEngine(callbackFunction) {
-
-        /* 
+        /*
         This is a way to avoid indexing the docs, if the user does not want to.
         */
         let docsSpaceNode = UI.projects.foundations.spaces.designSpace.workspace.getHierarchyHeadByNodeType('Docs Space')
@@ -63,97 +77,115 @@ function newFoundationsDocsSearchEngine() {
                 /* Search in Nodes */
                 for (let i = 0; i < SCHEMAS_BY_PROJECT.get(project).array.docsNodeSchema.length; i++) {
                     documentIndex = {
-                        phraseCount: {},                // here we have an object with properties matching it paragraph style, and each property is a map of phrases and their total count.
+                        id: 'Node' + project + i,                     // since we don't have a real ID we concatenate some values to achieve an unique ID
                         docsSchemaDocument: SCHEMAS_BY_PROJECT.get(project).array.docsNodeSchema[i],
                         category: 'Node',
-                        project: project
+                        project: project,
+                        // We are creating a single field containing the definition and paragraphs concatenated, leveraging the search logic to the algorithm
+                        text: extractTextContentFromSchemaDocs(SCHEMAS_BY_PROJECT.get(project).array.docsNodeSchema[i]),
                     }
-                    indexDocument(documentIndex)
-                    thisObject.docsIndex.push(documentIndex)
+
+                    thisObject.documentIndex.add(documentIndex)
+
                 }
                 asyncCallFinished()
             }
+
             function searchInConcepts() {
-                /* Search in Concepts */
+                //!* Search in Concepts *!/
                 for (let i = 0; i < SCHEMAS_BY_PROJECT.get(project).array.docsConceptSchema.length; i++) {
                     documentIndex = {
-                        phraseCount: {},                // here we have an object with properties matching it paragraph style, and each property is a map of phrases and their total count.
+                        id: 'Concept' + project + i,
                         docsSchemaDocument: SCHEMAS_BY_PROJECT.get(project).array.docsConceptSchema[i],
                         category: 'Concept',
-                        project: project
+                        project: project,
+                        // We are creating a single field containing the definition and paragraphs concatenated, leveraging the search logic to the algorithm
+                        text: extractTextContentFromSchemaDocs(SCHEMAS_BY_PROJECT.get(project).array.docsConceptSchema[i])
                     }
-                    indexDocument(documentIndex)
-                    thisObject.docsIndex.push(documentIndex)
+
+                    thisObject.documentIndex.add(documentIndex)
                 }
                 asyncCallFinished()
             }
+
             function searchInNTopics() {
-                /* Search in Topics */
+                //!* Search in Topics *!/
                 for (let i = 0; i < SCHEMAS_BY_PROJECT.get(project).array.docsTopicSchema.length; i++) {
                     documentIndex = {
-                        phraseCount: {},                // here we have an object with properties matching it paragraph style, and each property is a map of phrases and their total count.
+                        id: 'Topic' + project + i,
                         docsSchemaDocument: SCHEMAS_BY_PROJECT.get(project).array.docsTopicSchema[i],
                         category: 'Topic',
-                        project: project
+                        project: project,
+                        // We are creating a single field containing the definition and paragraphs concatenated, leveraging the search logic to the algorithm
+                        text: extractTextContentFromSchemaDocs(SCHEMAS_BY_PROJECT.get(project).array.docsTopicSchema[i])
                     }
-                    indexDocument(documentIndex)
-                    thisObject.docsIndex.push(documentIndex)
+                    thisObject.documentIndex.add(documentIndex)
                 }
                 asyncCallFinished()
             }
+
             function searchInTutorials() {
-                /* Search in Tutorials */
+                //!* Search in Tutorials *!/
                 for (let i = 0; i < SCHEMAS_BY_PROJECT.get(project).array.docsTutorialSchema.length; i++) {
                     documentIndex = {
-                        phraseCount: {},                // here we have an object with properties matching it paragraph style, and each property is a map of phrases and their total count.
+                        id: 'Tutorial' + project + i,
                         docsSchemaDocument: SCHEMAS_BY_PROJECT.get(project).array.docsTutorialSchema[i],
                         category: 'Tutorial',
-                        project: project
+                        project: project,
+                        // We are creating a single field containing the definition and paragraphs concatenated, leveraging the search logic to the algorithm
+                        text: extractTextContentFromSchemaDocs(SCHEMAS_BY_PROJECT.get(project).array.docsTutorialSchema[i])
                     }
-                    indexDocument(documentIndex)
-                    thisObject.docsIndex.push(documentIndex)
+                    thisObject.documentIndex.add(documentIndex)
                 }
                 asyncCallFinished()
             }
+
             function searchInReviews() {
-                /* Search in Reviews */
+                //!* Search in Reviews *!/
                 for (let i = 0; i < SCHEMAS_BY_PROJECT.get(project).array.docsReviewSchema.length; i++) {
                     documentIndex = {
-                        phraseCount: {},                // here we have an object with properties matching it paragraph style, and each property is a map of phrases and their total count.
+                        id: 'Review' + project + i,
                         docsSchemaDocument: SCHEMAS_BY_PROJECT.get(project).array.docsReviewSchema[i],
                         category: 'Review',
-                        project: project
+                        project: project,
+                        // We are creating a single field containing the definition and paragraphs concatenated, leveraging the search logic to the algorithm
+                        text: extractTextContentFromSchemaDocs(SCHEMAS_BY_PROJECT.get(project).array.docsReviewSchema[i])
                     }
-                    indexDocument(documentIndex)
-                    thisObject.docsIndex.push(documentIndex)
+                    thisObject.documentIndex.add(documentIndex)
                 }
                 asyncCallFinished()
             }
+
             function searchInBooks() {
-                /* Search in Books */
+                //!* Search in Books *!/
                 for (let i = 0; i < SCHEMAS_BY_PROJECT.get(project).array.docsBookSchema.length; i++) {
                     documentIndex = {
-                        phraseCount: {},                // here we have an object with properties matching it paragraph style, and each property is a map of phrases and their total count.
+                        id: 'Book' + project + i,
                         docsSchemaDocument: SCHEMAS_BY_PROJECT.get(project).array.docsBookSchema[i],
                         category: 'Book',
-                        project: project
+                        project: project,
+                        // We are creating a single field containing the definition and paragraphs concatenated, leveraging the search logic to the algorithm
+                        text: extractTextContentFromSchemaDocs(SCHEMAS_BY_PROJECT.get(project).array.docsBookSchema[i])
                     }
-                    indexDocument(documentIndex)
-                    thisObject.docsIndex.push(documentIndex)
+                    thisObject.documentIndex.add(documentIndex)
+
                 }
                 asyncCallFinished()
             }
+
             function searchInWorkspaces() {
-                /* Search in Workspace */
+                //!* Search in Workspace *!/
                 for (let i = 0; i < SCHEMAS_BY_PROJECT.get(project).array.workspaceSchema.length; i++) {
                     documentIndex = {
-                        phraseCount: {},                // here we have an object with properties matching it paragraph style, and each property is a map of phrases and their total count.
+                        id: 'Workspace' + project + i,
                         docsSchemaDocument: SCHEMAS_BY_PROJECT.get(project).array.workspaceSchema[i],
                         category: 'Workspace',
-                        project: project
+                        project: project,
+                        // We are creating a single field containing the definition and paragraphs concatenated, leveraging the search logic to the algorithm
+                        text: extractTextContentFromSchemaDocs(SCHEMAS_BY_PROJECT.get(project).array.workspaceSchema[i])
                     }
-                    indexDocument(documentIndex)
-                    thisObject.docsIndex.push(documentIndex)
+                    thisObject.documentIndex.add(documentIndex)
+
                 }
                 asyncCallFinished()
             }
@@ -161,121 +193,84 @@ function newFoundationsDocsSearchEngine() {
             function asyncCallFinished() {
                 totalAsyncCallsFinished++
                 if (totalAsyncCallsMade === totalAsyncCallsFinished) {
+
                     callbackFunction()
                 }
             }
         }
 
-        function indexDocument(documentIndex) {
 
-            if (documentIndex.docsSchemaDocument === undefined) {
+        function extractTextContentFromSchemaDocs(docsSchemaDocument) {
+            if (docsSchemaDocument === undefined) {
                 return
             }
 
-            if (documentIndex.docsSchemaDocument.topic !== undefined) {
-                let paragraph = {
-                    style: 'Topic',
-                    text: documentIndex.docsSchemaDocument.topic
-                }
-                indexParagraph(paragraph)
+            let textField = ''
+
+            if (docsSchemaDocument.topic !== undefined) {
+                let paragraph = {text: docsSchemaDocument.topic}
+                appendToTextField(paragraph.text)
             }
-            if (documentIndex.docsSchemaDocument.tutorial !== undefined) {
-                let paragraph = {
-                    style: 'Tutorial',
-                    text: documentIndex.docsSchemaDocument.tutorial
-                }
-                indexParagraph(paragraph)
+            if (docsSchemaDocument.tutorial !== undefined) {
+                let paragraph = {text: docsSchemaDocument.tutorial}
+                appendToTextField(paragraph.text)
             }
-            if (documentIndex.docsSchemaDocument.review !== undefined) {
-                let paragraph = {
-                    style: 'Review',
-                    text: documentIndex.docsSchemaDocument.review
-                }
-                indexParagraph(paragraph)
+            if (docsSchemaDocument.review !== undefined) {
+                let paragraph = {text: docsSchemaDocument.review}
+                appendToTextField(paragraph.text)
             }
-            if (documentIndex.docsSchemaDocument.type !== undefined) {
-                let paragraph = {
-                    style: 'Type',
-                    text: documentIndex.docsSchemaDocument.type
-                }
-                indexParagraph(paragraph)
+            if (docsSchemaDocument.type !== undefined) {
+                let paragraph = {text: docsSchemaDocument.type}
+                appendToTextField(paragraph.text)
             }
-            if (documentIndex.docsSchemaDocument.definition !== undefined) {
+            if (docsSchemaDocument.definition !== undefined) {
                 let paragraph = {
-                    style: 'Definition',
-                    text: documentIndex.docsSchemaDocument.definition.text,
-                    translations: documentIndex.docsSchemaDocument.definition.translations
+                    text: docsSchemaDocument.definition.text,
+                    translations: docsSchemaDocument.definition.translations
                 }
-                indexParagraph(paragraph)
+                appendToTextField(' ')
+                appendToTextField(paragraph.text)
                 indexAllTranslations(paragraph)
             }
-            if (documentIndex.docsSchemaDocument.paragraphs !== undefined) {
-                for (let k = 0; k < documentIndex.docsSchemaDocument.paragraphs.length; k++) {
-                    let paragraph = documentIndex.docsSchemaDocument.paragraphs[k]
-                    indexParagraph(paragraph)
+
+            if (docsSchemaDocument.paragraphs !== undefined) {
+                for (let k = 0; k < docsSchemaDocument.paragraphs.length; k++) {
+                    let paragraph = docsSchemaDocument.paragraphs[k]
+
+                    appendToTextField(' ')
+                    appendToTextField(paragraph.text)
                     indexAllTranslations(paragraph)
                 }
             }
 
+
             function indexAllTranslations(paragraph) {
-                if (paragraph.translations === undefined) { return }
-                for (i = 0; i < paragraph.translations.length; i++) {
-                    let translation = paragraph.translations[i]
-                    translation.style = paragraph.style
-                    indexParagraph(translation)
+                if (paragraph.translations === undefined) {
+                    return
+                }
+                for (let j = 0; j < paragraph.translations.length; j++) {
+                    let translation = paragraph.translations[j]
+                    appendToTextField(' ')
+                    appendToTextField(translation.text)
                 }
             }
 
-            function indexParagraph(paragraph) {
-                if (paragraph.text === undefined) {
-                    return
-                }
-                if (paragraph.style === undefined) {
-                    return
-                }
-
-                let text = paragraph.text.toLowerCase()
-                let style = paragraph.style.toLowerCase()
-                let stylePhraseCount = documentIndex.phraseCount[style]
-
-                if (stylePhraseCount === undefined) {
-                    stylePhraseCount = new Map()
-                    documentIndex.phraseCount[style] = stylePhraseCount
-                }
-
-                text = UI.projects.foundations.utilities.strings.replaceSpecialCharactersForSpaces(text)
-
-                let splittedText = text.split(' ')
-
-                for (n = 0; n < splittedText.length; n++) {
-                    let phrase = ''
-                    for (let m = 0; m < 10; m++) {
-                        let word = splittedText[n + m]
-                        if (word !== undefined) {
-                            if (m === 0) {
-                                phrase = phrase + word
-                            } else {
-                                phrase = phrase + ' ' + word
-                            }
-                            let key = UI.projects.foundations.utilities.strings.cleanTextOfCommonWordEndings(phrase)
-
-                            let thisPhraseCount = stylePhraseCount.get(key)
-                            if (thisPhraseCount === undefined) { thisPhraseCount = 0 }
-                            thisPhraseCount++
-
-                            stylePhraseCount.set(key, thisPhraseCount)
-                        }
-                    }
-                }
+            function appendToTextField(textToAppend) {
+                textField += textToAppend
             }
+
+            return textField
         }
+
+
     }
 
     function setUpWorkspaceSchemas() {
         /*
         We will scan the whole workspace and create an array with all of its nodes.
         */
-        let rootNodes = UI.projects.foundations.spaces.designSpace.workspace.workspaceNode.rootNodes
+        let workspaceNode = UI.projects.foundations.spaces.designSpace.workspace.workspaceNode
+        let rootNodes = workspaceNode.rootNodes
         let allNodesFound = []
         for (let i = 0; i < rootNodes.length; i++) {
             let rootNode = rootNodes[i]
@@ -284,6 +279,7 @@ function newFoundationsDocsSearchEngine() {
                 allNodesFound = allNodesFound.concat(nodeArray)
             }
         }
+
         /*
         We will create a document for each node, so that can later be indexed into the search engine.
         */
@@ -296,45 +292,58 @@ function newFoundationsDocsSearchEngine() {
                 let node = allNodesFound[i]
 
                 if (node.project === project) {
-                    let nodeNameTypePath = UI.projects.visualScripting.utilities.hierarchy.getNodeNameTypePath(node)
-
-                    let docsSchemaDocument = {
-                        nodeId: node.id,
-                        nodeNameTypePath: nodeNameTypePath,
-                        type: node.type,
-                        definition: { text: node.name },
-                        paragraphs: []
-                    }
-                    if (node.config !== undefined) {
-                        let paragraph
-                        paragraph = {
-                            style: "Title",
-                            text: "Config"
-                        }
-                        docsSchemaDocument.paragraphs.push(paragraph)
-                        paragraph = {
-                            style: "Json",
-                            text: node.config
-                        }
-                        docsSchemaDocument.paragraphs.push(paragraph)
-                    }
-                    if (node.code !== undefined) {
-                        let paragraph
-                        paragraph = {
-                            style: "Title",
-                            text: "Code"
-                        }
-                        docsSchemaDocument.paragraphs.push(paragraph)
-                        paragraph = {
-                            style: "Javascript",
-                            text: node.code
-                        }
-                        docsSchemaDocument.paragraphs.push(paragraph)
-                    }
+                    let docsSchemaDocument = createDocsSchemaDocument(node)
                     SCHEMAS_BY_PROJECT.get(project).array.workspaceSchema.push(docsSchemaDocument)
                     SCHEMAS_BY_PROJECT.get(project).map.workspaceSchema.set(node.id, docsSchemaDocument)
                 }
+
             }
+            //Ugly hack to insert also the workspace node itself into the list to be indexed later on
+            if (project === 'Foundations') {
+                let docsSchemaDocument =  createDocsSchemaDocument(workspaceNode)
+                SCHEMAS_BY_PROJECT.get(project).array.workspaceSchema.push(docsSchemaDocument)
+                SCHEMAS_BY_PROJECT.get(project).map.workspaceSchema.set(workspaceNode.id, docsSchemaDocument)
+            }
+        }
+
+        function createDocsSchemaDocument(node) {
+            let nodeNameTypePath = UI.projects.visualScripting.utilities.hierarchy.getNodeNameTypePath(node)
+
+            let docsSchemaDocument = {
+                nodeId: node.id,
+                nodeNameTypePath: nodeNameTypePath,
+                type: node.type,
+                definition: {text: node.name},
+                paragraphs: []
+            }
+            if (node.config !== undefined) {
+                let paragraph
+                paragraph = {
+                    style: "Title",
+                    text: "Config"
+                }
+                docsSchemaDocument.paragraphs.push(paragraph)
+                paragraph = {
+                    style: "Json",
+                    text: node.config
+                }
+                docsSchemaDocument.paragraphs.push(paragraph)
+            }
+            if (node.code !== undefined) {
+                let paragraph
+                paragraph = {
+                    style: "Title",
+                    text: "Code"
+                }
+                docsSchemaDocument.paragraphs.push(paragraph)
+                paragraph = {
+                    style: "Javascript",
+                    text: node.code
+                }
+                docsSchemaDocument.paragraphs.push(paragraph)
+            }
+
+            return docsSchemaDocument
         }
     }
 }

Projects/Education/UI/Spaces/Docs-Space/SearchResultsPage.js

@@ -17,194 +17,37 @@ function newFoundationsDocsSearchResultsPage() {
 
     function render() {
 
-        let resultsArary = []
+        let docIndex = UI.projects.education.spaces.docsSpace.searchEngine.documentIndex
+        let resultsArray = []
         let initialTime = new Date()
-        buildResultsArray()
-        buildHTML()
 
-        function buildResultsArray() {
-            for (let i = 0; i < UI.projects.education.spaces.docsSpace.searchEngine.docsIndex.length; i++) {
-                let documentIndex = UI.projects.education.spaces.docsSpace.searchEngine.docsIndex[i]
-                let documentPoints = 0
 
-                for (const style in documentIndex.phraseCount) {
-                    let key = UI.projects.foundations.utilities.strings.cleanTextOfCommonWordEndings(UI.projects.education.spaces.docsSpace.commandInterface.command.toLowerCase())
-                    let thisPhraseCount = documentIndex.phraseCount[style].get(key)
-                    if (thisPhraseCount === undefined) {
-                        thisPhraseCount = 0
-                    }
+        let searchByType = docIndex.search(UI.projects.education.spaces.docsSpace.commandInterface.command.toLowerCase(), {
+            pluck: 'docsSchemaDocument:type',
+            enrich: true,
+            limit: 10000
+        })
+        let searchByText = docIndex.search(UI.projects.education.spaces.docsSpace.commandInterface.command.toLowerCase(), {
+            pluck: 'text',
+            enrich: true,
+            limit: 10000
+        })
 
-                    if (documentIndex.docsSchemaDocument.type !== undefined) {
-                        if (key === UI.projects.foundations.utilities.strings.cleanTextOfCommonWordEndings(documentIndex.docsSchemaDocument.type.toLowerCase())) {
-                            documentPoints = documentPoints + thisPhraseCount * 100
-                        }
-                    }
-                    if (documentIndex.docsSchemaDocument.topic !== undefined) {
-                        if (key === UI.projects.foundations.utilities.strings.cleanTextOfCommonWordEndings(documentIndex.docsSchemaDocument.topic.toLowerCase())) {
-                            documentPoints = documentPoints + thisPhraseCount * 200
-                        }
-                    }
-                    if (documentIndex.docsSchemaDocument.tutorial !== undefined) {
-                        if (key === UI.projects.foundations.utilities.strings.cleanTextOfCommonWordEndings(documentIndex.docsSchemaDocument.tutorial.toLowerCase())) {
-                            documentPoints = documentPoints + thisPhraseCount * 200
-                        }
-                    }
-                    if (documentIndex.docsSchemaDocument.review !== undefined) {
-                        if (key === UI.projects.foundations.utilities.strings.cleanTextOfCommonWordEndings(documentIndex.docsSchemaDocument.review.toLowerCase())) {
-                            documentPoints = documentPoints + thisPhraseCount * 200
-                        }
-                    }
-
-                    switch (style) {
-                        case 'topic': {
-                            documentPoints = documentPoints + thisPhraseCount * 100
-                            break
-                        }
-                        case 'tutorial': {
-                            documentPoints = documentPoints + thisPhraseCount * 100
-                            break
-                        }
-                        case 'review': {
-                            documentPoints = documentPoints + thisPhraseCount * 100
-                            break
-                        }
-                        case 'type': {
-                            documentPoints = documentPoints + thisPhraseCount * 50
-                            break
-                        }
-                        case 'definition': {
-                            documentPoints = documentPoints + thisPhraseCount * 9
-                            break
-                        }
-                        case 'title': {
-                            documentPoints = documentPoints + thisPhraseCount * 10
-                            break
-                        }
-                        case 'subtitle': {
-                            documentPoints = documentPoints + thisPhraseCount * 8
-                            break
-                        }
-                        case 'text': {
-                            documentPoints = documentPoints + thisPhraseCount * 2
-                            break
-                        }
-                        case 'list': {
-                            documentPoints = documentPoints + thisPhraseCount * 2
-                            break
-                        }
-                        case 'note': {
-                            documentPoints = documentPoints + thisPhraseCount * 4
-                            break
-                        }
-                        case 'warning': {
-                            documentPoints = documentPoints + thisPhraseCount * 6
-                            break
-                        }
-                        case 'error': {
-                            documentPoints = documentPoints + thisPhraseCount * 6
-                            break
-                        }
-                        case 'important': {
-                            documentPoints = documentPoints + thisPhraseCount * 7
-                            break
-                        }
-                        case 'success': {
-                            documentPoints = documentPoints + thisPhraseCount * 5
-                            break
-                        }
-                        case 'callout': {
-                            documentPoints = documentPoints + thisPhraseCount * 5
-                            break
-                        }
-                        case 'summary': {
-                            documentPoints = documentPoints + thisPhraseCount * 6
-                            break
-                        }
-                        case 'section': {
-                            documentPoints = documentPoints + thisPhraseCount * 8
-                            break
-                        }
-                        case 'table': {
-                            documentPoints = documentPoints + thisPhraseCount * 3
-                            break
-                        }
-                        case 'hierarchy': {
-                            documentPoints = documentPoints + thisPhraseCount * 3
-                            break
-                        }
-                        case 'json': {
-                            documentPoints = documentPoints + thisPhraseCount * 2
-                            break
-                        }
-                        case 'javascript': {
-                            documentPoints = documentPoints + thisPhraseCount * 2
-                            break
-                        }
-                        case 'gif': {
-                            documentPoints = documentPoints + thisPhraseCount * 1
-                            break
-                        }
-                        case 'png': {
-                            documentPoints = documentPoints + thisPhraseCount * 1
-                            break
-                        }
-                        case 'anchor': {
-                            documentPoints = documentPoints + thisPhraseCount * 0
-                            break
-                        }
-                        case 'block': {
-                            documentPoints = documentPoints + thisPhraseCount * 0
-                            break
-                        }
-                        case 'include': {
-                            documentPoints = documentPoints + thisPhraseCount * 0
-                            break
-                        }
-                        case 'placeholder': {
-                            documentPoints = documentPoints + thisPhraseCount * 0
-                            break
-                        }
-                        case 'link': {
-                            documentPoints = documentPoints + thisPhraseCount * 1
-                            break
-                        }
-                        case 'youtube': {
-                            documentPoints = documentPoints + thisPhraseCount * 1
-                            break
-                        }
-                        case 'chapter': {
-                            documentPoints = documentPoints + thisPhraseCount * 8
-                            break
-                        }
-                    }
-                }
-
-                if (documentPoints === 0) { continue } // No matches anywhere
-
-                let result = {
-                    documentIndex: documentIndex,
-                    documentPoints: documentPoints
-                }
-                let added = false
-
-                if (resultsArary.length === 0) {
-                    resultsArary.push(result)
-                    added = true
-                } else {
-                    for (let j = 0; j < resultsArary.length; j++) {
-                        let thisResult = resultsArary[j]
-                        if (result.documentPoints > thisResult.documentPoints) {
-                            resultsArary.splice(j, 0, result)
-                            added = true
-                            break
-                        }
-                    }
-                }
-                if (added === false) {
-                    resultsArary.push(result)
-                }
+        // Search in all fields and remove duplicates
+        Promise.all([searchByType, searchByText]).then(
+            function (values) {
+                let flags = {}
+                values.forEach(arrResult => {
+                   arrResult.forEach(result => {
+                       if (!flags[result.id]) {
+                           flags[result.id] = true;
+                           resultsArray.push({documentIndex: result.doc});
+                       }
+                   })
+                })
+                buildHTML()
             }
-        }
+        )
 
         function buildHTML() {
             const tabs = ['All', 'Nodes', 'Concepts', 'Topics', 'Tutorials', 'Reviews', 'Books', 'Workspace']
@@ -231,8 +74,8 @@ function newFoundationsDocsSearchResultsPage() {
                 HTML = HTML + '<p> ' + tab.toUpperCase() + '_TOTAL_RESULTS results (' + tab.toUpperCase() + '_TOTAL_SECONDS seconds)</p>'
 
                 let resultCounter = 0
-                for (let j = 0; j < resultsArary.length; j++) {
-                    let result = resultsArary[j]
+                for (let j = 0; j < resultsArray.length; j++) {
+                    let result = resultsArray[j]
 
                     if (tab !== 'All') {
                         if (tab.indexOf(result.documentIndex.category) < 0) {