zova-cli-set-front 1.2.122 → 1.2.124

package/dist/index.js

@@ -10,7 +10,8 @@ import { createRequire, isBuiltin } from 'node:module';
 import { camelToKebab, toUpperCaseFirstChar, toLowerCaseFirstChar, skipPrefix, stringToCapitalize, replaceTemplate } from '@cabloy/word-utils';
 import fse from 'fs-extra';
 import { build as build$1 } from 'tsdown';
-import { createConfigUtils, saveJSONFile as saveJSONFile$1 } from 'zova-vite';
+import { createConfigUtils, resolveZovaViteContext, generateEntryFiles, saveJSONFile as saveJSONFile$1 } from 'zova-vite';
+import { lstat, readFile, writeFile } from 'node:fs/promises';
 import ts from 'typescript';
 import yaml from 'yaml';
 import fs from 'node:fs';
@@ -151,6 +152,85 @@ class CliBinBuildModule extends BeanCliBase {
   }
 }
 
+async function resolveRestBuildPaths(projectPath, flavor, runtimeDir, env = process.env) {
+  const isolatedKeys = ['ZOVA_ISOLATED', 'ZOVA_RUNTIME_DIR', 'ZOVA_QUASAR_ROOT', 'ZOVA_QUASAR_CACHE', 'ZOVA_QUASAR_CONFIG_DIR', 'ZOVA_REST_DIR', 'ZOVA_REST_TSCONFIG', 'ZOVA_REST_OUTDIR'];
+  const isolated = env.ZOVA_ISOLATED === 'true';
+  if (isolatedKeys.some(key => env[key] !== undefined)) {
+    if (!isolated || isolatedKeys.some(key => !env[key])) {
+      throw new Error('Incomplete isolated REST build environment');
+    }
+  }
+  if (!isolated) {
+    return {
+      isolated,
+      runtimeDir,
+      srcDir: path.join(projectPath, '.zova-rest'),
+      outDir: path.join(projectPath, 'dist', `rest-${flavor}`),
+      tsconfigPath: path.join(projectPath, 'tsconfig.rest.json')
+    };
+  }
+  if (!/^[a-z0-9][\w-]*$/i.test(flavor)) {
+    throw new Error('Invalid isolated REST flavor');
+  }
+  const match = /^\.zova-build-([a-z0-9][\w-]*)$/i.exec(runtimeDir);
+  if (!match) throw new Error('Isolated REST requires a run-specific Zova runtime directory');
+  const id = match[1];
+  const restDir = `.zova-rest-build-${id}`;
+  const quasarDir = `.quasar-build-${id}`;
+  if (env.ZOVA_RUNTIME_DIR !== runtimeDir || env.ZOVA_QUASAR_ROOT !== path.join(projectPath, quasarDir) || env.ZOVA_QUASAR_CACHE !== path.join(projectPath, quasarDir, 'cache') || env.ZOVA_QUASAR_CONFIG_DIR !== path.join(projectPath, quasarDir, 'config') || env.ZOVA_REST_DIR !== restDir || env.ZOVA_REST_TSCONFIG !== `.tsconfig.rest-build-${id}.json`) {
+    throw new Error('Isolated REST paths must belong to the selected build run');
+  }
+  const outputRoot = path.join(projectPath, quasarDir, 'output');
+  const outDir = env.ZOVA_REST_OUTDIR;
+  if (!outDir || !path.isAbsolute(outDir) || path.dirname(path.resolve(outDir)) !== outputRoot || path.basename(outDir) !== `rest-${flavor}`) {
+    throw new Error('Isolated REST output must be the selected run output directory');
+  }
+  // Validate every existing component before removing entry/output content. The
+  // outer runner owns these roots and alone removes them after child drainage.
+  for (const relative of [runtimeDir, restDir, quasarDir, `${quasarDir}/output`, `${quasarDir}/output/rest-${flavor}`, `${restDir}/entry`, `.tsconfig.rest-build-${id}.json`]) {
+    try {
+      const stat = await lstat(path.join(projectPath, relative));
+      if (stat.isSymbolicLink()) throw new Error(`Isolated REST path cannot be a symlink: ${relative}`);
+      if (relative.endsWith('.json')) {
+        if (!stat.isFile() || stat.nlink !== 1) {
+          throw new Error('Isolated REST tsconfig must be a single-link regular file');
+        }
+      } else if (!stat.isDirectory()) {
+        throw new Error(`Isolated REST path must be a directory: ${relative}`);
+      }
+    } catch (error) {
+      if (error.code !== 'ENOENT') throw error;
+      if ([runtimeDir, restDir, quasarDir].includes(relative)) {
+        throw new Error(`Isolated REST root is missing: ${relative}`);
+      }
+    }
+  }
+  return {
+    isolated,
+    runtimeDir,
+    srcDir: path.join(projectPath, restDir, 'entry'),
+    outDir,
+    tsconfigPath: path.join(projectPath, `.tsconfig.rest-build-${id}.json`)
+  };
+}
+async function writeIsolatedRestTsconfig(projectPath, paths) {
+  const basePath = path.join(projectPath, 'tsconfig.rest.json');
+  const base = JSON.parse(await readFile(basePath, 'utf8'));
+  const configDir = path.dirname(paths.tsconfigPath);
+  const relative = target => path.relative(configDir, target).replaceAll('\\', '/');
+  const include = (Array.isArray(base.include) ? base.include : []).filter(item => !/^\.?\/?\.zova-rest(?:\/|$)/.test(item)).map(item => relative(path.resolve(projectPath, item)));
+  include.push(`${relative(paths.srcDir)}/**/*`);
+  await writeFile(paths.tsconfigPath, JSON.stringify({
+    extends: `./${relative(basePath)}`,
+    // rolldown-plugin-dts supplies dirname(tsconfig) as tsgo's rootDir.
+    // Keep this owned config beside the project config, not inside entry/.
+    compilerOptions: {
+      rootDir: '.'
+    },
+    include
+  }, null, 2));
+}
+
 function extractRestDependencies(content) {
   const source = ts.createSourceFile('index.d.mts', content, ts.ScriptTarget.Latest);
   // createSourceFile exposes syntax diagnostics at runtime, but not in its public return type.
@@ -416,11 +496,42 @@ class CliBinBuildRest extends BeanCliBase {
     const bundleName = `zova-rest-${camelToKebab(flavor)}`;
     const bundleNameCopy = `${camelToKebab(flavor)}`;
     //
-    const srcDir = path.join(projectPath, '.zova-rest');
-    const outDir = path.join(projectPath, 'dist', `rest-${flavor}`);
+    const {
+      runtimeDir
+    } = resolveZovaViteContext({
+      appDir: projectPath
+    });
+    const paths = await resolveRestBuildPaths(path.resolve(projectPath), flavor, runtimeDir);
+    const {
+      isolated,
+      srcDir,
+      outDir,
+      tsconfigPath
+    } = paths;
+    if (!isolated) {
+      const manifest = await loadJSONFile(path.join(projectPath, 'package.json'));
+      if (Object.hasOwn(manifest.scripts ?? {}, 'build:isolated')) {
+        const hook = manifest.scripts['build:isolated'];
+        if (typeof hook !== 'string' || !hook.trim()) {
+          throw new Error('The application build:isolated script must be a non-empty string');
+        }
+        if (!/^[a-z0-9][\w-]*$/i.test(flavor)) {
+          throw new Error('Invalid isolated REST flavor');
+        }
+        await this.helper.spawnCmd({
+          cmd: 'npm',
+          args: ['run', 'build:isolated', '--', '--operation', 'rest', flavor],
+          options: {
+            cwd: projectPath
+          }
+        });
+        return;
+      }
+    }
     await rimraf(srcDir);
     await fse.ensureDir(srcDir);
     await rimraf(outDir);
+    if (isolated) await writeIsolatedRestTsconfig(path.resolve(projectPath), paths);
     // context
     const context = {
       projectPath,
@@ -428,15 +539,17 @@ class CliBinBuildRest extends BeanCliBase {
       bundleName,
       bundleNameCopy,
       srcDir,
-      outDir
+      outDir,
+      tsconfigPath,
+      isolated
     };
     //
-    await this._prepareResources(context);
+    await this._prepareResources(context, runtimeDir);
     await this._build(context);
     //
-    await rimraf(srcDir);
+    if (!isolated) await rimraf(srcDir);
   }
-  async _prepareResources(context) {
+  async _prepareResources(context, runtimeDir) {
     const {
       projectPath,
       flavor,
@@ -456,13 +569,16 @@ class CliBinBuildRest extends BeanCliBase {
     };
     const configOptions = {
       appDir: projectPath,
-      runtimeDir: '.zova'
+      runtimeDir
     };
     const configUtils = createConfigUtils(configMeta, configOptions);
     // env
     const env = configUtils.loadEnvs();
     // modulesMeta
     const modulesMeta = await configUtils.loadModulesMeta();
+    if (context.isolated) {
+      await generateEntryFiles(configMeta, configOptions, modulesMeta, env);
+    }
     // Modules
     const modules = [];
     const bundleModules = [];
@@ -495,7 +611,8 @@ class CliBinBuildRest extends BeanCliBase {
   }
   async _buildTs({
     srcDir,
-    outDir
+    outDir,
+    tsconfigPath
   }) {
     // entry
     const entry = path.join(srcDir, 'index.ts');
@@ -504,7 +621,7 @@ class CliBinBuildRest extends BeanCliBase {
       entry: [entry],
       format: ['esm'],
       outDir,
-      tsconfig: 'tsconfig.rest.json',
+      tsconfig: tsconfigPath,
       dts: false,
       plugins: [svgResolverPlugin()],
       deps: {
@@ -522,6 +639,7 @@ class CliBinBuildRest extends BeanCliBase {
   async _buildDts({
     srcDir,
     outDir,
+    tsconfigPath,
     bundleModules,
     sideEffectImportModuleNames
   }) {
@@ -532,7 +650,7 @@ class CliBinBuildRest extends BeanCliBase {
       entry: [entry],
       format: ['esm'],
       outDir,
-      tsconfig: 'tsconfig.rest.json',
+      tsconfig: tsconfigPath,
       clean: false,
       checks: {
         namespaceConflict: false
@@ -541,7 +659,7 @@ class CliBinBuildRest extends BeanCliBase {
         resolver: 'oxc',
         generator: 'tsgo',
         eager: true,
-        tsconfig: 'tsconfig.rest.json',
+        tsconfig: tsconfigPath,
         emitDtsOnly: true
       },
       plugins: [svgResolverPlugin()],
@@ -587,10 +705,12 @@ class CliBinBuildRest extends BeanCliBase {
     await saveJSONFile$1(path.join(outDir, 'package.json'), pkgContent);
     // await fse.copyFile(path.join(srcDir, 'package.json'), path.join(outDir, 'package.json'));
     // release
-    const outReleasesDir = path.join(projectPath, 'dist-releases', `rest-${flavor}-${process.env.APP_VERSION}`);
-    await fse.copy(outDir, outReleasesDir);
-    // copy
-    _copyToTarget(outDir, process.env.BUILD_REST_COPY_DIST, bundleNameCopy, projectPath);
+    if (!buildContext.isolated) {
+      const outReleasesDir = path.join(projectPath, 'dist-releases', `rest-${flavor}-${process.env.APP_VERSION}`);
+      await fse.copy(outDir, outReleasesDir);
+      // copy
+      _copyToTarget(outDir, process.env.BUILD_REST_COPY_DIST, bundleNameCopy, projectPath);
+    }
   }
 }
 function _copyToTarget(outDir, target, bundleNameCopy, projectPath) {

package/dist/lib/bean/cli.bin.buildRest.d.ts

@@ -21,6 +21,8 @@ interface IBinBuildRestContext {
     bundleNameCopy: string;
     srcDir: string;
     outDir: string;
+    tsconfigPath: string;
+    isolated: boolean;
     bundleModules?: string[];
     sideEffectImportModuleNames?: string[];
     moduleRoots?: string[];
@@ -28,9 +30,9 @@ interface IBinBuildRestContext {
 }
 export declare class CliBinBuildRest extends BeanCliBase {
     execute(): Promise<void>;
-    _prepareResources(context: IBinBuildRestContext): Promise<void>;
-    _buildTs({ srcDir, outDir }: IBinBuildRestContext): Promise<void>;
-    _buildDts({ srcDir, outDir, bundleModules, sideEffectImportModuleNames, }: IBinBuildRestContext): Promise<void>;
+    _prepareResources(context: IBinBuildRestContext, runtimeDir: string): Promise<void>;
+    _buildTs({ srcDir, outDir, tsconfigPath }: IBinBuildRestContext): Promise<void>;
+    _buildDts({ srcDir, outDir, tsconfigPath, bundleModules, sideEffectImportModuleNames, }: IBinBuildRestContext): Promise<void>;
     _injectDtsImports(outDir: string, sideEffectImportModuleNames: string[]): Promise<void>;
     _build(buildContext: IBinBuildRestContext): Promise<void>;
 }

package/dist/lib/common/restBuildPaths.d.ts

@@ -0,0 +1,9 @@
+export interface RestBuildPaths {
+    isolated: boolean;
+    runtimeDir: string;
+    srcDir: string;
+    outDir: string;
+    tsconfigPath: string;
+}
+export declare function resolveRestBuildPaths(projectPath: string, flavor: string, runtimeDir: string, env?: Record<string, string | undefined>): Promise<RestBuildPaths>;
+export declare function writeIsolatedRestTsconfig(projectPath: string, paths: RestBuildPaths): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.122",
-  "gitHead": "b0a4dbbda3b804afdfacf0792ad37a6e45724349",
+  "version": "1.2.124",
+  "gitHead": "d1a9a68c5d48db9bc82945c17984dabbec724d8c",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",
@@ -36,7 +36,7 @@
     "@babel/plugin-proposal-decorators": "^7.29.0",
     "@babel/plugin-transform-class-properties": "^7.28.6",
     "@babel/plugin-transform-typescript": "^7.28.6",
-    "@cabloy/cli": "^3.1.31",
+    "@cabloy/cli": "^3.1.32",
     "@cabloy/extend": "^3.2.8",
     "@cabloy/module-info": "^2.0.3",
     "@cabloy/openapi-typescript": "^7.9.2",
@@ -47,7 +47,7 @@
     "@typescript/native-preview": "npm:typescript@7.0.2",
     "@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.17",
     "babel-plugin-zova-bean-use": "^1.1.15",
     "babel-plugin-zova-behavior": "^1.1.16",
     "babel-plugin-zova-component": "^1.1.15",
@@ -65,7 +65,7 @@
     "vite": "^8.3.4",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.17",
-    "zova-vite": "^1.1.53"
+    "zova-vite": "^1.1.55"
   },
   "engines": {
     "node": ">=24.11.0"