Merge pull request #21 from NullVoxPopuli/fix-for-all-declaration-types

Fix for all declaration typse, particularly, non-declare

Author: NullVoxPopuli

.npmrc

@@ -0,0 +1 @@
+auto-install-peers=false

package.json

@@ -38,6 +38,7 @@
     "test": "vitest"
   },
   "dependencies": {
+    "@babel/parser": "^7.28.3",
     "fs-extra": "^11.2.0",
     "globby": "^14.0.0",
     "jscodeshift": "^0.15.1"

pnpm-lock.yaml

@@ -1,6 +1,68 @@
+/**
+ * See: original code for withParser('ts')
+ *
+ * https://github.com/facebook/jscodeshift/blob/e877ed287dcb3ef3ee8b20c53ec8b477ab564438/parser/ts.js
+ */
+import babylon from '@babel/parser';
 import jscodeshift from 'jscodeshift';
 
-const j = jscodeshift.withParser('ts');
+function customTSParser() {
+  /**
+   * https://github.com/facebook/jscodeshift/blob/e877ed287dcb3ef3ee8b20c53ec8b477ab564438/parser/tsOptions.js
+   *
+   * @type {import('@babel/parser').ParserOptions}
+   */
+  const options = {
+    sourceType: 'module',
+    allowImportExportEverywhere: true,
+    allowReturnOutsideFunction: true,
+    startLine: 1,
+    tokens: true,
+    plugins: [
+      'asyncGenerators',
+      'decoratorAutoAccessors',
+      'bigInt',
+      'classPrivateMethods',
+      'classPrivateProperties',
+      'classProperties',
+      'decorators-legacy',
+      'doExpressions',
+      'dynamicImport',
+      'exportDefaultFrom',
+      // @ts-ignore -- doesn't exist? why does jscodeshift have it?
+      'exportExtensions',
+      'exportNamespaceFrom',
+      'functionBind',
+      'functionSent',
+      'importAttributes',
+      'importMeta',
+      'nullishCoalescingOperator',
+      'numericSeparator',
+      'objectRestSpread',
+      'optionalCatchBinding',
+      'optionalChaining',
+      ['pipelineOperator', { proposal: 'minimal' }],
+      'throwExpressions',
+      /**
+       * Without dts: true, we don't properly parse all types of declaration files
+       *
+       * This is missing from the official tsOptions in jscodeshift
+       */
+      ['typescript', { dts: true }],
+    ],
+  };
+
+  return {
+    /**
+     * @param {string} code
+     */
+    parse(code) {
+      return babylon.parse(code, options);
+    },
+  };
+}
+
+const j = jscodeshift.withParser(customTSParser());
 
 /**
  * @param {string} contents

src/fixes/typescript.js

@@ -58,4 +58,35 @@ describe('fixBadDeclarationOutput', () => {
       export declare const four: 'literal';"
     `);
   });
+
+  test('it works with non-declare .d.ts', async () => {
+    const tmp = await mkdirp();
+
+    const a = path.join(tmp, 'a.d.ts');
+
+    await fs.writeFile(
+      a,
+      stripIndent`
+      /// <reference types="@glint/whatever/module">
+      /// <reference types="node_modules/@glint/whatever2/module">
+      /// <reference types="xyz">
+
+      export const two: number;
+      export const three: string;
+      export const four: 'literal';
+    `
+    );
+
+    await fixBadDeclarationOutput(`${tmp}/**/*.d.ts`, [['TypeScript#56571', { types: 'all' }]], {
+      log: true,
+    });
+
+    const aContents = await read(a);
+
+    expect(aContents).toMatchInlineSnapshot(`
+      "export const two: number;
+      export const three: string;
+      export const four: 'literal';"
+    `);
+  });
 });