CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.0.1
+* Fixed source start line and column (by Ivan Nikolić).
+
 ## 4.0
 * Removed Node.js 10 support.
 * Moved `postcss` to `peerDependencies`.

README.md

@@ -1,4 +1,4 @@
-# PostCSS SCSS Syntax [![Build Status][ci-img]][ci]
+# PostCSS SCSS Syntax
 
 <img align="right" width="95" height="95"
      title="Philosopher’s stone, logo of PostCSS"
@@ -11,25 +11,18 @@ at-rules & variables as properties, so that PostCSS plugins can then transform
 SCSS source code alongside CSS.
 
 [PostCSS]: https://github.com/postcss/postcss
-[ci-img]:  https://img.shields.io/travis/postcss/postcss-scss.svg
 [SCSS]:    http://sass-lang.com/
-[ci]:      https://travis-ci.org/postcss/postcss-scss
 
 <a href="https://evilmartians.com/?utm_source=postcss">
-<img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54">
+  <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg"
+    alt="Sponsored by Evil Martians" width="236" height="54">
 </a>
 
 
 ## Install
 
 ```sh
-npm --save install postcss-scss
-```
-
-or (if you use [Yarn](https://yarnpkg.com/))
-
-```sh
-yarn add --dev postcss-scss
+npm --save install postcss postcss-scss
 ```
 
 

lib/scss-parser.js

@@ -5,11 +5,11 @@ let NestedDeclaration = require('./nested-declaration')
 let scssTokenizer = require('./scss-tokenize')
 
 class ScssParser extends Parser {
-  createTokenizer () {
+  createTokenizer() {
     this.tokenizer = scssTokenizer(this.input)
   }
 
-  rule (tokens) {
+  rule(tokens) {
     let withColon = false
     let brackets = 0
     let value = ''
@@ -54,7 +54,15 @@ class ScssParser extends Parser {
       while (tokens[0][0] !== 'word') {
         node.raws.before += tokens.shift()[1]
       }
-      node.source.start = { line: tokens[0][2], column: tokens[0][3] }
+
+      if (tokens[0][2]) {
+        let pos = this.input.fromOffset(tokens[0][2])
+        node.source.start = {
+          offset: tokens[0][2],
+          line: pos.line,
+          column: pos.col
+        }
+      }
 
       node.prop = ''
       while (tokens.length) {
@@ -128,7 +136,7 @@ class ScssParser extends Parser {
     }
   }
 
-  comment (token) {
+  comment(token) {
     if (token[4] === 'inline') {
       let node = new Comment()
       this.init(node, token[2])
@@ -154,7 +162,7 @@ class ScssParser extends Parser {
     }
   }
 
-  raw (node, prop, tokens) {
+  raw(node, prop, tokens) {
     super.raw(node, prop, tokens)
     if (node.raws[prop]) {
       let scss = node.raws[prop].raw

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-scss",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "SCSS parser for PostCSS",
   "keywords": [
     "css",
@@ -36,24 +36,24 @@
     "postcss": "^8.3.3"
   },
   "devDependencies": {
-    "@logux/eslint-config": "^45.4.4",
-    "clean-publish": "^2.2.0",
-    "eslint": "^7.28.0",
+    "@logux/eslint-config": "^45.4.8",
+    "clean-publish": "^3.0.3",
+    "eslint": "^7.32.0",
     "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-jest": "^24.3.6",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-jest": "^24.5.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prefer-let": "^1.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-security": "^1.4.0",
-    "eslint-plugin-unicorn": "^33.0.1",
-    "jest": "^27.0.4",
-    "lint-staged": "^11.0.0",
-    "postcss": "^8.3.3",
-    "postcss-parser-tests": "^8.3.5",
+    "eslint-plugin-unicorn": "^36.0.0",
+    "jest": "^27.2.3",
+    "lint-staged": "^11.1.2",
+    "postcss": "^8.3.8",
+    "postcss-parser-tests": "^8.3.6",
     "postcss-sharec-config": "^0.4.1",
-    "prettier": "^2.2.1",
-    "simple-git-hooks": "^2.4.1"
+    "prettier": "^2.4.1",
+    "simple-git-hooks": "^2.6.1"
   },
   "simple-git-hooks": {
     "pre-commit": "npx lint-staged"

test/parse.test.js

@@ -12,6 +12,11 @@ eachTest((name, css, json) => {
 it('parses nested rules', () => {
   let root = parse('a { b {} }')
   expect(root.first.first.selector).toEqual('b')
+
+  expect(root.first.first.source.start.line).toEqual(1)
+  expect(root.first.first.source.start.column).toEqual(5)
+  expect(root.first.first.source.end.line).toEqual(1)
+  expect(root.first.first.source.end.column).toEqual(8)
 })
 
 it('parses at-rules inside rules', () => {
@@ -127,6 +132,11 @@ it('parses nested props as rule', () => {
   let root = parse('a { margin: { left: 10px; }}')
   expect(root.first.first.selector).toEqual('margin:')
   expect(root.first.first.first.prop).toEqual('left')
+
+  expect(root.first.first.source.start.line).toEqual(1)
+  expect(root.first.first.source.start.column).toEqual(5)
+  expect(root.first.first.source.end.line).toEqual(1)
+  expect(root.first.first.source.end.column).toEqual(27)
 })
 
 it('parses nested props with value', () => {
@@ -138,25 +148,45 @@ it('parses nested props with value', () => {
 
   expect(root.first.first.first.prop).toEqual('left')
   expect(root.first.first.first.value).toEqual('10px')
+
+  expect(root.first.first.source.start.line).toEqual(1)
+  expect(root.first.first.source.start.column).toEqual(5)
+  expect(root.first.first.source.end.line).toEqual(1)
+  expect(root.first.first.source.end.column).toEqual(29)
 })
 
 it('parses nested props with space-less digit', () => {
   let root = parse('a { margin:0 { left: 10px; }}')
   expect(root.first.first.prop).toEqual('margin')
   expect(root.first.first.value).toEqual('0')
   expect(root.first.first.first.prop).toEqual('left')
+
+  expect(root.first.first.source.start.line).toEqual(1)
+  expect(root.first.first.source.start.column).toEqual(5)
+  expect(root.first.first.source.end.line).toEqual(1)
+  expect(root.first.first.source.end.column).toEqual(28)
 })
 
 it('parses nested props with new line as rule', () => {
   let root = parse('a { \n margin  \n:0 { left: 10px; }}')
   expect(root.first.first.selector).toEqual('margin  \n:0')
+
+  expect(root.first.first.source.start.line).toEqual(2)
+  expect(root.first.first.source.start.column).toEqual(2)
+  expect(root.first.first.source.end.line).toEqual(3)
+  expect(root.first.first.source.end.column).toEqual(18)
 })
 
 it('parses nested props with important', () => {
   let root = parse('a { margin: 0!important { left: 10px; }}')
   expect(root.first.first.prop).toEqual('margin')
   expect(root.first.first.value).toEqual('0')
   expect(root.first.first.important).toBe(true)
+
+  expect(root.first.first.source.start.line).toEqual(1)
+  expect(root.first.first.source.start.column).toEqual(5)
+  expect(root.first.first.source.end.line).toEqual(1)
+  expect(root.first.first.source.end.column).toEqual(39)
 })
 
 it('parses interpolation with variable', () => {