@esportsplus/typescript 0.31.1 → 0.33.0

package/build/{probe → guard}/overlay/base/async.jsonc

@@ -5,7 +5,7 @@
 {
   "overlay": {
     "async": {
-      "lib.dom": {
+      "global": {
         "fetch": { "cancellable": true }
       }
     }

package/build/{probe → guard}/overlay/base/exceptions.jsonc

@@ -1,5 +1,7 @@
-// Base exceptions-channel overlay. Top-level keys are lib sections; each section
-// maps an overlay key (see load.ts overlayKey) to an exceptions entry:
+// Base exceptions-channel overlay. Top-level keys are sections: `lib.*` (matched
+// for symbols declared in that lib), `node:*` (matched for @types/node symbols),
+// and `global` (searched last, for runtime globals present in both hosts). Each
+// section maps an overlay key (see load.ts overlayKey) to an exceptions entry:
 //   { "exceptions": ["SyntaxError"] }   - the error types the leaf may throw
 //   { "exceptionsFromCallbacks": [0] }  - inherits whatever the arg at that index throws
 //   { "exceptions": [] }                - modeled as non-throwing (so it is not logged)
@@ -46,7 +48,18 @@
     "BigInt": { "exceptions": ["RangeError", "SyntaxError", "TypeError"] }
   },
 
-  "lib.dom": {
+  "node:fs": {
+    "readFileSync": { "exceptions": ["Error"] },
+    "writeFileSync": { "exceptions": ["Error"] },
+    "mkdirSync": { "exceptions": ["Error"] }
+  },
+
+  "node:path": {
+    "relative": { "exceptions": ["TypeError"] },
+    "resolve": { "exceptions": ["TypeError"] }
+  },
+
+  "global": {
     "URL": { "exceptions": ["TypeError"] },
     "URLSearchParams": { "exceptions": ["TypeError"] },
     "structuredClone": { "exceptions": ["DataCloneError"] }

package/build/{probe → guard}/overlay/base/resources.jsonc

@@ -9,11 +9,16 @@
 {
     "overlay": {
         "resources": {
-            "lib.dom": {
+            "global": {
                 "setInterval": { "acquires": "Interval", "releasedBy": "clearInterval" },
                 "setTimeout": { "acquires": "Timeout", "releasedBy": "clearTimeout" },
 
                 "EventTarget#addEventListener": { "acquires": "Listener", "releasedBy": "removeEventListener", "pairKey": [0, 1] },
+
+                "AbortController": { "acquires": "AbortController", "informational": true }
+            },
+
+            "lib.dom": {
                 "Element#addEventListener": { "acquires": "Listener", "releasedBy": "removeEventListener", "pairKey": [0, 1] },
                 "HTMLElement#addEventListener": { "acquires": "Listener", "releasedBy": "removeEventListener", "pairKey": [0, 1] },
                 "Window#addEventListener": { "acquires": "Listener", "releasedBy": "removeEventListener", "pairKey": [0, 1] },
@@ -22,13 +27,7 @@
 
                 "ResizeObserver": { "acquires": "ResizeObserver", "releasedBy": "#disconnect" },
                 "MutationObserver": { "acquires": "MutationObserver", "releasedBy": "#disconnect" },
-                "WebSocket": { "acquires": "WebSocket", "releasedBy": "#close" },
-                "AbortController": { "acquires": "AbortController", "informational": true }
-            },
-
-            "node:timers": {
-                "setInterval": { "acquires": "Interval", "releasedBy": "clearInterval" },
-                "setTimeout": { "acquires": "Timeout", "releasedBy": "clearTimeout" }
+                "WebSocket": { "acquires": "WebSocket", "releasedBy": "#close" }
             },
 
             "node:fs/promises": {

package/build/{probe → guard}/overlay/load.d.ts

@@ -1,18 +1,14 @@
-import type { HandlerBoundary, OverlaySet, AnalyzeConfig } from '../kernel/types.js';
+import type { OverlaySet } from '../kernel/types.js';
 type SectionTable = Map<string, unknown>;
 type ChannelTable = Map<string, SectionTable>;
 type MergedOverlay = {
     readonly channels: ReadonlyMap<string, ChannelTable>;
-    readonly boundaries: ReadonlyArray<HandlerBoundary>;
     entry(channel: string, section: string, key: string): unknown;
 };
-type LoadedOverlays = OverlaySet & {
-    boundariesFromPresets(): ReadonlyArray<HandlerBoundary>;
-};
 declare function mergeOverlayData(files: ReadonlyArray<{
     name: string;
     text: string;
 }>): MergedOverlay;
 declare function overlayKey(parentName: string | undefined, memberName: string, isNamespace: boolean): string;
-declare function loadOverlays(config: AnalyzeConfig): LoadedOverlays;
-export { loadOverlays, mergeOverlayData, overlayKey, type LoadedOverlays, type MergedOverlay };
+declare function loadOverlays(): OverlaySet;
+export { loadOverlays, mergeOverlayData, overlayKey, type MergedOverlay };

package/build/{probe → guard}/overlay/load.js

@@ -1,7 +1,7 @@
 import * as NodeFS from 'node:fs';
 import * as NodePath from 'node:path';
 import * as NodeURL from 'node:url';
-import * as ts from '../../probe/adapter.js';
+import * as ts from '../adapter.js';
 import { stripJsonc } from '../../jsonc.js';
 const KNOWN_NAMESPACES = new Set([
     'JSON',
@@ -12,55 +12,7 @@ const KNOWN_NAMESPACES = new Set([
     'Console',
     'console',
 ]);
-function legacyStripJsonc(text) {
-    let out = '';
-    let i = 0;
-    const n = text.length;
-    let inString = false;
-    let quote = '';
-    while (i < n) {
-        const ch = text[i];
-        const next = i + 1 < n ? text[i + 1] : '';
-        if (inString) {
-            out += ch;
-            if (ch === '\\') {
-                out += next;
-                i += 2;
-                continue;
-            }
-            if (ch === quote) {
-                inString = false;
-            }
-            i += 1;
-            continue;
-        }
-        if (ch === '"' || ch === "'") {
-            inString = true;
-            quote = ch;
-            out += ch;
-            i += 1;
-            continue;
-        }
-        if (ch === '/' && next === '/') {
-            while (i < n && text[i] !== '\n') {
-                i += 1;
-            }
-            continue;
-        }
-        if (ch === '/' && next === '*') {
-            i += 2;
-            while (i < n && !(text[i] === '*' && text[i + 1] === '/')) {
-                i += 1;
-            }
-            i += 2;
-            continue;
-        }
-        out += ch;
-        i += 1;
-    }
-    return out.replace(/,(\s*[}\]])/g, '$1');
-}
-void legacyStripJsonc;
+const GLOBAL_SECTION = 'global';
 function parseJsonc(name, text) {
     let parsed;
     try {
@@ -96,30 +48,6 @@ function mergeSections(into, sections) {
         }
     }
 }
-function readBoundaries(name, raw) {
-    if (raw === undefined) {
-        return [];
-    }
-    if (!Array.isArray(raw)) {
-        throw new Error(`analyze overlay: ${name} handlerBoundaries must be an array`);
-    }
-    return raw.map((item, index) => {
-        if (typeof item !== 'object' || item === null) {
-            throw new Error(`analyze overlay: ${name} handlerBoundaries[${index}] must be an object`);
-        }
-        const obj = item;
-        const callee = obj['callee'];
-        const callbackArgs = obj['callbackArgs'];
-        if (typeof callee !== 'string') {
-            throw new Error(`analyze overlay: ${name} handlerBoundaries[${index}].callee must be a string`);
-        }
-        if (!Array.isArray(callbackArgs) ||
-            callbackArgs.some((v) => typeof v !== 'number' || !Number.isInteger(v))) {
-            throw new Error(`analyze overlay: ${name} handlerBoundaries[${index}].callbackArgs must be an array of integers`);
-        }
-        return { callee, callbackArgs: callbackArgs };
-    });
-}
 function mergeOverlayData(files) {
     return mergeParsedOverlayData(files.map((file) => ({
         name: file.name,
@@ -128,7 +56,6 @@ function mergeOverlayData(files) {
 }
 function mergeParsedOverlayData(files) {
     const channels = new Map();
-    const boundaries = [];
     const channelFor = (channel) => {
         let table = channels.get(channel);
         if (!table) {
@@ -139,9 +66,7 @@ function mergeParsedOverlayData(files) {
     };
     for (const file of files) {
         const root = file.root;
-        const isBundle = 'overlay' in root || 'handlerBoundaries' in root;
-        if (isBundle) {
-            boundaries.push(...readBoundaries(file.name, root['handlerBoundaries']));
+        if ('overlay' in root) {
             const overlay = root['overlay'];
             if (overlay !== undefined) {
                 if (!isSectionMap(overlay)) {
@@ -160,7 +85,6 @@ function mergeParsedOverlayData(files) {
     }
     return {
         channels,
-        boundaries,
         entry(channel, section, key) {
             return channels.get(channel)?.get(section)?.get(key);
         },
@@ -232,9 +156,16 @@ function findInSections(channel, key, accept, preferred) {
     }
     return undefined;
 }
+function findInGlobal(channel, key) {
+    const table = channel.get(GLOBAL_SECTION);
+    if (table && table.has(key)) {
+        return { pkg: GLOBAL_SECTION, symbol: key, entry: table.get(key) };
+    }
+    return undefined;
+}
 const HERE = NodePath.dirname(NodeURL.fileURLToPath(import.meta.url));
 const shippedOverlayCache = new Map();
-const userOverlayCache = new Map();
+let mergedOverlayCache;
 function readShippedOverlay(file) {
     let cached = shippedOverlayCache.get(file);
     if (!cached) {
@@ -246,56 +177,42 @@ function readShippedOverlay(file) {
     }
     return cached;
 }
-function readUserOverlay(file) {
-    const mtimeMs = NodeFS.statSync(file).mtimeMs;
-    const cached = userOverlayCache.get(file);
-    if (!cached || cached.mtimeMs !== mtimeMs) {
-        const fresh = {
-            name: file,
-            root: parseJsonc(file, NodeFS.readFileSync(file, 'utf8')),
-        };
-        userOverlayCache.set(file, { mtimeMs, file: fresh });
-        return fresh;
-    }
-    return cached.file;
-}
-function loadOverlays(config) {
-    const files = [];
-    files.push(readShippedOverlay(NodePath.join(HERE, 'base', 'async.jsonc')));
-    files.push(readShippedOverlay(NodePath.join(HERE, 'base', 'exceptions.jsonc')));
-    files.push(readShippedOverlay(NodePath.join(HERE, 'base', 'resources.jsonc')));
-    for (const preset of config.presets) {
-        const presetPath = NodePath.join(HERE, 'presets', `${preset}.jsonc`);
-        if (!NodeFS.existsSync(presetPath)) {
-            throw new Error(`analyze overlay: unknown preset "${preset}" (no file at ${presetPath})`);
-        }
-        files.push(readShippedOverlay(presetPath));
+function loadOverlays() {
+    if (!mergedOverlayCache) {
+        mergedOverlayCache = mergeParsedOverlayData([
+            readShippedOverlay(NodePath.join(HERE, 'base', 'async.jsonc')),
+            readShippedOverlay(NodePath.join(HERE, 'base', 'exceptions.jsonc')),
+            readShippedOverlay(NodePath.join(HERE, 'base', 'resources.jsonc')),
+        ]);
     }
-    for (const overlay of config.overlays) {
-        if (!NodeFS.existsSync(overlay)) {
-            throw new Error(`analyze overlay: overlay file not found: ${overlay}`);
-        }
-        files.push(readUserOverlay(overlay));
-    }
-    const merged = mergeParsedOverlayData(files);
+    const merged = mergedOverlayCache;
+    const lookupCache = new Map();
     return {
-        boundariesFromPresets() {
-            return merged.boundaries;
-        },
         lookup(symbol, channel) {
+            let channels = lookupCache.get(symbol);
+            if (channels?.has(channel)) {
+                return channels.get(channel);
+            }
             const table = merged.channels.get(channel);
+            if (!channels) {
+                channels = new Map();
+                lookupCache.set(symbol, channels);
+            }
             if (!table) {
+                channels.set(channel, undefined);
                 return undefined;
             }
             const key = keyFor(symbol);
             const hint = sourceHint(symbol);
-            if (hint.kind === 'lib') {
-                return findInSections(table, key, (s) => s.startsWith('lib.'), hint.section);
-            }
-            if (hint.kind === 'node') {
-                return findInSections(table, key, (s) => s.startsWith('node:'), hint.section);
-            }
-            return findInSections(table, key, (s) => !s.startsWith('lib.'), undefined);
+            const accept = hint.kind === 'lib'
+                ? (s) => s.startsWith('lib.')
+                : hint.kind === 'node'
+                    ? (s) => s.startsWith('node:')
+                    : (s) => s !== GLOBAL_SECTION && !s.startsWith('lib.');
+            const found = findInSections(table, key, accept, hint.section);
+            const result = found ?? findInGlobal(table, key);
+            channels.set(channel, result);
+            return result;
         },
     };
 }

package/build/{probe → guard}/resources/channel.d.ts

@@ -1,4 +1,4 @@
 import type { Channel } from '../kernel/types.js';
 import { type ResourcesValue } from './value.js';
-declare const createResourcesChannel: (channelConfig: unknown, onDegrade?: (message: string) => void) => Channel<ResourcesValue>;
+declare const createResourcesChannel: (onDegrade?: (message: string) => void) => Channel<ResourcesValue>;
 export { createResourcesChannel };