feat(utils): move parts from utils into core (#81)

closes #78 --------- Co-authored-by: Matěj Chalk <34691111+matejchalk@users.noreply.github.com>
code-pushup · Oct 2, 2023 · dd0a180 · dd0a180
1 parent 0c915f0
commit dd0a180
Show file tree

Hide file tree

Showing 27 changed files with 92 additions and 377 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -8,8 +8,8 @@
     "bundle-require": "^4.0.1",
     "chalk": "^5.3.0",
     "yargs": "^17.7.2",
-    "@quality-metrics/models": "^0.0.1",
-    "@quality-metrics/utils": "^0.0.1",
-    "zod": "^3.22.1"
+    "@quality-metrics/models": "*",
+    "zod": "^3.22.1",
+    "@quality-metrics-cli/core": "*"
   }
 }
diff --git a/packages/cli/src/lib/cli.spec.ts b/packages/cli/src/lib/cli.spec.ts
@@ -3,9 +3,9 @@ import { describe, expect, it } from 'vitest';
 import { yargsCli } from './cli';
 import { middlewares } from './middlewares';
 import { options as defaultOptions } from './options';
-import { CollectOptions } from '@quality-metrics/utils';
-import { GlobalOptions } from './model';
+import { CollectOptions } from '@quality-metrics/core';
 import { getDirname } from './implementation/helper.mock';
+import { GlobalOptions } from './model';
 
 const __dirname = getDirname(import.meta.url);
 const withDirName = (path: string) => join(__dirname, path);

diff --git a/packages/cli/src/lib/collect/command-object.spec.ts b/packages/cli/src/lib/collect/command-object.spec.ts
@@ -1,6 +1,6 @@
 import { Report } from '@quality-metrics/models';
 import { dummyConfig } from '@quality-metrics/models/testing';
-import { CollectOptions } from '@quality-metrics/utils';
+import { CollectOptions } from '@quality-metrics/core';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { yargsCli } from '../cli';

diff --git a/packages/cli/src/lib/implementation/collect-and-persist.ts b/packages/cli/src/lib/implementation/collect-and-persist.ts
@@ -1,10 +1,9 @@
 import {
   collect,
   CollectOptions,
-  CollectOutputError,
   logPersistedResults,
   persistReport,
-} from '@quality-metrics/utils';
+} from '@quality-metrics/core';
 import { pluginOutputSchema, Report } from '@quality-metrics/models';
 import * as packageJson from '../../../package.json';
 
@@ -29,7 +28,7 @@ export async function collectAndPersistReports(
       // Running checks after persisting helps while debugging as you can check the invalid output after the error
       pluginOutputSchema.parse(plugin);
     } catch (e) {
-      throw new CollectOutputError(plugin.slug, e as Error);
+      throw new Error(`${plugin.slug} - ${(e as Error).message}`);
     }
   });
 }
diff --git a/packages/cli/src/lib/implementation/config-middleware.ts b/packages/cli/src/lib/implementation/config-middleware.ts
@@ -1,4 +1,4 @@
-import { GlobalOptions, globalOptionsSchema } from '../model';
+import { GlobalOptions, globalOptionsSchema } from '@quality-metrics/models';
 import { readCodePushupConfig } from './read-code-pushup-config';
 
 export class ConfigParseError extends Error {