Parser of template (stylelint#41)

Author: gucong3000

extract.js

@@ -308,7 +308,10 @@ function literalParser (source, opts, styles) {
 			endIndex: endNode.end,
 			skipConvert: true,
 			content: source,
-			syntax: objectSyntax(endNode),
+			opts: {
+				node: endNode,
+			},
+			syntax: objectSyntax,
 			lang: "object-literal",
 		};
 	});
@@ -321,18 +324,17 @@ function literalParser (source, opts, styles) {
 		const quasis = node.quasis;
 		const value = getTemplate(node, source);
 
-		if (value.length === 1 && !value[0].trim()) {
-			return;
-		}
-
 		const style = {
 			startIndex: quasis[0].start,
 			endIndex: quasis[quasis.length - 1].end,
-			content: value.join(""),
+			content: value,
 		};
-		if (value.length > 1) {
-			style.syntax = loadSyntax(opts, "postcss-styled");
+		if (node.expressions.length) {
+			style.syntax = loadSyntax(opts, __dirname);
 			style.lang = "template-literal";
+			style.opts = {
+				node: node,
+			};
 		} else {
 			style.lang = "css";
 		}

get-template.js

@@ -1,15 +1,5 @@
 "use strict";
 function getTemplate (node, source) {
-	const result = [];
-	node.quasis.forEach((node, i) => {
-		result[i << 1] = node.value.cooked;
-	});
-	const quasis = node.quasis;
-	node.expressions.forEach((node, i) => {
-		const index = (i << 1) + 1;
-		result[index] = source.slice(quasis[i].end, quasis[i + 1].start);
-	});
-
-	return result;
+	return source.slice(node.quasis[0].start, node.quasis[node.quasis.length - 1].end);
 }
 module.exports = getTemplate;

literal.js

@@ -3,15 +3,15 @@
 const Node = require("postcss/lib/node");
 
 /**
- * Represents a JS obj
+ * Represents a JS literal
  *
  * @extends Container
  *
  * @example
  * const root = postcss.parse('{}');
- * const obj = root.first;
- * obj.type       //=> 'obj'
- * obj.toString() //=> 'a{}'
+ * const literal = root.first;
+ * literal.type       //=> 'literal'
+ * literal.toString() //=> 'a{}'
  */
 class Literal extends Node {
 	constructor (defaults) {

object-parse.js

@@ -3,10 +3,10 @@
 const ObjectParser = require("./object-parser");
 const Input = require("postcss/lib/input");
 
-function objectParse (node, source, opts) {
+function objectParse (source, opts) {
 	const input = new Input(source, opts);
 	const parser = new ObjectParser(input);
-	parser.parse(node);
+	parser.parse(opts.node);
 	return parser.root;
 }
 module.exports = objectParse;

object-parser.js

@@ -172,8 +172,7 @@ class objectParser {
 				break;
 			}
 			case "TemplateLiteral": {
-				rawValue = source.slice(node.quasis[0].start, node.quasis[node.quasis.length - 1].end);
-				cookedValue = getTemplate(node, source).join("");
+				rawValue = getTemplate(node, source);
 				break;
 			}
 			default: {

object-syntax.js

@@ -2,10 +2,9 @@
 const stringify = require("./object-stringify");
 const parse = require("./object-parse");
 
-module.exports = (node) => {
-	const syntax = {
-		stringify,
-	};
-	syntax.parse = parse.bind(null, node);
-	return syntax;
+const syntax = {
+	parse,
+	stringify,
 };
+
+module.exports = syntax;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-jsx",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "PostCSS syntax for parsing CSS in JS literals",
   "repository": {
     "type": "git",
@@ -45,23 +45,20 @@
   "dependencies": {
     "@babel/core": "^7.1.2"
   },
-  "optionalDependencies": {
-    "postcss-styled": ">=0.34.0"
-  },
   "peerDependencies": {
     "postcss": ">=5.0.0",
-    "postcss-syntax": ">=0.34.0"
+    "postcss-syntax": ">=0.36.0"
   },
   "devDependencies": {
-    "autoprefixer": "^9.1.5",
+    "autoprefixer": "^9.4.3",
     "chai": "^4.2.0",
     "codecov": "^3.1.0",
     "json5": "^2.1.0",
     "mocha": "^5.2.0",
-    "nyc": "^13.0.1",
-    "postcss": "^7.0.5",
-    "postcss-parser-tests": "^6.3.0",
+    "nyc": "^13.1.0",
+    "postcss": "^7.0.7",
+    "postcss-parser-tests": "^6.3.1",
     "postcss-safe-parser": "^4.0.1",
-    "postcss-syntax": ">=0.34.0"
+    "postcss-syntax": ">=0.36.0"
   }
 }

template-parse.js

@@ -0,0 +1,14 @@
+"use strict";
+
+const TemplateParser = require("./template-parser");
+const Input = require("postcss/lib/input");
+
+function templateParse (css, opts) {
+	const input = new Input(css, opts);
+	input.node = opts.node;
+	const parser = new TemplateParser(input);
+	parser.parse();
+
+	return parser.root;
+}
+module.exports = templateParse;

template-parser.js

@@ -0,0 +1,9 @@
+"use strict";
+const Parser = require("postcss/lib/parser");
+const templateTokenize = require("./template-tokenize");
+class TemplateParser extends Parser {
+	createTokenizer () {
+		this.tokenizer = templateTokenize(this.input);
+	}
+}
+module.exports = TemplateParser;

template-safe-parse.js

@@ -0,0 +1,14 @@
+"use strict";
+
+const TemplateSafeParser = require("./template-safe-parser");
+const Input = require("postcss/lib/input");
+
+function templateSafeParse (css, opts) {
+	const input = new Input(css, opts);
+	input.node = opts.node;
+	const parser = new TemplateSafeParser(input);
+	parser.parse();
+
+	return parser.root;
+}
+module.exports = templateSafeParse;