Skip to content

Commit 0b9b8e3

Browse files
refactor: m_ => mut_
1 parent 755127b commit 0b9b8e3

File tree

10 files changed

+197
-193
lines changed

10 files changed

+197
-193
lines changed

benchmark/run.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ const benchmarkDataSets: Array<{
4444
return data;
4545
});
4646

47-
for (let m_i = 0; m_i < benchmarkDataSets.length; m_i++) {
48-
const { name: benchmarkName, data: benchmarkData } = benchmarkDataSets[m_i];
47+
for (let mut_i = 0; mut_i < benchmarkDataSets.length; mut_i++) {
48+
const { name: benchmarkName, data: benchmarkData } = benchmarkDataSets[mut_i];
4949
const bench = new Bench({
5050
time: 10_000,
5151
iterations: 1,
5252
warmupTime: 1000,
5353
warmupIterations: 1,
5454
});
5555

56-
console.log(`\nRunning benchmarks for data set "${benchmarkName}" (${m_i + 1} of ${benchmarkDataSets.length}):\n`);
56+
console.log(`\nRunning benchmarks for data set "${benchmarkName}" (${mut_i + 1} of ${benchmarkDataSets.length}):\n`);
5757

5858
bench
5959
.add("deepmerge-ts", () => {
@@ -84,7 +84,7 @@ for (let m_i = 0; m_i < benchmarkDataSets.length; m_i++) {
8484
function generateBenchmarkDataSet(name: string, items: number, maxProperties: number, maxDepth: number) {
8585
const data: object[] = [];
8686

87-
for (let m_i = 0; m_i < items; m_i++) {
87+
for (let mut_i = 0; mut_i < items; mut_i++) {
8888
data.push(generateBenchmarkDataItem(maxProperties, maxDepth));
8989
}
9090

@@ -101,8 +101,8 @@ function generateBenchmarkDataItem(maxProperties: number, depth: number, current
101101

102102
const propertiesOptions = shuffle(Array.from({ length: maxProperties }, (_, i) => String.fromCodePoint(i + 65)));
103103

104-
for (let m_i = 0; m_i < properties; m_i++) {
105-
const prop = propertiesOptions[m_i];
104+
for (let mut_i = 0; mut_i < properties; mut_i++) {
105+
const prop = propertiesOptions[mut_i];
106106

107107
obj[prop] = currentDepth < depth ? generateBenchmarkDataItem(maxProperties, depth, currentDepth + 1) : "value";
108108
}
@@ -111,14 +111,14 @@ function generateBenchmarkDataItem(maxProperties: number, depth: number, current
111111
}
112112

113113
function shuffle<T>(array: T[]) {
114-
let m_currentIndex = array.length;
115-
let m_randomIndex;
114+
let mut_currentIndex = array.length;
115+
let mut_randomIndex;
116116

117-
while (m_currentIndex !== 0) {
118-
m_randomIndex = Math.floor(Math.random() * m_currentIndex);
119-
m_currentIndex--;
117+
while (mut_currentIndex !== 0) {
118+
mut_randomIndex = Math.floor(Math.random() * mut_currentIndex);
119+
mut_currentIndex--;
120120

121-
[array[m_currentIndex], array[m_randomIndex]] = [array[m_randomIndex], array[m_currentIndex]];
121+
[array[mut_currentIndex], array[mut_randomIndex]] = [array[mut_randomIndex], array[mut_currentIndex]];
122122
}
123123

124124
return array;

src/deepmerge-into.ts

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ function getIntoUtils<M, MM extends DeepMergeBuiltInMetaData = DeepMergeBuiltInM
130130
/**
131131
* Merge unknown things into a target.
132132
*
133-
* @param m_target - The target to merge into.
133+
* @param mut_target - The target to merge into.
134134
* @param values - The values.
135135
*/
136136
export function mergeUnknownsInto<
@@ -139,7 +139,7 @@ export function mergeUnknownsInto<
139139
M,
140140
MM extends DeepMergeBuiltInMetaData = DeepMergeBuiltInMetaData,
141141
>(
142-
m_target: Reference<unknown>,
142+
mut_target: Reference<unknown>,
143143
values: Ts,
144144
utils: U,
145145
meta: M | undefined,
@@ -151,25 +151,25 @@ export function mergeUnknownsInto<
151151
return;
152152
}
153153
if (filteredValues.length === 1) {
154-
return void mergeOthersInto<U, M, MM>(m_target, filteredValues, utils, meta);
154+
return void mergeOthersInto<U, M, MM>(mut_target, filteredValues, utils, meta);
155155
}
156156

157-
const type = getObjectType(m_target.value);
157+
const type = getObjectType(mut_target.value);
158158

159159
if (type !== ObjectType.NOT && type !== ObjectType.OTHER) {
160-
for (let m_index = 1; m_index < filteredValues.length; m_index++) {
161-
if (getObjectType(filteredValues[m_index]) === type) {
160+
for (let mut_index = 1; mut_index < filteredValues.length; mut_index++) {
161+
if (getObjectType(filteredValues[mut_index]) === type) {
162162
continue;
163163
}
164164

165-
return void mergeOthersInto<U, M, MM>(m_target, filteredValues, utils, meta);
165+
return void mergeOthersInto<U, M, MM>(mut_target, filteredValues, utils, meta);
166166
}
167167
}
168168

169169
switch (type) {
170170
case ObjectType.RECORD: {
171171
return void mergeRecordsInto<U, M, MM>(
172-
m_target as Reference<Record<PropertyKey, unknown>>,
172+
mut_target as Reference<Record<PropertyKey, unknown>>,
173173
filteredValues as ReadonlyArray<Readonly<Record<PropertyKey, unknown>>>,
174174
utils,
175175
meta,
@@ -178,7 +178,7 @@ export function mergeUnknownsInto<
178178

179179
case ObjectType.ARRAY: {
180180
return void mergeArraysInto<U, M, MM>(
181-
m_target as Reference<unknown[]>,
181+
mut_target as Reference<unknown[]>,
182182
filteredValues as ReadonlyArray<ReadonlyArray<unknown>>,
183183
utils,
184184
meta,
@@ -187,7 +187,7 @@ export function mergeUnknownsInto<
187187

188188
case ObjectType.SET: {
189189
return void mergeSetsInto<U, M, MM>(
190-
m_target as Reference<Set<unknown>>,
190+
mut_target as Reference<Set<unknown>>,
191191
filteredValues as ReadonlyArray<Readonly<ReadonlySet<unknown>>>,
192192
utils,
193193
meta,
@@ -196,40 +196,40 @@ export function mergeUnknownsInto<
196196

197197
case ObjectType.MAP: {
198198
return void mergeMapsInto<U, M, MM>(
199-
m_target as Reference<Map<unknown, unknown>>,
199+
mut_target as Reference<Map<unknown, unknown>>,
200200
filteredValues as ReadonlyArray<Readonly<ReadonlyMap<unknown, unknown>>>,
201201
utils,
202202
meta,
203203
);
204204
}
205205

206206
default: {
207-
return void mergeOthersInto<U, M, MM>(m_target, filteredValues, utils, meta);
207+
return void mergeOthersInto<U, M, MM>(mut_target, filteredValues, utils, meta);
208208
}
209209
}
210210
}
211211

212212
/**
213213
* Merge records into a target record.
214214
*
215-
* @param m_target - The target to merge into.
215+
* @param mut_target - The target to merge into.
216216
* @param values - The records.
217217
*/
218218
function mergeRecordsInto<
219219
U extends DeepMergeIntoFunctionUtils<M, MM>,
220220
M,
221221
MM extends DeepMergeBuiltInMetaData = DeepMergeBuiltInMetaData,
222222
>(
223-
m_target: Reference<Record<PropertyKey, unknown>>,
223+
mut_target: Reference<Record<PropertyKey, unknown>>,
224224
values: ReadonlyArray<Readonly<Record<PropertyKey, unknown>>>,
225225
utils: U,
226226
meta: M | undefined,
227227
) {
228-
const action = utils.mergeFunctions.mergeRecords(m_target, values, utils, meta);
228+
const action = utils.mergeFunctions.mergeRecords(mut_target, values, utils, meta);
229229

230230
if (action === actions.defaultMerge) {
231231
utils.defaultMergeFunctions.mergeRecords<ReadonlyArray<Readonly<Record<PropertyKey, unknown>>>, U, M, MM>(
232-
m_target,
232+
mut_target,
233233
values,
234234
utils,
235235
meta,
@@ -240,81 +240,81 @@ function mergeRecordsInto<
240240
/**
241241
* Merge arrays into a target array.
242242
*
243-
* @param m_target - The target to merge into.
243+
* @param mut_target - The target to merge into.
244244
* @param values - The arrays.
245245
*/
246246
function mergeArraysInto<
247247
U extends DeepMergeIntoFunctionUtils<M, MM>,
248248
M,
249249
MM extends DeepMergeBuiltInMetaData = DeepMergeBuiltInMetaData,
250-
>(m_target: Reference<unknown[]>, values: ReadonlyArray<ReadonlyArray<unknown>>, utils: U, meta: M | undefined) {
251-
const action = utils.mergeFunctions.mergeArrays(m_target, values, utils, meta);
250+
>(mut_target: Reference<unknown[]>, values: ReadonlyArray<ReadonlyArray<unknown>>, utils: U, meta: M | undefined) {
251+
const action = utils.mergeFunctions.mergeArrays(mut_target, values, utils, meta);
252252

253253
if (action === actions.defaultMerge) {
254-
utils.defaultMergeFunctions.mergeArrays(m_target, values);
254+
utils.defaultMergeFunctions.mergeArrays(mut_target, values);
255255
}
256256
}
257257

258258
/**
259259
* Merge sets into a target set.
260260
*
261-
* @param m_target - The target to merge into.
261+
* @param mut_target - The target to merge into.
262262
* @param values - The sets.
263263
*/
264264
function mergeSetsInto<
265265
U extends DeepMergeIntoFunctionUtils<M, MM>,
266266
M,
267267
MM extends DeepMergeBuiltInMetaData = DeepMergeBuiltInMetaData,
268268
>(
269-
m_target: Reference<Set<unknown>>,
269+
mut_target: Reference<Set<unknown>>,
270270
values: ReadonlyArray<Readonly<ReadonlySet<unknown>>>,
271271
utils: U,
272272
meta: M | undefined,
273273
) {
274-
const action = utils.mergeFunctions.mergeSets(m_target, values, utils, meta);
274+
const action = utils.mergeFunctions.mergeSets(mut_target, values, utils, meta);
275275

276276
if (action === actions.defaultMerge) {
277-
utils.defaultMergeFunctions.mergeSets(m_target, values);
277+
utils.defaultMergeFunctions.mergeSets(mut_target, values);
278278
}
279279
}
280280

281281
/**
282282
* Merge maps into a target map.
283283
*
284-
* @param m_target - The target to merge into.
284+
* @param mut_target - The target to merge into.
285285
* @param values - The maps.
286286
*/
287287
function mergeMapsInto<
288288
U extends DeepMergeIntoFunctionUtils<M, MM>,
289289
M,
290290
MM extends DeepMergeBuiltInMetaData = DeepMergeBuiltInMetaData,
291291
>(
292-
m_target: Reference<Map<unknown, unknown>>,
292+
mut_target: Reference<Map<unknown, unknown>>,
293293
values: ReadonlyArray<Readonly<ReadonlyMap<unknown, unknown>>>,
294294
utils: U,
295295
meta: M | undefined,
296296
) {
297-
const action = utils.mergeFunctions.mergeMaps(m_target, values, utils, meta);
297+
const action = utils.mergeFunctions.mergeMaps(mut_target, values, utils, meta);
298298

299299
if (action === actions.defaultMerge) {
300-
utils.defaultMergeFunctions.mergeMaps(m_target, values);
300+
utils.defaultMergeFunctions.mergeMaps(mut_target, values);
301301
}
302302
}
303303

304304
/**
305305
* Merge other things into a target.
306306
*
307-
* @param m_target - The target to merge into.
307+
* @param mut_target - The target to merge into.
308308
* @param values - The other things.
309309
*/
310310
function mergeOthersInto<
311311
U extends DeepMergeIntoFunctionUtils<M, MM>,
312312
M,
313313
MM extends DeepMergeBuiltInMetaData = DeepMergeBuiltInMetaData,
314-
>(m_target: Reference<unknown>, values: ReadonlyArray<unknown>, utils: U, meta: M | undefined) {
315-
const action = utils.mergeFunctions.mergeOthers(m_target, values, utils, meta);
314+
>(mut_target: Reference<unknown>, values: ReadonlyArray<unknown>, utils: U, meta: M | undefined) {
315+
const action = utils.mergeFunctions.mergeOthers(mut_target, values, utils, meta);
316316

317-
if (action === actions.defaultMerge || m_target.value === actions.defaultMerge) {
318-
utils.defaultMergeFunctions.mergeOthers(m_target, values);
317+
if (action === actions.defaultMerge || mut_target.value === actions.defaultMerge) {
318+
utils.defaultMergeFunctions.mergeOthers(mut_target, values);
319319
}
320320
}

src/deepmerge.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ export function mergeUnknowns<
136136
const type = getObjectType(filteredValues[0]);
137137

138138
if (type !== ObjectType.NOT && type !== ObjectType.OTHER) {
139-
for (let m_index = 1; m_index < filteredValues.length; m_index++) {
140-
if (getObjectType(filteredValues[m_index]) === type) {
139+
for (let mut_index = 1; mut_index < filteredValues.length; mut_index++) {
140+
if (getObjectType(filteredValues[mut_index]) === type) {
141141
continue;
142142
}
143143

src/defaults/into.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ export type MergeFunctions = {
1616
/**
1717
* The default strategy to merge records into a target record.
1818
*
19-
* @param m_target - The result will be mutated into this record
19+
* @param mut_target - The result will be mutated into this record
2020
* @param values - The records (including the target's value if there is one).
2121
*/
2222
function mergeRecordsInto<
2323
Ts extends ReadonlyArray<Record<PropertyKey, unknown>>,
2424
U extends DeepMergeIntoFunctionUtils<M, MM>,
2525
M,
2626
MM extends DeepMergeBuiltInMetaData = DeepMergeBuiltInMetaData,
27-
>(m_target: Reference<Record<PropertyKey, unknown>>, values: Ts, utils: U, meta: M | undefined): void {
27+
>(mut_target: Reference<Record<PropertyKey, unknown>>, values: Ts, utils: U, meta: M | undefined): void {
2828
for (const key of getKeys(values)) {
2929
const propValues = [];
3030

@@ -47,66 +47,66 @@ function mergeRecordsInto<
4747
mergeUnknownsInto<ReadonlyArray<unknown>, U, M, MM>(propertyTarget, propValues, utils, updatedMeta);
4848

4949
if (key === "__proto__") {
50-
Object.defineProperty(m_target.value, key, {
50+
Object.defineProperty(mut_target.value, key, {
5151
value: propertyTarget.value,
5252
configurable: true,
5353
enumerable: true,
5454
writable: true,
5555
});
5656
} else {
57-
m_target.value[key] = propertyTarget.value;
57+
mut_target.value[key] = propertyTarget.value;
5858
}
5959
}
6060
}
6161

6262
/**
6363
* The default strategy to merge arrays into a target array.
6464
*
65-
* @param m_target - The result will be mutated into this array
65+
* @param mut_target - The result will be mutated into this array
6666
* @param values - The arrays (including the target's value if there is one).
6767
*/
6868
function mergeArraysInto<Ts extends ReadonlyArray<ReadonlyArray<unknown>>>(
69-
m_target: Reference<unknown[]>,
69+
mut_target: Reference<unknown[]>,
7070
values: Ts,
7171
): void {
72-
m_target.value.push(...values.slice(1).flat());
72+
mut_target.value.push(...values.slice(1).flat());
7373
}
7474

7575
/**
7676
* The default strategy to merge sets into a target set.
7777
*
78-
* @param m_target - The result will be mutated into this set
78+
* @param mut_target - The result will be mutated into this set
7979
* @param values - The sets (including the target's value if there is one).
8080
*/
8181
function mergeSetsInto<Ts extends ReadonlyArray<Readonly<ReadonlySet<unknown>>>>(
82-
m_target: Reference<Set<unknown>>,
82+
mut_target: Reference<Set<unknown>>,
8383
values: Ts,
8484
): void {
8585
for (const value of getIterableOfIterables(values.slice(1))) {
86-
m_target.value.add(value);
86+
mut_target.value.add(value);
8787
}
8888
}
8989

9090
/**
9191
* The default strategy to merge maps into a target map.
9292
*
93-
* @param m_target - The result will be mutated into this map
93+
* @param mut_target - The result will be mutated into this map
9494
* @param values - The maps (including the target's value if there is one).
9595
*/
9696
function mergeMapsInto<Ts extends ReadonlyArray<Readonly<ReadonlyMap<unknown, unknown>>>>(
97-
m_target: Reference<Map<unknown, unknown>>,
97+
mut_target: Reference<Map<unknown, unknown>>,
9898
values: Ts,
9999
): void {
100100
for (const [key, value] of getIterableOfIterables(values.slice(1))) {
101-
m_target.value.set(key, value);
101+
mut_target.value.set(key, value);
102102
}
103103
}
104104

105105
/**
106106
* Set the target to the last value.
107107
*/
108-
function mergeOthersInto<Ts extends ReadonlyArray<unknown>>(m_target: Reference<unknown>, values: Ts) {
109-
m_target.value = values.at(-1);
108+
function mergeOthersInto<Ts extends ReadonlyArray<unknown>>(mut_target: Reference<unknown>, values: Ts) {
109+
mut_target.value = values.at(-1);
110110
}
111111

112112
/**

0 commit comments

Comments
 (0)