ds-markdown 0.0.10-beta.1 → 0.0.10-beta.3
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 +234 -67
- package/dist/cjs/MarkdownCMD/index.js +183 -225
- package/dist/cjs/MarkdownCMD/index.js.map +1 -1
- package/dist/cjs/defined.d.ts +20 -0
- package/dist/cjs/hooks/useTypingTask.d.ts +31 -0
- package/dist/cjs/hooks/useTypingTask.js +226 -0
- package/dist/cjs/hooks/useTypingTask.js.map +1 -0
- package/dist/cjs/utils/Tokenizer.d.ts +11 -0
- package/dist/cjs/utils/Tokenizer.js +26 -4
- package/dist/cjs/utils/Tokenizer.js.map +1 -1
- package/dist/cjs/utils/compiler.js +5 -1
- package/dist/cjs/utils/compiler.js.map +1 -1
- package/dist/cjs/utils/methods/deepClone.d.ts +1 -0
- package/dist/cjs/utils/methods/deepClone.js +7 -0
- package/dist/cjs/utils/methods/deepClone.js.map +1 -0
- package/dist/cjs/utils/rule.js +2 -1
- package/dist/cjs/utils/rule.js.map +1 -1
- package/dist/esm/MarkdownCMD/index.js +184 -226
- package/dist/esm/MarkdownCMD/index.js.map +1 -1
- package/dist/esm/defined.d.ts +20 -0
- package/dist/esm/hooks/useTypingTask.d.ts +31 -0
- package/dist/esm/hooks/useTypingTask.js +222 -0
- package/dist/esm/hooks/useTypingTask.js.map +1 -0
- package/dist/esm/utils/Tokenizer.d.ts +11 -0
- package/dist/esm/utils/Tokenizer.js +24 -3
- package/dist/esm/utils/Tokenizer.js.map +1 -1
- package/dist/esm/utils/compiler.js +6 -2
- package/dist/esm/utils/compiler.js.map +1 -1
- package/dist/esm/utils/methods/deepClone.d.ts +1 -0
- package/dist/esm/utils/methods/deepClone.js +4 -0
- package/dist/esm/utils/methods/deepClone.js.map +1 -0
- package/dist/esm/utils/rule.js +2 -1
- package/dist/esm/utils/rule.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
import { useEffect, useRef } from 'react';
|
|
2
|
+
export const useTypingTask = (options) => {
|
|
3
|
+
const { timerType = 'setTimeout', interval, charsRef, onEnd, onStart, onTypedChar, processCharDisplay } = options;
|
|
4
|
+
/** 是否卸载 */
|
|
5
|
+
const isUnmountRef = useRef(false);
|
|
6
|
+
/** 是否正在打字 */
|
|
7
|
+
const isTypedRef = useRef(false);
|
|
8
|
+
/** 动画帧ID */
|
|
9
|
+
const animationFrameRef = useRef(null);
|
|
10
|
+
/** 传统定时器（兼容模式） */
|
|
11
|
+
const timerRef = useRef(null);
|
|
12
|
+
// 已经打过的字记录
|
|
13
|
+
const typedCharsRef = useRef(undefined);
|
|
14
|
+
useEffect(() => {
|
|
15
|
+
isUnmountRef.current = false;
|
|
16
|
+
return () => {
|
|
17
|
+
isUnmountRef.current = true;
|
|
18
|
+
};
|
|
19
|
+
}, []);
|
|
20
|
+
/**
|
|
21
|
+
* 记录打过的字
|
|
22
|
+
* @param char 当前字符
|
|
23
|
+
* @returns
|
|
24
|
+
*/
|
|
25
|
+
const recordTypedChars = (char) => {
|
|
26
|
+
let prevStr = '';
|
|
27
|
+
if (!typedCharsRef.current || typedCharsRef.current.answerType !== char.answerType) {
|
|
28
|
+
typedCharsRef.current = {
|
|
29
|
+
typedContent: char.content,
|
|
30
|
+
answerType: char.answerType,
|
|
31
|
+
prevStr: '',
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
prevStr = typedCharsRef.current.typedContent;
|
|
36
|
+
typedCharsRef.current.typedContent += char.content;
|
|
37
|
+
typedCharsRef.current.prevStr = prevStr;
|
|
38
|
+
}
|
|
39
|
+
return {
|
|
40
|
+
prevStr,
|
|
41
|
+
nextStr: typedCharsRef.current?.typedContent || '',
|
|
42
|
+
};
|
|
43
|
+
};
|
|
44
|
+
/**
|
|
45
|
+
* 触发打字开始回调
|
|
46
|
+
* @param char 当前字符
|
|
47
|
+
*/
|
|
48
|
+
const triggerOnStart = (char) => {
|
|
49
|
+
if (!onStart) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
const { prevStr } = recordTypedChars(char);
|
|
53
|
+
onStart({
|
|
54
|
+
currentIndex: prevStr.length,
|
|
55
|
+
currentChar: char.content,
|
|
56
|
+
answerType: char.answerType,
|
|
57
|
+
prevStr,
|
|
58
|
+
});
|
|
59
|
+
};
|
|
60
|
+
/**
|
|
61
|
+
* 触发打字结束回调
|
|
62
|
+
*/
|
|
63
|
+
const triggerOnEnd = () => {
|
|
64
|
+
if (!onEnd) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
onEnd({
|
|
68
|
+
str: typedCharsRef.current?.typedContent,
|
|
69
|
+
answerType: typedCharsRef.current?.answerType,
|
|
70
|
+
});
|
|
71
|
+
};
|
|
72
|
+
/**
|
|
73
|
+
* 触发打字过程中回调
|
|
74
|
+
* @param char 当前字符
|
|
75
|
+
* @param isStartPoint 是否是开始打字(第一个字)
|
|
76
|
+
*/
|
|
77
|
+
const triggerOnTypedChar = (char, isStartPoint = false) => {
|
|
78
|
+
if (!isStartPoint) {
|
|
79
|
+
recordTypedChars(char);
|
|
80
|
+
}
|
|
81
|
+
if (!onTypedChar) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
onTypedChar({
|
|
85
|
+
currentIndex: typedCharsRef.current?.prevStr.length || 0,
|
|
86
|
+
currentChar: char.content,
|
|
87
|
+
answerType: char.answerType,
|
|
88
|
+
prevStr: typedCharsRef.current?.prevStr || '',
|
|
89
|
+
});
|
|
90
|
+
};
|
|
91
|
+
/** 清除定时器 */
|
|
92
|
+
const clearTimer = () => {
|
|
93
|
+
// 清理 requestAnimationFrame
|
|
94
|
+
if (animationFrameRef.current) {
|
|
95
|
+
cancelAnimationFrame(animationFrameRef.current);
|
|
96
|
+
animationFrameRef.current = null;
|
|
97
|
+
}
|
|
98
|
+
// 清理 setTimeout (可能被 timestamp 模式使用)
|
|
99
|
+
if (timerRef.current) {
|
|
100
|
+
clearTimeout(timerRef.current);
|
|
101
|
+
timerRef.current = null;
|
|
102
|
+
}
|
|
103
|
+
isTypedRef.current = false;
|
|
104
|
+
typedCharsRef.current = undefined;
|
|
105
|
+
};
|
|
106
|
+
/** 开始打字任务 */
|
|
107
|
+
const startTypedTask = () => {
|
|
108
|
+
if (isTypedRef.current) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
if (timerType === 'requestAnimationFrame') {
|
|
112
|
+
startAnimationFrameMode();
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
startTimeoutMode();
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
/** requestAnimationFrame 模式 */
|
|
119
|
+
const startAnimationFrameMode = () => {
|
|
120
|
+
const chars = charsRef.current;
|
|
121
|
+
let lastFrameTime = 0;
|
|
122
|
+
const frameLoop = (currentTime) => {
|
|
123
|
+
if (isUnmountRef.current)
|
|
124
|
+
return;
|
|
125
|
+
if (chars.length === 0) {
|
|
126
|
+
stopAnimationFrame();
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
// 计算这一帧应该打多少个字符
|
|
130
|
+
if (lastFrameTime === 0) {
|
|
131
|
+
lastFrameTime = currentTime;
|
|
132
|
+
}
|
|
133
|
+
const deltaTime = currentTime - lastFrameTime;
|
|
134
|
+
const charsToType = Math.max(1, Math.floor(deltaTime / interval));
|
|
135
|
+
const actualCharsToType = Math.min(charsToType, chars.length);
|
|
136
|
+
// 处理字符
|
|
137
|
+
for (let i = 0; i < actualCharsToType; i++) {
|
|
138
|
+
const char = chars.shift();
|
|
139
|
+
if (char === undefined)
|
|
140
|
+
break;
|
|
141
|
+
if (!isTypedRef.current) {
|
|
142
|
+
isTypedRef.current = true;
|
|
143
|
+
triggerOnStart(char);
|
|
144
|
+
triggerOnTypedChar(char, true);
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
triggerOnTypedChar(char);
|
|
148
|
+
}
|
|
149
|
+
processCharDisplay(char);
|
|
150
|
+
}
|
|
151
|
+
lastFrameTime = currentTime;
|
|
152
|
+
// 继续下一帧
|
|
153
|
+
if (chars.length > 0) {
|
|
154
|
+
animationFrameRef.current = requestAnimationFrame(frameLoop);
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
isTypedRef.current = false;
|
|
158
|
+
triggerOnEnd();
|
|
159
|
+
}
|
|
160
|
+
};
|
|
161
|
+
animationFrameRef.current = requestAnimationFrame(frameLoop);
|
|
162
|
+
};
|
|
163
|
+
/** 停止动画帧模式 */
|
|
164
|
+
const stopAnimationFrame = () => {
|
|
165
|
+
isTypedRef.current = false;
|
|
166
|
+
if (animationFrameRef.current) {
|
|
167
|
+
cancelAnimationFrame(animationFrameRef.current);
|
|
168
|
+
animationFrameRef.current = null;
|
|
169
|
+
}
|
|
170
|
+
triggerOnEnd();
|
|
171
|
+
};
|
|
172
|
+
/** setTimeout 模式 */
|
|
173
|
+
const startTimeoutMode = () => {
|
|
174
|
+
const chars = charsRef.current;
|
|
175
|
+
const nextTyped = () => {
|
|
176
|
+
if (chars.length === 0) {
|
|
177
|
+
stopTimeout();
|
|
178
|
+
return;
|
|
179
|
+
}
|
|
180
|
+
timerRef.current = setTimeout(startTyped, interval);
|
|
181
|
+
};
|
|
182
|
+
const startTyped = (isStartPoint = false) => {
|
|
183
|
+
if (isUnmountRef.current)
|
|
184
|
+
return;
|
|
185
|
+
isTypedRef.current = true;
|
|
186
|
+
const char = chars.shift();
|
|
187
|
+
if (char === undefined) {
|
|
188
|
+
stopTimeout();
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
if (isStartPoint) {
|
|
192
|
+
triggerOnStart(char);
|
|
193
|
+
triggerOnTypedChar(char, isStartPoint);
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
triggerOnTypedChar(char);
|
|
197
|
+
}
|
|
198
|
+
processCharDisplay(char);
|
|
199
|
+
nextTyped();
|
|
200
|
+
};
|
|
201
|
+
startTyped(true);
|
|
202
|
+
};
|
|
203
|
+
/** 停止超时模式 */
|
|
204
|
+
const stopTimeout = () => {
|
|
205
|
+
isTypedRef.current = false;
|
|
206
|
+
if (timerRef.current) {
|
|
207
|
+
clearTimeout(timerRef.current);
|
|
208
|
+
timerRef.current = null;
|
|
209
|
+
}
|
|
210
|
+
triggerOnEnd();
|
|
211
|
+
};
|
|
212
|
+
return {
|
|
213
|
+
start: startTypedTask,
|
|
214
|
+
stop: clearTimer,
|
|
215
|
+
clear: () => {
|
|
216
|
+
clearTimer();
|
|
217
|
+
typedCharsRef.current = undefined;
|
|
218
|
+
},
|
|
219
|
+
isTyping: () => isTypedRef.current,
|
|
220
|
+
};
|
|
221
|
+
};
|
|
222
|
+
//# sourceMappingURL=useTypingTask.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useTypingTask.js","sourceRoot":"","sources":["../../../src/hooks/useTypingTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,30 +1,41 @@
|
|
|
1
1
|
/** 此文件借鉴 marked 的部分代码 */
|
|
2
|
+
export declare const getTokenId: () => number;
|
|
2
3
|
interface Space {
|
|
3
4
|
type: 'space';
|
|
4
5
|
raw: string;
|
|
6
|
+
noTrimEndRaw?: string;
|
|
7
|
+
id: number;
|
|
5
8
|
}
|
|
6
9
|
interface Fence {
|
|
7
10
|
type: 'fence';
|
|
8
11
|
raw: string;
|
|
12
|
+
noTrimEndRaw?: string;
|
|
13
|
+
id: number;
|
|
9
14
|
}
|
|
10
15
|
interface Segment {
|
|
11
16
|
type: 'segment';
|
|
12
17
|
raw: string;
|
|
18
|
+
noTrimEndRaw?: string;
|
|
19
|
+
id: number;
|
|
13
20
|
}
|
|
14
21
|
interface List {
|
|
15
22
|
type: 'list';
|
|
16
23
|
raw: string;
|
|
24
|
+
noTrimEndRaw: string;
|
|
17
25
|
items: ListItem[];
|
|
18
26
|
loose: boolean;
|
|
27
|
+
id: number;
|
|
19
28
|
}
|
|
20
29
|
interface ListItem {
|
|
21
30
|
type: 'list_item';
|
|
22
31
|
raw: string;
|
|
32
|
+
noTrimEndRaw: string;
|
|
23
33
|
task: boolean;
|
|
24
34
|
checked: boolean | undefined;
|
|
25
35
|
loose: boolean;
|
|
26
36
|
text: string;
|
|
27
37
|
tokens: Token[];
|
|
38
|
+
id: number;
|
|
28
39
|
}
|
|
29
40
|
export type Token = Space | Fence | Segment | List | ListItem;
|
|
30
41
|
export declare class Tokenizer {
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
/** 此文件借鉴 marked 的部分代码 */
|
|
2
2
|
import { rules } from './rule.js';
|
|
3
|
+
let id = 0;
|
|
4
|
+
export const getTokenId = () => {
|
|
5
|
+
return id++;
|
|
6
|
+
};
|
|
3
7
|
export class Tokenizer {
|
|
4
8
|
/** 空行 */
|
|
5
9
|
space(src) {
|
|
@@ -8,6 +12,7 @@ export class Tokenizer {
|
|
|
8
12
|
return {
|
|
9
13
|
type: 'space',
|
|
10
14
|
raw: cap[0],
|
|
15
|
+
id: getTokenId(),
|
|
11
16
|
};
|
|
12
17
|
}
|
|
13
18
|
}
|
|
@@ -18,6 +23,7 @@ export class Tokenizer {
|
|
|
18
23
|
return {
|
|
19
24
|
type: 'fence',
|
|
20
25
|
raw: cap[0],
|
|
26
|
+
id: getTokenId(),
|
|
21
27
|
};
|
|
22
28
|
}
|
|
23
29
|
}
|
|
@@ -28,6 +34,7 @@ export class Tokenizer {
|
|
|
28
34
|
return {
|
|
29
35
|
type: 'segment',
|
|
30
36
|
raw: cap[0],
|
|
37
|
+
id: getTokenId(),
|
|
31
38
|
};
|
|
32
39
|
}
|
|
33
40
|
}
|
|
@@ -39,9 +46,11 @@ export class Tokenizer {
|
|
|
39
46
|
const isordered = bull.length > 1;
|
|
40
47
|
const list = {
|
|
41
48
|
type: 'list',
|
|
42
|
-
raw:
|
|
49
|
+
raw: '',
|
|
50
|
+
noTrimEndRaw: '',
|
|
43
51
|
items: [],
|
|
44
52
|
loose: false,
|
|
53
|
+
id: getTokenId(),
|
|
45
54
|
};
|
|
46
55
|
bull = isordered ? `\\d{1,9}\\${bull.slice(-1)}` : `\\${bull}`;
|
|
47
56
|
// Get next list item
|
|
@@ -49,6 +58,7 @@ export class Tokenizer {
|
|
|
49
58
|
while (src) {
|
|
50
59
|
let endEarly = false;
|
|
51
60
|
let raw = '';
|
|
61
|
+
let noTrimEndRaw = '';
|
|
52
62
|
let itemContents = '';
|
|
53
63
|
if (!(cap = itemRegex.exec(src))) {
|
|
54
64
|
break;
|
|
@@ -57,7 +67,7 @@ export class Tokenizer {
|
|
|
57
67
|
// End list if bullet was actually HR (possibly move into itemRegex?)
|
|
58
68
|
break;
|
|
59
69
|
}
|
|
60
|
-
raw = cap[0];
|
|
70
|
+
raw = noTrimEndRaw = cap[0];
|
|
61
71
|
src = src.substring(raw.length);
|
|
62
72
|
/** 获取列表项 */
|
|
63
73
|
let line = cap[2].split('\n', 1)[0].replace(rules.other.listReplaceTabs, (t) => ' '.repeat(3 * t.length));
|
|
@@ -73,9 +83,13 @@ export class Tokenizer {
|
|
|
73
83
|
itemContents = line.slice(indent);
|
|
74
84
|
indent += cap[1].length;
|
|
75
85
|
}
|
|
76
|
-
if (blankLine &&
|
|
86
|
+
if (blankLine && src === '') {
|
|
87
|
+
endEarly = true;
|
|
88
|
+
}
|
|
89
|
+
else if (blankLine && rules.other.blankLine.test(nextLine)) {
|
|
77
90
|
// Items begin with at most one blank line
|
|
78
91
|
raw += nextLine + '\n';
|
|
92
|
+
noTrimEndRaw += nextLine + '\n';
|
|
79
93
|
src = src.substring(nextLine.length + 1);
|
|
80
94
|
endEarly = true;
|
|
81
95
|
}
|
|
@@ -140,6 +154,7 @@ export class Tokenizer {
|
|
|
140
154
|
blankLine = true;
|
|
141
155
|
}
|
|
142
156
|
raw += rawLine + '\n';
|
|
157
|
+
noTrimEndRaw += rawLine + '\n';
|
|
143
158
|
src = src.substring(rawLine.length + 1);
|
|
144
159
|
line = nextLineWithoutTabs.slice(indent);
|
|
145
160
|
}
|
|
@@ -153,13 +168,16 @@ export class Tokenizer {
|
|
|
153
168
|
list.items.push({
|
|
154
169
|
type: 'list_item',
|
|
155
170
|
raw,
|
|
171
|
+
noTrimEndRaw,
|
|
156
172
|
task: !!istask,
|
|
157
173
|
checked: ischecked,
|
|
158
174
|
loose: false,
|
|
159
175
|
text: itemContents,
|
|
160
176
|
tokens: [],
|
|
177
|
+
id: getTokenId(),
|
|
161
178
|
});
|
|
162
179
|
list.raw += raw;
|
|
180
|
+
list.noTrimEndRaw += noTrimEndRaw;
|
|
163
181
|
}
|
|
164
182
|
// Do not consume newlines at end of final item. Alternatively, make itemRegex *start* with any newlines to simplify/speed up endsWithBlankLine logic
|
|
165
183
|
const lastItem = list.items.at(-1);
|
|
@@ -172,6 +190,9 @@ export class Tokenizer {
|
|
|
172
190
|
return;
|
|
173
191
|
}
|
|
174
192
|
list.raw = list.raw.trimEnd();
|
|
193
|
+
if (src !== '') {
|
|
194
|
+
list.noTrimEndRaw = list.noTrimEndRaw.trimEnd();
|
|
195
|
+
}
|
|
175
196
|
return list;
|
|
176
197
|
}
|
|
177
198
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tokenizer.js","sourceRoot":"","sources":["../../../src/utils/Tokenizer.ts"],"names":[],"mappings":"AAAA,yBAAyB;AAEzB,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"Tokenizer.js","sourceRoot":"","sources":["../../../src/utils/Tokenizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import { Tokenizer } from './Tokenizer.js';
|
|
1
|
+
import { getTokenId, Tokenizer } from './Tokenizer.js';
|
|
2
2
|
function compile(src) {
|
|
3
3
|
const tokenizer = new Tokenizer();
|
|
4
4
|
const tokens = [];
|
|
5
5
|
let prevScr = src;
|
|
6
6
|
while (src) {
|
|
7
|
+
if (src.length === 0) {
|
|
8
|
+
break;
|
|
9
|
+
}
|
|
7
10
|
const space = tokenizer.space(src);
|
|
8
11
|
if (space) {
|
|
9
12
|
tokens.push(space);
|
|
@@ -13,7 +16,7 @@ function compile(src) {
|
|
|
13
16
|
const list = tokenizer.list(src);
|
|
14
17
|
if (list) {
|
|
15
18
|
tokens.push(list);
|
|
16
|
-
src = src.slice(list.
|
|
19
|
+
src = src.slice(list.noTrimEndRaw.length);
|
|
17
20
|
continue;
|
|
18
21
|
}
|
|
19
22
|
const fence = tokenizer.fence(src);
|
|
@@ -34,6 +37,7 @@ function compile(src) {
|
|
|
34
37
|
tokens.push({
|
|
35
38
|
type: 'segment',
|
|
36
39
|
raw: src,
|
|
40
|
+
id: getTokenId(),
|
|
37
41
|
});
|
|
38
42
|
src = '';
|
|
39
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../src/utils/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../src/utils/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAS,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE9D,SAAS,OAAO,CAAC,GAAW;IAC1B,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;IAElC,MAAM,MAAM,GAAY,EAAE,CAAC;IAC3B,IAAI,OAAO,GAAG,GAAG,CAAC;IAElB,OAAO,GAAG,EAAE,CAAC;QACX,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM;QACR,CAAC;QACD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAClC,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC1C,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAClC,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,SAAS;QACX,CAAC;QACD,IAAI,OAAO,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;YAC3B,qBAAqB;YACrB,oBAAoB;YACpB,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,SAAS;gBACf,GAAG,EAAE,GAAG;gBACR,EAAE,EAAE,UAAU,EAAE;aACjB,CAAC,CAAC;YACH,GAAG,GAAG,EAAE,CAAC;QACX,CAAC;QACD,OAAO,GAAG,GAAG,CAAC;IAChB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,GAAW;IACjC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,cAAc,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export default function deepClone<T>(obj: T): T;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../../../src/utils/methods/deepClone.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,SAAS,CAAI,GAAM;IACzC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;AACzC,CAAC"}
|
package/dist/esm/utils/rule.js
CHANGED
|
@@ -48,7 +48,8 @@ const list = edit(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/)
|
|
|
48
48
|
*/
|
|
49
49
|
const fences = /^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})([^\n]*)(?:\n|$)(?:|([\s\S]*?)(?:\n|$))(?: {0,3}\1[~`]* *(?=\n|$)|$)/;
|
|
50
50
|
// 一个块
|
|
51
|
-
const _segment = /^([^\n]+(?:\n(?!fences|list|hr| +\n)[^\n]+)*)/;
|
|
51
|
+
// const _segment = /^([^\n]+(?:\n(?!fences|list|hr| +\n)[^\n]+)*)/;
|
|
52
|
+
const _segment = /^([^\n]+(?:\n(?!fences|list|hr| +\n|\n)[^\n]+)*\n?)/;
|
|
52
53
|
const segment = edit(_segment)
|
|
53
54
|
.replace(/fences/, fences)
|
|
54
55
|
.replace(/list/, list)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../../src/utils/rule.ts"],"names":[],"mappings":"AAAA,yBAAyB;AAEzB,MAAM,KAAK,GAAG;IACZ,KAAK,EAAE,aAAa;IACpB,aAAa,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,IAAI,+BAA+B,CAAC;IAC3F,eAAe,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,qDAAqD,CAAC;IACrI,eAAe,EAAE,MAAM;IACvB,YAAY,EAAE,MAAM;IACpB,SAAS,EAAE,UAAU;IACrB,UAAU,EAAE,aAAa;IACzB,eAAe,EAAE,cAAc;IAC/B,aAAa,EAAE,KAAK;IACpB,OAAO,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,oDAAoD,CAAC;IAC5H,iBAAiB,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC;IACtF,cAAc,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,oBAAoB,EAAE,GAAG,CAAC;IACxG,gBAAgB,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,iBAAiB,CAAC;CACnG,CAAC;AAEF;;;;;GAKG;AACH,SAAS,IAAI,CAAC,KAAsB,EAAE,GAAG,GAAG,EAAE;IAC5C,IAAI,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;IAC9D,MAAM,GAAG,GAAG;QACV,OAAO,EAAE,CAAC,IAAqB,EAAE,GAAoB,EAAE,EAAE;YACvD,IAAI,SAAS,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;YAC3D,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACjD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACzC,OAAO,GAAG,CAAC;QACb,CAAC;QACD,QAAQ,EAAE,GAAG,EAAE;YACb,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;KACF,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,OAAO,GAAG,sBAAsB,CAAC;AACvC,MAAM,EAAE,GAAG,oEAAoE,CAAC;AAChF,SAAS;AACT,MAAM,MAAM,GAAG,uBAAuB,CAAC;AACvC,SAAS;AACT,MAAM,IAAI,GAAG,IAAI,CAAC,sCAAsC,CAAC;KACtD,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC;KACxB,QAAQ,EAAE,CAAC;AAEd;;GAEG;AACH,MAAM,MAAM,GAAG,6GAA6G,CAAC;AAC7H,MAAM;AACN,MAAM,QAAQ,GAAG
|
|
1
|
+
{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../../src/utils/rule.ts"],"names":[],"mappings":"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"}
|