Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { debuglog } from 'util';
import isUrl = require('is-url');
import { parse, AtRule } from 'postcss';
import {
parse as postCssParseValue,
Expand All @@ -10,7 +11,6 @@ import {
Punctuation,
Quoted,
} from 'postcss-values-parser';
import isUrl = require('is-url');

const debug = debuglog('detective-postcss');

Expand All @@ -26,15 +26,15 @@ function detective(src, options: detective.Options = { url: false }) {
root.walkAtRules((rule) => {
let file = null;
if (isImportRule(rule)) {
const firstNode = parseValue(rule.params).first;
const firstNode = postCssParseValue(rule.params).first;
file = getValueOrUrl(firstNode);
if (file) {
debug('found %s of %s', '@import', file);
}
}

if (isValueRule(rule)) {
const lastNode = parseValue(rule.params).last;
const lastNode = postCssParseValue(rule.params).last;
const prevNode = lastNode.prev();

if (prevNode && isFrom(prevNode)) {
Expand All @@ -58,7 +58,7 @@ function detective(src, options: detective.Options = { url: false }) {
if (!options.url) return references;

root.walkDecls((decl) => {
const { nodes } = parseValue(decl.value);
const { nodes } = postCssParseValue(decl.value);
const files = nodes
.filter((node) => isUrlNode(node))
.map((node) => getValueOrUrl(node));
Expand All @@ -75,10 +75,6 @@ function detective(src, options: detective.Options = { url: false }) {
return references;
}

function parseValue(value: string) {
return postCssParseValue(value);
}

function getValueOrUrl(node: ChildNode) {
// ['file']
const ret = isUrlNode(node) ? getValue(node.nodes[0]) : getValue(node);
Expand Down