From fd2658db8ba707577488b89be84ccaa4a8e9c607 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Fri, 2 May 2025 10:19:43 -0300 Subject: replacer: parseInput -> parseContentNodes --- src/content/dependencies/transformContent.js | 4 ++-- src/data/checks.js | 4 ++-- src/data/composite/things/content/withAnnotationParts.js | 2 +- src/data/composite/things/content/withSourceText.js | 2 +- src/data/composite/things/content/withSourceURLs.js | 2 +- src/data/composite/wiki-data/withContentNodes.js | 4 ++-- src/data/yaml.js | 4 ++-- src/replacer.js | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/content/dependencies/transformContent.js b/src/content/dependencies/transformContent.js index 805c3625..c1415474 100644 --- a/src/content/dependencies/transformContent.js +++ b/src/content/dependencies/transformContent.js @@ -1,5 +1,5 @@ import {bindFind} from '#find'; -import {replacerSpec, parseInput} from '#replacer'; +import {replacerSpec, parseContentNodes} from '#replacer'; import {Marked} from 'marked'; import striptags from 'striptags'; @@ -71,7 +71,7 @@ export default { sprawl(wikiData, content) { const find = bindFind(wikiData); - const parsedNodes = parseInput(content ?? ''); + const parsedNodes = parseContentNodes(content ?? ''); return { nodes: parsedNodes diff --git a/src/data/checks.js b/src/data/checks.js index c395f2f0..0bbd044e 100644 --- a/src/data/checks.js +++ b/src/data/checks.js @@ -4,7 +4,7 @@ import {inspect as nodeInspect} from 'node:util'; import {colors, ENABLE_COLOR} from '#cli'; import CacheableObject from '#cacheable-object'; -import {replacerSpec, parseInput} from '#replacer'; +import {replacerSpec, parseContentNodes} from '#replacer'; import {compareArrays, cut, cutStart, empty, getNestedProp, iterateMultiline} from '#sugar'; import Thing from '#thing'; @@ -638,7 +638,7 @@ export function reportContentTextErrors(wikiData, { const findArtistOrAlias = bindFindArtistOrAlias(boundFind); function* processContent(input) { - const nodes = parseInput(input); + const nodes = parseContentNodes(input); for (const node of nodes) { const index = node.i; diff --git a/src/data/composite/things/content/withAnnotationParts.js b/src/data/composite/things/content/withAnnotationParts.js index 290a7292..5eb8e3d5 100644 --- a/src/data/composite/things/content/withAnnotationParts.js +++ b/src/data/composite/things/content/withAnnotationParts.js @@ -1,5 +1,5 @@ import {input, templateCompositeFrom} from '#composite'; -import {parseInput} from '#replacer'; +import {parseContentNodes} from '#replacer'; import {transposeArrays} from '#sugar'; import {is} from '#validators'; diff --git a/src/data/composite/things/content/withSourceText.js b/src/data/composite/things/content/withSourceText.js index 487b3763..e0cd2f15 100644 --- a/src/data/composite/things/content/withSourceText.js +++ b/src/data/composite/things/content/withSourceText.js @@ -1,5 +1,5 @@ import {input, templateCompositeFrom} from '#composite'; -import {parseInput} from '#replacer'; +import {parseContentNodes} from '#replacer'; import {raiseOutputWithoutDependency} from '#composite/control-flow'; diff --git a/src/data/composite/things/content/withSourceURLs.js b/src/data/composite/things/content/withSourceURLs.js index 7c7b0ab2..263eb5f6 100644 --- a/src/data/composite/things/content/withSourceURLs.js +++ b/src/data/composite/things/content/withSourceURLs.js @@ -1,5 +1,5 @@ import {input, templateCompositeFrom} from '#composite'; -import {parseInput} from '#replacer'; +import {parseContentNodes} from '#replacer'; import {raiseOutputWithoutDependency} from '#composite/control-flow'; import {withFilteredList, withMappedList} from '#composite/data'; diff --git a/src/data/composite/wiki-data/withContentNodes.js b/src/data/composite/wiki-data/withContentNodes.js index 25352020..d014d43b 100644 --- a/src/data/composite/wiki-data/withContentNodes.js +++ b/src/data/composite/wiki-data/withContentNodes.js @@ -1,5 +1,5 @@ import {input, templateCompositeFrom} from '#composite'; -import {parseInput} from '#replacer'; +import {parseContentNodes} from '#replacer'; export default templateCompositeFrom({ annotation: `withContentNodes`, @@ -18,7 +18,7 @@ export default templateCompositeFrom({ [input('from')]: string, }) => continuation({ ['#contentNodes']: - parseInput(string), + parseContentNodes(string), }), }, ], diff --git a/src/data/yaml.js b/src/data/yaml.js index f3f422f7..79d71ebf 100644 --- a/src/data/yaml.js +++ b/src/data/yaml.js @@ -8,7 +8,7 @@ import {inspect as nodeInspect} from 'node:util'; import yaml from 'js-yaml'; import {colors, ENABLE_COLOR, logInfo, logWarn} from '#cli'; -import {parseInput, splitContentNodesAround} from '#replacer'; +import {parseContentNodes, splitContentNodesAround} from '#replacer'; import {sortByName} from '#sort'; import Thing from '#thing'; import thingConstructors from '#things'; @@ -835,7 +835,7 @@ export function parseContentEntries(thingClass, sourceText, {subdoc}) { const artistTextNodes = Array.from( splitContentNodesAround( - parseInput(matchEntry.artistText), + parseContentNodes(matchEntry.artistText), /\|/g)); const separatorIndices = diff --git a/src/replacer.js b/src/replacer.js index 8574bf0c..0698eced 100644 --- a/src/replacer.js +++ b/src/replacer.js @@ -821,7 +821,7 @@ export function postprocessExternalLinks(inputNodes) { return outputNodes; } -export function parseInput(input) { +export function parseContentNodes(input) { if (typeof input !== 'string') { throw new TypeError(`Expected input to be string, got ${typeAppearance(input)}`); } -- cgit 1.3.0-6-gf8a5