Convert FP and indices to TypeScript (date-fns#2525)

scripts/_lib/listFPFns.js

@@ -3,15 +3,22 @@ const fs = require('fs')
 
 module.exports = listFPFns
 
-const ignoredFiles = ['index.js', 'test.js', 'index.js.flow', 'package.json']
+const ignoredFiles = [
+  'index.js',
+  'index.ts',
+  'test.js',
+  'test.ts',
+  'index.js.flow',
+  'package.json',
+]
 
 function listFPFns() {
   const files = fs.readdirSync(path.join(process.cwd(), 'src', 'fp'))
   return files
-    .filter(file => /^[^._]/.test(file) && !ignoredFiles.includes(file))
-    .map(file => ({
+    .filter((file) => /^[^._]/.test(file) && !ignoredFiles.includes(file))
+    .map((file) => ({
       name: file,
       path: `./${file}`,
-      fullPath: `./src/fp/${file}/index.js`
+      fullPath: `./src/fp/${file}/index.js`,
     }))
 }

scripts/_lib/listFns.js

@@ -13,10 +13,12 @@ const ignoredFiles = [
   'fp',
   'constants',
   'index.js',
+  'index.ts',
   'test.js',
+  'test.ts',
   'index.js.flow',
   'package.json',
-  'types.ts'
+  'types.ts',
 ]
 
 async function listFns() {
@@ -25,13 +27,13 @@ async function listFns() {
 
   return Promise.all(
     files
-      .filter(file => /^[^._]/.test(file) && !ignoredFiles.includes(file))
-      .map(async file => {
+      .filter((file) => /^[^._]/.test(file) && !ignoredFiles.includes(file))
+      .map(async (file) => {
         const isTs = await exists(path.join(srcPath, file, 'index.ts'))
         return {
           name: file,
           path: `./${file}`,
-          fullPath: `./src/${file}/index.${isTs ? 'ts' : 'js'}`
+          fullPath: `./src/${file}/index.${isTs ? 'ts' : 'js'}`,
         }
       })
   )

scripts/_lib/listLocales.js

@@ -7,7 +7,9 @@ const readDir = promisify(fs.readdir)
 
 const ignoredFiles = [
   'index.js',
+  'index.ts',
   'test.js',
+  'test.ts',
   'index.js.flow',
   'package.json',
   'types.ts',

scripts/build/fp.js

@@ -29,9 +29,7 @@ function getFPFn(resultFnName, initialFnName, arity) {
     .concat(`import fn from '../../${initialFnName}/index'`)
     .concat(`import convertToFP from '../_lib/convertToFP/index'`)
     .concat('')
-    .concat(`var ${resultFnName} = convertToFP(fn, ${arity})`)
-    .concat('')
-    .concat(`export default ${resultFnName}`)
+    .concat(`export default convertToFP(fn, ${arity})`)
     .concat('')
     .join('\n')
 }
@@ -43,7 +41,7 @@ function buildFPFn({ title, generatedFrom, args: { length } }) {
   if (!fs.existsSync(fpFnDir)) {
     fs.mkdirSync(fpFnDir)
   }
-  fs.writeFileSync(`${fpFnDir}/index.js`, prettier(fpFnLines))
+  fs.writeFileSync(`${fpFnDir}/index.ts`, prettier(fpFnLines))
 }
 
 function buildFP(fns) {

scripts/build/indices.js

@@ -10,6 +10,7 @@
 const fs = require('fs')
 const path = require('path')
 const prettier = require('./_lib/prettier')
+
 const listFns = require('../_lib/listFns')
 const listFPFns = require('../_lib/listFPFns')
 const listLocales = require('../_lib/listLocales')
@@ -25,9 +26,9 @@ Promise.all([listFns(), listLocales()]).then(([fns, allLocales]) => {
     ({ code }) => !outdatedLocales.includes(code)
   )
 
-  writeFile('src/index.js', generateIndex(fns, false, true))
-  writeFile('src/fp/index.js', generateIndex(fpFns, true, true))
-  writeFile('src/locale/index.js', generateIndex(locales, false, false))
+  writeFile('src/index.ts', generateIndex(fns, false, true))
+  writeFile('src/fp/index.ts', generateIndex(fpFns, true, true))
+  writeFile('src/locale/index.ts', generateIndex(locales, false, false))
 })
 
 function writeFile(relativePath, content) {

src/fp/_lib/convertToFP/index.ts

@@ -0,0 +1,13 @@
+export default function convertToFP(
+  fn: Function,
+  arity: number,
+  a: any[] = []
+) {
+  if (a.length >= arity) {
+    return fn.apply(null, a.slice(0, arity).reverse())
+  }
+
+  return function (...args: any[]) {
+    return convertToFP(fn, arity, a.concat(args))
+  }
+}

src/fp/_lib/convertToFP/test.js → src/fp/_lib/convertToFP/test.ts

@@ -5,64 +5,67 @@ import assert from 'power-assert'
 import convertToFP from '.'
 
 describe('convertToFP', function () {
-  function fn(a, b, c) {
-    return 'a b c'.replace('a', a).replace('b', b).replace('c', c)
+  function fn(a: unknown, b: unknown, c: unknown) {
+    return 'a b c'
+      .replace('a', String(a))
+      .replace('b', String(b))
+      .replace('c', String(c))
   }
 
   describe('arity of converted function === arity of initial function', function () {
     it('allows arguments to be curried (and reverses their order)', function () {
-      var fpFn = convertToFP(fn, 3)
+      const fpFn = convertToFP(fn, 3)
       assert(fpFn(3)(2)(1) === '1 2 3')
     })
 
     it('allows to group arguments', function () {
-      var fpFn = convertToFP(fn, 3)
+      const fpFn = convertToFP(fn, 3)
       assert(fpFn(3, 2)(1) === '1 2 3')
       assert(fpFn(3)(2, 1) === '1 2 3')
     })
 
     it('allows the function to be called with all arguments in the reversed order', function () {
-      var fpFn = convertToFP(fn, 3)
+      const fpFn = convertToFP(fn, 3)
       assert(fpFn(3, 2, 1) === '1 2 3')
     })
 
     it('ignores calls without curried arguments', function () {
-      var fpFn = convertToFP(fn, 3)
+      const fpFn = convertToFP(fn, 3)
       assert(fpFn()()(3, 2)()()(1) === '1 2 3')
     })
 
     it('ignores extra curried arguments in the last group', function () {
-      var fpFn = convertToFP(fn, 3)
+      const fpFn = convertToFP(fn, 3)
       assert(fpFn(3, 2, 1, 0, -1, -2) === '1 2 3')
       assert(fpFn(3)(2)(1, 0, -1, -2) === '1 2 3')
     })
   })
 
   describe('arity of converted function < arity of initial function', function () {
     it('calls the initial function with a short list of arguments', function () {
-      var fpFn = convertToFP(fn, 2)
+      const fpFn = convertToFP(fn, 2)
       assert(fpFn(2)(1) === '1 2 undefined')
       assert(fpFn(2, 1) === '1 2 undefined')
     })
 
     it('ignores extra curried arguments in the last group', function () {
-      var fpFn = convertToFP(fn, 2)
+      const fpFn = convertToFP(fn, 2)
       assert(fpFn(3)(2, 1) === '2 3 undefined')
       assert(fpFn(3, 2, 1) === '2 3 undefined')
     })
   })
 
   describe('arity of converted function > arity of initial function', function () {
     it('works, but ignores the extra arguments', function () {
-      var fpFn = convertToFP(fn, 4)
+      const fpFn = convertToFP(fn, 4)
       assert(fpFn(4)(3)(2)(1) === '1 2 3')
       assert(fpFn(4, 3, 2, 1) === '1 2 3')
     })
   })
 
   describe('arity of converted function === 0', function () {
     it('returns the constant instead of function', function () {
-      var result = convertToFP(fn, 0)
+      const result = convertToFP(fn, 0)
       assert(result === 'undefined undefined undefined')
     })
   })

src/fp/add/index.js → src/fp/add/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../add/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var add = convertToFP(fn, 2)
-
-export default add
+export default convertToFP(fn, 2)

src/fp/addBusinessDays/index.js → src/fp/addBusinessDays/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addBusinessDays/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addBusinessDays = convertToFP(fn, 2)
-
-export default addBusinessDays
+export default convertToFP(fn, 2)

src/fp/addDays/index.js → src/fp/addDays/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addDays/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addDays = convertToFP(fn, 2)
-
-export default addDays
+export default convertToFP(fn, 2)

src/fp/addHours/index.js → src/fp/addHours/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addHours/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addHours = convertToFP(fn, 2)
-
-export default addHours
+export default convertToFP(fn, 2)

src/fp/addISOWeekYears/index.js → src/fp/addISOWeekYears/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addISOWeekYears/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addISOWeekYears = convertToFP(fn, 2)
-
-export default addISOWeekYears
+export default convertToFP(fn, 2)

src/fp/addMilliseconds/index.js → src/fp/addMilliseconds/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addMilliseconds/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addMilliseconds = convertToFP(fn, 2)
-
-export default addMilliseconds
+export default convertToFP(fn, 2)

src/fp/addMinutes/index.js → src/fp/addMinutes/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addMinutes/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addMinutes = convertToFP(fn, 2)
-
-export default addMinutes
+export default convertToFP(fn, 2)

src/fp/addMonths/index.js → src/fp/addMonths/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addMonths/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addMonths = convertToFP(fn, 2)
-
-export default addMonths
+export default convertToFP(fn, 2)

src/fp/addQuarters/index.js → src/fp/addQuarters/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addQuarters/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addQuarters = convertToFP(fn, 2)
-
-export default addQuarters
+export default convertToFP(fn, 2)

src/fp/addSeconds/index.js → src/fp/addSeconds/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addSeconds/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addSeconds = convertToFP(fn, 2)
-
-export default addSeconds
+export default convertToFP(fn, 2)

src/fp/addWeeks/index.js → src/fp/addWeeks/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addWeeks/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addWeeks = convertToFP(fn, 2)
-
-export default addWeeks
+export default convertToFP(fn, 2)

src/fp/addYears/index.js → src/fp/addYears/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../addYears/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var addYears = convertToFP(fn, 2)
-
-export default addYears
+export default convertToFP(fn, 2)

src/fp/areIntervalsOverlapping/index.js → src/fp/areIntervalsOverlapping/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../areIntervalsOverlapping/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var areIntervalsOverlapping = convertToFP(fn, 2)
-
-export default areIntervalsOverlapping
+export default convertToFP(fn, 2)

src/fp/areIntervalsOverlappingWithOptions/index.js → src/fp/areIntervalsOverlappingWithOptions/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../areIntervalsOverlapping/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var areIntervalsOverlappingWithOptions = convertToFP(fn, 3)
-
-export default areIntervalsOverlappingWithOptions
+export default convertToFP(fn, 3)

src/fp/closestIndexTo/index.js → src/fp/closestIndexTo/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../closestIndexTo/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var closestIndexTo = convertToFP(fn, 2)
-
-export default closestIndexTo
+export default convertToFP(fn, 2)

src/fp/closestTo/index.js → src/fp/closestTo/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../closestTo/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var closestTo = convertToFP(fn, 2)
-
-export default closestTo
+export default convertToFP(fn, 2)

src/fp/compareAsc/index.js → src/fp/compareAsc/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../compareAsc/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var compareAsc = convertToFP(fn, 2)
-
-export default compareAsc
+export default convertToFP(fn, 2)

src/fp/compareDesc/index.js → src/fp/compareDesc/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../compareDesc/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var compareDesc = convertToFP(fn, 2)
-
-export default compareDesc
+export default convertToFP(fn, 2)

src/fp/daysToWeeks/index.js → src/fp/daysToWeeks/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../daysToWeeks/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var daysToWeeks = convertToFP(fn, 1)
-
-export default daysToWeeks
+export default convertToFP(fn, 1)

src/fp/differenceInBusinessDays/index.js → src/fp/differenceInBusinessDays/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../differenceInBusinessDays/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var differenceInBusinessDays = convertToFP(fn, 2)
-
-export default differenceInBusinessDays
+export default convertToFP(fn, 2)

src/fp/differenceInCalendarDays/index.js → src/fp/differenceInCalendarDays/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../differenceInCalendarDays/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var differenceInCalendarDays = convertToFP(fn, 2)
-
-export default differenceInCalendarDays
+export default convertToFP(fn, 2)

src/fp/differenceInCalendarISOWeekYears/index.js → src/fp/differenceInCalendarISOWeekYears/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../differenceInCalendarISOWeekYears/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var differenceInCalendarISOWeekYears = convertToFP(fn, 2)
-
-export default differenceInCalendarISOWeekYears
+export default convertToFP(fn, 2)

src/fp/differenceInCalendarISOWeeks/index.js → src/fp/differenceInCalendarISOWeeks/index.ts

@@ -3,6 +3,4 @@
 import fn from '../../differenceInCalendarISOWeeks/index'
 import convertToFP from '../_lib/convertToFP/index'
 
-var differenceInCalendarISOWeeks = convertToFP(fn, 2)
-
-export default differenceInCalendarISOWeeks
+export default convertToFP(fn, 2)