@knighted/css 1.0.0-rc.13 → 1.0.0-rc.15

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

@@ -197,7 +197,10 @@ function normalizeSpecifier(raw) {
     if (!trimmed || trimmed.startsWith('\0')) {
         return '';
     }
-    const queryIndex = trimmed.search(/[?#]/);
+    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 '';
@@ -303,9 +306,7 @@ function createResolverFactory(cwd, extensions, scriptExtensions, graphOptions)
         options.extensionAlias = extensionAlias;
     }
     const tsconfigOption = resolveResolverTsconfig(graphOptions?.tsConfig, cwd);
-    if (tsconfigOption) {
-        options.tsconfig = tsconfigOption;
-    }
+    options.tsconfig = tsconfigOption ?? 'auto';
     return new oxc_resolver_1.ResolverFactory(options);
 }
 function buildExtensionAlias(scriptExtensions) {

package/dist/cjs/stableSelectorsLiteral.cjs

@@ -7,20 +7,23 @@ exports.formatStableSelectorMap = formatStableSelectorMap;
 const lightningcss_1 = require("lightningcss");
 const helpers_js_1 = require("./helpers.cjs");
 function buildStableSelectorsLiteral(options) {
+    const target = options.target ?? 'ts';
     const trimmedNamespace = options.namespace.trim();
     if (!trimmedNamespace) {
         options.emitWarning(`stableSelectors requested for ${options.resourcePath} but "stableNamespace" resolved to an empty value.`);
-        return {
-            literal: 'export const stableSelectors = {} as const;\n',
-            selectorMap: new Map(),
-        };
+        return finalizeLiteral(new Map(), target);
     }
     const selectorMap = collectStableSelectors(options.css, trimmedNamespace, options.resourcePath);
     if (selectorMap.size === 0) {
         options.emitWarning(`stableSelectors requested for ${options.resourcePath} but no selectors matched namespace "${trimmedNamespace}".`);
     }
+    return finalizeLiteral(selectorMap, target);
+}
+function finalizeLiteral(selectorMap, target) {
+    const formatted = formatStableSelectorMap(selectorMap);
+    const suffix = target === 'ts' ? ' as const' : '';
     return {
-        literal: `export const stableSelectors = ${formatStableSelectorMap(selectorMap)} as const;\n`,
+        literal: `export const stableSelectors = ${formatted}${suffix};\n`,
         selectorMap,
     };
 }

package/dist/cjs/stableSelectorsLiteral.d.cts

@@ -2,11 +2,13 @@ export interface StableSelectorsLiteralResult {
     literal: string;
     selectorMap: Map<string, string>;
 }
+type StableSelectorsLiteralTarget = 'ts' | 'js';
 export declare function buildStableSelectorsLiteral(options: {
     css: string;
     namespace: string;
     resourcePath: string;
     emitWarning: (message: string) => void;
+    target?: StableSelectorsLiteralTarget;
 }): StableSelectorsLiteralResult;
 export declare function collectStableSelectors(css: string, namespace: string, filename?: string): Map<string, string>;
 declare function collectStableSelectorsByRegex(css: string, namespace: string): Map<string, string>;

package/dist/loader-helpers.d.ts

@@ -0,0 +1,4 @@
+import type { KnightedCssCombinedModule } from './loader.js';
+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/loader-helpers.js

@@ -0,0 +1,3 @@
+export function asKnightedCssCombinedModule(module) {
+    return module;
+}

package/dist/loader.d.ts

@@ -1,6 +1,7 @@
 import type { LoaderDefinitionFunction, PitchLoaderDefinitionFunction } from 'webpack';
 import { type CssOptions } from './css.js';
-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/loader.js

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

package/dist/moduleGraph.js

@@ -191,7 +191,10 @@ function normalizeSpecifier(raw) {
     if (!trimmed || trimmed.startsWith('\0')) {
         return '';
     }
-    const queryIndex = trimmed.search(/[?#]/);
+    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 '';
@@ -297,9 +300,7 @@ function createResolverFactory(cwd, extensions, scriptExtensions, graphOptions)
         options.extensionAlias = extensionAlias;
     }
     const tsconfigOption = resolveResolverTsconfig(graphOptions?.tsConfig, cwd);
-    if (tsconfigOption) {
-        options.tsconfig = tsconfigOption;
-    }
+    options.tsconfig = tsconfigOption ?? 'auto';
     return new ResolverFactory(options);
 }
 function buildExtensionAlias(scriptExtensions) {

package/dist/stableSelectorsLiteral.d.ts

@@ -2,11 +2,13 @@ export interface StableSelectorsLiteralResult {
     literal: string;
     selectorMap: Map<string, string>;
 }
+type StableSelectorsLiteralTarget = 'ts' | 'js';
 export declare function buildStableSelectorsLiteral(options: {
     css: string;
     namespace: string;
     resourcePath: string;
     emitWarning: (message: string) => void;
+    target?: StableSelectorsLiteralTarget;
 }): StableSelectorsLiteralResult;
 export declare function collectStableSelectors(css: string, namespace: string, filename?: string): Map<string, string>;
 declare function collectStableSelectorsByRegex(css: string, namespace: string): Map<string, string>;

package/dist/stableSelectorsLiteral.js

@@ -1,20 +1,23 @@
 import { transform as lightningTransform } from 'lightningcss';
 import { escapeRegex, serializeSelector } from './helpers.js';
 export function buildStableSelectorsLiteral(options) {
+    const target = options.target ?? 'ts';
     const trimmedNamespace = options.namespace.trim();
     if (!trimmedNamespace) {
         options.emitWarning(`stableSelectors requested for ${options.resourcePath} but "stableNamespace" resolved to an empty value.`);
-        return {
-            literal: 'export const stableSelectors = {} as const;\n',
-            selectorMap: new Map(),
-        };
+        return finalizeLiteral(new Map(), target);
     }
     const selectorMap = collectStableSelectors(options.css, trimmedNamespace, options.resourcePath);
     if (selectorMap.size === 0) {
         options.emitWarning(`stableSelectors requested for ${options.resourcePath} but no selectors matched namespace "${trimmedNamespace}".`);
     }
+    return finalizeLiteral(selectorMap, target);
+}
+function finalizeLiteral(selectorMap, target) {
+    const formatted = formatStableSelectorMap(selectorMap);
+    const suffix = target === 'ts' ? ' as const' : '';
     return {
-        literal: `export const stableSelectors = ${formatStableSelectorMap(selectorMap)} as const;\n`,
+        literal: `export const stableSelectors = ${formatted}${suffix};\n`,
         selectorMap,
     };
 }

package/loader-queries.d.ts

@@ -19,7 +19,12 @@ declare module '*?knighted-css&types' {
  * TypeScript cannot infer the underlying module automatically, so consumers can
  * import the default export and narrow it with `KnightedCssCombinedModule<typeof import('./file')>`.
  */
-type KnightedCssCombinedModule<TModule> = TModule & { knightedCss: string }
+type KnightedCssCombinedExtras = Readonly<Record<string, unknown>>
+
+type KnightedCssCombinedModule<
+  TModule,
+  TExtras extends KnightedCssCombinedExtras = Record<never, never>,
+> = TModule & TExtras & { knightedCss: string }
 
 declare module '*?knighted-css&combined' {
   const combined: KnightedCssCombinedModule<Record<string, unknown>>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/css",
-  "version": "1.0.0-rc.13",
+  "version": "1.0.0-rc.15",
   "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",
@@ -10,6 +10,9 @@
       "loader": [
         "./dist/loader.d.ts"
       ],
+      "loader-helpers": [
+        "./dist/loader-helpers.d.ts"
+      ],
       "loader-queries": [
         "./loader-queries.d.ts"
       ],
@@ -32,6 +35,11 @@
       "import": "./dist/loader.js",
       "require": "./dist/cjs/loader.cjs"
     },
+    "./loader-helpers": {
+      "types": "./dist/loader-helpers.d.ts",
+      "import": "./dist/loader-helpers.js",
+      "require": "./dist/cjs/loader-helpers.cjs"
+    },
     "./loader-queries": {
       "types": "./loader-queries.d.ts",
       "default": "./loader-queries.d.ts"