wip

boneskull · Apr 21, 2024 · 7daef13 · 7daef13
1 parent 9e178b9
commit 7daef13
Show file tree

Hide file tree

Showing 23 changed files with 570 additions and 403 deletions.
diff --git a/packages/midnight-smoker/src/component/pkg-manager/pkg-manager.ts b/packages/midnight-smoker/src/component/pkg-manager/pkg-manager.ts
@@ -136,7 +136,7 @@ export class PkgManager extends ReifiedComponent<PkgManagerDef> {
 
   public async pack(
     signal: AbortSignal,
-    opts: PackOptions = {},
+    opts: PackOptions,
   ): Promise<InstallManifest[]> {
     const ctx: PkgManagerPackContext = {...this.ctx, ...opts, signal};
     this._installManifests = await this.def.pack(ctx);

diff --git a/packages/midnight-smoker/src/component/reporter/index.ts b/packages/midnight-smoker/src/component/reporter/index.ts
@@ -5,3 +5,7 @@
 export * from '#error/reporter-error';
 
 export * from '#schema/reporter-def';
+
+export * from './reporter';
+
+export * from './reporter-def';
diff --git a/packages/midnight-smoker/src/component/rule/index.ts b/packages/midnight-smoker/src/component/rule/index.ts
@@ -12,8 +12,6 @@ export * from '#schema/rule';
 
 export * from '#schema/rule-def';
 
-export * from '#schema/rule-issue';
-
 export * from '#schema/rule-options';
 
 export * from '#schema/rule-result';

diff --git a/packages/midnight-smoker/src/component/schema/index.ts b/packages/midnight-smoker/src/component/schema/index.ts
@@ -36,8 +36,6 @@ export * from './rule';
 
 export * from './rule-def';
 
-export * from './rule-issue';
-
 export * from './rule-options';
 
 export * from './rule-result';
@@ -59,3 +57,5 @@ export * from './smoker-event';
 export * from './static-pkg-manager-spec';
 
 export * from './static-plugin-metadata';
+
+export * from './workspaces';
diff --git a/packages/midnight-smoker/src/component/schema/install-manifest.ts b/packages/midnight-smoker/src/component/schema/install-manifest.ts
@@ -3,14 +3,19 @@ import {z} from 'zod';
 
 export const InstallManifestSchema = z
   .object({
+    localPath: NonEmptyStringSchema.optional().describe(
+      'Path to local package workspace; not applicable if this is an extra dep',
+    ),
     cwd: NonEmptyStringSchema.describe('The working directory for the install'),
     installPath: NonEmptyStringSchema.optional().describe(
       'The path to install the package to; only applicable if spec is a tarball',
     ),
     pkgName: NonEmptyStringSchema.describe(
       'The name of the package to install',
     ),
-    pkgSpec: NonEmptyStringSchema.describe('The package spec to install'),
+    pkgSpec: NonEmptyStringSchema.describe(
+      'The package spec to install; either a tarball or a name[@version] for additional deps',
+    ),
     isAdditional: z
       .boolean()
       .optional()

diff --git a/packages/midnight-smoker/src/component/schema/pack-options.ts b/packages/midnight-smoker/src/component/schema/pack-options.ts
@@ -5,9 +5,7 @@ export type PackOptions = z.infer<typeof PackOptionsSchema>;
 
 export const PackOptionsSchema = z
   .object({
-    cwd: NonEmptyStringSchema.optional().describe(
-      'The current working directory',
-    ),
+    cwd: NonEmptyStringSchema.describe('The current working directory'),
     allWorkspaces: z
       .boolean()
       .optional()

diff --git a/packages/midnight-smoker/src/component/schema/pkg-manager-def.ts b/packages/midnight-smoker/src/component/schema/pkg-manager-def.ts
@@ -84,6 +84,7 @@ export const PkgManagerContextSchema = z
     executor: ExecutorSchema,
     loose: z.boolean().optional(),
     verbose: z.boolean().optional(),
+    workspaceInfo: z.record(NonEmptyStringSchema),
   })
   .passthrough();
 

diff --git a/packages/midnight-smoker/src/component/schema/rule-issue.ts b/packages/midnight-smoker/src/component/schema/rule-issue.ts
diff --git a/packages/midnight-smoker/src/component/schema/workspaces.ts b/packages/midnight-smoker/src/component/schema/workspaces.ts
@@ -0,0 +1,13 @@
+import {z} from 'zod';
+import {NonEmptyStringArraySchema} from '../../util';
+
+export const WorkspacesSchema = NonEmptyStringArraySchema;
+
+export const WorkspacesConfigSchema = WorkspacesSchema.or(
+  z
+    .object({
+      packages: NonEmptyStringArraySchema,
+    })
+    .transform(({packages}) => packages)
+    .pipe(WorkspacesSchema),
+);
diff --git a/packages/midnight-smoker/src/machine/controller/control-machine-events.ts b/packages/midnight-smoker/src/machine/controller/control-machine-events.ts
@@ -22,7 +22,7 @@ import {type Simplify, type ValueOf} from 'type-fest';
 import {type InstallerMachineOutput} from '../installer/installer-machine';
 import {type LinterMachineOutput} from '../linter/linter-machine';
 import {type PackerMachineOutput} from '../packer/packer-machine';
-import {type ComponentReifierOutput} from '../reifier/component-reifier-machine';
+import {type ReifierOutput} from '../reifier/reifier-machine';
 import {type ReporterMachineOutput} from '../reporter/reporter-machine';
 import {type RunnerMachineOutput} from '../runner/runner-machine';
 
@@ -41,7 +41,7 @@ export type CtrlEvents =
   | CtrlPkgManagerPackOkEvent
   | CtrlPkgManagerInstallBeginEvent
   | CtrlPkgManagerPackBeginEvent
-  | CtrlComponentReifierDoneEvent
+  | CtrlReifierDoneEvent
   | CtrlRunScriptsEvent
   | CtrlRunScriptBeginEvent
   | CtrlReporterDoneEvent
@@ -217,9 +217,9 @@ export interface CtrlPkgManagerPackBeginEvent extends PackOptions {
   type: 'PKG_MANAGER_PACK_BEGIN';
 }
 
-export interface CtrlComponentReifierDoneEvent {
-  output: ComponentReifierOutput;
-  type: 'xstate.done.actor.ComponentReifier.*';
+export interface CtrlReifierDoneEvent {
+  output: ReifierOutput;
+  type: 'xstate.done.actor.Reifier.*';
 }
 
 export interface CtrlInstallerMachineDoneEvent {