vona-cli-set-api 1.0.406 → 1.0.409

package/cli/templates/create/project/basic/boilerplate/package.original.json

@@ -46,7 +46,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.231"
+    "vona": "^5.0.232"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-base/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-home-base",
   "type": "module",
-  "version": "5.0.12",
+  "version": "5.0.13",
   "title": "home-base",
   "vonaModule": {
     "dependencies": {

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-base/src/.metadata/index.ts

@@ -114,5 +114,4 @@ declare module 'vona' {
 
   
 }
-
 /** scope: end */

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-home-index",
   "type": "module",
-  "version": "5.0.12",
+  "version": "5.0.13",
   "title": "home-index",
   "vonaModule": {
     "dependencies": {

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/src/.metadata/index.ts

@@ -69,12 +69,7 @@ declare module 'vona-module-a-web' {
 }
 /** controller: end */
 /** locale: begin */
-import locale_en_us from '../config/locale/en-us.ts';
-import locale_zh_cn from '../config/locale/zh-cn.ts';
-export const locales = {
-  'en-us': locale_en_us,
-'zh-cn': locale_zh_cn,
-};
+import { locales } from './locales.ts'
 /** locale: end */
 /** scope: begin */
 import { BeanScopeBase, type BeanScopeUtil, type TypeModuleLocales, type TypeLocaleBase } from 'vona';
@@ -106,8 +101,4 @@ declare module 'vona' {
 
   
 }
-
-export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `home-index::${K}` {
-  return `home-index::${key}`;
-}
 /** scope: end */

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/src/.metadata/locales.ts

@@ -0,0 +1,12 @@
+import type { TypeLocaleBase } from 'vona';
+import locale_en_us from '../config/locale/en-us.ts';
+import locale_zh_cn from '../config/locale/zh-cn.ts';
+
+export const locales = {
+  'en-us': locale_en_us,
+  'zh-cn': locale_zh_cn,
+};
+
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `home-index::${K}` {
+  return `home-index::${key}`;
+}

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/src/controller/home.ts

@@ -3,7 +3,7 @@ import { BeanBase } from 'vona';
 import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Controller, Web } from 'vona-module-a-web';
-import { $locale } from '../.metadata/index.ts';
+import { $locale } from '../.metadata/locales.ts';
 
 export interface IControllerOptionsHome extends IDecoratorControllerOptions {}
 

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/src/index.ts

@@ -1 +1,2 @@
 export * from './.metadata/index.ts';
+export * from './.metadata/locales.ts';

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-home-user",
   "type": "module",
-  "version": "5.0.20",
+  "version": "5.0.21",
   "title": "home-user",
   "vonaModule": {
     "fileVersion": 1,

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/.metadata/index.ts

@@ -571,12 +571,7 @@ export * from '../config/config.ts';
 import type { config } from '../config/config.ts';
 /** config: end */
 /** locale: begin */
-import locale_en_us from '../config/locale/en-us.ts';
-import locale_zh_cn from '../config/locale/zh-cn.ts';
-export const locales = {
-  'en-us': locale_en_us,
-'zh-cn': locale_zh_cn,
-};
+import { locales } from './locales.ts'
 /** locale: end */
 /** scope: begin */
 import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig, type TypeModuleLocales, type TypeLocaleBase } from 'vona';
@@ -614,8 +609,4 @@ declare module 'vona' {
 
   
 }
-
-export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `home-user::${K}` {
-  return `home-user::${key}`;
-}
 /** scope: end */

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/.metadata/locales.ts

@@ -0,0 +1,12 @@
+import type { TypeLocaleBase } from 'vona';
+import locale_en_us from '../config/locale/en-us.ts';
+import locale_zh_cn from '../config/locale/zh-cn.ts';
+
+export const locales = {
+  'en-us': locale_en_us,
+  'zh-cn': locale_zh_cn,
+};
+
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `home-user::${K}` {
+  return `home-user::${key}`;
+}

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/entity/role.ts

@@ -2,7 +2,7 @@ import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import type { IRole } from 'vona-module-a-user';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
-import { $locale } from '../.metadata/index.ts';
+import { $locale } from '../.metadata/locales.ts';
 
 export interface IEntityOptionsRole extends IDecoratorEntityOptions {}
 

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/entity/user.ts

@@ -4,7 +4,7 @@ import type { IUser } from 'vona-module-a-user';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import { z } from 'zod';
-import { $locale } from '../.metadata/index.ts';
+import { $locale } from '../.metadata/locales.ts';
 
 export interface IEntityOptionsUser extends IDecoratorEntityOptions {}
 

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/index.ts

@@ -1,2 +1,3 @@
 export * from './.metadata/index.ts';
+export * from './.metadata/locales.ts';
 export * from './types/index.ts';

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-suite-a-home",
   "type": "module",
-  "version": "5.0.24",
+  "version": "5.0.25",
   "title": "a-home",
   "description": "",
   "author": "zhennann",

package/cli/templates/tools/crud/boilerplate/src/entity/{{resourceName}}.ts_

@@ -1,7 +1,7 @@
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
-import { $locale } from '../.metadata/index.ts';
+import { $locale } from '../.metadata/locales.ts';
 
 export interface IEntityOptions<%=argv.resourceNameCapitalize%> extends IDecoratorEntityOptions {}
 

package/dist/index.js

@@ -690,9 +690,9 @@ class CliBinDbReset extends BeanCliBase {
   }
   async _run(projectPath, _modulesMeta) {
     // testFile
-    let testFile = path.join(import.meta.dirname, './toolsIsolate/dbReset.ts');
+    let testFile = path.join(import.meta.dirname, '../../../toolsIsolate/dbReset.ts');
     if (!fse.existsSync(testFile)) {
-      testFile = path.join(import.meta.dirname, './toolsIsolate/dbReset.js');
+      testFile = path.join(import.meta.dirname, '../dist-toolsIsolate/dbReset.js');
     }
     // run
     let args = [];
@@ -848,9 +848,9 @@ class CliBinPlay extends BeanCliBase {
   }
   async _runIsolate(projectPath) {
     // testFile
-    let testFile = path.join(import.meta.dirname, './toolsIsolate/play.ts');
+    let testFile = path.join(import.meta.dirname, '../../../toolsIsolate/play.ts');
     if (!fse.existsSync(testFile)) {
-      testFile = path.join(import.meta.dirname, './toolsIsolate/play.js');
+      testFile = path.join(import.meta.dirname, '../dist-toolsIsolate/play.js');
     }
     // run
     let args = [];
@@ -912,9 +912,9 @@ class CliBinTest extends BeanCliBase {
     // globs
     const patterns = this._combineTestPatterns(projectPath, modulesMeta);
     // testFile
-    let testFile = path.join(import.meta.dirname, './toolsIsolate/test.ts');
+    let testFile = path.join(import.meta.dirname, '../../../toolsIsolate/test.ts');
     if (!fse.existsSync(testFile)) {
-      testFile = path.join(import.meta.dirname, './toolsIsolate/test.js');
+      testFile = path.join(import.meta.dirname, '../dist-toolsIsolate/test.js');
     }
     // run
     let args = [];
@@ -2151,7 +2151,7 @@ import { constants } from '../config/constants.ts';
 `;
   return content;
 }
-async function generateLocale(modulePath) {
+async function generateLocale1(modulePath, moduleName) {
   const files = await globby('src/config/locale/*.ts', {
     cwd: modulePath
   });
@@ -2163,14 +2163,27 @@ async function generateLocale(modulePath) {
     const localeName = path.basename(file, '.ts');
     const className = `locale_${localeName.replace('-', '_')}`;
     contentImports.push(`import ${className} from '../config/locale/${localeName}.ts';`);
-    contentLocales.push(`'${localeName}': ${className},`);
+    contentLocales.push(`  '${localeName}': ${className},`);
   }
   // combine
-  const content = `/** locale: begin */
+  const content = `import type { TypeLocaleBase } from 'vona';
 ${contentImports.join('\n')}
+
 export const locales = {
-  ${contentLocales.join('\n')}
+${contentLocales.join('\n')}
 };
+
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): \`${moduleName}::\${K}\` {
+  return \`${moduleName}::\${key}\`;
+}
+`;
+  return content;
+}
+async function generateLocale2(contentLocales) {
+  if (!contentLocales) return '';
+  // combine
+  const content = `/** locale: begin */
+import { locales } from './locales.ts'
 /** locale: end */
 `;
   return content;
@@ -2406,9 +2419,6 @@ declare module 'vona' {
     '${moduleName}': typeof errors;
   }` : ''}
 }
-${options.locales ? `\nexport function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): \`${moduleName}::\${K}\` {
-  return \`${moduleName}::\${key}\`;
-}` : ''}
 /** scope: end */
 `;
   return content;
@@ -2552,8 +2562,9 @@ class CliToolsMetadata extends BeanCliBase {
     const contentConstants = await generateConstant(modulePath);
     content += contentConstants;
     // locale
-    const contentLocales = await generateLocale(modulePath);
-    content += contentLocales;
+    const contentLocales1 = await generateLocale1(modulePath, moduleName);
+    const contentLocales2 = await generateLocale2(contentLocales1);
+    content += contentLocales2;
     // error
     const contentErrors = await generateError(modulePath);
     content += contentErrors;
@@ -2562,12 +2573,13 @@ class CliToolsMetadata extends BeanCliBase {
     // main
     content += await generateMain(modulePath);
     // scope
-    content += await generateScope(moduleName, relativeNameCapitalize, scopeResources, {
+    const generateScopeOptions = {
       config: contentConfig,
       errors: contentErrors,
-      locales: contentLocales,
+      locales: contentLocales2,
       constants: contentConstants
-    });
+    };
+    content += await generateScope(moduleName, relativeNameCapitalize, scopeResources, generateScopeOptions);
     // patch
     content = this._generatePatch(content);
     // empty
@@ -2579,6 +2591,8 @@ class CliToolsMetadata extends BeanCliBase {
     // save
     await fse.writeFile(metaIndexFile, content);
     // await this.helper.formatFile({ fileName: metaIndexFile, logPrefix: 'format: ' });
+    // locales
+    await this._generateLocales(modulePath, contentLocales1);
     // generate this
     await this._generateThis(moduleName, relativeNameCapitalize, modulePath);
     // index
@@ -2603,6 +2617,12 @@ class CliToolsMetadata extends BeanCliBase {
     const importContent = `import ${type ? 'type ' : ''}{ ${items.join(',')} } from '${packageName}';`;
     return `${importContent}\n${content}`;
   }
+  async _generateLocales(modulePath, contentLocales) {
+    if (!contentLocales) return;
+    const localesDest = path.join(modulePath, 'src/.metadata/locales.ts');
+    // save
+    await fse.writeFile(localesDest, contentLocales);
+  }
   async _generateThis(moduleName, relativeNameCapitalize, modulePath) {
     const thisDest = path.join(modulePath, 'src/.metadata/this.ts');
     if (fse.existsSync(thisDest)) return;
@@ -2630,6 +2650,12 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts'
     if (fse.existsSync(jsLibFile) && !jsContent.includes(jsLib)) {
       jsContent = `${jsLib}\n${jsContent}`;
     }
+    // jsLocales
+    const jsLocales = "export * from './.metadata/locales.ts';";
+    const jsLocalesFile = path.join(modulePath, 'src/.metadata/locales.ts');
+    if (fse.existsSync(jsLocalesFile) && !jsContent.includes(jsLocales)) {
+      jsContent = `${jsLocales}\n${jsContent}`;
+    }
     // jsMetadata
     const jsMetadata = "export * from './.metadata/index.ts';";
     const jsMetadataFile = path.join(modulePath, 'src/.metadata/index.ts');

package/dist/lib/bean/cli.tools.metadata.d.ts

@@ -9,6 +9,7 @@ export declare class CliToolsMetadata extends BeanCliBase {
     _generateMetadata(moduleName: string, force: boolean): Promise<void>;
     _generatePatch(content: string): string;
     _generatePatch_resources(content: string, packageName: string, resources: string[], type: boolean): string;
+    _generateLocales(modulePath: any, contentLocales: any): Promise<void>;
     _generateThis(moduleName: string, relativeNameCapitalize: string, modulePath: string): Promise<void>;
     _generateIndex(modulePath: string): Promise<void>;
     _generatePackage(modulePath: string): Promise<void>;

package/dist/lib/bean/toolsMetadata/generateConfig.d.ts

@@ -1,4 +1,5 @@
 export declare function generateConfig(modulePath: string): Promise<"" | "/** config: begin */\nexport * from '../config/config.ts';\nimport type { config } from '../config/config.ts';\n/** config: end */\n">;
 export declare function generateConstant(modulePath: string): Promise<"" | "/** constant: begin */\nexport * from '../config/constants.ts';\nimport { constants } from '../config/constants.ts';\n/** constant: end */\n">;
-export declare function generateLocale(modulePath: string): Promise<string>;
+export declare function generateLocale1(modulePath: string, moduleName: string): Promise<string>;
+export declare function generateLocale2(contentLocales: string): Promise<"" | "/** locale: begin */\nimport { locales } from './locales.ts'\n/** locale: end */\n">;
 export declare function generateError(modulePath: string): Promise<"" | "/** error: begin */\nexport * from '../config/errors.ts';\nimport type { errors } from '../config/errors.ts';\n/** error: end */\n">;

package/dist-toolsIsolate/dbReset.js

@@ -0,0 +1,8 @@
+import { closeApp, createGeneralApp } from 'vona-core';
+const argv = process.argv.slice(2);
+const projectPath = argv[0];
+await dbResetRun(projectPath);
+async function dbResetRun(projectPath) {
+    await createGeneralApp(projectPath);
+    await closeApp();
+}

package/dist-toolsIsolate/play.js

@@ -0,0 +1,59 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
+import path from 'node:path';
+import { sleep } from '@cabloy/utils';
+import fse from 'fs-extra';
+import { createGeneralApp, pathToHref } from 'vona-core';
+import whyIsNodeRunning from 'why-is-node-running';
+import parser from 'yargs-parser';
+const __template = `import type { IArgv, VonaApplication } from 'vona';
+
+export async function main(app: VonaApplication, _argv: IArgv) {
+  console.log(import.meta.filename);
+  console.log(app.config.meta);
+  return 'Hello VonaJS';
+}
+`;
+const projectPath = process.argv[2];
+const argv = parser(process.argv.slice(3));
+let mainFile;
+if (argv._[0]?.endsWith('.ts')) {
+    mainFile = argv._[0];
+    argv._ = argv._.slice(1);
+}
+else {
+    mainFile = 'index.ts';
+}
+await playRun(projectPath);
+async function playRun(projectPath) {
+    // create
+    const app = await createGeneralApp(projectPath);
+    // play
+    const playFile = path.join(projectPath, `src/backend/play/${mainFile}`);
+    if (!fse.existsSync(playFile)) {
+        await fse.outputFile(playFile, __template);
+    }
+    // run
+    const playInstance = await import(__rewriteRelativeImportExtension(pathToHref(playFile)));
+    const res = await playInstance.main(app, argv);
+    if (res !== undefined) {
+        // eslint-disable-next-line no-console
+        console.log(res);
+    }
+    // close
+    await app.close();
+    // handles
+    if (process.env.TEST_WHYISNODERUNNING === 'true') {
+        await sleep(2000);
+        const handles = process._getActiveHandles();
+        if (handles.length > 3) {
+            whyIsNodeRunning();
+        }
+    }
+}

package/dist-toolsIsolate/test.js

@@ -0,0 +1,141 @@
+import { createWriteStream } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { run } from 'node:test';
+import { lcov, spec } from 'node:test/reporters';
+import { fileURLToPath } from 'node:url';
+import { catchError, sleep } from '@cabloy/utils';
+import TableClass from 'cli-table3';
+import fse from 'fs-extra';
+import { globby } from 'globby';
+import { cast, createGeneralApp } from 'vona-core';
+import whyIsNodeRunning from 'why-is-node-running';
+const argv = process.argv.slice(2);
+const projectPath = argv[0];
+const coverage = argv[1] === 'true';
+const patterns = (argv[2] || '').split(',');
+await testRun(projectPath, coverage, patterns);
+async function testRun(projectPath, coverage, patterns) {
+    // patterns ignore
+    const patternsIgnore = (!coverage && process.env.TEST_PATTERNS_IGNORE) ? process.env.TEST_PATTERNS_IGNORE.split(',') : undefined;
+    // files
+    const files = await globby(patterns, {
+        cwd: projectPath,
+        ignore: patternsIgnore,
+    });
+    if (process.env.TEST_ONLY === 'true') {
+        files.push(resolveTemplatePath('test/done-only.test.js'));
+    }
+    else {
+        files.push(resolveTemplatePath('test/done.test.js'));
+    }
+    // coverage
+    let coverageIncludeGlobs = [];
+    if (coverage) {
+        if (fse.existsSync(path.join(projectPath, 'packages-vona/vona-core'))) {
+            coverageIncludeGlobs = coverageIncludeGlobs.concat(['packages-vona/vona-core/**/*.ts', 'src/suite-vendor/a-vona/**/*.ts']);
+        }
+        else {
+            coverageIncludeGlobs = coverageIncludeGlobs.concat(['src/module/**/*.ts', 'src/suite/**/*.ts']);
+        }
+    }
+    const coverageExcludeGlobs = [
+        'src/module/*/cli/**/*.ts',
+        'src/module/*/templates/**/*.ts',
+        'src/suite/*/modules/*/cli/**/*.ts',
+        'src/suite/*/modules/*/templates/**/*.ts',
+        'src/module-vendor/*/cli/**/*.ts',
+        'src/module-vendor/*/templates/**/*.ts',
+        'src/suite-vendor/*/modules/*/cli/**/*.ts',
+        'src/suite-vendor/*/modules/*/templates/**/*.ts',
+    ];
+    // app
+    const app = await createGeneralApp(projectPath);
+    // concurrency
+    const concurrency = await prepareConcurrency(app);
+    return new Promise(resolve => {
+        const testStream = run({
+            isolation: 'none',
+            concurrency,
+            only: process.env.TEST_ONLY === 'true',
+            coverage,
+            coverageIncludeGlobs,
+            coverageExcludeGlobs,
+            cwd: projectPath,
+            files,
+            setup: async () => { },
+        })
+            .on('test:coverage', data => {
+            outputCoverageReport(data.summary.totals);
+        })
+            .on('test:summary', async () => {
+            resolve(undefined);
+        })
+            .on('test:pass', async (t) => {
+            if (t.name === '---done---') {
+                const [_, err] = await catchError(() => {
+                    return app.close();
+                });
+                if (err) {
+                    console.error(err);
+                }
+                // handles
+                if (process.env.TEST_WHYISNODERUNNING === 'true') {
+                    await sleep(2000);
+                    const handles = process._getActiveHandles();
+                    if (handles.length > 3) {
+                        whyIsNodeRunning();
+                    }
+                }
+            }
+        });
+        if (coverage) {
+            const reporterDir = path.join(projectPath, 'coverage');
+            fse.ensureDirSync(reporterDir);
+            const reporterLcov = createWriteStream(path.join(reporterDir, 'lcov.info'));
+            testStream.compose(lcov)
+                .pipe(reporterLcov);
+        }
+        else {
+            testStream.compose(spec)
+                .pipe(process.stdout);
+        }
+    });
+}
+async function prepareConcurrency(app) {
+    // check
+    let concurrency = 1;
+    if (process.env.TEST_CONCURRENCY === 'true') {
+        concurrency = os.cpus().length;
+    }
+    else if (process.env.TEST_CONCURRENCY === 'false') {
+        concurrency = 1;
+    }
+    else {
+        concurrency = Number.parseInt(process.env.TEST_CONCURRENCY);
+    }
+    if (concurrency === 1)
+        return concurrency;
+    // check again
+    return await cast(app.bean).executor.mockCtx(async () => {
+        const db = cast(app.bean).database.getDb();
+        return db.dialect.capabilities.level ? concurrency : 1;
+    });
+}
+function outputCoverageReport(totals) {
+    // table
+    const table = new TableClass({
+        head: ['', 'Total', 'Covered', 'Percent'],
+        colWidths: [15, 15, 15, 25],
+    });
+    table.push(['Lines', totals.totalLineCount, totals.coveredLineCount, totals.coveredLinePercent]);
+    table.push(['Branches', totals.totalBranchCount, totals.coveredBranchCount, totals.coveredBranchPercent]);
+    table.push(['Functions', totals.totalFunctionCount, totals.coveredFunctionCount, totals.coveredFunctionPercent]);
+    // eslint-disable-next-line
+    console.log(table.toString());
+}
+;
+function resolveTemplatePath(file) {
+    const url = (new URL(path.join('../templates', file), import.meta.url));
+    return fileURLToPath(url);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.406",
+  "version": "1.0.409",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -25,6 +25,7 @@
   "files": [
     "cli",
     "dist",
+    "dist-toolsIsolate",
     "templates"
   ],
   "dependencies": {
@@ -68,7 +69,7 @@
   },
   "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
   "scripts": {
-    "clean": "rimraf dist tsconfig.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc && tsc -p tsconfig.isolate.json"
+    "clean": "rimraf dist dist-toolsIsolate tsconfig.build.tsbuildinfo tsconfig.isolate.tsbuildinfo",
+    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc -p tsconfig.build.json && tsc -p tsconfig.isolate.json"
   }
 }