changed: retruct

space307 · Dec 29, 2023 · 5a53b9e · 5a53b9e
1 parent 59480de
commit 5a53b9e
Show file tree

Hide file tree

Showing 42 changed files with 37 additions and 72 deletions.
diff --git a/bin/__tests__/monorepo/__snapshots__/collectUsages.test.js.snap b/bin/__tests__/monorepo/__snapshots__/collectUsages.test.js.snap
diff --git a/bin/__tests__/monorepo/packages/package-a/package.json b/bin/__tests__/monorepo/packages/package-a/package.json
diff --git a/bin/__tests__/monorepo/packages/package-b/package.json b/bin/__tests__/monorepo/packages/package-b/package.json
diff --git a/bin/__tests__/monorepo/packages/package-c/package.json b/bin/__tests__/monorepo/packages/package-c/package.json
diff --git a/bin/__tests__/package-d/package.json b/bin/__tests__/package-d/package.json
diff --git a/bin/index.js b/bin/index.js
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { collectUsages } from './collectUsages.js'
-import { getConfig } from './getConfig.js'
-import { main } from './main.js'
+import { collectUsages } from '../src/collectUsages.js'
+import { getConfig } from '../src/getConfig.js'
+import { main } from '../src/main.js'
 
 const config = await getConfig()
 

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "version": "0.0.33",
   "description": "Utility for monorepos. It helps to find unused exports from packages or get a list of all unique uses of any package",
-  "main": "./bin/index.js",
+  "main": "./src/index.js",
   "bin": "./bin/index.js",
   "author": "Viktor Pasynok",
   "license": "MIT",

diff --git a/.../__snapshots__/collectUsages.test.js.snap → .../__snapshots__/collectUsages.test.js.snap b/.../__snapshots__/collectUsages.test.js.snap → .../__snapshots__/collectUsages.test.js.snap
diff --git a/...s__/__snapshots__/search-dir.test.js.snap → ...s__/__snapshots__/search-dir.test.js.snap b/...s__/__snapshots__/search-dir.test.js.snap → ...s__/__snapshots__/search-dir.test.js.snap
@@ -3,7 +3,7 @@
 exports[`package-d 1`] = `
 "
 > check-exports
-> node ../../index.js -s ../monorepo/app
+> node ../../../bin/index.js -s ../monorepo/app
 
 
  Failed  Unused exports in package-d package found
@@ -18,7 +18,7 @@ exports[`package-d 1`] = `
 exports[`package-d happy 1`] = `
 "
 > check-exports-happy
-> node ../../index.js -s ../monorepo
+> node ../../../bin/index.js -s ../monorepo
 
 "
 `;
@@ -31,7 +31,7 @@ exports[`package-d happy 2`] = `
 exports[`package-d unhappy 1`] = `
 "
 > check-exports-unhappy
-> node ../../index.js -s ../biba
+> node ../../../bin/index.js -s ../biba
 
 
  Failed  Nothing is imported from package-d. Remove it.

diff --git a/bin/__tests__/collectUsages.test.js → src/__tests__/collectUsages.test.js b/bin/__tests__/collectUsages.test.js → src/__tests__/collectUsages.test.js
diff --git a/bin/__tests__/getConfig/cli.test.js → src/__tests__/getConfig/cli.test.js b/bin/__tests__/getConfig/cli.test.js → src/__tests__/getConfig/cli.test.js
diff --git a/bin/__tests__/getConfig/config+cli.js → src/__tests__/getConfig/config+cli.js b/bin/__tests__/getConfig/config+cli.js → src/__tests__/getConfig/config+cli.js
diff --git a/bin/__tests__/getConfig/constants.js → src/__tests__/getConfig/constants.js b/bin/__tests__/getConfig/constants.js → src/__tests__/getConfig/constants.js
diff --git a/bin/__tests__/getConfig/index.test.js → src/__tests__/getConfig/index.test.js b/bin/__tests__/getConfig/index.test.js → src/__tests__/getConfig/index.test.js
@@ -4,7 +4,7 @@ import { getConfig } from '../../getConfig.js'
 import { CONFIG } from './constants.js'
 
 test('default value', async () => {
-  vi.mock('../../../bin/utils/getRepoRoot.js', () => ({
+  vi.mock('../../utils/getRepoRoot.js', () => ({
     getRepoRoot: () => 'repo-root'
   }))
 

diff --git a/bin/__tests__/getConfig/withconfig.test.js → src/__tests__/getConfig/withconfig.test.js b/bin/__tests__/getConfig/withconfig.test.js → src/__tests__/getConfig/withconfig.test.js
diff --git a/...monorepo/__snapshots__/index.test.js.snap → ...monorepo/__snapshots__/index.test.js.snap b/...monorepo/__snapshots__/index.test.js.snap → ...monorepo/__snapshots__/index.test.js.snap
@@ -3,7 +3,7 @@
 exports[`run check-exports in package-a 1`] = `
 "
 > check-exports
-> node ../../../../index.js
+> node ../../../../../bin/index.js
 
 
  Failed  Unused exports in package-a package found
@@ -19,7 +19,7 @@ exports[`run check-exports in package-a 1`] = `
 exports[`run check-exports in package-b 1`] = `
 "
 > check-exports
-> node ../../../../index.js -e index.tsx
+> node ../../../../../bin/index.js -e index.tsx
 
 "
 `;
@@ -32,7 +32,7 @@ exports[`run check-exports in package-b 2`] = `
 exports[`run check-exports in package-c 1`] = `
 "
 > check-exports
-> node ../../../../index.js
+> node ../../../../../bin/index.js
 
 
  Failed  Nothing is imported from package-c. Remove it.

diff --git a/bin/__tests__/monorepo/app/index.ts → src/__tests__/monorepo/app/index.ts b/bin/__tests__/monorepo/app/index.ts → src/__tests__/monorepo/app/index.ts
diff --git a/bin/__tests__/monorepo/exec.js → src/__tests__/monorepo/exec.js b/bin/__tests__/monorepo/exec.js → src/__tests__/monorepo/exec.js
diff --git a/bin/__tests__/monorepo/index.test.js → src/__tests__/monorepo/index.test.js b/bin/__tests__/monorepo/index.test.js → src/__tests__/monorepo/index.test.js
diff --git a/bin/__tests__/monorepo/package.json → src/__tests__/monorepo/package.json b/bin/__tests__/monorepo/package.json → src/__tests__/monorepo/package.json
diff --git a/...ts__/monorepo/packages/package-a/index.ts → ...ts__/monorepo/packages/package-a/index.ts b/...ts__/monorepo/packages/package-a/index.ts → ...ts__/monorepo/packages/package-a/index.ts
diff --git a/src/__tests__/monorepo/packages/package-a/package.json b/src/__tests__/monorepo/packages/package-a/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "package-a",
+  "scripts": {
+    "check-exports": "node ../../../../../bin/index.js"
+  }
+}
diff --git a/...s__/monorepo/packages/package-b/index.tsx → ...s__/monorepo/packages/package-b/index.tsx b/...s__/monorepo/packages/package-b/index.tsx → ...s__/monorepo/packages/package-b/index.tsx
diff --git a/src/__tests__/monorepo/packages/package-b/package.json b/src/__tests__/monorepo/packages/package-b/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "package-b",
+  "scripts": {
+    "check-exports": "node ../../../../../bin/index.js -e index.tsx"
+  }
+}
diff --git a/...ts__/monorepo/packages/package-c/index.ts → ...ts__/monorepo/packages/package-c/index.ts b/...ts__/monorepo/packages/package-c/index.ts → ...ts__/monorepo/packages/package-c/index.ts
diff --git a/src/__tests__/monorepo/packages/package-c/package.json b/src/__tests__/monorepo/packages/package-c/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "package-c",
+  "scripts": {
+    "check-exports": "node ../../../../../bin/index.js"
+  }
+}
diff --git a/bin/__tests__/package-d/index.ts → src/__tests__/package-d/index.ts b/bin/__tests__/package-d/index.ts → src/__tests__/package-d/index.ts
diff --git a/src/__tests__/package-d/package.json b/src/__tests__/package-d/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "package-d",
+  "scripts": {
+    "check-exports": "node ../../../bin/index.js -s ../monorepo/app",
+    "check-exports-unhappy": "node ../../../bin/index.js -s ../biba",
+    "check-exports-happy": "node ../../../bin/index.js -s ../monorepo"
+  }
+}
diff --git a/bin/__tests__/search-dir.test.js → src/__tests__/search-dir.test.js b/bin/__tests__/search-dir.test.js → src/__tests__/search-dir.test.js
diff --git a/bin/collectUsages.js → src/collectUsages.js b/bin/collectUsages.js → src/collectUsages.js
diff --git a/bin/fileTraversal/getFiles.js → src/fileTraversal/getFiles.js b/bin/fileTraversal/getFiles.js → src/fileTraversal/getFiles.js
diff --git a/bin/fileTraversal/index.js → src/fileTraversal/index.js b/bin/fileTraversal/index.js → src/fileTraversal/index.js
diff --git a/bin/fileTraversal/processBatch/findImport.js → src/fileTraversal/processBatch/findImport.js b/bin/fileTraversal/processBatch/findImport.js → src/fileTraversal/processBatch/findImport.js
diff --git a/bin/fileTraversal/processBatch/index.js → src/fileTraversal/processBatch/index.js b/bin/fileTraversal/processBatch/index.js → src/fileTraversal/processBatch/index.js
diff --git a/bin/fileTraversal/processBatch/traversal.js → src/fileTraversal/processBatch/traversal.js b/bin/fileTraversal/processBatch/traversal.js → src/fileTraversal/processBatch/traversal.js
diff --git a/bin/getConfig.js → src/getConfig.js b/bin/getConfig.js → src/getConfig.js
diff --git a/bin/getExports.js → src/getExports.js b/bin/getExports.js → src/getExports.js
diff --git a/src/index.js b/src/index.js
diff --git a/bin/main.js → src/main.js b/bin/main.js → src/main.js
diff --git a/bin/utils/getRepoRoot.js → src/utils/getRepoRoot.js b/bin/utils/getRepoRoot.js → src/utils/getRepoRoot.js
diff --git a/bin/utils/index.js → src/utils/index.js b/bin/utils/index.js → src/utils/index.js
diff --git a/bin/utils/observableSet.js → src/utils/observableSet.js b/bin/utils/observableSet.js → src/utils/observableSet.js