@knighted/css 1.0.0-rc.8 → 1.0.0

package/dist/cjs/generateTypes.d.cts

@@ -1,54 +1,103 @@
-import { type SelectorTypeVariant } from './loaderInternals.cjs';
-interface DeclarationRecord {
+import { createRequire } from 'node:module';
+import { moduleType } from 'node-module-type';
+import { getTsconfig } from 'get-tsconfig';
+import { type MatchPath } from 'tsconfig-paths';
+import { cssWithMeta } from './css.cjs';
+interface ImportMatch {
     specifier: string;
-    filePath: string;
+    importer: string;
 }
+interface ManifestEntry {
+    file: string;
+    hash: string;
+}
+type SelectorModuleManifest = Record<string, ManifestEntry>;
+interface TsconfigResolutionContext {
+    absoluteBaseUrl?: string;
+    matchPath?: MatchPath;
+}
+type CssWithMetaFn = typeof cssWithMeta;
 export interface GenerateTypesResult {
-    written: number;
-    removed: number;
-    declarations: DeclarationRecord[];
+    selectorModulesWritten: number;
+    selectorModulesRemoved: number;
     warnings: string[];
-    outDir: string;
-    typesIndexPath: string;
+    manifestPath: string;
 }
 export interface GenerateTypesOptions {
     rootDir?: string;
     include?: string[];
     outDir?: string;
-    typesRoot?: string;
     stableNamespace?: string;
 }
+type ModuleTypeDetector = () => ReturnType<typeof moduleType>;
+declare function resolvePackageRoot(): string;
 export declare function generateTypes(options?: GenerateTypesOptions): Promise<GenerateTypesResult>;
 declare function normalizeIncludeOptions(include: string[] | undefined, rootDir: string): string[];
+declare function collectCandidateFiles(entries: string[]): Promise<string[]>;
+declare function findSpecifierImports(filePath: string): Promise<ImportMatch[]>;
 declare function stripInlineLoader(specifier: string): string;
 declare function splitResourceAndQuery(specifier: string): {
     resource: string;
     query: string;
 };
-declare function buildDeclarationFileName(specifier: string): string;
-declare function formatModuleDeclaration(specifier: string, variant: SelectorTypeVariant, selectors: Map<string, string>): string;
-declare function formatSelectorType(selectors: Map<string, string>): string;
+declare function extractSelectorSourceSpecifier(specifier: string): string | undefined;
+declare function resolveImportPath(resourceSpecifier: string, importerPath: string, rootDir: string, tsconfig?: TsconfigResolutionContext): Promise<string | undefined>;
+declare function buildSelectorModuleManifestKey(resolvedPath: string): string;
+declare function buildSelectorModulePath(resolvedPath: string): string;
+declare function formatSelectorModuleSource(selectors: Map<string, string>): string;
+declare function readManifest(manifestPath: string): Promise<SelectorModuleManifest>;
+declare function writeManifest(manifestPath: string, manifest: SelectorModuleManifest): Promise<void>;
+declare function removeStaleSelectorModules(previous: SelectorModuleManifest, next: SelectorModuleManifest): Promise<number>;
+declare function relativeToRoot(filePath: string, rootDir: string): string;
+declare function ensureSelectorModule(resolvedPath: string, selectors: Map<string, string>, previousManifest: SelectorModuleManifest, nextManifest: SelectorModuleManifest): Promise<boolean>;
+declare function resolveWithTsconfigPaths(specifier: string, tsconfig?: TsconfigResolutionContext): Promise<string | undefined>;
+declare function loadTsconfigResolutionContext(rootDir: string, loader?: typeof getTsconfig): TsconfigResolutionContext | undefined;
+declare function normalizeTsconfigPaths(paths: Record<string, string[] | string> | undefined): Record<string, string[]> | undefined;
+declare function isNonRelativeSpecifier(specifier: string): boolean;
+declare function createProjectPeerResolver(rootDir: string): (name: string) => Promise<any>;
+declare function getProjectRequire(rootDir: string): ReturnType<typeof createRequire>;
 export declare function runGenerateTypesCli(argv?: string[]): Promise<void>;
 export interface ParsedCliArgs {
     rootDir: string;
     include?: string[];
     outDir?: string;
-    typesRoot?: string;
     stableNamespace?: string;
     help?: boolean;
 }
 declare function parseCliArgs(argv: string[]): ParsedCliArgs;
 declare function printHelp(): void;
 declare function reportCliResult(result: GenerateTypesResult): void;
+declare function setCssWithMetaImplementation(impl?: CssWithMetaFn): void;
+declare function setModuleTypeDetector(detector?: ModuleTypeDetector): void;
+declare function setImportMetaUrlProvider(provider?: () => string | undefined): void;
 export declare const __generateTypesInternals: {
     stripInlineLoader: typeof stripInlineLoader;
     splitResourceAndQuery: typeof splitResourceAndQuery;
-    buildDeclarationFileName: typeof buildDeclarationFileName;
-    formatModuleDeclaration: typeof formatModuleDeclaration;
-    formatSelectorType: typeof formatSelectorType;
+    extractSelectorSourceSpecifier: typeof extractSelectorSourceSpecifier;
+    findSpecifierImports: typeof findSpecifierImports;
+    resolveImportPath: typeof resolveImportPath;
+    resolvePackageRoot: typeof resolvePackageRoot;
+    relativeToRoot: typeof relativeToRoot;
+    collectCandidateFiles: typeof collectCandidateFiles;
     normalizeIncludeOptions: typeof normalizeIncludeOptions;
+    normalizeTsconfigPaths: typeof normalizeTsconfigPaths;
+    setCssWithMetaImplementation: typeof setCssWithMetaImplementation;
+    setModuleTypeDetector: typeof setModuleTypeDetector;
+    setImportMetaUrlProvider: typeof setImportMetaUrlProvider;
+    isNonRelativeSpecifier: typeof isNonRelativeSpecifier;
+    createProjectPeerResolver: typeof createProjectPeerResolver;
+    getProjectRequire: typeof getProjectRequire;
+    loadTsconfigResolutionContext: typeof loadTsconfigResolutionContext;
+    resolveWithTsconfigPaths: typeof resolveWithTsconfigPaths;
     parseCliArgs: typeof parseCliArgs;
     printHelp: typeof printHelp;
     reportCliResult: typeof reportCliResult;
+    buildSelectorModuleManifestKey: typeof buildSelectorModuleManifestKey;
+    buildSelectorModulePath: typeof buildSelectorModulePath;
+    formatSelectorModuleSource: typeof formatSelectorModuleSource;
+    ensureSelectorModule: typeof ensureSelectorModule;
+    removeStaleSelectorModules: typeof removeStaleSelectorModules;
+    readManifest: typeof readManifest;
+    writeManifest: typeof writeManifest;
 };
 export {};

package/dist/cjs/loader-helpers.cjs

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.asKnightedCssCombinedModule = asKnightedCssCombinedModule;
+function asKnightedCssCombinedModule(module) {
+    return module;
+}

package/dist/cjs/loader-helpers.d.cts

@@ -0,0 +1,4 @@
+import type { KnightedCssCombinedModule } from './loader.cjs';
+type KnightedCssCombinedExtras = Readonly<Record<string, unknown>>;
+export declare function asKnightedCssCombinedModule<TModule, TExtras extends KnightedCssCombinedExtras = Record<never, never>>(module: unknown): KnightedCssCombinedModule<TModule, TExtras>;
+export {};

package/dist/cjs/loader.cjs

@@ -18,6 +18,7 @@ const loader = async function loader(source) {
             namespace: resolvedNamespace,
             resourcePath: this.resourcePath,
             emitWarning: message => emitKnightedWarning(this, message),
+            target: 'js',
         })
         : undefined;
     const injection = buildInjection(css, {
@@ -80,6 +81,7 @@ const pitch = function pitch() {
                 namespace: resolvedNamespace,
                 resourcePath: this.resourcePath,
                 emitWarning: message => emitKnightedWarning(this, message),
+                target: 'js',
             })
             : undefined;
         return createCombinedModule(request, css, {

package/dist/cjs/loader.d.cts

@@ -1,6 +1,7 @@
 import type { LoaderDefinitionFunction, PitchLoaderDefinitionFunction } from 'webpack';
 import { type CssOptions } from './css.cjs';
-export type KnightedCssCombinedModule<TModule> = TModule & {
+type KnightedCssCombinedExtras = Readonly<Record<string, unknown>>;
+export type KnightedCssCombinedModule<TModule, TExtras extends KnightedCssCombinedExtras = Record<never, never>> = TModule & TExtras & {
     knightedCss: string;
 };
 export interface KnightedCssVanillaOptions {

package/dist/cjs/moduleGraph.cjs

@@ -0,0 +1,432 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.collectStyleImports = collectStyleImports;
+const node_path_1 = __importDefault(require("node:path"));
+const node_module_1 = require("node:module");
+const node_fs_1 = require("node:fs");
+const node_url_1 = require("node:url");
+const oxc_parser_1 = require("oxc-parser");
+const oxc_resolver_1 = require("oxc-resolver");
+const tsconfig_paths_1 = require("tsconfig-paths");
+const get_tsconfig_1 = require("get-tsconfig");
+const SCRIPT_EXTENSIONS = ['.ts', '.tsx', '.mts', '.cts', '.js', '.jsx', '.mjs', '.cjs'];
+const BUILTIN_SPECIFIERS = new Set([
+    ...node_module_1.builtinModules,
+    ...node_module_1.builtinModules.map(mod => `node:${mod}`),
+]);
+const tsconfigResultCache = new Map();
+const tsconfigFsCache = new Map();
+async function collectStyleImports(entryPath, options) {
+    const { cwd, styleExtensions, filter, resolver, graphOptions } = options;
+    const normalizedStyles = normalizeExtensions(styleExtensions);
+    const scriptExtensions = normalizeExtensions([
+        ...SCRIPT_EXTENSIONS,
+        ...(graphOptions?.extensions ?? []),
+    ]);
+    const resolutionExtensions = dedupeExtensions([
+        ...scriptExtensions,
+        ...normalizedStyles,
+    ]);
+    const tsconfigMatcher = createTsconfigMatcher(graphOptions?.tsConfig, cwd, resolutionExtensions);
+    const seenScripts = new Set();
+    const seenStyles = new Set();
+    const styleOrder = [];
+    const resolutionCache = new Map();
+    const resolverFactory = createResolverFactory(cwd, resolutionExtensions, scriptExtensions, graphOptions);
+    async function walk(filePath) {
+        const absolutePath = node_path_1.default.resolve(filePath);
+        if (seenScripts.has(absolutePath)) {
+            return;
+        }
+        seenScripts.add(absolutePath);
+        const source = await readSourceFile(absolutePath);
+        if (!source) {
+            return;
+        }
+        const specifiers = extractModuleSpecifiers(source, absolutePath);
+        for (const specifier of specifiers) {
+            if (!specifier || isBuiltinSpecifier(specifier)) {
+                continue;
+            }
+            const resolved = await resolveImport(specifier, absolutePath);
+            if (!resolved) {
+                continue;
+            }
+            const normalized = node_path_1.default.resolve(resolved);
+            if (!filter(normalized)) {
+                continue;
+            }
+            if (isStyleExtension(normalized, normalizedStyles)) {
+                if (!seenStyles.has(normalized)) {
+                    seenStyles.add(normalized);
+                    styleOrder.push(normalized);
+                }
+                continue;
+            }
+            if (isScriptExtension(normalized, scriptExtensions)) {
+                await walk(normalized);
+            }
+        }
+    }
+    async function resolveImport(specifier, importer) {
+        const cacheKey = `${importer}::${specifier}`;
+        if (resolutionCache.has(cacheKey)) {
+            return resolutionCache.get(cacheKey);
+        }
+        let resolved;
+        if (resolver) {
+            resolved = normalizeResolverResult(await resolver(specifier, { cwd, from: importer }), cwd);
+        }
+        if (!resolved && tsconfigMatcher) {
+            resolved = tsconfigMatcher(specifier);
+        }
+        if (!resolved) {
+            resolved = resolveWithFactory(resolverFactory, specifier, importer, resolutionExtensions);
+        }
+        resolutionCache.set(cacheKey, resolved);
+        return resolved;
+    }
+    await walk(entryPath);
+    return styleOrder;
+}
+function normalizeExtensions(extensions) {
+    const result = new Set();
+    for (const ext of extensions) {
+        if (!ext)
+            continue;
+        const normalized = ext.startsWith('.') ? ext.toLowerCase() : `.${ext.toLowerCase()}`;
+        result.add(normalized);
+    }
+    return Array.from(result);
+}
+function dedupeExtensions(extensions) {
+    const result = new Set();
+    for (const ext of extensions) {
+        result.add(ext);
+    }
+    return Array.from(result);
+}
+function isBuiltinSpecifier(specifier) {
+    if (BUILTIN_SPECIFIERS.has(specifier)) {
+        return true;
+    }
+    if (specifier.startsWith('node:')) {
+        return true;
+    }
+    return false;
+}
+function isStyleExtension(filePath, extensions) {
+    const lower = filePath.toLowerCase();
+    return extensions.some(ext => lower.endsWith(ext));
+}
+function isScriptExtension(filePath, extensions) {
+    const ext = node_path_1.default.extname(filePath).toLowerCase();
+    return extensions.includes(ext);
+}
+async function readSourceFile(filePath) {
+    try {
+        return await node_fs_1.promises.readFile(filePath, 'utf8');
+    }
+    catch {
+        return undefined;
+    }
+}
+function extractModuleSpecifiers(sourceText, filePath) {
+    let program;
+    try {
+        ;
+        ({ program } = (0, oxc_parser_1.parseSync)(filePath, sourceText, { sourceType: 'unambiguous' }));
+    }
+    catch {
+        return [];
+    }
+    const specifiers = [];
+    const addSpecifier = (raw) => {
+        if (!raw) {
+            return;
+        }
+        const normalized = normalizeSpecifier(raw);
+        if (normalized) {
+            specifiers.push(normalized);
+        }
+    };
+    const visitor = new oxc_parser_1.Visitor({
+        ImportDeclaration(node) {
+            addSpecifier(node.source?.value);
+        },
+        ExportNamedDeclaration(node) {
+            if (node.source) {
+                addSpecifier(node.source.value);
+            }
+        },
+        ExportAllDeclaration(node) {
+            addSpecifier(node.source?.value);
+        },
+        TSImportEqualsDeclaration(node) {
+            const specifier = extractImportEqualsSpecifier(node);
+            if (specifier) {
+                addSpecifier(specifier);
+            }
+        },
+        ImportExpression(node) {
+            const specifier = getStringFromExpression(node.source);
+            if (specifier) {
+                addSpecifier(specifier);
+            }
+        },
+        CallExpression(node) {
+            if (!isRequireLikeCallee(node.callee)) {
+                return;
+            }
+            const specifier = getStringFromArgument(node.arguments[0]);
+            if (specifier) {
+                addSpecifier(specifier);
+            }
+        },
+    });
+    visitor.visit(program);
+    return specifiers;
+}
+function normalizeSpecifier(raw) {
+    if (!raw)
+        return '';
+    const trimmed = raw.trim();
+    if (!trimmed || trimmed.startsWith('\0')) {
+        return '';
+    }
+    const querySearchOffset = trimmed.startsWith('#') ? 1 : 0;
+    const remainder = trimmed.slice(querySearchOffset);
+    const queryMatchIndex = remainder.search(/[?#]/);
+    const queryIndex = queryMatchIndex === -1 ? -1 : querySearchOffset + queryMatchIndex;
+    const withoutQuery = queryIndex === -1 ? trimmed : trimmed.slice(0, queryIndex);
+    if (!withoutQuery) {
+        return '';
+    }
+    if (/^[a-z][\w+.-]*:/i.test(withoutQuery) && !withoutQuery.startsWith('file:')) {
+        return '';
+    }
+    return withoutQuery;
+}
+function extractImportEqualsSpecifier(node) {
+    if (node.moduleReference.type === 'TSExternalModuleReference') {
+        return node.moduleReference.expression.value;
+    }
+    return undefined;
+}
+function getStringFromArgument(argument) {
+    if (!argument || argument.type === 'SpreadElement') {
+        return undefined;
+    }
+    return getStringFromExpression(argument);
+}
+function getStringFromExpression(expression) {
+    if (!expression) {
+        return undefined;
+    }
+    if (expression.type === 'Literal') {
+        const literalValue = expression.value;
+        return typeof literalValue === 'string' ? literalValue : undefined;
+    }
+    if (expression.type === 'TemplateLiteral' && expression.expressions.length === 0) {
+        const [first] = expression.quasis;
+        return first?.value.cooked ?? first?.value.raw ?? undefined;
+    }
+    return undefined;
+}
+function isRequireLikeCallee(expression) {
+    const target = unwrapExpression(expression);
+    if (target.type === 'Identifier') {
+        return target.name === 'require';
+    }
+    if (target.type === 'MemberExpression') {
+        const object = target.object;
+        if (object.type === 'Identifier') {
+            return object.name === 'require';
+        }
+    }
+    return false;
+}
+function unwrapExpression(expression) {
+    if (expression.type === 'ChainExpression') {
+        const inner = expression.expression;
+        if (inner.type === 'CallExpression') {
+            return unwrapExpression(inner.callee);
+        }
+        return unwrapExpression(inner);
+    }
+    if (expression.type === 'TSNonNullExpression') {
+        return unwrapExpression(expression.expression);
+    }
+    return expression;
+}
+function normalizeResolverResult(result, cwd) {
+    if (!result) {
+        return undefined;
+    }
+    if (result.startsWith('file://')) {
+        try {
+            return (0, node_url_1.fileURLToPath)(new URL(result));
+        }
+        catch {
+            return undefined;
+        }
+    }
+    return node_path_1.default.isAbsolute(result) ? result : node_path_1.default.resolve(cwd, result);
+}
+function resolveWithFactory(factory, specifier, importer, extensions) {
+    if (specifier.startsWith('file://')) {
+        try {
+            return findExistingFile((0, node_url_1.fileURLToPath)(new URL(specifier)), extensions);
+        }
+        catch {
+            return undefined;
+        }
+    }
+    if (/^[a-z][\w+.-]*:/i.test(specifier)) {
+        return undefined;
+    }
+    try {
+        const result = factory.resolveFileSync(importer, specifier);
+        return result?.path;
+    }
+    catch {
+        return undefined;
+    }
+}
+function createResolverFactory(cwd, extensions, scriptExtensions, graphOptions) {
+    const options = {
+        extensions,
+        conditionNames: graphOptions?.conditions,
+    };
+    const extensionAlias = buildExtensionAlias(scriptExtensions);
+    if (extensionAlias) {
+        options.extensionAlias = extensionAlias;
+    }
+    const tsconfigOption = resolveResolverTsconfig(graphOptions?.tsConfig, cwd);
+    options.tsconfig = tsconfigOption ?? 'auto';
+    return new oxc_resolver_1.ResolverFactory(options);
+}
+function buildExtensionAlias(scriptExtensions) {
+    const alias = {};
+    const jsTargets = dedupeExtensions(scriptExtensions.filter(ext => ['.js', '.ts', '.tsx', '.mjs', '.cjs', '.mts', '.cts'].includes(ext)));
+    if (jsTargets.length > 0) {
+        for (const key of ['.js', '.mjs', '.cjs']) {
+            alias[key] = jsTargets;
+        }
+    }
+    const jsxTargets = dedupeExtensions(scriptExtensions.filter(ext => ext === '.jsx' || ext === '.tsx'));
+    if (jsxTargets.length > 0) {
+        alias['.jsx'] = jsxTargets;
+    }
+    return Object.keys(alias).length > 0 ? alias : undefined;
+}
+function resolveResolverTsconfig(input, cwd) {
+    if (!input || typeof input !== 'string') {
+        return undefined;
+    }
+    const resolved = resolveTsconfigPath(input, cwd);
+    if (!resolved) {
+        return undefined;
+    }
+    return { configFile: resolved };
+}
+function createTsconfigMatcher(input, cwd, extensions) {
+    const config = loadTsconfigPaths(input, cwd);
+    if (!config) {
+        return undefined;
+    }
+    const matchPath = (0, tsconfig_paths_1.createMatchPath)(config.absoluteBaseUrl, config.paths);
+    return (specifier) => {
+        const matched = matchPath(specifier, undefined, undefined, extensions);
+        if (!matched) {
+            return undefined;
+        }
+        return findExistingFile(matched, extensions) ?? matched;
+    };
+}
+function loadTsconfigPaths(input, cwd) {
+    if (!input) {
+        return undefined;
+    }
+    if (typeof input === 'string') {
+        const target = node_path_1.default.isAbsolute(input) ? input : node_path_1.default.resolve(cwd, input);
+        const cached = tsconfigResultCache.get(target);
+        if (cached !== undefined) {
+            return cached ?? undefined;
+        }
+        const result = (0, get_tsconfig_1.getTsconfig)(target, undefined, tsconfigFsCache);
+        if (!result) {
+            tsconfigResultCache.set(target, null);
+            return undefined;
+        }
+        const normalized = normalizeTsconfigCompilerOptions(result.config.compilerOptions, node_path_1.default.dirname(result.path));
+        tsconfigResultCache.set(target, normalized ?? null);
+        return normalized;
+    }
+    const compilerOptions = input.compilerOptions;
+    return normalizeTsconfigCompilerOptions(compilerOptions, cwd);
+}
+function normalizeTsconfigCompilerOptions(compilerOptions, configDir) {
+    if (!compilerOptions?.baseUrl || !compilerOptions.paths) {
+        return undefined;
+    }
+    const normalizedPaths = {};
+    for (const [pattern, replacements] of Object.entries(compilerOptions.paths)) {
+        if (!replacements || replacements.length === 0) {
+            continue;
+        }
+        normalizedPaths[pattern] = Array.isArray(replacements)
+            ? [...replacements]
+            : [replacements];
+    }
+    if (Object.keys(normalizedPaths).length === 0) {
+        return undefined;
+    }
+    const absoluteBaseUrl = node_path_1.default.isAbsolute(compilerOptions.baseUrl)
+        ? compilerOptions.baseUrl
+        : node_path_1.default.resolve(configDir, compilerOptions.baseUrl);
+    return { absoluteBaseUrl, paths: normalizedPaths };
+}
+function resolveTsconfigPath(tsconfigPath, cwd) {
+    const absolute = node_path_1.default.isAbsolute(tsconfigPath)
+        ? tsconfigPath
+        : node_path_1.default.resolve(cwd, tsconfigPath);
+    if (!(0, node_fs_1.existsSync)(absolute)) {
+        return undefined;
+    }
+    const stats = (0, node_fs_1.statSync)(absolute);
+    if (stats.isDirectory()) {
+        const candidate = node_path_1.default.join(absolute, 'tsconfig.json');
+        return (0, node_fs_1.existsSync)(candidate) ? candidate : undefined;
+    }
+    return absolute;
+}
+function findExistingFile(candidate, extensions) {
+    const candidateHasExt = hasExtension(candidate);
+    if (candidateHasExt && (0, node_fs_1.existsSync)(candidate)) {
+        return candidate;
+    }
+    if (!candidateHasExt) {
+        for (const ext of extensions) {
+            const withExt = `${candidate}${ext}`;
+            if ((0, node_fs_1.existsSync)(withExt)) {
+                return withExt;
+            }
+        }
+    }
+    if ((0, node_fs_1.existsSync)(candidate) && (0, node_fs_1.statSync)(candidate).isDirectory()) {
+        for (const ext of extensions) {
+            const indexPath = node_path_1.default.join(candidate, `index${ext}`);
+            if ((0, node_fs_1.existsSync)(indexPath)) {
+                return indexPath;
+            }
+        }
+    }
+    return undefined;
+}
+function hasExtension(filePath) {
+    return Boolean(node_path_1.default.extname(filePath));
+}

package/dist/cjs/moduleGraph.d.cts

@@ -0,0 +1,15 @@
+import type { CssResolver } from './types.cjs';
+export interface ModuleGraphOptions {
+    tsConfig?: string | Record<string, unknown>;
+    extensions?: string[];
+    conditions?: string[];
+}
+interface CollectOptions {
+    cwd: string;
+    styleExtensions: string[];
+    filter: (filePath: string) => boolean;
+    resolver?: CssResolver;
+    graphOptions?: ModuleGraphOptions;
+}
+export declare function collectStyleImports(entryPath: string, options: CollectOptions): Promise<string[]>;
+export {};

package/dist/cjs/sassInternals.cjs

@@ -24,8 +24,11 @@ function createSassImporter({ cwd, resolver, }) {
                     console.error('[knighted-css:sass] containing url:', context.containingUrl.href);
                 }
             }
+            const containingPath = context?.containingUrl
+                ? (0, node_url_1.fileURLToPath)(context.containingUrl)
+                : undefined;
             if (shouldNormalizeSpecifier(url)) {
-                const resolvedPath = await resolveAliasSpecifier(url, resolver, cwd);
+                const resolvedPath = await resolveAliasSpecifier(url, resolver, cwd, containingPath);
                 if (!resolvedPath) {
                     if (debug) {
                         console.error('[knighted-css:sass] resolver returned no result for', url);
@@ -61,8 +64,8 @@ function createSassImporter({ cwd, resolver, }) {
         },
     };
 }
-async function resolveAliasSpecifier(specifier, resolver, cwd) {
-    const resolved = await resolver(specifier, { cwd });
+async function resolveAliasSpecifier(specifier, resolver, cwd, from) {
+    const resolved = await resolver(specifier, { cwd, from });
     if (!resolved) {
         return undefined;
     }

package/dist/cjs/sassInternals.d.cts

@@ -1,6 +1,5 @@
-export type CssResolver = (specifier: string, ctx: {
-    cwd: string;
-}) => string | Promise<string | undefined>;
+import type { CssResolver } from './types.cjs';
+export type { CssResolver } from './types.cjs';
 export declare function createSassImporter({ cwd, resolver, }: {
     cwd: string;
     resolver?: CssResolver;
@@ -13,7 +12,7 @@ export declare function createSassImporter({ cwd, resolver, }: {
         syntax: "scss" | "indented";
     }>;
 } | undefined;
-export declare function resolveAliasSpecifier(specifier: string, resolver: CssResolver, cwd: string): Promise<string | undefined>;
+export declare function resolveAliasSpecifier(specifier: string, resolver: CssResolver, cwd: string, from?: string): Promise<string | undefined>;
 export declare function shouldNormalizeSpecifier(specifier: string): boolean;
 export declare function ensureSassPath(filePath: string): string | undefined;
 export declare function resolveRelativeSpecifier(specifier: string, containingUrl?: URL | null): string | undefined;