fix(setup): configure a comment-only Hermes config.yaml (#2096)
* fix(setup): configure a comment-only Hermes config.yaml
comments, or only a `---` marker, also parses to a null YAML document.
Setup still rejected it as malformed ("expected record, received null")
and reported Hermes as invalid.
Treat a null Hermes document as holding no settings, as #1983 does for
an empty file. The serializer already edits a comment-only document in
place. A bare `---` document holds a null scalar that takes no keys, so
replace it with a map and keep the comments written after the marker.
* fix(setup): keep rejecting an explicit null Hermes root
Only a document with no root, or a bare --- marker whose null scalar has
no source text, holds no settings. An explicit null or ~ is a value, so
setup and uninstall reject it as before, the same as any other non-map
root.
* test(setup): split the Hermes empty-configuration tests under the function length limit
The Hermes YAML registration block reached 159 lines, past oxlint's
max-lines-per-function limit of 150. Move the empty-document cases and
the multiple-document rejection into their own block.
* fix(setup): type the Hermes edit document as a plain Document
parseDocument with options returns a Document.Parsed, whose contents
accept only parsed nodes, so assigning the new map for a bare --- root
failed typecheck (TS2322). Annotate the edited document as Document, as
the code did before it moved into HermesConfigurationYaml.ts.
* fix(ci): isolate Linux Hopper process fixture inventory
---------
Co-authored-by: morluto <76467478+morluto@users.noreply.github.com>
This commit is contained in:
co-authored by
morluto
parent
1342eddd03
commit
aa6f74af04
@@ -1,7 +1,7 @@
|
||||
import {
|
||||
isScalar,
|
||||
parse,
|
||||
parseDocument,
|
||||
type Document,
|
||||
type ParsedNode,
|
||||
type ScalarTag,
|
||||
type Tags,
|
||||
@@ -56,9 +56,28 @@ const HERMES_YAML_OPTIONS = {
|
||||
a.source === b.source),
|
||||
};
|
||||
|
||||
/** Parse a Hermes `config.yaml`. */
|
||||
export const parseHermesConfigurationYaml = (text: string): unknown =>
|
||||
parse(text, HERMES_YAML_OPTIONS);
|
||||
// A comment-only document has no root; a bare marker has an unwritten null
|
||||
// scalar. Explicit null values, tags and anchors remain actual values.
|
||||
const isEmptyYamlRoot = (root: Document["contents"]): boolean =>
|
||||
root === null ||
|
||||
(isScalar(root) &&
|
||||
root.value === null &&
|
||||
root.source === "" &&
|
||||
root.tag === undefined &&
|
||||
root.anchor === undefined);
|
||||
|
||||
const parseHermesDocument = (text: string) => {
|
||||
const document = parseDocument(text, HERMES_YAML_OPTIONS);
|
||||
const error = document.errors[0];
|
||||
if (error !== undefined) throw error;
|
||||
return document;
|
||||
};
|
||||
|
||||
/** Parse a Hermes `config.yaml`, preserving the distinction between no root and explicit null. */
|
||||
export const parseHermesConfigurationYaml = (text: string): unknown => {
|
||||
const document = parseHermesDocument(text);
|
||||
return isEmptyYamlRoot(document.contents) ? {} : document.toJS();
|
||||
};
|
||||
|
||||
/** Set or delete one value in a Hermes `config.yaml`, keeping the rest as written. */
|
||||
export const editHermesConfigurationYaml = (
|
||||
@@ -66,7 +85,16 @@ export const editHermesConfigurationYaml = (
|
||||
path: readonly string[],
|
||||
value: unknown,
|
||||
): string => {
|
||||
const document = parseDocument(text, HERMES_YAML_OPTIONS);
|
||||
// A plain Document, so a bare `---` root can be replaced by a new map.
|
||||
const document: Document = parseHermesDocument(text);
|
||||
const root = document.contents;
|
||||
if (isScalar(root) && isEmptyYamlRoot(root)) {
|
||||
const map = document.createNode({});
|
||||
map.commentBefore = [root.commentBefore, root.comment]
|
||||
.filter((comment) => comment !== undefined)
|
||||
.join("\n");
|
||||
document.contents = map;
|
||||
}
|
||||
if (value === undefined) document.deleteIn(path);
|
||||
else document.setIn(path, value);
|
||||
// Editing REA must not reflow unrelated user prompts or other YAML scalars.
|
||||
|
||||
Reference in New Issue
Block a user