@knighted/css 1.0.3 → 1.0.4

package/README.md

@@ -112,9 +112,8 @@ Refer to [docs/type-generation.md](../../docs/type-generation.md) for CLI option
 Need the module exports, `knightedCss`, and a runtime `stableSelectors` map from one import? Use `?knighted-css&combined&types` (plus optional `&named-only`). Example:
 
 ```ts
-import type { KnightedCssCombinedModule } from '@knighted/css/loader'
 import { asKnightedCssCombinedModule } from '@knighted/css/loader-helpers'
-import type { ButtonStableSelectors } from './button.css.knighted-css.js'
+import type { KnightedCssStableSelectors as ButtonStableSelectors } from './button.css.knighted-css.js'
 import * as buttonModule from './button.js?knighted-css&combined&types'
 
 const {

package/dist/cjs/generateTypes.cjs

@@ -63,7 +63,6 @@ function getImportMetaUrl() {
         return undefined;
     }
 }
-const PACKAGE_ROOT = resolvePackageRoot();
 const SELECTOR_REFERENCE = '.knighted-css';
 const SELECTOR_MODULE_SUFFIX = '.knighted-css.ts';
 async function generateTypes(options = {}) {

package/dist/cjs/loader.cjs

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pitch = void 0;
+const node_path_1 = __importDefault(require("node:path"));
 const css_js_1 = require("./css.cjs");
 const moduleInfo_js_1 = require("./moduleInfo.cjs");
 const loaderInternals_js_1 = require("./loaderInternals.cjs");
@@ -128,15 +132,20 @@ function buildProxyRequest(ctx) {
     const sanitizedQuery = (0, loaderInternals_js_1.buildSanitizedQuery)(ctx.resourceQuery);
     const rawRequest = getRawRequest(ctx);
     if (rawRequest) {
-        const stripped = stripResourceQuery(rawRequest);
-        return `${stripped}${sanitizedQuery}`;
+        return rebuildProxyRequestFromRaw(ctx, rawRequest, sanitizedQuery);
     }
     const request = `${ctx.resourcePath}${sanitizedQuery}`;
-    const context = ctx.context ?? ctx.rootContext ?? process.cwd();
-    if (ctx.utils && typeof ctx.utils.contextify === 'function') {
-        return ctx.utils.contextify(context, request);
+    return contextifyRequest(ctx, request);
+}
+function rebuildProxyRequestFromRaw(ctx, rawRequest, sanitizedQuery) {
+    const stripped = stripResourceQuery(rawRequest);
+    const loaderDelimiter = stripped.lastIndexOf('!');
+    const loaderPrefix = loaderDelimiter >= 0 ? stripped.slice(0, loaderDelimiter + 1) : '';
+    let resource = loaderDelimiter >= 0 ? stripped.slice(loaderDelimiter + 1) : stripped;
+    if (isRelativeSpecifier(resource)) {
+        resource = makeResourceRelativeToContext(ctx, ctx.resourcePath);
     }
-    return request;
+    return `${loaderPrefix}${resource}${sanitizedQuery}`;
 }
 function getRawRequest(ctx) {
     const mod = ctx._module;
@@ -150,6 +159,42 @@ function stripResourceQuery(request) {
     const idx = request.indexOf('?');
     return idx >= 0 ? request.slice(0, idx) : request;
 }
+function contextifyRequest(ctx, request) {
+    const context = ctx.context ?? ctx.rootContext ?? process.cwd();
+    if (ctx.utils && typeof ctx.utils.contextify === 'function') {
+        return ctx.utils.contextify(context, request);
+    }
+    return rebuildRelativeRequest(context, request);
+}
+function rebuildRelativeRequest(context, request) {
+    const queryIndex = request.indexOf('?');
+    const resourcePath = queryIndex >= 0 ? request.slice(0, queryIndex) : request;
+    const query = queryIndex >= 0 ? request.slice(queryIndex) : '';
+    const relative = ensureDotPrefixedRelative(node_path_1.default.relative(context, resourcePath), resourcePath);
+    return `${relative}${query}`;
+}
+function makeResourceRelativeToContext(ctx, resourcePath) {
+    const context = ctx.context ?? node_path_1.default.dirname(resourcePath);
+    if (ctx.utils && typeof ctx.utils.contextify === 'function') {
+        const result = ctx.utils.contextify(context, resourcePath);
+        return stripResourceQuery(result);
+    }
+    return ensureDotPrefixedRelative(node_path_1.default.relative(context, resourcePath), resourcePath);
+}
+function ensureDotPrefixedRelative(relativePath, resourcePath) {
+    const fallback = relativePath.length > 0 ? relativePath : node_path_1.default.basename(resourcePath);
+    const normalized = normalizeToPosix(fallback);
+    if (normalized.startsWith('./') || normalized.startsWith('../')) {
+        return normalized;
+    }
+    return `./${normalized}`;
+}
+function normalizeToPosix(filePath) {
+    return filePath.split(node_path_1.default.sep).join('/');
+}
+function isRelativeSpecifier(specifier) {
+    return specifier.startsWith('./') || specifier.startsWith('../');
+}
 function createCombinedModule(request, css, options) {
     const shouldEmitDefault = options?.emitDefault ?? (0, loaderInternals_js_1.shouldForwardDefaultExport)(request);
     const requestLiteral = JSON.stringify(request);

package/dist/cjs/loaderInternals.cjs

@@ -56,14 +56,6 @@ function hasQueryFlag(query, flag) {
         return false;
     return entries.some(part => isQueryFlag(part, flag));
 }
-function safeDecode(value) {
-    try {
-        return decodeURIComponent(value);
-    }
-    catch {
-        return value;
-    }
-}
 function shouldForwardDefaultExport(request) {
     const [pathPart] = request.split('?');
     if (!pathPart)

package/dist/generateTypes.js

@@ -55,7 +55,6 @@ function getImportMetaUrl() {
         return undefined;
     }
 }
-const PACKAGE_ROOT = resolvePackageRoot();
 const SELECTOR_REFERENCE = '.knighted-css';
 const SELECTOR_MODULE_SUFFIX = '.knighted-css.ts';
 export async function generateTypes(options = {}) {

package/dist/loader.js

@@ -1,3 +1,4 @@
+import path from 'node:path';
 import { cssWithMeta, compileVanillaModule } from './css.js';
 import { detectModuleDefaultExport } from './moduleInfo.js';
 import { buildSanitizedQuery, hasCombinedQuery, hasNamedOnlyQueryFlag, hasQueryFlag, shouldEmitCombinedDefault, shouldForwardDefaultExport, TYPES_QUERY_FLAG, } from './loaderInternals.js';
@@ -124,15 +125,20 @@ function buildProxyRequest(ctx) {
     const sanitizedQuery = buildSanitizedQuery(ctx.resourceQuery);
     const rawRequest = getRawRequest(ctx);
     if (rawRequest) {
-        const stripped = stripResourceQuery(rawRequest);
-        return `${stripped}${sanitizedQuery}`;
+        return rebuildProxyRequestFromRaw(ctx, rawRequest, sanitizedQuery);
     }
     const request = `${ctx.resourcePath}${sanitizedQuery}`;
-    const context = ctx.context ?? ctx.rootContext ?? process.cwd();
-    if (ctx.utils && typeof ctx.utils.contextify === 'function') {
-        return ctx.utils.contextify(context, request);
+    return contextifyRequest(ctx, request);
+}
+function rebuildProxyRequestFromRaw(ctx, rawRequest, sanitizedQuery) {
+    const stripped = stripResourceQuery(rawRequest);
+    const loaderDelimiter = stripped.lastIndexOf('!');
+    const loaderPrefix = loaderDelimiter >= 0 ? stripped.slice(0, loaderDelimiter + 1) : '';
+    let resource = loaderDelimiter >= 0 ? stripped.slice(loaderDelimiter + 1) : stripped;
+    if (isRelativeSpecifier(resource)) {
+        resource = makeResourceRelativeToContext(ctx, ctx.resourcePath);
     }
-    return request;
+    return `${loaderPrefix}${resource}${sanitizedQuery}`;
 }
 function getRawRequest(ctx) {
     const mod = ctx._module;
@@ -146,6 +152,42 @@ function stripResourceQuery(request) {
     const idx = request.indexOf('?');
     return idx >= 0 ? request.slice(0, idx) : request;
 }
+function contextifyRequest(ctx, request) {
+    const context = ctx.context ?? ctx.rootContext ?? process.cwd();
+    if (ctx.utils && typeof ctx.utils.contextify === 'function') {
+        return ctx.utils.contextify(context, request);
+    }
+    return rebuildRelativeRequest(context, request);
+}
+function rebuildRelativeRequest(context, request) {
+    const queryIndex = request.indexOf('?');
+    const resourcePath = queryIndex >= 0 ? request.slice(0, queryIndex) : request;
+    const query = queryIndex >= 0 ? request.slice(queryIndex) : '';
+    const relative = ensureDotPrefixedRelative(path.relative(context, resourcePath), resourcePath);
+    return `${relative}${query}`;
+}
+function makeResourceRelativeToContext(ctx, resourcePath) {
+    const context = ctx.context ?? path.dirname(resourcePath);
+    if (ctx.utils && typeof ctx.utils.contextify === 'function') {
+        const result = ctx.utils.contextify(context, resourcePath);
+        return stripResourceQuery(result);
+    }
+    return ensureDotPrefixedRelative(path.relative(context, resourcePath), resourcePath);
+}
+function ensureDotPrefixedRelative(relativePath, resourcePath) {
+    const fallback = relativePath.length > 0 ? relativePath : path.basename(resourcePath);
+    const normalized = normalizeToPosix(fallback);
+    if (normalized.startsWith('./') || normalized.startsWith('../')) {
+        return normalized;
+    }
+    return `./${normalized}`;
+}
+function normalizeToPosix(filePath) {
+    return filePath.split(path.sep).join('/');
+}
+function isRelativeSpecifier(specifier) {
+    return specifier.startsWith('./') || specifier.startsWith('../');
+}
 function createCombinedModule(request, css, options) {
     const shouldEmitDefault = options?.emitDefault ?? shouldForwardDefaultExport(request);
     const requestLiteral = JSON.stringify(request);

package/dist/loaderInternals.js

@@ -44,14 +44,6 @@ export function hasQueryFlag(query, flag) {
         return false;
     return entries.some(part => isQueryFlag(part, flag));
 }
-function safeDecode(value) {
-    try {
-        return decodeURIComponent(value);
-    }
-    catch {
-        return value;
-    }
-}
 export function shouldForwardDefaultExport(request) {
     const [pathPart] = request.split('?');
     if (!pathPart)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/css",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "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",