esa-cli 0.0.2-beta.10 → 0.0.2-beta.13

package/dist/commands/init/helper.js

@@ -7,16 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import fs from 'fs-extra';
-import path from 'path';
-import Template from '../../libs/templates/index.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import logger from '../../libs/logger.js';
 import { execSync } from 'child_process';
-import t from '../../i18n/index.js';
+import path from 'path';
 import chalk from 'chalk';
-import { getDirName } from '../../utils/fileUtils/base.js';
+import fs from 'fs-extra';
 import inquirer from 'inquirer';
+import t from '../../i18n/index.js';
+import logger from '../../libs/logger.js';
+import Template from '../../libs/templates/index.js';
+import { getDirName } from '../../utils/fileUtils/base.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
 export const getTemplateInstances = (templateHubPath) => {
     return fs
         .readdirSync(templateHubPath)
@@ -66,22 +66,66 @@ export const preInstallDependencies = (targetPath) => __awaiter(void 0, void 0,
         else {
             logger.log(t('no_build_script').d('No build script found in package.json, skipping build step.'));
         }
+        // After build, try to infer assets directory if not explicitly known
+        try {
+            const candidates = ['dist', 'build', 'out'];
+            for (const dir of candidates) {
+                const abs = path.join(targetPath, dir);
+                if (fs.existsSync(abs) && fs.statSync(abs).isDirectory()) {
+                    // Update config file if present and assets not set
+                    const projectConfig = getProjectConfig(targetPath);
+                    if (projectConfig) {
+                        const { updateProjectConfigFile } = yield import('../../utils/fileUtils/index.js');
+                        if (!projectConfig.assets || !projectConfig.assets.directory) {
+                            yield updateProjectConfigFile({ assets: { directory: dir } }, targetPath);
+                            logger.success(`Detected build output "${dir}" and updated assets.directory`);
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+        catch (_a) { }
     }
 });
 export function checkAndUpdatePackage(packageName) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
+            const spinner = logger.ora;
+            spinner.text = t('checking_template_update').d('Checking esa-template updates...');
+            spinner.start();
             // 获取当前安装的版本
             const __dirname = getDirName(import.meta.url);
             const packageJsonPath = path.join(__dirname, '../../../');
-            const versionInfo = execSync(`npm list ${packageName}`).toString();
+            let versionInfo;
+            try {
+                versionInfo = execSync(`npm list ${packageName}`, {
+                    cwd: packageJsonPath
+                }).toString();
+            }
+            catch (e) {
+                spinner.text = t('template_updating').d('Updating templates to latest...');
+                execSync(`rm -rf node_modules/${packageName}`, {
+                    cwd: packageJsonPath
+                });
+                execSync(`npm install ${packageName}@latest`, {
+                    cwd: packageJsonPath,
+                    stdio: 'inherit'
+                });
+                spinner.stop();
+                logger.log(`├ ${t('template_updated_to_latest').d('Templates updated to latest.')}`);
+                return;
+            }
             const match = versionInfo.match(new RegExp(`(${packageName})@([0-9.]+)`));
             const currentVersion = match ? match[2] : '';
             // 获取最新版本
-            const latestVersion = execSync(`npm view ${packageName} version`)
+            const latestVersion = execSync(`npm view ${packageName} version`, {
+                cwd: packageJsonPath
+            })
                 .toString()
                 .trim();
             if (currentVersion !== latestVersion) {
+                spinner.stop();
                 logger.log(t('display_current_esa_template_version').d(`Current esa-template version:`) +
                     chalk.green(currentVersion) +
                     '    ' +
@@ -93,21 +137,51 @@ export function checkAndUpdatePackage(packageName) {
                     message: t('is_update_to_latest_version').d('Do you want to update templates to latest version?')
                 });
                 if (isUpdate) {
-                    execSync(`rm -rf node_modules/${packageName} &&rm -rf package-lock.json &&npm install ${packageName}@latest`, {
+                    spinner.start(t('template_updating').d('Updating templates to latest...'));
+                    execSync(`rm -rf node_modules/${packageName}`, {
+                        cwd: packageJsonPath
+                    });
+                    execSync(`rm -rf package-lock.json`, {
                         cwd: packageJsonPath
                     });
-                    logger.log(t('updated_esa_template_to_latest_version', { packageName }).d(`${packageName} updated successfully`));
+                    execSync(`npm install ${packageName}@latest`, {
+                        cwd: packageJsonPath,
+                        stdio: 'inherit'
+                    });
+                    spinner.stop();
+                    logger.log(`├ ${t('updated_esa_template_to_latest_version', { packageName }).d(`${packageName} updated successfully`)}`);
                 }
             }
             else {
-                logger.log(t('esa_template_is_latest_version', { packageName }).d(`${packageName} is latest.`));
+                spinner.stop();
+                logger.log(` ${t('checking_esa_template_finished').d(`Checking esa-template finished.`)}`);
+                t('esa_template_is_latest_version', { packageName }).d(`${packageName} is latest.`);
+                logger.divider();
             }
         }
         catch (error) {
             console.log(error);
             if (error instanceof Error) {
-                logger.error('检测和更新包时发生错误，跳过更新模版');
+                logger.ora.fail(t('check_and_update_package_error').d('Error: An error occurred while checking and updating the package, skipping template update'));
             }
         }
     });
 }
+export const getFrameworkConfig = (framework) => {
+    // 从init目录读取template.jsonc
+    const templatePath = path.join(getDirName(import.meta.url), 'template.jsonc');
+    const jsonc = fs.readFileSync(templatePath, 'utf-8');
+    const json = JSON.parse(jsonc);
+    return json[framework];
+};
+/**
+ * 获取框架全部配置
+ * @returns 框架全部配置
+ */
+export const getAllFrameworkConfig = () => {
+    // 从init目录读取template.jsonc
+    const templatePath = path.join(getDirName(import.meta.url), 'template.jsonc');
+    const jsonc = fs.readFileSync(templatePath, 'utf-8');
+    const json = JSON.parse(jsonc);
+    return json;
+};