Skip to content

Minor tweaks #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
XhmikosR wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Minor tweaks #330

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e1a44a
index: make references a const
XhmikosR May 25, 2026
bdbd381
index: use optional chaining
XhmikosR May 25, 2026
6c5c4f5
index: avoid object literal as default for options
XhmikosR May 25, 2026
5af9b0d
index: simplify url filtering
XhmikosR May 25, 2026
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
13 changes: 7 additions & 6 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ export interface Options {
url?: boolean;
}

function detective(src: string, options: Options = { url: false }): string[] {
let references: string[] = [];
function detective(src: string, options: Options = {}): string[] {
let root: Root;

try {
Expand All @@ -30,6 +29,8 @@ function detective(src: string, options: Options = { url: false }): string[] {
throw new MalformedCssError();
}

const references: string[] = [];

root.walkAtRules((rule) => {
let file = null;

Expand Down Expand Up @@ -74,7 +75,7 @@ function detective(src: string, options: Options = { url: false }): string[] {
const files = nodes
.filter((node) => isUrlNode(node))
.map((node) => getValueOrUrl(node))
.filter((file): file is string => Boolean(file));
.filter(Boolean) as string[];

for (const file of files) {
debug('found %s of %s', 'url() in declaration', file);
Expand All @@ -86,19 +87,19 @@ function detective(src: string, options: Options = { url: false }): string[] {
return references;
}

function getValueOrUrl(node: ChildNode): string | false {
function getValueOrUrl(node: ChildNode): string | undefined {
const ret = isUrlNode(node) ? getUrlContent(node) : getValue(node);

// is-url-superb uses new URL() which doesn't accept protocol-relative URLs;
// prepend http: so they get correctly identified and filtered out
return !isUrl(ret.startsWith('//') ? `http:${ret}` : ret) && ret;
return isUrl(ret.startsWith('//') ? `http:${ret}` : ret) ? undefined : ret;
}

function getUrlContent(urlNode: Func): string {
const first = urlNode.nodes[0];

// Quoted: url('foo.css') or url("foo.css")
if (first && first.type === 'quoted') {
if (first?.type === 'quoted') {
return first.contents;
}

Expand Down