mild-map 1.1.0 → 1.1.2

package/dist/index.js

@@ -1,21 +1,15 @@
 /* IMPORT */
-import { isWeakReferrable } from './utils.js';
+import { isWeakReferable } from './utils.js';
 /* MAIN */
 class MildMap {
     /* VARIABLES */
-    #strong;
-    #weak;
-    #size;
-    #finalizationRegistry;
-    #finalizationTokens;
+    #strong = new Map();
+    #weak = new WeakMap();
+    #size = 0;
+    #finalizationRegistry = new FinalizationRegistry(() => this.#size -= 1);
+    #finalizationTokens = new WeakMap();
     /* CONSTRUCTOR */
     constructor(entries) {
-        /* VARIABLES */
-        this.#strong = new Map();
-        this.#weak = new WeakMap();
-        this.#size = 0;
-        this.#finalizationRegistry = new FinalizationRegistry(() => this.#size -= 1);
-        this.#finalizationTokens = new WeakMap();
         if (entries) {
             for (const [key, value] of entries) {
                 this.set(key, value);
@@ -32,7 +26,7 @@ class MildMap {
         if (!hasKey)
             return false;
         this.#size -= 1;
-        if (isWeakReferrable(key)) {
+        if (isWeakReferable(key)) {
             const token = this.#finalizationTokens.get(key);
             if (token) {
                 this.#finalizationRegistry.unregister(token);
@@ -45,7 +39,7 @@ class MildMap {
         }
     }
     get(key) {
-        if (isWeakReferrable(key)) {
+        if (isWeakReferable(key)) {
             return this.#weak.get(key);
         }
         else {
@@ -53,7 +47,7 @@ class MildMap {
         }
     }
     has(key) {
-        if (isWeakReferrable(key)) {
+        if (isWeakReferable(key)) {
             return this.#weak.has(key);
         }
         else {
@@ -65,7 +59,7 @@ class MildMap {
         if (!hasKey) {
             this.#size += 1;
         }
-        if (isWeakReferrable(key)) {
+        if (isWeakReferable(key)) {
             this.#weak.set(key, value);
             if (!hasKey) {
                 const token = {};

package/dist/utils.d.ts

@@ -1,2 +1,2 @@
-declare const isWeakReferrable: (value: unknown) => value is object;
-export { isWeakReferrable };
+declare const isWeakReferable: (value: unknown) => value is WeakKey;
+export { isWeakReferable };

package/dist/utils.js

@@ -1,11 +1,19 @@
-/* IMPORT */
-import { SUPPORTS_SYMBOLS_AS_WEAKMAP_KEYS } from './constants.js';
-/* IMPORT */
-const isWeakReferrable = (value) => {
-    if (value === null)
-        return false;
-    const type = typeof value;
-    return type === 'object' || type === 'function' || (SUPPORTS_SYMBOLS_AS_WEAKMAP_KEYS && type === 'symbol');
-};
+/* MAIN */
+const isWeakReferable = (() => {
+    const SYMBOLS_ARE_WEAK_REFERABLE = (() => {
+        try {
+            new WeakSet().add(Symbol());
+            return true;
+        }
+        catch {
+            return false;
+        }
+    })();
+    return (value) => {
+        if (value === null)
+            return false;
+        return typeof value === 'object' || typeof value === 'function' || (SYMBOLS_ARE_WEAK_REFERABLE && typeof value === 'symbol' && !Symbol.keyFor(value));
+    };
+})();
 /* EXPORT */
-export { isWeakReferrable };
+export { isWeakReferable };

package/package.json

@@ -2,7 +2,8 @@
   "name": "mild-map",
   "repository": "github:fabiospampinato/mild-map",
   "description": "A WeakMap that supports any value, it holds strong references to primitives, and weak references to objects.",
-  "version": "1.1.0",
+  "license": "MIT",
+  "version": "1.1.2",
   "type": "module",
   "main": "dist/index.js",
   "exports": "./dist/index.js",
@@ -20,8 +21,8 @@
     "map"
   ],
   "devDependencies": {
-    "fava": "^0.1.2",
-    "tsex": "^2.1.0",
-    "typescript": "^4.9.5"
+    "fava": "^0.3.4",
+    "tsex": "^4.0.2",
+    "typescript": "^5.7.3"
   }
 }

package/readme.md

@@ -5,7 +5,7 @@ A WeakMap that supports any value, it holds strong references to primitives, and
 ## Install
 
 ```sh
-npm install --save mild-map
+npm install mild-map
 ```
 
 ## Usage

package/.editorconfig

@@ -1,10 +0,0 @@
-
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true

package/dist/constants.d.ts

@@ -1,2 +0,0 @@
-declare const SUPPORTS_SYMBOLS_AS_WEAKMAP_KEYS: boolean;
-export { SUPPORTS_SYMBOLS_AS_WEAKMAP_KEYS };

package/dist/constants.js

@@ -1,12 +0,0 @@
-/* MAIN */
-const SUPPORTS_SYMBOLS_AS_WEAKMAP_KEYS = (() => {
-    try {
-        new WeakMap().set(Symbol(), 0);
-        return true;
-    }
-    catch {
-        return false;
-    }
-})();
-/* EXPORT */
-export { SUPPORTS_SYMBOLS_AS_WEAKMAP_KEYS };

package/src/constants.ts

@@ -1,22 +0,0 @@
-
-/* MAIN */
-
-const SUPPORTS_SYMBOLS_AS_WEAKMAP_KEYS = ((): boolean => {
-
-  try {
-
-    new WeakMap ().set ( Symbol (), 0 );
-
-    return true;
-
-  } catch {
-
-    return false;
-
-  }
-
-})();
-
-/* EXPORT */
-
-export {SUPPORTS_SYMBOLS_AS_WEAKMAP_KEYS};

package/src/index.ts

@@ -1,139 +0,0 @@
-
-/* IMPORT */
-
-import {isWeakReferrable} from './utils';
-
-/* MAIN */
-
-class MildMap<K, V> {
-
-  /* VARIABLES */
-
-  #strong = new Map<K, V> ();
-  #weak = new WeakMap<any, V> ();
-  #size = 0;
-
-  #finalizationRegistry = new FinalizationRegistry ( () => this.#size -= 1 );
-  #finalizationTokens = new WeakMap<object, object> ();
-
-  /* CONSTRUCTOR */
-
-  constructor ( entries?: readonly (readonly [K, V])[] | null ) {
-
-    if ( entries ) {
-
-      for ( const [key, value] of entries ) {
-
-        this.set ( key, value );
-
-      }
-
-    }
-
-  }
-
-  /* GETTER API */
-
-  get size () {
-
-    return this.#size;
-
-  }
-
-  /* API */
-
-  delete ( key: K ): boolean {
-
-    const hasKey = this.has ( key );
-
-    if ( !hasKey ) return false;
-
-    this.#size -= 1;
-
-    if ( isWeakReferrable ( key ) ) {
-
-      const token = this.#finalizationTokens.get ( key );
-
-      if ( token ) {
-
-        this.#finalizationRegistry.unregister ( token );
-        this.#finalizationTokens.delete ( key );
-
-      }
-
-      return this.#weak.delete ( key );
-
-    } else {
-
-      return this.#strong.delete ( key );
-
-    }
-
-  }
-
-  get ( key: K ): V | undefined {
-
-    if ( isWeakReferrable ( key ) ) {
-
-      return this.#weak.get ( key );
-
-    } else {
-
-      return this.#strong.get ( key );
-
-    }
-
-  }
-
-  has ( key: K ): boolean {
-
-    if ( isWeakReferrable ( key ) ) {
-
-      return this.#weak.has ( key );
-
-    } else {
-
-      return this.#strong.has ( key );
-
-    }
-
-  }
-
-  set ( key: K, value: V ): this {
-
-    const hasKey = this.has ( key );
-
-    if ( !hasKey ) {
-
-      this.#size += 1;
-
-    }
-
-    if ( isWeakReferrable ( key ) ) {
-
-      this.#weak.set ( key, value );
-
-      if ( !hasKey ) {
-
-        const token = {};
-
-        this.#finalizationRegistry.register ( key, token, token );
-        this.#finalizationTokens.set ( key, token );
-
-      }
-
-    } else {
-
-      this.#strong.set ( key, value );
-
-    }
-
-    return this;
-
-  }
-
-}
-
-/* EXPORT */
-
-export default MildMap;

package/src/utils.ts

@@ -1,20 +0,0 @@
-
-/* IMPORT */
-
-import {SUPPORTS_SYMBOLS_AS_WEAKMAP_KEYS} from './constants';
-
-/* IMPORT */
-
-const isWeakReferrable = ( value: unknown ): value is object => {
-
-  if ( value === null ) return false;
-
-  const type = typeof value;
-
-  return type === 'object' || type === 'function' || ( SUPPORTS_SYMBOLS_AS_WEAKMAP_KEYS && type === 'symbol' );
-
-};
-
-/* EXPORT */
-
-export {isWeakReferrable};

package/test/index.js

@@ -1,70 +0,0 @@
-
-/* IMPORT */
-
-import {describe} from 'fava';
-import {setTimeout as delay} from 'node:timers/promises';
-import MildMap from '../dist/index.js';
-
-/* MAIN */
-
-describe ( 'MildMap', it => {
-
-  it ( 'works', async t => {
-
-    const map = new MildMap ();
-
-    let primitive = 0;
-    let object = {};
-
-    t.is ( map.size, 0 );
-
-    t.is ( map.get ( primitive ), undefined );
-    t.is ( map.get ( object ), undefined );
-
-    t.false ( map.has ( primitive ) );
-    t.false ( map.has ( object ) );
-
-    t.false ( map.delete ( primitive ) );
-    t.false ( map.delete ( object ) );
-
-    map.set ( primitive, 'primitive' );
-    map.set ( object, 'object' );
-
-    t.is ( map.size, 2 );
-
-    t.is ( map.get ( primitive ), 'primitive' );
-    t.is ( map.get ( object ), 'object' );
-
-    t.true ( map.has ( primitive ) );
-    t.true ( map.has ( object ) );
-
-    t.true ( map.delete ( primitive ) );
-    t.true ( map.delete ( object ) );
-
-    t.is ( map.size, 0 );
-
-    map.set ( primitive, 'primitive' );
-    map.set ( object, 'object' );
-
-    t.is ( map.size, 2 );
-
-    /* CLEANUP */
-
-    let deleted = 0;
-
-    const registry = new FinalizationRegistry ( () => deleted++ );
-
-    registry.register ( object );
-
-    object = null;
-
-    await delay ( 500 );
-    global.gc ();
-    await delay ( 500 );
-
-    t.is ( deleted, 1 );
-    t.is ( map.size, 1 );
-
-  });
-
-});

package/tsconfig.json

@@ -1,6 +0,0 @@
-{
-  "extends": "tsex/tsconfig.json",
-  "compilerOptions": {
-    "target": "es2022"
-  }
-}