telegram-transformer 1.1.0 → 1.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +18 -18
- package/lib/format.d.ts.map +1 -1
- package/lib/format.js +20 -10
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -60,26 +60,26 @@ console.log(formatted);
|
|
|
60
60
|
|
|
61
61
|
/*
|
|
62
62
|
{
|
|
63
|
-
text: "Hello <a href='https://
|
|
63
|
+
text: "Hello <a href='https://t.me/username'>@username</a> <a href='#awesome_hashtag'>#awesome_<strong>hashtag</strong></a> $USD /start@jobs_bot <a href='https://telegram.org'>https://telegram.org</a> <a href='mailto:do-not-reply@telegram.org'>do-not-reply@telegram.org</a> <a href='tel:+1-212-555-0123'>+1-212-555-0123</a> <strong>bold text</strong> <i>italic text</i> <u>under</u><u><strong>lined</strong> text</u> <strike>strikethrough text</strike> <span class='spoiler-hover'>spoiler message</span> monowidth string monowidth block <a href='https://telegram.org/'>text_link</a>",
|
|
64
64
|
entities: [
|
|
65
|
-
{ offset: 6, length:
|
|
66
|
-
{ offset:
|
|
67
|
-
{ offset:
|
|
68
|
-
{ offset:
|
|
69
|
-
{ offset:
|
|
70
|
-
{ offset:
|
|
71
|
-
{ offset:
|
|
72
|
-
{ offset:
|
|
73
|
-
{ offset:
|
|
74
|
-
{ offset:
|
|
75
|
-
{ offset:
|
|
76
|
-
{ offset:
|
|
77
|
-
{ offset:
|
|
78
|
-
{ offset:
|
|
79
|
-
{ offset:
|
|
65
|
+
{ offset: 6, length: 45, type: 'mention' },
|
|
66
|
+
{ offset: 16, length: 16, type: 'hashtag' },
|
|
67
|
+
{ offset: 88, length: 24, type: 'bold' },
|
|
68
|
+
{ offset: 117, length: 4, type: 'cashtag' },
|
|
69
|
+
{ offset: 122, length: 15, type: 'bot_command' },
|
|
70
|
+
{ offset: 138, length: 55, type: 'url' },
|
|
71
|
+
{ offset: 194, length: 72, type: 'email' },
|
|
72
|
+
{ offset: 267, length: 49, type: 'phone_number' },
|
|
73
|
+
{ offset: 317, length: 26, type: 'bold' },
|
|
74
|
+
{ offset: 344, length: 18, type: 'italic' },
|
|
75
|
+
{ offset: 363, length: 12, type: 'underline' },
|
|
76
|
+
{ offset: 144, length: 10, type: 'underline' },
|
|
77
|
+
{ offset: 378, length: 22, type: 'bold' },
|
|
78
|
+
{ offset: 410, length: 35, type: 'strikethrough' },
|
|
79
|
+
{ offset: 446, length: 50, type: 'spoiler' },
|
|
80
80
|
{
|
|
81
|
-
offset:
|
|
82
|
-
length:
|
|
81
|
+
offset: 530,
|
|
82
|
+
length: 45,
|
|
83
83
|
type: 'text_link',
|
|
84
84
|
url: 'https://telegram.org/'
|
|
85
85
|
}
|
package/lib/format.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,eAAO,MAAM,MAAM,SACX,MAAM,aACF,aAAa,EAAE,YAChB,OAAO;;;
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,eAAO,MAAM,MAAM,SACX,MAAM,aACF,aAAa,EAAE,YAChB,OAAO;;;CAyEjB,CAAC"}
|
package/lib/format.js
CHANGED
|
@@ -17,8 +17,10 @@ const format = (text, entities = [], options = constants_1.DEFAULT_OPTIONS) => {
|
|
|
17
17
|
};
|
|
18
18
|
const startFrom = options.startFrom || constants_1.DEFAULT_OPTIONS.startFrom;
|
|
19
19
|
let newText = text;
|
|
20
|
+
let offsetChange = 0;
|
|
21
|
+
let afterOffsetChange = 0;
|
|
20
22
|
let prevOffsetChange = 0;
|
|
21
|
-
let
|
|
23
|
+
let prevLengthChange = 0;
|
|
22
24
|
for (let i = 0; i < newEntities.length; i++) {
|
|
23
25
|
const entity = { ...newEntities[i] };
|
|
24
26
|
const formatter = formatters[entity.type] || formatters_1.defaultFormatter;
|
|
@@ -28,23 +30,31 @@ const format = (text, entities = [], options = constants_1.DEFAULT_OPTIONS) => {
|
|
|
28
30
|
if (isNotInRange) {
|
|
29
31
|
continue;
|
|
30
32
|
}
|
|
31
|
-
let newOffset = entity.offset +
|
|
33
|
+
let newOffset = entity.offset + offsetChange;
|
|
32
34
|
let newOffsetWithLength = newOffset + entity.length;
|
|
33
35
|
const prevEntity = newEntities[i - 1];
|
|
34
|
-
if (prevEntity &&
|
|
35
|
-
|
|
36
|
-
|
|
36
|
+
if (prevEntity &&
|
|
37
|
+
newOffset >= (prevEntity === null || prevEntity === void 0 ? void 0 : prevEntity.offset) + offsetChange + (prevEntity === null || prevEntity === void 0 ? void 0 : prevEntity.length)) {
|
|
38
|
+
prevEntity.offset += prevOffsetChange;
|
|
39
|
+
prevEntity.length += prevLengthChange;
|
|
40
|
+
offsetChange += afterOffsetChange;
|
|
41
|
+
afterOffsetChange = 0;
|
|
42
|
+
newOffset = entity.offset + offsetChange;
|
|
43
|
+
newOffsetWithLength = newOffset + entity.length;
|
|
37
44
|
}
|
|
38
|
-
newOffset = entity.offset + prevOffsetChange;
|
|
39
|
-
newOffsetWithLength = newOffset + entity.length;
|
|
40
45
|
const beforeEntity = newText.substring(0, newOffset);
|
|
41
46
|
const entityText = newText.substring(newOffset, newOffsetWithLength);
|
|
42
47
|
const afterEntity = newText.substring(newOffsetWithLength, newText.length);
|
|
43
48
|
const formatted = formatter(entityText, entity, text);
|
|
44
|
-
prevOffsetChange
|
|
45
|
-
|
|
46
|
-
|
|
49
|
+
prevOffsetChange = offsetChange;
|
|
50
|
+
prevLengthChange = formatted.before.length + formatted.after.length;
|
|
51
|
+
offsetChange += formatted.before.length;
|
|
52
|
+
afterOffsetChange += formatted.after.length;
|
|
47
53
|
newText = `${beforeEntity}${formatted.text}${afterEntity}`;
|
|
54
|
+
if (i === entities.length - 1) {
|
|
55
|
+
entity.offset += prevOffsetChange;
|
|
56
|
+
entity.length += prevLengthChange;
|
|
57
|
+
}
|
|
48
58
|
}
|
|
49
59
|
return {
|
|
50
60
|
text: newText,
|