perf(core): reduce code execution in build

danielroe · Jun 11, 2020 · be34f6c · be34f6c
1 parent 5017805
commit be34f6c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/packages/core/src/build/rollup.ts b/packages/core/src/build/rollup.ts
@@ -56,6 +56,9 @@ export function getRollupConfig(
   }: Package = new Package()
 ): RollupOptions[] {
   const resolvePath = (...path: string[]) => resolve(rootDir, ...path)
+  input = input ? resolvePath(input) : entrypoint
+  if (!input && !binaries.length) return []
+
   const name = basename(pkg.name.replace(suffix, ''))
   const getFilenames = getNameFunction(rootDir, name)
 
@@ -89,20 +92,16 @@ export function getRollupConfig(
       jsonPlugin(),
     ].concat(plugins)
 
-  input = input ? resolvePath(input) : entrypoint
-
-  if (!input && !binaries.length) return []
-
   const defaultOutputs = [
     {
       ...getFilenames(pkg.main),
       format: 'cjs',
       preferConst: true,
     },
-    ...includeIf(pkg.module && !dev, {
-      ...getFilenames(pkg.module, '-es'),
+    ...includeIf(!dev && pkg.module, pkgModule => ({
+      ...getFilenames(pkgModule, '-es'),
       format: 'es',
-    }),
+    })),
   ]
 
   return [
@@ -119,16 +118,15 @@ export function getRollupConfig(
         plugins: getPlugins(),
       })
     }),
-    ...includeIf(
-      input,
+    ...includeIf(input, input =>
       defu({}, options, {
         input,
         output: defaultOutputs,
         external,
         plugins: getPlugins(),
       })
     ),
-    ...includeIf(pkg.types && input, {
+    ...includeIf(pkg.types && input, input => ({
       input,
       output: {
         file: resolvePath(pkg.types || ''),
@@ -143,6 +141,6 @@ export function getRollupConfig(
           },
         }),
       ],
-    }),
+    })),
   ]
 }
diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts
@@ -60,7 +60,12 @@ export const includeDefinedProperties = <T extends Record<string, any>>(
     Object.entries(options).filter(([_, value]) => value !== undefined)
   ) as ExcludeNullable<T>
 
-export const includeIf = <T>(test: any, item: T) => (test ? [item] : [])
+type NonFalsy<T> = T extends null | undefined | false ? never : T
+
+export const includeIf = <T, I>(
+  test: T,
+  itemFactory: (outcome: NonFalsy<T>) => I
+) => (test ? [itemFactory(test as any)] : [])
 
 export const runInParallel = async <T, R extends any>(
   items: T[],

diff --git a/packages/core/src/utils/utils.spec.ts b/packages/core/src/utils/utils.spec.ts
@@ -90,14 +90,14 @@ describe('includeDefinedProperties', definedPropertiesTest)
 describe('includeIf', () => {
   it('should return an empty array when falsy', () => {
     const results = [
-      includeIf(false, 'test'),
-      includeIf(null, 'test'),
-      includeIf(undefined, 'test'),
+      includeIf(false, () => 'test'),
+      includeIf(null, () => 'test'),
+      includeIf(undefined, () => 'test'),
     ]
     expect(results).toEqual([[], [], []])
   })
   it('should return the item in an array when true', () => {
-    const result = includeIf(true, 'test')
+    const result = includeIf(true, () => 'test')
     expect(result).toEqual(['test'])
   })
 })