From e45d3b1d87be50492f2b7b3992b3870fad24e3cf Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Tue, 2 Aug 2022 08:08:02 +0300
Subject: [PATCH 01/12] assert: add assert.Snapshot

---
 doc/api/assert.md                             |  28 ++++
 doc/api/errors.md                             |   7 +
 lib/assert.js                                 |   3 +
 lib/internal/assert/snapshot.js               | 123 ++++++++++++++++
 lib/internal/errors.js                        |   2 +
 test/fixtures/assert-snapshot/basic.mjs       |   4 +
 test/fixtures/assert-snapshot/basic.snapshot  |   5 +
 test/fixtures/assert-snapshot/named.mjs       |   4 +
 test/fixtures/assert-snapshot/named.snapshot  |   5 +
 .../assert-snapshot/non-existing-name.mjs     |   4 +
 .../non-existing-name.snapshot                |   5 +
 test/fixtures/assert-snapshot/random.mjs      |  11 ++
 test/fixtures/assert-snapshot/random.snapshot |   5 +
 test/fixtures/assert-snapshot/same-name.mjs   |   4 +
 test/fixtures/assert-snapshot/serialize.mjs   |   9 ++
 .../assert-snapshot/serialize.snapshot        |   5 +
 test/fixtures/assert-snapshot/single.mjs      |   3 +
 test/fixtures/assert-snapshot/single.snapshot |   2 +
 .../assert-snapshot/value-changed.mjs         |   3 +
 .../assert-snapshot/value-changed.snapshot    |   2 +
 test/parallel/test-assert-snapshot.mjs        | 136 ++++++++++++++++++
 21 files changed, 370 insertions(+)
 create mode 100644 lib/internal/assert/snapshot.js
 create mode 100644 test/fixtures/assert-snapshot/basic.mjs
 create mode 100644 test/fixtures/assert-snapshot/basic.snapshot
 create mode 100644 test/fixtures/assert-snapshot/named.mjs
 create mode 100644 test/fixtures/assert-snapshot/named.snapshot
 create mode 100644 test/fixtures/assert-snapshot/non-existing-name.mjs
 create mode 100644 test/fixtures/assert-snapshot/non-existing-name.snapshot
 create mode 100644 test/fixtures/assert-snapshot/random.mjs
 create mode 100644 test/fixtures/assert-snapshot/random.snapshot
 create mode 100644 test/fixtures/assert-snapshot/same-name.mjs
 create mode 100644 test/fixtures/assert-snapshot/serialize.mjs
 create mode 100644 test/fixtures/assert-snapshot/serialize.snapshot
 create mode 100644 test/fixtures/assert-snapshot/single.mjs
 create mode 100644 test/fixtures/assert-snapshot/single.snapshot
 create mode 100644 test/fixtures/assert-snapshot/value-changed.mjs
 create mode 100644 test/fixtures/assert-snapshot/value-changed.snapshot
 create mode 100644 test/parallel/test-assert-snapshot.mjs

diff --git a/doc/api/assert.md b/doc/api/assert.md
index 4958e6dd7df474..8a2c4b63db54ba 100644
--- a/doc/api/assert.md
+++ b/doc/api/assert.md
@@ -2006,6 +2006,34 @@ argument, then `error` is assumed to be omitted and the string will be used for
 example in [`assert.throws()`][] carefully if using a string as the second
 argument gets considered.
 
+## `assert.snapshot(value[, name])`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+* `value` {string} the value to snapshot
+* `name` {string} the name of snapshot.
+  in case order of snapshots is non-deterministic,
+  it is recommended to use named snapshots
+  **Default:** ordinal number of the snapshot.
+* Returns: {Promise}
+
+reads a snapshot from a file, and compares `value` to the snapshot.
+If the value is not strictly equal to the snapshot,
+`assert.snapshot()` will return a rejected `Promise`
+with an [`AssertionError`][].
+
+If the snapshot file does not exist, the snapshot is written.
+
+In case it is needed to force a snapshot update,
+set `process.env.NODE_UPDATE_SNAPSHOT=1`;
+
+By default, a snapshot is read and written to a file,
+using the same name as the main entrypoint with `.snapshot` as the extension.
+
 ## `assert.strictEqual(actual, expected[, message])`
 
 <!-- YAML
diff --git a/doc/api/errors.md b/doc/api/errors.md
index e1c2810e1efd0c..4c544ef734776e 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -705,6 +705,13 @@ A special type of error that can be triggered whenever Node.js detects an
 exceptional logic violation that should never occur. These are raised typically
 by the `node:assert` module.
 
+<a id="ERR_ASSERT_SNAPSHOT_NOT_SUPPORTED"></a>
+
+### `ERR_ASSERT_SNAPSHOT_NOT_SUPPORTED`
+
+An attempt was made to use `assert.snapshot()` in an environment that
+does not support snapshots, such as the REPL, or when using `node --eval`.
+
 <a id="ERR_ASYNC_CALLBACK"></a>
 
 ### `ERR_ASYNC_CALLBACK`
diff --git a/lib/assert.js b/lib/assert.js
index 82c3a285f51abd..8a28bcde136d6f 100644
--- a/lib/assert.js
+++ b/lib/assert.js
@@ -1052,6 +1052,9 @@ assert.doesNotMatch = function doesNotMatch(string, regexp, message) {
 
 assert.CallTracker = CallTracker;
 
+const snapshot = require('internal/assert/snapshot');
+assert.snapshot = snapshot;
+
 /**
  * Expose a strict only variant of assert.
  * @param {...any} args
diff --git a/lib/internal/assert/snapshot.js b/lib/internal/assert/snapshot.js
new file mode 100644
index 00000000000000..48cff2809e53b3
--- /dev/null
+++ b/lib/internal/assert/snapshot.js
@@ -0,0 +1,123 @@
+'use strict';
+
+const {
+  ArrayPrototypeMap,
+  Boolean,
+  SafeMap,
+  SafeSet,
+  StringPrototypeIndexOf,
+  StringPrototypeSlice,
+  StringPrototypeSplit,
+  StringPrototypeReplace,
+  Symbol,
+} = primordials;
+
+const { codes: { ERR_ASSERT_SNAPSHOT_NOT_SUPPORTED } } = require('internal/errors');
+const AssertionError = require('internal/assert/assertion_error');
+const { inspect } = require('internal/util/inspect');
+const { once } = require('events');
+const { createReadStream, createWriteStream } = require('fs');
+const path = require('path');
+const assert = require('assert');
+
+const kUpdateSnapshot = Boolean(process.env.NODE_UPDATE_SNAPSHOT);
+const kInitialSnapshot = Symbol('kInitialSnapshot');
+const kDefaultDelimiter = '\n#*#*#*$#*#*#*#*#*#*$#*#*#\n';
+
+function defaultSnapshotPath() {
+  if (process.mainModule) {
+    const { dir, name } = path.parse(process.mainModule.filename);
+    return path.join(dir, `${name}.snapshot`);
+  }
+  if (!process.argv[1]) {
+    throw new ERR_ASSERT_SNAPSHOT_NOT_SUPPORTED();
+  }
+  const { dir, name } = path.parse(process.argv[1]);
+  return path.join(dir, `${name}.snapshot`);
+}
+
+let _source;
+function lazySource() {
+  _source = _source ?? createReadStream(defaultSnapshotPath(), { encoding: 'utf8' });
+  return _source;
+}
+
+let _target;
+function lazyTarget() {
+  _target = _target ?? createWriteStream(defaultSnapshotPath(), { encoding: 'utf8' });
+  return _target;
+}
+
+function serializeName(name) {
+  return StringPrototypeReplace(`${name}`, /:\n/g, '_');
+}
+
+let writtenNames;
+let snapshotValue;
+let counter = 0;
+
+async function writeSnapshot({ name, value }) {
+  const target = lazyTarget();
+  if (counter > 1) {
+    target.write(kDefaultDelimiter);
+  }
+  writtenNames = writtenNames || new SafeSet();
+  if (writtenNames.has(name)) {
+    throw new AssertionError({ message: `Snapshot "${name}" already used` });
+  }
+  writtenNames.add(name);
+  const drained = target.write(`${name}:\n${value}`);
+  await drained || once(target, 'drain');
+}
+
+async function getSnapshot() {
+  const source = lazySource();
+  if (snapshotValue !== undefined) {
+    return snapshotValue;
+  }
+  if (kUpdateSnapshot) {
+    snapshotValue = kInitialSnapshot;
+    return kInitialSnapshot;
+  }
+  try {
+    let data = '';
+    for await (const line of source) {
+      data += line;
+    }
+    snapshotValue = new SafeMap(
+      ArrayPrototypeMap(
+        StringPrototypeSplit(data, kDefaultDelimiter),
+        (item) => {
+          const keyDelimiter = StringPrototypeIndexOf(item, ':\n');
+          return [StringPrototypeSlice(item, 0, keyDelimiter), StringPrototypeSlice(item, keyDelimiter + 2)];
+        }
+      ));
+  } catch (e) {
+    if (e.code === 'ENOENT') {
+      snapshotValue = kInitialSnapshot;
+    } else {
+      throw e;
+    }
+  }
+  return snapshotValue;
+}
+
+
+async function snapshot(input, name) {
+  const snapshot = await getSnapshot();
+  counter = counter + 1;
+  name = serializeName(name ?? counter);
+
+  const value = inspect(input);
+  if (snapshot === kInitialSnapshot) {
+    await writeSnapshot({ name, value });
+  } else if (snapshot.has(name)) {
+    const expected = snapshot.get(name);
+    // eslint-disable-next-line no-restricted-syntax
+    assert.strictEqual(value, expected);
+  } else {
+    throw new AssertionError({ message: `Snapshot "${name}" does not exist` });
+  }
+}
+
+module.exports = snapshot;
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index df079d2952b47e..c780575266d6a7 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -936,6 +936,8 @@ module.exports = {
 E('ERR_AMBIGUOUS_ARGUMENT', 'The "%s" argument is ambiguous. %s', TypeError);
 E('ERR_ARG_NOT_ITERABLE', '%s must be iterable', TypeError);
 E('ERR_ASSERTION', '%s', Error);
+E('ERR_ASSERT_SNAPSHOT_NOT_SUPPORTED',
+  'Snapshot is not supported in this context ', TypeError);
 E('ERR_ASYNC_CALLBACK', '%s must be a function', TypeError);
 E('ERR_ASYNC_TYPE', 'Invalid name for async "type": %s', TypeError);
 E('ERR_BROTLI_INVALID_PARAM', '%s is not a valid Brotli parameter', RangeError);
diff --git a/test/fixtures/assert-snapshot/basic.mjs b/test/fixtures/assert-snapshot/basic.mjs
new file mode 100644
index 00000000000000..e9911db0b363a9
--- /dev/null
+++ b/test/fixtures/assert-snapshot/basic.mjs
@@ -0,0 +1,4 @@
+import assert from 'node:assert';
+
+await assert.snapshot("test");
+await assert.snapshot("test");
diff --git a/test/fixtures/assert-snapshot/basic.snapshot b/test/fixtures/assert-snapshot/basic.snapshot
new file mode 100644
index 00000000000000..f13ac4fb70d8b3
--- /dev/null
+++ b/test/fixtures/assert-snapshot/basic.snapshot
@@ -0,0 +1,5 @@
+1:
+'test'
+#*#*#*$#*#*#*#*#*#*$#*#*#
+2:
+'test'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/named.mjs b/test/fixtures/assert-snapshot/named.mjs
new file mode 100644
index 00000000000000..efb1e9ace51410
--- /dev/null
+++ b/test/fixtures/assert-snapshot/named.mjs
@@ -0,0 +1,4 @@
+import assert from 'node:assert';
+
+await assert.snapshot("test", "name");
+await assert.snapshot("test", "another name");
diff --git a/test/fixtures/assert-snapshot/named.snapshot b/test/fixtures/assert-snapshot/named.snapshot
new file mode 100644
index 00000000000000..aa449159e247cb
--- /dev/null
+++ b/test/fixtures/assert-snapshot/named.snapshot
@@ -0,0 +1,5 @@
+name:
+'test'
+#*#*#*$#*#*#*#*#*#*$#*#*#
+another name:
+'test'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/non-existing-name.mjs b/test/fixtures/assert-snapshot/non-existing-name.mjs
new file mode 100644
index 00000000000000..f98ec61c37be76
--- /dev/null
+++ b/test/fixtures/assert-snapshot/non-existing-name.mjs
@@ -0,0 +1,4 @@
+import assert from 'node:assert';
+
+await assert.snapshot("test", "another name");
+await assert.snapshot("test", "non existing");
diff --git a/test/fixtures/assert-snapshot/non-existing-name.snapshot b/test/fixtures/assert-snapshot/non-existing-name.snapshot
new file mode 100644
index 00000000000000..c3c303680d41ec
--- /dev/null
+++ b/test/fixtures/assert-snapshot/non-existing-name.snapshot
@@ -0,0 +1,5 @@
+another name:
+'test'
+#*#*#*$#*#*#*#*#*#*$#*#*#
+name:
+'test'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/random.mjs b/test/fixtures/assert-snapshot/random.mjs
new file mode 100644
index 00000000000000..a911e120830974
--- /dev/null
+++ b/test/fixtures/assert-snapshot/random.mjs
@@ -0,0 +1,11 @@
+import assert from 'node:assert';
+
+function random() {
+  return `Random Value: ${Math.random()}`;
+}
+function transform(value) {
+  return value.replaceAll(/Random Value: \d+\.+\d+/g, 'Random Value: *');
+}
+
+await assert.snapshot(transform(random()));
+await assert.snapshot(transform(random()));
diff --git a/test/fixtures/assert-snapshot/random.snapshot b/test/fixtures/assert-snapshot/random.snapshot
new file mode 100644
index 00000000000000..976dbad0115273
--- /dev/null
+++ b/test/fixtures/assert-snapshot/random.snapshot
@@ -0,0 +1,5 @@
+1:
+'Random Value: *'
+#*#*#*$#*#*#*#*#*#*$#*#*#
+2:
+'Random Value: *'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/same-name.mjs b/test/fixtures/assert-snapshot/same-name.mjs
new file mode 100644
index 00000000000000..f0ffcfd15aad1f
--- /dev/null
+++ b/test/fixtures/assert-snapshot/same-name.mjs
@@ -0,0 +1,4 @@
+import assert from 'node:assert';
+
+await assert.snapshot("test", "name");
+await assert.snapshot("test", "name");
diff --git a/test/fixtures/assert-snapshot/serialize.mjs b/test/fixtures/assert-snapshot/serialize.mjs
new file mode 100644
index 00000000000000..43ded300fb764a
--- /dev/null
+++ b/test/fixtures/assert-snapshot/serialize.mjs
@@ -0,0 +1,9 @@
+import assert from 'node:assert';
+
+function fn() {
+  this.should.be.a.fn();
+  return false;
+}
+
+await assert.snapshot(fn);
+await assert.snapshot({ foo: "bar" });
diff --git a/test/fixtures/assert-snapshot/serialize.snapshot b/test/fixtures/assert-snapshot/serialize.snapshot
new file mode 100644
index 00000000000000..b1ab0b7dd3f520
--- /dev/null
+++ b/test/fixtures/assert-snapshot/serialize.snapshot
@@ -0,0 +1,5 @@
+1:
+[Function: fn]
+#*#*#*$#*#*#*#*#*#*$#*#*#
+2:
+{ foo: 'bar' }
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/single.mjs b/test/fixtures/assert-snapshot/single.mjs
new file mode 100644
index 00000000000000..9b9e7a4eaab0a0
--- /dev/null
+++ b/test/fixtures/assert-snapshot/single.mjs
@@ -0,0 +1,3 @@
+import assert from 'node:assert';
+
+await assert.snapshot("test");
diff --git a/test/fixtures/assert-snapshot/single.snapshot b/test/fixtures/assert-snapshot/single.snapshot
new file mode 100644
index 00000000000000..53430451fb51db
--- /dev/null
+++ b/test/fixtures/assert-snapshot/single.snapshot
@@ -0,0 +1,2 @@
+1:
+'test'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/value-changed.mjs b/test/fixtures/assert-snapshot/value-changed.mjs
new file mode 100644
index 00000000000000..032d068b970528
--- /dev/null
+++ b/test/fixtures/assert-snapshot/value-changed.mjs
@@ -0,0 +1,3 @@
+import assert from 'node:assert';
+
+await assert.snapshot("changed");
diff --git a/test/fixtures/assert-snapshot/value-changed.snapshot b/test/fixtures/assert-snapshot/value-changed.snapshot
new file mode 100644
index 00000000000000..c9e807eac5da8d
--- /dev/null
+++ b/test/fixtures/assert-snapshot/value-changed.snapshot
@@ -0,0 +1,2 @@
+1:
+'original'
\ No newline at end of file
diff --git a/test/parallel/test-assert-snapshot.mjs b/test/parallel/test-assert-snapshot.mjs
new file mode 100644
index 00000000000000..438bf1d0f41e25
--- /dev/null
+++ b/test/parallel/test-assert-snapshot.mjs
@@ -0,0 +1,136 @@
+import { spawnPromisified } from '../common/index.mjs';
+import * as fixtures from '../common/fixtures.mjs';
+import tmpdir from '../common/tmpdir.js';
+import assert from 'node:assert';
+import path from 'node:path';
+import { execPath } from 'node:process';
+import { writeFile, readFile } from 'node:fs/promises';
+import { describe, it } from 'node:test';
+
+tmpdir.refresh();
+
+function getSnapshotPath(filename) {
+  const { name, dir } = path.parse(filename);
+  return path.join(tmpdir.path, dir, `${name}.snapshot`);
+}
+
+async function spawnTmpfile(content = '', filename, env) {
+  const header = filename.endsWith('.mjs') ?
+    'import assert from \'node:assert\';' :
+    'const assert = require(\'node:assert\');';
+  await writeFile(path.join(tmpdir.path, filename), `${header}\n${content}`);
+  const { stdout, stderr, code } = await spawnPromisified(
+    execPath,
+    ['--no-warnings', filename],
+    { cwd: tmpdir.path, env });
+
+  const snapshotPath = getSnapshotPath(filename);
+  const snapshot = await readFile(snapshotPath, 'utf8').catch((err) => err);
+  return { stdout, stderr, code, snapshot, snapshotPath, filename };
+}
+
+async function spawnFixture(filename) {
+  const { dir, base, name } = path.parse(filename);
+  const { stdout, stderr, code } = await spawnPromisified(execPath, ['--no-warnings', base], { cwd: dir });
+
+  const snapshotPath = path.join(dir, `${name}.snapshot`);
+  const snapshot = await readFile(snapshotPath, 'utf8').catch((err) => err);
+  return { stdout, stderr, code, snapshot, snapshotPath };
+}
+
+describe('assert.snapshot', { concurrency: true }, () => {
+  it('should write snapshot', async () => {
+    const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/basic.mjs'));
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(code, 0);
+    assert.strictEqual(snapshot, '1:\n\'test\'\n#*#*#*$#*#*#*#*#*#*$#*#*#\n2:\n\'test\'');
+  });
+
+  it('should accept named snapshots', async () => {
+    const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/named.mjs'));
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(code, 0);
+    assert.strictEqual(snapshot, 'name:\n\'test\'\n#*#*#*$#*#*#*#*#*#*$#*#*#\nanother name:\n\'test\'');
+  });
+
+  it('should succeed running multiple times', async () => {
+    let result = await spawnFixture(fixtures.path('assert-snapshot/single.mjs'));
+    assert.strictEqual(result.stderr, '');
+    assert.strictEqual(result.code, 0);
+    assert.strictEqual(result.snapshot, '1:\n\'test\'');
+
+    result = await spawnFixture(fixtures.path('assert-snapshot/single.mjs'));
+    assert.strictEqual(result.stderr, '');
+    assert.strictEqual(result.code, 0);
+    assert.strictEqual(result.snapshot, '1:\n\'test\'');
+  });
+
+  it('should fail when value does not match snapshot', async () => {
+    const { code, stderr, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/value-changed.mjs'));
+    assert.match(stderr, /AssertionError \[ERR_ASSERTION\]/);
+    assert.strictEqual(code, 1);
+    assert.strictEqual(snapshot, '1:\n\'original\'');
+  });
+
+  it('should fail when snapshot does not contain a named snapshot', async () => {
+    const { code, stderr, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/non-existing-name.mjs'));
+    assert.match(stderr, /AssertionError \[ERR_ASSERTION\]/);
+    assert.match(stderr, /Snapshot "non existing" does not exist/);
+    assert.strictEqual(code, 1);
+    assert.strictEqual(snapshot, 'another name:\n\'test\'\n#*#*#*$#*#*#*#*#*#*$#*#*#\nname:\n\'test\'');
+  });
+
+  it('should fail if multiple snapshots use the same name', async () => {
+    const { code, stderr, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/same-name.mjs'));
+    assert.match(stderr, /AssertionError \[ERR_ASSERTION\]/);
+    assert.match(stderr, /Snapshot "name" already used/);
+    assert.strictEqual(code, 1);
+    assert.strictEqual(snapshot.code, 'ENOENT');
+  });
+
+  it('should snapshot a random replaced value', async () => {
+    let result = await spawnFixture(fixtures.path('assert-snapshot/random.mjs'));
+    assert.strictEqual(result.stderr, '');
+    assert.strictEqual(result.code, 0);
+    const originalSnapshot = result.snapshot;
+
+    result = await spawnFixture(fixtures.path('assert-snapshot/random.mjs'));
+    assert.strictEqual(result.stderr, '');
+    assert.strictEqual(result.code, 0);
+    assert.strictEqual(result.snapshot, originalSnapshot);
+  });
+
+  it('should serialize values', async () => {
+    let result = await spawnFixture(fixtures.path('assert-snapshot/serialize.mjs'));
+    assert.strictEqual(result.stderr, '');
+    assert.strictEqual(result.code, 0);
+    const originalSnapshot = result.snapshot;
+
+    result = await spawnFixture(fixtures.path('assert-snapshot/serialize.mjs'));
+    assert.strictEqual(result.stderr, '');
+    assert.strictEqual(result.code, 0);
+    assert.strictEqual(result.snapshot, originalSnapshot);
+  });
+
+  it('should override snapshot when NODE_UPDATE_SNAPSHOT=1', async () => {
+    const filename = 'updated.mjs';
+    await writeFile(getSnapshotPath(filename), '1:\n\'test\'');
+    const { stderr, code, snapshot } = await spawnTmpfile('await assert.snapshot(\'changed\');',
+                                                          filename, { NODE_UPDATE_SNAPSHOT: '1' });
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(code, 0);
+    assert.strictEqual(snapshot, '1:\n\'changed\'');
+  });
+
+  it('snapshot file should have the name of the module - esm', async () => {
+    const filename = 'name.mjs';
+    const { snapshotPath } = await spawnTmpfile('await assert.snapshot("test");', filename);
+    assert.match(snapshotPath, /name\.snapshot$/);
+  });
+
+  it('snapshot file should have the name of the module - common js', async () => {
+    const filename = 'name.js';
+    const { snapshotPath } = await spawnTmpfile('assert.snapshot("test").then(() => process.exit());', filename);
+    assert.match(snapshotPath, /name\.snapshot$/);
+  });
+});

From 95e5182cada9717a554726e752744a4a8c0d6b0b Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Tue, 9 Aug 2022 23:26:49 +0300
Subject: [PATCH 02/12] fixup: process.env broken

---
 test/parallel/test-assert-snapshot.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-assert-snapshot.mjs b/test/parallel/test-assert-snapshot.mjs
index 438bf1d0f41e25..43733df7c8ed76 100644
--- a/test/parallel/test-assert-snapshot.mjs
+++ b/test/parallel/test-assert-snapshot.mjs
@@ -116,7 +116,7 @@ describe('assert.snapshot', { concurrency: true }, () => {
     const filename = 'updated.mjs';
     await writeFile(getSnapshotPath(filename), '1:\n\'test\'');
     const { stderr, code, snapshot } = await spawnTmpfile('await assert.snapshot(\'changed\');',
-                                                          filename, { NODE_UPDATE_SNAPSHOT: '1' });
+                                                          filename, { ...process.env, NODE_UPDATE_SNAPSHOT: '1' });
     assert.strictEqual(stderr, '');
     assert.strictEqual(code, 0);
     assert.strictEqual(snapshot, '1:\n\'changed\'');

From f8c945c61ae5be90b80e0c6b0a0e49c8d2a5cb0e Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Wed, 10 Aug 2022 11:33:12 +0300
Subject: [PATCH 03/12] make name required

---
 lib/internal/assert/snapshot.js               |  4 +-
 test/fixtures/assert-snapshot/basic.mjs       |  3 +-
 test/fixtures/assert-snapshot/basic.snapshot  |  5 +-
 .../{named.mjs => multiple.mjs}               |  0
 .../{named.snapshot => multiple.snapshot}     |  0
 test/fixtures/assert-snapshot/random.mjs      |  4 +-
 test/fixtures/assert-snapshot/random.snapshot |  4 +-
 test/fixtures/assert-snapshot/same-name.mjs   |  4 --
 test/fixtures/assert-snapshot/serialize.mjs   |  6 +-
 .../assert-snapshot/serialize.snapshot        | 12 +++-
 test/fixtures/assert-snapshot/single.mjs      |  2 +-
 test/fixtures/assert-snapshot/single.snapshot |  2 +-
 .../assert-snapshot/value-changed.mjs         |  2 +-
 .../assert-snapshot/value-changed.snapshot    |  2 +-
 test/parallel/test-assert-snapshot.mjs        | 64 +++++++++----------
 15 files changed, 55 insertions(+), 59 deletions(-)
 rename test/fixtures/assert-snapshot/{named.mjs => multiple.mjs} (100%)
 rename test/fixtures/assert-snapshot/{named.snapshot => multiple.snapshot} (100%)
 delete mode 100644 test/fixtures/assert-snapshot/same-name.mjs

diff --git a/lib/internal/assert/snapshot.js b/lib/internal/assert/snapshot.js
index 48cff2809e53b3..d722c4a94ce205 100644
--- a/lib/internal/assert/snapshot.js
+++ b/lib/internal/assert/snapshot.js
@@ -15,6 +15,7 @@ const {
 const { codes: { ERR_ASSERT_SNAPSHOT_NOT_SUPPORTED } } = require('internal/errors');
 const AssertionError = require('internal/assert/assertion_error');
 const { inspect } = require('internal/util/inspect');
+const { validateString } = require('internal/validators');
 const { once } = require('events');
 const { createReadStream, createWriteStream } = require('fs');
 const path = require('path');
@@ -49,6 +50,7 @@ function lazyTarget() {
 }
 
 function serializeName(name) {
+  validateString(name, 'name');
   return StringPrototypeReplace(`${name}`, /:\n/g, '_');
 }
 
@@ -106,7 +108,7 @@ async function getSnapshot() {
 async function snapshot(input, name) {
   const snapshot = await getSnapshot();
   counter = counter + 1;
-  name = serializeName(name ?? counter);
+  name = serializeName(name);
 
   const value = inspect(input);
   if (snapshot === kInitialSnapshot) {
diff --git a/test/fixtures/assert-snapshot/basic.mjs b/test/fixtures/assert-snapshot/basic.mjs
index e9911db0b363a9..7879b7924f98bd 100644
--- a/test/fixtures/assert-snapshot/basic.mjs
+++ b/test/fixtures/assert-snapshot/basic.mjs
@@ -1,4 +1,3 @@
 import assert from 'node:assert';
 
-await assert.snapshot("test");
-await assert.snapshot("test");
+await assert.snapshot("test", "name");
diff --git a/test/fixtures/assert-snapshot/basic.snapshot b/test/fixtures/assert-snapshot/basic.snapshot
index f13ac4fb70d8b3..1270c8d58e8e19 100644
--- a/test/fixtures/assert-snapshot/basic.snapshot
+++ b/test/fixtures/assert-snapshot/basic.snapshot
@@ -1,5 +1,2 @@
-1:
-'test'
-#*#*#*$#*#*#*#*#*#*$#*#*#
-2:
+name:
 'test'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/named.mjs b/test/fixtures/assert-snapshot/multiple.mjs
similarity index 100%
rename from test/fixtures/assert-snapshot/named.mjs
rename to test/fixtures/assert-snapshot/multiple.mjs
diff --git a/test/fixtures/assert-snapshot/named.snapshot b/test/fixtures/assert-snapshot/multiple.snapshot
similarity index 100%
rename from test/fixtures/assert-snapshot/named.snapshot
rename to test/fixtures/assert-snapshot/multiple.snapshot
diff --git a/test/fixtures/assert-snapshot/random.mjs b/test/fixtures/assert-snapshot/random.mjs
index a911e120830974..ef80f963553cc0 100644
--- a/test/fixtures/assert-snapshot/random.mjs
+++ b/test/fixtures/assert-snapshot/random.mjs
@@ -7,5 +7,5 @@ function transform(value) {
   return value.replaceAll(/Random Value: \d+\.+\d+/g, 'Random Value: *');
 }
 
-await assert.snapshot(transform(random()));
-await assert.snapshot(transform(random()));
+await assert.snapshot(transform(random()), 'random1');
+await assert.snapshot(transform(random()), 'random2');
diff --git a/test/fixtures/assert-snapshot/random.snapshot b/test/fixtures/assert-snapshot/random.snapshot
index 976dbad0115273..56ae5dbc5d49c6 100644
--- a/test/fixtures/assert-snapshot/random.snapshot
+++ b/test/fixtures/assert-snapshot/random.snapshot
@@ -1,5 +1,5 @@
-1:
+random1:
 'Random Value: *'
 #*#*#*$#*#*#*#*#*#*$#*#*#
-2:
+random2:
 'Random Value: *'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/same-name.mjs b/test/fixtures/assert-snapshot/same-name.mjs
deleted file mode 100644
index f0ffcfd15aad1f..00000000000000
--- a/test/fixtures/assert-snapshot/same-name.mjs
+++ /dev/null
@@ -1,4 +0,0 @@
-import assert from 'node:assert';
-
-await assert.snapshot("test", "name");
-await assert.snapshot("test", "name");
diff --git a/test/fixtures/assert-snapshot/serialize.mjs b/test/fixtures/assert-snapshot/serialize.mjs
index 43ded300fb764a..6f33a7a398ad9a 100644
--- a/test/fixtures/assert-snapshot/serialize.mjs
+++ b/test/fixtures/assert-snapshot/serialize.mjs
@@ -5,5 +5,7 @@ function fn() {
   return false;
 }
 
-await assert.snapshot(fn);
-await assert.snapshot({ foo: "bar" });
+await assert.snapshot(fn, 'function');
+await assert.snapshot({ foo: "bar" }, 'object');
+await assert.snapshot(new Set([1, 2, 3]), 'set');
+await assert.snapshot(new Map([['one', 1], ['two', 2]]), 'map');
diff --git a/test/fixtures/assert-snapshot/serialize.snapshot b/test/fixtures/assert-snapshot/serialize.snapshot
index b1ab0b7dd3f520..d5ed8e0f1e24c6 100644
--- a/test/fixtures/assert-snapshot/serialize.snapshot
+++ b/test/fixtures/assert-snapshot/serialize.snapshot
@@ -1,5 +1,11 @@
-1:
+function:
 [Function: fn]
 #*#*#*$#*#*#*#*#*#*$#*#*#
-2:
-{ foo: 'bar' }
\ No newline at end of file
+object:
+{ foo: 'bar' }
+#*#*#*$#*#*#*#*#*#*$#*#*#
+set:
+Set(3) { 1, 2, 3 }
+#*#*#*$#*#*#*#*#*#*$#*#*#
+map:
+Map(2) { 'one' => 1, 'two' => 2 }
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/single.mjs b/test/fixtures/assert-snapshot/single.mjs
index 9b9e7a4eaab0a0..ff0136388c08c6 100644
--- a/test/fixtures/assert-snapshot/single.mjs
+++ b/test/fixtures/assert-snapshot/single.mjs
@@ -1,3 +1,3 @@
 import assert from 'node:assert';
 
-await assert.snapshot("test");
+await assert.snapshot("test", "snapshot");
diff --git a/test/fixtures/assert-snapshot/single.snapshot b/test/fixtures/assert-snapshot/single.snapshot
index 53430451fb51db..b8ac2bb3b4631b 100644
--- a/test/fixtures/assert-snapshot/single.snapshot
+++ b/test/fixtures/assert-snapshot/single.snapshot
@@ -1,2 +1,2 @@
-1:
+snapshot:
 'test'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/value-changed.mjs b/test/fixtures/assert-snapshot/value-changed.mjs
index 032d068b970528..5a09e0afcbd062 100644
--- a/test/fixtures/assert-snapshot/value-changed.mjs
+++ b/test/fixtures/assert-snapshot/value-changed.mjs
@@ -1,3 +1,3 @@
 import assert from 'node:assert';
 
-await assert.snapshot("changed");
+await assert.snapshot("changed", "snapshot");
diff --git a/test/fixtures/assert-snapshot/value-changed.snapshot b/test/fixtures/assert-snapshot/value-changed.snapshot
index c9e807eac5da8d..2f574435b93709 100644
--- a/test/fixtures/assert-snapshot/value-changed.snapshot
+++ b/test/fixtures/assert-snapshot/value-changed.snapshot
@@ -1,2 +1,2 @@
-1:
+snapshot:
 'original'
\ No newline at end of file
diff --git a/test/parallel/test-assert-snapshot.mjs b/test/parallel/test-assert-snapshot.mjs
index 43733df7c8ed76..6bd54fc6984880 100644
--- a/test/parallel/test-assert-snapshot.mjs
+++ b/test/parallel/test-assert-snapshot.mjs
@@ -43,11 +43,11 @@ describe('assert.snapshot', { concurrency: true }, () => {
     const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/basic.mjs'));
     assert.strictEqual(stderr, '');
     assert.strictEqual(code, 0);
-    assert.strictEqual(snapshot, '1:\n\'test\'\n#*#*#*$#*#*#*#*#*#*$#*#*#\n2:\n\'test\'');
+    assert.strictEqual(snapshot, 'name:\n\'test\'');
   });
 
-  it('should accept named snapshots', async () => {
-    const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/named.mjs'));
+  it('should write multiple snapshots', async () => {
+    const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/multiple.mjs'));
     assert.strictEqual(stderr, '');
     assert.strictEqual(code, 0);
     assert.strictEqual(snapshot, 'name:\n\'test\'\n#*#*#*$#*#*#*#*#*#*$#*#*#\nanother name:\n\'test\'');
@@ -57,19 +57,29 @@ describe('assert.snapshot', { concurrency: true }, () => {
     let result = await spawnFixture(fixtures.path('assert-snapshot/single.mjs'));
     assert.strictEqual(result.stderr, '');
     assert.strictEqual(result.code, 0);
-    assert.strictEqual(result.snapshot, '1:\n\'test\'');
+    assert.strictEqual(result.snapshot, 'snapshot:\n\'test\'');
 
     result = await spawnFixture(fixtures.path('assert-snapshot/single.mjs'));
     assert.strictEqual(result.stderr, '');
     assert.strictEqual(result.code, 0);
-    assert.strictEqual(result.snapshot, '1:\n\'test\'');
+    assert.strictEqual(result.snapshot, 'snapshot:\n\'test\'');
+  });
+
+  it('should fail when name is not provided', async () => {
+    for (const name of [1, undefined, null, {}, function() {}]) {
+      await assert.rejects(() => assert.snapshot('', name), {
+        code: 'ERR_INVALID_ARG_TYPE', 
+        name: 'TypeError',
+        message: /^The "name" argument must be of type string/
+      });
+    }    
   });
 
   it('should fail when value does not match snapshot', async () => {
     const { code, stderr, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/value-changed.mjs'));
     assert.match(stderr, /AssertionError \[ERR_ASSERTION\]/);
     assert.strictEqual(code, 1);
-    assert.strictEqual(snapshot, '1:\n\'original\'');
+    assert.strictEqual(snapshot, 'snapshot:\n\'original\'');
   });
 
   it('should fail when snapshot does not contain a named snapshot', async () => {
@@ -80,46 +90,30 @@ describe('assert.snapshot', { concurrency: true }, () => {
     assert.strictEqual(snapshot, 'another name:\n\'test\'\n#*#*#*$#*#*#*#*#*#*$#*#*#\nname:\n\'test\'');
   });
 
-  it('should fail if multiple snapshots use the same name', async () => {
-    const { code, stderr, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/same-name.mjs'));
-    assert.match(stderr, /AssertionError \[ERR_ASSERTION\]/);
-    assert.match(stderr, /Snapshot "name" already used/);
-    assert.strictEqual(code, 1);
-    assert.strictEqual(snapshot.code, 'ENOENT');
-  });
-
   it('should snapshot a random replaced value', async () => {
-    let result = await spawnFixture(fixtures.path('assert-snapshot/random.mjs'));
-    assert.strictEqual(result.stderr, '');
-    assert.strictEqual(result.code, 0);
-    const originalSnapshot = result.snapshot;
-
-    result = await spawnFixture(fixtures.path('assert-snapshot/random.mjs'));
-    assert.strictEqual(result.stderr, '');
-    assert.strictEqual(result.code, 0);
-    assert.strictEqual(result.snapshot, originalSnapshot);
+    const originalSnapshot = await readFile(fixtures.path('assert-snapshot/random.snapshot'), 'utf8');
+    const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/random.mjs'));
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(code, 0);
+    assert.strictEqual(snapshot, originalSnapshot);
   });
 
   it('should serialize values', async () => {
-    let result = await spawnFixture(fixtures.path('assert-snapshot/serialize.mjs'));
-    assert.strictEqual(result.stderr, '');
-    assert.strictEqual(result.code, 0);
-    const originalSnapshot = result.snapshot;
-
-    result = await spawnFixture(fixtures.path('assert-snapshot/serialize.mjs'));
-    assert.strictEqual(result.stderr, '');
-    assert.strictEqual(result.code, 0);
-    assert.strictEqual(result.snapshot, originalSnapshot);
+    const originalSnapshot = await readFile(fixtures.path('assert-snapshot/serialize.snapshot'), 'utf8');
+    const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/serialize.mjs'));
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(code, 0);
+    assert.strictEqual(snapshot, originalSnapshot);
   });
 
   it('should override snapshot when NODE_UPDATE_SNAPSHOT=1', async () => {
     const filename = 'updated.mjs';
-    await writeFile(getSnapshotPath(filename), '1:\n\'test\'');
-    const { stderr, code, snapshot } = await spawnTmpfile('await assert.snapshot(\'changed\');',
+    await writeFile(getSnapshotPath(filename), 'snapshot:\n\'test\'');
+    const { stderr, code, snapshot } = await spawnTmpfile('await assert.snapshot(\'changed\', \'snapshot\');',
                                                           filename, { ...process.env, NODE_UPDATE_SNAPSHOT: '1' });
     assert.strictEqual(stderr, '');
     assert.strictEqual(code, 0);
-    assert.strictEqual(snapshot, '1:\n\'changed\'');
+    assert.strictEqual(snapshot, 'snapshot:\n\'changed\'');
   });
 
   it('snapshot file should have the name of the module - esm', async () => {

From 617e3bcdc376cc07bb91827b83daa18924ae52cd Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Wed, 10 Aug 2022 11:33:51 +0300
Subject: [PATCH 04/12] adjust to work on windows

---
 lib/internal/assert/snapshot.js                | 11 +++++++----
 .../fixtures/assert-snapshot/multiple.snapshot |  2 +-
 .../assert-snapshot/non-existing-name.snapshot |  2 +-
 test/fixtures/assert-snapshot/random.snapshot  |  2 +-
 .../assert-snapshot/serialize.snapshot         |  6 +++---
 test/parallel/test-assert-snapshot.mjs         | 18 +++++++++---------
 6 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/lib/internal/assert/snapshot.js b/lib/internal/assert/snapshot.js
index d722c4a94ce205..1a2627ce964836 100644
--- a/lib/internal/assert/snapshot.js
+++ b/lib/internal/assert/snapshot.js
@@ -3,6 +3,7 @@
 const {
   ArrayPrototypeMap,
   Boolean,
+  RegExp,
   SafeMap,
   SafeSet,
   StringPrototypeIndexOf,
@@ -12,6 +13,7 @@ const {
   Symbol,
 } = primordials;
 
+const { EOL } = require('internal/constants');
 const { codes: { ERR_ASSERT_SNAPSHOT_NOT_SUPPORTED } } = require('internal/errors');
 const AssertionError = require('internal/assert/assertion_error');
 const { inspect } = require('internal/util/inspect');
@@ -23,7 +25,8 @@ const assert = require('assert');
 
 const kUpdateSnapshot = Boolean(process.env.NODE_UPDATE_SNAPSHOT);
 const kInitialSnapshot = Symbol('kInitialSnapshot');
-const kDefaultDelimiter = '\n#*#*#*$#*#*#*#*#*#*$#*#*#\n';
+const kDefaultDelimiter = '\n#*#*#*#*#*#*#*#*#*#*#*#\n';
+const kDefaultDelimiterRegex = new RegExp(kDefaultDelimiter.replaceAll('*', '\\*').replaceAll('\n', '\r?\n'), 'g');
 
 function defaultSnapshotPath() {
   if (process.mainModule) {
@@ -51,7 +54,7 @@ function lazyTarget() {
 
 function serializeName(name) {
   validateString(name, 'name');
-  return StringPrototypeReplace(`${name}`, /:\n/g, '_');
+  return StringPrototypeReplace(`${name}`, /:\r?\n/g, '_');
 }
 
 let writtenNames;
@@ -88,9 +91,9 @@ async function getSnapshot() {
     }
     snapshotValue = new SafeMap(
       ArrayPrototypeMap(
-        StringPrototypeSplit(data, kDefaultDelimiter),
+        StringPrototypeSplit(data, kDefaultDelimiterRegex),
         (item) => {
-          const keyDelimiter = StringPrototypeIndexOf(item, ':\n');
+          const keyDelimiter = StringPrototypeIndexOf(item, `:${EOL}`);
           return [StringPrototypeSlice(item, 0, keyDelimiter), StringPrototypeSlice(item, keyDelimiter + 2)];
         }
       ));
diff --git a/test/fixtures/assert-snapshot/multiple.snapshot b/test/fixtures/assert-snapshot/multiple.snapshot
index aa449159e247cb..6d96e1c105f214 100644
--- a/test/fixtures/assert-snapshot/multiple.snapshot
+++ b/test/fixtures/assert-snapshot/multiple.snapshot
@@ -1,5 +1,5 @@
 name:
 'test'
-#*#*#*$#*#*#*#*#*#*$#*#*#
+#*#*#*#*#*#*#*#*#*#*#*#
 another name:
 'test'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/non-existing-name.snapshot b/test/fixtures/assert-snapshot/non-existing-name.snapshot
index c3c303680d41ec..b01e434d6d2e8b 100644
--- a/test/fixtures/assert-snapshot/non-existing-name.snapshot
+++ b/test/fixtures/assert-snapshot/non-existing-name.snapshot
@@ -1,5 +1,5 @@
 another name:
 'test'
-#*#*#*$#*#*#*#*#*#*$#*#*#
+#*#*#*#*#*#*#*#*#*#*#*#
 name:
 'test'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/random.snapshot b/test/fixtures/assert-snapshot/random.snapshot
index 56ae5dbc5d49c6..d0912a53246cd9 100644
--- a/test/fixtures/assert-snapshot/random.snapshot
+++ b/test/fixtures/assert-snapshot/random.snapshot
@@ -1,5 +1,5 @@
 random1:
 'Random Value: *'
-#*#*#*$#*#*#*#*#*#*$#*#*#
+#*#*#*#*#*#*#*#*#*#*#*#
 random2:
 'Random Value: *'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/serialize.snapshot b/test/fixtures/assert-snapshot/serialize.snapshot
index d5ed8e0f1e24c6..e70541d9b17ef5 100644
--- a/test/fixtures/assert-snapshot/serialize.snapshot
+++ b/test/fixtures/assert-snapshot/serialize.snapshot
@@ -1,11 +1,11 @@
 function:
 [Function: fn]
-#*#*#*$#*#*#*#*#*#*$#*#*#
+#*#*#*#*#*#*#*#*#*#*#*#
 object:
 { foo: 'bar' }
-#*#*#*$#*#*#*#*#*#*$#*#*#
+#*#*#*#*#*#*#*#*#*#*#*#
 set:
 Set(3) { 1, 2, 3 }
-#*#*#*$#*#*#*#*#*#*$#*#*#
+#*#*#*#*#*#*#*#*#*#*#*#
 map:
 Map(2) { 'one' => 1, 'two' => 2 }
\ No newline at end of file
diff --git a/test/parallel/test-assert-snapshot.mjs b/test/parallel/test-assert-snapshot.mjs
index 6bd54fc6984880..b7779f93c13271 100644
--- a/test/parallel/test-assert-snapshot.mjs
+++ b/test/parallel/test-assert-snapshot.mjs
@@ -43,43 +43,43 @@ describe('assert.snapshot', { concurrency: true }, () => {
     const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/basic.mjs'));
     assert.strictEqual(stderr, '');
     assert.strictEqual(code, 0);
-    assert.strictEqual(snapshot, 'name:\n\'test\'');
+    assert.match(snapshot, /^name:\r?\n'test'$/);
   });
 
   it('should write multiple snapshots', async () => {
     const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/multiple.mjs'));
     assert.strictEqual(stderr, '');
     assert.strictEqual(code, 0);
-    assert.strictEqual(snapshot, 'name:\n\'test\'\n#*#*#*$#*#*#*#*#*#*$#*#*#\nanother name:\n\'test\'');
+    assert.match(snapshot, /^name:\n'test'\r?\n#\*#\*#\*#\*#\*#\*#\*#\*#\*#\*#\*#\r?\nanother name:\r?\n'test'$/);
   });
 
   it('should succeed running multiple times', async () => {
     let result = await spawnFixture(fixtures.path('assert-snapshot/single.mjs'));
     assert.strictEqual(result.stderr, '');
     assert.strictEqual(result.code, 0);
-    assert.strictEqual(result.snapshot, 'snapshot:\n\'test\'');
+    assert.match(result.snapshot, /^snapshot:\r?\n'test'$/);
 
     result = await spawnFixture(fixtures.path('assert-snapshot/single.mjs'));
     assert.strictEqual(result.stderr, '');
     assert.strictEqual(result.code, 0);
-    assert.strictEqual(result.snapshot, 'snapshot:\n\'test\'');
+    assert.match(result.snapshot, /^snapshot:\r?\n'test'$/);
   });
 
   it('should fail when name is not provided', async () => {
     for (const name of [1, undefined, null, {}, function() {}]) {
       await assert.rejects(() => assert.snapshot('', name), {
-        code: 'ERR_INVALID_ARG_TYPE', 
+        code: 'ERR_INVALID_ARG_TYPE',
         name: 'TypeError',
         message: /^The "name" argument must be of type string/
       });
-    }    
+    }
   });
 
   it('should fail when value does not match snapshot', async () => {
     const { code, stderr, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/value-changed.mjs'));
     assert.match(stderr, /AssertionError \[ERR_ASSERTION\]/);
     assert.strictEqual(code, 1);
-    assert.strictEqual(snapshot, 'snapshot:\n\'original\'');
+    assert.match(snapshot, /^snapshot:\r?\n'original'$/);
   });
 
   it('should fail when snapshot does not contain a named snapshot', async () => {
@@ -87,7 +87,7 @@ describe('assert.snapshot', { concurrency: true }, () => {
     assert.match(stderr, /AssertionError \[ERR_ASSERTION\]/);
     assert.match(stderr, /Snapshot "non existing" does not exist/);
     assert.strictEqual(code, 1);
-    assert.strictEqual(snapshot, 'another name:\n\'test\'\n#*#*#*$#*#*#*#*#*#*$#*#*#\nname:\n\'test\'');
+    assert.match(snapshot, /^another name:\n'test'\r?\n#\*#\*#\*#\*#\*#\*#\*#\*#\*#\*#\*#\r?\nname:\r?\n'test'$/);
   });
 
   it('should snapshot a random replaced value', async () => {
@@ -113,7 +113,7 @@ describe('assert.snapshot', { concurrency: true }, () => {
                                                           filename, { ...process.env, NODE_UPDATE_SNAPSHOT: '1' });
     assert.strictEqual(stderr, '');
     assert.strictEqual(code, 0);
-    assert.strictEqual(snapshot, 'snapshot:\n\'changed\'');
+    assert.match(snapshot, /^snapshot:\r?\n'changed'$/);
   });
 
   it('snapshot file should have the name of the module - esm', async () => {

From 2a7a5db9fa8906cdb1949cc433647509fd91d86d Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Wed, 10 Aug 2022 17:14:10 +0300
Subject: [PATCH 05/12] update docs

---
 doc/api/assert.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/api/assert.md b/doc/api/assert.md
index 8a2c4b63db54ba..ffd351381d6440 100644
--- a/doc/api/assert.md
+++ b/doc/api/assert.md
@@ -2006,7 +2006,7 @@ argument, then `error` is assumed to be omitted and the string will be used for
 example in [`assert.throws()`][] carefully if using a string as the second
 argument gets considered.
 
-## `assert.snapshot(value[, name])`
+## `assert.snapshot(value, name)`
 
 <!-- YAML
 added: REPLACEME
@@ -2014,14 +2014,12 @@ added: REPLACEME
 
 > Stability: 1 - Experimental
 
-* `value` {string} the value to snapshot
+* `value` {any} the value to snapshot
 * `name` {string} the name of snapshot.
-  in case order of snapshots is non-deterministic,
-  it is recommended to use named snapshots
-  **Default:** ordinal number of the snapshot.
 * Returns: {Promise}
 
 reads a snapshot from a file, and compares `value` to the snapshot.
+`value` is serialized with [`util.inspect()`][]
 If the value is not strictly equal to the snapshot,
 `assert.snapshot()` will return a rejected `Promise`
 with an [`AssertionError`][].
@@ -2501,5 +2499,6 @@ argument.
 [`process.on('exit')`]: process.md#event-exit
 [`tracker.calls()`]: #trackercallsfn-exact
 [`tracker.verify()`]: #trackerverify
+[`util.inspect()`]: util.md#utilinspectobject-options
 [enumerable "own" properties]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Enumerability_and_ownership_of_properties
 [prototype-spec]: https://tc39.github.io/ecma262/#sec-ordinary-object-internal-methods-and-internal-slots

From fb0f0f704bd75e2b9a6f4dfd82db19a912aab44f Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Wed, 10 Aug 2022 17:15:14 +0300
Subject: [PATCH 06/12] CR

---
 lib/internal/assert/snapshot.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/assert/snapshot.js b/lib/internal/assert/snapshot.js
index 1a2627ce964836..c627e911c2e0c2 100644
--- a/lib/internal/assert/snapshot.js
+++ b/lib/internal/assert/snapshot.js
@@ -28,7 +28,7 @@ const kInitialSnapshot = Symbol('kInitialSnapshot');
 const kDefaultDelimiter = '\n#*#*#*#*#*#*#*#*#*#*#*#\n';
 const kDefaultDelimiterRegex = new RegExp(kDefaultDelimiter.replaceAll('*', '\\*').replaceAll('\n', '\r?\n'), 'g');
 
-function defaultSnapshotPath() {
+function getSnapshotPath() {
   if (process.mainModule) {
     const { dir, name } = path.parse(process.mainModule.filename);
     return path.join(dir, `${name}.snapshot`);
@@ -42,13 +42,13 @@ function defaultSnapshotPath() {
 
 let _source;
 function lazySource() {
-  _source = _source ?? createReadStream(defaultSnapshotPath(), { encoding: 'utf8' });
+  _source ??= createReadStream(getSnapshotPath(), { encoding: 'utf8' });
   return _source;
 }
 
 let _target;
 function lazyTarget() {
-  _target = _target ?? createWriteStream(defaultSnapshotPath(), { encoding: 'utf8' });
+  _target ??= createWriteStream(getSnapshotPath(), { encoding: 'utf8' });
   return _target;
 }
 

From d78f55f84aaae25bc43bff0623e1917901a447f5 Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Wed, 10 Aug 2022 17:45:45 +0300
Subject: [PATCH 07/12] CR

---
 lib/internal/assert/snapshot.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/internal/assert/snapshot.js b/lib/internal/assert/snapshot.js
index c627e911c2e0c2..77cccae8c1c5f9 100644
--- a/lib/internal/assert/snapshot.js
+++ b/lib/internal/assert/snapshot.js
@@ -40,14 +40,12 @@ function getSnapshotPath() {
   return path.join(dir, `${name}.snapshot`);
 }
 
-let _source;
-function lazySource() {
-  _source ??= createReadStream(getSnapshotPath(), { encoding: 'utf8' });
-  return _source;
+function getSource() {
+  return createReadStream(getSnapshotPath(), { encoding: 'utf8' });
 }
 
 let _target;
-function lazyTarget() {
+function getTarget() {
   _target ??= createWriteStream(getSnapshotPath(), { encoding: 'utf8' });
   return _target;
 }
@@ -62,7 +60,7 @@ let snapshotValue;
 let counter = 0;
 
 async function writeSnapshot({ name, value }) {
-  const target = lazyTarget();
+  const target = getTarget();
   if (counter > 1) {
     target.write(kDefaultDelimiter);
   }
@@ -76,7 +74,6 @@ async function writeSnapshot({ name, value }) {
 }
 
 async function getSnapshot() {
-  const source = lazySource();
   if (snapshotValue !== undefined) {
     return snapshotValue;
   }
@@ -85,6 +82,7 @@ async function getSnapshot() {
     return kInitialSnapshot;
   }
   try {
+    const source = getSource();
     let data = '';
     for await (const line of source) {
       data += line;

From b06b89af91dd95ecc2229b36f35a2a82d1c5c542 Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Thu, 11 Aug 2022 08:34:31 +0300
Subject: [PATCH 08/12] fix windows

---
 lib/internal/assert/snapshot.js                 |  7 ++++---
 test/fixtures/assert-snapshot/basic.snapshot    |  2 --
 test/fixtures/assert-snapshot/multiple.snapshot |  5 -----
 test/fixtures/assert-snapshot/single.snapshot   |  2 --
 test/parallel/test-assert-snapshot.mjs          | 11 +++++++----
 5 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 test/fixtures/assert-snapshot/basic.snapshot
 delete mode 100644 test/fixtures/assert-snapshot/multiple.snapshot
 delete mode 100644 test/fixtures/assert-snapshot/single.snapshot

diff --git a/lib/internal/assert/snapshot.js b/lib/internal/assert/snapshot.js
index 77cccae8c1c5f9..8c4501a52482c9 100644
--- a/lib/internal/assert/snapshot.js
+++ b/lib/internal/assert/snapshot.js
@@ -27,6 +27,7 @@ const kUpdateSnapshot = Boolean(process.env.NODE_UPDATE_SNAPSHOT);
 const kInitialSnapshot = Symbol('kInitialSnapshot');
 const kDefaultDelimiter = '\n#*#*#*#*#*#*#*#*#*#*#*#\n';
 const kDefaultDelimiterRegex = new RegExp(kDefaultDelimiter.replaceAll('*', '\\*').replaceAll('\n', '\r?\n'), 'g');
+const kKeyDelimiter = `:${EOL}`;
 
 function getSnapshotPath() {
   if (process.mainModule) {
@@ -82,7 +83,7 @@ async function getSnapshot() {
     return kInitialSnapshot;
   }
   try {
-    const source = getSource();
+  const source = getSource();
     let data = '';
     for await (const line of source) {
       data += line;
@@ -91,8 +92,8 @@ async function getSnapshot() {
       ArrayPrototypeMap(
         StringPrototypeSplit(data, kDefaultDelimiterRegex),
         (item) => {
-          const keyDelimiter = StringPrototypeIndexOf(item, `:${EOL}`);
-          return [StringPrototypeSlice(item, 0, keyDelimiter), StringPrototypeSlice(item, keyDelimiter + 2)];
+          const keyDelimiter = StringPrototypeIndexOf(item, kKeyDelimiter);
+          return [StringPrototypeSlice(item, 0, keyDelimiter), StringPrototypeSlice(item, keyDelimiter + kKeyDelimiter.length)];
         }
       ));
   } catch (e) {
diff --git a/test/fixtures/assert-snapshot/basic.snapshot b/test/fixtures/assert-snapshot/basic.snapshot
deleted file mode 100644
index 1270c8d58e8e19..00000000000000
--- a/test/fixtures/assert-snapshot/basic.snapshot
+++ /dev/null
@@ -1,2 +0,0 @@
-name:
-'test'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/multiple.snapshot b/test/fixtures/assert-snapshot/multiple.snapshot
deleted file mode 100644
index 6d96e1c105f214..00000000000000
--- a/test/fixtures/assert-snapshot/multiple.snapshot
+++ /dev/null
@@ -1,5 +0,0 @@
-name:
-'test'
-#*#*#*#*#*#*#*#*#*#*#*#
-another name:
-'test'
\ No newline at end of file
diff --git a/test/fixtures/assert-snapshot/single.snapshot b/test/fixtures/assert-snapshot/single.snapshot
deleted file mode 100644
index b8ac2bb3b4631b..00000000000000
--- a/test/fixtures/assert-snapshot/single.snapshot
+++ /dev/null
@@ -1,2 +0,0 @@
-snapshot:
-'test'
\ No newline at end of file
diff --git a/test/parallel/test-assert-snapshot.mjs b/test/parallel/test-assert-snapshot.mjs
index b7779f93c13271..7f554dfc1cc5c8 100644
--- a/test/parallel/test-assert-snapshot.mjs
+++ b/test/parallel/test-assert-snapshot.mjs
@@ -4,7 +4,7 @@ import tmpdir from '../common/tmpdir.js';
 import assert from 'node:assert';
 import path from 'node:path';
 import { execPath } from 'node:process';
-import { writeFile, readFile } from 'node:fs/promises';
+import { writeFile, readFile, unlink } from 'node:fs/promises';
 import { describe, it } from 'node:test';
 
 tmpdir.refresh();
@@ -40,26 +40,29 @@ async function spawnFixture(filename) {
 
 describe('assert.snapshot', { concurrency: true }, () => {
   it('should write snapshot', async () => {
-    const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/basic.mjs'));
+    const { stderr, code, snapshot, snapshotPath } = await spawnFixture(fixtures.path('assert-snapshot/basic.mjs'));
+    await unlink(snapshotPath);
     assert.strictEqual(stderr, '');
     assert.strictEqual(code, 0);
     assert.match(snapshot, /^name:\r?\n'test'$/);
   });
 
   it('should write multiple snapshots', async () => {
-    const { stderr, code, snapshot } = await spawnFixture(fixtures.path('assert-snapshot/multiple.mjs'));
+    const { stderr, code, snapshot, snapshotPath } = await spawnFixture(fixtures.path('assert-snapshot/multiple.mjs'));
+    await unlink(snapshotPath);
     assert.strictEqual(stderr, '');
     assert.strictEqual(code, 0);
     assert.match(snapshot, /^name:\n'test'\r?\n#\*#\*#\*#\*#\*#\*#\*#\*#\*#\*#\*#\r?\nanother name:\r?\n'test'$/);
   });
 
   it('should succeed running multiple times', async () => {
-    let result = await spawnFixture(fixtures.path('assert-snapshot/single.mjs'));
+    let result = await spawnFixture(fixtures.path('assert-snapshot/single.mjs'), false);
     assert.strictEqual(result.stderr, '');
     assert.strictEqual(result.code, 0);
     assert.match(result.snapshot, /^snapshot:\r?\n'test'$/);
 
     result = await spawnFixture(fixtures.path('assert-snapshot/single.mjs'));
+    await unlink(result.snapshotPath);
     assert.strictEqual(result.stderr, '');
     assert.strictEqual(result.code, 0);
     assert.match(result.snapshot, /^snapshot:\r?\n'test'$/);

From 012371875b2b1e099da9a301ae937e772514539f Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Thu, 11 Aug 2022 08:34:45 +0300
Subject: [PATCH 09/12] switch to use a flag

---
 doc/api/assert.md                      |  3 ++-
 doc/api/cli.md                         |  8 ++++++++
 lib/internal/assert/snapshot.js        |  3 ++-
 src/node_options.cc                    |  5 +++++
 src/node_options.h                     |  1 +
 test/parallel/test-assert-snapshot.mjs | 10 +++++-----
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/doc/api/assert.md b/doc/api/assert.md
index ffd351381d6440..d35861659ac136 100644
--- a/doc/api/assert.md
+++ b/doc/api/assert.md
@@ -2027,7 +2027,7 @@ with an [`AssertionError`][].
 If the snapshot file does not exist, the snapshot is written.
 
 In case it is needed to force a snapshot update,
-set `process.env.NODE_UPDATE_SNAPSHOT=1`;
+use [`--enable-source-maps`][];
 
 By default, a snapshot is read and written to a file,
 using the same name as the main entrypoint with `.snapshot` as the extension.
@@ -2473,6 +2473,7 @@ argument.
 [`AssertionError`]: #class-assertassertionerror
 [`CallTracker`]: #class-assertcalltracker
 [`Class`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes
+[`--update-assert-snapshot`]: cli.md#--update-assert-snapshot
 [`ERR_INVALID_RETURN_VALUE`]: errors.md#err_invalid_return_value
 [`Error.captureStackTrace`]: errors.md#errorcapturestacktracetargetobject-constructoropt
 [`Error`]: errors.md#class-error
diff --git a/doc/api/cli.md b/doc/api/cli.md
index dd7cbbd12fc1b2..e0e72e8a30c567 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1488,6 +1488,14 @@ occurs. One of the following modes can be chosen:
 If a rejection happens during the command line entry point's ES module static
 loading phase, it will always raise it as an uncaught exception.
 
+### `--update-assert-snapshot`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+Force updating snapshot files for [`assert.snapshot()`][]
+
 ### `--use-bundled-ca`, `--use-openssl-ca`
 
 <!-- YAML
diff --git a/lib/internal/assert/snapshot.js b/lib/internal/assert/snapshot.js
index 8c4501a52482c9..f5512abb087423 100644
--- a/lib/internal/assert/snapshot.js
+++ b/lib/internal/assert/snapshot.js
@@ -17,13 +17,14 @@ const { EOL } = require('internal/constants');
 const { codes: { ERR_ASSERT_SNAPSHOT_NOT_SUPPORTED } } = require('internal/errors');
 const AssertionError = require('internal/assert/assertion_error');
 const { inspect } = require('internal/util/inspect');
+const { getOptionValue } = require('internal/options');
 const { validateString } = require('internal/validators');
 const { once } = require('events');
 const { createReadStream, createWriteStream } = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const kUpdateSnapshot = Boolean(process.env.NODE_UPDATE_SNAPSHOT);
+const kUpdateSnapshot = getOptionValue('--update-assert-snapshot');
 const kInitialSnapshot = Symbol('kInitialSnapshot');
 const kDefaultDelimiter = '\n#*#*#*#*#*#*#*#*#*#*#*#\n';
 const kDefaultDelimiterRegex = new RegExp(kDefaultDelimiter.replaceAll('*', '\\*').replaceAll('\n', '\r?\n'), 'g');
diff --git a/src/node_options.cc b/src/node_options.cc
index bbf39e864c6e84..0ecf3bb918bb43 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -622,6 +622,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             &EnvironmentOptions::force_repl);
   AddAlias("-i", "--interactive");
 
+  AddOption("--update-assert-snapshot",
+            "update assert snapshot files",
+            &EnvironmentOptions::update_assert_snapshot,
+            kAllowedInEnvironment);
+
   AddOption("--napi-modules", "", NoOp{}, kAllowedInEnvironment);
 
   AddOption("--tls-keylog",
diff --git a/src/node_options.h b/src/node_options.h
index 156f96a93faf49..ca43192d85a4b4 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -136,6 +136,7 @@ class EnvironmentOptions : public Options {
   bool preserve_symlinks = false;
   bool preserve_symlinks_main = false;
   bool prof_process = false;
+  bool update_assert_snapshot = false;
 #if HAVE_INSPECTOR
   std::string cpu_prof_dir;
   static const uint64_t kDefaultCpuProfInterval = 1000;
diff --git a/test/parallel/test-assert-snapshot.mjs b/test/parallel/test-assert-snapshot.mjs
index 7f554dfc1cc5c8..4019b9b39bb6b1 100644
--- a/test/parallel/test-assert-snapshot.mjs
+++ b/test/parallel/test-assert-snapshot.mjs
@@ -14,15 +14,15 @@ function getSnapshotPath(filename) {
   return path.join(tmpdir.path, dir, `${name}.snapshot`);
 }
 
-async function spawnTmpfile(content = '', filename, env) {
+async function spawnTmpfile(content = '', filename, extraFlags = []) {
   const header = filename.endsWith('.mjs') ?
     'import assert from \'node:assert\';' :
     'const assert = require(\'node:assert\');';
   await writeFile(path.join(tmpdir.path, filename), `${header}\n${content}`);
   const { stdout, stderr, code } = await spawnPromisified(
     execPath,
-    ['--no-warnings', filename],
-    { cwd: tmpdir.path, env });
+    ['--no-warnings', ...extraFlags, filename],
+    { cwd: tmpdir.path });
 
   const snapshotPath = getSnapshotPath(filename);
   const snapshot = await readFile(snapshotPath, 'utf8').catch((err) => err);
@@ -109,11 +109,11 @@ describe('assert.snapshot', { concurrency: true }, () => {
     assert.strictEqual(snapshot, originalSnapshot);
   });
 
-  it('should override snapshot when NODE_UPDATE_SNAPSHOT=1', async () => {
+  it('should override snapshot when passing --update-assert-snapshot', async () => {
     const filename = 'updated.mjs';
     await writeFile(getSnapshotPath(filename), 'snapshot:\n\'test\'');
     const { stderr, code, snapshot } = await spawnTmpfile('await assert.snapshot(\'changed\', \'snapshot\');',
-                                                          filename, { ...process.env, NODE_UPDATE_SNAPSHOT: '1' });
+                                                          filename, ['--update-assert-snapshot']);
     assert.strictEqual(stderr, '');
     assert.strictEqual(code, 0);
     assert.match(snapshot, /^snapshot:\r?\n'changed'$/);

From 441c4d5ebb104cc590d07a09135ecd79ffb314f6 Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Thu, 11 Aug 2022 08:55:18 +0300
Subject: [PATCH 10/12] lint

---
 doc/api/assert.md               | 4 ++--
 doc/api/cli.md                  | 2 ++
 lib/internal/assert/snapshot.js | 8 +++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/doc/api/assert.md b/doc/api/assert.md
index d35861659ac136..34c0e47ecf0b52 100644
--- a/doc/api/assert.md
+++ b/doc/api/assert.md
@@ -2027,7 +2027,7 @@ with an [`AssertionError`][].
 If the snapshot file does not exist, the snapshot is written.
 
 In case it is needed to force a snapshot update,
-use [`--enable-source-maps`][];
+use [`--update-assert-snapshot`][];
 
 By default, a snapshot is read and written to a file,
 using the same name as the main entrypoint with `.snapshot` as the extension.
@@ -2468,12 +2468,12 @@ argument.
 [Object wrappers]: https://developer.mozilla.org/en-US/docs/Glossary/Primitive#Primitive_wrapper_objects_in_JavaScript
 [Object.prototype.toString()]: https://tc39.github.io/ecma262/#sec-object.prototype.tostring
 [`!=` operator]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Inequality
+[`--update-assert-snapshot`]: cli.md#--update-assert-snapshot
 [`===` operator]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Strict_equality
 [`==` operator]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Equality
 [`AssertionError`]: #class-assertassertionerror
 [`CallTracker`]: #class-assertcalltracker
 [`Class`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes
-[`--update-assert-snapshot`]: cli.md#--update-assert-snapshot
 [`ERR_INVALID_RETURN_VALUE`]: errors.md#err_invalid_return_value
 [`Error.captureStackTrace`]: errors.md#errorcapturestacktracetargetobject-constructoropt
 [`Error`]: errors.md#class-error
diff --git a/doc/api/cli.md b/doc/api/cli.md
index e0e72e8a30c567..86665e09df65a0 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1857,6 +1857,7 @@ Node.js options that are allowed are:
 * `--trace-warnings`
 * `--track-heap-objects`
 * `--unhandled-rejections`
+* `--update-assert-snapshot`
 * `--use-bundled-ca`
 * `--use-largepages`
 * `--use-openssl-ca`
@@ -2232,6 +2233,7 @@ done
 [`NO_COLOR`]: https://no-color.org
 [`SlowBuffer`]: buffer.md#class-slowbuffer
 [`YoungGenerationSizeFromSemiSpaceSize`]: https://chromium.googlesource.com/v8/v8.git/+/refs/tags/10.3.129/src/heap/heap.cc#328
+[`assert.snapshot()`]: assert.md##assertsnapshotvalue-name
 [`dns.lookup()`]: dns.md#dnslookuphostname-options-callback
 [`dns.setDefaultResultOrder()`]: dns.md#dnssetdefaultresultorderorder
 [`dnsPromises.lookup()`]: dns.md#dnspromiseslookuphostname-options
diff --git a/lib/internal/assert/snapshot.js b/lib/internal/assert/snapshot.js
index f5512abb087423..0cc58a8831c33d 100644
--- a/lib/internal/assert/snapshot.js
+++ b/lib/internal/assert/snapshot.js
@@ -2,7 +2,6 @@
 
 const {
   ArrayPrototypeMap,
-  Boolean,
   RegExp,
   SafeMap,
   SafeSet,
@@ -84,7 +83,7 @@ async function getSnapshot() {
     return kInitialSnapshot;
   }
   try {
-  const source = getSource();
+    const source = getSource();
     let data = '';
     for await (const line of source) {
       data += line;
@@ -94,7 +93,10 @@ async function getSnapshot() {
         StringPrototypeSplit(data, kDefaultDelimiterRegex),
         (item) => {
           const keyDelimiter = StringPrototypeIndexOf(item, kKeyDelimiter);
-          return [StringPrototypeSlice(item, 0, keyDelimiter), StringPrototypeSlice(item, keyDelimiter + kKeyDelimiter.length)];
+          return [
+            StringPrototypeSlice(item, 0, keyDelimiter),
+            StringPrototypeSlice(item, keyDelimiter + kKeyDelimiter.length),
+          ];
         }
       ));
   } catch (e) {

From be227622fa61b2cdd51aaa7a4bc190c7c1931788 Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Thu, 11 Aug 2022 09:02:21 +0300
Subject: [PATCH 11/12] fix

---
 doc/api/cli.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 86665e09df65a0..d29f748db068f2 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -2233,7 +2233,7 @@ done
 [`NO_COLOR`]: https://no-color.org
 [`SlowBuffer`]: buffer.md#class-slowbuffer
 [`YoungGenerationSizeFromSemiSpaceSize`]: https://chromium.googlesource.com/v8/v8.git/+/refs/tags/10.3.129/src/heap/heap.cc#328
-[`assert.snapshot()`]: assert.md##assertsnapshotvalue-name
+[`assert.snapshot()`]: assert.md#assertsnapshotvalue-name
 [`dns.lookup()`]: dns.md#dnslookuphostname-options-callback
 [`dns.setDefaultResultOrder()`]: dns.md#dnssetdefaultresultorderorder
 [`dnsPromises.lookup()`]: dns.md#dnspromiseslookuphostname-options

From 97c3db2616576d760fa093356452f7577e807b5e Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Thu, 11 Aug 2022 11:24:57 +0300
Subject: [PATCH 12/12] fix windows

---
 lib/internal/assert/snapshot.js        | 17 ++++++++---------
 test/parallel/test-assert-snapshot.mjs |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/internal/assert/snapshot.js b/lib/internal/assert/snapshot.js
index 0cc58a8831c33d..70af1fd4e63ca7 100644
--- a/lib/internal/assert/snapshot.js
+++ b/lib/internal/assert/snapshot.js
@@ -1,18 +1,17 @@
 'use strict';
 
 const {
+  ArrayPrototypeJoin,
   ArrayPrototypeMap,
+  ArrayPrototypeSlice,
   RegExp,
   SafeMap,
   SafeSet,
-  StringPrototypeIndexOf,
-  StringPrototypeSlice,
   StringPrototypeSplit,
   StringPrototypeReplace,
   Symbol,
 } = primordials;
 
-const { EOL } = require('internal/constants');
 const { codes: { ERR_ASSERT_SNAPSHOT_NOT_SUPPORTED } } = require('internal/errors');
 const AssertionError = require('internal/assert/assertion_error');
 const { inspect } = require('internal/util/inspect');
@@ -27,7 +26,7 @@ const kUpdateSnapshot = getOptionValue('--update-assert-snapshot');
 const kInitialSnapshot = Symbol('kInitialSnapshot');
 const kDefaultDelimiter = '\n#*#*#*#*#*#*#*#*#*#*#*#\n';
 const kDefaultDelimiterRegex = new RegExp(kDefaultDelimiter.replaceAll('*', '\\*').replaceAll('\n', '\r?\n'), 'g');
-const kKeyDelimiter = `:${EOL}`;
+const kKeyDelimiter = /:\r?\n/g;
 
 function getSnapshotPath() {
   if (process.mainModule) {
@@ -53,7 +52,7 @@ function getTarget() {
 
 function serializeName(name) {
   validateString(name, 'name');
-  return StringPrototypeReplace(`${name}`, /:\r?\n/g, '_');
+  return StringPrototypeReplace(`${name}`, kKeyDelimiter, '_');
 }
 
 let writtenNames;
@@ -92,10 +91,10 @@ async function getSnapshot() {
       ArrayPrototypeMap(
         StringPrototypeSplit(data, kDefaultDelimiterRegex),
         (item) => {
-          const keyDelimiter = StringPrototypeIndexOf(item, kKeyDelimiter);
+          const arr = StringPrototypeSplit(item, kKeyDelimiter);
           return [
-            StringPrototypeSlice(item, 0, keyDelimiter),
-            StringPrototypeSlice(item, keyDelimiter + kKeyDelimiter.length),
+            arr[0],
+            ArrayPrototypeJoin(ArrayPrototypeSlice(arr, 1), ':\n'),
           ];
         }
       ));
@@ -123,7 +122,7 @@ async function snapshot(input, name) {
     // eslint-disable-next-line no-restricted-syntax
     assert.strictEqual(value, expected);
   } else {
-    throw new AssertionError({ message: `Snapshot "${name}" does not exist` });
+    throw new AssertionError({ message: `Snapshot "${name}" does not exist`, actual: inspect(snapshot) });
   }
 }
 
diff --git a/test/parallel/test-assert-snapshot.mjs b/test/parallel/test-assert-snapshot.mjs
index 4019b9b39bb6b1..7382a0fa3633ad 100644
--- a/test/parallel/test-assert-snapshot.mjs
+++ b/test/parallel/test-assert-snapshot.mjs
@@ -90,7 +90,7 @@ describe('assert.snapshot', { concurrency: true }, () => {
     assert.match(stderr, /AssertionError \[ERR_ASSERTION\]/);
     assert.match(stderr, /Snapshot "non existing" does not exist/);
     assert.strictEqual(code, 1);
-    assert.match(snapshot, /^another name:\n'test'\r?\n#\*#\*#\*#\*#\*#\*#\*#\*#\*#\*#\*#\r?\nname:\r?\n'test'$/);
+    assert.match(snapshot, /^another name:\r?\n'test'\r?\n#\*#\*#\*#\*#\*#\*#\*#\*#\*#\*#\*#\r?\nname:\r?\n'test'$/);
   });
 
   it('should snapshot a random replaced value', async () => {