packtory 0.0.77 → 0.0.78

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dead-code-eliminator/transform/source-map-composer.js +44 -12
  2. package/dead-code-eliminator/transform/source-map-composer.js.map +1 -1
  3. package/package.json +1 -2
  4. package/sbom.cdx.json +4 -21
package/dead-code-eliminator/transform/source-map-composer.js CHANGED
@@ -1,5 +1,4 @@
1
- import { addMapping, GenMapping, toEncodedMap } from '@jridgewell/gen-mapping';
2
- import { eachMapping, TraceMap } from '@jridgewell/trace-mapping';
1
+ import { eachMapping, encodedMappings, presortedDecodedMap, TraceMap } from '@jridgewell/trace-mapping';
3
2
  import { translateGeneratedOffset } from "./atom-translator.js";
4
3
  import { lineColumnToOffset, offsetToLineColumn } from "./line-index.js";
5
4
  function tryParseTraceMap(originalMap) {
@@ -10,7 +9,36 @@ function tryParseTraceMap(originalMap) {
10
9
  return null;
11
10
  }
12
11
  }
13
- function appendTranslatedMappings(mappingsBuilder, traceMap, transform) {
12
+ function namedSegment(generated, traceMap, mapping) {
13
+ const sourceIndex = traceMap.sources.indexOf(mapping.source);
14
+ const originalLine = mapping.originalLine - 1;
15
+ if (mapping.name === null) {
16
+ return [generated.column, sourceIndex, originalLine, mapping.originalColumn];
17
+ }
18
+ const nameIndex = traceMap.names.indexOf(mapping.name);
19
+ return [generated.column, sourceIndex, originalLine, mapping.originalColumn, nameIndex];
20
+ }
21
+ function createSourceMapSegmentStore() {
22
+ const mappings = [];
23
+ return {
24
+ append(lineIndex, segment) {
25
+ const line = mappings[lineIndex];
26
+ if (line === undefined) {
27
+ mappings[lineIndex] = [segment];
28
+ }
29
+ else {
30
+ line.push(segment);
31
+ }
32
+ },
33
+ toMappings() {
34
+ return Array.from({ length: mappings.length }, function (_ignoredValue, index) {
35
+ return mappings[index] ?? [];
36
+ });
37
+ }
38
+ };
39
+ }
40
+ function translatedMappings(traceMap, transform) {
41
+ const mappings = createSourceMapSegmentStore();
14
42
  let sawMapping = false;
15
43
  eachMapping(traceMap, function (mapping) {
16
44
  sawMapping = true;
@@ -18,23 +46,20 @@ function appendTranslatedMappings(mappingsBuilder, traceMap, transform) {
18
46
  const oldOffset = lineColumnToOffset(transform.originalLineIndex, mapping.generatedLine, mapping.generatedColumn);
19
47
  const newOffset = translateGeneratedOffset(oldOffset, transform.atoms);
20
48
  if (newOffset !== undefined) {
21
- addMapping(mappingsBuilder, {
22
- generated: offsetToLineColumn(transform.transformedLineIndex, newOffset),
23
- source: mapping.source,
24
- original: { line: mapping.originalLine, column: mapping.originalColumn }
25
- });
49
+ const generated = offsetToLineColumn(transform.transformedLineIndex, newOffset);
50
+ mappings.append(generated.line - 1, namedSegment(generated, traceMap, mapping));
26
51
  }
27
52
  }
28
53
  });
29
- return sawMapping;
54
+ return { mappings: mappings.toMappings(), sawMapping };
30
55
  }
31
56
  function recomposeWithTransform(originalMap, transform) {
32
57
  const traceMap = tryParseTraceMap(originalMap);
33
58
  if (traceMap === null) {
34
59
  return originalMap;
35
60
  }
36
- const mappingsBuilder = new GenMapping();
37
- if (!appendTranslatedMappings(mappingsBuilder, traceMap, transform)) {
61
+ const translated = translatedMappings(traceMap, transform);
62
+ if (!translated.sawMapping) {
38
63
  return originalMap;
39
64
  }
40
65
  return JSON.stringify({
@@ -44,7 +69,14 @@ function recomposeWithTransform(originalMap, transform) {
44
69
  sources: traceMap.sources,
45
70
  sourcesContent: traceMap.sourcesContent,
46
71
  names: traceMap.names,
47
- mappings: toEncodedMap(mappingsBuilder).mappings
72
+ mappings: encodedMappings(presortedDecodedMap({
73
+ version: 3,
74
+ sources: Array.from(traceMap.sources),
75
+ names: Array.from(traceMap.names),
76
+ mappings: translated.mappings.map(function (line) {
77
+ return Array.from(line);
78
+ })
79
+ }))
48
80
  });
49
81
  }
50
82
  export function recomposeSourceMap(originalMap, sourceMapTransforms) {
package/dead-code-eliminator/transform/source-map-composer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"source-map-composer.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/source-map-composer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAA2B,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,SAAS,gBAAgB,CAAC,WAAmB;IACzC,IAAI,CAAC;QACD,OAAO,IAAI,QAAQ,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC;AAED,SAAS,wBAAwB,CAC7B,eAA2B,EAC3B,QAAkB,EAClB,SAA6B;IAE7B,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,WAAW,CAAC,QAAQ,EAAE,UAAU,OAAO;QACnC,UAAU,GAAG,IAAI,CAAC;QAClB,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YAC1B,MAAM,SAAS,GAAG,kBAAkB,CAChC,SAAS,CAAC,iBAAiB,EAC3B,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,eAAe,CAC1B,CAAC;YACF,MAAM,SAAS,GAAG,wBAAwB,CAAC,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC1B,UAAU,CAAC,eAAe,EAAE;oBACxB,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,oBAAoB,EAAE,SAAS,CAAC;oBACxE,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,cAAc,EAAE;iBAC3E,CAAC,CAAC;YACP,CAAC;QACL,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,sBAAsB,CAAC,WAAmB,EAAE,SAA6B;IAC9E,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC/C,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpB,OAAO,WAAW,CAAC;IACvB,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,UAAU,EAAE,CAAC;IACzC,IAAI,CAAC,wBAAwB,CAAC,eAAe,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC;QAClE,OAAO,WAAW,CAAC;IACvB,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC;QAClB,OAAO,EAAE,CAAC;QACV,IAAI,EAAE,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI;QACxD,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,QAAQ,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC,QAAQ;KACnD,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,kBAAkB,CAC9B,WAAmB,EACnB,mBAAkD;IAElD,OAAO,mBAAmB,CAAC,MAAM,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;AAC3E,CAAC"}
1
+ {"version":3,"file":"source-map-composer.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/source-map-composer.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -9,7 +9,6 @@
9
9
  "dependencies": {
10
10
  "@arethetypeswrong/core": "0.18.5",
11
11
  "@cyclonedx/cyclonedx-library": "10.1.0",
12
- "@jridgewell/gen-mapping": "0.3.13",
13
12
  "@jridgewell/trace-mapping": "0.3.31",
14
13
  "@schema-hub/zod-error-formatter": "0.0.14",
15
14
  "@ts-morph/common": "0.29.0",
@@ -145,5 +144,5 @@
145
144
  "./tar/tarball-builder.js"
146
145
  ],
147
146
  "type": "module",
148
- "version": "0.0.77"
147
+ "version": "0.0.78"
149
148
  }
package/sbom.cdx.json CHANGED
@@ -16,9 +16,9 @@
16
16
  "component": {
17
17
  "type": "library",
18
18
  "name": "packtory",
19
- "version": "0.0.77",
20
- "bom-ref": "pkg:npm/packtory@0.0.77",
21
- "purl": "pkg:npm/packtory@0.0.77"
19
+ "version": "0.0.78",
20
+ "bom-ref": "pkg:npm/packtory@0.0.78",
21
+ "purl": "pkg:npm/packtory@0.0.78"
22
22
  }
23
23
  },
24
24
  "components": [
@@ -48,19 +48,6 @@
48
48
  ],
49
49
  "purl": "pkg:npm/@cyclonedx/cyclonedx-library@10.1.0"
50
50
  },
51
- {
52
- "type": "library",
53
- "name": "@jridgewell/gen-mapping",
54
- "version": "0.3.13",
55
- "bom-ref": "pkg:npm/@jridgewell/gen-mapping@0.3.13",
56
- "scope": "required",
57
- "licenses": [
58
- {
59
- "expression": "MIT"
60
- }
61
- ],
62
- "purl": "pkg:npm/@jridgewell/gen-mapping@0.3.13"
63
- },
64
51
  {
65
52
  "type": "library",
66
53
  "name": "@jridgewell/trace-mapping",
@@ -355,9 +342,6 @@
355
342
  {
356
343
  "ref": "pkg:npm/@cyclonedx/cyclonedx-library@10.1.0"
357
344
  },
358
- {
359
- "ref": "pkg:npm/@jridgewell/gen-mapping@0.3.13"
360
- },
361
345
  {
362
346
  "ref": "pkg:npm/@jridgewell/trace-mapping@0.3.31"
363
347
  },
@@ -392,11 +376,10 @@
392
376
  "ref": "pkg:npm/npm-registry-fetch@20.0.1"
393
377
  },
394
378
  {
395
- "ref": "pkg:npm/packtory@0.0.77",
379
+ "ref": "pkg:npm/packtory@0.0.78",
396
380
  "dependsOn": [
397
381
  "pkg:npm/@arethetypeswrong/core@0.18.5",
398
382
  "pkg:npm/@cyclonedx/cyclonedx-library@10.1.0",
399
- "pkg:npm/@jridgewell/gen-mapping@0.3.13",
400
383
  "pkg:npm/@jridgewell/trace-mapping@0.3.31",
401
384
  "pkg:npm/@schema-hub/zod-error-formatter@0.0.14",
402
385
  "pkg:npm/@ts-morph/common@0.29.0",