fix: 深度可选config

xuasir · Mar 5, 2021 · cc01c41 · cc01c41
1 parent bd1723d
commit cc01c41
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/packages/cli/src/exports/create.ts b/packages/cli/src/exports/create.ts
@@ -9,9 +9,15 @@ import type { IPluginAPI } from './pluginAPI'
 
 export interface IConfig extends IProjectConfig {
   libBuild: ILibBuildConfig
-  lint: Partial<ILintConfig>
-  changelog: Partial<IChangelogConfig>
-  release: Partial<IReleaseConfig>
+  lint: ILintConfig
+  changelog: IChangelogConfig
+  release: IReleaseConfig
+}
+
+type IDeepPartial<T> = {
+  [K in keyof T]?:
+    | (T[K] extends Record<string, any> ? IDeepPartial<T[K]> : T[K])
+    | undefined
 }
 
 export type IPlugin = IPluginBase<(api: IPluginAPI) => void>
@@ -23,4 +29,4 @@ export interface IPreset {
 export const createPlugin = (plugin: IPlugin) => plugin
 export const createPreset = (preset: IPreset) => preset
 
-export const defineConfig = (config: Partial<IConfig>) => config
+export const defineConfig = (config: IDeepPartial<IConfig>) => config
diff --git a/packages/plugin-build-lib/src/plugin/config.ts b/packages/plugin-build-lib/src/plugin/config.ts
@@ -6,12 +6,14 @@ export const libBuildSchema = createSchema<ILibBuildConfig>((joi) =>
     targets: joi.array(),
     pointPkgs: joi.array(),
     pkgOrder: joi.array(),
-    rollupChain: joi.function()
+    rollupChain: joi.function(),
+    rollTypes: joi.boolean()
   })
 )
 
 export const defaultLibBuildConfig: () => ILibBuildConfig = () => {
   return {
-    targets: []
+    targets: [],
+    rollTypes: false
   }
 }
diff --git a/packages/plugin-build-lib/src/plugin/types.ts b/packages/plugin-build-lib/src/plugin/types.ts
@@ -74,4 +74,5 @@ export interface ILibBuildConfig {
    * shared should be roll before core
    */
   pkgOrder?: string[]
+  rollTypes?: boolean
 }
diff --git a/packages/plugin-cmd-lib/src/plugin.ts b/packages/plugin-cmd-lib/src/plugin.ts
@@ -39,7 +39,7 @@ export default createPlugin({
               DefaultTargets.includes(target)
             ) as ILibBuildTargets[]
         }
-        if (args?.rollTypes) {
+        if (args?.rollTypes || config?.rollTypes) {
           targets.push('rollTypes')
         }