Skip to content

Commit

Permalink
feat: support when last character is a separator (#185)
Browse files Browse the repository at this point in the history
  • Loading branch information
arthurdenner committed Feb 29, 2020
1 parent 1355e5f commit a3281df
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 2 deletions.
14 changes: 14 additions & 0 deletions src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,17 @@ it('It should work if used to build specific functions', () => {

expect(result).toEqual('123-456-789');
});

describe('when the last character in pattern is a separator', () => {
it('should format properly if pattern begins with a separator', () => {
const result = formatStringByPattern('(999)', 123);

expect(result).toEqual('(123)');
});

it("should format properly if pattern doesn't begin with a separator", () => {
const result = formatStringByPattern('999)', 123);

expect(result).toEqual('123)');
});
});
21 changes: 19 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
function shouldAppendLastSeparator(current: string, pattern: string, lastSeparator: string) {
return current.length + 1 === pattern.length && pattern.endsWith(lastSeparator);
}

function getFormattedString(pattern: string, value?: string | number) {
if (!value) {
return value;
Expand All @@ -10,6 +14,7 @@ function getFormattedString(pattern: string, value?: string | number) {
.map(b => b.length);
const separators = pattern.split(/[\da-zA-Z\n|]/g).filter(Boolean);
const [firstSeparator] = separators;
const lastSeparator = separators[separators.length - 1];

if (pattern.startsWith(firstSeparator)) {
const afterReduce = separators.reduce(
Expand All @@ -30,7 +35,13 @@ function getFormattedString(pattern: string, value?: string | number) {
}
);

return afterReduce.result.slice(0, pattern.length);
const res = afterReduce.result.slice(0, pattern.length);

if (shouldAppendLastSeparator(res, pattern, lastSeparator)) {
return res.concat(lastSeparator);
}

return res;
}

const afterReduce = blockSizes.reduce(
Expand All @@ -54,7 +65,13 @@ function getFormattedString(pattern: string, value?: string | number) {
}
);

return afterReduce.value.slice(0, pattern.length);
const res = afterReduce.value.slice(0, pattern.length);

if (shouldAppendLastSeparator(res, pattern, lastSeparator)) {
return res.concat(lastSeparator);
}

return res;
}

function formatStringByPattern(pattern: string): (value?: string | number) => string;
Expand Down

0 comments on commit a3281df

Please sign in to comment.