parse incomplete attrs

spec-es6/attribute_parser.spec.js

@@ -12,6 +12,12 @@ describe("Lexer", () => {
             .toEqual(["#label", "=", "Hallo"]);
     });
 
+    it("label with value", () => {
+        const tokens = attributeParser.lexer("#label=Hallo");
+        expect(tokens[0].startIndex).toEqual(0);
+        expect(tokens[0].endIndex).toEqual(5);
+    });
+
     it("relation with value", () => {
         expect(attributeParser.lexer('~relation=<a class="reference-link" href="#root/RclIpMauTOKS/NFi2gL4xtPxM" data-note-path="root/RclIpMauTOKS/NFi2gL4xtPxM">note</a>').map(t => t.text))
             .toEqual(["~relation", "=", "#root/RclIpMauTOKS/NFi2gL4xtPxM"]);

src/public/app/services/attribute_parser.js

@@ -43,7 +43,7 @@ function lexer(str) {
 
         tokens.push({
             text: currentWord,
-            startIndex: endIndex - currentWord.length,
+            startIndex: endIndex - currentWord.length + 1,
             endIndex: endIndex
         });
 
@@ -110,7 +110,7 @@ function lexer(str) {
     return tokens;
 }
 
-function parser(tokens) {
+function parser(tokens, allowEmptyRelations = false) {
     const attrs = [];
 
     for (let i = 0; i < tokens.length; i++) {
@@ -121,8 +121,8 @@ function parser(tokens) {
                 type: 'label',
                 name: text.substr(1),
                 isInheritable: false, // FIXME
-                startIndex,
+                nameStartIndex: startIndex,
-                endIndex
+                nameEndIndex: endIndex
             };
 
             if (i + 1 < tokens.length && tokens[i + 1].text === "=") {
@@ -133,13 +133,30 @@ function parser(tokens) {
                 i += 2;
 
                 attr.value = tokens[i].text;
+                attr.valueStartIndex = tokens[i].startIndex;
+                attr.valueEndIndex = tokens[i].endIndex;
             }
 
             attrs.push(attr);
         }
         else if (text.startsWith('~')) {
+            const attr = {
+                type: 'relation',
+                name: text.substr(1),
+                isInheritable: false, // FIXME
+                nameStartIndex: startIndex,
+                nameEndIndex: endIndex
+            };
+
+            attrs.push(attr);
+
             if (i + 2 >= tokens.length || tokens[i + 1].text !== '=') {
-                throw new Error(`Relation "${text}" should point to a note.`);
+                if (allowEmptyRelations) {
+                    break;
+                }
+                else {
+                    throw new Error(`Relation "${text}" should point to a note.`);
+                }
             }
 
             i += 2;
@@ -151,16 +168,9 @@ function parser(tokens) {
 
             const noteId = notePath.split('/').pop();
 
-            const attr = {
+            attr.value = noteId;
-                type: 'relation',
+            attr.valueStartIndex = tokens[i].startIndex;
-                name: text.substr(1),
+            attr.valueEndIndex = tokens[i].endIndex;
-                isInheritable: false, // FIXME
-                value: noteId,
-                startIndex,
-                endIndex
-            };
-
-            attrs.push(attr);
         }
         else {
             throw new Error(`Unrecognized attribute "${text}"`);
@@ -170,10 +180,10 @@ function parser(tokens) {
     return attrs;
 }
 
-function lexAndParse(str) {
+function lexAndParse(str, allowEmptyRelations = false) {
     const tokens = lexer(str);
 
-    return parser(tokens);
+    return parser(tokens, allowEmptyRelations);
 }
 
 export default {

src/public/app/widgets/note_attributes.js

@@ -116,7 +116,17 @@ export default class NoteAttributesWidget extends TabAwareWidget {
 
         this.$editor.on("click", () => {
             const pos = this.textEditor.model.document.selection.getFirstPosition();
-            console.log(pos.textNode && pos.textNode.data, pos.parent.textNode && pos.parent.textNode.data, pos.offset);
+
+            if (pos && pos.textNode && pos.textNode.data) {
+                const attr = pos.textNode.data;
+                const index = pos.offset - pos.textNode.startOffset;
+
+                const attrs = attributesParser.lexAndParse(attr, true);
+
+                console.log(attrs);
+
+                console.log(attr.substr(0, index) + '|' + attr.substr(index));
+            }
         });
 
         this.textEditor = await BalloonEditor.create(this.$editor[0], {