@knighted/css 1.0.0-alpha.4 → 1.0.0-rc.0

package/dist/cjs/loader.cjs

@@ -1,25 +1,103 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.pitch = void 0;
 const css_js_1 = require("./css.cjs");
 const DEFAULT_EXPORT_NAME = 'knightedCss';
+const COMBINED_QUERY_FLAG = 'combined';
 const loader = async function loader(source) {
-    const rawOptions = (typeof this.getOptions === 'function' ? this.getOptions() : {});
-    const cssOptions = rawOptions;
-    const normalizedOptions = {
-        ...cssOptions,
-        cwd: cssOptions.cwd ?? this.rootContext ?? process.cwd(),
-    };
-    const { css, files } = await (0, css_js_1.cssWithMeta)(this.resourcePath, normalizedOptions);
-    const uniqueFiles = new Set([this.resourcePath, ...files]);
-    for (const file of uniqueFiles) {
-        this.addDependency(file);
-    }
-    const input = typeof source === 'string' ? source : source.toString('utf8');
-    const injection = `\n\nexport const ${DEFAULT_EXPORT_NAME} = ${JSON.stringify(css)};\n`;
+    const cssOptions = resolveCssOptions(this);
+    const css = await extractCss(this, cssOptions);
+    const injection = buildInjection(css);
+    const input = toSourceString(source);
     const isStyleModule = this.resourcePath.endsWith('.css.ts');
-    const output = isStyleModule
-        ? `${injection}export default {};\n`
-        : `${input}${injection}`;
-    return output;
+    return isStyleModule ? `${injection}export default {};\n` : `${input}${injection}`;
 };
+const pitch = function pitch() {
+    if (!hasCombinedQuery(this.resourceQuery)) {
+        return;
+    }
+    const request = buildProxyRequest(this);
+    const cssOptions = resolveCssOptions(this);
+    return extractCss(this, cssOptions).then(css => createCombinedModule(request, css));
+};
+exports.pitch = pitch;
+loader.pitch = exports.pitch;
 exports.default = loader;
+function resolveCssOptions(ctx) {
+    const rawOptions = (typeof ctx.getOptions === 'function' ? ctx.getOptions() : {});
+    return {
+        ...rawOptions,
+        cwd: rawOptions.cwd ?? ctx.rootContext ?? process.cwd(),
+    };
+}
+async function extractCss(ctx, options) {
+    const { css, files } = await (0, css_js_1.cssWithMeta)(ctx.resourcePath, options);
+    const uniqueFiles = new Set([ctx.resourcePath, ...files]);
+    for (const file of uniqueFiles) {
+        ctx.addDependency(file);
+    }
+    return css;
+}
+function toSourceString(source) {
+    return typeof source === 'string' ? source : source.toString('utf8');
+}
+function buildInjection(css) {
+    return `\n\nexport const ${DEFAULT_EXPORT_NAME} = ${JSON.stringify(css)};\n`;
+}
+function hasCombinedQuery(query) {
+    if (!query)
+        return false;
+    const trimmed = query.startsWith('?') ? query.slice(1) : query;
+    if (!trimmed)
+        return false;
+    return trimmed
+        .split('&')
+        .filter(Boolean)
+        .some(part => isQueryFlag(part, COMBINED_QUERY_FLAG));
+}
+function buildProxyRequest(ctx) {
+    const sanitizedQuery = buildSanitizedQuery(ctx.resourceQuery);
+    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 request;
+}
+function buildSanitizedQuery(query) {
+    if (!query)
+        return '';
+    const entries = splitQuery(query).filter(part => {
+        return !isQueryFlag(part, COMBINED_QUERY_FLAG) && !isQueryFlag(part, 'knighted-css');
+    });
+    return entries.length > 0 ? `?${entries.join('&')}` : '';
+}
+function splitQuery(query) {
+    const trimmed = query.startsWith('?') ? query.slice(1) : query;
+    if (!trimmed)
+        return [];
+    return trimmed.split('&').filter(Boolean);
+}
+function isQueryFlag(entry, flag) {
+    const [rawKey] = entry.split('=');
+    try {
+        return decodeURIComponent(rawKey) === flag;
+    }
+    catch {
+        return rawKey === flag;
+    }
+}
+function createCombinedModule(request, css) {
+    const requestLiteral = JSON.stringify(request);
+    const defaultExport = `const __knightedDefault =
+typeof __knightedModule.default !== 'undefined'
+  ? __knightedModule.default
+  : __knightedModule;`;
+    return [
+        `import * as __knightedModule from ${requestLiteral};`,
+        `export * from ${requestLiteral};`,
+        defaultExport,
+        'export default __knightedDefault;',
+        buildInjection(css),
+    ].join('\n');
+}

package/dist/cjs/loader.d.cts

@@ -1,6 +1,10 @@
-import type { LoaderDefinitionFunction } from 'webpack';
+import type { LoaderDefinitionFunction, PitchLoaderDefinitionFunction } from 'webpack';
 import { type CssOptions } from './css.cjs';
+export type KnightedCssCombinedModule<TModule> = TModule & {
+    knightedCss: string;
+};
 export interface KnightedCssLoaderOptions extends CssOptions {
 }
 declare const loader: LoaderDefinitionFunction<KnightedCssLoaderOptions>;
+export declare const pitch: PitchLoaderDefinitionFunction<KnightedCssLoaderOptions>;
 export default loader;

package/dist/loader.d.ts

@@ -1,6 +1,10 @@
-import type { LoaderDefinitionFunction } from 'webpack';
+import type { LoaderDefinitionFunction, PitchLoaderDefinitionFunction } from 'webpack';
 import { type CssOptions } from './css.js';
+export type KnightedCssCombinedModule<TModule> = TModule & {
+    knightedCss: string;
+};
 export interface KnightedCssLoaderOptions extends CssOptions {
 }
 declare const loader: LoaderDefinitionFunction<KnightedCssLoaderOptions>;
+export declare const pitch: PitchLoaderDefinitionFunction<KnightedCssLoaderOptions>;
 export default loader;

package/dist/loader.js

@@ -1,23 +1,99 @@
 import { cssWithMeta } from './css.js';
 const DEFAULT_EXPORT_NAME = 'knightedCss';
+const COMBINED_QUERY_FLAG = 'combined';
 const loader = async function loader(source) {
-    const rawOptions = (typeof this.getOptions === 'function' ? this.getOptions() : {});
-    const cssOptions = rawOptions;
-    const normalizedOptions = {
-        ...cssOptions,
-        cwd: cssOptions.cwd ?? this.rootContext ?? process.cwd(),
-    };
-    const { css, files } = await cssWithMeta(this.resourcePath, normalizedOptions);
-    const uniqueFiles = new Set([this.resourcePath, ...files]);
-    for (const file of uniqueFiles) {
-        this.addDependency(file);
-    }
-    const input = typeof source === 'string' ? source : source.toString('utf8');
-    const injection = `\n\nexport const ${DEFAULT_EXPORT_NAME} = ${JSON.stringify(css)};\n`;
+    const cssOptions = resolveCssOptions(this);
+    const css = await extractCss(this, cssOptions);
+    const injection = buildInjection(css);
+    const input = toSourceString(source);
     const isStyleModule = this.resourcePath.endsWith('.css.ts');
-    const output = isStyleModule
-        ? `${injection}export default {};\n`
-        : `${input}${injection}`;
-    return output;
+    return isStyleModule ? `${injection}export default {};\n` : `${input}${injection}`;
 };
+export const pitch = function pitch() {
+    if (!hasCombinedQuery(this.resourceQuery)) {
+        return;
+    }
+    const request = buildProxyRequest(this);
+    const cssOptions = resolveCssOptions(this);
+    return extractCss(this, cssOptions).then(css => createCombinedModule(request, css));
+};
+loader.pitch = pitch;
 export default loader;
+function resolveCssOptions(ctx) {
+    const rawOptions = (typeof ctx.getOptions === 'function' ? ctx.getOptions() : {});
+    return {
+        ...rawOptions,
+        cwd: rawOptions.cwd ?? ctx.rootContext ?? process.cwd(),
+    };
+}
+async function extractCss(ctx, options) {
+    const { css, files } = await cssWithMeta(ctx.resourcePath, options);
+    const uniqueFiles = new Set([ctx.resourcePath, ...files]);
+    for (const file of uniqueFiles) {
+        ctx.addDependency(file);
+    }
+    return css;
+}
+function toSourceString(source) {
+    return typeof source === 'string' ? source : source.toString('utf8');
+}
+function buildInjection(css) {
+    return `\n\nexport const ${DEFAULT_EXPORT_NAME} = ${JSON.stringify(css)};\n`;
+}
+function hasCombinedQuery(query) {
+    if (!query)
+        return false;
+    const trimmed = query.startsWith('?') ? query.slice(1) : query;
+    if (!trimmed)
+        return false;
+    return trimmed
+        .split('&')
+        .filter(Boolean)
+        .some(part => isQueryFlag(part, COMBINED_QUERY_FLAG));
+}
+function buildProxyRequest(ctx) {
+    const sanitizedQuery = buildSanitizedQuery(ctx.resourceQuery);
+    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 request;
+}
+function buildSanitizedQuery(query) {
+    if (!query)
+        return '';
+    const entries = splitQuery(query).filter(part => {
+        return !isQueryFlag(part, COMBINED_QUERY_FLAG) && !isQueryFlag(part, 'knighted-css');
+    });
+    return entries.length > 0 ? `?${entries.join('&')}` : '';
+}
+function splitQuery(query) {
+    const trimmed = query.startsWith('?') ? query.slice(1) : query;
+    if (!trimmed)
+        return [];
+    return trimmed.split('&').filter(Boolean);
+}
+function isQueryFlag(entry, flag) {
+    const [rawKey] = entry.split('=');
+    try {
+        return decodeURIComponent(rawKey) === flag;
+    }
+    catch {
+        return rawKey === flag;
+    }
+}
+function createCombinedModule(request, css) {
+    const requestLiteral = JSON.stringify(request);
+    const defaultExport = `const __knightedDefault =
+typeof __knightedModule.default !== 'undefined'
+  ? __knightedModule.default
+  : __knightedModule;`;
+    return [
+        `import * as __knightedModule from ${requestLiteral};`,
+        `export * from ${requestLiteral};`,
+        defaultExport,
+        'export default __knightedDefault;',
+        buildInjection(css),
+    ].join('\n');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/css",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-rc.0",
   "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",