Skip to content

Commit 7575b63

Browse files
committed
gen-mapping: temporarily remove scopes/ranges APIs
1 parent 08ff6d7 commit 7575b63

File tree

2 files changed

+39
-31
lines changed

2 files changed

+39
-31
lines changed

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

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import { SetArray, put, remove } from './set-array';
2-
import { encode, encodeGeneratedRanges, encodeOriginalScopes } from '@jridgewell/sourcemap-codec';
2+
import {
3+
encode,
4+
// encodeGeneratedRanges,
5+
// encodeOriginalScopes
6+
} from '@jridgewell/sourcemap-codec';
37
import { TraceMap, decodedMappings } from '@jridgewell/trace-mapping';
48

59
import {
@@ -11,17 +15,17 @@ import {
1115
} from './sourcemap-segment';
1216

1317
import type { SourceMapInput } from '@jridgewell/trace-mapping';
14-
import type { OriginalScope, GeneratedRange } from '@jridgewell/sourcemap-codec';
18+
// import type { OriginalScope, GeneratedRange } from '@jridgewell/sourcemap-codec';
1519
import type { SourceMapSegment } from './sourcemap-segment';
1620
import type {
1721
DecodedSourceMap,
1822
EncodedSourceMap,
1923
Pos,
2024
Mapping,
21-
BindingExpressionRange,
22-
OriginalPos,
23-
OriginalScopeInfo,
24-
GeneratedRangeInfo,
25+
// BindingExpressionRange,
26+
// OriginalPos,
27+
// OriginalScopeInfo,
28+
// GeneratedRangeInfo,
2529
} from './types';
2630

2731
export type { DecodedSourceMap, EncodedSourceMap, Mapping };
@@ -41,8 +45,8 @@ export class GenMapping {
4145
private declare _sources: SetArray<string>;
4246
private declare _sourcesContent: (string | null)[];
4347
private declare _mappings: SourceMapSegment[][];
44-
private declare _originalScopes: OriginalScope[][];
45-
private declare _generatedRanges: GeneratedRange[];
48+
// private declare _originalScopes: OriginalScope[][];
49+
// private declare _generatedRanges: GeneratedRange[];
4650
private declare _ignoreList: SetArray<number>;
4751
declare file: string | null | undefined;
4852
declare sourceRoot: string | null | undefined;
@@ -52,8 +56,8 @@ export class GenMapping {
5256
this._sources = new SetArray();
5357
this._sourcesContent = [];
5458
this._mappings = [];
55-
this._originalScopes = [];
56-
this._generatedRanges = [];
59+
// this._originalScopes = [];
60+
// this._generatedRanges = [];
5761
this.file = file;
5862
this.sourceRoot = sourceRoot;
5963
this._ignoreList = new SetArray();
@@ -65,8 +69,8 @@ interface PublicMap {
6569
_sources: GenMapping['_sources'];
6670
_sourcesContent: GenMapping['_sourcesContent'];
6771
_mappings: GenMapping['_mappings'];
68-
_originalScopes: GenMapping['_originalScopes'];
69-
_generatedRanges: GenMapping['_generatedRanges'];
72+
// _originalScopes: GenMapping['_originalScopes'];
73+
// _generatedRanges: GenMapping['_generatedRanges'];
7074
_ignoreList: GenMapping['_ignoreList'];
7175
}
7276

@@ -226,23 +230,23 @@ export function setSourceContent(map: GenMapping, source: string, content: strin
226230
const {
227231
_sources: sources,
228232
_sourcesContent: sourcesContent,
229-
_originalScopes: originalScopes,
233+
// _originalScopes: originalScopes,
230234
} = cast(map);
231235
const index = put(sources, source);
232236
sourcesContent[index] = content;
233-
if (index === originalScopes.length) originalScopes[index] = [];
237+
// if (index === originalScopes.length) originalScopes[index] = [];
234238
}
235239

236240
export function setIgnore(map: GenMapping, source: string, ignore = true) {
237241
const {
238242
_sources: sources,
239243
_sourcesContent: sourcesContent,
240244
_ignoreList: ignoreList,
241-
_originalScopes: originalScopes,
245+
// _originalScopes: originalScopes,
242246
} = cast(map);
243247
const index = put(sources, source);
244248
if (index === sourcesContent.length) sourcesContent[index] = null;
245-
if (index === originalScopes.length) originalScopes[index] = [];
249+
// if (index === originalScopes.length) originalScopes[index] = [];
246250
if (ignore) put(ignoreList, index);
247251
else remove(ignoreList, index);
248252
}
@@ -258,8 +262,8 @@ export function toDecodedMap(map: GenMapping): DecodedSourceMap {
258262
_sourcesContent: sourcesContent,
259263
_names: names,
260264
_ignoreList: ignoreList,
261-
_originalScopes: originalScopes,
262-
_generatedRanges: generatedRanges,
265+
// _originalScopes: originalScopes,
266+
// _generatedRanges: generatedRanges,
263267
} = cast(map);
264268
removeEmptyFinalLines(mappings);
265269

@@ -271,8 +275,8 @@ export function toDecodedMap(map: GenMapping): DecodedSourceMap {
271275
sources: sources.array,
272276
sourcesContent,
273277
mappings,
274-
originalScopes,
275-
generatedRanges,
278+
// originalScopes,
279+
// generatedRanges,
276280
ignoreList: ignoreList.array,
277281
};
278282
}
@@ -285,8 +289,8 @@ export function toEncodedMap(map: GenMapping): EncodedSourceMap {
285289
const decoded = toDecodedMap(map);
286290
return {
287291
...decoded,
288-
originalScopes: decoded.originalScopes.map((os) => encodeOriginalScopes(os)),
289-
generatedRanges: encodeGeneratedRanges(decoded.generatedRanges as GeneratedRange[]),
292+
// originalScopes: decoded.originalScopes.map((os) => encodeOriginalScopes(os)),
293+
// generatedRanges: encodeGeneratedRanges(decoded.generatedRanges as GeneratedRange[]),
290294
mappings: encode(decoded.mappings as SourceMapSegment[][]),
291295
};
292296
}
@@ -357,7 +361,7 @@ function addSegmentInternal<S extends string | null | undefined>(
357361
_sources: sources,
358362
_sourcesContent: sourcesContent,
359363
_names: names,
360-
_originalScopes: originalScopes,
364+
// _originalScopes: originalScopes,
361365
} = cast(map);
362366
const line = getIndex(mappings, genLine);
363367
const index = getColumnIndex(line, genColumn);
@@ -375,7 +379,7 @@ function addSegmentInternal<S extends string | null | undefined>(
375379
const sourcesIndex = put(sources, source);
376380
const namesIndex = name ? put(names, name) : NO_NAME;
377381
if (sourcesIndex === sourcesContent.length) sourcesContent[sourcesIndex] = content ?? null;
378-
if (sourcesIndex === originalScopes.length) originalScopes[sourcesIndex] = [];
382+
// if (sourcesIndex === originalScopes.length) originalScopes[sourcesIndex] = [];
379383

380384
if (skipable && skipSource(line, index, sourcesIndex, sourceLine, sourceColumn, namesIndex)) {
381385
return;
@@ -507,6 +511,7 @@ function addMappingInternal<S extends string | null | undefined>(
507511
);
508512
}
509513

514+
/*
510515
export function addOriginalScope(
511516
map: GenMapping,
512517
data: {
@@ -539,8 +544,10 @@ export function addOriginalScope(
539544
const len = originalScopes[index].push(scope);
540545
return [index, len - 1, variables];
541546
}
547+
*/
542548

543549
// Generated Ranges
550+
/*
544551
export function addGeneratedRange(
545552
map: GenMapping,
546553
data: {
@@ -605,3 +612,4 @@ export function addBinding(
605612
binding.push([put(names, expression.expression), start.line - 1, start.column]);
606613
}
607614
}
615+
*/

packages/gen-mapping/src/types.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { GeneratedRange, OriginalScope } from '@jridgewell/sourcemap-codec';
1+
// import type { GeneratedRange, OriginalScope } from '@jridgewell/sourcemap-codec';
22
import type { SourceMapSegment } from './sourcemap-segment';
33

44
export interface SourceMapV3 {
@@ -13,14 +13,14 @@ export interface SourceMapV3 {
1313

1414
export interface EncodedSourceMap extends SourceMapV3 {
1515
mappings: string;
16-
originalScopes: string[];
17-
generatedRanges: string;
16+
// originalScopes: string[];
17+
// generatedRanges: string;
1818
}
1919

2020
export interface DecodedSourceMap extends SourceMapV3 {
2121
mappings: readonly SourceMapSegment[][];
22-
originalScopes: readonly OriginalScope[][];
23-
generatedRanges: readonly GeneratedRange[];
22+
// originalScopes: readonly OriginalScope[][];
23+
// generatedRanges: readonly GeneratedRange[];
2424
}
2525

2626
export interface Pos {
@@ -37,8 +37,8 @@ export interface BindingExpressionRange {
3737
expression: string;
3838
}
3939

40-
export type OriginalScopeInfo = [number, number, string[] | undefined];
41-
export type GeneratedRangeInfo = [GeneratedRange, string[] | undefined];
40+
// export type OriginalScopeInfo = [number, number, string[] | undefined];
41+
// export type GeneratedRangeInfo = [GeneratedRange, string[] | undefined];
4242

4343
export type Mapping =
4444
| {

0 commit comments

Comments
 (0)