@vforsh/argus-watcher 0.3.0 → 0.4.0

package/dist/runtime/watcherInject.d.ts

@@ -1,3 +1,5 @@
+import { type WatcherRecord } from '@vforsh/argus-core';
+import type { CdpSessionHandle } from '../cdp/connection.js';
 export declare const buildInjectExpression: (script: string, argusPayload: {
     watcherId: string;
     watcherHost: string;
@@ -11,5 +13,27 @@ export declare const buildInjectExpression: (script: string, argusPayload: {
         parentId: string | null;
     };
 } | null) => string;
-export declare const formatWatcherError: (error: unknown) => string;
+/** Options for the optional attach-time script injection. */
+export type WatcherInjectOptions = {
+    script: string;
+    exposeArgus?: boolean;
+};
+/** Target metadata the injected `window.__ARGUS__` payload carries. */
+type InjectTarget = {
+    title?: string | null;
+    url?: string | null;
+    type?: string | null;
+    parentId?: string | null;
+};
+/**
+ * Build the attach hook that installs a watcher's `inject.script`.
+ *
+ * Returns a no-op when nothing is configured, so the runtime can call it unconditionally. The script
+ * is registered for future documents *and* evaluated once against the page already loaded; a failure
+ * on either is warned about but never fails the attach.
+ *
+ * @param record Live watcher record, read at call time for the `window.__ARGUS__` payload.
+ */
+export declare const createInjectOnAttach: (inject: WatcherInjectOptions | undefined, record: WatcherRecord) => ((session: CdpSessionHandle, target: InjectTarget) => Promise<void>);
+export {};
 //# sourceMappingURL=watcherInject.d.ts.map

package/dist/runtime/watcherInject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcherInject.d.ts","sourceRoot":"","sources":["../../src/runtime/watcherInject.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,GACjC,QAAQ,MAAM,EACd,cAAc;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAC3F,GAAG,IAAI,KACN,MAUF,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,OAAO,OAAO,KAAG,MAQnD,CAAA"}
+{"version":3,"file":"watcherInject.d.ts","sourceRoot":"","sources":["../../src/runtime/watcherInject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAE5D,eAAO,MAAM,qBAAqB,GACjC,QAAQ,MAAM,EACd,cAAc;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAC3F,GAAG,IAAI,KACN,MAUF,CAAA;AAED,6DAA6D;AAC7D,MAAM,MAAM,oBAAoB,GAAG;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA;AAED,uEAAuE;AACvE,KAAK,YAAY,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAA;AAElH;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,GAChC,QAAQ,oBAAoB,GAAG,SAAS,EACxC,QAAQ,aAAa,KACnB,CAAC,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAsCrE,CAAA"}

package/dist/runtime/watcherInject.js

@@ -1,3 +1,4 @@
+import { formatError } from '@vforsh/argus-core';
 export const buildInjectExpression = (script, argusPayload) => {
     const lines = ['(() => {'];
     if (argusPayload) {
@@ -9,13 +10,54 @@ export const buildInjectExpression = (script, argusPayload) => {
     lines.push('})();');
     return lines.join('\n');
 };
-export const formatWatcherError = (error) => {
-    if (!error) {
-        return 'Unknown error';
+/**
+ * Build the attach hook that installs a watcher's `inject.script`.
+ *
+ * Returns a no-op when nothing is configured, so the runtime can call it unconditionally. The script
+ * is registered for future documents *and* evaluated once against the page already loaded; a failure
+ * on either is warned about but never fails the attach.
+ *
+ * @param record Live watcher record, read at call time for the `window.__ARGUS__` payload.
+ */
+export const createInjectOnAttach = (inject, record) => {
+    if (!inject?.script) {
+        return async () => { };
     }
-    if (error instanceof Error) {
-        return error.message;
+    return async (session, target) => {
+        if (!session.isAttached()) {
+            return;
+        }
+        const trimmedScript = inject.script.trim();
+        if (trimmedScript === '') {
+            console.warn(`[Watcher] Inject script is empty for watcher ${record.id}. Skipping.`);
+            return;
+        }
+        const argusPayload = inject.exposeArgus ?? true
+            ? {
+                watcherId: record.id,
+                watcherHost: record.host,
+                watcherPort: record.port,
+                watcherPid: record.pid,
+                attachedAt: Date.now(),
+                target: {
+                    title: target.title ?? null,
+                    url: target.url ?? null,
+                    type: target.type ?? 'page',
+                    parentId: target.parentId ?? null,
+                },
+            }
+            : null;
+        const expression = buildInjectExpression(trimmedScript, argusPayload);
+        await runInjectStep('register', record.id, () => session.sendAndWait('Page.addScriptToEvaluateOnNewDocument', { source: expression }));
+        await runInjectStep('run', record.id, () => session.sendAndWait('Runtime.evaluate', { expression, silent: true }));
+    };
+};
+const runInjectStep = async (step, watcherId, action) => {
+    try {
+        await action();
+    }
+    catch (error) {
+        console.warn(`[Watcher] Failed to ${step} inject script for watcher ${watcherId}: ${formatError(error)}`);
     }
-    return String(error);
 };
 //# sourceMappingURL=watcherInject.js.map

package/dist/runtime/watcherInject.js.map

@@ -1 +1 @@
-{"version":3,"file":"watcherInject.js","sourceRoot":"","sources":["../../src/runtime/watcherInject.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACpC,MAAc,EACd,YAOQ,EACC,EAAE;IACX,MAAM,KAAK,GAAG,CAAC,UAAU,CAAC,CAAA;IAC1B,IAAI,YAAY,EAAE,CAAC;QAClB,KAAK,CAAC,IAAI,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;IAClE,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,yBAAyB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC9D,KAAK,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;IAC5D,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAC1B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACnB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACxB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAc,EAAU,EAAE;IAC5D,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,eAAe,CAAA;IACvB,CAAC;IACD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,OAAO,CAAA;IACrB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACrB,CAAC,CAAA"}
+{"version":3,"file":"watcherInject.js","sourceRoot":"","sources":["../../src/runtime/watcherInject.ts"],"names":[],"mappings":"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"}

package/dist/runtime/watcherServices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcherServices.d.ts","sourceRoot":"","sources":["../../src/runtime/watcherServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAGtD,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE/D,MAAM,MAAM,sBAAsB,GAAG;IACpC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,oBAAoB,EAAE,QAAQ,EAAE,IAAI,CAAC,KAAK,IAAI,CAAA;IACzE,QAAQ,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAA;IAC3C,gBAAgB,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,KAAK,IAAI,CAAA;IACvE,UAAU,EAAE,MAAM,IAAI,CAAA;IACtB,UAAU,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,KAAK,IAAI,CAAA;IAC9E,QAAQ,EAAE,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACzF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,KAAK,IAAI,CAAA;IACxF,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACpC,YAAY,EAAE,eAAe,CAAA;IAC7B,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,GAAG,IAAI,CAAA;IACvE,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAA;IACrD,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAA;IACrD,QAAQ,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;IAC3C,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAA;CACrD,CAAA;AAED,eAAO,MAAM,4BAA4B,GACxC,SAAS,mBAAmB,EAC5B,OAAO,sBAAsB,EAC7B,WAAW,sBAAsB,KAC/B,sBAiGF,CAAA"}
+{"version":3,"file":"watcherServices.d.ts","sourceRoot":"","sources":["../../src/runtime/watcherServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAGtD,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE/D,MAAM,MAAM,sBAAsB,GAAG;IACpC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,oBAAoB,EAAE,QAAQ,EAAE,IAAI,CAAC,KAAK,IAAI,CAAA;IACzE,QAAQ,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAA;IAC3C,gBAAgB,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,KAAK,IAAI,CAAA;IACvE,UAAU,EAAE,MAAM,IAAI,CAAA;IACtB,UAAU,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,KAAK,IAAI,CAAA;IAC9E,QAAQ,EAAE,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACzF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,KAAK,IAAI,CAAA;IACxF,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACpC,YAAY,EAAE,eAAe,CAAA;IAC7B,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,GAAG,IAAI,CAAA;IACvE,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAA;IACrD,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAA;IACrD,QAAQ,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;IAC3C,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAA;CACrD,CAAA;AAED,eAAO,MAAM,4BAA4B,GACxC,SAAS,mBAAmB,EAC5B,OAAO,sBAAsB,EAC7B,WAAW,sBAAsB,KAC/B,sBAsFF,CAAA"}

package/dist/runtime/watcherServices.js

@@ -6,16 +6,19 @@ import { createRuntimeEditor } from '../cdp/editor.js';
 import { createCdpSource } from '../sources/cdp-source.js';
 import { createExtensionSource } from '../sources/extension-source.js';
 export const createWatcherRuntimeServices = (options, setup, callbacks) => {
-    const { sourceMode, chrome, artifactsBaseDir, netBuffer, realtimeNetBuffer, sessionHandle, ignoreMatcher, stripUrlPrefixes, watcherId, host, record, extensionRole, } = setup;
-    if (sourceMode === 'extension') {
-        const sourceHandle = createExtensionSource({
+    const { sourceMode, chrome, artifactsBaseDir, netBuffer, realtimeNetBuffer, sessionHandle, ignoreMatcher, stripUrlPrefixes, sourcemaps, watcherId, host, record, extensionRole, } = setup;
+    const callbackEvents = {
+        onLog: callbacks.onLog,
+        onStatus: callbacks.onStatus,
+        onPageNavigation: callbacks.onPageNavigation,
+        onPageLoad: callbacks.onPageLoad,
+        onPageIntl: callbacks.onPageIntl,
+        onAttach: callbacks.onAttach,
+    };
+    const sourceHandle = sourceMode === 'extension'
+        ? createExtensionSource({
             events: {
-                onLog: callbacks.onLog,
-                onStatus: callbacks.onStatus,
-                onPageNavigation: callbacks.onPageNavigation,
-                onPageLoad: callbacks.onPageLoad,
-                onPageIntl: callbacks.onPageIntl,
-                onAttach: callbacks.onAttach,
+                ...callbackEvents,
                 onTargetChanged: callbacks.onTargetChanged,
                 onDetach: () => {
                     callbacks.onDetach();
@@ -27,63 +30,47 @@ export const createWatcherRuntimeServices = (options, setup, callbacks) => {
             role: extensionRole,
             ignoreMatcher: ignoreMatcher ? (url) => ignoreMatcher.matches(url) : null,
             stripUrlPrefixes,
-        });
-        return {
-            sourceHandle,
-            networkCapture: netBuffer
-                ? createNetworkCapture({
-                    session: sourceHandle.pageSession ?? sourceHandle.session,
-                    buffer: netBuffer,
-                    realtimeBuffer: realtimeNetBuffer,
-                })
-                : null,
-            traceRecorder: createTraceRecorder({ session: sourceHandle.session, artifactsDir: artifactsBaseDir }),
-            screenshotter: createScreenshotter({
-                session: sourceHandle.session,
-                pageSession: sourceHandle.pageSession,
-                artifactsDir: artifactsBaseDir,
-            }),
-            recorder: createRecorder({
-                session: sourceHandle.session,
-                pageSession: sourceHandle.pageSession,
-                artifactsDir: artifactsBaseDir,
-                onRecordingStateChange: callbacks.onRecordingStateChange,
-            }),
-            runtimeEditor: createRuntimeEditor(sourceHandle.session),
-        };
-    }
-    const sourceHandle = createCdpSource({
-        chrome,
-        match: options.match,
-        sessionHandle,
-        events: {
-            onLog: callbacks.onLog,
-            onStatus: callbacks.onStatus,
-            onPageNavigation: callbacks.onPageNavigation,
-            onPageLoad: callbacks.onPageLoad,
-            onPageIntl: callbacks.onPageIntl,
-            onAttach: callbacks.onAttach,
-            onDetach: (reason) => {
-                callbacks.onDetach(reason);
+            sourcemaps,
+        })
+        : createCdpSource({
+            chrome,
+            match: options.match,
+            sessionHandle,
+            events: {
+                ...callbackEvents,
+                onDetach: (reason) => {
+                    callbacks.onDetach(reason);
+                },
             },
-        },
-        watcherId,
-        ignoreMatcher: ignoreMatcher ? (url) => ignoreMatcher.matches(url) : null,
-        stripUrlPrefixes,
-    });
+            watcherId,
+            ignoreMatcher: ignoreMatcher ? (url) => ignoreMatcher.matches(url) : null,
+            stripUrlPrefixes,
+            sourcemaps,
+        });
+    /**
+     * Only an extension session can be scoped to an iframe while a separate top-level session stays
+     * available, which is what lets visual capture translate frame-relative coordinates. A direct CDP
+     * session is its own page session, so it has nothing to translate against and passes `undefined`.
+     */
+    const pageSession = sourceMode === 'extension' ? sourceHandle.pageSession : undefined;
     return {
         sourceHandle,
         networkCapture: netBuffer
-            ? createNetworkCapture({ session: sessionHandle.session, buffer: netBuffer, realtimeBuffer: realtimeNetBuffer })
+            ? createNetworkCapture({
+                session: sourceHandle.pageSession ?? sourceHandle.session,
+                buffer: netBuffer,
+                realtimeBuffer: realtimeNetBuffer,
+            })
             : null,
-        traceRecorder: createTraceRecorder({ session: sessionHandle.session, artifactsDir: artifactsBaseDir }),
-        screenshotter: createScreenshotter({ session: sessionHandle.session, artifactsDir: artifactsBaseDir }),
+        traceRecorder: createTraceRecorder({ session: sourceHandle.session, artifactsDir: artifactsBaseDir }),
+        screenshotter: createScreenshotter({ session: sourceHandle.session, pageSession, artifactsDir: artifactsBaseDir }),
         recorder: createRecorder({
-            session: sessionHandle.session,
+            session: sourceHandle.session,
+            pageSession,
             artifactsDir: artifactsBaseDir,
             onRecordingStateChange: callbacks.onRecordingStateChange,
         }),
-        runtimeEditor: createRuntimeEditor(sessionHandle.session),
+        runtimeEditor: createRuntimeEditor(sourceHandle.session),
     };
 };
 //# sourceMappingURL=watcherServices.js.map

package/dist/runtime/watcherServices.js.map

@@ -1 +1 @@
-{"version":3,"file":"watcherServices.js","sourceRoot":"","sources":["../../src/runtime/watcherServices.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"watcherServices.js","sourceRoot":"","sources":["../../src/runtime/watcherServices.ts"],"names":[],"mappings":"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"}

package/dist/runtime/watcherSetup.d.ts

@@ -5,6 +5,7 @@ import { NetBuffer } from '../buffer/NetBuffer.js';
 import { RealtimeNetBuffer } from '../buffer/RealtimeNetBuffer.js';
 import { WatcherFileLogger } from '../fileLogs/WatcherFileLogger.js';
 import { buildIgnoreMatcher } from '../cdp/ignoreList.js';
+import { type SourcemapResolver } from '../sourcemaps/sourcemapResolver.js';
 import { createCdpSessionHandle } from '../cdp/connection.js';
 import { createEmulationController } from '../emulation/EmulationController.js';
 import { createThrottleController } from '../throttle/ThrottleController.js';
@@ -26,6 +27,8 @@ export type NormalizedWatcherSetup = {
     pageConsoleLogging: NonNullable<StartWatcherOptions['pageConsoleLogging']>;
     ignoreMatcher: ReturnType<typeof buildIgnoreMatcher>;
     stripUrlPrefixes: string[] | undefined;
+    /** Owned here so the cache lives and dies with the watcher instead of the module. */
+    sourcemaps: SourcemapResolver;
     events: Emittery<ArgusWatcherEventMap>;
     buffer: LogBuffer;
     netBuffer: NetBuffer | null;

package/dist/runtime/watcherSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcherSetup.d.ts","sourceRoot":"","sources":["../../src/runtime/watcherSetup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAGtE,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAA;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAA;AAC5E,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AACrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAA;AAClF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAEtD,MAAM,MAAM,sBAAsB,GAAG;IACpC,UAAU,EAAE,WAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACtD,aAAa,EAAE,WAAW,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAA;IAChE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,aAAa,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,UAAU,EAAE,OAAO,CAAA;IACnB,kBAAkB,EAAE,WAAW,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,CAAC,CAAA;IAC1E,aAAa,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAA;IACpD,gBAAgB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IACtC,MAAM,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAA;IACtC,MAAM,EAAE,SAAS,CAAA;IACjB,SAAS,EAAE,SAAS,GAAG,IAAI,CAAA;IAC3B,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAC3C,MAAM,EAAE,aAAa,CAAA;IACrB,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACpC,aAAa,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAA;IACxD,mBAAmB,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAA;IACjE,kBAAkB,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAA;IAC/D,oBAAoB,EAAE,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAA;IACnE,iBAAiB,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;CAC7D,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,SAAS,mBAAmB,EAAE,WAAW,MAAM,KAAG,sBAyEvF,CAAA"}
+{"version":3,"file":"watcherSetup.d.ts","sourceRoot":"","sources":["../../src/runtime/watcherSetup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAGtE,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAA2B,KAAK,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AACpG,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAA;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAA;AAC5E,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AACrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAA;AAClF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAEtD,MAAM,MAAM,sBAAsB,GAAG;IACpC,UAAU,EAAE,WAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACtD,aAAa,EAAE,WAAW,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAA;IAChE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,aAAa,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,UAAU,EAAE,OAAO,CAAA;IACnB,kBAAkB,EAAE,WAAW,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,CAAC,CAAA;IAC1E,aAAa,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAA;IACpD,gBAAgB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IACtC,qFAAqF;IACrF,UAAU,EAAE,iBAAiB,CAAA;IAC7B,MAAM,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAA;IACtC,MAAM,EAAE,SAAS,CAAA;IACjB,SAAS,EAAE,SAAS,GAAG,IAAI,CAAA;IAC3B,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAC3C,MAAM,EAAE,aAAa,CAAA;IACrB,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACpC,aAAa,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAA;IACxD,mBAAmB,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAA;IACjE,kBAAkB,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAA;IAC/D,oBAAoB,EAAE,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAA;IACnE,iBAAiB,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;CAC7D,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,SAAS,mBAAmB,EAAE,WAAW,MAAM,KAAG,sBA0EvF,CAAA"}

package/dist/runtime/watcherSetup.js

@@ -6,6 +6,7 @@ import { NetBuffer } from '../buffer/NetBuffer.js';
 import { RealtimeNetBuffer } from '../buffer/RealtimeNetBuffer.js';
 import { WatcherFileLogger } from '../fileLogs/WatcherFileLogger.js';
 import { buildIgnoreMatcher } from '../cdp/ignoreList.js';
+import { createSourcemapResolver } from '../sourcemaps/sourcemapResolver.js';
 import { createCdpSessionHandle } from '../cdp/connection.js';
 import { createEmulationController } from '../emulation/EmulationController.js';
 import { createThrottleController } from '../throttle/ThrottleController.js';
@@ -71,6 +72,7 @@ export const normalizeWatcherSetup = (options, watcherId) => {
         pageConsoleLogging,
         ignoreMatcher,
         stripUrlPrefixes,
+        sourcemaps: createSourcemapResolver(),
         events,
         buffer,
         netBuffer,

package/dist/runtime/watcherSetup.js.map

@@ -1 +1 @@
-{"version":3,"file":"watcherSetup.js","sourceRoot":"","sources":["../../src/runtime/watcherSetup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"watcherSetup.js","sourceRoot":"","sources":["../../src/runtime/watcherSetup.ts"],"names":[],"mappings":"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"}

package/dist/sourcemaps/resolveLocation.d.ts

@@ -1,18 +1,27 @@
-import { TraceMap } from '@jridgewell/trace-mapping';
-type GeneratedLocation = {
+import type { TraceMap } from '@jridgewell/trace-mapping';
+/** A location as Chrome reported it: bundle URL plus 1-based line/column. */
+export type GeneratedLocation = {
     file: string | null;
     line: number | null;
     column: number | null;
 };
-type ResolvedLocation = {
+/** A location mapped back to original sources. Line/column stay 1-based. */
+export type ResolvedLocation = {
     file: string;
     line: number;
     column: number;
 };
-export declare const resolveSourcemappedLocation: (location: GeneratedLocation) => Promise<ResolvedLocation | null>;
+/**
+ * Map a generated location through an already-loaded sourcemap.
+ *
+ * Pure: fetching and caching live in `createSourcemapResolver` (`./sourcemapResolver.js`).
+ * `trace-mapping` is 0-based on columns and 1-based on lines, so columns are shifted on the way in
+ * and back out.
+ *
+ * @returns The original location, or `null` when the map has no entry for it.
+ */
 export declare const resolveSourcemappedLocationWithMap: (traceMap: TraceMap, location: {
     line: number;
     column: number;
 }) => ResolvedLocation | null;
-export {};
 //# sourceMappingURL=resolveLocation.d.ts.map

package/dist/sourcemaps/resolveLocation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveLocation.d.ts","sourceRoot":"","sources":["../../src/sourcemaps/resolveLocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAuB,MAAM,2BAA2B,CAAA;AAGzE,KAAK,iBAAiB,GAAG;IACxB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CACrB,CAAA;AAED,KAAK,gBAAgB,GAAG;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACd,CAAA;AAKD,eAAO,MAAM,2BAA2B,GAAU,UAAU,iBAAiB,KAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAsB9G,CAAA;AAED,eAAO,MAAM,kCAAkC,GAAI,UAAU,QAAQ,EAAE,UAAU;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAG,gBAAgB,GAAG,IAmBtI,CAAA"}
+{"version":3,"file":"resolveLocation.d.ts","sourceRoot":"","sources":["../../src/sourcemaps/resolveLocation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AAEzD,6EAA6E;AAC7E,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CACrB,CAAA;AAED,4EAA4E;AAC5E,MAAM,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,kCAAkC,GAAI,UAAU,QAAQ,EAAE,UAAU;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAG,gBAAgB,GAAG,IAmBtI,CAAA"}

package/dist/sourcemaps/resolveLocation.js

@@ -1,26 +1,13 @@
-import { TraceMap, originalPositionFor } from '@jridgewell/trace-mapping';
-const traceMapCache = new Map();
-const pendingTraceMaps = new Map();
-export const resolveSourcemappedLocation = async (location) => {
-    if (!location.file) {
-        return null;
-    }
-    if (location.line == null || location.column == null) {
-        return null;
-    }
-    const scriptUrl = normalizeHttpUrl(location.file);
-    if (!scriptUrl) {
-        return null;
-    }
-    const traceMap = await getTraceMap(scriptUrl);
-    if (!traceMap) {
-        return null;
-    }
-    return resolveSourcemappedLocationWithMap(traceMap, {
-        line: location.line,
-        column: location.column,
-    });
-};
+import { originalPositionFor } from '@jridgewell/trace-mapping';
+/**
+ * Map a generated location through an already-loaded sourcemap.
+ *
+ * Pure: fetching and caching live in `createSourcemapResolver` (`./sourcemapResolver.js`).
+ * `trace-mapping` is 0-based on columns and 1-based on lines, so columns are shifted on the way in
+ * and back out.
+ *
+ * @returns The original location, or `null` when the map has no entry for it.
+ */
 export const resolveSourcemappedLocationWithMap = (traceMap, location) => {
     if (location.line <= 0 || location.column <= 0) {
         return null;
@@ -38,49 +25,4 @@ export const resolveSourcemappedLocationWithMap = (traceMap, location) => {
         column: position.column + 1,
     };
 };
-const getTraceMap = async (scriptUrl) => {
-    const cached = traceMapCache.get(scriptUrl);
-    if (cached !== undefined) {
-        return cached;
-    }
-    const pending = pendingTraceMaps.get(scriptUrl);
-    if (pending) {
-        return pending;
-    }
-    const promise = fetchTraceMap(scriptUrl)
-        .then((traceMap) => {
-        traceMapCache.set(scriptUrl, traceMap);
-        return traceMap;
-    })
-        .catch(() => {
-        traceMapCache.set(scriptUrl, null);
-        return null;
-    })
-        .finally(() => {
-        pendingTraceMaps.delete(scriptUrl);
-    });
-    pendingTraceMaps.set(scriptUrl, promise);
-    return promise;
-};
-const fetchTraceMap = async (scriptUrl) => {
-    const response = await fetch(`${scriptUrl}.map`);
-    if (!response.ok) {
-        return null;
-    }
-    const rawMap = (await response.json());
-    return new TraceMap(rawMap, scriptUrl);
-};
-const normalizeHttpUrl = (value) => {
-    let url;
-    try {
-        url = new URL(value);
-    }
-    catch {
-        return null;
-    }
-    if (url.protocol !== 'http:' && url.protocol !== 'https:') {
-        return null;
-    }
-    return url.toString();
-};
 //# sourceMappingURL=resolveLocation.js.map

package/dist/sourcemaps/resolveLocation.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveLocation.js","sourceRoot":"","sources":["../../src/sourcemaps/resolveLocation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolveLocation.js","sourceRoot":"","sources":["../../src/sourcemaps/resolveLocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AAiB/D;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,QAAkB,EAAE,QAA0C,EAA2B,EAAE;IAC7I,IAAI,QAAQ,CAAC,IAAI,IAAI,CAAC,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QAChD,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,QAAQ,EAAE;QAC9C,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC;KACxC,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,IAAI,IAAI,IAAI,QAAQ,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QAC1E,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,IAAI,EAAE,QAAQ,CAAC,MAAM;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,MAAM,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC;KAC3B,CAAA;AACF,CAAC,CAAA"}

package/dist/sourcemaps/sourceMappingUrl.d.ts

@@ -0,0 +1,27 @@
+import type { SourceMapInput } from '@jridgewell/trace-mapping';
+/**
+ * Where a bundle says its sourcemap lives.
+ *
+ * `inline` carries an already-decoded `data:` payload; `remote` carries an absolute URL that still
+ * has to be fetched. `baseUrl` is what relative `sources` entries resolve against.
+ */
+export type SourcemapReference = {
+    kind: 'inline';
+    map: SourceMapInput;
+    baseUrl: string;
+} | {
+    kind: 'remote';
+    url: string;
+};
+/**
+ * Read a script's sourcemap annotation and turn it into something fetchable.
+ *
+ * Replaces the `${scriptUrl}.map` guess: the annotation is authoritative, so cache-busting query
+ * strings, CDN-hosted maps, hashed map filenames, and inline `data:` maps all resolve correctly.
+ *
+ * @param source - The script text (or its tail — only the last annotation matters).
+ * @param scriptUrl - Absolute URL the script was served from; relative annotations resolve against it.
+ * @returns The reference, or `null` when the script carries no usable annotation.
+ */
+export declare const readSourcemapReference: (source: string, scriptUrl: string) => SourcemapReference | null;
+//# sourceMappingURL=sourceMappingUrl.d.ts.map

package/dist/sourcemaps/sourceMappingUrl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sourceMappingUrl.d.ts","sourceRoot":"","sources":["../../src/sourcemaps/sourceMappingUrl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE/D;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,GAAG,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAS3H;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,GAAI,QAAQ,MAAM,EAAE,WAAW,MAAM,KAAG,kBAAkB,GAAG,IAgB/F,CAAA"}

package/dist/sourcemaps/sourceMappingUrl.js

@@ -0,0 +1,57 @@
+import { Buffer } from 'node:buffer';
+/**
+ * Matches the sourceMappingURL annotation bundlers append, in both the line-comment and block-comment
+ * spellings and with the legacy `@` sigil.
+ * Global so the last annotation wins — a concatenated bundle can carry several.
+ */
+const ANNOTATION_PATTERN = /\/[/*][#@]\s*sourceMappingURL\s*=\s*([^\s'"]+)/g;
+/**
+ * Read a script's sourcemap annotation and turn it into something fetchable.
+ *
+ * Replaces the `${scriptUrl}.map` guess: the annotation is authoritative, so cache-busting query
+ * strings, CDN-hosted maps, hashed map filenames, and inline `data:` maps all resolve correctly.
+ *
+ * @param source - The script text (or its tail — only the last annotation matters).
+ * @param scriptUrl - Absolute URL the script was served from; relative annotations resolve against it.
+ * @returns The reference, or `null` when the script carries no usable annotation.
+ */
+export const readSourcemapReference = (source, scriptUrl) => {
+    const value = readAnnotation(source);
+    if (!value) {
+        return null;
+    }
+    if (value.startsWith('data:')) {
+        const map = decodeInlineSourcemap(value);
+        return map ? { kind: 'inline', map, baseUrl: scriptUrl } : null;
+    }
+    try {
+        return { kind: 'remote', url: new URL(value, scriptUrl).toString() };
+    }
+    catch {
+        return null;
+    }
+};
+const readAnnotation = (source) => {
+    let last = null;
+    for (const match of source.matchAll(ANNOTATION_PATTERN)) {
+        last = match[1] ?? last;
+    }
+    return last;
+};
+/** Decode a `data:application/json[;base64],…` sourcemap payload. Returns null on any malformed part. */
+const decodeInlineSourcemap = (value) => {
+    const comma = value.indexOf(',');
+    if (comma < 0) {
+        return null;
+    }
+    const meta = value.slice(0, comma);
+    const payload = value.slice(comma + 1);
+    try {
+        const json = meta.includes(';base64') ? Buffer.from(payload, 'base64').toString('utf8') : decodeURIComponent(payload);
+        return JSON.parse(json);
+    }
+    catch {
+        return null;
+    }
+};
+//# sourceMappingURL=sourceMappingUrl.js.map

package/dist/sourcemaps/sourceMappingUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sourceMappingUrl.js","sourceRoot":"","sources":["../../src/sourcemaps/sourceMappingUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAWpC;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,iDAAiD,CAAA;AAE5E;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,SAAiB,EAA6B,EAAE;IACtG,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;IACpC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAA;QACxC,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;IAChE,CAAC;IAED,IAAI,CAAC;QACJ,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAA;IACrE,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,CAAA;IACZ,CAAC;AACF,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,MAAc,EAAiB,EAAE;IACxD,IAAI,IAAI,GAAkB,IAAI,CAAA;IAC9B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACzD,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;IACxB,CAAC;IACD,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA;AAED,yGAAyG;AACzG,MAAM,qBAAqB,GAAG,CAAC,KAAa,EAAyB,EAAE;IACtE,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAChC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACf,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;IAClC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAEtC,IAAI,CAAC;QACJ,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QACrH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAmB,CAAA;IAC1C,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,CAAA;IACZ,CAAC;AACF,CAAC,CAAA"}

package/dist/sourcemaps/sourcemapResolver.d.ts

@@ -0,0 +1,30 @@
+import { type GeneratedLocation, type ResolvedLocation } from './resolveLocation.js';
+/**
+ * Per-watcher sourcemap lookup.
+ *
+ * One instance is owned by the watcher runtime rather than the module, so the cache dies with the
+ * watcher and a navigation can reset it — a stale or failed map never outlives the page that
+ * produced it.
+ */
+export type SourcemapResolver = {
+    /** Map a generated location back to its original source, or `null` when no map applies. */
+    resolve: (location: GeneratedLocation) => Promise<ResolvedLocation | null>;
+    /** Drop every cached map. Called on top-level navigation so a rebuilt bundle is re-read. */
+    clear: () => void;
+};
+export type SourcemapResolverOptions = {
+    /** Hard cap on cached scripts. Oldest entries are evicted first. Default 128. */
+    maxEntries?: number;
+    /** How long a "no usable map" answer is trusted before being retried. Default 30s. */
+    negativeTtlMs?: number;
+    /** Bytes requested from the end of a script when hunting for the annotation. Default 64 KiB. */
+    tailBytes?: number;
+};
+/**
+ * Build a sourcemap resolver.
+ *
+ * Map locations come from each bundle's own `//# sourceMappingURL=` annotation, never from a
+ * `<script>.map` guess, so query strings, CDN-hosted maps, and inline `data:` maps all work.
+ */
+export declare const createSourcemapResolver: (options?: SourcemapResolverOptions) => SourcemapResolver;
+//# sourceMappingURL=sourcemapResolver.d.ts.map

package/dist/sourcemaps/sourcemapResolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sourcemapResolver.d.ts","sourceRoot":"","sources":["../../src/sourcemaps/sourcemapResolver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsC,KAAK,iBAAiB,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAExH;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC/B,2FAA2F;IAC3F,OAAO,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;IAC1E,4FAA4F;IAC5F,KAAK,EAAE,MAAM,IAAI,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACtC,iFAAiF;IACjF,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,sFAAsF;IACtF,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gGAAgG;IAChG,SAAS,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAYD;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,UAAS,wBAA6B,KAAG,iBAyFhF,CAAA"}