@trpc/upgrade 0.0.0-alpha.0 → 0.0.0-alpha.1

package/dist/cli.cjs

@@ -4,13 +4,11 @@ var cli$1 = require('@effect/cli');
 var platform = require('@effect/platform');
 var platformNode = require('@effect/platform-node');
 var effect = require('effect');
-var ignore = require('ignore');
 var typescript = require('typescript');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var path__default = /*#__PURE__*/_interopDefault(path);
-var ignore__default = /*#__PURE__*/_interopDefault(ignore);
 
 var version = "0.0.0-alpha.0";
 
@@ -20,12 +18,15 @@ const installPackage = (packageName)=>{
     return platform.Command.streamLines(platform.Command.make(packageManager, 'install', packageName)).pipe(effect.Stream.mapEffect(effect.Console.log), effect.Stream.runDrain);
 };
 const filterIgnored = (files)=>effect.Effect.gen(function*() {
-        const fs = yield* platform.FileSystem.FileSystem;
-        const ignores = yield* fs.readFileString(path__default.default.join(process.cwd(), '.gitignore')).pipe(effect.Effect.map((content)=>content.split('\n')), effect.Effect.map((patterns)=>ignore__default.default().add(patterns)));
+        const ignores = yield* platform.Command.string(platform.Command.make('git', 'check-ignore', '**/*')).pipe(effect.Effect.map((_)=>_.split('\n')));
+        yield* effect.Effect.log('All files in program:', files.map((_)=>_.fileName));
+        yield* effect.Effect.log('Ignored files:', ignores);
         // Ignore "common files"
-        const relativeFilePaths = files.filter((source)=>!source.fileName.includes('node_modules') && !source.fileName.includes('packages/')).map((file)=>path__default.default.relative(process.cwd(), file.fileName));
-        // As well as gitignored?
-        return ignores.filter(relativeFilePaths);
+        const filteredSourcePaths = files.filter((source)=>source.fileName.startsWith(path__default.default.resolve()) && // only look ahead of current directory
+            !source.fileName.includes('/trpc/packages/') && // relative paths when running codemod locally
+            !ignores.includes(source.fileName)).map((source)=>source.fileName);
+        yield* effect.Effect.log('Filtered files:', filteredSourcePaths);
+        return filteredSourcePaths;
     });
 const Program = effect.Effect.succeed(typescript.findConfigFile(process.cwd(), typescript.sys.fileExists)).pipe(effect.Effect.filterOrFail(effect.Predicate.isNotNullable, ()=>'No tsconfig found'), effect.Effect.tap((_)=>effect.Effect.logDebug('Using tsconfig', _)), effect.Effect.map((_)=>typescript.readConfigFile(_, typescript.sys.readFile)), effect.Effect.map((_)=>typescript.parseJsonConfigFileContent(_.config, typescript.sys, process.cwd())), effect.Effect.map((_)=>typescript.createProgram({
         options: _.options,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/upgrade",
-  "version": "0.0.0-alpha.0",
+  "version": "0.0.0-alpha.1",
   "description": "Upgrade scripts for tRPC",
   "author": "juliusmarminge",
   "license": "MIT",
@@ -32,7 +32,6 @@
     "@effect/platform": "0.69.25",
     "@effect/platform-node": "0.64.27",
     "effect": "3.10.16",
-    "ignore": "^6.0.2",
     "jscodeshift": "17.1.1",
     "typescript": "^5.6.2"
   },

package/src/bin/cli.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 import path from 'path';
 import { Command as CLICommand, Prompt } from '@effect/cli';
-import { Command, FileSystem } from '@effect/platform';
+import { Command } from '@effect/platform';
 import { NodeContext, NodeRuntime } from '@effect/platform-node';
 import {
   Console,
@@ -12,7 +12,6 @@ import {
   Stream,
   String,
 } from 'effect';
-import ignore from 'ignore';
 import type { SourceFile } from 'typescript';
 import {
   createProgram,
@@ -47,25 +46,29 @@ const installPackage = (packageName: string) => {
 
 const filterIgnored = (files: readonly SourceFile[]) =>
   Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const ignores = yield* fs
-      .readFileString(path.join(process.cwd(), '.gitignore'))
-      .pipe(
-        Effect.map((content) => content.split('\n')),
-        Effect.map((patterns) => ignore().add(patterns)),
-      );
+    const ignores = yield* Command.string(
+      Command.make('git', 'check-ignore', '**/*'),
+    ).pipe(Effect.map((_) => _.split('\n')));
+
+    yield* Effect.log(
+      'All files in program:',
+      files.map((_) => _.fileName),
+    );
+    yield* Effect.log('Ignored files:', ignores);
 
     // Ignore "common files"
-    const relativeFilePaths = files
+    const filteredSourcePaths = files
       .filter(
         (source) =>
-          !source.fileName.includes('node_modules') &&
-          !source.fileName.includes('packages/'),
+          source.fileName.startsWith(path.resolve()) && // only look ahead of current directory
+          !source.fileName.includes('/trpc/packages/') && // relative paths when running codemod locally
+          !ignores.includes(source.fileName), // ignored files
       )
-      .map((file) => path.relative(process.cwd(), file.fileName));
+      .map((source) => source.fileName);
+
+    yield* Effect.log('Filtered files:', filteredSourcePaths);
 
-    // As well as gitignored?
-    return ignores.filter(relativeFilePaths);
+    return filteredSourcePaths;
   });
 
 const Program = Effect.succeed(