zova-vite 1.1.53 → 1.1.54

package/dist/index.d.ts

@@ -1,6 +1,8 @@
 export * from './collect-css-ssr.ts';
 export * from './configUtils.ts';
+export * from './generateEntryFiles.ts';
 export * from './teleports.ts';
 export * from './types.ts';
 export * from './utils.ts';
 export * from './zova.ts';
+export * from './zovaRuntimeResolver.ts';

package/dist/index.js

@@ -7,6 +7,7 @@ import compileTemplate from 'lodash/template.js';
 import parseArgs from 'minimist';
 import { createRequire } from 'node:module';
 import { pathToFileURL } from 'node:url';
+import { lstatSync } from 'node:fs';
 import chalk from 'chalk';
 import babel from '@cabloy/vite-plugin-babel';
 import devtoolsJson from 'vite-plugin-devtools-json';
@@ -183,6 +184,126 @@ function pathToHref(fileName) {
   return pathToFileURL(fileName).href;
 }
 
+const ZOVA_RUNTIME_DIR_ENV = 'ZOVA_RUNTIME_DIR';
+const ZOVA_ISOLATED_ENV = 'ZOVA_ISOLATED';
+const ZOVA_DEFAULT_RUNTIME_DIR = '.zova';
+
+/**
+ * Resolve the generated-runtime directory without allowing it to escape the
+ * application directory. The returned path always uses `/`, which is also the
+ * separator used by Vite module ids.
+ */
+function resolveZovaRuntimeDir(runtimeDir) {
+  const value = process.env[ZOVA_RUNTIME_DIR_ENV] ?? runtimeDir ?? ZOVA_DEFAULT_RUNTIME_DIR;
+  if (process.env[ZOVA_ISOLATED_ENV] === 'true' && !/^\.zova-build-[a-z0-9][\w-]*$/i.test(value)) {
+    throw new Error('Isolated Zova builds require an explicit .zova-build-<ID> runtime directory');
+  }
+  if (!value || value === '.' || value === '..') {
+    throw new Error('Zova runtime directory must be a non-empty relative path');
+  }
+  // path.isAbsolute only recognizes the host platform. Reject foreign Win32
+  // absolute/drive-relative forms as well so the same input is safe on either
+  // platform.
+  if (path.isAbsolute(value) || path.posix.isAbsolute(value) || path.win32.isAbsolute(value) || /^[a-z]:/i.test(value) || value.startsWith('\\\\')) {
+    throw new Error('Zova runtime directory must be relative to the application directory');
+  }
+  const normalized = value.replaceAll('\\', '/');
+  const parts = normalized.split('/');
+  if (parts.some(part => part === '..')) {
+    throw new Error('Zova runtime directory must remain inside the application directory');
+  }
+  const cleaned = parts.filter(part => part !== '.').join('/');
+  // Generated config/app imports use ../src and ../../src. Keep the runtime
+  // beside src rather than accepting nested paths whose imports would be wrong.
+  if (!/^[\w.-]+$/.test(cleaned) || cleaned === '.' || cleaned === '..') {
+    throw new Error('Zova runtime directory must be one local directory name beside src');
+  }
+  return cleaned;
+}
+
+/** Validate a runner-owned sibling directory before creating or removing it. */
+function resolveZovaLocalPath(appDir, dirName, prefix) {
+  if (!/^[\w.-]+$/.test(dirName) || dirName === '.' || dirName === '..' || prefix !== undefined && (!dirName.startsWith(prefix) || !/^[a-z0-9][\w-]*$/i.test(dirName.slice(prefix.length)))) {
+    throw new Error('Zova local directory must be a validated sibling directory name');
+  }
+  const localPath = path.resolve(appDir, dirName);
+  try {
+    const stat = lstatSync(localPath);
+    if (stat.isSymbolicLink() || !stat.isDirectory()) {
+      throw new Error('Zova local directory must not be a symlink or non-directory');
+    }
+  } catch (error) {
+    if (error.code !== 'ENOENT') throw error;
+  }
+  return localPath;
+}
+function resolveZovaViteContext(options) {
+  const appDir = path.resolve(options.appDir);
+  const runtimeDir = resolveZovaRuntimeDir(options.runtimeDir);
+  const runtimePath = resolveZovaLocalPath(appDir, runtimeDir);
+  return {
+    appDir,
+    runtimeDir,
+    runtimePath,
+    isolated: process.env[ZOVA_ISOLATED_ENV] === 'true'
+  };
+}
+function stripIdQuery(id) {
+  return id.split(/[?#]/, 1)[0];
+}
+function slash(value) {
+  return value.replaceAll('\\', '/');
+}
+function isWithin(root, target) {
+  const relative = path.relative(root, target);
+  return relative === '' || !relative.startsWith(`..${path.sep}`) && relative !== '..' && !path.isAbsolute(relative);
+}
+
+/**
+ * Create the resolver used by isolated builds. Existing source imports point at
+ * `.zova`; isolated builds generate the same files under ZOVA_RUNTIME_DIR.
+ * Delegating the mapped absolute id back to Vite preserves Vite's normal
+ * extension handling (including its `.js` to `.ts` fallback).
+ */
+function createZovaRuntimeResolverPlugin(configOptions) {
+  if (process.env[ZOVA_ISOLATED_ENV] !== 'true') return undefined;
+  const context = resolveZovaViteContext(configOptions);
+  const legacyRuntimePath = path.join(context.appDir, ZOVA_DEFAULT_RUNTIME_DIR);
+  const legacyRuntimePrefix = `${slash(legacyRuntimePath)}/`;
+  return {
+    name: 'zova-runtime-resolver',
+    enforce: 'pre',
+    async resolveId(source, importer, resolveOptions) {
+      const sourceFile = stripIdQuery(source);
+      let sourcePath;
+      if (sourceFile.startsWith('app/.zova/')) {
+        sourcePath = path.join(context.appDir, sourceFile.slice('app/'.length));
+      } else if (path.isAbsolute(sourceFile)) {
+        sourcePath = path.resolve(sourceFile);
+      } else if (sourceFile.startsWith('.')) {
+        if (!importer || importer.startsWith('\0')) return null;
+        const importerPath = path.resolve(stripIdQuery(importer));
+        if (!isWithin(context.appDir, importerPath)) return null;
+        sourcePath = path.resolve(path.dirname(importerPath), sourceFile);
+      } else {
+        return null;
+      }
+      const normalizedSourcePath = slash(sourcePath);
+      if (!normalizedSourcePath.startsWith(legacyRuntimePrefix)) return null;
+      const relative = path.relative(legacyRuntimePath, sourcePath);
+      const mapped = slash(path.join(context.runtimePath, relative)) + source.slice(sourceFile.length);
+      const resolved = await this.resolve(mapped, importer, {
+        ...resolveOptions,
+        skipSelf: true
+      });
+      if (!resolved) {
+        this.error(`Unable to resolve isolated Zova runtime import: ${source}`);
+      }
+      return resolved;
+    }
+  };
+}
+
 // const __ModuleLibs = [
 //   /src\/module\/([^/]*)\//,
 //   /src\/module-vendor\/([^/]*)\//,
@@ -214,6 +335,9 @@ const __ZovaManualChunkVendorsSys = [{
   output: 'faker'
 }];
 function createConfigUtils(configMeta, configOptions) {
+  const {
+    runtimeDir
+  } = resolveZovaViteContext(configOptions);
   let __modulesMeta;
   return {
     loadEnvs: __loadEnvs,
@@ -356,7 +480,7 @@ function createConfigUtils(configMeta, configOptions) {
     const groups = [];
     if (process.env.BUILD_MINIFY === 'false') {
       groups.push({
-        test: /\.zova\/config\.ts/,
+        test: new RegExp(`(?:^|/)${runtimeDir.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}/config\\.ts(?:$|[?#])`),
         name: '-zova-config'
       });
     }
@@ -436,22 +560,10 @@ function createConfigUtils(configMeta, configOptions) {
   // }
 }
 
-function collectTeleports(html, teleports) {
-  return html.replace(/(\n|\r\n)\s*<!--app-teleports-->/, renderTeleports(teleports));
-}
-function renderTeleports(teleports) {
-  if (!teleports) return '';
-  return Object.entries(teleports).reduce((all, [key, value]) => {
-    // This serializer creates dedicated containers, not arbitrary CSS selector targets.
-    const target = /^#[a-z_][\w-]*/i.exec(key);
-    if (!target || target[0] !== key) {
-      throw new Error(`Unsupported SSR Teleport target ${JSON.stringify(key)}. Only simple #id targets are supported (ASCII letter or underscore first, then letters, digits, underscores, or hyphens). Use a dedicated Teleport container, not body.`);
-    }
-    return `${all}<div id="${key.slice(1)}">${value}</div>`;
-  }, '');
-}
-
 async function generateEntryFiles(configMeta, configOptions, modulesMeta, env) {
+  const {
+    runtimeDir
+  } = resolveZovaViteContext(configOptions);
   // config
   await __generateConfig();
   // modules meta
@@ -493,13 +605,13 @@ async function generateEntryFiles(configMeta, configOptions, modulesMeta, env) {
     }
     const contentDest = `${imports.join('\n')}\nexport default [${constNames.join(', ')}];`;
     // output
-    const fileDest = path.join(configOptions.appDir, configOptions.runtimeDir, 'config.ts');
+    const fileDest = path.join(configOptions.appDir, runtimeDir, 'config.ts');
     fse.ensureFileSync(fileDest);
     fse.writeFileSync(fileDest, contentDest, 'utf-8');
   }
   async function __generateAppComponent() {
     // dest
-    const pathDest = path.join(configOptions.appDir, configOptions.runtimeDir, 'app');
+    const pathDest = path.join(configOptions.appDir, runtimeDir, 'app');
     fse.ensureDirSync(pathDest);
     // vars
     const vars = {
@@ -523,8 +635,8 @@ async function generateEntryFiles(configMeta, configOptions, modulesMeta, env) {
     const moduleNames = modulesArray.map(item => item.info.relativeName);
     // src
     const fileSrc = resolveTemplatePath('zova-modules-meta.ejs');
-    const fileDest = path.join(configOptions.appDir, configOptions.runtimeDir, 'modules-meta.ts');
-    await fse.ensureDir(path.join(configOptions.appDir, configOptions.runtimeDir));
+    const fileDest = path.join(configOptions.appDir, runtimeDir, 'modules-meta.ts');
+    await fse.ensureDir(path.join(configOptions.appDir, runtimeDir));
     await copyTemplateFile(fileSrc, fileDest, {
       modules,
       moduleNames
@@ -543,7 +655,7 @@ async function generateEntryFiles(configMeta, configOptions, modulesMeta, env) {
     }
     // src
     const fileSrc = resolveTemplatePath('env.ejs');
-    const fileDest = path.join(configOptions.appDir, configOptions.runtimeDir, 'env.ts');
+    const fileDest = path.join(configOptions.appDir, runtimeDir, 'env.ts');
     await copyTemplateFile(fileSrc, fileDest, {
       envNormal: JSON.stringify(envNormal, null, 2),
       envSecret: JSON.stringify(envSecret, null, 2)
@@ -588,6 +700,21 @@ async function generateEntryFiles(configMeta, configOptions, modulesMeta, env) {
   // }
 }
 
+function collectTeleports(html, teleports) {
+  return html.replace(/(\n|\r\n)\s*<!--app-teleports-->/, renderTeleports(teleports));
+}
+function renderTeleports(teleports) {
+  if (!teleports) return '';
+  return Object.entries(teleports).reduce((all, [key, value]) => {
+    // This serializer creates dedicated containers, not arbitrary CSS selector targets.
+    const target = /^#[a-z_][\w-]*/i.exec(key);
+    if (!target || target[0] !== key) {
+      throw new Error(`Unsupported SSR Teleport target ${JSON.stringify(key)}. Only simple #id targets are supported (ASCII letter or underscore first, then letters, digits, underscores, or hyphens). Use a dedicated Teleport container, not body.`);
+    }
+    return `${all}<div id="${key.slice(1)}">${value}</div>`;
+  }, '');
+}
+
 // eslint-disable-next-line
 const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
 const isCSSRequest = request => CSS_LANGS_RE.test(request);
@@ -636,6 +763,9 @@ function hmrPlugin(_config) {
 
 function generateVitePlugins(configOptions, modulesMeta) {
   const vitePlugins = [];
+  if (process.env.ZOVA_ISOLATED === 'true') {
+    vitePlugins.push(['zova-runtime-resolver', createZovaRuntimeResolverPlugin, configOptions, undefined]);
+  }
   vitePlugins.push(__getVitePluginTs());
   vitePlugins.push(__getVitePluginTsx());
   if (process.env.MOCK_ENABLED === 'true') {
@@ -662,7 +792,8 @@ function generateVitePlugins(configOptions, modulesMeta) {
         babelrc: false,
         configFile: false,
         plugins: [[babelPluginZovaBeanModule, {
-          brandName: 'zova'
+          brandName: 'zova',
+          runtimeDir: resolveZovaRuntimeDir(configOptions.runtimeDir)
         }], [babelPluginZovaBeanUse], [babelPluginTransformTypescriptMetadata], [babelPluginProposalDecorators, {
           version: 'legacy'
         }], [babelPluginTransformClassProperties, {
@@ -683,7 +814,8 @@ function generateVitePlugins(configOptions, modulesMeta) {
     return ['@vitejs/plugin-vue-jsx', vueJsxPlugin, {
       include: /\.[jt]sx$/,
       babelPlugins: [[babelPluginZovaComponent], [babelPluginZovaBehavior], [babelPluginZovaBeanModule, {
-        brandName: 'zova'
+        brandName: 'zova',
+        runtimeDir: resolveZovaRuntimeDir(configOptions.runtimeDir)
       }], [babelPluginZovaBeanUse], [babelPluginTransformTypescriptMetadata], [babelPluginProposalDecorators, {
         version: 'legacy'
       }], [babelPluginTransformClassProperties, {
@@ -856,4 +988,4 @@ async function generateZovaViteMeta(configMeta, configOptions) {
   }
 }
 
-export { SymbolCssResult, collectCss, collectTeleports, copyTemplateFile, copyTemplateIfNeed, createConfigUtils, generateConfigDefine, generateZovaViteMeta, getAbsolutePathOfModule, getAppMode, getEnvFromCli, getEnvMeta, getFlavor, getOutDir, getOutReleasesDir, loadJSONFile, pathToHref, removeCssHotReloaded, renderTeleports, requireModule, resolveTemplatePath, saveJSONFile };
+export { SymbolCssResult, ZOVA_DEFAULT_RUNTIME_DIR, ZOVA_ISOLATED_ENV, ZOVA_RUNTIME_DIR_ENV, collectCss, collectTeleports, copyTemplateFile, copyTemplateIfNeed, createConfigUtils, createZovaRuntimeResolverPlugin, generateConfigDefine, generateEntryFiles, generateZovaViteMeta, getAbsolutePathOfModule, getAppMode, getEnvFromCli, getEnvMeta, getFlavor, getOutDir, getOutReleasesDir, loadJSONFile, pathToHref, removeCssHotReloaded, renderTeleports, requireModule, resolveTemplatePath, resolveZovaLocalPath, resolveZovaRuntimeDir, resolveZovaViteContext, saveJSONFile };

package/dist/types.d.ts

@@ -4,12 +4,19 @@ export interface ZovaViteConfigChunkVendor {
 }
 export interface ZovaViteConfigOptions {
     appDir: string;
-    runtimeDir: string;
+    /** Generated runtime directory, relative to appDir. Defaults to `.zova`. */
+    runtimeDir?: string;
     zovaManualChunk?: {
         debug: boolean;
         vendors: ZovaViteConfigChunkVendor[];
     };
 }
+export interface ZovaViteContext {
+    appDir: string;
+    runtimeDir: string;
+    runtimePath: string;
+    isolated: boolean;
+}
 export interface ZovaViteConfigResult {
     env: {
         [name: string]: string;

package/dist/zovaRuntimeResolver.d.ts

@@ -0,0 +1,21 @@
+import type { Plugin } from 'vite';
+import type { ZovaViteConfigOptions, ZovaViteContext } from './types.ts';
+export declare const ZOVA_RUNTIME_DIR_ENV = "ZOVA_RUNTIME_DIR";
+export declare const ZOVA_ISOLATED_ENV = "ZOVA_ISOLATED";
+export declare const ZOVA_DEFAULT_RUNTIME_DIR = ".zova";
+/**
+ * Resolve the generated-runtime directory without allowing it to escape the
+ * application directory. The returned path always uses `/`, which is also the
+ * separator used by Vite module ids.
+ */
+export declare function resolveZovaRuntimeDir(runtimeDir?: string): string;
+/** Validate a runner-owned sibling directory before creating or removing it. */
+export declare function resolveZovaLocalPath(appDir: string, dirName: string, prefix?: string): string;
+export declare function resolveZovaViteContext(options: ZovaViteConfigOptions): ZovaViteContext;
+/**
+ * Create the resolver used by isolated builds. Existing source imports point at
+ * `.zova`; isolated builds generate the same files under ZOVA_RUNTIME_DIR.
+ * Delegating the mapped absolute id back to Vite preserves Vite's normal
+ * extension handling (including its `.js` to `.ts` fallback).
+ */
+export declare function createZovaRuntimeResolverPlugin(configOptions: ZovaViteConfigOptions): Plugin | undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-vite",
-  "version": "1.1.53",
-  "gitHead": "b0a4dbbda3b804afdfacf0792ad37a6e45724349",
+  "version": "1.1.54",
+  "gitHead": "c94b659a5ab1819ad7714ddacb6875c4f8cbc022",
   "description": "zova vite",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
     "@types/node": "^22.19.17",
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "babel-plugin-transform-typescript-metadata": "^0.4.0",
-    "babel-plugin-zova-bean-module": "^1.2.15",
+    "babel-plugin-zova-bean-module": "^1.2.16",
     "babel-plugin-zova-bean-use": "^1.1.15",
     "babel-plugin-zova-behavior": "^1.1.16",
     "babel-plugin-zova-component": "^1.1.15",