Wider print width (#2012)

* increase formatting print-width to 120; 80 hurts legibility of TS too much

* apply formatting

* fix

Author: cspotcode

dprint.json

@@ -1,6 +1,6 @@
 {
   "incremental": true,
-  "lineWidth": 80,
+  "lineWidth": 120,
   "prettier": {
     "associations": [
       "**/*.{ts,tsx,js,mjs,cjs,jsx,json,md}"

esm.mjs

@@ -4,5 +4,4 @@ const require = createRequire(fileURLToPath(import.meta.url));
 
 /** @type {import('./dist/esm')} */
 const esm = require('./dist/esm');
-export const { resolve, load, getFormat, transformSource } =
-  esm.registerAndCreateEsmHooks();
+export const { resolve, load, getFormat, transformSource } = esm.registerAndCreateEsmHooks();

esm/transpile-only.mjs

@@ -4,5 +4,6 @@ const require = createRequire(fileURLToPath(import.meta.url));
 
 /** @type {import('../dist/esm')} */
 const esm = require('../dist/esm');
-export const { resolve, load, getFormat, transformSource } =
-  esm.registerAndCreateEsmHooks({ transpileOnly: true });
+export const { resolve, load, getFormat, transformSource } = esm.registerAndCreateEsmHooks({
+  transpileOnly: true,
+});

package.json

@@ -167,7 +167,8 @@
     "v8-compile-cache-lib": "^3.0.1"
   },
   "prettier": {
-    "singleQuote": true
+    "singleQuote": true,
+    "printWidth": 120
   },
   "volta": {
     "node": "18.14.0",

scripts/build-manifest.mjs

@@ -4,20 +4,14 @@ import { resolve } from 'path';
 
 // NOTE: could be replaced with using https://npm.im/yarpm
 
-const manifestPath = resolve(
-  fileURLToPath(import.meta.url),
-  '../../package.json'
-);
+const manifestPath = resolve(fileURLToPath(import.meta.url), '../../package.json');
 const pkg = JSON.parse(readFileSync(manifestPath, 'utf8'));
 
 // Fully splat the "prepack" script so that it does not contain references to a package manager, neither `yarn` nor `npm`
 pkg.scripts.prepack = pkg.scripts.__prepack_template__;
 while (true) {
   let before = pkg.scripts.prepack;
-  pkg.scripts.prepack = pkg.scripts.prepack.replace(
-    /yarn (\S+)/g,
-    ($0, $1) => pkg.scripts[$1]
-  );
+  pkg.scripts.prepack = pkg.scripts.prepack.replace(/yarn (\S+)/g, ($0, $1) => pkg.scripts[$1]);
   if (pkg.scripts.prepack === before) break;
 }
 

scripts/create-merged-schema.ts

@@ -19,16 +19,10 @@ async function main() {
   // Apply this prefix to the names of all ts-node-generated definitions
   const tsnodeDefinitionPrefix = 'tsNode';
   let tsNodeSchema: any = JSON.parse(
-    JSON.stringify(originalTsNodeSchema).replace(
-      /#\/definitions\//g,
-      `#/definitions/${tsnodeDefinitionPrefix}`
-    )
+    JSON.stringify(originalTsNodeSchema).replace(/#\/definitions\//g, `#/definitions/${tsnodeDefinitionPrefix}`)
   );
   tsNodeSchema.definitions = Object.fromEntries(
-    Object.entries(tsNodeSchema.definitions).map(([key, value]) => [
-      `${tsnodeDefinitionPrefix}${key}`,
-      value,
-    ])
+    Object.entries(tsNodeSchema.definitions).map(([key, value]) => [`${tsnodeDefinitionPrefix}${key}`, value])
   );
   // console.dir(tsNodeSchema, {
   //   depth: Infinity
@@ -39,9 +33,7 @@ async function main() {
     ...schemastoreSchema,
     definitions: {
       ...Object.fromEntries(
-        Object.entries(schemastoreSchema.definitions).filter(
-          ([key]) => !key.startsWith(tsnodeDefinitionPrefix)
-        )
+        Object.entries(schemastoreSchema.definitions).filter(([key]) => !key.startsWith(tsnodeDefinitionPrefix))
       ),
       ...tsNodeSchema.definitions,
       tsNodeTsConfigOptions: undefined,
@@ -50,15 +42,11 @@ async function main() {
         properties: {
           'ts-node': {
             ...tsNodeSchema.definitions.tsNodeTsConfigOptions,
-            description:
-              tsNodeSchema.definitions.tsNodeTsConfigSchema.properties[
-                'ts-node'
-              ].description,
+            description: tsNodeSchema.definitions.tsNodeTsConfigSchema.properties['ts-node'].description,
             properties: {
               ...tsNodeSchema.definitions.tsNodeTsConfigOptions.properties,
               compilerOptions: {
-                ...tsNodeSchema.definitions.tsNodeTsConfigOptions.properties
-                  .compilerOptions,
+                ...tsNodeSchema.definitions.tsNodeTsConfigOptions.properties.compilerOptions,
                 allOf: [
                   {
                     $ref: '#/definitions/compilerOptionsDefinition/properties/compilerOptions',
@@ -73,17 +61,12 @@ async function main() {
   };
   // Splice into the allOf array at a spot that looks good.  Does not affect
   // behavior of the schema, but looks nicer if we want to submit as a PR to schemastore.
-  mergedSchema.allOf = mergedSchema.allOf.filter(
-    (item: any) => !item.$ref?.includes('tsNode')
-  );
+  mergedSchema.allOf = mergedSchema.allOf.filter((item: any) => !item.$ref?.includes('tsNode'));
   mergedSchema.allOf.splice(mergedSchema.allOf.length - 1, 0, {
     $ref: '#/definitions/tsNodeDefinition',
   });
 
-  writeFileSync(
-    resolve(__dirname, '../tsconfig.schemastore-schema.json'),
-    JSON.stringify(mergedSchema, null, 2)
-  );
+  writeFileSync(resolve(__dirname, '../tsconfig.schemastore-schema.json'), JSON.stringify(mergedSchema, null, 2));
 }
 
 export async function getSchemastoreSchema() {

scripts/update-schemastore-schema-with-compiler-options.ts

@@ -32,9 +32,7 @@ import { getSchemastoreSchema } from './create-merged-schema';
 
 async function main() {
   const schemastoreSchema = await getSchemastoreSchema();
-  const compilerOptions =
-    schemastoreSchema.definitions.compilerOptionsDefinition.properties
-      .compilerOptions.properties;
+  const compilerOptions = schemastoreSchema.definitions.compilerOptionsDefinition.properties.compilerOptions.properties;
 
   // These options are only available via CLI flags, not in a tsconfig file.
   const excludedOptions = [

src/bin.ts

@@ -42,10 +42,7 @@ import { findAndReadConfig } from './configuration';
  *
  * @internal
  */
-export function main(
-  argv: string[] = process.argv.slice(2),
-  entrypointArgs: Record<string, any> = {}
-) {
+export function main(argv: string[] = process.argv.slice(2), entrypointArgs: Record<string, any> = {}) {
   const args = parseArgv(argv, entrypointArgs);
   const state: BootstrapState = {
     shouldUseChildProcess: false,
@@ -174,8 +171,7 @@ function parseArgv(argv: string[], entrypointArgs: Record<string, any>) {
         '--log-error': '--logError',
         '--scope-dir': '--scopeDir',
         '--no-experimental-repl-await': '--noExperimentalReplAwait',
-        '--experimental-specifier-resolution':
-          '--experimentalSpecifierResolution',
+        '--experimental-specifier-resolution': '--experimentalSpecifierResolution',
       },
       {
         argv,
@@ -379,12 +375,7 @@ function phase3(payload: BootstrapState) {
     compilerHost,
     ignore,
     logError,
-    projectSearchDir: getProjectSearchDir(
-      cwd,
-      scriptMode,
-      cwdMode,
-      entryPointPath
-    ),
+    projectSearchDir: getProjectSearchDir(cwd, scriptMode, cwdMode, entryPointPath),
     project,
     skipProject,
     skipIgnore,
@@ -396,8 +387,7 @@ function phase3(payload: BootstrapState) {
     scopeDir,
     preferTsExts,
     esm,
-    experimentalSpecifierResolution:
-      experimentalSpecifierResolution as ExperimentalSpecifierResolution,
+    experimentalSpecifierResolution: experimentalSpecifierResolution as ExperimentalSpecifierResolution,
   });
 
   // If ESM is enabled through the parsed tsconfig, stage4 should be run in a child
@@ -432,20 +422,14 @@ function getEntryPointInfo(state: BootstrapState) {
   // `node -e code -i ./script.js` ignores -e
   const executeEval = code != null && !(interactive && restArgs.length);
   const executeEntrypoint = !executeEval && restArgs.length > 0;
-  const executeRepl =
-    !executeEntrypoint &&
-    (interactive || (process.stdin.isTTY && !executeEval));
+  const executeRepl = !executeEntrypoint && (interactive || (process.stdin.isTTY && !executeEval));
   const executeStdin = !executeEval && !executeRepl && !executeEntrypoint;
 
   /**
    * Unresolved. May point to a symlink, not realpath. May be missing file extension
    * NOTE: resolution relative to cwd option (not `process.cwd()`) is legacy backwards-compat; should be changed in next major: https://github.com/TypeStrong/ts-node/issues/1834
    */
-  const entryPointPath = executeEntrypoint
-    ? isCli
-      ? resolve(cwd, restArgs[0])
-      : resolve(restArgs[0])
-    : undefined;
+  const entryPointPath = executeEntrypoint ? (isCli ? resolve(cwd, restArgs[0]) : resolve(restArgs[0])) : undefined;
 
   return {
     executeEval,
@@ -458,18 +442,11 @@ function getEntryPointInfo(state: BootstrapState) {
 
 function phase4(payload: BootstrapState) {
   const { isInChildProcess, tsNodeScript } = payload;
-  const { version, showConfig, restArgs, code, print, argv } =
-    payload.parseArgvResult;
+  const { version, showConfig, restArgs, code, print, argv } = payload.parseArgvResult;
   const { cwd } = payload.phase2Result!;
   const { preloadedConfig } = payload.phase3Result!;
 
-  const {
-    entryPointPath,
-    executeEntrypoint,
-    executeEval,
-    executeRepl,
-    executeStdin,
-  } = getEntryPointInfo(payload);
+  const { entryPointPath, executeEntrypoint, executeEval, executeRepl, executeStdin } = getEntryPointInfo(payload);
 
   /**
    * <repl>, [stdin], and [eval] are all essentially virtual files that do not exist on disc and are backed by a REPL
@@ -543,13 +520,10 @@ function phase4(payload: BootstrapState) {
   });
   register(service);
 
-  if (replStuff)
-    replStuff.state.path = join(cwd, REPL_FILENAME(service.ts.version));
+  if (replStuff) replStuff.state.path = join(cwd, REPL_FILENAME(service.ts.version));
 
   if (isInChildProcess)
-    (
-      require('./child/child-loader') as typeof import('./child/child-loader')
-    ).lateBindHooks(createEsmHooks(service));
+    (require('./child/child-loader') as typeof import('./child/child-loader')).lateBindHooks(createEsmHooks(service));
 
   // Bind REPL service to ts-node compiler service (chicken-and-egg problem)
   replStuff?.repl.setService(service);
@@ -566,18 +540,14 @@ function phase4(payload: BootstrapState) {
   if (version >= 3) {
     console.log(`ts-node v${VERSION} ${dirname(__dirname)}`);
     console.log(`node ${process.version}`);
-    console.log(
-      `compiler v${service.ts.version} ${service.compilerPath ?? ''}`
-    );
+    console.log(`compiler v${service.ts.version} ${service.compilerPath ?? ''}`);
     process.exit(0);
   }
 
   if (showConfig) {
     const ts = service.ts as any as TSInternal;
     if (typeof ts.convertToTSConfig !== 'function') {
-      console.error(
-        'Error: --showConfig requires a typescript versions >=3.2 that support --showConfig'
-      );
+      console.error('Error: --showConfig requires a typescript versions >=3.2 that support --showConfig');
       process.exit(1);
     }
     let moduleTypes = undefined;
@@ -586,20 +556,13 @@ function phase4(payload: BootstrapState) {
       const showRelativeTo = dirname(service.configFilePath!);
       moduleTypes = {} as Record<string, string>;
       for (const [key, value] of Object.entries(service.options.moduleTypes)) {
-        moduleTypes[
-          relative(
-            showRelativeTo,
-            resolve(service.options.optionBasePaths?.moduleTypes!, key)
-          )
-        ] = value;
+        moduleTypes[relative(showRelativeTo, resolve(service.options.optionBasePaths?.moduleTypes!, key))] = value;
       }
     }
     const json = {
       ['ts-node']: {
         ...service.options,
-        require: service.options.require?.length
-          ? service.options.require
-          : undefined,
+        require: service.options.require?.length ? service.options.require : undefined,
         moduleTypes,
         optionBasePaths: undefined,
         compilerOptions: undefined,
@@ -621,10 +584,7 @@ function phase4(payload: BootstrapState) {
   }
 
   // Prepend `ts-node` arguments to CLI for child processes.
-  process.execArgv.push(
-    tsNodeScript,
-    ...argv.slice(2, argv.length - restArgs.length)
-  );
+  process.execArgv.push(tsNodeScript, ...argv.slice(2, argv.length - restArgs.length));
 
   // TODO this comes from BootstrapState
   process.argv = [process.argv[1]]
@@ -633,10 +593,7 @@ function phase4(payload: BootstrapState) {
 
   // Execute the main contents (either eval, script or piped).
   if (executeEntrypoint) {
-    if (
-      payload.isInChildProcess &&
-      versionGteLt(process.versions.node, '18.6.0', '18.7.0')
-    ) {
+    if (payload.isInChildProcess && versionGteLt(process.versions.node, '18.6.0', '18.7.0')) {
       // HACK workaround node regression
       require('../dist-raw/runmain-hack.js').run(entryPointPath);
     } else {
@@ -647,13 +604,7 @@ function phase4(payload: BootstrapState) {
     // If stdin runs, eval and repl will not.
     if (executeEval) {
       addBuiltinLibsToObject(global);
-      evalAndExitOnTsError(
-        evalStuff!.repl,
-        evalStuff!.module!,
-        code!,
-        print,
-        'eval'
-      );
+      evalAndExitOnTsError(evalStuff!.repl, evalStuff!.module!, code!, print, 'eval');
     }
 
     if (executeRepl) {
@@ -680,23 +631,15 @@ function phase4(payload: BootstrapState) {
 /**
  * Get project search path from args.
  */
-function getProjectSearchDir(
-  cwd?: string,
-  scriptMode?: boolean,
-  cwdMode?: boolean,
-  scriptPath?: string
-) {
+function getProjectSearchDir(cwd?: string, scriptMode?: boolean, cwdMode?: boolean, scriptPath?: string) {
   // Validate `--script-mode` / `--cwd-mode` / `--cwd` usage is correct.
   if (scriptMode && cwdMode) {
     throw new TypeError('--cwd-mode cannot be combined with --script-mode');
   }
   if (scriptMode && !scriptPath) {
-    throw new TypeError(
-      '--script-mode must be used with a script name, e.g. `ts-node --script-mode <script.ts>`'
-    );
+    throw new TypeError('--script-mode must be used with a script name, e.g. `ts-node --script-mode <script.ts>`');
   }
-  const doScriptMode =
-    scriptMode === true ? true : cwdMode === true ? false : !!scriptPath;
+  const doScriptMode = scriptMode === true ? true : cwdMode === true ? false : !!scriptPath;
   if (doScriptMode) {
     // Use node's own resolution behavior to ensure we follow symlinks.
     // scriptPath may omit file extension or point to a directory with or without package.json.
@@ -739,9 +682,7 @@ function requireResolveNonCached(absoluteModuleSpecifier: string) {
   const { dir, base } = parsePath(absoluteModuleSpecifier);
   const relativeModuleSpecifier = `./${base}`;
 
-  const req = Module.createRequire(
-    join(dir, 'imaginaryUncacheableRequireResolveScript')
-  );
+  const req = Module.createRequire(join(dir, 'imaginaryUncacheableRequireResolveScript'));
   return req.resolve(relativeModuleSpecifier, {
     paths: [
       `${guaranteedNonexistentDirectoryPrefix}${guaranteedNonexistentDirectorySuffix++}`,
@@ -775,11 +716,7 @@ function evalAndExitOnTsError(
   }
 
   if (isPrinted) {
-    console.log(
-      typeof result === 'string'
-        ? result
-        : inspect(result, { colors: process.stdout.isTTY })
-    );
+    console.log(typeof result === 'string' ? result : inspect(result, { colors: process.stdout.isTTY }));
   }
 }
 

src/child/argv-payload.ts

@@ -12,7 +12,5 @@ export function compress(object: any) {
 
 /** @internal */
 export function decompress(str: string) {
-  return JSON.parse(
-    brotliDecompressSync(Buffer.from(str, 'base64')).toString()
-  );
+  return JSON.parse(brotliDecompressSync(Buffer.from(str, 'base64')).toString());
 }