Merge pull request #1 from gucong3000/submodule

submodule

Author: gucong3000

.editorconfig

@@ -4,7 +4,9 @@ language: node_js
 
 node_js:
   - stable
-  - 4
+
+script:
+  - nyc mocha --no-timeouts
 
 after_script:
-  - npm run report-coverage
+  - codecov

.eslintrc.json

@@ -34,7 +34,7 @@ postcss([stylelint({ fix: true })]).process(source, { syntax: syntax }).then(fun
 
 input:
 ```javascript
-import glm from 'jsx';
+import glm from 'glamorous';
 const Component1 = glm.a({
 	flexDirectionn: 'row',
 	display: 'inline-block',
@@ -44,7 +44,7 @@ const Component1 = glm.a({
 
 output:
 ```javascript
-import glm from 'jsx';
+import glm from 'glamorous';
 const Component1 = glm.a({
 	color: '#fff',
 	display: 'inline-block',

.travis.yml

@@ -0,0 +1,9 @@
+"use strict";
+function camelCase (str) {
+	if (str.startsWith("--")) {
+		return str;
+	}
+	return str.replace(/(^|\s|\W)-(ms-)/g, "$1$2").replace(/-+(\w)/g, (s, char) => s.length > 2 ? s : char.toUpperCase());
+}
+
+module.exports = camelCase;

README.md

@@ -2,6 +2,7 @@
 const traverse = require("@babel/traverse").default;
 const t = require("@babel/types").default;
 const parse = require("babylon").parse;
+const getTemplate = require("./get-template");
 
 const isTopLevelExpression = path =>
 	path.isObjectExpression() && !path.findParent(p => p.isObjectExpression());
@@ -64,15 +65,15 @@ function getOptions (opts, attribute) {
 	};
 }
 
-function literalParser (source, opts) {
+function literalParser (source, opts, styles) {
 	let ast;
 	try {
 		ast = parse(source, getOptions(opts));
 	} catch (ex) {
 		if (opts.from && /\.(?:m?[jt]sx?|es\d*|pac)(\?.*|$)/i.test(opts.from)) {
-			return [];
+			return styles || [];
 		}
-		return;
+		return styles;
 	}
 
 	let glamorousImport;
@@ -133,30 +134,34 @@ function literalParser (source, opts) {
 
 	objects = objects.map(path => {
 		const objectSyntax = require("./object-syntax");
-		const root = objectSyntax.parse(path.node, source, opts);
-		const startIndex = root.first.raws.node.start;
-		const endIndex = root.last.raws.node.end;
+		const endNode = path.node;
+		const syntax = objectSyntax(endNode);
+		let startNode = endNode;
+		if (startNode.leadingComments && startNode.leadingComments.length) {
+			startNode = startNode.leadingComments[0];
+		}
 		return {
-			root,
-			startIndex,
-			endIndex,
-			syntax: objectSyntax,
+			startIndex: startNode.start,
+			endIndex: endNode.end,
+			skipConvert: true,
+			content: source,
+			syntax,
 			lang: "object-literal",
 		};
 	});
 
-	let styledSyntax;
+	let templateSyntax;
 
-	function getStyledSyntax () {
-		if (!styledSyntax) {
-			const getSyntax = require("postcss-syntax/lib/get-syntax");
+	function getTemplateSyntax () {
+		if (!templateSyntax) {
+			const getSyntax = require("postcss-syntax/get-syntax");
 			const cssSyntax = getSyntax("css", opts);
-			styledSyntax = {
-				parse: require(cssSyntax.parse.name === "safeParse" ? "./template-safe-parse" : "./template-parse"),
+			templateSyntax = {
+				parse: require("postcss-styled/template-" + (cssSyntax.parse.name === "safeParse" ? "safe-parse" : "parse")),
 				stringify: cssSyntax.stringify,
 			};
 		}
-		return styledSyntax;
+		return templateSyntax;
 	}
 
 	tpls = tpls.filter(path => (
@@ -165,28 +170,28 @@ function literalParser (source, opts) {
 		))
 	)).map(path => {
 		const quasis = path.node.quasis;
-		const startIndex = quasis[0].start;
-		const strSource = source.slice(startIndex, quasis[quasis.length - 1].end);
+		const value = getTemplate(path.node, source);
 
-		if (!strSource.trim()) {
+		if (value.length === 1 && !value[0].trim()) {
 			return;
 		}
 
 		const style = {
-			startIndex: startIndex,
-			content: strSource,
+			startIndex: quasis[0].start,
+			endIndex: quasis[quasis.length - 1].end,
+			content: value.join(""),
 			ignoreErrors: true,
 		};
-		if (/(^|\s|\{|\}|;|:)\$\{/m.test(strSource)) {
-			style.syntax = getStyledSyntax();
+		if (value.length > 1) {
+			style.syntax = getTemplateSyntax();
 			style.lang = "template-literal";
 		} else {
 			style.lang = "css";
 		}
 		return style;
 	}).filter(Boolean);
 
-	return objects.concat(tpls);
+	return (styles || []).concat(objects).concat(tpls);
 };
 
 module.exports = literalParser;

camel-case.js

@@ -0,0 +1,15 @@
+"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;
+}
+module.exports = getTemplate;

lib/extract.js extract.jslib/extract.js renamed to extract.js

@@ -1,5 +1,5 @@
 "use strict";
 const extract = require("./extract");
-const syntax = require("postcss-syntax/lib/syntax")(extract);
+const syntax = require("postcss-syntax/syntax")(extract);
 
 module.exports = syntax;