Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e980e44
Linting/formatting
camdecoster Sep 29, 2025
212f892
Return empty string for undefined value in templateFormatString
camdecoster Sep 29, 2025
75b157f
Refactoring
camdecoster Oct 2, 2025
5f3670f
Add fallback value for template strings
camdecoster Oct 3, 2025
336e9ae
Add fallback to calls to hovertemplateString
camdecoster Oct 3, 2025
02a4cad
Add fallback to calls to texttemplateString
camdecoster Oct 3, 2025
77bc2b9
Add fallback to calls to texttemplateStringForShapes
camdecoster Oct 7, 2025
85b67e9
Update defaults calculations
camdecoster Oct 6, 2025
680c793
Add helper function for template fallback attributes
camdecoster Oct 6, 2025
52c29cc
Add fallback value to attributes files
camdecoster Oct 7, 2025
f623b22
Update esbuild strip meta plugin to handle more joined arrays
camdecoster Oct 8, 2025
074f8a0
Return array from ternary
camdecoster Oct 8, 2025
6f3daa8
Update tests per default fallback value
camdecoster Oct 8, 2025
6719bd3
Update schema
camdecoster Oct 8, 2025
84fc044
Update test baselines
camdecoster Oct 8, 2025
e719f74
Rename object keys
camdecoster Oct 8, 2025
fb7a40c
Add/update tests to check fallback value
camdecoster Oct 9, 2025
faaae28
Add draftlog
camdecoster Oct 9, 2025
5c032c6
Fix typos
camdecoster Oct 21, 2025
a0ce641
Update fallback `editType` to match template
camdecoster Oct 21, 2025
14ab31c
Handle undefined values and missing values differently
camdecoster Oct 23, 2025
4f79efe
Update default fallback value and template attribute descriptions
camdecoster Oct 23, 2025
257475c
Add tests for missing and undefined values
camdecoster Oct 23, 2025
a148edd
Update schema
camdecoster Oct 23, 2025
c40fe9f
Merge remote-tracking branch 'origin/master' into cam/7564/return-emp…
camdecoster Oct 23, 2025
6a66148
Revert "Update test baselines"
camdecoster Oct 23, 2025
5215f13
Always use fallback for missing values, except when fallback is false
camdecoster Oct 24, 2025
30f87f3
Update schema
camdecoster Oct 24, 2025
b61d70d
Update mocks to show fallback values
camdecoster Oct 24, 2025
d900ca3
Update tests per final behavior
camdecoster Oct 24, 2025
a061787
Update baseline images
camdecoster Oct 24, 2025
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
Prev Previous commit
Next Next commit
Handle undefined values and missing values differently
  • Loading branch information
camdecoster committed Oct 23, 2025
commit 14ab31ccb710ec449fa79acbfb746a5f7f9dcd3f
42 changes: 29 additions & 13 deletions src/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1122,24 +1122,26 @@ var TEMPLATE_STRING_FORMAT_SEPARATOR = /^[:|\|]/;
* @param {object} options.labels - Data object containing fallback text when no formatting is specified, ex.: {yLabel: 'formattedYValue'}
* @param {object} options.locale - D3 locale for formatting
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: IMO this argument should continue to be called d3locale for clarity

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to leave it as is since the JSDoc description explains what it is.

* @param {object} options.opts - Additional options
* @param {string} options.template - Input string containing %{...:...} template strings
* @param {number} options.opts.count - Count of warnings for missing values
* @param {number} options.opts.max - Maximum allowed count of warnings for missing values before suppressing the warning message
* @param {string} options.opts.name - Template name, used in warning message
* @param {boolean} options.opts.parseMultDiv - Parse * and / operators in template string (used in shape labels)
* @param {string} options.template - Input string containing %{...:...} template string specifiers
*
* @return {string} templated string
*/
function templateFormatString({ data = [], locale, fallback, labels = {}, opts, template }) {
return template.replace(lib.TEMPLATE_STRING_REGEX, (_, rawKey, format) => {
const isOther = ['xother', 'yother'].includes(rawKey);
const isSpaceOther = ['_xother', '_yother'].includes(rawKey);
const isSpaceOtherSpace = ['_xother_', '_yother_'].includes(rawKey);
const isOtherSpace = ['xother_', 'yother_'].includes(rawKey);
return template.replace(lib.TEMPLATE_STRING_REGEX, (match, key, format) => {
const isOther = ['xother', 'yother'].includes(key);
const isSpaceOther = ['_xother', '_yother'].includes(key);
const isSpaceOtherSpace = ['_xother_', '_yother_'].includes(key);
const isOtherSpace = ['xother_', 'yother_'].includes(key);
const hasOther = isOther || isSpaceOther || isOtherSpace || isSpaceOtherSpace;

let key = rawKey;
// Remove underscores from key
if (isSpaceOther || isSpaceOtherSpace) key = key.substring(1);
if (isOtherSpace || isSpaceOtherSpace) key = key.substring(0, key.length - 1);

// Shape labels support * and / operators in template string
// Parse these if the parseMultDiv param is set to true
let parsedOp = null;
let parsedNumber = null;
if (opts.parseMultDiv) {
Expand All @@ -1149,32 +1151,46 @@ function templateFormatString({ data = [], locale, fallback, labels = {}, opts,
parsedNumber = _match.number;
}

let value;
let keyIsMissing = true;
let value = undefined;
if (hasOther) {
// 'other' specifiers that are undefined return an empty string by design
if (labels[key] === undefined) return '';
value = labels[key];
keyIsMissing = false;
} else {
for (const obj of data) {
if (!obj) continue;
if (obj.hasOwnProperty(key)) {
value = obj[key];
keyIsMissing = false;
break;
}

if (!SIMPLE_PROPERTY_REGEX.test(key)) {
// true here means don't convert null to undefined
value = lib.nestedProperty(obj, key).get(true);
keyIsMissing = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm this is a tough one, the question is whether lib.nestedProperty(obj, key).get() provides a way to distinguish between "the value of this key path is undefined" vs. "this key path was not found in the object"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is moot since I removed this part of the code.

}
if (value !== undefined) break;
}
}

if (value === undefined) {
if (keyIsMissing) {
const { count, max, name } = opts;
if (count < max) lib.warn(`Variable '${key}' in ${name} could not be found! Using fallback value.`);
if (count === max) lib.warn(`Too many '${name}' warnings - additional warnings will be suppressed`);
if (count < max)
lib.warn(
[
`Variable '${key}' in ${name} could not be found!`,
'Please verify that the template is correct.'
].join(' ')
);
if (count === max) lib.warn(`Too many '${name}' warnings - additional warnings will be suppressed.`);
opts.count++;

return match;
} else if (value === undefined) {
// In this case, the actual value in the data set is 'undefined', so use fallback without warning
return fallback;
}

Expand Down