@qooxdoo/framework 7.0.0-beta.5 → 7.0.0-beta.9

package/source/class/qx/tool/utils/json/Stringify.js

@@ -23,11 +23,11 @@
 /* eslint-disable no-redeclare */
 
 /**
- * Stringify 
+ * Stringify
  */
 qx.Class.define("qx.tool.utils.json.Stringify", {
   extend: qx.core.Object,
-  
+
   statics: {
     /**
      * Pretty prints an AST tree
@@ -43,15 +43,15 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
           case "object":
             writer.comments(node.leadingComments);
             writer.write("{\n").indent(+1);
-            node.children.forEach(function(child, index) {
+            node.children.forEach(function (child, index) {
               if (index > 0) {
-                writer.write(",\n"); 
+                writer.write(",\n");
               }
-              writer.write("\"" + child.key.value + "\" : ");
+              writer.write('"' + child.key.value + '" : ');
               writeNode(child.value);
             });
             if (node.children.length) {
-              writer.write("\n"); 
+              writer.write("\n");
             }
             writer.comments(node.trailingComments);
             writer.indent(-1).write("}");
@@ -60,14 +60,14 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
           case "array":
             writer.comments(node.leadingComments);
             writer.write("[\n").indent(+1);
-            node.children.forEach(function(child, index) {
+            node.children.forEach(function (child, index) {
               if (index > 0) {
-                writer.write(",\n"); 
+                writer.write(",\n");
               }
               writeNode(child.value);
             });
             if (node.children.length) {
-              writer.write("\n"); 
+              writer.write("\n");
             }
             writer.comments(node.trailingComments);
             writer.indent(-1).write("]\n");
@@ -80,7 +80,7 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
             break;
 
           case "identifier":
-            writer.write("\"" + node.value + "\"");
+            writer.write('"' + node.value + '"');
             break;
 
           case "literal":
@@ -100,24 +100,24 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
     },
 
     /**
-     * Prints an object out, using the AST to preserve formatting and whitespace 
+     * Prints an object out, using the AST to preserve formatting and whitespace
      * (and include comments) wherever possible.  Any parts of the object which
-     * do not have a corresponding AST tree will be pretty printed  
-     * 
+     * do not have a corresponding AST tree will be pretty printed
+     *
      * This is only really suitable for amendments to the object graph because
      * preserving formatting & comments relies on a 1:1 comparison between the
-     * AST and the object.  This means that if you move a subset of an object to 
+     * AST and the object.  This means that if you move a subset of an object to
      * another part of the object graph, it will be seen as a deletion of one
-     * subset and a brand new subset - you will loose all comments as well as 
-     * layout. 
-     * 
+     * subset and a brand new subset - you will loose all comments as well as
+     * layout.
+     *
      * @param object {Object}
      * @param ast {Tokenizer}
      * @return {String}
      */
     reprint(object, ast) {
       var writer = new qx.tool.utils.json.Writer();
-      
+
       if (!ast) {
         prettyPojo(object);
         return writer.buffer;
@@ -129,16 +129,16 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
        */
       function prettyPojo(obj) {
         if (typeof obj == "string") {
-          writer.write("\"" + obj + "\""); 
+          writer.write('"' + obj + '"');
         } else if (typeof obj == "number") {
-          writer.write(obj); 
+          writer.write(obj);
         } else if (typeof obj == "boolean") {
-          writer.write(obj ? "true" : "false"); 
+          writer.write(obj ? "true" : "false");
         } else if (qx.lang.Type.isArray(obj)) {
           writer.write("[ ");
-          obj.forEach(function(elem, index) {
+          obj.forEach(function (elem, index) {
             if (index != 0) {
-              writer.write(", "); 
+              writer.write(", ");
             }
             prettyPojo(elem);
           });
@@ -149,9 +149,9 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
           writer.write("{\n").indent(+1);
           for (var name in obj) {
             if (!first) {
-              writer.write(",\n"); 
+              writer.write(",\n");
             }
-            writer.write("\"" + name + "\": ");
+            writer.write('"' + name + '": ');
             prettyPojo(obj[name]);
             first = false;
           }
@@ -164,7 +164,7 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
        * Pretty prints a key:value pair
        */
       function prettyPojoProperty(key, value) {
-        writer.write("\"" + key + "\": ");
+        writer.write('"' + key + '": ');
         prettyPojo(value);
       }
 
@@ -176,14 +176,14 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
         if (startTokenIndex > -1) {
           while (startTokenIndex < index) {
             var token = tokenizer.tokens[startTokenIndex];
-            writer.write(token.rawValue||token.value);
+            writer.write(token.rawValue || token.value);
             startTokenIndex++;
           }
         }
       }
 
       /*
-       * Writes an object, comparing it with the AST node.  Used recursively 
+       * Writes an object, comparing it with the AST node.  Used recursively
        */
       function writeNode(object, node) {
         /*
@@ -197,21 +197,21 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
 
         /*
          * Calculates the largest endToken
-         * 
+         *
          * @param endToken {Number} current largest endToken, or -1 for none
          * @param node {AST Node}
          */
         function maxEndToken(endToken, node) {
           var index;
           if (node.endToken !== undefined) {
-            index = node.endToken; 
+            index = node.endToken;
           } else if (node.startToken !== undefined) {
-            index = node.startToken; 
+            index = node.startToken;
           } else {
-            return endToken; 
+            return endToken;
           }
           if (endToken > index) {
-            return endToken; 
+            return endToken;
           }
           return index;
         }
@@ -224,7 +224,7 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
 
         switch (node.type) {
           case "object":
-          // If it's not the correct type, then pretty print
+            // If it's not the correct type, then pretty print
             if (!qx.tool.utils.json.Stringify.isPlainObject(object)) {
               prettyPojo(object);
               return;
@@ -232,12 +232,12 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
 
             // Create lookups
             var childAstLookup = {};
-            node.children.forEach(function(child, index) {
+            node.children.forEach(function (child, index) {
               childAstLookup[child.key.value] = child;
             });
             var childPropertyLookup = {};
             for (var name in object) {
-              childPropertyLookup[name] = object[name]; 
+              childPropertyLookup[name] = object[name];
             }
 
             // Opening brace
@@ -250,29 +250,32 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
               var child = node.children[i];
               var key = child.key.value;
               var value = object[key];
-            
+
               // Deleted a child?
               if (value === undefined) {
                 writeTokensUntil(child.key.startToken);
                 startTokenIndex = child.value.endToken + 1;
                 if (first && i < node.children.length - 1) {
-                  while (tokenizer.tokens[startTokenIndex].type != qx.tool.utils.json.Tokenizer.tokenTypes.COMMA) {
-                    startTokenIndex++; 
+                  while (
+                    tokenizer.tokens[startTokenIndex].type !=
+                    qx.tool.utils.json.Tokenizer.tokenTypes.COMMA
+                  ) {
+                    startTokenIndex++;
                   }
                   startTokenIndex++;
                 }
                 continue;
               }
-            
+
               first = false;
               endToken = maxEndToken(endToken, child.value);
-            
+
               // Write existing property
               writeTokensUntil(child.value.startToken);
               writeNode(value, child.value);
               delete childPropertyLookup[key];
             }
-          
+
             // Added properties
             var first = node.children.length === 0;
             var oldIndent = writer.matchIndent();
@@ -283,13 +286,13 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
               }
               prettyPojoProperty(name, childPropertyLookup[name]);
             }
-          
+
             // Unindent and output the closing brace
             writer.resetIndent(oldIndent);
             if (endToken === -1) {
-              startTokenIndex = node.endToken; 
+              startTokenIndex = node.endToken;
             } else {
-              startTokenIndex = endToken + 1; 
+              startTokenIndex = endToken + 1;
             }
             writeTokensUntil(node.endToken + 1);
             break;
@@ -299,12 +302,13 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
               prettyPojo(object);
               return;
             }
-          
+
             // Opening brace
             writeTokensUntil(node.startToken + 1);
 
             for (var i = 0; i < object.length; i++) {
-              var child = i < node.children.length ? node.children[i] : undefined;
+              var child =
+                i < node.children.length ? node.children[i] : undefined;
               if (child !== undefined) {
                 writeTokensUntil(child.startToken);
                 writeNode(object[i], child);
@@ -312,14 +316,14 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
               } else {
                 var oldIndent = writer.matchIndent();
                 if (i != 0) {
-                  writer.write(",\n"); 
+                  writer.write(",\n");
                 }
                 prettyPojo(object[i]);
                 writer.resetIndent(oldIndent);
-              //startTokenIndex = node.endToken;
+                //startTokenIndex = node.endToken;
               }
             }
-          
+
             // Closing brace
             writeTokensUntil(node.endToken + 1);
             break;
@@ -328,24 +332,24 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
             break;
 
           case "literal":
-          // Check type
+            // Check type
             if (!qx.tool.utils.json.Stringify.isLiteral(object)) {
               prettyPojo(object);
               startTokenIndex = node.endToken + 1;
               return;
             }
-          
+
             // If it has not changed, then use the AST
             if (qx.tool.utils.json.Stringify.isSameLiteral(node, object)) {
               writeTokensUntil(node.startToken + 1);
-          
+
               // New value, but try and preserve prefix comment & whitespace
             } else {
               writeTokensUntil(node.startToken);
               if (typeof object === "string") {
-                writer.write("\"" + object + "\""); 
+                writer.write('"' + object + '"');
               } else {
-                writer.write(object); 
+                writer.write(object);
               }
               startTokenIndex = node.startToken + 1;
             }
@@ -363,10 +367,13 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
       if (startTokenIndex > -1) {
         while (startTokenIndex < tokenizer.tokens.length) {
           var token = tokenizer.tokens[startTokenIndex++];
-          if (token.type != qx.tool.utils.json.Tokenizer.tokenTypes.COMMENT && token.type != qx.tool.utils.json.Tokenizer.tokenTypes.WHITESPACE) {
-            break; 
+          if (
+            token.type != qx.tool.utils.json.Tokenizer.tokenTypes.COMMENT &&
+            token.type != qx.tool.utils.json.Tokenizer.tokenTypes.WHITESPACE
+          ) {
+            break;
           }
-          writer.write(token.rawValue||token.value);
+          writer.write(token.rawValue || token.value);
         }
       }
 
@@ -374,23 +381,23 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
     },
 
     /**
-     * Converts an AST into an ordinary POJO 
+     * Converts an AST into an ordinary POJO
      */
     astToObject(ast, settings) {
       function writeNode(node) {
         var result;
-        
+
         switch (node.type) {
           case "object":
-            result = {}; 
-            node.children.forEach(function(child, index) {
+            result = {};
+            node.children.forEach(function (child, index) {
               result[child.key.value] = writeNode(child.value);
             });
             break;
 
           case "array":
             result = [];
-            node.children.forEach(function(child, index) {
+            node.children.forEach(function (child, index) {
               result.push(writeNode(child));
             });
             break;
@@ -402,6 +409,7 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
           default:
             throw new Error("Unexpected node type '" + node.type + "'");
         }
+
         return result;
       }
 
@@ -410,7 +418,7 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
 
     /**
      * Detects whether the value is a native object
-     * 
+     *
      * @param obj {Object}
      * @returns boolean
      */
@@ -425,13 +433,18 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
 
     /**
      * Detects whether the value is a literal value
-     * 
+     *
      * @param obj {Object}
      * @returns boolean
      */
     isLiteral(obj) {
-      if (obj === null || typeof obj === "string" || typeof obj === "number" || typeof obj === "boolean") {
-        return true; 
+      if (
+        obj === null ||
+        typeof obj === "string" ||
+        typeof obj === "number" ||
+        typeof obj === "boolean"
+      ) {
+        return true;
       }
       return false;
     },
@@ -441,19 +454,21 @@ qx.Class.define("qx.tool.utils.json.Stringify", {
      */
     isSameLiteral(node, object) {
       if (node.rawValue === null && object === null) {
-        return true; 
+        return true;
       }
-      if ((node.rawValue !== null && object === null) || (node.rawValue === null && object !== null)) {
-        return false; 
+      if (
+        (node.rawValue !== null && object === null) ||
+        (node.rawValue === null && object !== null)
+      ) {
+        return false;
       }
       if (typeof node.value !== typeof object) {
-        return false; 
+        return false;
       }
       if (typeof node.value === "string") {
         return node.value === object;
       }
       return node.rawValue == object;
     }
-    
   }
 });

package/source/class/qx/tool/utils/json/Tokenizer.js

@@ -44,17 +44,16 @@ const __tokenTypes = {
   WHITESPACE: 12
 };
 
-
 /**
  * Tokenizer, based on json-to-ast by Vlad trushin
  */
 qx.Class.define("qx.tool.utils.json.Tokenizer", {
   extend: qx.core.Object,
 
-  construct: function(input, settings) {
-    this.base(arguments);
+  construct(input, settings) {
+    super();
     this.input = input;
-    this.settings = settings||{};
+    this.settings = settings || {};
     this.tokens = null;
     this.tokenIndex = -1;
   },
@@ -90,7 +89,10 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
       }
       for (; tokenIndex < this.tokens.length; tokenIndex++) {
         var token = this.tokens[tokenIndex];
-        if (token.type != tokenTypes.COMMENT && token.type != tokenTypes.WHITESPACE) {
+        if (
+          token.type != tokenTypes.COMMENT &&
+          token.type != tokenTypes.WHITESPACE
+        ) {
           return true;
         }
       }
@@ -112,9 +114,16 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
           return this.tokens[++this.tokenIndex];
         }
       } else {
-        for (++this.tokenIndex; this.tokenIndex < this.tokens.length; this.tokenIndex++) {
+        for (
+          ++this.tokenIndex;
+          this.tokenIndex < this.tokens.length;
+          this.tokenIndex++
+        ) {
           var token = this.tokens[this.tokenIndex];
-          if (token.type != tokenTypes.COMMENT && token.type != tokenTypes.WHITESPACE) {
+          if (
+            token.type != tokenTypes.COMMENT &&
+            token.type != tokenTypes.WHITESPACE
+          ) {
             return token;
           }
         }
@@ -129,20 +138,19 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
       let line = 1;
       let column = 1;
       let index = 0;
-      const tokens = this.tokens = [];
+      const tokens = (this.tokens = []);
       var input = this.input;
 
       while (index < input.length) {
         const args = [input, index, line, column, this.settings];
 
-        const matched = (
+        const matched =
           Tokenizer.parseWhitespace(...args) ||
           Tokenizer.parseComment(...args) ||
           Tokenizer.parseChar(...args) ||
           Tokenizer.parseKeyword(...args) ||
           Tokenizer.parseString(...args) ||
-          Tokenizer.parseNumber(...args)
-        );
+          Tokenizer.parseNumber(...args);
 
         if (matched) {
           const token = {
@@ -158,6 +166,7 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
               this.settings.source
             )
           };
+
           if (matched.rawValue) {
             token.rawValue = matched.rawValue;
           }
@@ -183,7 +192,8 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
   statics: {
     tokenTypes: __tokenTypes,
 
-    punctuatorTokensMap: { // Lexeme: Token
+    punctuatorTokensMap: {
+      // Lexeme: Token
       "{": __tokenTypes.LEFT_BRACE,
       "}": __tokenTypes.RIGHT_BRACE,
       "[": __tokenTypes.LEFT_BRACKET,
@@ -192,10 +202,11 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
       ",": __tokenTypes.COMMA
     },
 
-    keywordTokensMap: { // Lexeme: Token config
-      "true": { type: __tokenTypes.TRUE, value: true },
-      "false": { type: __tokenTypes.FALSE, value: false },
-      "null": { type: __tokenTypes.NULL, value: null }
+    keywordTokensMap: {
+      // Lexeme: Token config
+      true: { type: __tokenTypes.TRUE, value: true },
+      false: { type: __tokenTypes.FALSE, value: false },
+      null: { type: __tokenTypes.NULL, value: null }
     },
 
     stringStates: {
@@ -205,15 +216,15 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
     },
 
     escapes: {
-      "\"": "\"", // Quotation mask
+      '"': '"', // Quotation mask
       "\\": "\\", // Reverse solidus
       "/": "/", // Solidus
-      "b": "\b", // Backspace
-      "f": "\f", // Form feed
-      "n": "\n", // New line
-      "r": "\r", // Carriage return
-      "t": "\t", // Horizontal tab
-      "u": "u" // 4 hexadecimal digits
+      b: "\b", // Backspace
+      f: "\f", // Form feed
+      n: "\n", // New line
+      r: "\r", // Carriage return
+      t: "\t", // Horizontal tab
+      u: "u" // 4 hexadecimal digits
     },
 
     numberStates: {
@@ -262,16 +273,19 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
 
       while (true) {
         var char = input.charAt(index);
-        if (char === "\r") { // CR (Unix)
+        if (char === "\r") {
+          // CR (Unix)
           index++;
           line++;
           column = 1;
           value += char;
-          if (input.charAt(index) === "\n") { // CRLF (Windows)
+          if (input.charAt(index) === "\n") {
+            // CRLF (Windows)
             index++;
             value += "\n";
           }
-        } else if (char === "\n") { // LF (MacOS)
+        } else if (char === "\n") {
+          // LF (MacOS)
           index++;
           line++;
           column = 1;
@@ -308,14 +322,17 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
             index += 2;
             column += 2;
             break;
-          } else if (char === "\r") { // CR (Unix)
+          } else if (char === "\r") {
+            // CR (Unix)
             index++;
             line++;
             column = 1;
-            if (input.charAt(index) === "\n") { // CRLF (Windows)
+            if (input.charAt(index) === "\n") {
+              // CRLF (Windows)
               index++;
             }
-          } else if (char === "\n") { // LF (MacOS)
+          } else if (char === "\n") {
+            // LF (MacOS)
             index++;
             line++;
             column = 1;
@@ -333,15 +350,18 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
       } else if (str === "//") {
         for (index += 2; index < input.length; index++) {
           var char = input[index];
-          if (char === "\r") { // CR (Unix)
+          if (char === "\r") {
+            // CR (Unix)
             index++;
             line++;
             column = 1;
-            if (input.charAt(index) === "\n") { // CRLF (Windows)
+            if (input.charAt(index) === "\n") {
+              // CRLF (Windows)
               index++;
             }
             break;
-          } else if (char === "\n") { // LF (MacOS)
+          } else if (char === "\n") {
+            // LF (MacOS)
             index++;
             line++;
             column = 1;
@@ -363,7 +383,8 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
 
     parseChar(input, index, line, column) {
       const char = input.charAt(index);
-      const punctuatorTokensMap = qx.tool.utils.json.Tokenizer.punctuatorTokensMap;
+      const punctuatorTokensMap =
+        qx.tool.utils.json.Tokenizer.punctuatorTokensMap;
 
       if (char in punctuatorTokensMap) {
         return {
@@ -382,8 +403,11 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
       const keywordTokensMap = qx.tool.utils.json.Tokenizer.keywordTokensMap;
 
       for (const name in keywordTokensMap) {
-        if (keywordTokensMap.hasOwnProperty(name) && input.substr(index, name.length) === name) {
-          const {type, value} = keywordTokensMap[name];
+        if (
+          keywordTokensMap.hasOwnProperty(name) &&
+          input.substr(index, name.length) === name
+        ) {
+          const { type, value } = keywordTokensMap[name];
 
           return {
             type,
@@ -399,7 +423,8 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
     },
 
     parseString(input, index, line, column, settings) {
-      const { stringStates, tokenTypes, escapes } = qx.tool.utils.json.Tokenizer;
+      const { stringStates, tokenTypes, escapes } =
+        qx.tool.utils.json.Tokenizer;
 
       const startIndex = index;
       let buffer = "";
@@ -410,7 +435,7 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
 
         switch (state) {
           case stringStates._START_: {
-            if (char === "\"") {
+            if (char === '"') {
               state = stringStates.START_QUOTE_OR_CHAR;
               index++;
             } else {
@@ -423,7 +448,7 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
             if (char === "\\") {
               state = stringStates.ESCAPE;
               index++;
-            } else if (char === "\"") {
+            } else if (char === '"') {
               index++;
               var result = {
                 type: tokenTypes.STRING,
@@ -432,6 +457,7 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
                 index,
                 value: buffer
               };
+
               if (settings.verbose) {
                 result.rawValue = input.substring(startIndex, index);
               }
@@ -593,6 +619,5 @@ qx.Class.define("qx.tool.utils.json.Tokenizer", {
 
       return null;
     }
-
   }
 });