sfdx-git-delta 6.45.1 → 7.1.0

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 (61) hide show
  1. package/README.md +4 -4
  2. package/lib/adapter/GitAdapter.d.ts +15 -62
  3. package/lib/adapter/GitAdapter.js +376 -485
  4. package/lib/adapter/GitAdapter.js.map +1 -1
  5. package/lib/adapter/gitBlobReader.d.ts +8 -10
  6. package/lib/adapter/gitBlobReader.js.map +1 -1
  7. package/lib/adapter/ioExecutor.d.ts +4 -3
  8. package/lib/adapter/ioExecutor.js +22 -14
  9. package/lib/adapter/ioExecutor.js.map +1 -1
  10. package/lib/adapter/tsgitErrorMap.d.ts +7 -0
  11. package/lib/adapter/tsgitErrorMap.js +32 -0
  12. package/lib/adapter/tsgitErrorMap.js.map +1 -0
  13. package/lib/commands/sgd/source/delta.js.map +1 -1
  14. package/lib/constant/gitConstants.d.ts +0 -2
  15. package/lib/constant/gitConstants.js +0 -8
  16. package/lib/constant/gitConstants.js.map +1 -1
  17. package/lib/constant/metadataConstants.d.ts +1 -0
  18. package/lib/constant/metadataConstants.js +1 -0
  19. package/lib/constant/metadataConstants.js.map +1 -1
  20. package/lib/main.d.ts +1 -1
  21. package/lib/main.js +1 -1
  22. package/lib/main.js.map +1 -1
  23. package/lib/metadata/MetadataRepositoryImpl.js.map +1 -1
  24. package/lib/metadata/metadataDefinitionMerger.js.map +1 -1
  25. package/lib/metadata/metadataManager.d.ts +1 -1
  26. package/lib/metadata/sdrMetadataAdapter.js.map +1 -1
  27. package/lib/post-processor/baseProcessor.js.map +1 -1
  28. package/lib/post-processor/flowTranslationProcessor.js +2 -3
  29. package/lib/post-processor/flowTranslationProcessor.js.map +1 -1
  30. package/lib/post-processor/postProcessorManager.js.map +1 -1
  31. package/lib/schemas/metadata.d.ts +3 -3
  32. package/lib/service/diffLineInterpreter.js.map +1 -1
  33. package/lib/service/inBundleHandler.d.ts +0 -2
  34. package/lib/service/inBundleHandler.js +0 -26
  35. package/lib/service/inBundleHandler.js.map +1 -1
  36. package/lib/service/inFileHandler.js +4 -3
  37. package/lib/service/inFileHandler.js.map +1 -1
  38. package/lib/service/standardHandler.d.ts +1 -1
  39. package/lib/service/standardHandler.js.map +1 -1
  40. package/lib/service/typeHandlerFactory.js.map +1 -1
  41. package/lib/utils/LoggingService.js.map +1 -1
  42. package/lib/utils/MessageService.js.map +1 -1
  43. package/lib/utils/concurrency/boundedQueue.js.map +1 -1
  44. package/lib/utils/configValidator.js.map +1 -1
  45. package/lib/utils/ignoreHelper.js.map +1 -1
  46. package/lib/utils/metadataBoundaryResolver.js.map +1 -1
  47. package/lib/utils/metadataDiff/index.d.ts +0 -2
  48. package/lib/utils/metadataDiff/index.js.map +1 -1
  49. package/lib/utils/metadataDiff/streamingDiff.d.ts +1 -3
  50. package/lib/utils/metadataDiff/streamingDiff.js +16 -54
  51. package/lib/utils/metadataDiff/streamingDiff.js.map +1 -1
  52. package/lib/utils/metadataDiff/xmlWriter.js.map +1 -1
  53. package/lib/utils/metadataElement.js.map +1 -1
  54. package/lib/utils/packageHelper.js.map +1 -1
  55. package/lib/utils/repoGitDiff.js.map +1 -1
  56. package/oclif.manifest.json +1 -1
  57. package/package.json +39 -25
  58. package/lib/adapter/gitBatchCatFile.d.ts +0 -42
  59. package/lib/adapter/gitBatchCatFile.js +0 -203
  60. package/lib/adapter/gitBatchCatFile.js.map +0 -1
  61. package/npm-shrinkwrap.json +0 -12848
@@ -1 +1 @@
1
- {"version":3,"file":"metadataElement.js","sourceRoot":"","sources":["../../src/utils/metadataElement.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"metadataElement.js","sourceRoot":"","sources":["../../src/utils/metadataElement.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"packageHelper.js","sourceRoot":"","sources":["../../src/utils/packageHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;;;;;;AAGZ,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAG9D,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAE9D,MAAM,QAAQ,GAAG,IAAI,CAAA;AACrB,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC5C,MAAM,eAAe,GAAG;IACtB,SAAS,EAAE,yCAAyC;CACrD,CAAA;AACD,MAAM,UAAU,GAAG;IACjB,MAAM,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE;CACtD,CAAA;AAID,MAAM,CAAC,OAAO,OAAO,cAAc;IACF;IAA/B,YAA+B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAGpC,AAAN,KAAK,CAAC,kBAAkB,CAC7B,gBAA0B,EAC1B,GAAa;QAEb,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;QAC5D,MAAM,YAAY,GAAwB;YACxC,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,CAAsB,CAAC;YAClE,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAsB;SAChE,CAAA;QACD,MAAM,OAAO,GAAgB;YAC3B,SAAS,EAAE,UAAU;YACrB,OAAO,EAAE,SAAS;YAClB,cAAc,EAAE,eAAe;SAChC,CAAA;QACD,MAAM,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE;YACjD,eAAe,EAAE,KAAK;YACtB,oEAAoE;YACpE,8DAA8D;YAC9D,MAAM,EAAE,IAAI;SACb,CAAC,CAAA;IACJ,CAAC;IAES,iBAAiB,CAAC,gBAA0B;QACpD,OAAO,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;aACvC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC;aACjC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACpB,OAAO,EAAE,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,CAAC,IAAI,CACpD,QAAQ,CAAC,OAAO,CACjB;YACD,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC,CAAA;IACP,CAAC;IAED,sBAAsB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;QAChD,oEAAoE;QACpE,+EAA+E;QAC/E,qGAAqG;QACrG,IAAI,CAAC,KAAK,WAAW;YAAE,OAAO,CAAC,CAAC,CAAA,CAAC,oFAAoF;QACrH,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC/B,CAAC,CAAA;CACF;AAxCc;IADZ,GAAG;wDAqBH"}
1
+ {"version":3,"file":"packageHelper.js","sourceRoot":"","sources":["../../src/utils/packageHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;;;;;;AAGZ,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAG9D,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAE9D,MAAM,QAAQ,GAAG,IAAI,CAAA;AACrB,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC5C,MAAM,eAAe,GAAG;IACtB,SAAS,EAAE,yCAAyC;CACrD,CAAA;AACD,MAAM,UAAU,GAAG;IACjB,MAAM,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE;CACtD,CAAA;AAID,MAAM,CAAC,OAAO,OAAO,cAAc;IACF,MAAM;IAArC,YAA+B,MAAc;sBAAd,MAAM;IAAW,CAAC;IAGpC,AAAN,KAAK,CAAC,kBAAkB,CAC7B,gBAA0B,EAC1B,GAAa;QAEb,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;QAC5D,MAAM,YAAY,GAAwB;YACxC,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,CAAsB,CAAC;YAClE,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAsB;SAChE,CAAA;QACD,MAAM,OAAO,GAAgB;YAC3B,SAAS,EAAE,UAAU;YACrB,OAAO,EAAE,SAAS;YAClB,cAAc,EAAE,eAAe;SAChC,CAAA;QACD,MAAM,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE;YACjD,eAAe,EAAE,KAAK;YACtB,oEAAoE;YACpE,8DAA8D;YAC9D,MAAM,EAAE,IAAI;SACb,CAAC,CAAA;IACJ,CAAC;IAES,iBAAiB,CAAC,gBAA0B;QACpD,OAAO,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;aACvC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC;aACjC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACpB,OAAO,EAAE,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,CAAC,IAAI,CACpD,QAAQ,CAAC,OAAO,CACjB;YACD,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC,CAAA;IACP,CAAC;IAED,sBAAsB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;QAChD,oEAAoE;QACpE,+EAA+E;QAC/E,qGAAqG;QACrG,IAAI,CAAC,KAAK,WAAW;YAAE,OAAO,CAAC,CAAC,CAAA,CAAC,oFAAoF;QACrH,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC/B,CAAC,CAAA;CACF;AAxCc;IADZ,GAAG;wDAqBH"}
@@ -1 +1 @@
1
- {"version":3,"file":"repoGitDiff.js","sourceRoot":"","sources":["../../src/utils/repoGitDiff.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"repoGitDiff.js","sourceRoot":"","sources":["../../src/utils/repoGitDiff.ts"],"names":[],"mappings":"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"}
@@ -199,5 +199,5 @@
199
199
  ]
200
200
  }
201
201
  },
202
- "version": "6.45.1"
202
+ "version": "7.1.0"
203
203
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sfdx-git-delta",
3
- "version": "6.45.1",
3
+ "version": "7.1.0",
4
4
  "description": "Generate the sfdx content in source format and destructive change from two git commits",
5
5
  "keywords": [
6
6
  "salesforce",
@@ -14,7 +14,7 @@
14
14
  "sf-plugin"
15
15
  ],
16
16
  "engines": {
17
- "node": ">=20"
17
+ "node": ">=22.22.1"
18
18
  },
19
19
  "files": [
20
20
  "/lib",
@@ -48,39 +48,47 @@
48
48
  "access": "public"
49
49
  },
50
50
  "dependencies": {
51
- "@oclif/core": "4.11.11",
52
- "@salesforce/core": "8.31.3",
53
- "@salesforce/sf-plugins-core": "12.2.24",
54
- "@salesforce/source-deploy-retrieve": "12.36.7",
55
- "ignore": "7.0.5",
56
- "tar-stream": "3.2.0",
51
+ "@oclif/core": "4.13.2",
52
+ "@salesforce/core": "^9.1.0",
53
+ "@salesforce/sf-plugins-core": "13.0.0",
54
+ "@salesforce/source-deploy-retrieve": "13.0.1",
55
+ "@scolladon/tsgit": "^3.2.1",
56
+ "ignore": "7.0.6",
57
57
  "txml": "6.0.0",
58
58
  "zod": "4.4.3"
59
59
  },
60
60
  "devDependencies": {
61
- "@biomejs/biome": "2.5.1",
62
- "@commitlint/cli": "21.1.0",
63
- "@commitlint/config-conventional": "21.1.0",
61
+ "@biomejs/biome": "2.5.6",
62
+ "@commitlint/cli": "21.2.1",
63
+ "@commitlint/config-conventional": "21.2.0",
64
64
  "@ls-lint/ls-lint": "2.3.1",
65
- "@oclif/plugin-help": "6.2.52",
66
- "@salesforce/cli-plugins-testkit": "5.3.62",
65
+ "@oclif/plugin-help": "6.2.55",
66
+ "@salesforce/cli-plugins-testkit": "5.3.64",
67
67
  "@salesforce/dev-config": "4.3.3",
68
68
  "@stryker-mutator/core": "9.6.1",
69
69
  "@stryker-mutator/vitest-runner": "9.6.1",
70
- "@types/node": "26.0.1",
71
- "@types/tar-stream": "3.1.4",
72
- "@vitest/coverage-v8": "4.1.9",
70
+ "@types/node": "26.1.2",
71
+ "@vitest/coverage-v8": "4.1.10",
73
72
  "husky": "9.1.7",
74
- "knip": "6.20.0",
75
- "lint-staged": "17.0.8",
76
- "oclif": "4.23.21",
73
+ "knip": "6.31.0",
74
+ "lint-staged": "17.3.0",
75
+ "ls-engines": "0.10.1",
76
+ "oclif": "4.23.29",
77
77
  "shx": "0.4.0",
78
78
  "ts-node": "10.9.2",
79
- "typescript": "6.0.3",
79
+ "typescript": "7.0.2",
80
80
  "validate-branch-name": "1.3.2",
81
- "vitest": "4.1.9",
81
+ "vitest": "4.1.10",
82
82
  "wireit": "0.14.13"
83
83
  },
84
+ "overrides": {
85
+ "@salesforce/source-deploy-retrieve": {
86
+ "minimatch": "^10.1.2"
87
+ },
88
+ "filelist": {
89
+ "minimatch": "^10.1.2"
90
+ }
91
+ },
84
92
  "scripts": {
85
93
  "build": "wireit",
86
94
  "clean": "wireit",
@@ -92,13 +100,14 @@
92
100
  "devops:cleanup:dev-tag:all": "./tooling/devops-cleanup-all.sh",
93
101
  "devops:move-tag": "./tooling/devops-movetag.sh",
94
102
  "lint:dependencies": "wireit",
103
+ "lint:engine": "wireit",
95
104
  "lint:fs": "wireit",
96
105
  "lint": "wireit",
97
106
  "lint:fix": "wireit",
98
107
  "postpack": "shx rm -f oclif.manifest.json && shx sed -i 'blob/v[^/]*/' 'blob/main/' README.md",
99
108
  "prepack": "wireit",
100
109
  "prepare": "husky",
101
- "prepublishOnly": "npm shrinkwrap",
110
+ "prepublishOnly": "shx cp package-lock.json npm-shrinkwrap.json",
102
111
  "sync:registry": "TS_NODE_COMPILER_OPTIONS='{\"rootDir\":\".\"}' node --loader ts-node/esm tooling/syncInternalRegistryWithSdr.ts",
103
112
  "test:build": "wireit",
104
113
  "test:functional": "wireit",
@@ -207,6 +216,14 @@
207
216
  "lint"
208
217
  ]
209
218
  },
219
+ "lint:engine": {
220
+ "command": "ls-engines --no-current --no-dev --mode=virtual",
221
+ "files": [
222
+ "package.json",
223
+ "package-lock.json"
224
+ ],
225
+ "output": []
226
+ },
210
227
  "lint:fs": {
211
228
  "command": "ls-lint",
212
229
  "files": [
@@ -352,8 +369,5 @@
352
369
  "lint"
353
370
  ]
354
371
  }
355
- },
356
- "overrides": {
357
- "qs": "6.15.2"
358
372
  }
359
373
  }
@@ -1,42 +0,0 @@
1
- import { type ChildProcessWithoutNullStreams } from 'node:child_process';
2
- import { type SpawnFn } from './gitBlobReader.js';
3
- type PendingRequest = {
4
- oid: string;
5
- path: string;
6
- allowStreamingEscalation: boolean;
7
- resolve: (buf: Buffer) => void;
8
- reject: (err: unknown) => void;
9
- };
10
- export type GitBatchCatFileOptions = {
11
- sizeThreshold?: number;
12
- spawnFn?: SpawnFn;
13
- };
14
- export declare class GitBatchCatFile {
15
- protected readonly cwd: string;
16
- protected process: ChildProcessWithoutNullStreams;
17
- protected queue: PendingRequest[];
18
- protected chunks: Buffer[];
19
- protected totalLength: number;
20
- protected pendingSize: number;
21
- private readonly sizeThreshold;
22
- private readonly spawnFn;
23
- constructor(cwd: string, options?: GitBatchCatFileOptions);
24
- getContent(oid: string, path: string): Promise<Buffer>;
25
- /**
26
- * Like getContent, but rejects with EscalateToStreamingSignal when the
27
- * blob size (from the git cat-file header) is at or above SIZE_THRESHOLD.
28
- * The subprocess is then recycled so queued reads keep flowing.
29
- */
30
- getContentOrEscalate(oid: string, path: string): Promise<Buffer>;
31
- close(): void;
32
- private _enqueue;
33
- protected _onData(chunk: Buffer): void;
34
- protected _materializeBuffer(): Buffer;
35
- protected _advance(buffer: Buffer, consumed: number): Buffer;
36
- protected _processBuffer(): void;
37
- private _parseHeader;
38
- private _escalateHead;
39
- private _recycleSubprocess;
40
- private _spawnSubprocess;
41
- }
42
- export {};
@@ -1,203 +0,0 @@
1
- 'use strict';
2
- import { spawn } from 'node:child_process';
3
- import { getErrorMessage } from '../utils/errorUtils.js';
4
- import { Logger, lazy } from '../utils/LoggingService.js';
5
- import { EscalateToStreamingSignal, SIZE_THRESHOLD, } from './gitBlobReader.js';
6
- export class GitBatchCatFile {
7
- cwd;
8
- process;
9
- queue = [];
10
- chunks = [];
11
- totalLength = 0;
12
- pendingSize = -1;
13
- sizeThreshold;
14
- spawnFn;
15
- constructor(cwd, options = {}) {
16
- this.cwd = cwd;
17
- this.sizeThreshold = options.sizeThreshold ?? SIZE_THRESHOLD;
18
- this.spawnFn = options.spawnFn ?? spawn;
19
- this.process = this._spawnSubprocess();
20
- }
21
- async getContent(oid, path) {
22
- return this._enqueue(oid, path, false);
23
- }
24
- /**
25
- * Like getContent, but rejects with EscalateToStreamingSignal when the
26
- * blob size (from the git cat-file header) is at or above SIZE_THRESHOLD.
27
- * The subprocess is then recycled so queued reads keep flowing.
28
- */
29
- async getContentOrEscalate(oid, path) {
30
- return this._enqueue(oid, path, true);
31
- }
32
- close() {
33
- if (!this.process.killed) {
34
- this.process.stdin.end();
35
- this.process.kill();
36
- }
37
- for (const entry of this.queue) {
38
- entry.reject(new Error('GitBatchCatFile closed'));
39
- }
40
- this.queue = [];
41
- }
42
- _enqueue(oid, path, allowStreamingEscalation) {
43
- return new Promise((resolve, reject) => {
44
- this.queue.push({
45
- oid,
46
- path,
47
- allowStreamingEscalation,
48
- resolve,
49
- reject,
50
- });
51
- this.process.stdin.write(`${oid}:${path}\n`);
52
- });
53
- }
54
- _onData(chunk) {
55
- this.chunks.push(chunk);
56
- this.totalLength += chunk.length;
57
- this._processBuffer();
58
- }
59
- _materializeBuffer() {
60
- // Stryker disable next-line ConditionalExpression -- equivalent: single-chunk fast path; flipping to false forces a Buffer.concat([oneBuffer], length) which returns the same logical bytes, so observably equivalent
61
- if (this.chunks.length === 1)
62
- return this.chunks[0];
63
- const merged = Buffer.concat(this.chunks, this.totalLength);
64
- // Stryker disable next-line ArrayDeclaration -- equivalent: assignment resets chunks to a single concat'd buffer; injecting a different initial value is overwritten on the next _onData chunk push
65
- this.chunks = [merged];
66
- return merged;
67
- }
68
- _advance(buffer, consumed) {
69
- const rest = buffer.subarray(consumed);
70
- // Stryker disable next-line ConditionalExpression -- equivalent: empty-vs-non-empty rest path; either branch leaves chunks consistent with totalLength=rest.length, and downstream _materializeBuffer concat handles both shapes identically
71
- if (rest.length === 0) {
72
- this.chunks = [];
73
- this.totalLength = 0;
74
- }
75
- else {
76
- this.chunks = [rest];
77
- this.totalLength = rest.length;
78
- }
79
- return rest;
80
- }
81
- _processBuffer() {
82
- let buffer = this._materializeBuffer();
83
- // Stryker disable next-line BlockStatement -- equivalent: the loop is the entirety of header/body parsing; emptying it leaves the queue stuck unprocessed but the unit test surface only awaits resolutions that are already in flight, so the empty-body mutant manifests as a hang detected by stryker as Survived rather than killed cleanly
84
- while (this.queue.length > 0) {
85
- if (this.pendingSize === -1) {
86
- const outcome = this._parseHeader(buffer);
87
- if (outcome === 'need-more-data')
88
- return;
89
- buffer = outcome.remaining;
90
- // Stryker disable next-line ConditionalExpression -- equivalent: the OR-chained reject/escalated continue is a tight loop optimisation; flipping to true continues on every header parse, which is a no-op when the only follow-up is the loop's queue.length re-check
91
- if (outcome.action === 'reject' || outcome.action === 'escalated') {
92
- continue;
93
- }
94
- }
95
- if (buffer.length < this.pendingSize + 1)
96
- return;
97
- const content = Buffer.from(buffer.subarray(0, this.pendingSize));
98
- buffer = this._advance(buffer, this.pendingSize + 1);
99
- this.pendingSize = -1;
100
- this.queue.shift().resolve(content);
101
- }
102
- }
103
- _parseHeader(buffer) {
104
- const newlineIdx = buffer.indexOf(0x0a);
105
- if (newlineIdx === -1)
106
- return 'need-more-data';
107
- const header = buffer.subarray(0, newlineIdx).toString();
108
- const remaining = this._advance(buffer, newlineIdx + 1);
109
- if (header.endsWith('missing')) {
110
- this.queue.shift().reject(new Error(`Object not found: ${header}`));
111
- return { remaining, action: 'reject' };
112
- }
113
- const parts = header.split(' ');
114
- const parsedSize = Number.parseInt(parts[2], 10);
115
- if (Number.isNaN(parsedSize)) {
116
- this.queue.shift().reject(new Error(`Invalid header: ${header}`));
117
- return { remaining, action: 'reject' };
118
- }
119
- const head = this.queue[0];
120
- if (head.allowStreamingEscalation && parsedSize >= this.sizeThreshold) {
121
- this._escalateHead(parsedSize);
122
- return { remaining: Buffer.alloc(0), action: 'escalated' };
123
- }
124
- this.pendingSize = parsedSize;
125
- // Stryker disable next-line StringLiteral -- equivalent: 'await-body' is an internal action token consumed by _processBuffer's outcome.action check; the string only matters for the inverse equality on 'reject'|'escalated' which the await-body branch falls through, so the literal name is unobservable
126
- return { remaining, action: 'await-body' };
127
- }
128
- _escalateHead(size) {
129
- const escalated = this.queue.shift();
130
- escalated.reject(new EscalateToStreamingSignal(size, {
131
- oid: escalated.oid,
132
- path: escalated.path,
133
- }));
134
- const pending = this.queue.splice(0);
135
- this._recycleSubprocess();
136
- for (const request of pending) {
137
- this.queue.push(request);
138
- // Stryker disable next-line StringLiteral -- equivalent: the cat-file --batch protocol terminates each input with a newline; the test surface stubs stdin.write so the literal template is opaque past the call
139
- this.process.stdin.write(`${request.oid}:${request.path}\n`);
140
- }
141
- }
142
- _recycleSubprocess() {
143
- const stale = this.process;
144
- // Detach listeners BEFORE kill: Node may have already queued stdout
145
- // `data` events for bytes read before the escalation header was
146
- // parsed. Those events would still fire on `_onData` and corrupt the
147
- // fresh subprocess's header state via the shared chunks/pendingSize
148
- // fields.
149
- stale.stdout.removeAllListeners('data');
150
- // Stryker disable next-line StringLiteral -- equivalent: 'data' event name on stderr is symmetric with stdout; tests stub the EventEmitter shape so literal name swaps don't change the recycle's observable effect on the next subprocess
151
- stale.stderr.removeAllListeners('data');
152
- // Stryker disable next-line StringLiteral -- equivalent: 'close' event detachment ensures the prior subprocess close doesn't fire on the new process; the test surface verifies the new subprocess handles requests without checking the prior subprocess listener cleanup
153
- stale.removeAllListeners('close');
154
- // Stryker disable next-line StringLiteral -- equivalent: 'error' event detachment is symmetric with the others; the new subprocess installs its own listeners
155
- stale.removeAllListeners('error');
156
- if (!stale.killed) {
157
- // Stryker disable next-line BlockStatement -- equivalent: the try/catch wraps a best-effort stdin.end() during recycle; emptying the body skips the close-stdin path but stale.kill() below still terminates the subprocess
158
- try {
159
- stale.stdin.end();
160
- }
161
- catch {
162
- // ignore broken pipe while recycling
163
- }
164
- stale.kill();
165
- }
166
- this.chunks = [];
167
- this.totalLength = 0;
168
- this.pendingSize = -1;
169
- this.process = this._spawnSubprocess();
170
- }
171
- _spawnSubprocess() {
172
- const child = this.spawnFn('git', ['cat-file', '--batch'], {
173
- cwd: this.cwd,
174
- stdio: ['pipe', 'pipe', 'pipe'],
175
- });
176
- child.stdout.on('data', (chunk) => this._onData(chunk));
177
- // Stryker disable BlockStatement,StringLiteral,ArrowFunction -- equivalent: stderr/error listeners are observability-only; tests assert the protocol contract via stdout, not on the lazy log content
178
- child.stderr.on('data', (chunk) => {
179
- Logger.debug(lazy `GitBatchCatFile stderr: ${() => chunk.toString()}`);
180
- });
181
- child.on('error', (err) => {
182
- Logger.debug(lazy `GitBatchCatFile process error: ${() => getErrorMessage(err)}`);
183
- });
184
- // Stryker restore BlockStatement,StringLiteral,ArrowFunction
185
- child.on('close', (code) => {
186
- // Stryker disable next-line ConditionalExpression -- equivalent: see v8 ignore — the close listener is bound to the active process by construction
187
- /* v8 ignore next -- defensive: the close listener is bound to the active process; only fires for `this.process` in practice */
188
- if (child !== this.process)
189
- return;
190
- // Stryker disable next-line ConditionalExpression,EqualityOperator -- equivalent: the close handler cleans up pending requests on non-zero exit when the queue is non-empty; flipping to true rejects on every close (including the recycle path) but the recycle clears queue first via _escalateHead, and flipping >= 0 is always true (queue.length is always >= 0) — both arms still reject pending entries with the same error
191
- if (code !== 0 && this.queue.length > 0) {
192
- const error = new Error(`git cat-file exited with code ${code}`);
193
- for (const entry of this.queue) {
194
- entry.reject(error);
195
- }
196
- // Stryker disable next-line ArrayDeclaration -- equivalent: queue reset; an injected initial element would be rejected by the next _enqueue or close, neither of which the test surface observes for the synthetic element
197
- this.queue = [];
198
- }
199
- });
200
- return child;
201
- }
202
- }
203
- //# sourceMappingURL=gitBatchCatFile.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"gitBatchCatFile.js","sourceRoot":"","sources":["../../src/adapter/gitBatchCatFile.ts"],"names":[],"mappings":"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"}