@wyw-in-js/vite 1.1.0 → 2.0.0-alpha.1

package/types/index.js

@@ -1,53 +1,14 @@
-"use strict";
 /**
  * This file contains a Vite loader for wyw-in-js.
  * It uses the transform.ts function to generate class names from source code,
  * returns transformed code without template literals and attaches generated source maps
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = wywInJS;
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
-const vite_1 = require("vite");
-const shared_1 = require("@wyw-in-js/shared");
-const transformPkg = __importStar(require("@wyw-in-js/transform"));
-const { createTransformManifest, createFileReporter, getFileIdx, stringifyTransformManifest, transform, TransformCacheCollection, } = transformPkg;
+import { existsSync } from 'fs';
+import path from 'path';
+import { createFilter, loadEnv } from 'vite';
+import { asyncResolverFactory, logger, mergeOxcResolverAlias, syncResolve, toNativeResolverAlias, } from '@wyw-in-js/shared';
+import * as transformPkg from '@wyw-in-js/transform';
+const { createTransformManifest, createFileReporter, disposeEvalBroker, getFileIdx, stringifyTransformManifest, transform, TransformCacheCollection, } = transformPkg;
 const createMetadataManifest = (metadata, context) => typeof createTransformManifest === 'function'
     ? createTransformManifest(metadata, context)
     : {
@@ -59,30 +20,30 @@ const stringifyMetadataManifest = (manifest) => typeof stringifyTransformManifes
     ? stringifyTransformManifest(manifest)
     : `${JSON.stringify(manifest, null, 2)}\n`;
 const isWindowsAbsolutePath = (value) => /^[a-zA-Z]:[\\/]/.test(value);
-const normalizeToPosix = (value) => value.replace(/\\/g, path_1.default.posix.sep);
+const normalizeToPosix = (value) => value.replace(/\\/g, path.posix.sep);
 const isInside = (childPath, parentPath) => {
-    const rel = path_1.default.relative(parentPath, childPath);
-    return rel === '' || (!rel.startsWith('..') && !path_1.default.isAbsolute(rel));
+    const rel = path.relative(parentPath, childPath);
+    return rel === '' || (!rel.startsWith('..') && !path.isAbsolute(rel));
 };
 const isWywCssAssetName = (value) => value.endsWith('.wyw-in-js.css');
 const normalizeAssetRelativePath = (value) => {
-    const normalized = path_1.default.posix.normalize(normalizeToPosix(value).replace(/^\/+/, ''));
-    if (normalized.startsWith('..') || path_1.default.posix.isAbsolute(normalized)) {
+    const normalized = path.posix.normalize(normalizeToPosix(value).replace(/^\/+/, ''));
+    if (normalized.startsWith('..') || path.posix.isAbsolute(normalized)) {
         return null;
     }
     return normalized;
 };
 const stripExtension = (value) => {
-    const ext = path_1.default.posix.extname(value);
+    const ext = path.posix.extname(value);
     return ext ? value.slice(0, -ext.length) : value;
 };
 const getComparableAssetPaths = (value, rootDir) => {
     const variants = new Set();
     const normalized = normalizeToPosix(value);
     variants.add(normalized);
-    if (path_1.default.isAbsolute(value) || isWindowsAbsolutePath(normalized)) {
+    if (path.isAbsolute(value) || isWindowsAbsolutePath(normalized)) {
         if (isInside(value, rootDir)) {
-            const relativeToRoot = normalizeAssetRelativePath(path_1.default.relative(rootDir, value));
+            const relativeToRoot = normalizeAssetRelativePath(path.relative(rootDir, value));
             if (relativeToRoot) {
                 variants.add(relativeToRoot);
             }
@@ -144,8 +105,8 @@ const findWywCssAssetFileName = (bundle, cssFilename, rootDir) => {
     return null;
 };
 const getRelativeImportPath = (fromFileName, toFileName) => {
-    const fromDir = path_1.default.posix.dirname(normalizeToPosix(fromFileName));
-    const relativePath = path_1.default.posix.relative(fromDir, normalizeToPosix(toFileName));
+    const fromDir = path.posix.dirname(normalizeToPosix(fromFileName));
+    const relativePath = path.posix.relative(fromDir, normalizeToPosix(toFileName));
     return relativePath.startsWith('.') ? relativePath : `./${relativePath}`;
 };
 const escapeForRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
@@ -188,7 +149,7 @@ const safeDecodeURIComponent = (value) => {
 };
 const normalizeViteFsPath = (value) => {
     const fsPath = value.slice(VITE_FS_PREFIX.length);
-    return path_1.default.normalize(safeDecodeURIComponent(fsPath));
+    return path.normalize(safeDecodeURIComponent(fsPath));
 };
 const isCssReloadTarget = (value) => {
     if (!value || typeof value !== 'object')
@@ -217,12 +178,12 @@ const getWywCssAssetFileNames = (resolvedConfig, output, originalAssetFileNames)
     const preserveModulesRootValue = output.preserveModulesRoot;
     let preserveModulesRootAbs = null;
     if (typeof preserveModulesRootValue === 'string') {
-        preserveModulesRootAbs = path_1.default.isAbsolute(preserveModulesRootValue)
+        preserveModulesRootAbs = path.isAbsolute(preserveModulesRootValue)
             ? preserveModulesRootValue
-            : path_1.default.resolve(rootDir, preserveModulesRootValue);
+            : path.resolve(rootDir, preserveModulesRootValue);
     }
     const preserveModulesRootRel = preserveModulesRootAbs && isInside(preserveModulesRootAbs, rootDir)
-        ? normalizeToPosix(path_1.default.relative(rootDir, preserveModulesRootAbs))
+        ? normalizeToPosix(path.relative(rootDir, preserveModulesRootAbs))
         : null;
     return (assetInfo) => {
         const template = typeof originalAssetFileNames === 'function'
@@ -237,18 +198,18 @@ const getWywCssAssetFileNames = (resolvedConfig, output, originalAssetFileNames)
         }
         let relativePath = null;
         const assetNameNormalized = normalizeToPosix(assetName);
-        if (path_1.default.isAbsolute(assetName) ||
+        if (path.isAbsolute(assetName) ||
             isWindowsAbsolutePath(assetNameNormalized)) {
             const preserveRel = preserveModulesRootAbs && isInside(assetName, preserveModulesRootAbs)
-                ? path_1.default.relative(preserveModulesRootAbs, assetName)
+                ? path.relative(preserveModulesRootAbs, assetName)
                 : null;
             if (preserveRel &&
-                !path_1.default.isAbsolute(preserveRel) &&
+                !path.isAbsolute(preserveRel) &&
                 !preserveRel.startsWith('..')) {
                 relativePath = preserveRel;
             }
             else if (isInside(assetName, rootDir)) {
-                relativePath = path_1.default.relative(rootDir, assetName);
+                relativePath = path.relative(rootDir, assetName);
             }
         }
         else if (preserveModulesRootRel &&
@@ -266,13 +227,13 @@ const getWywCssAssetFileNames = (resolvedConfig, output, originalAssetFileNames)
         }
         const withoutExt = stripExtension(normalized);
         if (template.includes('[name]')) {
-            const dir = path_1.default.posix.dirname(withoutExt);
+            const dir = path.posix.dirname(withoutExt);
             if (dir === '.' || dir === '') {
                 return template;
             }
             return template.replace(/\[name\]/g, `${dir}/[name]`);
         }
-        const dir = path_1.default.posix.dirname(withoutExt);
+        const dir = path.posix.dirname(withoutExt);
         if (dir === '.' || dir === '') {
             return template;
         }
@@ -287,7 +248,7 @@ const getWywCssAssetFileNames = (resolvedConfig, output, originalAssetFileNames)
         return `${prefix}${dir}/${template.slice(idx)}`;
     };
 };
-function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepComments, prefixer, preprocessor, ssrDevCss, ssrDevCssPath, transformLibraries, ...rest } = {}) {
+export default function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepComments, prefixer, preprocessor, ssrDevCss, ssrDevCssPath, transformLibraries, ...rest } = {}) {
     const supportedModuleExtensions = new Set([
         '.cjs',
         '.cts',
@@ -298,7 +259,7 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
         '.ts',
         '.tsx',
     ]);
-    const filter = (0, vite_1.createFilter)(include, exclude);
+    const filter = createFilter(include, exclude);
     const cssLookup = {};
     const cssFileLookup = {};
     const metadataLookup = {};
@@ -308,6 +269,18 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
     let config;
     let devServer;
     let importMetaEnvForEval = null;
+    let nativeResolverAlias = {};
+    const buildOverrideContext = (getEnv) => (context, filename) => {
+        const env = getEnv();
+        const withEnv = env
+            ? { ...context, __wyw_import_meta_env: env }
+            : context;
+        return rest.overrideContext
+            ? rest.overrideContext(withEnv, filename)
+            : withEnv;
+    };
+    const overrideContextClient = buildOverrideContext(() => importMetaEnvForEval?.client);
+    const overrideContextSsr = buildOverrideContext(() => importMetaEnvForEval?.ssr);
     const ssrDevCssEnabled = Boolean(ssrDevCss);
     const [ssrDevCssPathname, ssrDevCssQuery] = (ssrDevCssPath ?? '/_wyw-in-js/ssr.css').split('?', 2);
     const ssrDevCssRoute = ssrDevCssPathname.startsWith('/')
@@ -333,29 +306,29 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
     const { emitter, onDone } = createFileReporter(debug ?? false);
     const isSafeAssetPath = (fileName) => fileName !== '' &&
         fileName !== '..' &&
-        !fileName.startsWith(`..${path_1.default.posix.sep}`) &&
-        !path_1.default.posix.isAbsolute(fileName) &&
+        !fileName.startsWith(`..${path.posix.sep}`) &&
+        !path.posix.isAbsolute(fileName) &&
         !isWindowsAbsolutePath(fileName);
     const replaceModuleExtension = (filename, nextExtension) => {
-        const extension = path_1.default.extname(filename);
+        const extension = path.extname(filename);
         return supportedModuleExtensions.has(extension)
             ? `${filename.slice(0, -extension.length)}${nextExtension}`
             : `${filename}${nextExtension}`;
     };
     const toBundleRelativePath = (filename) => {
-        const relativePath = normalizeToPosix(path_1.default.relative(config.root, filename));
+        const relativePath = normalizeToPosix(path.relative(config.root, filename));
         if (isSafeAssetPath(relativePath)) {
             return relativePath;
         }
-        if (!path_1.default.isAbsolute(relativePath) &&
+        if (!path.isAbsolute(relativePath) &&
             !isWindowsAbsolutePath(relativePath)) {
-            return path_1.default.posix.join('_wyw-in-js', 'external', ...relativePath
-                .split(path_1.default.posix.sep)
+            return path.posix.join('_wyw-in-js', 'external', ...relativePath
+                .split(path.posix.sep)
                 .filter(Boolean)
                 .map((segment) => (segment === '..' ? '__up__' : segment)));
         }
-        return path_1.default.posix.join('_wyw-in-js', 'external', ...normalizeToPosix(path_1.default.resolve(filename))
-            .split(path_1.default.posix.sep)
+        return path.posix.join('_wyw-in-js', 'external', ...normalizeToPosix(path.resolve(filename))
+            .split(path.posix.sep)
             .filter(Boolean)
             .map((segment) => segment.replace(/:$/, '')));
     };
@@ -385,15 +358,24 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
     const clientCache = new TransformCacheCollection();
     const ssrCache = new TransformCacheCollection();
     const caches = new Set([clientCache, ssrCache]);
+    let evalBrokersDisposed = false;
+    const disposeEvalBrokers = () => {
+        if (evalBrokersDisposed)
+            return;
+        evalBrokersDisposed = true;
+        for (const cache of caches) {
+            disposeEvalBroker(cache);
+        }
+    };
     const getCache = (isSsr) => isSsr ? ssrCache : clientCache;
     const isInsideCacheDir = (filename) => {
         if (!config.cacheDir) {
             return false;
         }
-        const relative = path_1.default.relative(config.cacheDir, filename);
+        const relative = path.relative(config.cacheDir, filename);
         return (relative !== '' &&
             !relative.startsWith('..') &&
-            !path_1.default.isAbsolute(relative));
+            !path.isAbsolute(relative));
     };
     const getDepsOptimizer = () => {
         if (!devServer)
@@ -430,8 +412,8 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
         }
         return viteResolver(what, importer, false, true);
     };
-    const createAsyncResolver = (0, shared_1.asyncResolverFactory)(async (resolved, what, importer, stack) => {
-        const log = shared_1.logger.extend('vite').extend(getFileIdx(importer));
+    const createAsyncResolver = asyncResolverFactory(async (resolved, what, importer, stack) => {
+        const log = logger.extend('vite').extend(getFileIdx(importer));
         if (resolved) {
             log("resolve ✅ '%s'@'%s -> %O\n%s", what, importer, resolved);
             // Vite adds param like `?v=667939b3` to cached modules
@@ -447,7 +429,7 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
             if (resolvedId.startsWith('/@')) {
                 return null;
             }
-            if (!(0, fs_1.existsSync)(resolvedId)) {
+            if (!existsSync(resolvedId)) {
                 // When Vite resolves to an optimized deps entry (cacheDir) it may not be written yet.
                 // Wait for Vite's optimizer instead of calling optimizeDeps() manually (deprecated in Vite 7).
                 try {
@@ -459,19 +441,19 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
                 // Vite can return an optimized deps entry (from cacheDir) before it's written to disk.
                 // Manually calling optimizeDeps is deprecated in Vite 7 and can also get called many times.
                 // Instead, fall back to resolving the original module path directly.
-                if (!(0, fs_1.existsSync)(resolvedId) && isInsideCacheDir(resolvedId)) {
+                if (!existsSync(resolvedId) && isInsideCacheDir(resolvedId)) {
                     try {
-                        return (0, shared_1.syncResolve)(what, importer, stack);
+                        return syncResolve(what, importer, stack);
                     }
                     catch {
                         // Fall through to preserve previous behavior: return resolvedId and let WyW surface the error.
                     }
                 }
             }
-            if (!(0, fs_1.existsSync)(resolvedId) && !path_1.default.isAbsolute(resolvedId)) {
+            if (!existsSync(resolvedId) && !path.isAbsolute(resolvedId)) {
                 // Vite can resolve an import to a bare specifier when bundling for SSR and marking it as external.
                 // In that case we still need a real file path for WyW evaluation.
-                return (0, shared_1.syncResolve)(what, importer, stack);
+                return syncResolve(what, importer, stack);
             }
             return resolvedId;
         }
@@ -482,12 +464,15 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
         }
         if (!what.startsWith('.') &&
             !what.startsWith('/') &&
-            !path_1.default.isAbsolute(what)) {
+            !path.isAbsolute(what)) {
             // Keep compatibility with SSR externalization: fall back to Node resolution for bare specifiers.
-            return (0, shared_1.syncResolve)(what, importer, stack);
+            return syncResolve(what, importer, stack);
         }
         throw new Error(`Could not resolve ${what}`);
-    }, (what, importer) => [what, importer]);
+    }, (what, importer) => [
+        what,
+        importer,
+    ]);
     const asyncResolveClient = createAsyncResolver(resolveClient);
     const asyncResolveSsr = createAsyncResolver(resolveSsr);
     return {
@@ -500,10 +485,14 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
         },
         buildEnd() {
             onDone(process.cwd());
+            if (config.command === 'build') {
+                disposeEvalBrokers();
+            }
         },
         configResolved(resolvedConfig) {
             config = resolvedConfig;
             viteResolver = config.createResolver();
+            nativeResolverAlias = toNativeResolverAlias(config.resolve?.alias);
             if (preserveCssPaths && config.command === 'build') {
                 const outputs = config.build.rollupOptions.output;
                 let outputEntries = [];
@@ -532,7 +521,7 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
             'envDir' in config && typeof config.envDir === 'string'
                 ? config.envDir
                 : config.root;
-            const loaded = (0, vite_1.loadEnv)(config.mode, envDir, envPrefix);
+            const loaded = loadEnv(config.mode, envDir, envPrefix);
             const base = {
                 ...loaded,
                 BASE_URL: config.base,
@@ -547,32 +536,33 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
         },
         configureServer(_server) {
             devServer = _server;
-            if (!ssrDevCssEnabled || config.command !== 'serve')
-                return;
-            devServer.middlewares.use((req, res, next) => {
-                const { url } = req;
-                if (!url) {
-                    next();
-                    return;
-                }
-                const [pathname] = url.split('?', 1);
-                if (pathname !== ssrDevCssRoute) {
-                    next();
-                    return;
-                }
-                const etag = `W/"${ssrDevCssVersion}"`;
-                const ifNoneMatch = req.headers['if-none-match'];
-                if (ifNoneMatch === etag) {
-                    res.statusCode = 304;
-                    res.end();
-                    return;
-                }
-                res.statusCode = 200;
-                res.setHeader('Content-Type', 'text/css; charset=utf-8');
-                res.setHeader('Cache-Control', 'no-cache');
-                res.setHeader('ETag', etag);
-                res.end(getSsrDevCssContents());
-            });
+            devServer.httpServer?.once('close', disposeEvalBrokers);
+            if (ssrDevCssEnabled && config.command === 'serve') {
+                devServer.middlewares.use((req, res, next) => {
+                    const { url } = req;
+                    if (!url) {
+                        next();
+                        return;
+                    }
+                    const [pathname] = url.split('?', 1);
+                    if (pathname !== ssrDevCssRoute) {
+                        next();
+                        return;
+                    }
+                    const etag = `W/"${ssrDevCssVersion}"`;
+                    const ifNoneMatch = req.headers['if-none-match'];
+                    if (ifNoneMatch === etag) {
+                        res.statusCode = 304;
+                        res.end();
+                        return;
+                    }
+                    res.statusCode = 200;
+                    res.setHeader('Content-Type', 'text/css; charset=utf-8');
+                    res.setHeader('Cache-Control', 'no-cache');
+                    res.setHeader('ETag', etag);
+                    res.end(getSsrDevCssContents());
+                });
+            }
         },
         transformIndexHtml(html) {
             if (!ssrDevCssEnabled || config.command !== 'serve')
@@ -666,20 +656,14 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
                 !filter(url) ||
                 id in cssLookup)
                 return;
-            const log = shared_1.logger.extend('vite').extend(getFileIdx(id));
+            const log = logger.extend('vite').extend(getFileIdx(id));
             log('transform %s', id);
             const isSsr = typeof transformOptions === 'boolean'
                 ? transformOptions
                 : Boolean(transformOptions?.ssr);
-            const overrideContext = (context, filename) => {
-                const env = importMetaEnvForEval?.[isSsr ? 'ssr' : 'client'];
-                const withEnv = env
-                    ? { ...context, __wyw_import_meta_env: env }
-                    : context;
-                return rest.overrideContext
-                    ? rest.overrideContext(withEnv, filename)
-                    : withEnv;
-            };
+            const overrideContext = isSsr
+                ? overrideContextSsr
+                : overrideContextClient;
             const transformServices = {
                 options: {
                     filename: id,
@@ -689,6 +673,7 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
                     preprocessor,
                     pluginOptions: {
                         ...rest,
+                        oxcOptions: mergeOxcResolverAlias(rest.oxcOptions, nativeResolverAlias),
                         overrideContext,
                     },
                 },
@@ -712,7 +697,7 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
                     pluginCode: diagnostic.category,
                 });
             });
-            const relativeId = normalizeToPosix(path_1.default.relative(config.root, id));
+            const relativeId = normalizeToPosix(path.relative(config.root, id));
             const metadataFilename = replaceModuleExtension(id, '.wyw-in-js.json');
             const metadataRelativePath = toBundleRelativePath(metadataFilename);
             delete metadataLookup[metadataRelativePath];
@@ -745,7 +730,7 @@ function wywInJS({ debug, include, exclude, sourceMap, preserveCssPaths, keepCom
             dependencies ??= [];
             const cssFilename = normalizeToPosix(replaceModuleExtension(id, '.wyw-in-js.css'));
             cssFilesByModuleId.set(id, cssFilename);
-            const cssRelativePath = normalizeToPosix(path_1.default.relative(config.root, cssFilename));
+            const cssRelativePath = normalizeToPosix(path.relative(config.root, cssFilename));
             const cssId = `/${cssRelativePath}`;
             if (sourceMap && result.cssSourceMapText) {
                 const map = Buffer.from(result.cssSourceMapText).toString('base64');