dynohot - npm Package Compare versions

Comparing version 2.1.0 to 2.1.1

dist/runtime/instance.js

@@ -10,2 +10,3 @@ import * as assert from "node:assert/strict";
 import { moduleNamespacePropertyDescriptor, withResolvers } from "./utility.js";
+const ambiguousIndirectResolution = () => { throw new Error("Ambiguous"); };
 /** @internal */
@@ -259,46 +260,58 @@ export class ReloadableModuleInstance {
             this.namespace ??= () => namespace;
-            const ambiguousNames = new Set();
-            const resolutions = new Map();
-            const seen = new Set();
-            (function traverse(instance) {
-                if (seen.has(instance)) {
-                    return;
-                }
-                else {
-                    seen.add(instance);
-                }
-                for (const [name, resolution] of instance.directExports()) {
-                    if (name !== "default") {
-                        const previousResolution = resolutions.get(name);
-                        if (previousResolution === undefined) {
-                            resolutions.set(name, resolution);
-                        }
-                        else if (previousResolution !== resolution) {
-                            ambiguousNames.add(name);
-                        }
-                    }
-                }
+            const collectNamedExports = function* (instance) {
+                // Local names
+                yield* instance.directExports();
+                // Named indirect exports
                 for (const entry of instance.indirectExportEntries()) {
-                    const instance = entry.moduleRequest.controller().select(select);
                     if (entry.binding.type === BindingType.indirectExport) {
+                        const name = entry.binding.as ?? entry.binding.name;
                         const resolution = instance.resolveExport(entry.binding.name, select, undefined);
                         assert.ok(resolution != null);
-                        resolutions.set(entry.binding.as ?? entry.binding.name, resolution);
+                        yield [name, resolution];
                     }
                     else {
                         assert.equal(entry.binding.type, BindingType.indirectStarExport);
-                        resolutions.set(entry.binding.as, instance.moduleNamespace(select));
+                        const name = entry.binding.as;
+                        const resolution = entry.moduleRequest.controller().select(select).moduleNamespace();
+                        yield [name, resolution];
                     }
                 }
-                for (const entry of instance.starExportEntries()) {
-                    traverse(entry.moduleRequest.controller().select(select));
-                }
-            })(this);
-            const thisDefault = this.state.environment.exports.default;
-            if (thisDefault) {
-                resolutions.set("default", thisDefault);
+            };
+            // Resolve directly exported names
+            const directResolutions = new Map(collectNamedExports(this));
+            // Resolve indirect star exports
+            const seen = new Set([this]);
+            const indirectResolutions = new Map();
+            for (const entry of this.starExportEntries()) {
+                const instance = entry.moduleRequest.controller().select(select);
+                (function traverse(instance) {
+                    if (seen.has(instance)) {
+                        return;
+                    }
+                    else {
+                        seen.add(instance);
+                    }
+                    for (const [name, resolution] of collectNamedExports(instance)) {
+                        if (name !== "default") {
+                            const previousResolution = indirectResolutions.get(name);
+                            if (previousResolution === undefined) {
+                                indirectResolutions.set(name, resolution);
+                            }
+                            else if (previousResolution !== resolution) {
+                                indirectResolutions.set(name, ambiguousIndirectResolution);
+                            }
+                        }
+                    }
+                    for (const entry of instance.starExportEntries()) {
+                        traverse(entry.moduleRequest.controller().select(select));
+                    }
+                })(instance);
             }
-            const unambiguousResolutions = Array.from(Fn.filter(resolutions, ([name]) => !ambiguousNames.has(name)));
-            unambiguousResolutions.sort(mappedPrimitiveComparator(([name]) => name));
-            Object.defineProperties(namespace, Object.fromEntries(Fn.map(unambiguousResolutions, ([name, get]) => [name, { ...moduleNamespacePropertyDescriptor, get }])));
+            // Combine direct & indirect exports
+            const unambiguousIndirectResolutions = Fn.reject(indirectResolutions, ([name, resolution]) => resolution === ambiguousIndirectResolution || directResolutions.has(name));
+            const namespaceDescriptors = Fn.pipe(Fn.concat([directResolutions, unambiguousIndirectResolutions]), $$ => Fn.map($$, ([name, resolution]) => {
+                const descriptor = { ...moduleNamespacePropertyDescriptor, get: resolution };
+                return [name, descriptor];
+            }), $$ => [...$$], $$ => $$.sort(mappedPrimitiveComparator(([name]) => name)), $$ => [...$$]);
+            Object.defineProperties(namespace, Object.fromEntries(namespaceDescriptors));
             Object.freeze(namespace);
@@ -305,0 +318,0 @@ }

package.json

 {
 	"name": "dynohot",
 	"type": "module",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"exports": {
@@ -6,0 +6,0 @@ ".": "./dist/loader/dispatch.js",

No alert changes

Improved metrics

Total package byte prevSize

152432

0.63%

Lines of code

3228

0.4%

No dependency changes