depvitals 0.3.0 → 0.4.0

package/dist/scanner/moduleSpecifiers.js

@@ -43,13 +43,47 @@ export class ModuleSpecifierError extends Error {
  *   from which the scanner cannot safely continue.
  */
 export function extractModuleSpecifiers(source, options = {}) {
+    return collectModuleSpecifiers(source, options).map(({ specifier, kind }) => ({
+        specifier,
+        kind,
+    }));
+}
+/**
+ * Authoritative occurrence collector. The lexer must finish successfully before locations escape.
+ * Recognition is shared with the legacy projection above; no additional extraction is performed.
+ */
+export function collectModuleSpecifiers(source, options = {}) {
     const jsx = options.jsx ?? false;
     // Ambiguous input gets one non-interpreting lexical probe and one definitive extraction. No
     // source reread, parser retry after an exception, or repeated per-statement suffix scans.
     const module = options.module === 'detect'
         ? tokenize(source, jsx, false, true).some((token) => token.moduleSignal === true)
         : (options.module ?? false);
-    return interpret(tokenize(source, jsx, module));
+    const occurrences = interpret(tokenize(source, jsx, module));
+    let cursor = 0;
+    let line = 1;
+    let column = 1;
+    // Interpreter output is in literal encounter order. Each original UTF-16 unit is visited at
+    // most once, except a bounded CRLF lookahead; no per-occurrence prefix/suffix scan is needed.
+    return occurrences.map(({ specifier, kind, offset }) => {
+        while (cursor < offset) {
+            const character = source[cursor++];
+            if (character === '\r') {
+                if (source[cursor] === '\n')
+                    cursor++;
+                line++;
+                column = 1;
+            }
+            else if (character === '\n' || character === '\u2028' || character === '\u2029') {
+                line++;
+                column = 1;
+            }
+            else {
+                column++;
+            }
+        }
+        return { specifier, kind, position: { offset, line, column } };
+    });
 }
 /**
  * Turn source into a stream of significant tokens, skipping whitespace, line/block comments, regex
@@ -3231,14 +3265,18 @@ function handleImport(tokens, i, occurrences, closingDelimiter) {
     }
     // `import 'pkg'`
     if (next?.kind === 'string') {
-        occurrences.push({ specifier: next.value, kind: 'import' });
+        occurrences.push({ specifier: next.value, kind: 'import', offset: next.offset });
         return i + 2;
     }
     // Keep literal specifiers with sole-argument or bounded object-literal options forms.
     if (next?.kind === 'punct' && next.value === '(') {
         const specifier = dynamicImportSpecifier(tokens, i + 2, closingDelimiter);
         if (specifier !== undefined) {
-            occurrences.push({ specifier, kind: 'dynamic-import' });
+            occurrences.push({
+                specifier: specifier.value,
+                kind: 'dynamic-import',
+                offset: specifier.offset,
+            });
             return i + 3;
         }
         return i + 1;
@@ -3261,7 +3299,7 @@ function scanImportSource(tokens, i, occurrences, kind) {
     const sourceIndex = kind === 'export-from' ? exportSourceIndex(tokens, i) : importSourceIndex(tokens, i);
     const source = sourceIndex === undefined ? undefined : tokens[sourceIndex];
     if (source?.kind === 'string' && sourceIndex !== undefined) {
-        occurrences.push({ specifier: source.value, kind });
+        occurrences.push({ specifier: source.value, kind, offset: source.offset });
         return sourceIndex + 1;
     }
     return i + 1;
@@ -3395,7 +3433,7 @@ function handleRequire(tokens, i, occurrences) {
     if (next?.kind === 'punct' && next.value === '(') {
         const specifier = soleStringSpecifier(tokens, i + 2);
         if (specifier !== undefined) {
-            occurrences.push({ specifier, kind: 'require' });
+            occurrences.push({ specifier: specifier.value, kind: 'require', offset: specifier.offset });
             return i + 3;
         }
     }
@@ -3543,10 +3581,10 @@ function dynamicImportSpecifier(tokens, argIndex, closingDelimiter) {
         return undefined;
     }
     const next = isPunct(tokens[optionsClose + 1], ',') ? optionsClose + 2 : optionsClose + 1;
-    return isPunct(tokens[next], ')') ? specifier.value : undefined;
+    return isPunct(tokens[next], ')') ? specifier : undefined;
 }
 /**
- * The decoded string at `argIndex` when it is the only argument of the surrounding call, that is
+ * The string token at `argIndex` when it is the only argument of the surrounding call, that is
  * when it is a string followed by an optional trailing comma and `)`. Returns undefined otherwise,
  * so a dynamic argument (e.g. `'pkg-' + name`) or a call with extra arguments (e.g.
  * `require('pkg', ctx)`) never yields a static specifier.
@@ -3561,7 +3599,7 @@ function soleStringSpecifier(tokens, argIndex) {
     if (closing?.kind !== 'punct' || closing.value !== ')') {
         return undefined;
     }
-    return arg.value;
+    return arg;
 }
 /* -------------------------------------------------------------------------- */
 /* Lexical constructs                                                         */