fix: gen vscode code

tomgao365 · tomgao365 · commit 134c28393aef · 2026-01-02T14:49:05.000+08:00
diff --git a/packages/vscode-dev/src/gen.ts b/packages/vscode-dev/src/gen.ts
@@ -7,7 +7,7 @@ import { cwd } from 'node:process';
 import { readJson, readJsonSync, writeFile, writeJson } from '@tomjs/node';
 import chalk from 'chalk';
 import chokidar from 'chokidar';
-import { formatCode, getDtsOutputPath, logger } from './utils';
+import { getDtsOutputPath, logger } from './utils';
 
 const ROOT = cwd();
 
@@ -107,8 +107,7 @@ async function genNlsDts(keys: string[], opts: CLIOptions) {
   const nslKeys = [...new Set(keys)];
   nslKeys.sort();
 
-  nlsCode = /* ts */ `
-import '@tomjs/vscode';
+  nlsCode = /* ts */ `import '@tomjs/vscode';
 
 declare module '@tomjs/vscode' {
   type I18nMessageType = ${nslKeys.map(key => `'${key}'`).join(' | ') || 'undefined'};
@@ -122,8 +121,7 @@ declare module '@tomjs/vscode' {
         | [message: I18nMessageType, args: Record<string, any>]
     ) => string;
   }
-}
-  `;
+}`;
 
   await mergeDts(opts);
 
@@ -147,12 +145,10 @@ function getCommandDts(pkg: IExtensionManifest, opts: CLIOptions) {
     return '';
   }
 
-  return /* ts */ `
-  export type BuiltinCommand = ${builtinType || 'undefined'};
+  return /* ts */ `  export type BuiltinCommand = ${builtinType || 'undefined'};
   export type UserCommand = ${commandType || 'undefined'};
 
   export namespace commands {
-
     export function registerCommand( command: UserCommand,
       callback: (...args: any[]) => any,
       thisArg?: any,
@@ -176,8 +172,7 @@ function getCommandDts(pkg: IExtensionManifest, opts: CLIOptions) {
 
   export interface StatusBarItem {
     command?: BuiltinCommand | UserCommand;
-  }
-`;
+  }`;
 }
 
 function getViewDts(pkg: IExtensionManifest) {
@@ -223,9 +218,7 @@ async function genPackageDts(opts: CLIOptions) {
 
   pkgCode = /* ts */ `
 declare module 'vscode' {
-  ${getCommandDts(pkg, opts)}
-
-  ${getViewDts(pkg)}
+${[getCommandDts(pkg, opts), getViewDts(pkg)].filter(s => s).join('\n')}
 }
 `;
 
@@ -236,6 +229,5 @@ declare module 'vscode' {
 
 async function mergeDts(opts: CLIOptions) {
   const codes = [nlsCode, pkgCode].filter(s => s);
-  const code = await formatCode(codes.join('\n\n'), opts.cwd!);
-  await writeFile(getDtsOutputPath(opts), `// generated by @tomjs/vscode-dev\n${code}`);
+  await writeFile(getDtsOutputPath(opts), `// generated by @tomjs/vscode-dev\n${codes.join('\n')}`);
 }
diff --git a/packages/vscode-dev/src/utils.ts b/packages/vscode-dev/src/utils.ts
@@ -6,47 +6,6 @@ import { mkdirpSync } from '@tomjs/node';
 
 export const logger = new Logger({ directory: 'vscode-dev/logs' });
 
-export async function formatCode(code: string, cwd: string) {
-  try {
-    const prettier = await import('prettier');
-
-    let filepath: string | undefined;
-    const configFileNames = ['.prettierrc', '.prettier.cjs', '.prettier.mjs', '.prettier.js'];
-    for (const name of configFileNames) {
-      const fp = path.join(cwd, name);
-      if (fs.existsSync(fp)) {
-        filepath = fp;
-        break;
-      }
-    }
-
-    if (prettier) {
-      return prettier.format(
-        code,
-        filepath
-          ? { filepath }
-          : {
-              parser: 'babel-ts',
-              printWidth: 100,
-              tabWidth: 2,
-              useTabs: false,
-              semi: true,
-              singleQuote: true,
-              trailingComma: 'all',
-              arrowParens: 'avoid',
-              proseWrap: 'never',
-              endOfLine: 'lf',
-            },
-      );
-    }
-  }
-  catch (e: any) {
-    logger.error(e);
-  }
-
-  return code.replace(/^\s+/gm, '').replace(/\n/g, '');
-}
-
 function getDtsDir(cwd: string) {
   const folders = ['types', 'extension', 'src'];
   for (const folder of folders) {
