@knighted/css 1.1.0-rc.1 → 1.1.0-rc.3

package/dist/cjs/generateTypes.cjs

@@ -16,6 +16,7 @@ const get_tsconfig_1 = require("get-tsconfig");
 const tsconfig_paths_1 = require("tsconfig-paths");
 const css_js_1 = require("./css.cjs");
 const lexer_js_1 = require("./lexer.cjs");
+const moduleResolution_js_1 = require("./moduleResolution.cjs");
 const stableSelectorsLiteral_js_1 = require("./stableSelectorsLiteral.cjs");
 const stableNamespace_js_1 = require("./stableNamespace.cjs");
 let activeCssWithMeta = css_js_1.cssWithMeta;
@@ -66,6 +67,8 @@ function getImportMetaUrl() {
 const SELECTOR_REFERENCE = '.knighted-css';
 const SELECTOR_MODULE_SUFFIX = '.knighted-css.ts';
 const STYLE_EXTENSIONS = css_js_1.DEFAULT_EXTENSIONS.map(ext => ext.toLowerCase());
+const SCRIPT_EXTENSIONS = Array.from(SUPPORTED_EXTENSIONS);
+const RESOLUTION_EXTENSIONS = Array.from(new Set([...SCRIPT_EXTENSIONS, ...STYLE_EXTENSIONS]));
 const EXTENSION_FALLBACKS = {
     '.js': ['.ts', '.tsx', '.jsx', '.mjs', '.cjs'],
     '.mjs': ['.mts', '.mjs', '.js', '.ts', '.tsx'],
@@ -73,7 +76,7 @@ const EXTENSION_FALLBACKS = {
     '.jsx': ['.tsx', '.jsx'],
 };
 async function generateTypes(options = {}) {
-    const rootDir = node_path_1.default.resolve(options.rootDir ?? process.cwd());
+    const rootDir = await resolveRootDir(node_path_1.default.resolve(options.rootDir ?? process.cwd()));
     const include = normalizeIncludeOptions(options.include, rootDir);
     const cacheDir = node_path_1.default.resolve(options.outDir ?? node_path_1.default.join(rootDir, '.knighted-css'));
     const tsconfig = loadTsconfigResolutionContext(rootDir);
@@ -88,8 +91,17 @@ async function generateTypes(options = {}) {
     };
     return generateDeclarations(internalOptions);
 }
+async function resolveRootDir(rootDir) {
+    try {
+        return await promises_1.default.realpath(rootDir);
+    }
+    catch {
+        return rootDir;
+    }
+}
 async function generateDeclarations(options) {
     const peerResolver = createProjectPeerResolver(options.rootDir);
+    const resolverFactory = (0, moduleResolution_js_1.createResolverFactory)(options.rootDir, RESOLUTION_EXTENSIONS, SCRIPT_EXTENSIONS);
     const files = await collectCandidateFiles(options.include);
     const selectorModulesManifestPath = node_path_1.default.join(options.cacheDir, 'selector-modules.json');
     const previousSelectorManifest = await readManifest(selectorModulesManifestPath);
@@ -110,7 +122,7 @@ async function generateDeclarations(options) {
                 continue;
             }
             const resolvedNamespace = (0, stableNamespace_js_1.resolveStableNamespace)(options.stableNamespace);
-            const resolvedPath = await resolveImportPath(selectorSource, match.importer, options.rootDir, options.tsconfig);
+            const resolvedPath = await resolveImportPath(selectorSource, match.importer, options.rootDir, options.tsconfig, resolverFactory, RESOLUTION_EXTENSIONS);
             if (!resolvedPath) {
                 warnings.push(`Unable to resolve ${selectorSource} referenced by ${relativeToRoot(match.importer, options.rootDir)}.`);
                 continue;
@@ -251,7 +263,8 @@ function stripInlineLoader(specifier) {
     return idx >= 0 ? specifier.slice(idx + 1) : specifier;
 }
 function splitResourceAndQuery(specifier) {
-    const hashIndex = specifier.indexOf('#');
+    const hashOffset = specifier.startsWith('#') ? 1 : 0;
+    const hashIndex = specifier.indexOf('#', hashOffset);
     const trimmed = hashIndex >= 0 ? specifier.slice(0, hashIndex) : specifier;
     const queryIndex = trimmed.indexOf('?');
     if (queryIndex < 0) {
@@ -282,7 +295,7 @@ function extractSelectorSourceSpecifier(specifier) {
     return base;
 }
 const projectRequireCache = new Map();
-async function resolveImportPath(resourceSpecifier, importerPath, rootDir, tsconfig) {
+async function resolveImportPath(resourceSpecifier, importerPath, rootDir, tsconfig, resolverFactory, resolutionExtensions = RESOLUTION_EXTENSIONS) {
     if (!resourceSpecifier)
         return undefined;
     if (resourceSpecifier.startsWith('.')) {
@@ -295,6 +308,12 @@ async function resolveImportPath(resourceSpecifier, importerPath, rootDir, tscon
     if (tsconfigResolved) {
         return resolveWithExtensionFallback(tsconfigResolved);
     }
+    if (resolverFactory) {
+        const resolved = (0, moduleResolution_js_1.resolveWithFactory)(resolverFactory, resourceSpecifier, importerPath, resolutionExtensions);
+        if (resolved) {
+            return resolved;
+        }
+    }
     const requireFromRoot = getProjectRequire(rootDir);
     try {
         return requireFromRoot.resolve(resourceSpecifier);
@@ -315,7 +334,7 @@ function buildSelectorModulePath(resolvedPath) {
     return `${base}${SELECTOR_MODULE_SUFFIX}`;
 }
 function formatSelectorModuleSource(selectors, proxyInfo) {
-    const header = '// Generated by @knighted/css/generate-types\n// Do not edit.\n\n';
+    const header = '// Generated by @knighted/css/generate-types\n// Do not edit.';
     const entries = Array.from(selectors.entries()).sort(([a], [b]) => a.localeCompare(b));
     const lines = entries.map(([token, selector]) => `  ${JSON.stringify(token)}: ${JSON.stringify(selector)},`);
     const literal = lines.length > 0
@@ -330,14 +349,15 @@ ${lines.join('\n')}
             proxyLines.push(`export { default } from '${proxyInfo.moduleSpecifier}'`);
         }
         proxyLines.push(`export { knightedCss } from '${proxyInfo.moduleSpecifier}?knighted-css'`);
-        proxyLines.push('');
     }
-    const defaultExport = proxyInfo ? '' : '\nexport default stableSelectors\n';
-    return `${header}${proxyLines.join('\n')}
-export const stableSelectors = ${literal}
+    const defaultExport = proxyInfo ? '' : '\nexport default stableSelectors';
+    const stableBlock = `export const stableSelectors = ${literal}
 
 export type KnightedCssStableSelectors = typeof stableSelectors
 export type KnightedCssStableSelectorToken = keyof typeof stableSelectors${defaultExport}`;
+    const sections = [header, proxyLines.join('\n'), stableBlock].filter(Boolean);
+    return `${sections.join('\n\n')}
+`;
 }
 function hashContent(content) {
     return node_crypto_1.default.createHash('sha1').update(content).digest('hex');