fix: vscode-dev d.ts

tomgao365 · tomgao365 · commit f667785d2091 · 2026-01-02T12:00:22.000+08:00
diff --git a/packages/vscode-dev/src/gen.ts b/packages/vscode-dev/src/gen.ts
@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { cwd } from 'node:process';
-import { emptyDirSync, readFile, readJson, readJsonSync, writeFile, writeJson } from '@tomjs/node';
+import { readJson, readJsonSync, writeFile, writeJson } from '@tomjs/node';
 import type { IExtensionManifest } from '@tomjs/vscode-types';
 import chalk from 'chalk';
 import chokidar from 'chokidar';
@@ -11,9 +11,8 @@ import { formatCode, getDtsOutputPath, logger } from './utils';
 
 const ROOT = cwd();
 
-const DTS_CACHE_DIR = path.join(ROOT, 'node_modules', '.cache/@tomjs/vscode-dev');
-const DTS_CACHE_NLS_PATH = path.join(DTS_CACHE_DIR, 'nls.d.ts');
-const DTS_CACHE_PKG_PATH = path.join(DTS_CACHE_DIR, 'pkg.d.ts');
+let nlsCode = '';
+let pkgCode = '';
 
 function createWatcher(paths: string | string[], callback: () => Promise<any>) {
   const watchPaths = Array.isArray(paths) ? paths : [paths];
@@ -51,8 +50,6 @@ function createWatcher(paths: string | string[], callback: () => Promise<any>) {
 }
 
 export async function generateCode(opts: CLIOptions) {
-  emptyDirSync(DTS_CACHE_DIR);
-
   opts.cwd = opts.cwd ?? ROOT;
   opts.locales = path.join(opts.cwd, opts.locales ?? 'locales');
   opts.lang = opts.lang ?? 'en';
@@ -109,7 +106,7 @@ async function genNlsDts(keys: string[], opts: CLIOptions) {
   const nslKeys = [...new Set(keys)];
   nslKeys.sort();
 
-  const code = /* ts */ `
+  nlsCode = /* ts */ `
 import '@tomjs/vscode';
 
 declare module '@tomjs/vscode' {
@@ -127,7 +124,6 @@ declare module '@tomjs/vscode' {
 }
   `;
 
-  await writeFile(DTS_CACHE_NLS_PATH, code);
   await mergeDts(opts);
 
   logger.success(`generate ${chalk.green(opts.dtsName)} [package.nls.json]`);
@@ -223,34 +219,21 @@ async function genPackageDts(opts: CLIOptions) {
     logger.error(e?.message);
   }
 
-  const code = /* ts */ `
+  pkgCode = /* ts */ `
 declare module 'vscode' {
   ${getCommandDts(pkg, opts)}
 
   ${getViewDts(pkg)}
 }
 `;
 
-  await writeFile(DTS_CACHE_PKG_PATH, code);
   await mergeDts(opts);
 
   logger.success(`generate ${chalk.green(opts.dtsName)} [package.json]`);
 }
 
 async function mergeDts(opts: CLIOptions) {
-  const codes = await Promise.all(
-    [DTS_CACHE_NLS_PATH, DTS_CACHE_PKG_PATH].map(async filePath => {
-      if (!fs.existsSync(filePath)) {
-        return '';
-      }
-      return readFile(filePath);
-    }),
-  );
-
+  const codes = [nlsCode, pkgCode].filter(s => s);
   const code = await formatCode(codes.join('\n\n'), opts.cwd!);
-
-  await writeFile(
-    path.join(getDtsOutputPath(opts.cwd!), opts.dtsName!),
-    `// generated by @tomjs/vscode-dev\n${code}`,
-  );
+  await writeFile(getDtsOutputPath(opts), `// generated by @tomjs/vscode-dev\n${code}`);
 }
diff --git a/packages/vscode-dev/src/types.ts b/packages/vscode-dev/src/types.ts
@@ -24,7 +24,7 @@ export interface CLIOptions {
    */
   dtsDir?: string;
   /**
-   * generate d.ts file name, default is "vscode-i18n.d.ts"
+   * generate d.ts file name, default is "vscode.d.ts"
    */
   dtsName?: string;
   /**
diff --git a/packages/vscode-dev/src/utils.ts b/packages/vscode-dev/src/utils.ts
@@ -1,6 +1,8 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import Logger from '@tomjs/logger';
+import { mkdirpSync } from '@tomjs/node';
+import type { CLIOptions } from './types';
 
 export const logger = new Logger({ directory: 'vscode-dev/logs' });
 
@@ -44,12 +46,7 @@ export const formatCode = async (code: string, cwd: string) => {
   return code.replace(/^\s+/gm, '').replace(/\n/g, '');
 };
 
-/**
- * Get dts output path
- * @param cwd
- * @returns
- */
-export function getDtsOutputPath(cwd: string) {
+function getDtsDir(cwd: string) {
   const folders = ['types', 'extension', 'src'];
   for (const folder of folders) {
     const dir = path.join(cwd, folder);
@@ -59,3 +56,11 @@ export function getDtsOutputPath(cwd: string) {
   }
   return cwd;
 }
+
+export function getDtsOutputPath(opts: CLIOptions) {
+  const filePath = opts.dtsDir ? path.join(opts.cwd!, opts.dtsDir) : getDtsDir(opts.cwd!);
+  if (!fs.existsSync(filePath)) {
+    mkdirpSync(filePath);
+  }
+  return path.join(filePath, opts.dtsName || 'vscode.d.ts');
+}
