[pull] main from microsoft:main

extensions/terminal-suggest/scripts/update-specs.js

@@ -8,7 +8,130 @@
 const fs = require('fs');
 const path = require('path');
 
-const upstreamSpecs = require('../out/constants.js').upstreamSpecs;
+/** @type {string[]} */
+const upstreamSpecs = [
+	'basename',
+	'cat',
+	'chmod',
+	'chown',
+	'clear',
+	'cp',
+	'curl',
+	'cut',
+	'date',
+	'dd',
+	'df',
+	'diff',
+	'dig',
+	'dirname',
+	'du',
+	'echo',
+	'env',
+	'export',
+	'fdisk',
+	'find',
+	'fmt',
+	'fold',
+	'grep',
+	'head',
+	'htop',
+	'id',
+	'jq',
+	'kill',
+	'killall',
+	'less',
+	'ln',
+	'ls',
+	'lsblk',
+	'lsof',
+	'mkdir',
+	'more',
+	'mount',
+	'mv',
+	'nl',
+	'od',
+	'paste',
+	'ping',
+	'pkill',
+	'ps',
+	'pwd',
+	'readlink',
+	'rm',
+	'rmdir',
+	'rsync',
+	'scp',
+	'sed',
+	'seq',
+	'shred',
+	'sort',
+	'source',
+	'split',
+	'stat',
+	'su',
+	'sudo',
+	'tac',
+	'tail',
+	'tar',
+	'tee',
+	'time',
+	'top',
+	'touch',
+	'tr',
+	'traceroute',
+	'tree',
+	'truncate',
+	'uname',
+	'uniq',
+	'unzip',
+	'wc',
+	'wget',
+	'where',
+	'whereis',
+	'which',
+	'who',
+	'xargs',
+	'xxd',
+	'zip',
+
+	// OS package management
+	'apt',
+	'brew',
+
+	// Editors
+	'nano',
+	'vim',
+
+	// Shells
+	'ssh',
+
+	// Android
+	'adb',
+
+	// Docker
+	'docker',
+	'docker-compose',
+
+	// Dotnet
+	'dotnet',
+
+	// Go
+	'go',
+
+	// JavaScript / TypeScript
+	'node',
+	'nvm',
+	'yo',
+
+	// Python
+	'python',
+	'python3',
+	'ruff',
+
+	// Ruby
+	'bundle',
+	'ruby',
+];
+
 const extRoot = path.resolve(path.join(__dirname, '..'));
 const replaceStrings = [
 	[
@@ -94,3 +217,26 @@ for (const spec of upstreamSpecs) {
 
 	fs.writeFileSync(destination, content);
 }
+
+// Generate upstreamSpecs.ts with re-exports
+function specToExportName(spec) {
+	return spec.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
+}
+
+function specToReExport(spec) {
+	return `export { default as ${specToExportName(spec)} } from './completions/upstream/${spec}';`;
+}
+
+const copyright = `/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/`;
+
+const lines = [
+	copyright,
+	'',
+	'// This file is generated by scripts/update-specs.js',
+	...upstreamSpecs.map(specToReExport),
+	'',
+];
+fs.writeFileSync(path.join(extRoot, 'src/upstreamSpecs.ts'), lines.join('\n'));

extensions/terminal-suggest/src/constants.ts

@@ -3,130 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export const upstreamSpecs = [
-	'basename',
-	'cat',
-	'chmod',
-	'chown',
-	'clear',
-	'cp',
-	'curl',
-	'cut',
-	'date',
-	'dd',
-	'df',
-	'diff',
-	'dig',
-	'dirname',
-	'du',
-	'echo',
-	'env',
-	'export',
-	'fdisk',
-	'find',
-	'fmt',
-	'fold',
-	'grep',
-	'head',
-	'htop',
-	'id',
-	'jq',
-	'kill',
-	'killall',
-	'less',
-	'ln',
-	'ls',
-	'lsblk',
-	'lsof',
-	'mkdir',
-	'more',
-	'mount',
-	'mv',
-	'nl',
-	'od',
-	'paste',
-	'ping',
-	'pkill',
-	'ps',
-	'pwd',
-	'readlink',
-	'rm',
-	'rmdir',
-	'rsync',
-	'scp',
-	'sed',
-	'seq',
-	'shred',
-	'sort',
-	'source',
-	'split',
-	'stat',
-	'su',
-	'sudo',
-	'tac',
-	'tail',
-	'tar',
-	'tee',
-	'time',
-	'top',
-	'touch',
-	'tr',
-	'traceroute',
-	'tree',
-	'truncate',
-	'uname',
-	'uniq',
-	'unzip',
-	'wc',
-	'wget',
-	'where',
-	'whereis',
-	'which',
-	'who',
-	'xargs',
-	'xxd',
-	'zip',
-
-	// OS package management
-	'apt',
-	'brew',
-
-	// Editors
-	'nano',
-	'vim',
-
-	// Shells
-	'ssh',
-
-	// Android
-	'adb',
-
-	// Docker
-	'docker',
-	'docker-compose',
-
-	// Dotnet
-	'dotnet',
-
-	// Go
-	'go',
-
-	// JavaScript / TypeScript
-	'node',
-	'nvm',
-	'yo',
-
-	// Python
-	'python',
-	'python3',
-	'ruff',
-
-	// Ruby
-	'bundle',
-	'ruby',
-];
-
-
 export const enum SettingsIds {
 	SuggestPrefix = 'terminal.integrated.suggest',
 	CachedWindowsExecutableExtensions = 'terminal.integrated.suggest.windowsExecutableExtensions',

extensions/terminal-suggest/src/terminalSuggestMain.ts

@@ -21,7 +21,7 @@ import npxCompletionSpec from './completions/npx';
 import pnpmCompletionSpec from './completions/pnpm';
 import setLocationSpec from './completions/set-location';
 import yarnCompletionSpec from './completions/yarn';
-import { upstreamSpecs } from './constants';
+import * as upstreamSpecs from './upstreamSpecs';
 import { ITerminalEnvironment, PathExecutableCache } from './env/pathExecutableCache';
 import { executeCommand, executeCommandTimeout, IFigExecuteExternals } from './fig/execute';
 import { getFigSuggestions } from './fig/figInterface';
@@ -77,10 +77,8 @@ export const availableSpecs: Fig.Spec[] = [
 	pnpmCompletionSpec,
 	setLocationSpec,
 	yarnCompletionSpec,
+	...Object.values(upstreamSpecs)
 ];
-for (const spec of upstreamSpecs) {
-	availableSpecs.push(require(`./completions/upstream/${spec}`).default);
-}
 
 const getShellSpecificGlobals: Map<TerminalShellType, (options: ExecOptionsWithStringEncoding, existingCommands?: Set<string>) => Promise<(string | ICompletionResource)[]>> = new Map([
 	[TerminalShellType.Bash, getBashGlobals],