zova-cli-set-front 1.2.118 → 1.2.120

package/cli/templates/create/page/snippets/routes.ts

@@ -1,6 +1,6 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
 
-const __snippet_declare = "import { ZPage<%=argv.nameMeta.fullCapitalize%> } from './.metadata/page/<%=argv.pageName%>.js';\n";
+const __snippet_declare = "import { ZPage<%=argv.nameMeta.fullCapitalize%> } from './.metadata/page/<%=argv.pageName%>.ts';\n";
 const __snippet_body = '{ path: \'<%=argv.moduleInfo.name!==argv.pageName?argv.pageName:""%>\', component: ZPage<%=argv.nameMeta.fullCapitalize%> },';
 
 export default metadataCustomSnippet({

package/cli/templates/refactor/anotherRender/snippets/render.ts

@@ -19,7 +19,7 @@ export default metadataCustomSnippet({
       ast = ast.replace(" } from 'zova';", ", Use } from 'zova';");
     }
     ast = ast
-      .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.renderClassName} } from './render.${argv.renderName}.jsx';`)
+      .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.renderClassName} } from './render.${argv.renderName}.tsx';`)
       .replace(
         'extends BeanRenderBase {',
         `extends BeanRenderBase {\n  @Use()\n  $$$$render${argv.renderNameCapitalize}: ${argv.renderClassName};\n`,

package/cli/templates/refactor/anotherStyle/snippets/style.ts

@@ -19,7 +19,7 @@ export default metadataCustomSnippet({
       ast = ast.replace(" } from 'zova';", ", Use } from 'zova';");
     }
     ast = ast
-      .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.styleClassName} } from './style.${argv.styleName}.js';`)
+      .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.styleClassName} } from './style.${argv.styleName}.ts';`)
       .replace('extends BeanStyleBase {', `extends BeanStyleBase {\n  @Use()\n  $$$$style${argv.styleNameCapitalize}: ${argv.styleClassName};\n`);
     // ok
     return ast;

package/dist/index.js

@@ -505,6 +505,7 @@ class CliBinBuildRest extends BeanCliBase {
       format: ['esm'],
       outDir,
       tsconfig: 'tsconfig.rest.json',
+      dts: false,
       plugins: [svgResolverPlugin()],
       deps: {
         alwaysBundle: _id => {
@@ -533,9 +534,12 @@ class CliBinBuildRest extends BeanCliBase {
       outDir,
       tsconfig: 'tsconfig.rest.json',
       clean: false,
+      checks: {
+        namespaceConflict: false
+      },
       dts: {
         resolver: 'oxc',
-        tsgo: true,
+        generator: 'tsgo',
         eager: true,
         tsconfig: 'tsconfig.rest.json',
         emitDtsOnly: true
@@ -1775,7 +1779,7 @@ export const OpenApiBaseURL = (sys: ZovaSys) => {
     });
     // output: openapi/index.ts
     const indexFile = path.join(module.root, 'src/api/openapi/index.ts');
-    await fse.outputFile(indexFile, "export * from './baseURL.js';\nexport * from './schemas.js';\nexport * from './types.js';");
+    await fse.outputFile(indexFile, "export * from './baseURL.ts';\nexport * from './schemas.ts';\nexport * from './types.ts';");
     await this.helper.formatFile({
       fileName: indexFile
     });
@@ -1795,7 +1799,7 @@ export const OpenApiBaseURL = (sys: ZovaSys) => {
     }
     let contentSchemas = typeSchemas.join('\n');
     if (contentSchemas.includes('components["schemas"]')) {
-      contentSchemas = `import type { components } from './types.js';\n${contentSchemas}`;
+      contentSchemas = `import type { components } from './types.ts';\n${contentSchemas}`;
     }
     contentSchemas = `// eslint-disable\n${contentSchemas}`;
     return contentSchemas;
@@ -1955,8 +1959,8 @@ export const OpenApiBaseURL = (sys: ZovaSys) => {
     if (contentSignatures.length > 0) importsOpenapiValue.push('OpenApiBaseURL');
     if (contentTypes2.includes('components["schemas"]')) importsOpenapiType.push('components');
     if (contentTypes2.includes('paths[')) importsOpenapiType.push('paths');
-    const contentImportsOpenapiValue = importsOpenapiValue.length > 0 ? `import { ${importsOpenapiValue.join(', ')} } from './openapi/index.js';` : '';
-    const contentImportsOpenapiType = importsOpenapiType.length > 0 ? `import type { ${importsOpenapiType.join(', ')} } from './openapi/index.js';` : '';
+    const contentImportsOpenapiValue = importsOpenapiValue.length > 0 ? `import { ${importsOpenapiValue.join(', ')} } from './openapi/index.ts';` : '';
+    const contentImportsOpenapiType = importsOpenapiType.length > 0 ? `import type { ${importsOpenapiType.join(', ')} } from './openapi/index.ts';` : '';
     const contentImportsOpenapi = [contentImportsOpenapiValue, contentImportsOpenapiType].filter(item => !!item).join('\n');
     // apiContent
     const apiContent = `import { Api, BeanApiBase } from 'zova-module-a-api';
@@ -1985,7 +1989,7 @@ export class Api${apiName} extends BeanApiBase {
   }
 `);
     }
-    const contentImportsApiPath = importsApiPath.length > 0 ? `import { ${importsApiPath.join(', ')} } from '../api/${apiNameLower}.js';` : '';
+    const contentImportsApiPath = importsApiPath.length > 0 ? `import { ${importsApiPath.join(', ')} } from '../api/${apiNameLower}.ts';` : '';
     const apiMetaContent = `import { BeanBase } from 'zova';
 import { ApiMeta } from 'zova-module-a-api';
 ${contentImportsApiPath}
@@ -2646,7 +2650,7 @@ class CliRefactorRenameComponent extends BeanCliBase {
     const routesFile = path.join(targetDir, 'src/routes.ts');
     let content = (await fse.readFile(routesFile)).toString();
     //
-    content = content.replace(`import { ZPage${argv.nameMeta.shortCapitalize} } from './.metadata/page/${argv.nameMeta.short}.js';`, `import { ZPage${argv.componentNameNewCapitalize} } from './.metadata/page/${argv.componentNameNew}.js';`);
+    content = content.replace(`import { ZPage${argv.nameMeta.shortCapitalize} } from './.metadata/page/${argv.nameMeta.short}.ts';`, `import { ZPage${argv.componentNameNewCapitalize} } from './.metadata/page/${argv.componentNameNew}.ts';`);
     //
     const ast = gogocode(content);
     const astNode = ast.find('export const routes: IModuleRoute[] = [$_$]');
@@ -2772,8 +2776,8 @@ async function generateConfig(modulePath) {
   if (!(await fse.pathExists(configFile))) return '';
   // combine
   const content = `/** config: begin */
-export * from '../config/config.js';
-import { config } from '../config/config.js';
+export * from '../config/config.ts';
+import { config } from '../config/config.ts';
 /** config: end */
 `;
   return content;
@@ -2783,8 +2787,8 @@ async function generateConstant(modulePath) {
   if (!(await fse.pathExists(constantFile))) return '';
   // combine
   const content = `/** constant: begin */
-export * from '../config/constants.js';
-import { constants } from '../config/constants.js';
+export * from '../config/constants.ts';
+import { constants } from '../config/constants.ts';
 /** constant: end */
 `;
   return content;
@@ -2800,7 +2804,7 @@ async function generateLocale1(modulePath) {
   for (const file of files) {
     const localeName = path.basename(file, '.ts');
     const className = `locale_${localeName.replace('-', '_')}`;
-    contentImports.push(`import ${className} from '../config/locale/${localeName}.js';`);
+    contentImports.push(`import ${className} from '../config/locale/${localeName}.ts';`);
     contentLocales.push(`  '${localeName}': ${className},`);
   }
   // combine
@@ -2816,7 +2820,7 @@ async function generateLocale2(contentLocales) {
   if (!contentLocales) return '';
   // combine
   const content = `/** locale: begin */
-import { locales } from './locales.js';
+import { locales } from './locales.ts';
 /** locale: end */
 `;
   return content;
@@ -2826,8 +2830,8 @@ async function generateError(modulePath) {
   if (!(await fse.pathExists(errorFile))) return '';
   // combine
   const content = `/** error: begin */
-export * from '../config/errors.js';
-import { errors } from '../config/errors.js';
+export * from '../config/errors.ts';
+import { errors } from '../config/errors.ts';
 /** error: end */
 `;
   return content;
@@ -2991,7 +2995,7 @@ async function generateMonkey_common(modulePath, commandName) {
   if (!(await fse.pathExists(monkeyFile))) return '';
   // combine
   const content = `/** ${commandName}: begin */
-export * from '../${commandName}.js';
+export * from '../${commandName}.ts';
 /** ${commandName}: end */
 `;
   return content;
@@ -3001,7 +3005,7 @@ async function generateMain_common(modulePath, commandName) {
   if (!(await fse.pathExists(monkeyFile))) return '';
   // combine
   const content = `/** ${commandName}: begin */
-export * from '../${commandName}.js';
+export * from '../${commandName}.ts';
 /** ${commandName}: end */
 `;
   return content;
@@ -3035,8 +3039,8 @@ async function globAllTsFiles(moduleName, modulePath) {
     if (fileName.startsWith('_')) continue;
     const parts = fileName.split('.').slice(0, -1);
     const isIgnore = checkIgnoreOfParts(parts);
-    const fileNameJS = fileName.replace('.ts', '.js').replace('.tsx', '.jsx');
-    const fileNameJSRelative = path.relative(pathMetadata, filePath).replace(/\\/g, '/').replace('.ts', '.js').replace('.tsx', '.jsx');
+    const fileNameJS = fileName;
+    const fileNameJSRelative = path.relative(pathMetadata, filePath).replace(/\\/g, '/');
     const fileContent = fse.readFileSync(filePath).toString();
     const isVirtual = fileContent.includes('@Virtual()');
     const isPreload = fileContent.includes('@Preload()');
@@ -3300,7 +3304,7 @@ async function generateScope(moduleName, relativeNameCapitalize, scopeResources,
   // combine
   const content = `/** scope: begin */
 import { ${contentImports.join(', ')} } from 'zova';
-import { Scope } from '${moduleName === 'a-bean' ? '../lib/scope.js' : 'zova-module-a-bean'}';
+import { Scope } from '${moduleName === 'a-bean' ? '../lib/scope.ts' : 'zova-module-a-bean'}';
 
 @Scope()
 export class ScopeModule${relativeNameCapitalize} extends BeanScopeBase {}
@@ -3368,7 +3372,7 @@ async function generateScopeResourcesMeta(globFiles, metaName, _metaMeta, _scene
   if (globFiles.length === 0) return '';
   // combine
   const content = `/** meta ${metaName}: begin */
-import { Meta${toUpperCaseFirstChar(metaName)} } from '../bean/meta.${metaName}.js';
+import { Meta${toUpperCaseFirstChar(metaName)} } from '../bean/meta.${metaName}.ts';
 /** meta ${metaName}: end */
 `;
   return content;
@@ -3520,14 +3524,30 @@ class CliToolsMetadata extends BeanCliBase {
   }
   async _generateThis(moduleName, relativeNameCapitalize, modulePath) {
     const thisDest = path.join(modulePath, 'src/.metadata/this.ts');
-    if (await fse.pathExists(thisDest)) return;
+    const exportLine = `export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts';`;
+    if (await fse.pathExists(thisDest)) {
+      const content = await fse.readFile(thisDest, 'utf8');
+      const migrated = this._migrateOwnedExport(content, exportLine);
+      if (migrated !== content) await fse.writeFile(thisDest, migrated);
+      return;
+    }
     const content = `export const __ThisModule__ = '${moduleName}';
-export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.js';
+${exportLine}
 `;
     // save
     await fse.writeFile(thisDest, content);
   }
+  _migrateOwnedExport(content, exportLine) {
+    const pattern = escapeRegExp(exportLine).replace('\\.ts', '\\.(?:js|ts)').replaceAll("'", '[\'"]');
+    let seen = false;
+    return content.replace(new RegExp(`^([ \\t]*)${pattern}([ \\t]*)(\\r?)(\\n|$)`, 'gm'), (_line, indent, trailing, carriageReturn, newline) => {
+      if (seen) return '';
+      seen = true;
+      return `${indent}${exportLine}${trailing}${carriageReturn}${newline}`;
+    });
+  }
   async _prependExportIfNeeded(jsContent, exportLine, sourceFile, modulePath) {
+    jsContent = this._migrateOwnedExport(jsContent, exportLine);
     const sourcePath = path.join(modulePath, sourceFile);
     if ((await fse.pathExists(sourcePath)) && !jsContent.includes(exportLine)) {
       return `${exportLine}\n${jsContent}`;
@@ -3540,10 +3560,10 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.js'
     if (await fse.pathExists(jsFile)) {
       jsContent = (await fse.readFile(jsFile)).toString();
     }
-    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './types/index.js';", 'src/types/index.ts', modulePath);
-    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './lib/index.js';", 'src/lib/index.ts', modulePath);
-    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './.metadata/locales.js';", 'src/.metadata/locales.ts', modulePath);
-    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './.metadata/index.js';", 'src/.metadata/index.ts', modulePath);
+    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './types/index.ts';", 'src/types/index.ts', modulePath);
+    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './lib/index.ts';", 'src/lib/index.ts', modulePath);
+    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './.metadata/locales.ts';", 'src/.metadata/locales.ts', modulePath);
+    jsContent = await this._prependExportIfNeeded(jsContent, "export * from './.metadata/index.ts';", 'src/.metadata/index.ts', modulePath);
     // trim empty
     jsContent = jsContent.replace('export {};\n', '');
     // write

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>;
     _generateLocales(modulePath: string, contentLocales: any): Promise<void>;
     _generateThis(moduleName: string, relativeNameCapitalize: string, modulePath: string): Promise<void>;
+    _migrateOwnedExport(content: string, exportLine: string): string;
     _prependExportIfNeeded(jsContent: string, exportLine: string, sourceFile: string, modulePath: string): Promise<string>;
     _generateIndex(modulePath: string): Promise<void>;
     _generatePackage(modulePath: string, beansPreload: string[]): Promise<void>;

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

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

package/dist-cli/templates/create/page/snippets/routes.js

@@ -1,5 +1,5 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
-const __snippet_declare = "import { ZPage<%=argv.nameMeta.fullCapitalize%> } from './.metadata/page/<%=argv.pageName%>.js';\n";
+const __snippet_declare = "import { ZPage<%=argv.nameMeta.fullCapitalize%> } from './.metadata/page/<%=argv.pageName%>.ts';\n";
 const __snippet_body = '{ path: \'<%=argv.moduleInfo.name!==argv.pageName?argv.pageName:""%>\', component: ZPage<%=argv.nameMeta.fullCapitalize%> },';
 export default metadataCustomSnippet({
     file: 'src/routes.ts',

package/dist-cli/templates/refactor/anotherRender/snippets/render.js

@@ -9,7 +9,7 @@ export default metadataCustomSnippet({
             ast = ast.replace(" } from 'zova';", ", Use } from 'zova';");
         }
         ast = ast
-            .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.renderClassName} } from './render.${argv.renderName}.jsx';`)
+            .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.renderClassName} } from './render.${argv.renderName}.tsx';`)
             .replace('extends BeanRenderBase {', `extends BeanRenderBase {\n  @Use()\n  $$$$render${argv.renderNameCapitalize}: ${argv.renderClassName};\n`);
         // ok
         return ast;

package/dist-cli/templates/refactor/anotherStyle/snippets/style.js

@@ -9,7 +9,7 @@ export default metadataCustomSnippet({
             ast = ast.replace(" } from 'zova';", ", Use } from 'zova';");
         }
         ast = ast
-            .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.styleClassName} } from './style.${argv.styleName}.js';`)
+            .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.styleClassName} } from './style.${argv.styleName}.ts';`)
             .replace('extends BeanStyleBase {', `extends BeanStyleBase {\n  @Use()\n  $$$$style${argv.styleNameCapitalize}: ${argv.styleClassName};\n`);
         // ok
         return ast;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.118",
-  "gitHead": "31497914f41f111229d4d35139e4a609a522b49d",
+  "version": "1.2.120",
+  "gitHead": "c27fb3b5f3566b676b7d635e2e26545c6d389ad7",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",
@@ -59,12 +59,15 @@
     "rolldown": "^1.2.14",
     "rolldown-plugin-dts": "^0.22.5",
     "svgo": "^3.2.0",
-    "tsdown": "^0.21.7",
+    "tsdown": "^0.23.1",
     "typescript": "^5.9.3",
     "urllib": "^4.6.11",
     "vite": "^8.3.4",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.17",
-    "zova-vite": "^1.1.50"
+    "zova-vite": "^1.1.51"
+  },
+  "engines": {
+    "node": ">=24.11.0"
   }
 }