@knighted/css 1.0.0-rc.10 → 1.0.0-rc.11

package/dist/cjs/generateTypes.cjs

@@ -108,9 +108,6 @@ async function generateDeclarations(options) {
             if (!query || !(0, loaderInternals_js_1.hasQueryFlag)(query, loaderInternals_js_1.TYPES_QUERY_FLAG)) {
                 continue;
             }
-            if (processedSpecifiers.has(cleaned)) {
-                continue;
-            }
             const resolvedNamespace = (0, stableNamespace_js_1.resolveStableNamespace)(options.stableNamespace);
             const resolvedPath = await resolveImportPath(resource, match.importer, options.rootDir, options.tsconfig);
             if (!resolvedPath) {
@@ -138,22 +135,26 @@ async function generateDeclarations(options) {
                 }
                 selectorCache.set(cacheKey, selectorMap);
             }
+            const canonicalSpecifier = buildDeclarationModuleSpecifier(resolvedPath, options.outDir, query);
+            if (processedSpecifiers.has(canonicalSpecifier)) {
+                continue;
+            }
             const variant = (0, loaderInternals_js_1.determineSelectorVariant)(query);
-            const declaration = formatModuleDeclaration(cleaned, variant, selectorMap);
+            const declaration = formatModuleDeclaration(canonicalSpecifier, variant, selectorMap);
             const declarationHash = hashContent(declaration);
-            const fileName = buildDeclarationFileName(cleaned);
+            const fileName = buildDeclarationFileName(canonicalSpecifier);
             const targetPath = node_path_1.default.join(options.outDir, fileName);
-            const previousEntry = previousManifest[cleaned];
+            const previousEntry = previousManifest[canonicalSpecifier];
             const needsWrite = previousEntry?.hash !== declarationHash || !(await fileExists(targetPath));
             if (needsWrite) {
                 await promises_1.default.writeFile(targetPath, declaration, 'utf8');
                 writes += 1;
             }
-            nextManifest[cleaned] = { file: fileName, hash: declarationHash };
+            nextManifest[canonicalSpecifier] = { file: fileName, hash: declarationHash };
             if (needsWrite) {
-                declarations.push({ specifier: cleaned, filePath: targetPath });
+                declarations.push({ specifier: canonicalSpecifier, filePath: targetPath });
             }
-            processedSpecifiers.add(cleaned);
+            processedSpecifiers.add(canonicalSpecifier);
         }
     }
     const removed = await removeStaleDeclarations(previousManifest, nextManifest, options.outDir);
@@ -325,6 +326,50 @@ function formatSelectorType(selectors) {
 ${lines.join('\n')}
   }>`;
 }
+function buildDeclarationModuleSpecifier(resolvedPath, declarationDir, query) {
+    const relativePath = node_path_1.default.relative(declarationDir, resolvedPath);
+    const normalizedPath = normalizeRelativePath(relativePath);
+    const canonicalQuery = buildCanonicalQuery(query);
+    return `${normalizedPath}${canonicalQuery}`;
+}
+function normalizeRelativePath(relativePath) {
+    let normalized = relativePath.split(node_path_1.default.sep).join('/');
+    if (!normalized || normalized === '') {
+        normalized = '.';
+    }
+    if (normalized === '.') {
+        return './';
+    }
+    if (normalized.startsWith('./') || normalized.startsWith('../')) {
+        return normalized;
+    }
+    if (normalized.startsWith('.')) {
+        return normalized;
+    }
+    return `./${normalized}`;
+}
+function buildCanonicalQuery(query) {
+    if (!query) {
+        return '';
+    }
+    const sanitized = (0, loaderInternals_js_1.buildSanitizedQuery)(query);
+    const extraParts = sanitized ? sanitized.slice(1).split('&').filter(Boolean) : [];
+    const parts = [];
+    parts.push('knighted-css');
+    if ((0, loaderInternals_js_1.hasQueryFlag)(query, loaderInternals_js_1.COMBINED_QUERY_FLAG)) {
+        parts.push(loaderInternals_js_1.COMBINED_QUERY_FLAG);
+    }
+    for (const flag of loaderInternals_js_1.NAMED_ONLY_QUERY_FLAGS) {
+        if ((0, loaderInternals_js_1.hasQueryFlag)(query, flag)) {
+            parts.push(flag);
+        }
+    }
+    if ((0, loaderInternals_js_1.hasQueryFlag)(query, loaderInternals_js_1.TYPES_QUERY_FLAG)) {
+        parts.push(loaderInternals_js_1.TYPES_QUERY_FLAG);
+    }
+    const merged = [...parts, ...extraParts];
+    return merged.length > 0 ? `?${merged.join('&')}` : '';
+}
 function hashContent(content) {
     return node_crypto_1.default.createHash('sha1').update(content).digest('hex');
 }
@@ -618,6 +663,8 @@ exports.__generateTypesInternals = {
     buildDeclarationFileName,
     formatModuleDeclaration,
     formatSelectorType,
+    buildDeclarationModuleSpecifier,
+    buildCanonicalQuery,
     relativeToRoot,
     collectCandidateFiles,
     normalizeIncludeOptions,

package/dist/cjs/generateTypes.d.cts

@@ -52,6 +52,8 @@ declare function resolveImportPath(resourceSpecifier: string, importerPath: stri
 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 buildDeclarationModuleSpecifier(resolvedPath: string, declarationDir: string, query: string): string;
+declare function buildCanonicalQuery(query: string): string;
 declare function writeTypesIndex(indexPath: string, manifest: Manifest, outDir: string): Promise<void>;
 declare function relativeToRoot(filePath: string, rootDir: string): string;
 declare function resolveWithTsconfigPaths(specifier: string, tsconfig?: TsconfigResolutionContext): Promise<string | undefined>;
@@ -85,6 +87,8 @@ export declare const __generateTypesInternals: {
     buildDeclarationFileName: typeof buildDeclarationFileName;
     formatModuleDeclaration: typeof formatModuleDeclaration;
     formatSelectorType: typeof formatSelectorType;
+    buildDeclarationModuleSpecifier: typeof buildDeclarationModuleSpecifier;
+    buildCanonicalQuery: typeof buildCanonicalQuery;
     relativeToRoot: typeof relativeToRoot;
     collectCandidateFiles: typeof collectCandidateFiles;
     normalizeIncludeOptions: typeof normalizeIncludeOptions;

package/dist/generateTypes.d.ts

@@ -52,6 +52,8 @@ declare function resolveImportPath(resourceSpecifier: string, importerPath: stri
 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 buildDeclarationModuleSpecifier(resolvedPath: string, declarationDir: string, query: string): string;
+declare function buildCanonicalQuery(query: string): string;
 declare function writeTypesIndex(indexPath: string, manifest: Manifest, outDir: string): Promise<void>;
 declare function relativeToRoot(filePath: string, rootDir: string): string;
 declare function resolveWithTsconfigPaths(specifier: string, tsconfig?: TsconfigResolutionContext): Promise<string | undefined>;
@@ -85,6 +87,8 @@ export declare const __generateTypesInternals: {
     buildDeclarationFileName: typeof buildDeclarationFileName;
     formatModuleDeclaration: typeof formatModuleDeclaration;
     formatSelectorType: typeof formatSelectorType;
+    buildDeclarationModuleSpecifier: typeof buildDeclarationModuleSpecifier;
+    buildCanonicalQuery: typeof buildCanonicalQuery;
     relativeToRoot: typeof relativeToRoot;
     collectCandidateFiles: typeof collectCandidateFiles;
     normalizeIncludeOptions: typeof normalizeIncludeOptions;

package/dist/generateTypes.js

@@ -8,7 +8,7 @@ import { moduleType } from 'node-module-type';
 import { getTsconfig } from 'get-tsconfig';
 import { createMatchPath } from 'tsconfig-paths';
 import { cssWithMeta } from './css.js';
-import { determineSelectorVariant, hasQueryFlag, TYPES_QUERY_FLAG, } from './loaderInternals.js';
+import { determineSelectorVariant, hasQueryFlag, TYPES_QUERY_FLAG, buildSanitizedQuery, COMBINED_QUERY_FLAG, NAMED_ONLY_QUERY_FLAGS, } from './loaderInternals.js';
 import { buildStableSelectorsLiteral } from './stableSelectorsLiteral.js';
 import { resolveStableNamespace } from './stableNamespace.js';
 let activeCssWithMeta = cssWithMeta;
@@ -100,9 +100,6 @@ async function generateDeclarations(options) {
             if (!query || !hasQueryFlag(query, TYPES_QUERY_FLAG)) {
                 continue;
             }
-            if (processedSpecifiers.has(cleaned)) {
-                continue;
-            }
             const resolvedNamespace = resolveStableNamespace(options.stableNamespace);
             const resolvedPath = await resolveImportPath(resource, match.importer, options.rootDir, options.tsconfig);
             if (!resolvedPath) {
@@ -130,22 +127,26 @@ async function generateDeclarations(options) {
                 }
                 selectorCache.set(cacheKey, selectorMap);
             }
+            const canonicalSpecifier = buildDeclarationModuleSpecifier(resolvedPath, options.outDir, query);
+            if (processedSpecifiers.has(canonicalSpecifier)) {
+                continue;
+            }
             const variant = determineSelectorVariant(query);
-            const declaration = formatModuleDeclaration(cleaned, variant, selectorMap);
+            const declaration = formatModuleDeclaration(canonicalSpecifier, variant, selectorMap);
             const declarationHash = hashContent(declaration);
-            const fileName = buildDeclarationFileName(cleaned);
+            const fileName = buildDeclarationFileName(canonicalSpecifier);
             const targetPath = path.join(options.outDir, fileName);
-            const previousEntry = previousManifest[cleaned];
+            const previousEntry = previousManifest[canonicalSpecifier];
             const needsWrite = previousEntry?.hash !== declarationHash || !(await fileExists(targetPath));
             if (needsWrite) {
                 await fs.writeFile(targetPath, declaration, 'utf8');
                 writes += 1;
             }
-            nextManifest[cleaned] = { file: fileName, hash: declarationHash };
+            nextManifest[canonicalSpecifier] = { file: fileName, hash: declarationHash };
             if (needsWrite) {
-                declarations.push({ specifier: cleaned, filePath: targetPath });
+                declarations.push({ specifier: canonicalSpecifier, filePath: targetPath });
             }
-            processedSpecifiers.add(cleaned);
+            processedSpecifiers.add(canonicalSpecifier);
         }
     }
     const removed = await removeStaleDeclarations(previousManifest, nextManifest, options.outDir);
@@ -317,6 +318,50 @@ function formatSelectorType(selectors) {
 ${lines.join('\n')}
   }>`;
 }
+function buildDeclarationModuleSpecifier(resolvedPath, declarationDir, query) {
+    const relativePath = path.relative(declarationDir, resolvedPath);
+    const normalizedPath = normalizeRelativePath(relativePath);
+    const canonicalQuery = buildCanonicalQuery(query);
+    return `${normalizedPath}${canonicalQuery}`;
+}
+function normalizeRelativePath(relativePath) {
+    let normalized = relativePath.split(path.sep).join('/');
+    if (!normalized || normalized === '') {
+        normalized = '.';
+    }
+    if (normalized === '.') {
+        return './';
+    }
+    if (normalized.startsWith('./') || normalized.startsWith('../')) {
+        return normalized;
+    }
+    if (normalized.startsWith('.')) {
+        return normalized;
+    }
+    return `./${normalized}`;
+}
+function buildCanonicalQuery(query) {
+    if (!query) {
+        return '';
+    }
+    const sanitized = buildSanitizedQuery(query);
+    const extraParts = sanitized ? sanitized.slice(1).split('&').filter(Boolean) : [];
+    const parts = [];
+    parts.push('knighted-css');
+    if (hasQueryFlag(query, COMBINED_QUERY_FLAG)) {
+        parts.push(COMBINED_QUERY_FLAG);
+    }
+    for (const flag of NAMED_ONLY_QUERY_FLAGS) {
+        if (hasQueryFlag(query, flag)) {
+            parts.push(flag);
+        }
+    }
+    if (hasQueryFlag(query, TYPES_QUERY_FLAG)) {
+        parts.push(TYPES_QUERY_FLAG);
+    }
+    const merged = [...parts, ...extraParts];
+    return merged.length > 0 ? `?${merged.join('&')}` : '';
+}
 function hashContent(content) {
     return crypto.createHash('sha1').update(content).digest('hex');
 }
@@ -610,6 +655,8 @@ export const __generateTypesInternals = {
     buildDeclarationFileName,
     formatModuleDeclaration,
     formatSelectorType,
+    buildDeclarationModuleSpecifier,
+    buildCanonicalQuery,
     relativeToRoot,
     collectCandidateFiles,
     normalizeIncludeOptions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/css",
-  "version": "1.0.0-rc.10",
+  "version": "1.0.0-rc.11",
   "description": "A build-time utility that traverses JavaScript/TypeScript module dependency graphs to extract, compile, and optimize all imported CSS into a single, in-memory string.",
   "type": "module",
   "main": "./dist/css.js",