@zukhruf/git-hooks 0.3.43 → 0.3.45

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.
package/README.md CHANGED
@@ -83,7 +83,7 @@ await preCommit([
83
83
  ]);
84
84
  ```
85
85
 
86
- The targets run in the order that `run` gives. When a target fails, the commit stops, and the hook shows the reason that the target gave. Put `Format` after `Codegen`, so that the generated files are checked too.
86
+ The targets run in the order that `run` gives. When a target fails, the commit stops, and the hook shows the reason that the target gave. Put `Format` after `Codegen`, so that the generated files are checked too. nx and its tasks get none of the variables that tie git to one repo (see [Where a pre-push build runs](#where-a-pre-push-build-runs)), so a target that runs git in a folder of its own does not change the repo. The hook's own git commands keep these variables, so they read and write the index of the commit.
87
87
 
88
88
  ## Add a step of your own
89
89
 
@@ -191,9 +191,11 @@ build waiting for another pre-push build in this repo
191
191
 
192
192
  ## Where a pre-push build runs
193
193
 
194
- Each pushed commit is built in a snapshot: a copy of the files of that commit in a temporary folder outside the repo. The files come from the object store of git, so the snapshot holds what the commit holds, and nothing that is only in the working tree. A file that `.gitignore` names, such as `.env`, is not in the snapshot.
194
+ Each pushed commit is built in a snapshot: a clone of the repo in a temporary folder outside the repo, with the files of that commit. The hook makes the clone with `git clone --shared --no-checkout`, and then runs `git checkout --detach <sha>` in it. The clone shares the object store of the repo through `objects/info/alternates`, so git copies no objects. The snapshot holds what the commit holds, and nothing that is only in the working tree. A file that `.gitignore` names, such as `.env`, is not in the snapshot. Git writes the files of the commit as in each checkout: it makes the links and the executable files, and it applies `.gitattributes` and the filters of your git config.
195
195
 
196
- nx runs in the snapshot, and git commands in nx work there. The hook sets `GIT_DIR` to the git folder of the repo, `GIT_WORK_TREE` to the snapshot, and `GIT_INDEX_FILE` to a temporary index that it makes from the pushed commit. Thus git sees the snapshot as a clean checkout of that commit, with no changed and no untracked files, and `nx affected --base --head` works.
196
+ nx runs in the snapshot, and git commands in nx work there. The snapshot is a repo of its own, so git sees a clean checkout of the pushed commit, with no changed and no untracked files. `nx affected --base --head` works, because git finds the base commit through the shared object store.
197
+
198
+ nx and its tasks get none of the variables that tie git to one repo, such as `GIT_DIR`, `GIT_WORK_TREE` and `GIT_INDEX_FILE`. The hook removes each variable that `git rev-parse --local-env-vars` lists. Git removes the same list when it runs a command in another repo, such as a submodule. Thus a task that runs `git init` in a temporary folder of its own makes a repo in that folder, and does not change the repo that pushes. Before 0.3.43, the hook gave nx these variables. In sdk-it, a test ran `git init` in a temporary folder, and git wrote `core.worktree` into the config of the real repo. The snapshot was then deleted, so each git command in the repo failed.
197
199
 
198
200
  The snapshot uses the packages that the repo installed when they match the `package-lock.json` of the commit. Then the setup takes about 1 s. A workspace package resolves to its folder in the snapshot, not in the working tree.
199
201
 
@@ -226,7 +228,7 @@ A create or an update also has a `head` and a `base`. The `head` is the local co
226
228
  - When the remote has the `head` already, the `base` is the `head`, and the range is empty.
227
229
  - When the remote has no commit of that history, there is no `base`, and the step must check the whole history.
228
230
 
229
- `push.inSnapshot(sha, work)` runs `work` on the snapshot of one commit. `work` gets the folder of the snapshot and an environment for the tools that it runs there: the git environment above, `NX_DAEMON=false`, and the nx cache of the state folder. `push.nx(sha, ...args)` runs nx in the snapshot of one commit, with the git environment above, and gives its standard output. When nx exits with a code other than 0, it throws.
231
+ `push.inSnapshot(sha, work)` runs `work` on the snapshot of one commit. `work` gets the folder of the snapshot and an environment for the tools that it runs there: the environment of the hook without the variables that tie git to one repo, `NX_DAEMON=false`, and the nx cache of the state folder. `push.nx(sha, ...args)` runs nx in the snapshot of one commit, with that environment, and gives its standard output. When nx exits with a code other than 0, it throws.
230
232
 
231
233
  This step runs the tests of the projects that each pushed range affects:
232
234
 
@@ -1 +1 @@
1
- {"version":3,"file":"commit.d.ts","sourceRoot":"","sources":["../src/commit.ts"],"names":[],"mappings":"AAaA,qBAAa,MAAM;;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAGV,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU;IAMlD,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAc3B,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAYhC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK7B,OAAO,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAOnD,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAU/D,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM7B,KAAK,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBtC,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAiCpC"}
1
+ {"version":3,"file":"commit.d.ts","sourceRoot":"","sources":["../src/commit.ts"],"names":[],"mappings":"AAeA,qBAAa,MAAM;;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAGV,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU;IAMlD,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAc3B,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAYhC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK7B,OAAO,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAOnD,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAU/D,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM7B,KAAK,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBtC,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAiCpC"}
package/dist/commit.js CHANGED
@@ -3,6 +3,7 @@ import { mkdtempDisposable } from 'node:fs/promises';
3
3
  import { tmpdir } from 'node:os';
4
4
  import { join, matchesGlob } from 'node:path';
5
5
  import { promisify } from 'node:util';
6
+ import { withoutRepoVariables } from "./repo-variables.js";
6
7
  const execFileAsync = promisify(execFile);
7
8
  // The staged commit: the index of the repo at `root`. Each read of a staged
8
9
  // file goes to its staged copy, never to the working tree, because other
@@ -59,11 +60,17 @@ export class Commit {
59
60
  await this.#git('add', '--', ...paths);
60
61
  }
61
62
  // Runs the repo's own nx with no daemon, so a hook started from a GUI or an
62
- // agent shell does not leave a daemon behind or read its stale graph.
63
+ // agent shell does not leave a daemon behind or read its stale graph. nx
64
+ // and its tasks get none of git's variables of the repo, so a task that
65
+ // runs git in its own folder never reaches the repo. The git commands of
66
+ // the commit keep them, so they read and write the commit's index.
63
67
  async nx(...args) {
64
68
  const { stdout } = await execFileAsync(join(this.root, 'node_modules/.bin/nx'), args, {
65
69
  cwd: this.root,
66
- env: { ...this.#environment, NX_DAEMON: 'false' },
70
+ env: {
71
+ ...(await withoutRepoVariables(this.#environment)),
72
+ NX_DAEMON: 'false',
73
+ },
67
74
  encoding: 'utf8',
68
75
  maxBuffer: 2 ** 30,
69
76
  });
@@ -1 +1 @@
1
- {"version":3,"file":"commit.js","sourceRoot":"","sources":["../src/commit.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commit.js","sourceRoot":"","sources":["../src/commit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,4EAA4E;AAC5E,yEAAyE;AACzE,6EAA6E;AAC7E,sEAAsE;AACtE,kBAAkB;AAClB,MAAM,OAAO,MAAM;IACR,IAAI,CAAS;IACb,YAAY,CAAoB;IAEzC,YAAY,IAAY,EAAE,WAA8B;QACtD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IAClC,CAAC;IAED,+DAA+D;IAC/D,KAAK,CAAC,MAAM;QACV,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAC5B,MAAM,EACN,UAAU,EACV,aAAa,EACb,oBAAoB,EACpB,IAAI,CACL,CAAC;QACF,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,0EAA0E;IAC1E,2EAA2E;IAC3E,uEAAuE;IACvE,KAAK,CAAC,KAAK;QACT,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,OAAO;aACJ,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC/C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CACxD,CAAC;QACF,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,+BAA+B;IAC/B,IAAI,CAAC,IAAY;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,kEAAkE;IAClE,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,wEAAwE;IACxE,yEAAyE;IACzE,KAAK,CAAC,UAAU,CAAI,IAAoC;QACtD,YAAY,QAAQ,GAAG,MAAM,iBAAiB,CAC5C,IAAI,CAAC,MAAM,EAAE,EAAE,YAAY,CAAC,CAC7B,CAAC;QACF,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,YAAY,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC;QACzE,uDAAuD;QACvD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,0EAA0E;IAC1E,KAAK,CAAC,QAAQ;QACZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;QAC5D,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,4EAA4E;IAC5E,KAAK,CAAC,KAAK,CAAC,KAAwB;QAClC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC;IACzC,CAAC;IAED,4EAA4E;IAC5E,yEAAyE;IACzE,wEAAwE;IACxE,yEAAyE;IACzE,mEAAmE;IACnE,KAAK,CAAC,EAAE,CAAC,GAAG,IAAc;QACxB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CACpC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,sBAAsB,CAAC,EACvC,IAAI,EACJ;YACE,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,GAAG,EAAE;gBACH,GAAG,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAClD,SAAS,EAAE,OAAO;aACnB;YACD,QAAQ,EAAE,MAAM;YAChB,SAAS,EAAE,CAAC,IAAI,EAAE;SACnB,CACF,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,wEAAwE;IACxE,8EAA8E;IAC9E,KAAK,CAAC,QAAQ;QACZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAC1B,MAAM,EACN,UAAU,EACV,YAAY,EACZ,WAAW,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAC7B,QAAQ,CACT,CAAC;QACF,MAAM,QAAQ,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7C,IACE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YACxB,CAAC,QAAQ,CAAC,KAAK,CACb,CAAC,OAAO,EAAqB,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ,CAC5D;YAED,MAAM,IAAI,SAAS,CACjB,yBAAyB,MAAM,CAAC,IAAI,EAAE,uBAAuB,CAC9D,CAAC;QACJ,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAG,IAAc;QAC1B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE;YAClD,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,GAAG,EAAE,IAAI,CAAC,YAAY;YACtB,QAAQ,EAAE,MAAM;YAChB,0DAA0D;YAC1D,SAAS,EAAE,CAAC,IAAI,EAAE;SACnB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
@@ -1 +1 @@
1
- {"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../src/push.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,SAAS,EAAkB,MAAM,iBAAiB,CAAC;AASjE,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;gBAET,GAAG,EAAE,MAAM;CAKxB;AAED,UAAU,WAAW;IAEnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC;IAExC,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAEjE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C;AAKD,qBAAa,IAAI;;IACf,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,QAAQ,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,CAAC;IAKvC,OAAO;WAWM,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAchD,UAAU,CAAC,CAAC,EAChB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,GACnE,OAAO,CAAC,CAAC,CAAC;IA6Db,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAcpD"}
1
+ {"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../src/push.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,SAAS,EAAkB,MAAM,iBAAiB,CAAC;AASjE,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;gBAET,GAAG,EAAE,MAAM;CAKxB;AAED,UAAU,WAAW;IAEnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC;IAExC,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAEjE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C;AAKD,qBAAa,IAAI;;IACf,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,QAAQ,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,CAAC;IAKvC,OAAO;WAWM,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBhD,UAAU,CAAC,CAAC,EAChB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,GACnE,OAAO,CAAC,CAAC,CAAC;IA2Db,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAcpD"}
package/dist/push.js CHANGED
@@ -7,7 +7,7 @@ import { setTimeout as delay } from 'node:timers/promises';
7
7
  import { promisify } from 'node:util';
8
8
  import { FileLock } from '@zukhruf/fs';
9
9
  import { readRefUpdates } from "./ref-update.js";
10
- import { writeCommitFiles } from "./snapshot/commit-files.js";
10
+ import { withoutRepoVariables } from "./repo-variables.js";
11
11
  import { hasInstallDrift } from "./snapshot/drift.js";
12
12
  import { installFor } from "./snapshot/installs.js";
13
13
  import { runNx } from "./snapshot/nx.js";
@@ -41,11 +41,14 @@ export class Push {
41
41
  const git = (...args) => gitIn(options.root, options.environment, ...args);
42
42
  return new Push(options, await readRefUpdates(git, options.remote.name, options.input));
43
43
  }
44
- // Runs `work` on the snapshot of one commit: its files in a temporary
45
- // folder, with a node_modules that a build can use. `environment` makes git
46
- // see a clean checkout of the commit there, and holds the nx cache of the
47
- // state folder. One snapshot is open at a time in a repo; the snapshot is
48
- // deleted after `work`.
44
+ // Runs `work` on the snapshot of one commit: a clone of the repo in a
45
+ // temporary folder with a checkout of the commit, and a node_modules that a
46
+ // build can use. The clone shares the objects of the repo, so it copies
47
+ // none, and git commands in it see a clean checkout of the commit. The
48
+ // environment has none of git's variables of the repo, so a tool that runs
49
+ // git in another folder never reaches the repo, and it holds the nx cache of
50
+ // the state folder. One snapshot is open at a time in a repo; the snapshot
51
+ // is deleted after `work`.
49
52
  async inSnapshot(sha, work) {
50
53
  const state = join((await this.#git('rev-parse', '--path-format=absolute', '--git-common-dir')).trim(), 'git-hooks');
51
54
  await mkdir(state, { recursive: true });
@@ -56,9 +59,10 @@ export class Push {
56
59
  await delay(200);
57
60
  }
58
61
  await using temporary = await mkdtempDisposable(join(tmpdir(), 'git-hooks-push-'));
59
- const top = await realpath(temporary.path);
60
- const folder = join(top, 'tree');
61
- await writeCommitFiles((...args) => this.#git(...args), { cwd: this.#root, env: this.#environment }, sha, folder);
62
+ const folder = join(await realpath(temporary.path), 'tree');
63
+ const isolated = await withoutRepoVariables(this.#environment);
64
+ await gitIn(temporary.path, isolated, 'clone', '--shared', '--no-checkout', '--quiet', this.#root, folder);
65
+ await gitIn(folder, isolated, 'checkout', '--detach', '--quiet', sha);
62
66
  if (!existsSync(join(folder, 'package-lock.json')))
63
67
  throw new MissingLockfileError(sha);
64
68
  const installed = (await hasInstallDrift(join(folder, 'package-lock.json'), join(this.#root, 'node_modules/.package-lock.json')))
@@ -67,18 +71,11 @@ export class Push {
67
71
  await linkPackages(installed, folder);
68
72
  const cache = join(state, 'nx');
69
73
  const environment = {
70
- ...this.#environment,
71
- GIT_DIR: (await this.#git('rev-parse', '--absolute-git-dir')).trim(),
72
- GIT_WORK_TREE: folder,
73
- GIT_INDEX_FILE: join(top, 'index'),
74
+ ...isolated,
74
75
  NX_DAEMON: 'false',
75
76
  NX_CACHE_DIRECTORY: cache,
76
77
  NX_WORKSPACE_DATA_DIRECTORY: join(cache, 'workspace-data'),
77
78
  };
78
- // A temporary index of the commit, refreshed against the snapshot, so git
79
- // finds no changed and no untracked files.
80
- await gitIn(folder, environment, 'read-tree', sha);
81
- await gitIn(folder, environment, 'update-index', '-q', '--refresh');
82
79
  // Awaited here, so the snapshot and the lock stay until `work` ends.
83
80
  return await work(folder, environment);
84
81
  }
package/dist/push.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"push.js","sourceRoot":"","sources":["../src/push.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"push.js","sourceRoot":"","sources":["../src/push.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export declare function withoutRepoVariables(environment: NodeJS.ProcessEnv): Promise<NodeJS.ProcessEnv>;
2
+ //# sourceMappingURL=repo-variables.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"repo-variables.d.ts","sourceRoot":"","sources":["../src/repo-variables.ts"],"names":[],"mappings":"AAYA,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,CAAC,UAAU,GAC7B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAU5B"}
@@ -0,0 +1,16 @@
1
+ import { execFile } from 'node:child_process';
2
+ import { promisify } from 'node:util';
3
+ const execFileAsync = promisify(execFile);
4
+ // The environment without the variables that tie git to one repo, such as
5
+ // GIT_DIR, GIT_WORK_TREE and GIT_INDEX_FILE. A hook gets some of them from
6
+ // git, and a tool that the hook starts, such as nx and its tasks, must not
7
+ // get them: a task that runs `git init` in its own temp folder would then
8
+ // write to the repo of the hook. Git gives the list with
9
+ // `git rev-parse --local-env-vars`, and clears the same list when it runs a
10
+ // command in another repo, such as a submodule.
11
+ export async function withoutRepoVariables(environment) {
12
+ const { stdout } = await execFileAsync('git', ['rev-parse', '--local-env-vars'], { env: environment, encoding: 'utf8' });
13
+ const names = new Set(stdout.split('\n'));
14
+ return Object.fromEntries(Object.entries(environment).filter(([name]) => !names.has(name)));
15
+ }
16
+ //# sourceMappingURL=repo-variables.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"repo-variables.js","sourceRoot":"","sources":["../src/repo-variables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,0EAA0E;AAC1E,2EAA2E;AAC3E,2EAA2E;AAC3E,0EAA0E;AAC1E,yDAAyD;AACzD,4EAA4E;AAC5E,gDAAgD;AAChD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,WAA8B;IAE9B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CACpC,KAAK,EACL,CAAC,WAAW,EAAE,kBAAkB,CAAC,EACjC,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,CACvC,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CACjE,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zukhruf/git-hooks",
3
- "version": "0.3.43",
3
+ "version": "0.3.45",
4
4
  "description": "Git hooks written in TypeScript. A pre-commit hook runs steps in order against the staged commit: it checks the staged copy of each file with Prettier and changes nothing, runs nx sync and stages only the files that sync wrote, and builds generated files when nx says their projects are affected. A repo adds a step of its own as a class.",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -43,7 +43,7 @@
43
43
  "access": "public"
44
44
  },
45
45
  "dependencies": {
46
- "@zukhruf/fs": "^0.3.43"
46
+ "@zukhruf/fs": "^0.3.45"
47
47
  },
48
48
  "peerDependencies": {
49
49
  "nx": ">=21.0.0",
@@ -55,6 +55,7 @@
55
55
  }
56
56
  },
57
57
  "devDependencies": {
58
+ "@zukhruf/testing": "^0.3.45",
58
59
  "prettier": "^3.9.9"
59
60
  }
60
61
  }
@@ -1,5 +0,0 @@
1
- export declare function writeCommitFiles(git: (...args: string[]) => Promise<string>, gitOptions: {
2
- cwd: string;
3
- env: NodeJS.ProcessEnv;
4
- }, sha: string, folder: string): Promise<void>;
5
- //# sourceMappingURL=commit-files.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"commit-files.d.ts","sourceRoot":"","sources":["../../src/snapshot/commit-files.ts"],"names":[],"mappings":"AAgBA,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,EAC3C,UAAU,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;CAAE,EACnD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAqDf"}
@@ -1,101 +0,0 @@
1
- import { spawn } from 'node:child_process';
2
- import { once } from 'node:events';
3
- import { chmod, mkdir, stat, symlink, writeFile } from 'node:fs/promises';
4
- import { dirname, join, resolve } from 'node:path';
5
- // Writes the files of one commit into an empty folder, from the object store:
6
- // `git ls-tree` names them and one `git cat-file --batch` gives their content.
7
- // No filter applies (no autocrlf, no smudge, no LFS), and `export-ignore` does
8
- // not apply. A submodule is not a file, so it is not written.
9
- export async function writeCommitFiles(git, gitOptions, sha, folder) {
10
- const blobs = (await git('ls-tree', '-r', '-z', '--full-tree', sha))
11
- .split('\0')
12
- .filter((line) => line !== '')
13
- .map((line) => {
14
- const tab = line.indexOf('\t');
15
- const [mode = '', type = '', object = ''] = line.slice(0, tab).split(' ');
16
- return { mode, type, object, path: line.slice(tab + 1) };
17
- })
18
- .filter(({ type }) => type === 'blob');
19
- const catFile = spawn('git', ['cat-file', '--batch'], {
20
- ...gitOptions,
21
- stdio: ['pipe', 'pipe', 'inherit'],
22
- });
23
- const exited = once(catFile, 'close');
24
- catFile.stdin.end(blobs.map(({ object }) => `${object}\n`).join(''));
25
- const records = new Records(catFile.stdout);
26
- const links = [];
27
- for (const blob of blobs) {
28
- const header = (await records.line()).split(' ');
29
- const size = Number(header[2]);
30
- if (header[1] !== 'blob' || !Number.isInteger(size))
31
- throw new Error(`git cat-file gave "${header.join(' ')}" for ${blob.path}`);
32
- const content = await records.bytes(size + 1);
33
- const path = join(folder, blob.path);
34
- await mkdir(dirname(path), { recursive: true });
35
- if (blob.mode === '120000')
36
- links.push({ blob, target: content.subarray(0, size).toString() });
37
- else {
38
- await writeFile(path, content.subarray(0, size));
39
- if (blob.mode === '100755')
40
- await chmod(path, 0o755);
41
- }
42
- }
43
- await exited;
44
- // The files come first: on Windows, a link becomes a junction when its
45
- // target is a folder of the commit, or else a text file that holds the
46
- // target, as git does with core.symlinks=false.
47
- for (const { blob, target } of links) {
48
- const path = join(folder, blob.path);
49
- if (process.platform !== 'win32')
50
- await symlink(target, path);
51
- else {
52
- const absolute = resolve(dirname(path), target);
53
- const isFolder = await stat(absolute).then((stats) => stats.isDirectory(), () => false);
54
- if (isFolder)
55
- await symlink(absolute, path, 'junction');
56
- else
57
- await writeFile(path, target);
58
- }
59
- }
60
- }
61
- // Reads the records of `git cat-file --batch`: a header line, then the
62
- // content and a newline.
63
- class Records {
64
- #chunks;
65
- #buffer = Buffer.alloc(0);
66
- constructor(stream) {
67
- this.#chunks = stream[Symbol.asyncIterator]();
68
- }
69
- async line() {
70
- let end = this.#buffer.indexOf(0x0a);
71
- while (end === -1) {
72
- this.#buffer = Buffer.concat([this.#buffer, await this.#next()]);
73
- end = this.#buffer.indexOf(0x0a);
74
- }
75
- const line = this.#buffer.subarray(0, end).toString();
76
- this.#buffer = this.#buffer.subarray(end + 1);
77
- return line;
78
- }
79
- async bytes(count) {
80
- if (this.#buffer.length < count) {
81
- const parts = [this.#buffer];
82
- let length = this.#buffer.length;
83
- while (length < count) {
84
- const chunk = await this.#next();
85
- parts.push(chunk);
86
- length += chunk.length;
87
- }
88
- this.#buffer = Buffer.concat(parts, length);
89
- }
90
- const bytes = this.#buffer.subarray(0, count);
91
- this.#buffer = this.#buffer.subarray(count);
92
- return bytes;
93
- }
94
- async #next() {
95
- const { done, value } = await this.#chunks.next();
96
- if (done === true)
97
- throw new Error('git cat-file ended before it gave each file');
98
- return Buffer.isBuffer(value) ? value : Buffer.from(String(value));
99
- }
100
- }
101
- //# sourceMappingURL=commit-files.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"commit-files.js","sourceRoot":"","sources":["../../src/snapshot/commit-files.ts"],"names":[],"mappings":"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"}