@coze-arch/cli 0.0.15-alpha.511af9 → 0.0.15-alpha.73e572

package/lib/cli.js

@@ -2107,7 +2107,7 @@ const EventBuilder = {
 };
 
 var name = "@coze-arch/cli";
-var version = "0.0.15-alpha.511af9";
+var version = "0.0.15-alpha.73e572";
 var description = "coze coding devtools cli";
 var license = "MIT";
 var author = "fanwenjie.fe@bytedance.com";
@@ -6148,40 +6148,72 @@ const byFlag = (flag) => {
 };
 
 function _optionalChain$4(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
-const PATCH_ID$3 = 'vite/add-validate@0.0.14';
+
+
 const COZE_FILE = '.coze';
-const VALIDATE_SCRIPT_FILE = 'scripts/validate.sh';
 const PACKAGE_JSON_FILE$1 = 'package.json';
 
-const VALIDATE_LINE = 'validate = ["bash", "./scripts/validate.sh"]';
-
-const REQUIRED_SCRIPTS = {
-  'ts-check': 'tsc -p tsconfig.json',
-  'lint:build': 'eslint . --quiet',
-  validate: "pnpm run --parallel '/^(ts-check|lint:build)$/'",
+const VALIDATE_RELATED_SCRIPTS = {
+  nextjs: ['validate', 'ts-check', 'lint:build'],
+  vite: ['validate', 'ts-check', 'lint:build'],
+  'nuxt-vue': ['validate', 'ts-check', 'lint:build'],
+  taro: ['validate', 'lint:build', 'tsc'],
+  expo: ['validate', 'lint:client', 'lint:server'],
 };
 
 
 
 
 
-const getTemplateValidateScriptPath = () =>
-  path.join(getTemplatesDir(), 'vite', 'scripts', 'validate.sh');
-
-const getProjectValidateScriptPath = (projectFolder) =>
-  path.join(projectFolder, VALIDATE_SCRIPT_FILE);
+const FG_KEY_MAP = {
+  nextjs: 'coding.arch.patch_nextjs_validate',
+  vite: 'coding.arch.patch_vite_validate',
+  'nuxt-vue': 'coding.arch.patch_nuxt_vue_validate',
+  taro: 'coding.arch.patch_taro_validate',
+  expo: 'coding.arch.patch_expo_validate',
+};
 
-const readTemplateValidateScriptContent = async () =>
-  fs$1.readFile(getTemplateValidateScriptPath(), 'utf-8');
+const VALIDATE_SCRIPT_MAP = {
+  nextjs: 'scripts/validate.sh',
+  vite: 'scripts/validate.sh',
+  'nuxt-vue': 'scripts/validate.sh',
+  taro: '.cozeproj/scripts/validate.sh',
+  expo: '.cozeproj/scripts/validate.sh',
+};
 
 const hasValidateInCoze = (context) =>
   _optionalChain$4([context, 'access', _ => _.cozeConfig, 'optionalAccess', _2 => _2.dev, 'optionalAccess', _3 => _3.validate]) !== undefined;
 
+const getTemplateScripts = async (
+  template,
+) => {
+  const templatePackageJsonPath = path.join(
+    getTemplatesDir(),
+    template,
+    PACKAGE_JSON_FILE$1,
+  );
+  const content = await fs$1.readFile(templatePackageJsonPath, 'utf-8');
+  const templatePackageJson = safeJsonParse(content, null);
+  if (!_optionalChain$4([templatePackageJson, 'optionalAccess', _4 => _4.scripts])) {
+    return {};
+  }
+
+  const relatedKeys = VALIDATE_RELATED_SCRIPTS[template];
+  const result = {};
+  for (const key of relatedKeys) {
+    if (templatePackageJson.scripts[key] !== undefined) {
+      result[key] = templatePackageJson.scripts[key];
+    }
+  }
+  return result;
+};
+
 const getMissingScripts = (
   scripts,
+  templateScripts,
 ) => {
   const missing = {};
-  for (const [key, value] of Object.entries(REQUIRED_SCRIPTS)) {
+  for (const [key, value] of Object.entries(templateScripts)) {
     if (!scripts || scripts[key] === undefined) {
       missing[key] = value;
     }
@@ -6189,46 +6221,69 @@ const getMissingScripts = (
   return missing;
 };
 
-const addValidateToCoze = async (projectFolder) => {
+const addValidateToCoze = async (
+  projectFolder,
+  validateScriptPath,
+) => {
   const cozePath = path.join(projectFolder, COZE_FILE);
   const content = await fs$1.readFile(cozePath, 'utf-8');
 
-  const runLinePattern = /^(run\s*=\s*\[.*\])\s*$/m;
-  const match = content.match(runLinePattern);
-  if (!match) {
+  const validateLine = `validate = ["bash", "${validateScriptPath}"]`;
+
+  const lines = content.split('\n');
+  let devStart = -1;
+  let devEnd = -1;
+
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i].trim() === '[dev]') {
+      devStart = i;
+    } else if (devStart !== -1 && lines[i].startsWith('[')) {
+      devEnd = i;
+      break;
+    }
+  }
+
+  if (devStart === -1) {
     return false;
   }
 
-  const runLine = match[1];
-  const nextContent = content.replace(
-    runLinePattern,
-    `${runLine}\n${VALIDATE_LINE}`,
-  );
+  if (devEnd === -1) {
+    devEnd = lines.length;
+  }
 
-  await fs$1.writeFile(cozePath, nextContent, 'utf-8');
+  lines.splice(devEnd, 0, validateLine);
+  await fs$1.writeFile(cozePath, lines.join('\n'), 'utf-8');
   return true;
 };
 
 const createValidateScript = async (
   projectFolder,
+  template,
+  validateScriptFile,
 ) => {
-  const targetPath = getProjectValidateScriptPath(projectFolder);
+  const targetPath = path.join(projectFolder, validateScriptFile);
   if (await isFileExists(targetPath)) {
     return false;
   }
 
-  const scriptsDir = path.join(projectFolder, 'scripts');
+  const scriptsDir = path.join(projectFolder, validateScriptFile.split('/').slice(0, -1).join('/'));
   if (!(await isFileExists(scriptsDir))) {
     await fs$1.mkdir(scriptsDir, { recursive: true });
   }
 
-  const templateContent = await readTemplateValidateScriptContent();
+  const templateScriptPath = path.join(
+    getTemplatesDir(),
+    template,
+    validateScriptFile,
+  );
+  const templateContent = await fs$1.readFile(templateScriptPath, 'utf-8');
   await fs$1.writeFile(targetPath, templateContent, 'utf-8');
   return true;
 };
 
 const addMissingScriptsToPackageJson = async (
   projectFolder,
+  template,
 ) => {
   const packageJsonPath = path.join(projectFolder, PACKAGE_JSON_FILE$1);
   if (!(await isFileExists(packageJsonPath))) {
@@ -6241,7 +6296,8 @@ const addMissingScriptsToPackageJson = async (
     return false;
   }
 
-  const missingScripts = getMissingScripts(packageJson.scripts);
+  const templateScripts = await getTemplateScripts(template);
+  const missingScripts = getMissingScripts(packageJson.scripts, templateScripts);
   if (Object.keys(missingScripts).length === 0) {
     return false;
   }
@@ -6255,81 +6311,92 @@ const addMissingScriptsToPackageJson = async (
   return true;
 };
 
-const patchViteAddValidate = {
-  id: PATCH_ID$3,
-  template: 'vite',
-  disabled: byFlag('coding.arch.patch_vite_validate'),
-  operations: [
-    {
-      kind: 'file-patch',
-      file: COZE_FILE,
-      description: '在 [dev] 下添加 validate 命令',
-    },
-    {
-      kind: 'create-file',
-      file: VALIDATE_SCRIPT_FILE,
-      description: '创建 validate 脚本',
-    },
-    {
-      kind: 'file-patch',
-      file: PACKAGE_JSON_FILE$1,
-      description: '补齐 validate/ts-check/lint:build 脚本',
-    },
-  ],
-  shouldApply: context =>
-    context.template === 'vite' && !hasValidateInCoze(context),
-  apply: async (context) => {
-    if (context.template !== 'vite') {
-      return {
-        applied: false,
-        patchId: PATCH_ID$3,
-        message: 'Only applies to vite projects, skipping',
-      };
-    }
-
-    if (hasValidateInCoze(context)) {
-      return {
-        applied: false,
-        patchId: PATCH_ID$3,
-        message: '.coze already has validate config, skipping',
-      };
-    }
+const createAddValidatePatch = (template) => {
+  const patchId = `${template}/add-validate@0.0.1`;
+  const validateScriptFile = VALIDATE_SCRIPT_MAP[template];
+  const validateScriptPath = template === 'taro' || template === 'expo'
+    ? validateScriptFile
+    : `./${validateScriptFile}`;
 
-    const cozeUpdated = await addValidateToCoze(context.projectFolder);
-    if (!cozeUpdated) {
-      return {
-        applied: false,
-        patchId: PATCH_ID$3,
-        message:
-          'Failed to add validate to .coze (run line not found), skipping',
-      };
-    }
-    logger.info('Patched .coze: added validate command');
+  return {
+    id: patchId,
+    template,
+    disabled: byFlag(FG_KEY_MAP[template]),
+    operations: [
+      {
+        kind: 'file-patch',
+        file: COZE_FILE,
+        description: '在 [dev] 下添加 validate 命令',
+      },
+      {
+        kind: 'create-file',
+        file: validateScriptFile,
+        description: '创建 validate 脚本',
+      },
+      {
+        kind: 'file-patch',
+        file: PACKAGE_JSON_FILE$1,
+        description: '补齐 validate/ts-check/lint:build 脚本',
+      },
+    ],
+    shouldApply: context => !hasValidateInCoze(context),
+    apply: async (context) => {
+      const cozeUpdated = await addValidateToCoze(
+        context.projectFolder,
+        validateScriptPath,
+      );
+      if (!cozeUpdated) {
+        return {
+          applied: false,
+          patchId,
+          message:
+            'Failed to add validate to .coze ([dev] section not found), skipping',
+        };
+      }
+      if (context.cozeConfig) {
+        context.cozeConfig.dev = {
+          ...context.cozeConfig.dev,
+          validate: ['bash', validateScriptPath],
+        };
+      }
+      logger.info('Patched .coze: added validate command');
 
-    const scriptCreated = await createValidateScript(context.projectFolder);
-    if (scriptCreated) {
-      logger.info('Created scripts/validate.sh');
-    } else {
-      logger.info('scripts/validate.sh already exists, skipping');
-    }
+      const scriptCreated = await createValidateScript(
+        context.projectFolder,
+        template,
+        validateScriptFile,
+      );
+      if (scriptCreated) {
+        logger.info(`Created ${validateScriptFile}`);
+      } else {
+        logger.info(`${validateScriptFile} already exists, skipping`);
+      }
 
-    const scriptsUpdated = await addMissingScriptsToPackageJson(
-      context.projectFolder,
-    );
-    if (scriptsUpdated) {
-      logger.info('Patched package.json: added missing scripts');
-    } else {
-      logger.info('package.json scripts already complete, skipping');
-    }
+      const scriptsUpdated = await addMissingScriptsToPackageJson(
+        context.projectFolder,
+        template,
+      );
+      if (scriptsUpdated) {
+        logger.info('Patched package.json: added missing scripts');
+      } else {
+        logger.info('package.json scripts already complete, skipping');
+      }
 
-    return {
-      applied: true,
-      patchId: PATCH_ID$3,
-      message: 'Added validate support to vite project',
-    };
-  },
+      return {
+        applied: true,
+        patchId,
+        message: `Added validate support to ${template} project`,
+      };
+    },
+  };
 };
 
+const patchNextjsAddValidate = createAddValidatePatch('nextjs');
+const patchViteAddValidate = createAddValidatePatch('vite');
+const patchNuxtVueAddValidate = createAddValidatePatch('nuxt-vue');
+const patchTaroAddValidate = createAddValidatePatch('taro');
+const patchExpoAddValidate = createAddValidatePatch('expo');
+
 function _optionalChain$3(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 const PATCH_ID$2 = 'taro/update-pack-script-for-tt-build@0.0.13';
 const PACKAGE_JSON_FILE = 'package.json';
@@ -6756,7 +6823,11 @@ const patches = [
   patchNextOutputTracingRoot,
   patchTaroAgentsMd,
   patchTaroPackScript,
+  patchNextjsAddValidate,
   patchViteAddValidate,
+  patchNuxtVueAddValidate,
+  patchTaroAddValidate,
+  patchExpoAddValidate,
 ] ;
 
 const getTemplatePatches = (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/cli",
-  "version": "0.0.15-alpha.511af9",
+  "version": "0.0.15-alpha.73e572",
   "private": false,
   "description": "coze coding devtools cli",
   "license": "MIT",