@cabloy/cli 3.0.84 → 3.0.87

package/dist/index.js

@@ -8,6 +8,7 @@ import NPMConfig from '@npmcli/config';
 import npmDefinitions from '@npmcli/config/lib/definitions/index.js';
 import path from 'node:path';
 import fse from 'fs-extra';
+import { globby } from 'globby';
 import { pathToFileURL } from 'node:url';
 import * as ModuleInfo from '@cabloy/module-info';
 import { ProcessHelper } from '@cabloy/process-helper';
@@ -17,7 +18,6 @@ import gogocode from 'gogocode';
 import tmp from 'tmp';
 import fs from 'node:fs';
 import ejs from '@zhennann/ejs';
-import { globby } from 'globby';
 import isTextOrBinary from 'istextorbinary';
 import BaseCommand from '@zhennann/common-bin';
 import enquirer from 'enquirer';
@@ -201,13 +201,14 @@ class LocalCommon {
     } = await this._generatePackageJson_prepareDeps(projectPath);
     // pkg/pkgOriginal
     const pkgOriginal = await this.cli.helper.loadJSONFile(pkgOriginalFile);
+    let pkg;
     if (fse.existsSync(pkgFile)) {
-      const pkg = await this.cli.helper.loadJSONFile(pkgFile);
+      pkg = await this.cli.helper.loadJSONFile(pkgFile);
       // save back
       await this._generatePackageJson_saveBack(pkg, pkgOriginal, pkgOriginalFile, deps, depsDev);
     }
     // generate pkg from pkgOriginal
-    await this._generatePackageJson_pkgFromPkgOriginal(pkgOriginal, pkgFile, deps, depsDev);
+    await this._generatePackageJson_pkgFromPkgOriginal(projectPath, pkgOriginal, pkg, pkgFile, deps, depsDev);
   }
   async _generatePackageJson_prepareDeps(_projectPath) {
     const deps = {};
@@ -232,7 +233,7 @@ class LocalCommon {
       depsDev
     };
   }
-  async _generatePackageJson_pkgFromPkgOriginal(pkgOriginal, pkgFile, deps, depsDev) {
+  async _generatePackageJson_pkgFromPkgOriginal(projectPath, pkgOriginal, pkg, pkgFile, deps, depsDev) {
     function _handleDeps(nameDependencies, deps) {
       for (const key in deps) {
         const version = deps[key];
@@ -243,7 +244,27 @@ class LocalCommon {
     }
     _handleDeps('dependencies', deps);
     _handleDeps('devDependencies', depsDev);
-    await this.cli.helper.saveJSONFile(pkgFile, pkgOriginal);
+    // zovaRest
+    await this._generatePackageJson_pkgFromZovaRest(projectPath, pkgOriginal.dependencies);
+    // save
+    const strPkgOriginal = `${JSON.stringify(pkgOriginal, null, 2)}\n`;
+    const strPkg = pkg ? `${JSON.stringify(pkg, null, 2)}\n` : '';
+    if (strPkgOriginal !== strPkg) {
+      await fse.writeFile(pkgFile, strPkgOriginal);
+      await this.cli.helper.pnpmInstall();
+    }
+  }
+  async _generatePackageJson_pkgFromZovaRest(projectPath, devDependencies) {
+    if (this.cli.context.brandName !== 'vona') return;
+    const targetDir = path.join(projectPath, 'zovaRest');
+    const bundles = await globby('*', {
+      cwd: targetDir,
+      onlyDirectories: true
+    });
+    for (const bundle of bundles) {
+      const name = `zova-rest-${bundle}`;
+      devDependencies[name] = `file:./zovaRest/${bundle}`;
+    }
   }
   async _generatePackageJson_saveBack(pkg, pkgOriginal, pkgOriginalFile, deps, depsDev) {
     let changed = false;
@@ -259,8 +280,10 @@ class LocalCommon {
       for (const key in moduleDeps) {
         const version = moduleDeps[key];
         if (moduleDepsOriginal[key] && moduleDepsOriginal[key] === version) continue;
+        const isZovaRest = key.includes('zova-rest-');
         const isModule = key.includes('vona-module-') || key.includes('zova-module-');
         const isModuleWorkspace = isModule && version.startsWith('workspace:');
+        if (isZovaRest && version.includes('file:')) continue;
         if (isModuleWorkspace) continue;
         if (deps[key] && !isModule) continue;
         moduleDepsOriginal[key] = version;
@@ -462,6 +485,9 @@ class LocalHelper {
   async pnpmInstall() {
     // args
     const args = ['install'];
+    if (process.env.GITHUB_ACTIONS === 'true') {
+      args.push('--no-frozen-lockfile');
+    }
     // log
     await this.console.log('===> pnpm install');
     // spawn

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

@@ -12,7 +12,8 @@ export declare class LocalCommon {
         deps: TypeDeps;
         depsDev: TypeDeps;
     }>;
-    _generatePackageJson_pkgFromPkgOriginal(pkgOriginal: IModulePackage, pkgFile: string, deps: TypeDeps, depsDev: TypeDeps): Promise<void>;
+    _generatePackageJson_pkgFromPkgOriginal(projectPath: string, pkgOriginal: IModulePackage, pkg: IModulePackage | undefined, pkgFile: string, deps: TypeDeps, depsDev: TypeDeps): Promise<void>;
+    _generatePackageJson_pkgFromZovaRest(projectPath: string, devDependencies: {}): Promise<void>;
     _generatePackageJson_saveBack(pkg: IModulePackage, pkgOriginal: IModulePackage, pkgOriginalFile: string, deps: TypeDeps, depsDev: TypeDeps): Promise<void>;
 }
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/cli",
   "type": "module",
-  "version": "3.0.84",
+  "version": "3.0.87",
   "description": "@cabloy/cli",
   "publishConfig": {
     "access": "public"
@@ -27,11 +27,11 @@
   ],
   "dependencies": {
     "@babel/parser": "^7.26.5",
-    "@cabloy/module-glob": "^5.2.43",
-    "@cabloy/module-info": "^1.3.32",
+    "@cabloy/module-glob": "^5.2.46",
+    "@cabloy/module-info": "^1.3.33",
     "@cabloy/process-helper": "^2.0.25",
-    "@cabloy/utils": "^2.0.8",
-    "@cabloy/word-utils": "^2.0.1",
+    "@cabloy/utils": "^2.0.11",
+    "@cabloy/word-utils": "^2.0.2",
     "@npmcli/config": "^10.4.2",
     "@zhennann/common-bin": "^4.0.0",
     "@zhennann/ejs": "^3.0.1",