From 6eb9eeb92c9cc21fca6b4aac78e6731c66a22f78 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Sat, 31 Dec 2022 14:19:56 +0200 Subject: [PATCH 1/3] fix(ffi): use `export const` & `const` --- src/Data/TemplateString/TemplateString.js | 6 +++--- src/Data/TemplateString/Unsafe/TemplateString.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Data/TemplateString/TemplateString.js b/src/Data/TemplateString/TemplateString.js index dbb28c1..f12d5eb 100644 --- a/src/Data/TemplateString/TemplateString.js +++ b/src/Data/TemplateString/TemplateString.js @@ -1,5 +1,5 @@ -exports._buildExclamationKeyObject = function (tuples) { +export const _buildExclamationKeyObject = function (tuples) { var valueMap = {}; tuples.forEach(function (tuple) { valueMap['!' + tuple.value0] = tuple.value1; @@ -7,9 +7,9 @@ exports._buildExclamationKeyObject = function (tuples) { return valueMap; }; -var templatePattern = /\$\{([^}]+)\}/g; +const templatePattern = /\$\{([^}]+)\}/g; -exports._getTemplateVars = function (str) { +export const _getTemplateVars = function (str) { return (str.match(templatePattern) || []).map(function (str) { return str.substring(2, str.length - 1); }); diff --git a/src/Data/TemplateString/Unsafe/TemplateString.js b/src/Data/TemplateString/Unsafe/TemplateString.js index 5718cad..44c5046 100644 --- a/src/Data/TemplateString/Unsafe/TemplateString.js +++ b/src/Data/TemplateString/Unsafe/TemplateString.js @@ -1,7 +1,7 @@ -var templatePattern = /\$\{([^}]+)\}/g; +const templatePattern = /\$\{([^}]+)\}/g; -exports._templateBy = function (keyFrom, str, obj) { +export const _templateBy = function (keyFrom, str, obj) { return str.replace(templatePattern, function (match, ident) { var key = keyFrom(ident); return Object.hasOwnProperty.call(obj, key) ? obj[key] : match; From dbd24d77366ddef3e163f2c2fff91d799e23af01 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Sat, 31 Dec 2022 14:24:34 +0200 Subject: [PATCH 2/3] style: use ES6 for more things The changes to exports were needed, but some of the other changes are more stylistic choices. --- src/Data/TemplateString/TemplateString.js | 6 +++--- src/Data/TemplateString/Unsafe/TemplateString.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Data/TemplateString/TemplateString.js b/src/Data/TemplateString/TemplateString.js index f12d5eb..9655683 100644 --- a/src/Data/TemplateString/TemplateString.js +++ b/src/Data/TemplateString/TemplateString.js @@ -1,6 +1,6 @@ -export const _buildExclamationKeyObject = function (tuples) { - var valueMap = {}; +export const function _buildExclamationKeyObject(tuples) { + const valueMap = {}; tuples.forEach(function (tuple) { valueMap['!' + tuple.value0] = tuple.value1; }); @@ -9,7 +9,7 @@ export const _buildExclamationKeyObject = function (tuples) { const templatePattern = /\$\{([^}]+)\}/g; -export const _getTemplateVars = function (str) { +export const function _getTemplateVars(str) { return (str.match(templatePattern) || []).map(function (str) { return str.substring(2, str.length - 1); }); diff --git a/src/Data/TemplateString/Unsafe/TemplateString.js b/src/Data/TemplateString/Unsafe/TemplateString.js index 44c5046..c816f3e 100644 --- a/src/Data/TemplateString/Unsafe/TemplateString.js +++ b/src/Data/TemplateString/Unsafe/TemplateString.js @@ -1,9 +1,9 @@ const templatePattern = /\$\{([^}]+)\}/g; -export const _templateBy = function (keyFrom, str, obj) { +export const function _templateBy(keyFrom, str, obj) { return str.replace(templatePattern, function (match, ident) { - var key = keyFrom(ident); + const key = keyFrom(ident); return Object.hasOwnProperty.call(obj, key) ? obj[key] : match; }); }; From a4450688b11d6640174aa32ae59e726c05795796 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Sat, 31 Dec 2022 14:32:55 +0200 Subject: [PATCH 3/3] fix: `const function` instead of just `function` --- src/Data/TemplateString/TemplateString.js | 4 ++-- src/Data/TemplateString/Unsafe/TemplateString.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Data/TemplateString/TemplateString.js b/src/Data/TemplateString/TemplateString.js index 9655683..384ed00 100644 --- a/src/Data/TemplateString/TemplateString.js +++ b/src/Data/TemplateString/TemplateString.js @@ -1,5 +1,5 @@ -export const function _buildExclamationKeyObject(tuples) { +export function _buildExclamationKeyObject(tuples) { const valueMap = {}; tuples.forEach(function (tuple) { valueMap['!' + tuple.value0] = tuple.value1; @@ -9,7 +9,7 @@ export const function _buildExclamationKeyObject(tuples) { const templatePattern = /\$\{([^}]+)\}/g; -export const function _getTemplateVars(str) { +export function _getTemplateVars(str) { return (str.match(templatePattern) || []).map(function (str) { return str.substring(2, str.length - 1); }); diff --git a/src/Data/TemplateString/Unsafe/TemplateString.js b/src/Data/TemplateString/Unsafe/TemplateString.js index c816f3e..55b9f24 100644 --- a/src/Data/TemplateString/Unsafe/TemplateString.js +++ b/src/Data/TemplateString/Unsafe/TemplateString.js @@ -1,7 +1,7 @@ const templatePattern = /\$\{([^}]+)\}/g; -export const function _templateBy(keyFrom, str, obj) { +export function _templateBy(keyFrom, str, obj) { return str.replace(templatePattern, function (match, ident) { const key = keyFrom(ident); return Object.hasOwnProperty.call(obj, key) ? obj[key] : match;