Migrate to Typescript 6 #640
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ | |
| "skipLibCheck": true, | ||
| "strict": true, | ||
| "target": "ES2020", | ||
| "types": ["node"], | ||
| "verbatimModuleSyntax": true | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| import fs from 'fs/promises'; | ||
| import pathlib from 'path'; | ||
| import { Argument, Command } from '@commander-js/extra-typings'; | ||
| import { bundlesDir, outDir, tabsDir } from '@sourceacademy/modules-repotools/getGitRoot'; | ||
| import { resolveAllBundles, resolveAllTabs } from '@sourceacademy/modules-repotools/manifest'; | ||
| import type { ResultType } from '@sourceacademy/modules-repotools/types'; | ||
| import { isNodeError } from '@sourceacademy/modules-repotools/utils'; | ||
| import { mapAsync } from 'es-toolkit'; | ||
|
|
||
| type HandleEnoentResult<T> = { | ||
| ok: true; | ||
| result?: T; | ||
| } | { | ||
| ok: false; | ||
| error: unknown; | ||
| }; | ||
|
|
||
| /** | ||
| * Wrapper for handling fs operations that ignore 'ENOENT' errors | ||
| */ | ||
| async function handleEnoent<T>(promise: Promise<T>): Promise<HandleEnoentResult<T>> { | ||
| try { | ||
| const result = await promise; | ||
| return { | ||
| ok: true, | ||
| result | ||
| }; | ||
| } catch (error) { | ||
| if (!isNodeError(error) || error.code !== 'ENOENT') { | ||
| return { | ||
| ok: false, | ||
| error | ||
| }; | ||
| }; | ||
|
|
||
| return { ok: true }; | ||
| } | ||
| } | ||
|
|
||
| type CleanResult = ResultType<object>; | ||
|
|
||
| async function cleanBundles(bundlesDir: string, outDir: string): Promise<CleanResult> { | ||
| const bundleResult = await resolveAllBundles(bundlesDir); | ||
|
leeyi45 marked this conversation as resolved.
|
||
|
|
||
| if (bundleResult.severity === 'error') { | ||
| return bundleResult; | ||
| } | ||
|
|
||
| const results = await mapAsync(Object.values(bundleResult.bundles), async (bundle): Promise<string | undefined> => { | ||
| const tsPath = pathlib.join(bundle.directory, 'dist'); | ||
|
|
||
| const dirStats = await handleEnoent(fs.stat(tsPath)); | ||
| if (!dirStats.ok) { | ||
| return `Error occurred while cleaning ${bundle.name}: ${dirStats.error}`; | ||
| } | ||
|
|
||
| try { | ||
| if (dirStats.result?.isDirectory()) { | ||
| await fs.rm(tsPath, { recursive: true, force: true }); | ||
| } | ||
| } catch (error) { | ||
| return `Error occurred while cleaning ${bundle.name}: ${error}`; | ||
| } | ||
|
leeyi45 marked this conversation as resolved.
Outdated
|
||
|
|
||
| const buildPath = pathlib.join(outDir, 'bundles', `${bundle.name}.js`); | ||
| const rmbuildResult = await handleEnoent(fs.rm(buildPath)); | ||
|
|
||
| if (!rmbuildResult.ok) { | ||
| return `Error occurred while cleaning ${bundle.name}: ${rmbuildResult.error}`; | ||
| } | ||
|
|
||
| return undefined; | ||
| }); | ||
|
|
||
| const errors = results.filter(x => x !== undefined); | ||
| if (errors.length > 0) { | ||
| return { | ||
| severity: 'error', | ||
| errors | ||
| }; | ||
| } | ||
|
|
||
| return { | ||
| severity: 'success' | ||
| }; | ||
| } | ||
|
|
||
| async function cleanTabs(bundlesDir: string, tabsDir: string, outDir: string): Promise<CleanResult> { | ||
| const tabResult = await resolveAllTabs(bundlesDir, tabsDir); | ||
| if (tabResult.severity === 'error') { | ||
| return tabResult; | ||
| } | ||
|
|
||
| const results = await mapAsync(Object.values(tabResult.tabs), async tab => { | ||
| const buildPath = pathlib.join(outDir, 'tabs', `${tab.name}.js`); | ||
| const rmResult = await handleEnoent(fs.rm(buildPath)); | ||
|
|
||
| if (rmResult.ok) return undefined; | ||
|
|
||
| return `Error while cleaning ${tab.name} tab: ${rmResult.error}`; | ||
| }); | ||
|
|
||
| const errors = results.filter(x => x !== undefined); | ||
| if (errors.length > 0) { | ||
| return { | ||
| severity: 'error', | ||
| errors | ||
| }; | ||
| } | ||
|
|
||
| return { severity: 'success' }; | ||
| } | ||
|
|
||
| export const getCleanCommand = () => new Command('clean') | ||
| .description('Remove existing compiled and built assets') | ||
| .addArgument( | ||
| new Argument('[type]', 'Type of Asset to clean') | ||
| .choices(['tabs', 'bundles']) | ||
| .default('bundles') | ||
| ) | ||
| .action(async asset => { | ||
| switch (asset) { | ||
| case 'bundles': { | ||
| await cleanBundles(bundlesDir, outDir); | ||
| break; | ||
| } | ||
| case 'tabs': { | ||
| await cleanTabs(bundlesDir, tabsDir, outDir); | ||
| break; | ||
| } | ||
| } | ||
|
leeyi45 marked this conversation as resolved.
|
||
| }); | ||
|
leeyi45 marked this conversation as resolved.
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: The
getExecOutputfunction is called with the entire command as a single string, instead of splitting it into the executable name and an array of arguments.Severity: HIGH
Suggested Fix
Refactor the
getExecOutputcall to separate the executable from its arguments. The first argument should be the string'git', and the second argument should be an array of strings containing the command's flags and parameters:['--no-pager', 'diff', '--quiet', 'origin/master', '--', 'yarn.lock'].Prompt for AI Agent