fixed #159

weso · Aug 4, 2020 · b2875d0 · b2875d0
1 parent 560b6a3
commit b2875d0
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 33 deletions.
diff --git a/dist/yashe.bundled.min.js b/dist/yashe.bundled.min.js
diff --git a/src/config/defaults.js b/src/config/defaults.js
@@ -12,12 +12,13 @@ YASHE.defaults = $.extend(true, {}, YASHE.defaults, {
   /**
 	 *  Default shape 
 	 */
-  value:  `PREFIX wd:    <http://www.wikidata.org/entity/>
-  <human>{ 
-    wd:a  [ wd:Q5 ]  
-  }
-  
-
+  value:  `PREFIX p:    <http://www.wikidata.org/entity/>
+  PREFIX ps:    <http://www.wikidata.org/entity/>
+  PREFIX xsd:    <http://www.wikidata.org/entity/>
+    <#sequence_assembly>  {
+      ( p:P2576 { ps:P2576  xsd:string } |
+        ps:P4333 {xsd:string    p:P4333 } )  
+    }
 `,
 
   highlightSelectionMatches: {

diff --git a/src/main.js b/src/main.js
@@ -216,9 +216,8 @@ const extendCmInstance = function(yashe) {
 
   yashe.prettify = function(){
     if(!yashe.hasErrors()){
-      console.log('e')
       prettyUtils.prettify(yashe);
-      if(yashe.hasErrors())yashe.undo(); //Just in case the prettify fail
+      //if(yashe.hasErrors())yashe.undo(); //Just in case the prettify fail
     }
   }
 
@@ -394,7 +393,7 @@ root.storeContent = function(yashe) {
 root.prettify = function(yashe){
   if(!yashe.hasErrors()){
     prettyUtils.prettify(yashe);
-   // if(yashe.hasErrors())yashe.undo(); //Just in case the prettify fail
+    //if(yashe.hasErrors())yashe.undo(); //Just in case the prettify fail
   }
 }
 

diff --git a/src/utils/formatUtils.js b/src/utils/formatUtils.js
@@ -164,7 +164,6 @@ var copyLineDown = function(yashe) {
     notifyUser(yashe);
     yashe.prettify();
     let history = disableEditor(yashe);
-    console.log('dale papi')
     for (var l = 0; l < yashe.lineCount(); ++l) {
       let lineTokens = getNonWsLineTokens(yashe.getLineTokens(l));
       let valueSetSize = getValueSetSizeIfClosed(lineTokens);
@@ -193,8 +192,9 @@ var copyLineDown = function(yashe) {
           if(valueSetSize<0){ 
             let endOfLine = lineTokens[lineTokens.length-1].end
             yashe.replaceRange(' # '+comments,{line:l,ch:endOfLine},{line:l,ch:endOfLine})
+            if(yashe.hasErrors(yashe))yashe.undo(); 
             //For some reason I'm not able to make codemirror scroll methods work, so I'm forcing the scroll with the cursor
-            yashe.setCursor({line:l+10,ch:token.start}); 
+            yashe.setCursor({line:l+10,ch:token.start});
             valueSetSize = 0;
             comments = '';
           }

diff --git a/src/utils/pretty/node.js b/src/utils/pretty/node.js
@@ -1,13 +1,14 @@
 class Node{
 
-    constructor(constraints,triples,comment='',emptyBrackets,afterTriples=[],finalParenthesis=''){
+    constructor(constraints,triples,comment='',emptyBrackets,afterTriples=[],finalParenthesis='',multiElementOneOf=false){
         this.constraints = constraints;
         this.triples = triples;
         this.comment = comment;                     //Comment at the end
         this.emptyBrackets = emptyBrackets;         //ej: schema:name    {};
         this.afterTriples= afterTriples;            // Whatever after {}
         this.finalParenthesis = finalParenthesis;  
         this.hasAleardyAComment = false;            //This is used in the methor getSemicolonIfNeeded due not to set the comment again if it has been already seted 
+        this.multiElementOneOf = multiElementOneOf;
     }
 
     toString(longest=0,isTriple,indent=1,isLastTriple=false){
@@ -136,7 +137,9 @@ class Node{
     getSemicolonIfNeeded(isTriple,isLastTriple,tripleComment){
         let str = EMPTY_STRING;
         if(isTriple){
-            if(!isLastTriple)str+=SEMICOLON;
+            if(!isLastTriple){
+                if(!this.multiElementOneOf)str+=SEMICOLON;
+            }
             if(!this.hasAleardyAComment)str+=tripleComment;
         }
         return str;

diff --git a/src/utils/pretty/prettyUtils.js b/src/utils/pretty/prettyUtils.js
@@ -12,6 +12,8 @@ function prettify(yashe){
     let initialDirectivesAndStarts = getInitialDirectivesAndStarts(tokens);
     let shapes = getShapes(tokens);
 
+    console.log(shapes)
+
     //  Strings
     let initialDirectivesAndStartsStr = getDirectivesAndStartsStr(initialDirectivesAndStarts);
     let shapesStr = getShapesStr(shapes);
@@ -102,8 +104,8 @@ function getTriples(tokens) {
 
             if(token.skip) return acc; //Is a comment that is part of the previous triple
             singleTriple.push(token);     
-
-            if(isFinishOfTriple(tokens,token,index,finish)){
+            let multiElementOneOf = isMultiElementOneOf(token);
+            if(isFinishOfTriple(tokens,token,index,finish) || multiElementOneOf){
                 if(singleTriple.length>1){
                         let before = getBeforeTriplesTokens(singleTriple);
                         let tripleTokens = getTripleTokens(singleTriple);
@@ -112,7 +114,7 @@ function getTriples(tokens) {
                         let comment = getComentsAfterToken(token,tokens,index); //We want the tokens after the Triple
                         let emptyBrackets = start && subTriples.length==0;
 
-                        acc.push(new Node(before,subTriples,comment,emptyBrackets,after));
+                        acc.push(new Node(before,subTriples,comment,emptyBrackets,after,'',multiElementOneOf));
                         start=false;
                 }
                 singleTriple = [];
@@ -131,6 +133,10 @@ function getTriples(tokens) {
         },[])
 }
 
+function isMultiElementOneOf(token){
+    return token.string == '|';
+}
+
 function getAfterTripleTokens(tokens){
     let start=false;
     let open = 0;