Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/interpolate with multiple nesting keys #1801

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Fix/interpolate with multiple nesting keys #1801

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de91053
fix(packages/sui-i18n): Do not reuse regex when checking nested inter…
Aug 1, 2024
e8ed174
feat(packages/sui-i18n): Reuse the interpolate regex and handle its s…
Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions packages/sui-i18n/src/i18n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import {slugify} from '@s-ui/js/lib/string/slugify.js'

import DefaultAdapter from './adapters/default.js'

const INTERPOLATE_REGEX = /%\[(?<key>[\S\s]*?)\b\](?<children>[\S\s]*?)\[\1\]%/gi

export default class Rosetta {
constructor({adapter = new DefaultAdapter()} = {}) {
this._culture = null
Expand Down Expand Up @@ -195,14 +197,13 @@ export default class Rosetta {

// Interpolate each text chunk, returning an array of all the transformed chunks.
interpolate(key, values = {}) {
// Redeclare the RegExp on each call to make it stateless
const interpolateRegExp = /%\[(?<key>[\S\s]*?)\b\](?<children>[\S\s]*?)\[\1\]%/gi

// Perform basic replace for static values
const str = this.t(key, values)

// Identify all the occurrences which are like: %[key]children[key]%, save {key, children} in a group for every match
const matches = str.matchAll(interpolateRegExp)
// Reset the state of the regex to start from the beginning
INTERPOLATE_REGEX.lastIndex = 0
const matches = str.matchAll(INTERPOLATE_REGEX)

let remaining = str

Expand All @@ -211,7 +212,9 @@ export default class Rosetta {
let {key, children} = match.groups

// Handle nested matches
if (interpolateRegExp.test(children)) {
// We need to reset the lastIndex to 0 to start the search from the beginning
INTERPOLATE_REGEX.lastIndex = 0
if (INTERPOLATE_REGEX.test(children)) {
children = this.interpolate(children, values)
}

Expand Down