User bebel to parse object

Author: SBeator

lib/sort-json-core.js

@@ -1,4 +1,6 @@
-var sorter = require('./sort-json-utils');
+const sorter = require('./sort-json-utils');
+const babylon = require('babylon');
+const generate = require('@babel/generator');
 
 function getAutoIndent(selectedText, indent) {
   var lines = selectedText.split('\n');
@@ -175,8 +177,6 @@ function jsonToObjectString(json, needTailingComma, autoIndent, isEs6) {
 }
 
 function checkIfNeedTailingComma(objectString) {
-  console.log('objectString');
-  console.log(objectString);
   return objectString.match(/,[\s\t\n]*\}/);
 }
 
@@ -188,62 +188,81 @@ function checkIsObjectText(selectedText) {
   );
 }
 
+function addAutoIndent(text, autoIndent) {
+  const autoIndentString = new Array(autoIndent).fill(' ').join('');
+  const lines = text.split('\n');
+
+  return [
+    lines[0],
+    ...lines
+      .filter((line, index) => index > 0)
+      .map(line => `${autoIndentString}${line}`),
+  ].join('\n');
+}
+
 function selectedTextToSortedText(
   selectedText,
   indent,
   jsonParser,
   sortOrder,
   sortOptions
 ) {
-  var isObejct = checkIsObjectText(selectedText);
-
-  if (!isObejct) {
-    throw { message: 'Please make sure your selected text is a JS obejct!' };
-  }
+  var needTailingComma = checkIfNeedTailingComma(selectedText);
 
   var autoIndent = getAutoIndent(selectedText, indent);
 
-  var marks = [];
+  const declarPrefix = 'const a = ';
+  let code = `${declarPrefix}${selectedText}`;
 
-  var { json, isEs6 } = objectStringToJson(selectedText, marks, indent);
-
-  var needTailingComma = checkIfNeedTailingComma(selectedText);
-
-  console.log('jsonText');
-  console.log(json);
-
-  console.log('marks');
-  console.log(marks);
+  let ast;
 
   try {
-    var initialJSON = sorter.textToJSON(jsonParser, json);
+    ast = babylon.parse(code, {
+      sourceType: 'module',
+      plugins: ['objectRestSpread'],
+    });
   } catch (e) {
-    if (e.name == 'SyntaxError') {
-      throw { message: 'Please make sure your selected text is a JS obejct!' };
-    } else {
-      throw e;
-    }
+    throw { message: 'Please make sure your selected text is a JS obejct!' };
   }
-  var sortedJSON = sorter.sortJSON(initialJSON, sortOrder, sortOptions);
 
-  var sortedJsonText = sorter.jsonToText(jsonParser, sortedJSON, indent);
+  const object = ast.program.body[0].declarations[0].init;
+  object.properties = object.properties.sort((a, b) => {
+    if (!a.key) {
+      return 1;
+    }
+
+    if (!b.key) {
+      return -1;
+    }
 
-  console.log('sortedJsonText');
-  console.log(sortedJsonText);
-  sortedJsonText = decodeMark(sortedJsonText, marks);
+    return a.key.name
+      ? b.key.name
+        ? a.key.name.localeCompare(b.key.name)
+        : 1
+      : b.key.name
+        ? -1
+        : a.key.value.localeCompare(b.key.value);
+  });
+
+  if (sortOrder && sortOrder.indexOf('desc') >= 0) {
+    object.properties = object.properties.reverse();
+  }
 
-  console.log('decoded text');
-  console.log(sortedJsonText);
+  let sortedText = generate.default(ast, {}, code).code;
 
-  var sortedText = jsonToObjectString(
-    sortedJsonText,
-    needTailingComma,
-    autoIndent,
-    isEs6
-  );
+  sortedText = sortedText.replace(/  /g, new Array(indent).fill(' ').join(''));
+  sortedText = sortedText.slice(declarPrefix.length, sortedText.length - 1);
+  sortedText = addAutoIndent(sortedText, autoIndent);
 
-  console.log('sortedText');
-  console.log(sortedText);
+  if (needTailingComma) {
+    var tailingCommaRegex = /([^\{:,\s\t\n]+)([\s\t\n]*[\]\}])/g;
+    while (sortedText.match(tailingCommaRegex)) {
+      sortedText = sortedText.replace(
+        tailingCommaRegex,
+        (match, $1, $2) => `${$1},${$2}`
+      );
+    }
+  }
 
   return sortedText;
 }

package.json

@@ -15,7 +15,9 @@
     "url": "https://github.com/SBeator/sort-js-object-keys/issues",
     "email": "star_yes@qq.com"
   },
-  "categories": ["Other"],
+  "categories": [
+    "Other"
+  ],
   "activationEvents": [
     "onCommand:sortJsObjectKeys.sortJsObjectKeys",
     "onCommand:sortJsObjectKeys.sortJsObjectKeysReverse"
@@ -44,14 +46,16 @@
     "test": "node ./node_modules/vscode/bin/test"
   },
   "devDependencies": {
-    "typescript": "^2.0.3",
-    "vscode": "^1.0.0",
-    "mocha": "^2.3.3",
-    "eslint": "^3.6.0",
+    "@types/mocha": "^2.2.32",
     "@types/node": "^6.0.40",
-    "@types/mocha": "^2.2.32"
+    "eslint": "^3.6.0",
+    "mocha": "^2.3.3",
+    "typescript": "^2.0.3",
+    "vscode": "^1.0.0"
   },
   "dependencies": {
+    "@babel/generator": "7.0.0-beta.46",
+    "babylon": "7.0.0-beta.46",
     "json5": "^0.5.1",
     "lodash": "^4.17.4"
   }

test/extension.test.js

@@ -42,7 +42,7 @@ suite('Extension Tests', function() {
     try {
       result = sorter.sort(jsObject, 4, JSON5, ['asc'], {});
     } catch (e) {
-      result = e;
+      result = e.message;
     }
 
     assert.equal(result, 'Please make sure your selected text is a JS obejct!');
@@ -57,7 +57,7 @@ suite('Extension Tests', function() {
     try {
       result = sorter.sort(jsObject, 4, JSON5, ['asc'], {});
     } catch (e) {
-      result = e;
+      result = e.message;
     }
 
     assert.equal(result, 'Please make sure your selected text is a JS obejct!');
@@ -233,32 +233,33 @@ suite('Extension Tests', function() {
     );
   });
 
-  test('Support line comments at the end of the object', function() {
-    var jsObject = `{
-        b: 2,
-        // some comment
-        a: 1,
-        // another comment
-        d: 5,
-        c: 4,
-        // end comment
-    }`;
-
-    var result = sorter.sort(jsObject, 4, JSON5, ['asc'], {});
-
-    assert.equal(
-      result,
-      `{
-        // some comment
-        a: 1,
-        b: 2,
-        c: 4,
-        // another comment
-        d: 5,
-        // end comment
-    }`
-    );
-  });
+  // NOT suppot end line comments because babel not suppot it correctly
+  // test('Support line comments at the end of the object', function() {
+  //   var jsObject = `{
+  //       b: 2,
+  //       // some comment
+  //       a: 1,
+  //       // another comment
+  //       d: 5,
+  //       c: 4,
+  //       // end comment
+  //   }`;
+
+  //   var result = sorter.sort(jsObject, 4, JSON5, ['asc'], {});
+
+  //   assert.equal(
+  //     result,
+  //     `{
+  //       // some comment
+  //       a: 1,
+  //       b: 2,
+  //       c: 4,
+  //       // another comment
+  //       d: 5,
+  //       // end comment
+  //   }`
+  //   );
+  // });
 
   test("Support ' in string", function() {
     var jsObject = `{