chore: restructure dist layout to work with existing tests and examples

jessealama · Apr 10, 2024 · 02ded6a · 02ded6a
1 parent ed05d82
commit 02ded6a
Show file tree

Hide file tree

Showing 24 changed files with 54 additions and 55 deletions.
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -22,7 +22,7 @@ jobs:
             - name: lint
               run: npm run lint
             - name: compile typescript
-              run: npx tsc
+              run: npm run build && npx tsc
             - name: test
               run: npm run test
             - name: generate coverage

diff --git a/examples/bill.ts b/examples/bill.ts
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 const zero = new Decimal128("0");
 const one = new Decimal128("1");

diff --git a/examples/floor.mts b/examples/floor.mts
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 function floor(d: Decimal128): Decimal128 {
     return d.round(0, "floor");

diff --git a/examples/mortgage.ts b/examples/mortgage.ts
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 import { pow } from "./pow.mjs";
 
 const one = new Decimal128("1");

diff --git a/examples/normalize.mts b/examples/normalize.mts
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 function normalize(d: Decimal128): string {
     // Decimal128 object

diff --git a/examples/pow.mts b/examples/pow.mts
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 function pow(a: Decimal128, b: number): Decimal128 {
     let result = a;

diff --git a/examples/round.js b/examples/round.js
@@ -2,7 +2,7 @@
 
 // Examples from the Intl.NumberFormat spec
 
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 let minusOnePointFive = new Decimal128("-1.5");
 let zeroPointFour = new Decimal128("0.4");

diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
     "name": "decimal128",
     "version": "11.2.0",
-    "main": "dist/decimal128.cjs",
-    "module": "dist/decimal128.mjs",
-    "typings": "dist/decimal128.d.ts",
+    "main": "dist/cjs/decimal128.cjs",
+    "module": "dist/esm/decimal128.mjs",
+    "typings": "dist/esm/decimal128.d.ts",
     "exports": {
         ".": {
-            "import": "./dist/decimal128.mjs",
-            "require": "./dist/decimal128.cjs",
-            "types": "./dist/decimal128.d.ts"
+            "import": "./dist/esm/decimal128.mjs",
+            "require": "./dist/cjs/decimal128.cjs",
+            "types": "./dist/esm/decimal128.d.ts"
         }
     },
     "type": "module",

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -2,37 +2,36 @@
 import typescript from "@rollup/plugin-typescript";
 
 /**
- * @type { import("rollup").OutputOptions }
+ * @param {'esm' | 'cjs'} format
+ * @returns { import("rollup").RollupOptions }
  */
-const commonOutput = {
-    sourcemap: true,
-    interop: "esModule",
+const createConfig = (format) => {
+    const extension = format === "esm" ? "mjs" : "cjs";
+    return {
+        input: "src/decimal128.mts",
+        output: [
+            {
+                sourcemap: true,
+                interop: "esModule",
+                preserveModules: true,
+                dir: `./dist/${format}`,
+                format: format,
+                entryFileNames: `[name].${extension}`,
+            },
+        ],
+        plugins: [
+            typescript({
+                tsconfig: "tsconfig.build.json",
+                outDir: `dist/${format}`,
+                sourceMap: false,
+            }),
+        ],
+    };
 };
 
 /**
- * @type { import("rollup").RollupOptions }
+ * @type { import("rollup").RollupOptions[] }
  */
-const config = {
-    input: "src/decimal128.mts",
-    output: [
-        {
-            ...commonOutput,
-            file: "./dist/decimal128.mjs",
-            format: "esm",
-        },
-        {
-            ...commonOutput,
-            file: "./dist/decimal128.cjs",
-            format: "cjs",
-        },
-    ],
-    plugins: [
-        typescript({
-            tsconfig: "tsconfig.build.json",
-            outDir: "dist",
-            sourceMap: false,
-        }),
-    ],
-};
+const config = [createConfig("esm"), createConfig("cjs")];
 
 export default config;
diff --git a/tests/abs.test.js b/tests/abs.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 const MAX_SIGNIFICANT_DIGITS = 34;
 const bigDigits = "9".repeat(MAX_SIGNIFICANT_DIGITS);

diff --git a/tests/add.test.js b/tests/add.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 const MAX_SIGNIFICANT_DIGITS = 34;
 const bigDigits = "9".repeat(MAX_SIGNIFICANT_DIGITS);

diff --git a/tests/common.test.js b/tests/common.test.js
@@ -1,4 +1,4 @@
-import { countSignificantDigits } from "../src/common.mjs";
+import { countSignificantDigits } from "../dist/esm/common.mjs";
 
 describe("significant digits", () => {
     test("basic example", () => {

diff --git a/tests/constructor.test.js b/tests/constructor.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 const MAX_SIGNIFICANT_DIGITS = 34;
 

diff --git a/tests/divide.test.js b/tests/divide.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 describe("division", () => {
     test("simple example", () => {

diff --git a/tests/equals.test.js b/tests/equals.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 const MAX_SIGNIFICANT_DIGITS = 34;
 const nan = new Decimal128("NaN");

diff --git a/tests/lessthan.test.js b/tests/lessthan.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 const MAX_SIGNIFICANT_DIGITS = 34;
 const nan = new Decimal128("NaN");

diff --git a/tests/multiply.test.js b/tests/multiply.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 const examples = [
     ["123.456", "789.789", "97504.190784"],

diff --git a/tests/rational.test.js b/tests/rational.test.js
@@ -1,4 +1,4 @@
-import { Rational } from "../src/rational.mjs";
+import { Rational } from "../dist/esm/rational.mjs";
 describe("constructor", () => {
     test("cannot divide by zero", () => {
         expect(() => new Rational(1n, 0n)).toThrow(RangeError);

diff --git a/tests/remainder.test.js b/tests/remainder.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 const a = "4.1";
 const b = "1.25";

diff --git a/tests/round.test.js b/tests/round.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 import * as string_decoder from "string_decoder";
 import { expectDecimal128 } from "./util.js";
 

diff --git a/tests/subtract.test.js b/tests/subtract.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 import { expectDecimal128 } from "./util.js";
 
 const MAX_SIGNIFICANT_DIGITS = 34;

diff --git a/tests/tostring.test.js b/tests/tostring.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 import { expectDecimal128 } from "./util.js";
 
 describe("NaN", () => {

diff --git a/tests/util.js b/tests/util.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 export function expectDecimal128(a, b) {
     let lhs = a instanceof Decimal128 ? a.toString({ normalize: false }) : a;

diff --git a/tests/valueof.test.js b/tests/valueof.test.js
@@ -1,4 +1,4 @@
-import { Decimal128 } from "../src/decimal128.mjs";
+import { Decimal128 } from "../dist/esm/decimal128.mjs";
 
 describe("valueOf", () => {
     test("throws unconditionally", () => {