Allow undefined and false in composable array

vilicvane · Nov 4, 2023 · b8f5f08 · b8f5f08
1 parent 90a72fe
commit b8f5f08
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 19 deletions.
diff --git a/packages/core/src/library/boilerplate/composable.ts b/packages/core/src/library/boilerplate/composable.ts
@@ -2,7 +2,7 @@ import type {Composable, File} from '../file/index.js';
 
 export type ComposableModuleDefault =
   | Composable
-  | Composable[]
+  | (Composable | false | undefined)[]
   | undefined
   | ComposableBuilder;
 
@@ -13,9 +13,11 @@ export type ComposableBuilder<
   options: TOptions,
 ) =>
   | Composable<TFile>
-  | Composable<TFile>[]
+  | (Composable<TFile> | false | undefined)[]
   | undefined
-  | Promise<Composable<TFile> | Composable<TFile>[] | undefined>;
+  | Promise<
+      Composable<TFile> | (Composable<TFile> | false | undefined)[] | undefined
+    >;
 
 /**
  * A utility function that returns the givin composable / composable module function as-is.

diff --git a/packages/core/src/library/boilerplate/composables.ts b/packages/core/src/library/boilerplate/composables.ts
@@ -78,23 +78,30 @@ export async function composables(
     const baseDir = Path.relative(root, Path.dirname(composableModulePath));
 
     allComposables.push(
-      ...composables.map(composable => {
-        const {path} = composable;
-
-        return {
-          source: composableModulePath,
-          target: path
-            ? Path.join(baseDir, path)
-            : Path.join(
-                baseDir,
-                Path.basename(
-                  composableModulePath,
-                  Path.extname(composableModulePath),
+      ...composables
+        .filter(
+          (
+            composable,
+          ): composable is Exclude<typeof composable, false | undefined> =>
+            !!composable,
+        )
+        .map(composable => {
+          const {path} = composable;
+
+          return {
+            source: composableModulePath,
+            target: path
+              ? Path.join(baseDir, path)
+              : Path.join(
+                  baseDir,
+                  Path.basename(
+                    composableModulePath,
+                    Path.extname(composableModulePath),
+                  ),
                 ),
-              ),
-          ...composable,
-        };
-      }),
+            ...composable,
+          };
+        }),
     );
   }