refactor: update multimap package for esm support

Author: Arvid Nicolaas

packages/multimap/.denoifyrc.json

@@ -1,5 +1,6 @@
 {
-  "index": "src/main/index.ts",
+  "index": "./_deno_prepare/src/main/index.ts",
   "replacer": "../../config/denoify-rimbu-replacer.js",
-  "includes": ["README.md", "LICENSE", "CHANGELOG.md"]
+  "includes": ["README.md", "LICENSE", "CHANGELOG.md"],
+  "out": "./deno_dist"
 }

packages/multimap/.prettierrc.cjs

@@ -1 +1 @@
-module.exports = require('../../config/.prettierrc');
+module.exports = require('../../config/.prettierrc.cjs');

packages/multimap/CHANGELOG.md

@@ -3,10 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.10.7](https://github.com/rimbu-org/rimbu/compare/@rimbu/[email protected]...@rimbu/[email protected]) (2023-06-20)
-
-**Note:** Version bump only for package @rimbu/multimap
-
 ## [0.10.6](https://github.com/rimbu-org/rimbu/compare/@rimbu/[email protected]...@rimbu/[email protected]) (2023-05-21)
 
 **Note:** Version bump only for package @rimbu/multimap

packages/multimap/config/api-extractor.custom.json

@@ -1,8 +1,8 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "<projectFolder>/../../config/api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>dist/types/custom/index.d.ts",
-  "bundledPackages": [],
+  "mainEntryPointFilePath": "<projectFolder>dist/types/custom/index.d.mts",
+  "bundledPackages": ["@rimbu/multimap"],
   "docModel": {
     "enabled": true,
     "apiJsonFilePath": "<projectFolder>/../../doc-gen/input/<unscopedPackageName>!custom.api.json"

packages/multimap/config/api-extractor.main.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "<projectFolder>/../../config/api-extractor.json",
-  "mainEntryPointFilePath": "<projectFolder>dist/types/main/index.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>dist/types/main/index.d.mts",
   "bundledPackages": [],
   "docModel": {
     "enabled": true,

packages/multimap/custom/package.json

@@ -1,8 +1,7 @@
 {
   "name": "custom",
   "private": true,
-  "source": "../src/custom/index.ts",
-  "main": "../dist/main/custom/index.js",
-  "module": "../dist/module/custom/index.js",
-  "types": "../dist/types/custom/index.d.ts"
+  "main": "../dist/cjs/custom/index.js",
+  "module": "../dist/esm/custom/index.mjs",
+  "types": "../dist/types/custom/index.d.mts"
 }

packages/multimap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rimbu/multimap",
-  "version": "0.10.7",
+  "version": "0.10.6",
   "description": "An immutable Map where each key can have multiple values",
   "keywords": [
     "multimap",
@@ -32,24 +32,42 @@
     "url": "https://github.com/rimbu-org/rimbu.git",
     "directory": "packages/multimap"
   },
-  "source": "./src/main/index.ts",
-  "main": "./dist/main/main/index.js",
-  "module": "./dist/module/main/index.js",
-  "types": "./dist/types/main/index.d.ts",
+  "type": "module",
+  "main": "./dist/cjs/main/index.js",
+  "module": "./dist/esm/main/index.mjs",
+  "types": "./dist/types/main/index.d.mts",
   "exports": {
     ".": {
-      "types": "./dist/types/main/index.d.ts",
-      "bun": "./src/main/index.ts",
-      "import": "./dist/module/main/index.js",
-      "require": "./dist/main/main/index.js",
-      "default": "./dist/module/main/index.js"
+      "types": "./dist/types/main/index.d.mts",
+      "bun": "./dist/bun/main/index.mts",
+      "import": "./dist/esm/main/index.mjs",
+      "require": "./dist/cjs/main/index.js",
+      "default": "./dist/esm/main/index.mjs"
     },
     "./custom": {
-      "types": "./dist/types/custom/index.d.ts",
-      "bun": "./src/custom/index.ts",
-      "import": "./dist/module/custom/index.js",
-      "require": "./dist/main/custom/index.js",
-      "default": "./dist/module/custom/index.js"
+      "types": "./dist/types/custom/index.d.mts",
+      "bun": "./dist/bun/custom/index.mts",
+      "import": "./dist/esm/custom/index.mjs",
+      "require": "./dist/cjs/custom/index.js",
+      "default": "./dist/esm/custom/index.mjs"
+    }
+  },
+  "imports": {
+    "#multimap/*.mts": {
+      "bun": "./dist/bun/*.mts"
+    },
+    "#multimap/*.mjs": {
+      "types": "./dist/types/*.d.mts",
+      "import": "./dist/esm/*.mjs",
+      "require": "./dist/cjs/*.js",
+      "default": "./dist/esm/*.mjs"
+    },
+    "#multimap/*": {
+      "types": "./dist/types/*/index.d.mts",
+      "bun": "./dist/bun/*/index.mts",
+      "import": "./dist/esm/*/index.mjs",
+      "require": "./dist/cjs/*/index.js",
+      "default": "./dist/esm/*/index.mjs"
     }
   },
   "files": [
@@ -59,30 +77,36 @@
   ],
   "scripts": {
     "build": "yarn clean && yarn bundle",
-    "build:deno": "rimraf deno_dist ../../deno_dist/multimap && denoify && mv deno_dist ../../deno_dist/multimap",
-    "bundle": "yarn bundle:main && yarn bundle:module && yarn bundle:types",
-    "bundle:main": "tsc --p tsconfig.main.json",
-    "bundle:module": "tsc --p tsconfig.module.json",
+    "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' --legacy-output",
+    "bundle:deno-prepare": "node ../../config/prepare-denoify.mjs",
+    "bundle:deno-convert": "denoify --src _deno_prepare/src",
+    "bundle:deno-move": "rimraf ../../deno_dist/multimap && mv deno_dist ../../deno_dist/multimap",
+    "bundle:deno-clean": "rimraf _deno_prepare",
+    "bundle:esm": "tsc --p tsconfig.esm.json",
     "bundle:types": "tsc --p tsconfig.types.json",
     "clean": "rimraf dist",
     "extract-api": "yarn extract-api:main && yarn extract-api:custom",
-    "extract-api:custom": "api-extractor run --local --verbose --config config/api-extractor.custom.json",
-    "extract-api:main": "api-extractor run --local --verbose --config config/api-extractor.main.json",
+    "extract-api:custom": "ts-node ../../config/api-extractor.ts config/api-extractor.custom.json",
+    "extract-api:main": "ts-node ../../config/api-extractor.ts config/api-extractor.main.json",
     "format": "yarn format:base --write",
-    "format:base": "prettier \"{!CHANGELOG.md}|**/**/*.{ts,tsx,js,json,md}\"",
+    "format:base": "prettier \"{!CHANGELOG.md}|**/**/*.{ts,tsx,js,mts,mjs,json,md}\"",
     "format:check": "yarn format:base --check",
     "lint": "eslint src",
-    "test": "jest",
-    "test:random": "jest --config jest-random.config.json --runInBand",
-    "test:types": "tsd",
+    "test": "vitest run",
+    "test:cov": "vitest run --coverage",
+    "test:watch": "vitest",
+    "test:random": "vitest run --config vitest.random.config.ts",
+    "test:types": "tsd --files test-d",
     "typecheck": "tsc"
   },
-  "sideEffects": false,
   "dependencies": {
     "@rimbu/base": "^0.11.4",
     "@rimbu/collection-types": "^0.10.6",
     "@rimbu/common": "*",
-    "@rimbu/hashed": "^0.9.7",
+    "@rimbu/hashed": "^0.9.6",
     "@rimbu/sorted": "^0.10.6",
     "@rimbu/stream": "^0.13.6",
     "tslib": "^2.5.0"

packages/multimap/src/custom/implementation/base.mts

@@ -2,23 +2,24 @@ import { RimbuError } from '@rimbu/base';
 import type { RMap, RSet } from '@rimbu/collection-types';
 import {
   EmptyBase,
-  KeyValue,
+  type KeyValue,
   NonEmptyBase,
-  WithKeyValue,
+  type WithKeyValue,
 } from '@rimbu/collection-types/map-custom';
 import {
-  ArrayNonEmpty,
+  type ArrayNonEmpty,
   OptLazy,
   Reducer,
-  RelatedTo,
-  ToJSON,
+  type RelatedTo,
+  type ToJSON,
   TraverseState,
 } from '@rimbu/common';
-import type { MultiMap } from '@rimbu/multimap';
-import type { MultiMapBase } from '@rimbu/multimap/custom';
-import { Stream, StreamSource } from '@rimbu/stream';
+import { Stream, type StreamSource } from '@rimbu/stream';
 import { isEmptyStreamSourceInstance } from '@rimbu/stream/custom';
 
+import type { MultiMap } from '#multimap/main';
+import type { MultiMapBase } from '#multimap/custom';
+
 export interface ContextImplTypes extends MultiMapBase.Types {
   readonly context: MultiMapContext<this['_K'], this['_V'], string>;
 }
@@ -442,19 +443,22 @@ export class MultiMapBuilder<
     return this.size === 0;
   }
 
-  getValues = <UK>(key: RelatedTo<K, UK>): any => {
+  // prettier-ignore
+  getValues = <UK,>(key: RelatedTo<K, UK>): any => {
     return (
       this.source?.getValues(key) ??
       this.keyMap.get(key)?.build() ??
       this.context.keyMapValuesContext.empty()
     );
   };
 
-  hasKey = <UK>(key: RelatedTo<K, UK>): boolean => {
+  // prettier-ignore
+  hasKey = <UK,>(key: RelatedTo<K, UK>): boolean => {
     return this.source?.hasKey(key) ?? this.keyMap.hasKey(key);
   };
 
-  hasEntry = <UK>(key: RelatedTo<K, UK>, value: V): boolean => {
+  // prettier-ignore
+  hasEntry = <UK,>(key: RelatedTo<K, UK>, value: V): boolean => {
     return (
       this.source?.hasEntry(key, value) ??
       this.keyMap.get(key)?.has(value) ??
@@ -557,7 +561,8 @@ export class MultiMapBuilder<
     return Stream.applyFilter(entries, this.removeEntry).count() > 0;
   };
 
-  removeKey = <UK>(key: RelatedTo<K, UK>): boolean => {
+  // prettier-ignore
+  removeKey = <UK,>(key: RelatedTo<K, UK>): boolean => {
     this.checkLock();
 
     if (!this.context.keyMapContext.isValidKey(key)) return false;
@@ -574,7 +579,8 @@ export class MultiMapBuilder<
     return changed;
   };
 
-  removeKeys = <UK>(keys: StreamSource<RelatedTo<K, UK>>): boolean => {
+  // prettier-ignore
+  removeKeys = <UK,>(keys: StreamSource<RelatedTo<K, UK>>): boolean => {
     this.checkLock();
 
     return Stream.from(keys).filterPure(this.removeKey).count() > 0;

packages/multimap/src/custom/index.mts

@@ -1,3 +1,3 @@
-export * from './interface/base';
-export * from './interface/creators';
-export * from './implementation/base';
+export * from './interface/base.mjs';
+export * from './interface/creators.mjs';
+export * from './implementation/base.mjs';

packages/multimap/src/custom/interface/creators.mts

@@ -1,14 +1,15 @@
 import type { RMap, RSet } from '@rimbu/collection-types';
 import type { HashMap, HashSet } from '@rimbu/hashed';
+import type { SortedMap, SortedSet } from '@rimbu/sorted';
+
 import type {
   HashMultiMapHashValue,
   HashMultiMapSortedValue,
   MultiMap,
   SortedMultiMapHashValue,
   SortedMultiMapSortedValue,
-} from '@rimbu/multimap';
-import type { MultiMapBase } from '@rimbu/multimap/custom';
-import type { SortedMap, SortedSet } from '@rimbu/sorted';
+} from '#multimap/main';
+import type { MultiMapBase } from '#multimap/custom';
 
 export interface MultiMapCreators {
   /**

packages/multimap/src/main/index.mts

@@ -6,10 +6,10 @@
  * See the [Rimbu docs MultiMap page](/docs/collections/multimap) for more information.
  */
 
-export * from './interface/generic/variant';
-export * from './interface/generic/generic';
+export * from './interface/generic/variant.mjs';
+export * from './interface/generic/generic.mjs';
 
-export * from './interface/hash-key/hash-value/interface';
-export * from './interface/hash-key/sorted-value/interface';
-export * from './interface/sorted-key/hash-value/interface';
-export * from './interface/sorted-key/sorted-value/interface';
+export * from './interface/hash-key/hash-value/interface.mjs';
+export * from './interface/hash-key/sorted-value/interface.mjs';
+export * from './interface/sorted-key/hash-value/interface.mjs';
+export * from './interface/sorted-key/sorted-value/interface.mjs';

packages/multimap/src/main/interface/generic/generic.mts

@@ -1,10 +1,11 @@
 import type { RMap, RSet } from '@rimbu/collection-types';
+import type { Streamable } from '@rimbu/stream';
+
 import {
   type MultiMapBase,
   MultiMapContext,
   type MultiMapCreators,
-} from '@rimbu/multimap/custom';
-import type { Streamable } from '@rimbu/stream';
+} from '#multimap/custom';
 
 /**
  * A type-invariant immutable MultiMap of key type K, and value type V.

packages/multimap/src/main/interface/generic/variant.mts

@@ -1,6 +1,7 @@
-import type { VariantMultiMapBase } from '@rimbu/multimap/custom';
 import type { Streamable } from '@rimbu/stream';
 
+import type { VariantMultiMapBase } from '#multimap/custom';
+
 /**
  * A type-variant immutable MultiMap of key type K, and value type V.
  * In the Map, each key has at least one value.

packages/multimap/src/main/interface/hash-key/hash-value/interface.mts

@@ -1,10 +1,11 @@
 import { HashMap, HashSet } from '@rimbu/hashed';
+import type { Stream, Streamable } from '@rimbu/stream';
+
 import {
-  HashMultiMapHashValueCreators,
-  MultiMapBase,
+  type HashMultiMapHashValueCreators,
+  type MultiMapBase,
   MultiMapContext,
-} from '@rimbu/multimap/custom';
-import type { Stream, Streamable } from '@rimbu/stream';
+} from '#multimap/custom';
 
 /**
  * A type-invariant immutable MultiMap of key type K, and value type V.

packages/multimap/src/main/interface/hash-key/sorted-value/interface.mts

@@ -1,12 +1,13 @@
 import { HashMap } from '@rimbu/hashed/map';
-import {
-  HashMultiMapSortedValueCreators,
-  MultiMapBase,
-  MultiMapContext,
-} from '@rimbu/multimap/custom';
 import { SortedSet } from '@rimbu/sorted/set';
 import type { Stream, Streamable } from '@rimbu/stream';
 
+import {
+  type HashMultiMapSortedValueCreators,
+  type MultiMapBase,
+  MultiMapContext,
+} from '#multimap/custom';
+
 /**
  * A type-invariant immutable MultiMap of key type K, and value type V.
  * In the MultiMap, each key has at least one value.

packages/multimap/src/main/interface/sorted-key/hash-value/interface.mts

@@ -1,12 +1,13 @@
 import { HashSet } from '@rimbu/hashed/set';
-import {
-  MultiMapBase,
-  MultiMapContext,
-  SortedMultiMapHashValueCreators,
-} from '@rimbu/multimap/custom';
 import { SortedMap } from '@rimbu/sorted/map';
 import type { Stream, Streamable } from '@rimbu/stream';
 
+import {
+  type MultiMapBase,
+  MultiMapContext,
+  type SortedMultiMapHashValueCreators,
+} from '#multimap/custom';
+
 /**
  * A type-invariant immutable MultiMap of key type K, and value type V.
  * In the MultiMap, each key has at least one value.

packages/multimap/src/main/interface/sorted-key/sorted-value/interface.mts

@@ -1,11 +1,12 @@
-import {
-  MultiMapBase,
-  MultiMapContext,
-  SortedMultiMapSortedValueCreators,
-} from '@rimbu/multimap/custom';
 import { SortedMap, SortedSet } from '@rimbu/sorted';
 import type { Stream, Streamable } from '@rimbu/stream';
 
+import {
+  type MultiMapBase,
+  MultiMapContext,
+  type SortedMultiMapSortedValueCreators,
+} from '#multimap/custom';
+
 /**
  * A type-invariant immutable MultiMap of key type K, and value type V.
  * In the MultiMap, each key has at least one value.

packages/multimap/test-d/hash-multimap-hash-value.test-d.mts

@@ -2,7 +2,8 @@ import type { ArrayNonEmpty } from '@rimbu/common';
 import type { HashMap, HashSet } from '@rimbu/hashed';
 import type { FastIterator, Stream } from '@rimbu/stream';
 import { expectAssignable, expectNotAssignable, expectType } from 'tsd';
-import type { HashMultiMapHashValue } from '@rimbu/multimap';
+
+import type { HashMultiMapHashValue } from '../src/main/index.mjs';
 
 type GE<K, V> = HashMultiMapHashValue<K, V>;
 type GNE<K, V> = HashMultiMapHashValue.NonEmpty<K, V>;