chore: move from tsup back to tsc to fix the types and dual package hazard

Author: Arvid Nicolaas

config/bunnify.mjs

@@ -1,8 +1,67 @@
 import fs from 'fs';
 import path from 'path';
 
-const srcDir = `./src`;
-const destDir = `./dist/bun`;
+if (process.argv.length <= 2) {
+  console.log(`\
+bunnify: utility to generate source code from a "verbatimModuleSyntax" project that
+is compatible with other frameworks or suitable for compilation to other frameworks
+
+usage: bunnify <options>
+
+available options:
+-mode bun                 sets default values to create bun-compatible code
+-mode cjs                 sets default values to create cjs-compilation compatible code
+-src <folder>             (default: './src') the source path of the code
+-dest <folder>            (default: './dist') the target path of the code
+-fileSourceExt <ext>      (default: '.mts' )the file extension for the source files
+-fileTargetExt            (default: '.mts') the file extension for the target files
+-sourceImportExt          (default: '.mjs') the extension of the imports in the code
+-sourceTargetExt          (default: '.mjs') the target extension of the imports in the code
+-removePrivate            (default: 'false') replace private identifiers by non-private ones
+`);
+  process.exit(1);
+}
+
+let args = process.argv.slice(2);
+
+let options = {};
+
+while (args.length > 0) {
+  const [option, value] = args;
+  options[option.slice(1)] = value;
+  args = args.slice(2);
+}
+
+if (options.mode) {
+  if (options.mode === 'bun') {
+    options = {
+      src: './src',
+      dest: './dist/bun',
+      fileSourceExt: '.mts',
+      fileTargetExt: '.mts',
+      sourceImportExt: '.mjs',
+      sourceTargetExt: '.mts',
+      removePrivate: 'false',
+      ...options,
+    };
+  } else if (options.mode === 'cjs') {
+    options = {
+      src: './src',
+      dest: './_cjs_prepare',
+      fileSourceExt: '.mts',
+      fileTargetExt: '.cts',
+      sourceImportExt: '.mjs',
+      sourceTargetExt: '.cjs',
+      removePrivate: 'true',
+      ...options,
+    };
+  } else {
+    console.log(
+      'bunnify: unknown options supplied to -mode. options are `bun` or `cjs`'
+    );
+    process.exit(1);
+  }
+}
 
 function* traverse(src) {
   const files = fs.readdirSync(src);
@@ -19,17 +78,20 @@ function* traverse(src) {
 }
 
 try {
-  fs.rmSync(destDir, { recursive: true, force: true });
+  fs.rmSync(options.dest, { recursive: true, force: true });
 
-  fs.mkdirSync(destDir, { force: true, recursive: true });
+  fs.mkdirSync(options.dest, { force: true, recursive: true });
 
-  const srcLen = srcDir.length;
+  const srcLen = options.src.length;
 
-  for (const file of traverse(srcDir)) {
-    if (file.endsWith('.mts')) {
+  for (const file of traverse(options.src)) {
+    if (file.endsWith(options.fileSourceExt)) {
       const relativePath = file.slice(srcLen - 1);
 
-      const fullDestPath = path.join(destDir, relativePath);
+      const fullDestPath = path.join(
+        options.dest,
+        relativePath.replace(options.fileSourceExt, options.fileTargetExt)
+      );
 
       try {
         fs.mkdirSync(path.dirname(fullDestPath), {
@@ -41,7 +103,14 @@ try {
       }
 
       const contents = fs.readFileSync(file, { encoding: 'utf-8' });
-      const result = contents.replaceAll('.mjs', '.mts');
+      let result = contents.replaceAll(
+        options.sourceImportExt,
+        options.sourceTargetExt
+      );
+
+      if (options.removePrivate === 'true') {
+        result = result.replaceAll(/#(\w+)/g, '___$1');
+      }
 
       fs.writeFileSync(fullDestPath, result, { encoding: 'utf-8' });
     }

config/tsconfig.cjs.base.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.common.json",
+  "compilerOptions": {
+    "declaration": true,
+    "verbatimModuleSyntax": false,
+    "target": "ES5",
+    "module": "CommonJS",
+    "moduleResolution": "Node10"
+  }
+}

config/tsconfig.esm.base.json

@@ -1,6 +1,6 @@
 {
   "extends": "./tsconfig.common.json",
   "compilerOptions": {
-    "declaration": false
+    "declaration": true
   }
 }

config/tsconfig.extractor.base.json

@@ -1,6 +1,26 @@
 {
   "extends": "./tsconfig.common.json",
   "compilerOptions": {
-    "declaration": false
+    "declaration": false,
+    "rootDir": "..",
+    "baseUrl": "./packages",
+    "paths": {
+      "@rimbu/bimap": ["bimap/dist/esm/main/index.d.mts"],
+      "@rimbu/bimultimap": ["bimultimap/dist/esm/main/index.d.mts"],
+      "@rimbu/collection-types": ["collection-types/dist/esm/main/index.d.mts"],
+      "@rimbu/common": ["common/dist/esm/index.d.mts"],
+      "@rimbu/core": ["core/dist/esm/main/index.d.mts"],
+      "@rimbu/deep": ["deep/dist/esm/index.d.mts"],
+      "@rimbu/graph": ["graph/dist/esm/main/index.d.mts"],
+      "@rimbu/hashed": ["hashed/dist/esm/main/index.d.mts"],
+      "@rimbu/list": ["list/dist/esm/main/index.d.mts"],
+      "@rimbu/multimap": ["multimap/dist/esm/main/index.d.mts"],
+      "@rimbu/multiset": ["multiset/dist/esm/main/index.d.mts"],
+      "@rimbu/ordered": ["ordered/dist/esm/main/index.d.mts"],
+      "@rimbu/proximity": ["proximity/dist/esm/main/index.d.mts"],
+      "@rimbu/sorted": ["sorted/dist/esm/main/index.d.mts"],
+      "@rimbu/stream": ["stream/dist/esm/main/index.d.mts"],
+      "@rimbu/table": ["table/dist/esm/main/index.d.mts"]
+    }
   }
 }

config/tsconfig.types.base.json

@@ -1,4 +1,4 @@
-import { createDraft, finishDraft } from 'npm:immer@9.0.21';
+import { createDraft, finishDraft } from 'npm:immer@10.0.3';
 
 import { Action, SliceConfig } from '../../actor/mod.ts';
 

deno_dist/actor/immer/slice-immer.ts

@@ -66,7 +66,6 @@
     "rimraf": "^5.0.1",
     "ts-node": "^10.9.1",
     "tsd": "^0.30.4",
-    "tsup": "^8.0.1",
     "typescript": "^5.3.3",
     "vite-tsconfig-paths": "^4.3.1",
     "vitest": "^1.2.1"

package.json

@@ -3,5 +3,5 @@
   "private": true,
   "main": "../dist/cjs/immer/index.cjs",
   "module": "../dist/esm/immer/index.mjs",
-  "types": "../dist/types/immer/index.d.mts"
+  "types": "../dist/cjs/immer/index.d.cts"
 }

packages/actor/immer/package.json

@@ -30,56 +30,62 @@
   "type": "module",
   "main": "./dist/cjs/main/index.cjs",
   "module": "./dist/esm/main/index.mjs",
-  "types": "./dist/types/main/index.d.mts",
+  "types": "./dist/cjs/main/index.d.cts",
   "exports": {
     ".": {
-      "types": "./dist/types/main/index.d.mts",
-      "bun": "./dist/bun/main/index.mts",
-      "import": "./dist/esm/main/index.mjs",
-      "require": "./dist/cjs/main/index.cjs",
-      "default": "./dist/esm/main/index.mjs"
+      "import": {
+        "types": "./dist/esm/main/index.d.mts",
+        "default": "./dist/esm/main/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/main/index.d.cts",
+        "default": "./dist/cjs/main/index.cjs"
+      },
+      "bun": "./dist/bun/main/index.mts"
     },
     "./immer": {
-      "types": "./dist/types/immer/index.d.mts",
-      "bun": "./dist/bun/immer/index.mts",
-      "import": "./dist/esm/immer/index.mjs",
-      "require": "./dist/cjs/immer/index.cjs",
-      "default": "./dist/esm/immer/index.mjs"
+      "import": {
+        "types": "./dist/esm/immer/index.d.mts",
+        "default": "./dist/esm/immer/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/immer/index.d.cts",
+        "default": "./dist/cjs/immer/index.cjs"
+      },
+      "bun": "./dist/bun/immer/index.mts"
     },
     "./patch": {
-      "types": "./dist/types/patch/index.d.mts",
-      "bun": "./dist/bun/patch/index.mts",
-      "import": "./dist/esm/patch/index.mjs",
-      "require": "./dist/cjs/patch/index.cjs",
-      "default": "./dist/esm/patch/index.mjs"
-    },
-    "./stream": {
-      "types": "./dist/types/stream/index.d.mts",
-      "bun": "./dist/bun/stream/index.mts",
-      "import": "./dist/esm/stream/index.mjs",
-      "require": "./dist/cjs/stream/index.cjs",
-      "default": "./dist/esm/stream/index.mjs"
+      "import": {
+        "types": "./dist/esm/patch/index.d.mts",
+        "default": "./dist/esm/patch/index.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/patch/index.d.cts",
+        "default": "./dist/cjs/patch/index.cjs"
+      },
+      "bun": "./dist/bun/patch/index.mts"
     }
   },
   "files": [
     "dist",
     "src",
     "immer",
-    "patch",
-    "stream"
+    "patch"
   ],
   "scripts": {
     "build": "yarn clean && yarn bundle",
     "build:deno": "yarn bundle:deno-prepare && yarn bundle:deno-convert && yarn bundle:deno-move && yarn bundle:deno-clean",
-    "bundle": "yarn bundle:cjs && yarn bundle:esm && yarn bundle:types && yarn bundle:bun",
-    "bundle:bun": "node ../../config/bunnify.mjs",
-    "bundle:cjs": "tsup src --format cjs --clean -d dist/cjs --loader '.mts=ts' --external @rimbu/base --external @rimbu/stream",
+    "bundle": "yarn bundle:cjs && yarn bundle:esm && yarn bundle:bun",
+    "bundle:bun": "node ../../config/bunnify.mjs -mode bun",
+    "bundle:cjs": "yarn bundle:cjs-prepare && yarn bundle:cjs-build && yarn bundle:cjs-clean",
+    "bundle:cjs-prepare": "node ../../config/bunnify.mjs -mode cjs",
+    "bundle:cjs-build": "tsc -p tsconfig.cjs.json",
+    "bundle:cjs-clean": "rimraf _cjs_prepare",
     "bundle:deno-prepare": "node ../../config/prepare-denoify.mjs",
     "bundle:deno-convert": "denoify --src _deno_prepare/src",
     "bundle:deno-move": "rimraf ../../deno_dist/actor && mv deno_dist ../../deno_dist/actor",
     "bundle:deno-clean": "rimraf _deno_prepare",
     "bundle:esm": "tsc --p tsconfig.esm.json",
-    "bundle:types": "tsc --p tsconfig.types.json",
     "clean": "rimraf dist",
     "format": "yarn format:base --write",
     "format:base": "prettier \"{!CHANGELOG.md}|**/**/*.{ts,tsx,js,mts,mjs,json,md}\"",
@@ -100,6 +106,9 @@
   "devDependencies": {
     "@rimbu/stream": "^2.1.0",
     "happy-dom": "^9.20.3",
-    "immer": "^9.0.16"
+    "immer": "^10.0.3"
+  },
+  "optionalDependencies": {
+    "immer": "^10.0.3"
   }
 }

packages/actor/package.json

@@ -3,5 +3,5 @@
   "private": true,
   "main": "../dist/cjs/patch/index.cjs",
   "module": "../dist/esm/patch/index.mjs",
-  "types": "../dist/types/patch/index.d.mts"
+  "types": "../dist/cjs/patch/index.d.cts"
 }