chore: remove componentregistry, fix broken test paths

boneskull · May 18, 2024 · 1dc4031 · 1dc4031
1 parent 835e643
commit 1dc4031
Show file tree

Hide file tree

Showing 34 changed files with 361 additions and 987 deletions.
diff --git a/packages/midnight-smoker/package.json b/packages/midnight-smoker/package.json
@@ -214,8 +214,6 @@
     "@types/yargs": "17.0.32",
     "memfs": "4.6.0",
     "strip-ansi": "5.2.0",
-    "tsconfig-paths": "4.2.0",
-    "unexpected-eventemitter": "2.4.0",
     "zod-to-json-schema": "3.22.3"
   },
   "overrides": {

diff --git a/packages/midnight-smoker/src/component/component/component-registry.ts b/packages/midnight-smoker/src/component/component/component-registry.ts
diff --git a/packages/midnight-smoker/src/component/component/component.ts b/packages/midnight-smoker/src/component/component/component.ts
diff --git a/packages/midnight-smoker/src/component/component/index.ts b/packages/midnight-smoker/src/component/component/index.ts
diff --git a/packages/midnight-smoker/src/component/index.ts b/packages/midnight-smoker/src/component/index.ts
@@ -4,8 +4,6 @@
  * @packageDocumentation
  */
 
-export * from './component';
-
 export * from './executor';
 
 export * from './pkg-manager';

diff --git a/packages/midnight-smoker/src/component/pkg-manager/index.ts b/packages/midnight-smoker/src/component/pkg-manager/index.ts
@@ -2,7 +2,6 @@
  * @module midnight-smoker/pkg-manager
  */
 
-// export * from '#schema/pkg-manager';
 export * from '#error/pkg-manager';
 
 export type {ExecResult} from '#schema/exec-result';
@@ -23,7 +22,7 @@ export * from '#schema/pkg-manager-spec';
 
 export * from '#schema/static-pkg-manager-spec';
 
-export * as Util from 'midnight-smoker/util';
+export * as Util from '#util';
 
 export {SemVer} from 'semver';
 

diff --git a/packages/midnight-smoker/src/component/rule/index.ts b/packages/midnight-smoker/src/component/rule/index.ts
@@ -23,5 +23,3 @@ export * from '#schema/rule-static';
 export * from './context';
 
 export * from './issue';
-
-export * from './rule';
diff --git a/packages/midnight-smoker/src/error/invalid-component-error.ts b/packages/midnight-smoker/src/error/invalid-component-error.ts
@@ -1,13 +1,11 @@
-import type {ComponentKind} from '#constants';
 import {BaseSmokerError} from './base-error';
 
 export class InvalidComponentError extends BaseSmokerError<{
-  id: string;
-  kind: ComponentKind;
+  def: unknown;
 }> {
   public readonly id = 'InvalidComponentError';
 
-  constructor(message: string, kind: ComponentKind, id: string) {
-    super(message, {id, kind});
+  constructor(message: string, def: unknown) {
+    super(message, {def});
   }
 }
diff --git a/packages/midnight-smoker/src/machine/loader/loader-machine.ts b/packages/midnight-smoker/src/machine/loader/loader-machine.ts
@@ -249,7 +249,7 @@ export const LoaderMachine = setup({
                       params: ({event: {output}}) => output,
                     },
                   ],
-                  target: '#LoaderMachine.materializing.selectPkgManagers.done',
+                  target: '#LoaderMachine.selecting.selectPkgManagers.done',
                 },
                 onError: {
                   actions: [
@@ -345,12 +345,12 @@ export const LoaderMachine = setup({
         {
           guard: not('hasError'),
           target: 'done',
-          actions: log('materializing complete'),
+          actions: log('selecting complete'),
         },
         {
           guard: 'hasError',
           target: 'errored',
-          actions: log('materializing errored'),
+          actions: log('selecting errored'),
         },
       ],
     },

diff --git a/packages/midnight-smoker/src/package.json b/packages/midnight-smoker/src/package.json
@@ -1,5 +1,9 @@
 {
   "name": "midnight-smoker",
+  "engines": {
+    "node": "^16.20.0 || ^18.0.0 || ^20.0.0",
+    "npm": ">=7.0.0"
+  },
   "imports": {
     "#cli": "./cli/index.ts",
     "#cli/*": "./cli/*.ts",
@@ -69,7 +73,7 @@
     "./script-runner": {
       "default": "./component/script-runner/index.ts"
     },
-    "./package.json": "./package.kson",
+    "./package.json": "./package.json",
     "./constants": {
       "default": "./constants.ts"
     },

diff --git a/packages/midnight-smoker/src/plugin/component.ts b/packages/midnight-smoker/src/plugin/component.ts
@@ -0,0 +1,32 @@
+import {type ComponentKind, type ComponentKinds} from '#constants';
+import {type Executor} from '#schema/executor';
+import {type PkgManagerDef} from '#schema/pkg-manager-def';
+import {type SomeReporterDef} from '#schema/reporter-def';
+import {type SomeRuleDef} from '#schema/rule-def';
+import {type StaticPluginMetadata} from '#schema/static-plugin-metadata';
+// import Debug from 'debug';
+
+// const debug = Debug('midnight-smoker:component');
+export type ComponentObject<T extends ComponentKind> =
+  T extends typeof ComponentKinds.RuleDef
+    ? SomeRuleDef
+    : T extends typeof ComponentKinds.PkgManagerDef
+      ? PkgManagerDef
+      : T extends typeof ComponentKinds.ReporterDef
+        ? SomeReporterDef
+        : T extends typeof ComponentKinds.Executor
+          ? Executor
+          : never;
+
+export interface Component<T extends ComponentKind = ComponentKind> {
+  readonly id: string;
+  readonly kind: T;
+  readonly pluginName: string;
+  readonly componentName: string;
+  readonly isBlessed: boolean;
+  readonly plugin: StaticPluginMetadata;
+}
+
+export type SomeComponentObject = ComponentObject<any>;
+
+export type SomeComponent = Component<any>;
diff --git a/packages/midnight-smoker/src/plugin/create-plugin-api.ts b/packages/midnight-smoker/src/plugin/create-plugin-api.ts
@@ -70,7 +70,7 @@ export const createPluginAPI = (
     name = DEFAULT_COMPONENT_ID,
   ) => {
     metadata.addExecutor(name, ExecutorSchema.parse(executor));
-    registerComponent(ComponentKinds.Executor, executor, name);
+    registerComponent(ComponentKinds.Executor, executor, name); //?
     return pluginApi;
   };