vesta-web 1.2.1__py3-none-any.whl → 1.2.3__py3-none-any.whl

vesta/emptyProject/static/framework/utils.mjs

@@ -0,0 +1,9 @@
+export const fillTemplateLitteral = (template, vars = {}) => {
+    const handler = new Function('vars', [
+        'const tagged = ( ' + Object.keys(vars).join(', ') + ' ) =>',
+        '`' + template + '`',
+        'return tagged(...Object.values(vars))'
+    ].join('\n'));
+    const res = handler(vars)
+    return res;
+};

vesta/emptyProject/static/markdown/markdown.mjs

@@ -1,5 +1,7 @@
 // This in absolutely no spec, it comes exclusively from my deranged mind
 
+import {fillTemplateLitteral} from "../framework/utils.mjs";
+
 export class Markdown {
     constructor() {
     }
@@ -374,19 +376,18 @@ export class Markdown {
         return tokenList;
     }
 
-    render(tokens) {
+    render(tokens, renderingSet = this.HTML_equiv) {
         let result = ""
         for(let token_id = 0;  token_id < tokens.length; token_id+=1){
-            const render = this.renderToken(tokens[token_id], token_id, tokens)
+            const render = this.renderToken(tokens[token_id], token_id, tokens, renderingSet)
             token_id = render[1]
             result = result.concat(render[0])
         }
         return result;
     }
 
-    renderToken(token, token_id, tokens){
+    renderToken(token, token_id, tokens, renderingSet = this.HTML_equiv){
         // console.log("render token",token,token_id,tokens)
-        const old_id = token_id
         let content = ""
         switch(token.type) {
             case ">":
@@ -398,7 +399,7 @@ export class Markdown {
                     content = content.concat(render[0])
                 }
                 token.content = content
-                return [fillTemplate(this.HTML_equiv[token.type], token), token_id]
+                return [fillTemplateLitteral(renderingSet[token.type], token), token_id]
             case "-#":
                 let smallContent = token.content
                 while (token_id + 1 < tokens.length && tokens[token_id + 1].type !== "endline") {
@@ -408,7 +409,7 @@ export class Markdown {
                     smallContent = smallContent.concat(render[0])
                 }
                 token.content = smallContent
-                return [fillTemplate(this.HTML_equiv[token.type], token), token_id]
+                return [fillTemplateLitteral(renderingSet[token.type], token), token_id]
             case "*":
                 // this is suboptimal because we're looking for same size closing
                 // smth like *** a ** b * will not work as intended
@@ -418,34 +419,35 @@ export class Markdown {
                         token.content = content
                         if (token.props.level % 2) {
                             if (token.props.level === 3) {
-                                token.content = fillTemplate(this.HTML_equiv["**"], token)
+                                token.content = fillTemplateLitteral(renderingSet["**"], token)
                             }
-                            return [fillTemplate(this.HTML_equiv["*"], token), token_id]
+                            return [fillTemplateLitteral(renderingSet["*"], token), token_id]
                         } else {
-                            return [fillTemplate(this.HTML_equiv["**"], token), token_id]
+                            return [fillTemplateLitteral(renderingSet["**"], token), token_id]
                         }
                     }
                     const render = this.renderToken(tokens[token_id], token_id, tokens)
                     token_id = render[1]
                     content = content.concat(render[0])
                 }
-                token.content = "*".repeat(token.props.level)
-                // should be optimized, because we just drop a part of the render here
-                return [fillTemplate(this.HTML_equiv["text"], token), old_id]
+                // No closing * found, render as text and continue from current position
+                token.content = "*".repeat(token.props.level).concat(content)
+                return [fillTemplateLitteral(renderingSet["text"], token), token_id]
             case "~~":
             case "||":
                 while (token_id + 1 < tokens.length) {
                     token_id += 1
                     if(tokens[token_id].type === token.type){
                         token.content = content
-                        return [fillTemplate(this.HTML_equiv[token.type], token), token_id]
+                        return [fillTemplateLitteral(renderingSet[token.type], token), token_id]
                     }
                     const render = this.renderToken(tokens[token_id], token_id, tokens)
                     token_id = render[1]
                     content = content.concat(render[0])
                 }
-                token.content = token.type
-                return [fillTemplate(this.HTML_equiv["text"], token), old_id]
+                // No closing pair found, render as text and continue from current position
+                token.content = token.type.concat(content)
+                return [fillTemplateLitteral(renderingSet["text"], token), token_id]
             case "[":
                 while (token_id + 1 < tokens.length) {
                     token_id += 1
@@ -459,7 +461,7 @@ export class Markdown {
                            tokens[token_id+3].type === ")"){
                             token.content = content
                             token.props.link = tokens[token_id+2].content
-                            return [fillTemplate(this.HTML_equiv["link"], token), token_id+3]
+                            return [fillTemplateLitteral(renderingSet["link"], token), token_id+3]
                         }else{
                             break
                         }
@@ -468,14 +470,15 @@ export class Markdown {
                     token_id = render[1]
                     content = content.concat(render[0])
                 }
-                token.content = token.type
-                return [fillTemplate(this.HTML_equiv["text"], token), old_id]
+                // No closing ] or proper link syntax found, render as text and continue from current position
+                token.content = token.type.concat(content)
+                return [fillTemplateLitteral(renderingSet["text"], token), token_id]
             case "color":
                 while (token_id + 1 < tokens.length) {
                     token_id += 1
                     if(tokens[token_id].type === "/>"){
                         token.content = content
-                        return [fillTemplate(this.HTML_equiv[token.type], token), token_id]
+                        return [fillTemplateLitteral(renderingSet[token.type], token), token_id]
                     }
                     const render = this.renderToken(tokens[token_id], token_id, tokens)
                     token_id = render[1]
@@ -483,9 +486,9 @@ export class Markdown {
                 }
                 token.type="text"
                 token.content = "<$"+token.props?.color
-                return [fillTemplate(this.HTML_equiv[token.type], token), token_id]
+                return [fillTemplateLitteral(renderingSet[token.type], token), token_id]
             default:
-                return [fillTemplate(this.HTML_equiv[token.type], token), token_id]
+                return [fillTemplateLitteral(renderingSet[token.type], token), token_id]
         }
     }
 }
@@ -497,13 +500,3 @@ class Token{
         this.props={}
     }
 }
-
-const fillTemplate = (template, vars = {}) => {
-    const handler = new Function('vars', [
-        'const tagged = ( ' + Object.keys(vars).join(', ') + ' ) =>',
-        '`' + template + '`',
-        'return tagged(...Object.values(vars))'
-    ].join('\n'));
-    const res = handler(vars)
-    return res;
-};

{vesta_web-1.2.1.dist-info → vesta_web-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vesta-web
-Version: 1.2.1
+Version: 1.2.3
 Summary: An extensive web framework adding every feature needed for Carbonlab
 Project-URL: Homepage, https://gitlab.com/Louciole/vesta
 Project-URL: Issues, https://gitlab.com/Louciole/vesta/-/issues

{vesta_web-1.2.1.dist-info → vesta_web-1.2.3.dist-info}/RECORD

@@ -31,6 +31,7 @@ vesta/emptyProject/static/style.css,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 vesta/emptyProject/static/framework/global.mjs,sha256=Zr3F9E_DfyYzxqYfdeSBCTezf42VNUqkWR1zB3Py_Tw,124
 vesta/emptyProject/static/framework/navigation.mjs,sha256=EMI-bTJDp0XqTWxHQkZKyT-u5Q9cKA6QVkF4hJyKrRY,11119
 vesta/emptyProject/static/framework/templating.mjs,sha256=v0w-JtkOoSgHWAy7_A24jZzvBQ99f5FBii2RrykUAkU,3319
+vesta/emptyProject/static/framework/utils.mjs,sha256=S6Ed6BoFY-OyS4jumQ3BMbyTBRXlIcgEriwz0Pv3VoM,321
 vesta/emptyProject/static/framework/vesta.mjs,sha256=0YrLyt4US22TIknO3OFWeOQuWimIWLBwMFCoKzBEHX4,5459
 vesta/emptyProject/static/framework/websockets.mjs,sha256=Ck0bdEj0mVU3PHZ1MtPPz2He47OYl2WmRxqE3NSKh-c,1349
 vesta/emptyProject/static/home/auth.css,sha256=Vw-wFyQJm1ydDVBHPdKWp4dvzrfFRry4-kgScVFleOM,1924
@@ -38,7 +39,7 @@ vesta/emptyProject/static/home/auth.html,sha256=sz-CC-B4NUqth8aSQqwQCvq2V46AnhaI
 vesta/emptyProject/static/home/auth.js,sha256=txMlUqr4A-15Czf4MYwaED35XXcaHI_zrc4SpnjItJU,4622
 vesta/emptyProject/static/home/reset.html,sha256=EcXfX2Vil3NrYhDvEptrIhW9QV9X_kDy59-TK2S_P4w,2655
 vesta/emptyProject/static/home/verif.html,sha256=tUw96l0FZ5-AXuE8s-7v1nM632onErq5swgCU53zP-s,2906
-vesta/emptyProject/static/markdown/markdown.mjs,sha256=eqSV-uzI1PcZS6eev8pqXv2UocDv2NHyFG6v91b-KAo,24105
+vesta/emptyProject/static/markdown/markdown.mjs,sha256=s51IMYqoDznrcs23ByjL1PhtWlCMZj3kvxQAuhE30w8,24229
 vesta/emptyProject/static/markdown/utils.mjs,sha256=PGxhsJfub_lt-LEZVqYt8lKEp_RTRVGXuNhGmWxto-k,614
 vesta/emptyProject/static/translations/en.mjs,sha256=ouMluPVTgB4Q5vmb7zGE6YGTH4URruog5_a52sBDYNE,22
 vesta/emptyProject/static/translations/fr.mjs,sha256=ouMluPVTgB4Q5vmb7zGE6YGTH4URruog5_a52sBDYNE,22
@@ -55,8 +56,8 @@ vesta/scripts/initDB.py,sha256=4o_J3IK0vcil2oHvk_qmtqLSlWABcRPFBC3M61-oSF8,1842
 vesta/scripts/install.py,sha256=GvH_HHx5aU5_54RQ1_2vz4DaLCh42AHfUKy-m0q21vY,2125
 vesta/scripts/testsRun.py,sha256=bXJImdexKQUDW8CR8F9VIKTrgkd7QfnvHQPENEV4x38,2463
 vesta/scripts/utils.py,sha256=PR2XPonaoZEbegzV3QX1EHfyq67sU-cbDEUexCuJp9Q,6013
-vesta_web-1.2.1.dist-info/METADATA,sha256=wQBkA51DKVeEg3DQPWEqLFZ0D1JqXcvkC3mhekIbxlQ,1584
-vesta_web-1.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-vesta_web-1.2.1.dist-info/entry_points.txt,sha256=MHMrWJwtkb4FmNz0CTpxZzwQ3LTqndXBh8YBPDfXlW4,49
-vesta_web-1.2.1.dist-info/licenses/LICENSE.md,sha256=zoPFEFUUoSgosmDBK5fGTWGRHHBaSVuuJT2ZQIYXuIk,177
-vesta_web-1.2.1.dist-info/RECORD,,
+vesta_web-1.2.3.dist-info/METADATA,sha256=R_ENQZRuZmkJDpllpVoqnE3KC_ga3-Ol05LjktJxNio,1584
+vesta_web-1.2.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+vesta_web-1.2.3.dist-info/entry_points.txt,sha256=MHMrWJwtkb4FmNz0CTpxZzwQ3LTqndXBh8YBPDfXlW4,49
+vesta_web-1.2.3.dist-info/licenses/LICENSE.md,sha256=zoPFEFUUoSgosmDBK5fGTWGRHHBaSVuuJT2ZQIYXuIk,177
+vesta_web-1.2.3.dist-info/RECORD,,