Move to objects in jsonify()

Author: ai

each-test.js

@@ -1,5 +1,5 @@
-let { readFileSync, readdirSync } = require('fs')
-let { join, extname, basename } = require('path')
+let { readdirSync, readFileSync } = require('fs')
+let { basename, extname, join } = require('path')
 
 let extra = require('./extra-cases')
 
@@ -10,7 +10,7 @@ function read(file) {
 module.exports = function eachTest(callback) {
   readdirSync(join(__dirname, 'cases')).forEach(i => {
     if (extname(i) !== '.json') return
-    let json = read(i).toString().trim()
+    let json = JSON.parse(read(i).toString().trim())
     let name = basename(i, '.json')
     let css = extra[name]
     if (!css) {

index.d.ts

@@ -1,12 +1,12 @@
-export function jsonify (node: object): string
+export function jsonify(node: object): object
 
-export function testPath (name: string): string
+export function testPath(name: string): string
 
-export function eachTest (
-  callback: (name: string, css: string, json: string) => void
+export function eachTest(
+  callback: (name: string, css: string, json: object) => void
 ): void
 
-export function testOnReal (
+export function testOnReal(
   callback: (css: string) => { css: string },
   extra: string[]
 ): void

index.js

@@ -3,4 +3,4 @@ let eachTest = require('./each-test')
 let testPath = require('./test-path')
 let jsonify = require('./jsonify')
 
-module.exports = { jsonify, testPath, eachTest, testOnReal }
+module.exports = { eachTest, jsonify, testOnReal, testPath }

jsonify.js

@@ -15,5 +15,5 @@ function clean(node) {
 
 module.exports = function jsonify(node) {
   let cleaned = clean(node.toJSON())
-  return JSON.stringify(cleaned, null, 2)
+  return JSON.parse(JSON.stringify(cleaned, null, 2))
 }

test/jsonify.test.js

@@ -6,10 +6,7 @@ let jsonify = require('../jsonify')
 
 test('converts to JSON string', () => {
   let node = postcss.rule()
-  equal(
-    jsonify(node),
-    '{\n' + '  "raws": {},\n' + '  "type": "rule",\n' + '  "nodes": []\n' + '}'
-  )
+  equal(jsonify(node), { nodes: [], raws: {}, type: 'rule' })
 })
 
 test('converts source.input', () => {
@@ -19,62 +16,56 @@ test('converts source.input', () => {
     }
   })
   node.each(() => {})
-  equal(
-    jsonify(node),
-    '{\n' +
-      '  "raws": {},\n' +
-      '  "source": {},\n' +
-      '  "type": "rule",\n' +
-      '  "nodes": []\n' +
-      '}'
-  )
+  equal(jsonify(node), {
+    nodes: [],
+    raws: {},
+    source: {},
+    type: 'rule'
+  })
 })
 
 test('converts source.input recursively', () => {
   let rule = postcss.rule({
     source: {
-      start: {
-        offset: 0,
-        line: 1,
-        column: 1
-      },
       end: {
-        offset: 14,
+        column: 15,
         line: 1,
-        column: 15
+        offset: 14
       },
-      input: new postcss.Input('test', { from: '/a.css' })
+      input: new postcss.Input('test', { from: '/a.css' }),
+      start: {
+        column: 1,
+        line: 1,
+        offset: 0
+      }
     }
   })
   let root = postcss.root()
   root.append(rule)
 
-  equal(
-    jsonify(root),
-    '{\n' +
-      '  "raws": {},\n' +
-      '  "type": "root",\n' +
-      '  "nodes": [\n' +
-      '    {\n' +
-      '      "raws": {},\n' +
-      '      "source": {\n' +
-      '        "start": {\n' +
-      '          "offset": 0,\n' +
-      '          "line": 1,\n' +
-      '          "column": 1\n' +
-      '        },\n' +
-      '        "end": {\n' +
-      '          "offset": 14,\n' +
-      '          "line": 1,\n' +
-      '          "column": 15\n' +
-      '        }\n' +
-      '      },\n' +
-      '      "type": "rule",\n' +
-      '      "nodes": []\n' +
-      '    }\n' +
-      '  ]\n' +
-      '}'
-  )
+  equal(jsonify(root), {
+    nodes: [
+      {
+        nodes: [],
+        raws: {},
+        source: {
+          end: {
+            column: 15,
+            line: 1,
+            offset: 14
+          },
+          start: {
+            column: 1,
+            line: 1,
+            offset: 0
+          }
+        },
+        type: 'rule'
+      }
+    ],
+    raws: {},
+    type: 'root'
+  })
 })
 
 test.run()