feat: merge high-order functions into regular functions

.eslintrc.json

@@ -46,7 +46,7 @@
       }
     },
     {
-      "files": ["src/functions"],
+      "files": ["src/math.ts"],
       "rules": {
         "functional/functional-parameters": [
           "error",
@@ -59,20 +59,6 @@
         ]
       }
     },
-    {
-      "files": ["src/functions-ho"],
-      "rules": {
-        "functional/functional-parameters": [
-          "error",
-          {
-            "allowRestParameter": false,
-            "enforceParameterCount": {
-              "count": "exactlyOne"
-            }
-          }
-        ]
-      }
-    },
     {
       "files": ["**/*.test.ts"],
       "plugins": ["vitest"],

README.md

@@ -47,12 +47,9 @@ This library is split into several submodules.
 - `uom-types`\
   Defines the core types of this library. You'll only need to use if if you are defining your own custom types.
 
-- `uom-types/functions`\
+- `uom-types/math`\
   Defines runtime mathematical functions that are type-aware of this library's types.
 
-- `uom-types/functions/higher-order`\
-  Defines runtime higher order mathematical functions that are type-aware of this library's types.
-
 - `uom-types/units`\
   Defines common units.\
   Note: does not currently define any imperial types.

docs/index.md

@@ -7,7 +7,7 @@ Typesafe units with no runtime overhead.
 Example:
 
 ```ts
-import { mul } from "uom-types/functions";
+import { mul } from "uom-types/math";
 import {
   type Metre,
   type Length,
@@ -55,7 +55,7 @@ Example of defining and using a custom `Health` unit:
 
 ```ts
 import { type Unit } from "uom-types";
-import { mul, sub } from "uom-types/functions";
+import { mul, sub } from "uom-types/math";
 import { type Second } from "uom-types/units";
 
 type Health = Unit<{ HP: 1 }>;

knip.jsonc

@@ -2,8 +2,7 @@
   "$schema": "https://unpkg.com/knip@next/schema.json",
   "entry": [
     "src/index.ts!",
-    "src/functions/index.ts!",
-    "src/functions-ho/index.ts!",
+    "src/math.ts!",
     "src/units/index.ts!",
     "src/units/converters/index.ts!",
     "tests/**/*.test.ts",

package.json

@@ -29,21 +29,13 @@
         "require": "./dist/index.d.cts"
       }
     },
-    "./functions": {
+    "./math": {
       "types": {
-        "import": "./dist/functions.d.mts",
-        "require": "./dist/functions.d.cts"
+        "import": "./dist/math.d.mts",
+        "require": "./dist/math.d.cts"
       },
-      "import": "./dist/functions.mjs",
-      "require": "./dist/functions.cjs"
-    },
-    "./functions/higher-order": {
-      "types": {
-        "import": "./dist/functions-higher-order.d.mts",
-        "require": "./dist/functions-higher-order.d.cts"
-      },
-      "import": "./dist/functions-higher-order.mjs",
-      "require": "./dist/functions-higher-order.cjs"
+      "import": "./dist/math.mjs",
+      "require": "./dist/math.cjs"
     },
     "./units": {
       "types": {

rollup.config.ts

@@ -43,8 +43,7 @@ const common = {
 const runtimes = {
   ...common,
   input: {
-    functions: "./src/functions/index.ts",
-    "functions-higher-order": "./src/functions-ho/index.ts",
+    math: "./src/math.ts",
     "units-converters": "./src/units/converters/index.ts",
   },
   output: formats.map((format) => {
@@ -76,8 +75,7 @@ const types = {
   ...common,
   input: {
     index: "./src/index.ts",
-    functions: "./src/functions/index.ts",
-    "functions-higher-order": "./src/functions-ho/index.ts",
+    math: "./src/math.ts",
     units: "./src/units/index.ts",
     "units-converters": "./src/units/converters/index.ts",
   },

scripts/generate-files.ts

@@ -82,7 +82,7 @@ function generateSiUnitPrefixesFile() {
 }
 
 function generateSiUnitPrefixesConvertionFile() {
-  const imports = `import { type UnknownUnit, type UnitConversionRate } from "#uom-types";\nimport { mul, div } from "#uom-types/functions";\n\n`;
+  const imports = `import { type UnknownUnit, type UnitConversionRate } from "#uom-types";\nimport { mul, div } from "#uom-types/math";\n\n`;
   const main = [...exponents.values()]
     .map((exponent) => {
       const name = scalar10ToName.get(exponent);