zova-cli-set-front 1.2.16 → 1.2.17

package/dist/index.js

@@ -10,16 +10,17 @@ import { createRequire } from 'node:module';
 import { camelToKebab, replaceTemplate, toUpperCaseFirstChar, toLowerCaseFirstChar, skipPrefix, stringToCapitalize } from '@cabloy/word-utils';
 import fse from 'fs-extra';
 import { build as build$1 } from 'tsdown';
-import { createConfigUtils } from 'zova-vite';
-import { getOnionScenesMeta, getOnionMetasMeta } from '@cabloy/module-info';
+import yaml from 'yaml';
+import { saveJSONFile as saveJSONFile$1, createConfigUtils } from 'zova-vite';
 import fs from 'node:fs';
+import 'node:url';
+import { getOnionScenesMeta, getOnionMetasMeta } from '@cabloy/module-info';
 import compressing from 'compressing';
 import os from 'node:os';
 import urllib from 'urllib';
 import { extend } from '@cabloy/extend';
 import { catchError, matchSelector, getPropertyObject, evaluateSimple, StringPrefixRegexp } from '@cabloy/utils';
 import ts from 'typescript';
-import 'node:url';
 import { globbySync, globby } from 'globby';
 import gogocode from 'gogocode';
 import { optimize } from 'svgo';
@@ -153,6 +154,42 @@ class CliBinBuildModule extends BeanCliBase {
   }
 }
 
+function getControllerFileName(module, type, beanName) {
+  const controllerFile = path.join(module.root, `src/${type}/${beanName}/controller.ts`);
+  if (fs.existsSync(controllerFile)) {
+    return 'controller.ts';
+  }
+  return 'controller.tsx';
+}
+async function loadJSONFile(fileName) {
+  const pkgContent = (await fse.readFile(fileName)).toString();
+  return JSON.parse(pkgContent);
+}
+async function saveJSONFile(fileName, json) {
+  await fse.writeFile(fileName, `${JSON.stringify(json, null, 2)}\n`);
+}
+
+function svgResolverPlugin() {
+  return {
+    name: 'svg-resolver',
+    resolveId: {
+      filter: {
+        id: /\.svg$/
+      },
+      handler(source, importer) {
+        return path.resolve(path.dirname(importer), source);
+      }
+    },
+    load: {
+      filter: {
+        id: /\.svg$/
+      },
+      handler(_id) {
+        return 'export default {};';
+      }
+    }
+  };
+}
 const __template_package = `{
   "name": "{{Name}}",
   "version": "{{Version}}",
@@ -207,6 +244,15 @@ class CliBinBuildRest extends BeanCliBase {
     // index.ts
     await this._prepareResourcesIndex(context);
   }
+  _prepareBundleModules() {
+    const modules = [];
+    for (const module of this.modulesMeta.modulesArray) {
+      if (module.root.includes('/src/module/') || module.root.includes('/src/suite/')) {
+        modules.push(module.info.fullName);
+      }
+    }
+    return modules;
+  }
   async _build({
     projectPath,
     flavor,
@@ -214,6 +260,8 @@ class CliBinBuildRest extends BeanCliBase {
     srcDir,
     outDir
   }) {
+    const bundleModules = this._prepareBundleModules();
+    // entry
     const entry = path.join(srcDir, 'index.ts');
     // build
     await build$1({
@@ -222,15 +270,29 @@ class CliBinBuildRest extends BeanCliBase {
       outDir,
       tsconfig: 'tsconfig.rest.json',
       dts: {
-        resolve: true,
+        // resolve: true,
         resolver: 'tsc',
         tsgo: true,
         eager: true,
         tsconfig: 'tsconfig.rest.json'
-      }
+      },
+      plugins: [svgResolverPlugin()],
+      deps: {
+        alwaysBundle: id => {
+          if (bundleModules.includes(id)) return true;
+          return false;
+        }
+      },
+      minify: true
     });
+    // deps
+    const deps = await _extractDeps(path.join(outDir, 'index.d.mts'));
+    const depsVersion = await _extractDepsVersion(projectPath, deps);
     // package.json
-    await fse.copyFile(path.join(srcDir, 'package.json'), path.join(outDir, 'package.json'));
+    const pkgContent = await loadJSONFile(path.join(srcDir, 'package.json'));
+    pkgContent.dependencies = depsVersion;
+    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);
@@ -267,69 +329,40 @@ class CliBinBuildRest extends BeanCliBase {
   async _prepareResourcesIndex({
     srcDir
   }) {
-    let indexContent = '';
+    let indexContent = `import type { IIconRecord } from 'zova-module-a-icon';
+export type { IIconRecord } from 'zova-module-a-icon';
+export type { IPagePathRecord } from 'zova-module-a-router';
+`;
     indexContent += await this._prepareResourcesIndex_rest(srcDir);
     indexContent += await this._prepareResourcesIndex_icons(srcDir);
-    indexContent += await this._prepareResourcesIndex_pages(srcDir);
     await fse.writeFile(path.join(srcDir, 'index.ts'), indexContent);
   }
   async _prepareResourcesIndex_rest(srcDir) {
     let content = '';
     for (const module of this.modulesMeta.modulesArray) {
-      const restIndexFile = path.join(module.root, 'rest/index.ts');
-      if (!fse.existsSync(restIndexFile)) continue;
-      const restIndexFileRelative = path.relative(srcDir, restIndexFile);
+      const restDir = path.join(module.root, 'rest');
+      if (!fse.existsSync(restDir)) continue;
+      let tempDir;
+      if (module.info.node_modules) {
+        tempDir = path.join(srcDir, 'modules', module.info.relativeName, 'rest');
+        await fse.copy(restDir, tempDir);
+      } else {
+        tempDir = path.join(module.root, 'rest');
+      }
+      const restIndexFile = path.join(tempDir, 'index.ts');
+      let restIndexFileRelative = path.relative(srcDir, restIndexFile);
+      if (!restIndexFileRelative.startsWith('.')) {
+        restIndexFileRelative = `./${restIndexFileRelative}`;
+      }
       content += `export * from '${restIndexFileRelative}';\n`;
     }
     return content;
   }
   async _prepareResourcesIndex_icons(_srcDir) {
-    let content = '';
-    for (const module of this.modulesMeta.modulesArray) {
-      const restIconsFile = path.join(module.root, 'rest/icons.txt');
-      if (!fse.existsSync(restIconsFile)) continue;
-      const contentIcons = (await fse.readFile(restIconsFile)).toString();
-      content += `${contentIcons}\n`;
-    }
-    if (content) {
-      content = `export interface IIconRecord {
-${content}
-}
-export function $iconName<K extends keyof IIconRecord>(name: K): any {
+    const content = `export function $iconName<K extends keyof IIconRecord>(name: K): any {
   return name;
 }
 `;
-    }
-    return content;
-  }
-  async _prepareResourcesIndex_pages(_srcDir) {
-    let contentImport = '';
-    let contentRecord = '';
-    for (const module of this.modulesMeta.modulesArray) {
-      const restPagesRecordFile = path.join(module.root, 'rest/pagesRecord.txt');
-      if (!fse.existsSync(restPagesRecordFile)) continue;
-      const restPagesImportFile = path.join(module.root, 'rest/pagesImport.txt');
-      const contentPagesImport = (await fse.readFile(restPagesImportFile)).toString();
-      const contentPagesRecord = (await fse.readFile(restPagesRecordFile)).toString();
-      contentImport += `${contentPagesImport}\n`;
-      contentRecord += `${contentPagesRecord}\n`;
-    }
-    let content = '';
-    if (contentRecord) {
-      content = `${contentImport}
-export interface TypePagePathSchema<PARAMS = unknown, QUERY = unknown> {
-  params?: PARAMS;
-  query?: QUERY;
-}
-export interface IPagePathRecord {
-${contentRecord}
-'/': TypePagePathSchema<undefined,undefined>;
-presetLogin: TypePagePathSchema<undefined,undefined>;
-presetErrorExpired: TypePagePathSchema<undefined,undefined>;
-presetResource: TypePagePathSchema<undefined,undefined>;
-}
-`;
-    }
     return content;
   }
 }
@@ -344,6 +377,64 @@ function _copyToTarget(outDir, target, bundleNameCopy) {
     });
   }
 }
+async function _extractDeps(filePath) {
+  let content = (await fse.readFile(filePath)).toString();
+  const pos = content.indexOf('//#region');
+  content = content.substring(0, pos);
+  const packageNames = new Set();
+  const re = /import\s+[\s\S]*?\s+from\s+['"]([^'"]+)['"]/g;
+  let match;
+  while (true) {
+    match = re.exec(content);
+    if (!match) break;
+    let pkg = match[1];
+    if (pkg.startsWith('.') || pkg.startsWith('/')) continue;
+    if (pkg.startsWith('@')) {
+      if (pkg.split('/').length > 2) {
+        pkg = pkg.split('/').slice(0, 2).join('/');
+      }
+    } else {
+      if (pkg.split('/').length > 1) {
+        pkg = pkg.split('/').slice(0, 1).join('/');
+      }
+    }
+    packageNames.add(pkg);
+  }
+  return Array.from(packageNames).sort();
+}
+async function _extractDepsVersion(projectPath, deps) {
+  const lockfilePath = path.join(projectPath, 'pnpm-lock.yaml');
+  const lockfileContent = (await fse.readFile(lockfilePath)).toString();
+  const parsedLockfile = yaml.parse(lockfileContent);
+  const depsVersion = {};
+  for (const dep of deps) {
+    let version = getPackageVersionFromLock(parsedLockfile, dep);
+    if (!version) {
+      version = await getPackageVersionFromNodeModules(projectPath, dep);
+    }
+    if (!version) {
+      console.warn('dep version not found: ', dep);
+      continue;
+    }
+    depsVersion[dep] = `^${version}`;
+  }
+  return depsVersion;
+}
+function getPackageVersionFromLock(parsedLockfile, packageName) {
+  const packages = parsedLockfile.packages || {};
+  for (const key in packages) {
+    if (key.startsWith(`${packageName}@`)) {
+      return key.substring(`${packageName}@`.length);
+    }
+  }
+  return null;
+}
+async function getPackageVersionFromNodeModules(projectPath, packageName) {
+  const pkgFile = path.join(projectPath, 'node_modules', packageName, 'package.json');
+  if (!fse.existsSync(pkgFile)) return null;
+  const pkgContent = await loadJSONFile(pkgFile);
+  return pkgContent.version;
+}
 
 const __ThisSetName__ = 'front';
 
@@ -2176,21 +2267,6 @@ class CliRefactorAnotherStyle extends BeanCliBase {
   }
 }
 
-function getControllerFileName(module, type, beanName) {
-  const controllerFile = path.join(module.root, `src/${type}/${beanName}/controller.ts`);
-  if (fs.existsSync(controllerFile)) {
-    return 'controller.ts';
-  }
-  return 'controller.tsx';
-}
-async function loadJSONFile(fileName) {
-  const pkgContent = (await fse.readFile(fileName)).toString();
-  return JSON.parse(pkgContent);
-}
-async function saveJSONFile(fileName, json) {
-  await fse.writeFile(fileName, `${JSON.stringify(json, null, 2)}\n`);
-}
-
 class CliRefactorComponentEmits extends BeanCliBase {
   async execute() {
     const {
@@ -2904,15 +2980,18 @@ ${contentResourceIcons}
 /** icons: end */
 `;
   // restComponent
-  await generateRestIcon(moduleName, modulePath, resourceIcons);
+  await generateRestIcon(moduleName, modulePath);
   // ok
   return content;
 }
-async function generateRestIcon(_moduleName, modulePath, resourceIcons) {
+async function generateRestIcon(moduleName, modulePath, _resourceIcons) {
   // icons
-  const contentResourceIcons = resourceIcons.join('\n');
-  const fileIcons = path.join(modulePath, 'rest/icons.txt');
+  const contentResourceIcons = `import 'zova-module-${moduleName}';\n`;
+  const fileIcons = path.join(modulePath, 'rest/icons.ts');
   await fse.outputFile(fileIcons, contentResourceIcons);
+  // index
+  const exportIndexContent = "export * from './icons.js';";
+  await generateRestIndex(modulePath, exportIndexContent);
 }
 async function _generateFileConfigIcons(groups) {
   const groupsFrontImport = [];
@@ -2996,6 +3075,18 @@ function _getRecordId(moduleName, groupName, iconName) {
   if (groupName === 'default') groupName = '';
   return `${moduleName}:${groupName}:${iconName}`;
 }
+async function generateRestIndex(modulePath, append) {
+  // index
+  const fileIndex = path.join(modulePath, 'rest/index.ts');
+  let contentIndex = '';
+  if (fse.existsSync(fileIndex)) {
+    contentIndex = (await fse.readFile(fileIndex)).toString();
+  }
+  if (!contentIndex.includes(append)) {
+    contentIndex = `${contentIndex}${append}\n`;
+    await fse.outputFile(fileIndex, contentIndex);
+  }
+}
 
 // import SVGCompiler from 'svg-baker';
 // const svgSymbol = await new SVGCompiler().addSymbol({
@@ -3462,6 +3553,9 @@ class CliToolsMetadata extends BeanCliBase {
       // do nothing
       return;
     }
+    // rest
+    await rimraf(path.join(modulePath, 'rest'));
+    // metaDir
     await this.helper.ensureDir(metaDir);
     // relativeNameCapitalize
     const relativeNameCapitalize = this.helper.stringToCapitalize(moduleName, '-');

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

@@ -16,11 +16,11 @@ interface IBinBuildRestContext {
 export declare class CliBinBuildRest extends BeanCliBase {
     execute(): Promise<void>;
     _prepareResources(context: IBinBuildRestContext): Promise<void>;
+    _prepareBundleModules(): string[];
     _build({ projectPath, flavor, bundleNameCopy, srcDir, outDir }: IBinBuildRestContext): Promise<void>;
     _prepareResourcesPackage({ projectPath, flavor, bundleName, srcDir }: IBinBuildRestContext): Promise<void>;
     _prepareResourcesIndex({ srcDir }: IBinBuildRestContext): Promise<void>;
     _prepareResourcesIndex_rest(srcDir: string): Promise<string>;
     _prepareResourcesIndex_icons(_srcDir: string): Promise<string>;
-    _prepareResourcesIndex_pages(_srcDir: string): Promise<string>;
 }
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.16",
-  "gitHead": "761a9baced655ccf3197e756c1d046ed651fafd5",
+  "version": "1.2.17",
+  "gitHead": "4caf955ae46d889cab5dd7efc981f562b3b54aa2",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",
@@ -59,10 +59,11 @@
     "rolldown": "^1.0.0-rc.11",
     "rolldown-plugin-dts": "^0.22.5",
     "svgo": "^3.2.0",
-    "tsdown": "^0.18.3",
+    "tsdown": "^0.21.7",
     "typescript": "^5.9.3",
     "urllib": "^4.6.11",
     "vite": "^8.0.2",
+    "yaml": "^2.8.3",
     "zova-openapi": "^1.1.7",
     "zova-vite": "^1.1.12"
   }