open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add: expose parseError.index

Browse Source
This commit is contained in:
eight 2017-11-09 15:53:09 +08:00
parent 4d8268bb27
commit d02984ee2a
1 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/usercss.js
View File

@ -105,7 +105,10 @@ var usercss = (() => {
const commentSource = source.slice(m.index, m.index + m[0].length); const commentSource = source.slice(m.index, m.index + m[0].length);
const n = commentSource.match(metaRe); const n = commentSource.match(metaRe);
if (n) { if (n) {
return n[0]; return {
index: m.index + n.index,
text: n[0]
};
} }
} }
} }
@ -189,6 +192,7 @@ var usercss = (() => {
result.default = state.value; result.default = state.value;
} }
state.usercssData.vars[result.name] = result; state.usercssData.vars[result.name] = result;
validVar(result);
} }
function createOption(label, value) { function createOption(label, value) {
@ -352,10 +356,11 @@ var usercss = (() => {
usercssData usercssData
}; };
const text = getMetaSource(sourceCode); const {text, index: metaIndex} = getMetaSource(sourceCode);
const re = /@(\w+)\s+/mg; const re = /@(\w+)\s+/mg;
const state = {style, re, text, usercssData}; const state = {style, re, text, usercssData};
function doParse() {
let match; let match;
while ((match = re.exec(text))) { while ((match = re.exec(text))) {
state.key = match[1]; state.key = match[1];
@ -373,11 +378,25 @@ var usercss = (() => {
} }
if (state.key === 'version') { if (state.key === 'version') {
usercssData[state.key] = normalizeVersion(usercssData[state.key]); usercssData[state.key] = normalizeVersion(usercssData[state.key]);
validVersion(usercssData[state.key]);
} }
if (METAS[state.key]) { if (METAS[state.key]) {
style[state.key] = usercssData[state.key]; style[state.key] = usercssData[state.key];
} }
if (state.key === 'homepageURL' || state.key === 'supportURL') {
validUrl(usercssData[state.key]);
} }
}
}
try {
doParse();
} catch (e) {
// grab additional info
e.index = metaIndex + state.re.lastIndex;
throw e;
}
if (state.maybeUSO && !usercssData.preprocessor) { if (state.maybeUSO && !usercssData.preprocessor) {
usercssData.preprocessor = 'uso'; usercssData.preprocessor = 'uso';
} }
@ -463,7 +482,7 @@ var usercss = (() => {
} }
} }
// validate version // validate version
semverCompare(data.version, '0.0.0'); validVersion(data.version);
// validate URLs // validate URLs
validUrl(data.homepageURL); validUrl(data.homepageURL);
@ -475,6 +494,10 @@ var usercss = (() => {
} }
} }
function validVersion(version) {
semverCompare(version, '0.0.0');
}
function validUrl(url) { function validUrl(url) {
if (!url) { if (!url) {
return; return;