postcss 8.1.12 → 8.2.1

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Change Log
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## 8.2.1
+* Fixed `Node#toJSON()` and `postcss.fromJSON()` (by Niklas Mischkulnig).
+
+## 8.2 “Prince Orobas”
+* Added `Node#toJSON()` and `postcss.fromJSON()` (by Niklas Mischkulnig).
+
+## 8.1.14
+* Fixed parser performance regression.
+
+## 8.1.13
+* Fixed broken AST after moving nodes in visitor API.
+
 ## 8.1.12
 * Fixed Autoprefixer regression.
 

package/lib/container.js

@@ -337,6 +337,7 @@ class Container extends Node {
     let processed = nodes.map(i => {
       // istanbul ignore next
       if (typeof i.markDirty !== 'function') rebuild(i)
+      i = i.proxyOf
       if (i.parent) i.parent.removeChild(i)
       if (i[isClean]) markDirtyUp(i)
       if (typeof i.raws.before === 'undefined') {

package/lib/fromJSON.d.ts

@@ -0,0 +1,5 @@
+import { JSONHydrator } from './postcss.js'
+
+declare const fromJSON: JSONHydrator
+
+export default fromJSON

package/lib/fromJSON.js

@@ -0,0 +1,52 @@
+'use strict'
+
+let Declaration = require('./declaration')
+let PreviousMap = require('./previous-map')
+let Comment = require('./comment')
+let AtRule = require('./at-rule')
+let Input = require('./input')
+let Root = require('./root')
+let Rule = require('./rule')
+
+function fromJSON (json, inputs) {
+  let { inputs: ownInputs, ...defaults } = json
+  if (ownInputs) {
+    inputs = []
+    for (let input of ownInputs) {
+      let inputHydrated = { ...input, __proto__: Input.prototype }
+      if (inputHydrated.map) {
+        inputHydrated.map = {
+          ...inputHydrated.map,
+          __proto__: PreviousMap.prototype
+        }
+      }
+      inputs.push(inputHydrated)
+    }
+  }
+  if (defaults.nodes) {
+    defaults.nodes = json.nodes.map(n => fromJSON(n, inputs))
+  }
+  if (defaults.source) {
+    let { inputId, ...source } = defaults.source
+    defaults.source = source
+    if (inputId != null) {
+      defaults.source.input = inputs[inputId]
+    }
+  }
+  if (defaults.type === 'root') {
+    return new Root(defaults)
+  } else if (defaults.type === 'decl') {
+    return new Declaration(defaults)
+  } else if (defaults.type === 'rule') {
+    return new Rule(defaults)
+  } else if (defaults.type === 'comment') {
+    return new Comment(defaults)
+  } else if (defaults.type === 'atrule') {
+    return new AtRule(defaults)
+  } else {
+    throw new Error('Unknown node type: ' + json.type)
+  }
+}
+
+module.exports = fromJSON
+fromJSON.default = fromJSON

package/lib/input.js

@@ -3,12 +3,13 @@
 let { fileURLToPath, pathToFileURL } = require('url')
 let { resolve, isAbsolute } = require('path')
 let { nanoid } = require('nanoid/non-secure')
-let vfileLocation = require('vfile-location')
 
 let terminalHighlight = require('./terminal-highlight')
 let CssSyntaxError = require('./css-syntax-error')
 let PreviousMap = require('./previous-map')
 
+let fromOffsetCache = Symbol('fromOffset cache')
+
 class Input {
   constructor (css, opts = {}) {
     if (
@@ -50,15 +51,45 @@ class Input {
   }
 
   fromOffset (offset) {
-    let finder = vfileLocation(this.css)
-    this.fromOffset = i => {
-      let position = finder.toPoint(i)
-      return {
-        line: position.line,
-        col: position.column
+    let lastLine, lineToIndex
+    if (!this[fromOffsetCache]) {
+      let lines = this.css.split('\n')
+      lineToIndex = new Array(lines.length)
+      let prevIndex = 0
+
+      for (let i = 0, l = lines.length; i < l; i++) {
+        lineToIndex[i] = prevIndex
+        prevIndex += lines[i].length + 1
+      }
+
+      this[fromOffsetCache] = lineToIndex
+    } else {
+      lineToIndex = this[fromOffsetCache]
+    }
+    lastLine = lineToIndex[lineToIndex.length - 1]
+
+    let min = 0
+    if (offset >= lastLine) {
+      min = lineToIndex.length - 1
+    } else {
+      let max = lineToIndex.length - 2
+      let mid
+      while (min < max) {
+        mid = min + ((max - min) >> 1)
+        if (offset < lineToIndex[mid]) {
+          max = mid - 1
+        } else if (offset >= lineToIndex[mid + 1]) {
+          min = mid + 1
+        } else {
+          min = mid
+          break
+        }
       }
     }
-    return this.fromOffset(offset)
+    return {
+      line: min + 1,
+      col: offset - lineToIndex[min] + 1
+    }
   }
 
   error (message, line, column, opts = {}) {
@@ -142,6 +173,22 @@ class Input {
   get from () {
     return this.file || this.id
   }
+
+  toJSON () {
+    let json = {}
+    for (let name of ['hasBOM', 'css', 'file', 'id']) {
+      if (this[name] != null) {
+        json[name] = this[name]
+      }
+    }
+    if (this.map) {
+      json.map = { ...this.map }
+      if (json.map.consumerCache) {
+        json.map.consumerCache = undefined
+      }
+    }
+    return json
+  }
 }
 
 module.exports = Input

package/lib/node.js

@@ -166,8 +166,11 @@ class Node {
     if (!keepBetween) delete this.raws.between
   }
 
-  toJSON () {
+  toJSON (inputs) {
     let fixed = {}
+    let emitInputs = inputs == null
+    inputs = inputs || new Map()
+    let inputsNextIndex = 0
 
     for (let name in this) {
       if (!Object.prototype.hasOwnProperty.call(this, name)) {
@@ -180,18 +183,34 @@ class Node {
       if (Array.isArray(value)) {
         fixed[name] = value.map(i => {
           if (typeof i === 'object' && i.toJSON) {
-            return i.toJSON()
+            return i.toJSON(inputs)
           } else {
             return i
           }
         })
       } else if (typeof value === 'object' && value.toJSON) {
-        fixed[name] = value.toJSON()
+        fixed[name] = value.toJSON(inputs)
+      } else if (name === 'source') {
+        let inputId = inputs.get(value.input)
+        if (inputId == null) {
+          inputId = inputsNextIndex
+          inputs.set(value.input, inputsNextIndex)
+          inputsNextIndex++
+        }
+        fixed[name] = {
+          inputId,
+          start: value.start,
+          end: value.end
+        }
       } else {
         fixed[name] = value
       }
     }
 
+    if (emitInputs) {
+      fixed.inputs = [...inputs.keys()].map(input => input.toJSON())
+    }
+
     return fixed
   }
 

package/lib/postcss.d.ts

@@ -213,6 +213,10 @@ export interface Stringifier {
   (node: AnyNode, builder: Builder): void
 }
 
+export interface JSONHydrator {
+  (data: object): Node
+}
+
 export interface Syntax {
   /**
    * Function to generate AST by string.
@@ -352,6 +356,17 @@ export interface Postcss {
    */
   parse: Parser
 
+  /**
+   * Rehydrate a JSON AST (from `Node#toJSON`) back into the AST classes.
+   *
+   * ```js
+   * const json = root.toJSON()
+   * // save to file, send by network, etc
+   * const root2  = postcss.fromJSON(json)
+   * ```
+   */
+  fromJSON: JSONHydrator
+
   /**
    * Contains the `list` module.
    */
@@ -412,6 +427,7 @@ export interface Postcss {
 
 export const stringify: Stringifier
 export const parse: Parser
+export const fromJSON: JSONHydrator
 
 export const comment: Postcss['comment']
 export const atRule: Postcss['atRule']

package/lib/postcss.js

@@ -6,6 +6,7 @@ let LazyResult = require('./lazy-result')
 let Container = require('./container')
 let Processor = require('./processor')
 let stringify = require('./stringify')
+let fromJSON = require('./fromJSON')
 let Warning = require('./warning')
 let Comment = require('./comment')
 let AtRule = require('./at-rule')
@@ -62,6 +63,7 @@ postcss.plugin = function plugin (name, initializer) {
 
 postcss.stringify = stringify
 postcss.parse = parse
+postcss.fromJSON = fromJSON
 postcss.list = list
 
 postcss.comment = defaults => new Comment(defaults)

package/lib/postcss.mjs

@@ -3,6 +3,7 @@ import postcss from './postcss.js'
 export default postcss
 
 export const stringify = postcss.stringify
+export const fromJSON = postcss.fromJSON
 export const plugin = postcss.plugin
 export const parse = postcss.parse
 export const list = postcss.list

package/lib/processor.js

@@ -5,7 +5,7 @@ let Root = require('./root')
 
 class Processor {
   constructor (plugins = []) {
-    this.version = '8.1.12'
+    this.version = '8.2.1'
     this.plugins = this.normalize(plugins)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.1.12",
+  "version": "8.2.1",
   "description": "Tool for transforming styles with JS plugins",
   "engines": {
     "node": "^10 || ^12 || >=14"
@@ -37,8 +37,7 @@
   "dependencies": {
     "colorette": "^1.2.1",
     "nanoid": "^3.1.20",
-    "source-map": "^0.6.1",
-    "vfile-location": "^3.2.0"
+    "source-map": "^0.6.1"
   },
   "browser": {
     "./lib/terminal-highlight": false,