js-build-tools 6.5.0 → 6.7.0

package/functions/partials/distFor.test.mjs

@@ -1,195 +1,195 @@
-import fs from 'fs'
-import { Transform, PassThrough } from 'node:stream'
-import ts from 'typescript'
-import File from 'vinyl'
-import * as setUp from '../test-helpers/setUp.mjs'
-import { distFor } from './distFor.mjs'
-import { countMatches, fileExists } from 'test-filesystem'
-import { tsFor } from './tsFor.mjs'
-
-// tsFor's real implementation loads gulp-ts-compile (a genuine ESM-only package) via a dynamic import() hidden
-// from babel's static analysis - necessary for production correctness (see tsFor.mjs's own comments), but this
-// project's current CommonJS-transform-based Jest setup cannot execute a real dynamic import at all: it doesn't
-// just fail cleanly, it segfaults the whole Jest worker. This fake stands in for it here, doing real (not
-// mocked-away) TypeScript transpilation via `ts.transpileModule` so this test still exercises genuine compile
-// behavior - gulp-ts-compile's own test suite separately covers its whole-program/cross-file-import behavior.
-const fakeLoadTsCompile = () => Promise.resolve((options) => {
-  const transform = new Transform({
-    objectMode: true,
-    transform (file, enc, callback) {
-      const { outputText } = ts.transpileModule(file.contents.toString(), { compilerOptions: options })
-      jsStream.push(new File({ cwd: file.cwd, base: file.base, path: file.path.replace(/\.tsx?$/, '.js'), contents: Buffer.from(outputText) }))
-      callback()
-    },
-    flush (callback) {
-      jsStream.end()
-      dtsStream.end()
-      callback()
-    }
-  })
-  const jsStream = new PassThrough({ objectMode: true })
-  const dtsStream = new PassThrough({ objectMode: true })
-  transform.js = jsStream
-  transform.dts = dtsStream
-  return transform
-})
-
-setUp.setDefaults('test-dist-for')
-const gulpConfig = setUp.gulpConfig
-
-const rawContents = 'const babel = require(\'gulp-babel\')\n' +
-  'const { dest, src } = require(\'gulp\')\n' +
-  'const typeScript = require(\'./typeScript\')\n' +
-  'const gulpConfig = require(\'../gulp.config.js\')\n' +
-  '\n' +
-  'const useTsConfig = gulpConfig.get(\'useTsConfig\')\n' +
-  '\n' +
-  'const defaultSrc = useTsConfig\n' +
-  '  ? gulpConfig.get(\'distSearch\')\n' +
-  '  : gulpConfig.get(\'srcSearch\')\n' +
-  '\n' +
-  'const distFor = (srcPath = defaultSrc, destPath = gulpConfig.get(\'distPath\')) => {\n' +
-  '  let pipedSrc = src(srcPath)\n' +
-  '  if (useTsConfig) {\n' +
-  '    // Add the typescript so we can compile then apply babel to those files\n' +
-  '    pipedSrc = typeScript(pipedSrc)\n' +
-  '  }\n' +
-  '  return pipedSrc\n' +
-  '    .pipe(babel())\n' +
-  '    .pipe(dest(destPath))\n' +
-  '}\n' +
-  '\n' +
-  'module.exports = distFor\n'
-
-const rawTsContents = '// @ts-ignore\n' +
-  'import gulpConfig from \'../gulp.config.js\'\n' +
-  '// @ts-ignore\n' +
-  'import typeScript from \'./typeScript.js\'\n' +
-  '// @ts-ignore\n' +
-  'import {dest, src} from \'gulp\'\n' +
-  '// @ts-ignore\n' +
-  'import babel from \'gulp-babel\'\n' +
-  '\n' +
-  'const useTsConfig = gulpConfig.get(\'useTsConfig\')\n' +
-  '\n' +
-  'const defaultSrc: string | Array<any> = useTsConfig\n' +
-  '    ? gulpConfig.get(\'distSearch\')\n' +
-  '    : gulpConfig.get(\'srcSearch\')\n' +
-  '\n' +
-  '// @ts-ignore\n' +
-  'const distFor = (srcPath: string | Array<any> = defaultSrc, destPath: string = gulpConfig.get(\'distPath\')): import(\'readable-stream\').Stream => {\n' +
-  '    let pipedSrc = src(srcPath)\n' +
-  '    if (useTsConfig) {\n' +
-  '        // Add the typescript so we can compile then apply babel to those files\n' +
-  '        pipedSrc = typeScript(pipedSrc)\n' +
-  '    }\n' +
-  '    return pipedSrc\n' +
-  '        .pipe(babel())\n' +
-  '        .pipe(dest(destPath))\n' +
-  '}\n' +
-  '\n' +
-  'export default distFor\n'
-
-const rawMjsContents = 'import babel from \'gulp-babel\'\n' +
-  'import { dest, src } from \'gulp\'\n' +
-  'import { distForSrc } from \'./distForSrc.mjs\'\n' +
-  'import * as gulpConfig from \'../../gulp.config.mjs\'\n' +
-  '\n' +
-  '/**\n' +
-  ' * Build the distribution for a given source pattern.\n' +
-  ' * @memberOf module:partials\n' +
-  ' * @param {string|array} [srcPath=\'src/config/path/dist/for\']\n' +
-  ' * @param {string} [destPath=\'dist/config/path\']\n' +
-  ' * @returns {stream.Stream}\n' +
-  ' */\n' +
-  'export const distFor = (srcPath = distForSrc(), destPath = gulpConfig.get(\'dist.to\')) => src(srcPath)\n' +
-  '  .pipe(babel())\n' +
-  '  .pipe((result) => console.log(result) || result)\n' +
-  '  .pipe(dest(destPath))\n'
-
-beforeEach(setUp.beforeEach)
-
-afterEach(setUp.afterEach)
-
-describe('distFor', () => {
-  test('copies the src directory and babelifies it into the dist directory', done => {
-    const srcPath = gulpConfig.get('srcPath')
-    const srcFile = `${srcPath}/distFor.js`
-    fs.writeFileSync(srcFile, rawContents)
-    expect.assertions(3)
-    const oldContents = fs.readFileSync(srcFile).toString()
-    expect(countMatches(oldContents, 'const ')).toEqual(7)
-    const distPath = gulpConfig.get('dist.to')
-    distFor(srcFile)
-      .on('finish', () => {
-        expect(fileExists(distPath)).toBeTruthy()
-        const babelifiedContents = fs.readFileSync(`${distPath}/distFor.js`).toString()
-        /* There used to be checks here for `const`/`let` being swapped to `var`, and for arrow functions being
-           compiled down to `function`/`arguments`, but neither happens anymore now that 'browserslist' resolves to
-           targets that natively support this syntax - there's nothing stable left to count. What still matters -
-           that babel actually ran and produced a valid CommonJS module - is confirmed by the "use strict" check.
-         */
-        expect(countMatches(babelifiedContents, '"use strict"')).toEqual(1)
-        done()
-      })
-      .on('error', error => {
-        console.error('Encountered error', error)
-        done()
-      })
-  }, 5000)
-
-  test('can process typescript before babel', done => {
-    // Since adding the additional skip in tsFor if not enabled we need to ensure that we enable typescript for this test.
-    gulpConfig.set('typescript.enabled', true)
-    const srcPath = gulpConfig.get('srcPath')
-    const srcFile = `${srcPath}/distFor.ts`
-    fs.writeFileSync(srcFile, rawTsContents)
-    expect.assertions(7)
-    const oldContents = fs.readFileSync(srcFile).toString()
-    expect(countMatches(oldContents, 'const ')).toEqual(3)
-    const distPath = gulpConfig.get('dist.to')
-    const tsFrom = gulpConfig.get('typescript.from')
-    const tsTo = gulpConfig.get('typescript.to')
-    tsFor(tsFrom, tsTo, fakeLoadTsCompile)(() => {
-      distFor()
-        .on('finish', () => {
-          expect(fileExists(distPath)).toBeTruthy()
-          const babelifiedContents = fs.readFileSync(`${distPath}/distFor.js`).toString()
-          expect(countMatches(babelifiedContents, '"use strict"')).toEqual(1)
-          expect(countMatches(babelifiedContents, 'const ')).toEqual(0)
-          expect(countMatches(babelifiedContents, 'var ')).toEqual(8)
-          expect(countMatches(babelifiedContents, 'function')).toEqual(1)
-          expect(countMatches(babelifiedContents, 'Object.defineProperty(exports, "__esModule", {')).toEqual(1)
-          done()
-        })
-        .on('error', error => {
-          console.error('Encountered error with distFor', error)
-          done()
-        })
-    })
-  }, 60000)
-
-  test('converts .mjs file extension to .js', done => {
-    const srcPath = gulpConfig.get('srcPath')
-    const srcFile = `${srcPath}/distFor.mjs`
-    fs.writeFileSync(srcFile, rawMjsContents)
-    // expect.assertions(5)
-    const oldContents = fs.readFileSync(srcFile).toString()
-    expect(countMatches(oldContents, '.mjs')).toEqual(2)
-    const distPath = gulpConfig.get('dist.to')
-    distFor(srcFile)
-      .on('finish', () => {
-        expect(fileExists(distPath)).toBeTruthy()
-        const babelifiedContents = fs.readFileSync(`${distPath}/distFor.js`).toString()
-        // A total '.js' substring count is too fragile - it drifts with whichever core-js polyfill modules babel
-        // happens to pull in. Check specifically for the thing this test is about: the .mjs import extension in
-        // the source (./distForSrc.mjs) got rewritten to .js in the compiled require path.
-        expect(countMatches(babelifiedContents, 'distForSrc.js')).toEqual(1)
-        done()
-      })
-      .on('error', error => {
-        console.error('Encountered error', error)
-        done()
-      })
-  }, 5000)
-})
+import fs from 'fs'
+import { Transform, PassThrough } from 'node:stream'
+import ts from 'typescript'
+import File from 'vinyl'
+import * as setUp from '../test-helpers/setUp.mjs'
+import { distFor } from './distFor.mjs'
+import { countMatches, fileExists } from 'test-filesystem'
+import { tsFor } from './tsFor.mjs'
+
+// tsFor's real implementation loads gulp-ts-compile (a genuine ESM-only package) via a dynamic import() hidden
+// from babel's static analysis - necessary for production correctness (see tsFor.mjs's own comments), but this
+// project's current CommonJS-transform-based Jest setup cannot execute a real dynamic import at all: it doesn't
+// just fail cleanly, it segfaults the whole Jest worker. This fake stands in for it here, doing real (not
+// mocked-away) TypeScript transpilation via `ts.transpileModule` so this test still exercises genuine compile
+// behavior - gulp-ts-compile's own test suite separately covers its whole-program/cross-file-import behavior.
+const fakeLoadTsCompile = () => Promise.resolve((options) => {
+  const transform = new Transform({
+    objectMode: true,
+    transform (file, enc, callback) {
+      const { outputText } = ts.transpileModule(file.contents.toString(), { compilerOptions: options })
+      jsStream.push(new File({ cwd: file.cwd, base: file.base, path: file.path.replace(/\.tsx?$/, '.js'), contents: Buffer.from(outputText) }))
+      callback()
+    },
+    flush (callback) {
+      jsStream.end()
+      dtsStream.end()
+      callback()
+    }
+  })
+  const jsStream = new PassThrough({ objectMode: true })
+  const dtsStream = new PassThrough({ objectMode: true })
+  transform.js = jsStream
+  transform.dts = dtsStream
+  return transform
+})
+
+setUp.setDefaults('test-dist-for')
+const gulpConfig = setUp.gulpConfig
+
+const rawContents = 'const babel = require(\'gulp-babel\')\n' +
+  'const { dest, src } = require(\'gulp\')\n' +
+  'const typeScript = require(\'./typeScript\')\n' +
+  'const gulpConfig = require(\'../gulp.config.js\')\n' +
+  '\n' +
+  'const useTsConfig = gulpConfig.get(\'useTsConfig\')\n' +
+  '\n' +
+  'const defaultSrc = useTsConfig\n' +
+  '  ? gulpConfig.get(\'distSearch\')\n' +
+  '  : gulpConfig.get(\'srcSearch\')\n' +
+  '\n' +
+  'const distFor = (srcPath = defaultSrc, destPath = gulpConfig.get(\'distPath\')) => {\n' +
+  '  let pipedSrc = src(srcPath)\n' +
+  '  if (useTsConfig) {\n' +
+  '    // Add the typescript so we can compile then apply babel to those files\n' +
+  '    pipedSrc = typeScript(pipedSrc)\n' +
+  '  }\n' +
+  '  return pipedSrc\n' +
+  '    .pipe(babel())\n' +
+  '    .pipe(dest(destPath))\n' +
+  '}\n' +
+  '\n' +
+  'module.exports = distFor\n'
+
+const rawTsContents = '// @ts-ignore\n' +
+  'import gulpConfig from \'../gulp.config.js\'\n' +
+  '// @ts-ignore\n' +
+  'import typeScript from \'./typeScript.js\'\n' +
+  '// @ts-ignore\n' +
+  'import {dest, src} from \'gulp\'\n' +
+  '// @ts-ignore\n' +
+  'import babel from \'gulp-babel\'\n' +
+  '\n' +
+  'const useTsConfig = gulpConfig.get(\'useTsConfig\')\n' +
+  '\n' +
+  'const defaultSrc: string | Array<any> = useTsConfig\n' +
+  '    ? gulpConfig.get(\'distSearch\')\n' +
+  '    : gulpConfig.get(\'srcSearch\')\n' +
+  '\n' +
+  '// @ts-ignore\n' +
+  'const distFor = (srcPath: string | Array<any> = defaultSrc, destPath: string = gulpConfig.get(\'distPath\')): import(\'readable-stream\').Stream => {\n' +
+  '    let pipedSrc = src(srcPath)\n' +
+  '    if (useTsConfig) {\n' +
+  '        // Add the typescript so we can compile then apply babel to those files\n' +
+  '        pipedSrc = typeScript(pipedSrc)\n' +
+  '    }\n' +
+  '    return pipedSrc\n' +
+  '        .pipe(babel())\n' +
+  '        .pipe(dest(destPath))\n' +
+  '}\n' +
+  '\n' +
+  'export default distFor\n'
+
+const rawMjsContents = 'import babel from \'gulp-babel\'\n' +
+  'import { dest, src } from \'gulp\'\n' +
+  'import { distForSrc } from \'./distForSrc.mjs\'\n' +
+  'import * as gulpConfig from \'../../gulp.config.mjs\'\n' +
+  '\n' +
+  '/**\n' +
+  ' * Build the distribution for a given source pattern.\n' +
+  ' * @memberOf module:partials\n' +
+  ' * @param {string|array} [srcPath=\'src/config/path/dist/for\']\n' +
+  ' * @param {string} [destPath=\'dist/config/path\']\n' +
+  ' * @returns {stream.Stream}\n' +
+  ' */\n' +
+  'export const distFor = (srcPath = distForSrc(), destPath = gulpConfig.get(\'dist.to\')) => src(srcPath)\n' +
+  '  .pipe(babel())\n' +
+  '  .pipe((result) => console.log(result) || result)\n' +
+  '  .pipe(dest(destPath))\n'
+
+beforeEach(setUp.beforeEach)
+
+afterEach(setUp.afterEach)
+
+describe('distFor', () => {
+  test('copies the src directory and babelifies it into the dist directory', done => {
+    const srcPath = gulpConfig.get('srcPath')
+    const srcFile = `${srcPath}/distFor.js`
+    fs.writeFileSync(srcFile, rawContents)
+    expect.assertions(3)
+    const oldContents = fs.readFileSync(srcFile).toString()
+    expect(countMatches(oldContents, 'const ')).toEqual(7)
+    const distPath = gulpConfig.get('dist.to')
+    distFor(srcFile)
+      .on('finish', () => {
+        expect(fileExists(distPath)).toBeTruthy()
+        const babelifiedContents = fs.readFileSync(`${distPath}/distFor.js`).toString()
+        /* There used to be checks here for `const`/`let` being swapped to `var`, and for arrow functions being
+           compiled down to `function`/`arguments`, but neither happens anymore now that 'browserslist' resolves to
+           targets that natively support this syntax - there's nothing stable left to count. What still matters -
+           that babel actually ran and produced a valid CommonJS module - is confirmed by the "use strict" check.
+         */
+        expect(countMatches(babelifiedContents, '"use strict"')).toEqual(1)
+        done()
+      })
+      .on('error', error => {
+        console.error('Encountered error', error)
+        done()
+      })
+  }, 5000)
+
+  test('can process typescript before babel', done => {
+    // Since adding the additional skip in tsFor if not enabled we need to ensure that we enable typescript for this test.
+    gulpConfig.set('typescript.enabled', true)
+    const srcPath = gulpConfig.get('srcPath')
+    const srcFile = `${srcPath}/distFor.ts`
+    fs.writeFileSync(srcFile, rawTsContents)
+    expect.assertions(7)
+    const oldContents = fs.readFileSync(srcFile).toString()
+    expect(countMatches(oldContents, 'const ')).toEqual(3)
+    const distPath = gulpConfig.get('dist.to')
+    const tsFrom = gulpConfig.get('typescript.from')
+    const tsTo = gulpConfig.get('typescript.to')
+    tsFor(tsFrom, tsTo, fakeLoadTsCompile)(() => {
+      distFor()
+        .on('finish', () => {
+          expect(fileExists(distPath)).toBeTruthy()
+          const babelifiedContents = fs.readFileSync(`${distPath}/distFor.js`).toString()
+          expect(countMatches(babelifiedContents, '"use strict"')).toEqual(1)
+          expect(countMatches(babelifiedContents, 'const ')).toEqual(0)
+          expect(countMatches(babelifiedContents, 'var ')).toEqual(8)
+          expect(countMatches(babelifiedContents, 'function')).toEqual(1)
+          expect(countMatches(babelifiedContents, 'Object.defineProperty(exports, "__esModule", {')).toEqual(1)
+          done()
+        })
+        .on('error', error => {
+          console.error('Encountered error with distFor', error)
+          done()
+        })
+    })
+  }, 60000)
+
+  test('converts .mjs file extension to .js', done => {
+    const srcPath = gulpConfig.get('srcPath')
+    const srcFile = `${srcPath}/distFor.mjs`
+    fs.writeFileSync(srcFile, rawMjsContents)
+    // expect.assertions(5)
+    const oldContents = fs.readFileSync(srcFile).toString()
+    expect(countMatches(oldContents, '.mjs')).toEqual(2)
+    const distPath = gulpConfig.get('dist.to')
+    distFor(srcFile)
+      .on('finish', () => {
+        expect(fileExists(distPath)).toBeTruthy()
+        const babelifiedContents = fs.readFileSync(`${distPath}/distFor.js`).toString()
+        // A total '.js' substring count is too fragile - it drifts with whichever core-js polyfill modules babel
+        // happens to pull in. Check specifically for the thing this test is about: the .mjs import extension in
+        // the source (./distForSrc.mjs) got rewritten to .js in the compiled require path.
+        expect(countMatches(babelifiedContents, 'distForSrc.js')).toEqual(1)
+        done()
+      })
+      .on('error', error => {
+        console.error('Encountered error', error)
+        done()
+      })
+  }, 5000)
+})

package/functions/partials/distForSrc.mjs

@@ -1,11 +1,11 @@
-import * as gulpConfig from '../../gulp.config.mjs'
-
-/**
- * Retrieve the correct distFor search path based on TS Config.
- * @memberOf module:partials
- * @param {module:gulpConfig~FlagStringSetting} [useTs='config/for/ts']
- * @returns {string}
- */
-export const distForSrc = (useTs = gulpConfig.get('typescript.enabled')) => useTs
-  ? gulpConfig.get('browser.from')
-  : gulpConfig.get('dist.from')
+import * as gulpConfig from '../../gulp.config.mjs'
+
+/**
+ * Retrieve the correct distFor search path based on TS Config.
+ * @memberOf module:partials
+ * @param {module:gulpConfig~FlagStringSetting} [useTs='config/for/ts']
+ * @returns {string}
+ */
+export const distForSrc = (useTs = gulpConfig.get('typescript.enabled')) => useTs
+  ? gulpConfig.get('browser.from')
+  : gulpConfig.get('dist.from')

package/functions/partials/distForSrc.test.mjs

@@ -1,18 +1,18 @@
-import * as setUp from '../test-helpers/setUp.mjs'
-import { distForSrc } from './distForSrc.mjs'
-
-const gulpConfig = setUp.gulpConfig
-
-describe('distForSrc', () => {
-  test('typescript.enabled as false returns srcSearch', () => {
-    expect.assertions(1)
-    gulpConfig.set('typescript.enabled', false)
-    expect(distForSrc()).toBe(gulpConfig.get('dist.from'))
-  })
-
-  test('typescript.enabled as true returns distSearch', () => {
-    expect.assertions(1)
-    gulpConfig.set('typescript.enabled', true)
-    expect(distForSrc()).toBe(gulpConfig.get('browser.from'))
-  })
-})
+import * as setUp from '../test-helpers/setUp.mjs'
+import { distForSrc } from './distForSrc.mjs'
+
+const gulpConfig = setUp.gulpConfig
+
+describe('distForSrc', () => {
+  test('typescript.enabled as false returns srcSearch', () => {
+    expect.assertions(1)
+    gulpConfig.set('typescript.enabled', false)
+    expect(distForSrc()).toBe(gulpConfig.get('dist.from'))
+  })
+
+  test('typescript.enabled as true returns distSearch', () => {
+    expect.assertions(1)
+    gulpConfig.set('typescript.enabled', true)
+    expect(distForSrc()).toBe(gulpConfig.get('browser.from'))
+  })
+})

package/functions/partials/distSeries.mjs

@@ -1,21 +1,21 @@
-import * as gulpConfig from '../../gulp.config.mjs'
-import { distFor } from './distFor.mjs'
-import { distForSrc } from './distForSrc.mjs'
-import { series } from 'gulp'
-import { tsFor } from './tsFor.mjs'
-
-/**
- * When using TypeScript, ensure that we process the ts first then run babel (dist)
- * @memberOf module:partials
- * @param {string} [srcPath='src/config/path/dist/for']
- * @param {string} [distFinalPath='dist/config/path']
- * @param {string} [tsSearch='ts/search/config/path']
- * @returns {function(null=): stream.Stream}
- */
-export const distSeries = (srcPath = distForSrc(), distFinalPath = gulpConfig.get('dist.to'), tsSearch = gulpConfig.get('typescript.from')) => {
-  const typescript = tsFor(tsSearch, distFinalPath)
-  const dist = () => distFor(srcPath, distFinalPath)
-  return gulpConfig.get('typescript.enabled')
-    ? series(typescript, dist)
-    : dist
-}
+import * as gulpConfig from '../../gulp.config.mjs'
+import { distFor } from './distFor.mjs'
+import { distForSrc } from './distForSrc.mjs'
+import { series } from 'gulp'
+import { tsFor } from './tsFor.mjs'
+
+/**
+ * When using TypeScript, ensure that we process the ts first then run babel (dist)
+ * @memberOf module:partials
+ * @param {string} [srcPath='src/config/path/dist/for']
+ * @param {string} [distFinalPath='dist/config/path']
+ * @param {string} [tsSearch='ts/search/config/path']
+ * @returns {function(null=): stream.Stream}
+ */
+export const distSeries = (srcPath = distForSrc(), distFinalPath = gulpConfig.get('dist.to'), tsSearch = gulpConfig.get('typescript.from')) => {
+  const typescript = tsFor(tsSearch, distFinalPath)
+  const dist = () => distFor(srcPath, distFinalPath)
+  return gulpConfig.get('typescript.enabled')
+    ? series(typescript, dist)
+    : dist
+}

package/functions/partials/distSeries.test.mjs

@@ -1,34 +1,34 @@
-import * as setUp from '../test-helpers/setUp.mjs'
-import { distSeries } from './distSeries.mjs'
-import { tsFor } from './tsFor.mjs'
-import { distFor } from './distFor.mjs'
-
-const gulpConfig = setUp.gulpConfig
-
-const genericFunction = () => Promise.resolve(true)
-
-jest.mock('./distFor.mjs', () => ({ distFor: jest.fn(genericFunction) }))
-jest.mock('./tsFor.mjs', () => ({ tsFor: jest.fn(() => genericFunction) }))
-
-describe('distSeries', () => {
-  test('when not using ts config only returns runnable distFor', done => {
-    gulpConfig.set('typescript.enabled', false)
-    expect.assertions(1)
-    distSeries()()
-    setTimeout(() => {
-      expect(distFor).toHaveBeenCalledWith(gulpConfig.get('dist.from'), gulpConfig.get('dist.to'))
-      done()
-    }, 500)
-  })
-
-  test('when using ts config returns runnable series of tsFor and distFor', done => {
-    gulpConfig.set('typescript.enabled', true)
-    expect.assertions(2)
-    distSeries()()
-    setTimeout(() => {
-      expect(tsFor).toHaveBeenCalledWith(gulpConfig.get('typescript.from'), gulpConfig.get('dist.to'))
-      expect(distFor).toHaveBeenCalledWith(gulpConfig.get('browser.from'), gulpConfig.get('dist.to'))
-      done()
-    }, 500)
-  })
-})
+import * as setUp from '../test-helpers/setUp.mjs'
+import { distSeries } from './distSeries.mjs'
+import { tsFor } from './tsFor.mjs'
+import { distFor } from './distFor.mjs'
+
+const gulpConfig = setUp.gulpConfig
+
+const genericFunction = () => Promise.resolve(true)
+
+jest.mock('./distFor.mjs', () => ({ distFor: jest.fn(genericFunction) }))
+jest.mock('./tsFor.mjs', () => ({ tsFor: jest.fn(() => genericFunction) }))
+
+describe('distSeries', () => {
+  test('when not using ts config only returns runnable distFor', done => {
+    gulpConfig.set('typescript.enabled', false)
+    expect.assertions(1)
+    distSeries()()
+    setTimeout(() => {
+      expect(distFor).toHaveBeenCalledWith(gulpConfig.get('dist.from'), gulpConfig.get('dist.to'))
+      done()
+    }, 500)
+  })
+
+  test('when using ts config returns runnable series of tsFor and distFor', done => {
+    gulpConfig.set('typescript.enabled', true)
+    expect.assertions(2)
+    distSeries()()
+    setTimeout(() => {
+      expect(tsFor).toHaveBeenCalledWith(gulpConfig.get('typescript.from'), gulpConfig.get('dist.to'))
+      expect(distFor).toHaveBeenCalledWith(gulpConfig.get('browser.from'), gulpConfig.get('dist.to'))
+      done()
+    }, 500)
+  })
+})