support more extensions and js source type

Author: gucong3000

get-lang.js

@@ -1,35 +1,40 @@
 "use strict";
 
-// https://github.com/Microsoft/vscode/blob/master/extensions/markdown-basics/package.json
-// https://github.com/Microsoft/vscode/blob/master/extensions/html/package.json
-// https://github.com/Microsoft/vscode/blob/master/extensions/javascript/package.json
-// https://github.com/Microsoft/vscode/blob/master/extensions/typescript-basics/package.json
-// https://github.com/Microsoft/vscode/blob/master/extensions/xml/package.json
-// https://github.com/Microsoft/vscode/blob/master/extensions/css/package.json
-// https://github.com/Microsoft/vscode/blob/master/extensions/less/package.json
-// https://github.com/vuejs/vetur/blob/master/package.json
-
 const languages = {
 	sass: /^sass$/i,
+	// https://github.com/Microsoft/vscode/blob/master/extensions/scss/package.json
 	scss: /^scss$/i,
+	// https://github.com/Microsoft/vscode/blob/master/extensions/less/package.json
 	less: /^less$/i,
+	// https://github.com/MhMadHamster/vscode-postcss-language/blob/master/package.json
 	sugarss: /^s(?:ugar)?ss$/i,
+	// https://github.com/d4rkr00t/language-stylus/blob/master/package.json
 	stylus: /^styl(?:us)?$/i,
-	// WXSS(WeiXin Style Sheets) See: https://developers.weixin.qq.com/miniprogram/dev/framework/view/wxss.html
-	// acss(AntFinancial Style Sheet) See: https://docs.alipay.com/mini/framework/acss
+	// WXSS(WeiXin Style Sheets)		See: https://developers.weixin.qq.com/miniprogram/dev/framework/view/wxss.html
+	// acss(AntFinancial Style Sheet)	See: https://docs.alipay.com/mini/framework/acss
 	// `*.pcss`, `*.postcss`
+	// https://github.com/Microsoft/vscode/blob/master/extensions/css/package.json
+	// https://github.com/rcsole/postcss-syntax/blob/master/package.json
 	css: /^(?:wx|\w*c)ss$/i,
 };
 
 const extracts = {
-	jsx: /^(?:m?[jt]sx?|es\d*|pac)$/i,
+	// https://github.com/Microsoft/vscode/blob/master/extensions/javascript/package.json
+	// https://github.com/Microsoft/vscode/blob/master/extensions/typescript-basics/package.json
+	// https://github.com/michaelgmcd/vscode-language-babel/blob/master/package.json
+	jsx: /^(?:m?[jt]sx?|es\d*|pac|babel|flow)$/i,
+	// *.*html?	HTML		https://github.com/Microsoft/vscode/blob/master/extensions/html/package.json
 	// *.xslt?	XSLT		https://msdn.microsoft.com/en-us/library/ms764661(v=vs.85).aspx
 	// *.vue	VUE 		https://vue-loader.vuejs.org/spec.html
-	// *.ux		quickapp	https://doc.quickapp.cn/framework/source-file.html
 	// *.wpy	WePY		https://github.com/Tencent/wepy/blob/master/docs/md/doc.md#wpy文件说明
-	html: /^(?:\w*html?|xht|mdoc|jsp|aspx?|volt|ejs|php|vue|ux|wpy)$/i,
+	// *.ux		quickapp	https://doc.quickapp.cn/framework/source-file.html
+	// *.php*	PHP			https://github.com/Microsoft/vscode/blob/master/extensions/php/package.json
+	// *.twig	Twig		https://github.com/mblode/vscode-twig-language/blob/master/package.json
+	// *.liquid	Liquid		https://github.com/GingerBear/vscode-liquid/blob/master/package.json
+	html: /^(?:\w*html?|xht|xslt?|mdoc|jsp|aspx?|volt|ejs|vue|wpy|ux|php\d*|ctp|twig|liquid)$/i,
+	// https://github.com/Microsoft/vscode/blob/master/extensions/markdown-basics/package.json
 	markdown: /^(?:m(?:ark)?d(?:ow)?n|mk?d)$/i,
-	xsl: /^xslt?$/i,
+	// https://github.com/Microsoft/vscode/blob/master/extensions/xml/package.json
 	xml: /^(?:xml|xsd|ascx|atom|axml|bpmn|config|cpt|csl|csproj|csproj|user|dita|ditamap|dtd|dtml|fsproj|fxml|iml|isml|jmx|launch|menu|mxml|nuspec|opml|owl|proj|props|pt|publishsettings|pubxml|pubxml|user|rdf|rng|rss|shproj|storyboard|svg|targets|tld|tmx|vbproj|vbproj|user|vcxproj|vcxproj|filters|wsdl|wxi|wxl|wxs|xaml|xbl|xib|xlf|xliff|xpdl|xul|xoml)$/i,
 };
 
@@ -39,21 +44,28 @@ function sourceType (source) {
 		return;
 	}
 	let extract;
-	if ((/^#!([^\r\n]+)/.test(source) && /(?:^|\s+)(?:ts-)?node(?:\.\w+)?(?:\s+|$)$/.test(RegExp.$1)) || /^("|')use strict\1;*\s*(\r?\n|$)/.test(source) || /^import(?:\s+[^;]+\s+from)?\s+("|')[^'"]+?\1;*\s*(\r?\n|$)/.test(source) || /^(?:(?:var|let|const)\s+[^;]+\s*=)?\s*(?:require|import)\(.+\)/.test(source)) {
+	if (
+		// start with strict mode
+		// start with import code
+		// start with require code
+		/^(?:(?:\/\/[^\r\n]*\r?\n|\/\*.*?\*\/)\s*)*(?:(?:("|')use strict\1|import(?:\s+[^;]+\s+from)?\s+("|')[^'"]+?\2)\s*(;|\r?\n|$)|(?:(?:var|let|const)\s+[^;]+\s*=\s*)?(?:require|import)\(.+\))/.test(source) ||
 		// https://en.wikipedia.org/wiki/Shebang_(Unix)
-		// or start with strict mode
-		// or start with import code
+		(/^#!([^\r\n]+)/.test(source) && /(?:^|\s+|\/)(?:ts-)?node(?:\.\w+)?(?:\s+|$)$/.test(RegExp.$1))
+	) {
 		extract = "jsx";
-	} else if (/^<(?:!DOCTYPE\s+)?html(\s+[^<>]*)?>/i.test(source)) {
+	} else if (
+		/^(?:<\?.*?\?>\s*)*<(?:!DOCTYPE\s+)?html(\s+[^<>]*)?>/i.test(source) ||
+		/^<\?php(?:\s+[\s\S]*)?(?:\?>|$)/.test(source)
+	) {
 		extract = "html";
 	} else if (/^<\?xml(\s+[^<>]*)?\?>/i.test(source)) {
 		// https://msdn.microsoft.com/en-us/library/ms764661(v=vs.85).aspx
 		if (/<xsl:\w+\b[^<>]*>/.test(source) || /<\/xsl:\w+>/i.test(source)) {
-			extract = "xsl";
+			extract = "html";
 		} else {
 			extract = "xml";
 		}
-	} else if (/^#+\s+\S+/.test(source) || /^\S+[^\r\n]*\r?\n=+(\r?\n|$)/.test(source)) {
+	} else if (/^(?:#+\s+\S+|\S+[^\r\n]*\r?\n=+(\r?\n|$))/.test(source)) {
 		extract = "markdown";
 	} else if (/<(\w+)(?:\s+[^<>]*)?>[\s\S]*?<\/\1>/.test(source)) {
 		extract = "html";
@@ -92,8 +104,8 @@ function fileType (file) {
 }
 
 function getLang (opts, source) {
-	const file = opts.from;
-	const rules = opts.syntax.config.rules;
+	const file = opts.from || opts;
+	const rules = opts.syntax && opts.syntax.config && opts.syntax.config.rules;
 	return (rules && rules.find(
 		rule => rule.test.test ? rule.test.test(file) : rule.test(file, source)
 	)) || fileType(file) || sourceType(source) || {

index.js

@@ -7,7 +7,6 @@ const defaultConfig = {
 	stylus: "css",
 	babel: "jsx",
 	xml: "html",
-	xsl: "html",
 };
 
 try {

normal-opts.js

@@ -0,0 +1,11 @@
+"use strict";
+
+function normalOpts (opts, syntax) {
+	if (!opts) {
+		opts = {};
+	}
+	opts.syntax = syntax;
+	return opts;
+}
+
+module.exports = normalOpts;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-syntax",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "description": "Automatically switch PostCSS syntax by file extensions",
   "repository": {
     "type": "git",
@@ -30,6 +30,54 @@
   "scripts": {
     "test": "nyc mocha --require ./test/fixtures/link --no-timeouts"
   },
+  "extensions": [
+    ".css",
+    ".pcss",
+    ".postcss",
+    ".acss",
+    ".wxss",
+    ".sass",
+    ".scss",
+    ".less",
+    ".sss",
+    ".js",
+    ".es6",
+    ".mjs",
+    ".pac",
+    ".jsx",
+    ".ts",
+    ".tsx",
+    ".babel",
+    ".flow",
+    ".html",
+    ".htm",
+    ".shtml",
+    ".xhtml",
+    ".mdoc",
+    ".jsp",
+    ".asp",
+    ".aspx",
+    ".jshtm",
+    ".volt",
+    ".ejs",
+    ".rhtml",
+    ".xsl",
+    ".xslt",
+    ".vue",
+    ".wpy",
+    ".ux",
+    ".php",
+    ".php4",
+    ".php5",
+    ".phtml",
+    ".ctp",
+    ".twig",
+    ".liquid",
+    ".md",
+    ".mdown",
+    ".markdown",
+    ".markdn"
+  ],
   "peerDependencies": {
     "postcss": ">=5.0.0"
   },
@@ -38,13 +86,13 @@
     "codecov": "^3.0.2",
     "mocha": "^5.2.0",
     "nyc": "^12.0.2",
-    "postcss": "^6.0.22",
-    "postcss-html": ">=0.30.0",
-    "postcss-jsx": ">=0.30.0",
+    "postcss": "^6.0.23",
+    "postcss-html": ">=0.31.0",
+    "postcss-jsx": ">=0.31.0",
     "postcss-less": "^2.0.0",
-    "postcss-markdown": ">=0.30.0",
+    "postcss-markdown": ">=0.31.0",
     "postcss-safe-parser": "^3.0.1",
-    "postcss-scss": "^1.0.5",
+    "postcss-scss": "^1.0.6",
     "proxyquire": "^2.0.1",
     "sugarss": "^1.0.1"
   }

parse.js

@@ -3,16 +3,11 @@
 const parser = require("./parser");
 const processor = require("./processor");
 const getLang = require("./get-lang");
+const normalOpts = require("./normal-opts");
 
 function parse (source, opts) {
-	if (!opts) {
-		opts = {};
-	}
-	if (!opts.syntax) {
-		opts.syntax = this;
-	}
-
 	source = source.toString();
+	opts = normalOpts(opts, this);
 	const syntax = getLang(opts, source);
 	const syntaxOpts = Object.assign({}, opts, syntax.opts);
 	let root;

syntax.js

@@ -1,23 +1,18 @@
 "use strict";
 const stringify = require("./stringify");
 const parseStyle = require("./parse-style");
+const normalOpts = require("./normal-opts");
 
 module.exports = (extract, lang) => {
 	const defaultConfig = {
 		postcss: "css",
 		stylus: "css",
 		babel: "jsx",
 		xml: "html",
-		xsl: "html",
 	};
 	function parse (source, opts) {
 		source = source.toString();
-		if (!opts) {
-			opts = {};
-		}
-		if (!opts.syntax) {
-			opts.syntax = this;
-		}
+		opts = normalOpts(opts, this);
 		const document = parseStyle(source, opts, extract(source, opts));
 		document.source.lang = lang;
 		return document;

test/custom.js

@@ -1,11 +1,13 @@
 "use strict";
 const expect = require("chai").expect;
 const Module = require("module");
-const _findPath = Module._findPath;
+let _findPath;
 let syntax;
 
 describe("custom language", () => {
 	before(() => {
+		_findPath = Module._findPath;
+
 		Module._findPath = (request, paths, isMain) => {
 			if (request === "postcss-jsx") {
 				return null;
@@ -16,9 +18,11 @@ describe("custom language", () => {
 		delete require.cache[require.resolve("../")];
 		syntax = require("../");
 	});
+
 	after(() => {
-		Module._findPath = Module._findPath;
+		Module._findPath = _findPath;
 	});
+
 	it("custom.postcss", () => {
 		const code = "a { display: block; }";
 		const document = syntax({