fixup! fixup! feat(workspace-plugin): implement inferred plugins for clean,format,type-check targets

Author: Hotell

tools/workspace-plugin/src/plugins/clean-plugin.spec.ts

@@ -39,7 +39,7 @@ describe(`clean-plugin`, () => {
   });
 
   it('should create nodes', async () => {
-    const results = await createNodesFunction(['proj/project.json'], {}, context);
+    const results = await createNodesFunction(['proj/project.json'], { targetName: 'clean' }, context);
 
     expect(results).toMatchInlineSnapshot(`
       Array [

tools/workspace-plugin/src/plugins/clean-plugin.ts

@@ -10,7 +10,9 @@ import { dirname } from 'node:path';
 
 import { assertProjectExists, projectConfigGlob } from './shared';
 
-interface CleanPluginOptions {}
+interface CleanPluginOptions {
+  targetName?: string;
+}
 
 export const createNodesV2: CreateNodesV2<CleanPluginOptions> = [
   projectConfigGlob,
@@ -27,6 +29,12 @@ export const createNodesV2: CreateNodesV2<CleanPluginOptions> = [
 ];
 
 // ===================================================================================================================
+function normalizeOptions(options: CleanPluginOptions | undefined): Required<CleanPluginOptions> {
+  options ??= {};
+  options.targetName ??= 'type-check';
+
+  return options as Required<CleanPluginOptions>;
+}
 
 function createNodesInternal(
   configFilePath: string,
@@ -39,6 +47,8 @@ function createNodesInternal(
     return {};
   }
 
+  const normalizedOptions = normalizeOptions(options);
+
   const targetConfig: TargetConfiguration = {
     executor: '@fluentui/workspace-plugin:clean',
   };
@@ -47,7 +57,7 @@ function createNodesInternal(
     projects: {
       [projectRoot]: {
         targets: {
-          clean: targetConfig,
+          [normalizedOptions.targetName]: targetConfig,
         },
       },
     },

tools/workspace-plugin/src/plugins/format-plugin.spec.ts

@@ -42,7 +42,7 @@ describe(`format-plugin`, () => {
     // await tempFs.createFiles({
 
     // });
-    const results = await createNodesFunction(['proj/project.json'], {}, context);
+    const results = await createNodesFunction(['proj/project.json'], { targetName: 'format' }, context);
 
     expect(results).toMatchInlineSnapshot(`
       Array [

tools/workspace-plugin/src/plugins/format-plugin.ts

@@ -11,7 +11,9 @@ import { dirname } from 'node:path';
 
 import { assertProjectExists, projectConfigGlob } from './shared';
 
-interface FormatPluginOptions {}
+interface FormatPluginOptions {
+  targetName?: string;
+}
 
 const pmc = getPackageManagerCommand();
 
@@ -30,6 +32,12 @@ export const createNodesV2: CreateNodesV2<FormatPluginOptions> = [
 ];
 
 // ===================================================================================================================
+function normalizeOptions(options: FormatPluginOptions | undefined): Required<FormatPluginOptions> {
+  options ??= {};
+  options.targetName ??= 'format';
+
+  return options as Required<FormatPluginOptions>;
+}
 
 function createNodesInternal(
   configFilePath: string,
@@ -42,6 +50,8 @@ function createNodesInternal(
     return {};
   }
 
+  const normalizedOptions = normalizeOptions(options);
+
   const targetConfig: TargetConfiguration = {
     command: 'prettier --write {projectRoot}',
     cache: true,
@@ -71,7 +81,7 @@ function createNodesInternal(
     projects: {
       [projectRoot]: {
         targets: {
-          format: targetConfig,
+          [normalizedOptions.targetName]: targetConfig,
         },
       },
     },

tools/workspace-plugin/src/plugins/type-check-plugin.spec.ts

@@ -44,7 +44,7 @@ describe(`type-check-plugin`, () => {
       'proj/tsconfig.lib.json': '{}',
       'proj/tsconfig.spec.json': '{}',
     });
-    const results = await createNodesFunction(['proj/tsconfig.json'], {}, context);
+    const results = await createNodesFunction(['proj/tsconfig.json'], { targetName: 'type-check' }, context);
 
     expect(results).toMatchInlineSnapshot(`
       Array [

tools/workspace-plugin/src/plugins/type-check-plugin.ts

@@ -10,7 +10,9 @@ import { dirname } from 'node:path';
 
 import { assertProjectExists } from './shared';
 
-interface TypeCheckPluginOptions {}
+interface TypeCheckPluginOptions {
+  targetName?: string;
+}
 
 const typescriptConfigGlob = '**/tsconfig.json';
 
@@ -19,7 +21,7 @@ export const createNodesV2: CreateNodesV2<TypeCheckPluginOptions> = [
   (configFiles, options, context) => {
     return createNodesFromFiles(
       (configFile, options, context) => {
-        return createNodesInternal(configFile, options ?? {}, context);
+        return createNodesInternal(configFile, options, context);
       },
       configFiles,
       options,
@@ -30,9 +32,16 @@ export const createNodesV2: CreateNodesV2<TypeCheckPluginOptions> = [
 
 // ===================================================================================================================
 
+function normalizeOptions(options: TypeCheckPluginOptions | undefined): Required<TypeCheckPluginOptions> {
+  options ??= {};
+  options.targetName ??= 'type-check';
+
+  return options as Required<TypeCheckPluginOptions>;
+}
+
 function createNodesInternal(
   configFilePath: string,
-  options: TypeCheckPluginOptions,
+  options: TypeCheckPluginOptions | undefined,
   context: CreateNodesContextV2,
 ): CreateNodesResult {
   const projectRoot = dirname(configFilePath);
@@ -41,6 +50,8 @@ function createNodesInternal(
     return {};
   }
 
+  const normalizedOptions = normalizeOptions(options);
+
   const targetConfig: TargetConfiguration = {
     executor: '@fluentui/workspace-plugin:type-check',
     cache: true,
@@ -55,7 +66,7 @@ function createNodesInternal(
     projects: {
       [projectRoot]: {
         targets: {
-          'type-check': targetConfig,
+          [normalizedOptions.targetName]: targetConfig,
         },
       },
     },