Cleanup commented scopes code

Author: jridgewell

packages/gen-mapping/src/gen-mapping.ts

@@ -1,8 +1,6 @@
 import { SetArray, put, remove } from './set-array';
 import {
   encode,
-  // encodeGeneratedRanges,
-  // encodeOriginalScopes
 } from '@jridgewell/sourcemap-codec';
 import { TraceMap, decodedMappings } from '@jridgewell/trace-mapping';
 
@@ -15,17 +13,12 @@ import {
 } from './sourcemap-segment';
 
 import type { SourceMapInput } from '@jridgewell/trace-mapping';
-// import type { OriginalScope, GeneratedRange } from '@jridgewell/sourcemap-codec';
 import type { SourceMapSegment } from './sourcemap-segment';
 import type {
   DecodedSourceMap,
   EncodedSourceMap,
   Pos,
   Mapping,
-  // BindingExpressionRange,
-  // OriginalPos,
-  // OriginalScopeInfo,
-  // GeneratedRangeInfo,
 } from './types';
 
 export type { DecodedSourceMap, EncodedSourceMap, Mapping };
@@ -45,8 +38,6 @@ export class GenMapping {
   declare private _sources: SetArray<string>;
   declare private _sourcesContent: (string | null)[];
   declare private _mappings: SourceMapSegment[][];
-  // private declare _originalScopes: OriginalScope[][];
-  // private declare _generatedRanges: GeneratedRange[];
   declare private _ignoreList: SetArray<number>;
   declare file: string | null | undefined;
   declare sourceRoot: string | null | undefined;
@@ -56,8 +47,6 @@ export class GenMapping {
     this._sources = new SetArray();
     this._sourcesContent = [];
     this._mappings = [];
-    // this._originalScopes = [];
-    // this._generatedRanges = [];
     this.file = file;
     this.sourceRoot = sourceRoot;
     this._ignoreList = new SetArray();
@@ -69,8 +58,6 @@ interface PublicMap {
   _sources: GenMapping['_sources'];
   _sourcesContent: GenMapping['_sourcesContent'];
   _mappings: GenMapping['_mappings'];
-  // _originalScopes: GenMapping['_originalScopes'];
-  // _generatedRanges: GenMapping['_generatedRanges'];
   _ignoreList: GenMapping['_ignoreList'];
 }
 
@@ -230,23 +217,19 @@ export function setSourceContent(map: GenMapping, source: string, content: strin
   const {
     _sources: sources,
     _sourcesContent: sourcesContent,
-    // _originalScopes: originalScopes,
   } = cast(map);
   const index = put(sources, source);
   sourcesContent[index] = content;
-  // if (index === originalScopes.length) originalScopes[index] = [];
 }
 
 export function setIgnore(map: GenMapping, source: string, ignore = true) {
   const {
     _sources: sources,
     _sourcesContent: sourcesContent,
     _ignoreList: ignoreList,
-    // _originalScopes: originalScopes,
   } = cast(map);
   const index = put(sources, source);
   if (index === sourcesContent.length) sourcesContent[index] = null;
-  // if (index === originalScopes.length) originalScopes[index] = [];
   if (ignore) put(ignoreList, index);
   else remove(ignoreList, index);
 }
@@ -262,8 +245,6 @@ export function toDecodedMap(map: GenMapping): DecodedSourceMap {
     _sourcesContent: sourcesContent,
     _names: names,
     _ignoreList: ignoreList,
-    // _originalScopes: originalScopes,
-    // _generatedRanges: generatedRanges,
   } = cast(map);
   removeEmptyFinalLines(mappings);
 
@@ -275,8 +256,6 @@ export function toDecodedMap(map: GenMapping): DecodedSourceMap {
     sources: sources.array,
     sourcesContent,
     mappings,
-    // originalScopes,
-    // generatedRanges,
     ignoreList: ignoreList.array,
   };
 }
@@ -288,8 +267,6 @@ export function toDecodedMap(map: GenMapping): DecodedSourceMap {
 export function toEncodedMap(map: GenMapping): EncodedSourceMap {
   const decoded = toDecodedMap(map);
   return Object.assign({}, decoded, {
-    // originalScopes: decoded.originalScopes.map((os) => encodeOriginalScopes(os)),
-    // generatedRanges: encodeGeneratedRanges(decoded.generatedRanges as GeneratedRange[]),
     mappings: encode(decoded.mappings as SourceMapSegment[][]),
   });
 }
@@ -305,7 +282,6 @@ export function fromMap(input: SourceMapInput): GenMapping {
   putAll(cast(gen)._sources, map.sources as string[]);
   cast(gen)._sourcesContent = map.sourcesContent || map.sources.map(() => null);
   cast(gen)._mappings = decodedMappings(map) as GenMapping['_mappings'];
-  // TODO: implement originalScopes/generatedRanges
   if (map.ignoreList) putAll(cast(gen)._ignoreList, map.ignoreList);
 
   return gen;
@@ -360,7 +336,6 @@ function addSegmentInternal<S extends string | null | undefined>(
     _sources: sources,
     _sourcesContent: sourcesContent,
     _names: names,
-    // _originalScopes: originalScopes,
   } = cast(map);
   const line = getIndex(mappings, genLine);
   const index = getColumnIndex(line, genColumn);
@@ -378,7 +353,6 @@ function addSegmentInternal<S extends string | null | undefined>(
   const sourcesIndex = put(sources, source);
   const namesIndex = name ? put(names, name) : NO_NAME;
   if (sourcesIndex === sourcesContent.length) sourcesContent[sourcesIndex] = content ?? null;
-  // if (sourcesIndex === originalScopes.length) originalScopes[sourcesIndex] = [];
 
   if (skipable && skipSource(line, index, sourcesIndex, sourceLine, sourceColumn, namesIndex)) {
     return;
@@ -509,106 +483,3 @@ function addMappingInternal<S extends string | null | undefined>(
     content,
   );
 }
-
-/*
-export function addOriginalScope(
-  map: GenMapping,
-  data: {
-    start: Pos;
-    end: Pos;
-    source: string;
-    kind: string;
-    name?: string;
-    variables?: string[];
-  },
-): OriginalScopeInfo {
-  const { start, end, source, kind, name, variables } = data;
-  const {
-    _sources: sources,
-    _sourcesContent: sourcesContent,
-    _originalScopes: originalScopes,
-    _names: names,
-  } = cast(map);
-  const index = put(sources, source);
-  if (index === sourcesContent.length) sourcesContent[index] = null;
-  if (index === originalScopes.length) originalScopes[index] = [];
-
-  const kindIndex = put(names, kind);
-  const scope: OriginalScope = name
-    ? [start.line - 1, start.column, end.line - 1, end.column, kindIndex, put(names, name)]
-    : [start.line - 1, start.column, end.line - 1, end.column, kindIndex];
-  if (variables) {
-    scope.vars = variables.map((v) => put(names, v));
-  }
-  const len = originalScopes[index].push(scope);
-  return [index, len - 1, variables];
-}
-*/
-
-// Generated Ranges
-/*
-export function addGeneratedRange(
-  map: GenMapping,
-  data: {
-    start: Pos;
-    isScope: boolean;
-    originalScope?: OriginalScopeInfo;
-    callsite?: OriginalPos;
-  },
-): GeneratedRangeInfo {
-  const { start, isScope, originalScope, callsite } = data;
-  const {
-    _originalScopes: originalScopes,
-    _sources: sources,
-    _sourcesContent: sourcesContent,
-    _generatedRanges: generatedRanges,
-  } = cast(map);
-
-  const range: GeneratedRange = [
-    start.line - 1,
-    start.column,
-    0,
-    0,
-    originalScope ? originalScope[0] : -1,
-    originalScope ? originalScope[1] : -1,
-  ];
-  if (originalScope?.[2]) {
-    range.bindings = originalScope[2].map(() => [[-1]]);
-  }
-  if (callsite) {
-    const index = put(sources, callsite.source);
-    if (index === sourcesContent.length) sourcesContent[index] = null;
-    if (index === originalScopes.length) originalScopes[index] = [];
-    range.callsite = [index, callsite.line - 1, callsite.column];
-  }
-  if (isScope) range.isScope = true;
-  generatedRanges.push(range);
-
-  return [range, originalScope?.[2]];
-}
-
-export function setEndPosition(range: GeneratedRangeInfo, pos: Pos) {
-  range[0][2] = pos.line - 1;
-  range[0][3] = pos.column;
-}
-
-export function addBinding(
-  map: GenMapping,
-  range: GeneratedRangeInfo,
-  variable: string,
-  expression: string | BindingExpressionRange,
-) {
-  const { _names: names } = cast(map);
-  const bindings = (range[0].bindings ||= []);
-  const vars = range[1];
-
-  const index = vars!.indexOf(variable);
-  const binding = getIndex(bindings, index);
-
-  if (typeof expression === 'string') binding[0] = [put(names, expression)];
-  else {
-    const { start } = expression;
-    binding.push([put(names, expression.expression), start.line - 1, start.column]);
-  }
-}
-*/