md-hopper 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.
|
@@ -39,6 +39,7 @@ export interface EndLinksProperties {
|
|
|
39
39
|
export declare const LINK_NAME_PREFIX = "md_hopper:";
|
|
40
40
|
export declare const BEGIN_COMMENT = "<!--";
|
|
41
41
|
export declare const END_COMMENT = "-->";
|
|
42
|
+
export declare const END_COMMENT_PATTERN = "--!?>";
|
|
42
43
|
export declare const PARAM_SEPARATOR = ":";
|
|
43
44
|
export declare const MD_HOPPER_COMMENT_PREFIX = "MD_HOPPER";
|
|
44
45
|
export declare const COMMENT_REG_EXP: RegExp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"md.d.ts","sourceRoot":"","sources":["../../../../src/lib/_internal/types/md.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU;;;;;;;;CAQtB,CAAA;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC5C,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,MAAM,WAAW,MAAO,SAAQ,QAAQ,EAAE,iBAAiB;CAAG;AAE9D,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,IAAI,CAAA;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,OAAO,CAAA;IACd,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,eAAO,MAAM,gBAAgB,eAAe,CAAA;AAC5C,eAAO,MAAM,aAAa,SAAS,CAAA;AACnC,eAAO,MAAM,WAAW,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"md.d.ts","sourceRoot":"","sources":["../../../../src/lib/_internal/types/md.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU;;;;;;;;CAQtB,CAAA;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC5C,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,MAAM,WAAW,MAAO,SAAQ,QAAQ,EAAE,iBAAiB;CAAG;AAE9D,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,IAAI,CAAA;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,OAAO,CAAA;IACd,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,eAAO,MAAM,gBAAgB,eAAe,CAAA;AAC5C,eAAO,MAAM,aAAa,SAAS,CAAA;AACnC,eAAO,MAAM,WAAW,QAAQ,CAAA;AAEhC,eAAO,MAAM,mBAAmB,UAAU,CAAA;AAC1C,eAAO,MAAM,eAAe,MAAM,CAAA;AAClC,eAAO,MAAM,wBAAwB,cAAc,CAAA;AACnD,eAAO,MAAM,eAAe,QAAgE,CAAA;AAC5F,eAAO,MAAM,kBAAkB,QAA2B,CAAA;AAC1D,eAAO,MAAM,YAAY,QAAsD,CAAA;AAC/E,eAAO,MAAM,gCAAgC,QAE5C,CAAA;AACD,eAAO,MAAM,wBAAwB,QAGpC,CAAA;AACD,eAAO,MAAM,yBAAyB,QAGrC,CAAA;AACD,eAAO,MAAM,0BAA0B,QAAoE,CAAA;AAC3G,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,WAItC,CAAA"}
|
|
@@ -10,14 +10,15 @@ export const PROPERTIES = {
|
|
|
10
10
|
export const LINK_NAME_PREFIX = 'md_hopper:';
|
|
11
11
|
export const BEGIN_COMMENT = '<!--';
|
|
12
12
|
export const END_COMMENT = '-->';
|
|
13
|
+
// 正規表現に埋め込む終端パターン。HTML のコメントは `--!>` でも閉じるため、それも終端として扱う
|
|
14
|
+
export const END_COMMENT_PATTERN = '--!?>';
|
|
13
15
|
export const PARAM_SEPARATOR = ':';
|
|
14
16
|
export const MD_HOPPER_COMMENT_PREFIX = 'MD_HOPPER';
|
|
15
|
-
|
|
16
|
-
export const COMMENT_REG_EXP = new RegExp(`${BEGIN_COMMENT}.*?--!?>`, 'gs');
|
|
17
|
+
export const COMMENT_REG_EXP = new RegExp(`${BEGIN_COMMENT}.*?${END_COMMENT_PATTERN}`, 'gs');
|
|
17
18
|
export const BRAKE_LINE_REG_EXP = new RegExp(/\r?\n/, 'g');
|
|
18
19
|
export const LINK_REG_EXP = new RegExp('^(\\s*.*)\\[(.+)][(|\\[](.+)[)|\\]].*');
|
|
19
20
|
export const MD_HOPPER_COMMENT_PREFIX_REG_EXP = new RegExp(`${BEGIN_COMMENT}\\s*${MD_HOPPER_COMMENT_PREFIX}${PARAM_SEPARATOR}\\s*`);
|
|
20
|
-
export const MD_HOPPER_PARAMS_REG_EXP = new RegExp(`^[^${PARAM_SEPARATOR}]+${PARAM_SEPARATOR}(.*?)${
|
|
21
|
-
export const MD_HOPPER_CONTENT_REG_EXP = new RegExp(`^[^${PARAM_SEPARATOR}]+${PARAM_SEPARATOR}
|
|
21
|
+
export const MD_HOPPER_PARAMS_REG_EXP = new RegExp(`^[^${PARAM_SEPARATOR}]+${PARAM_SEPARATOR}(.*?)${END_COMMENT_PATTERN}.*`, 's');
|
|
22
|
+
export const MD_HOPPER_CONTENT_REG_EXP = new RegExp(`^[^${PARAM_SEPARATOR}]+${PARAM_SEPARATOR}.*?${END_COMMENT_PATTERN}(.*)`, 's');
|
|
22
23
|
export const MD_HOPPER_PROPERTY_REG_EXP = new RegExp(`^([^${PARAM_SEPARATOR}]+?)${PARAM_SEPARATOR}.*`, 's');
|
|
23
|
-
export const getParamExp = (param) => new RegExp(`${BEGIN_COMMENT}\\s*${MD_HOPPER_COMMENT_PREFIX}\\s*${PARAM_SEPARATOR}\\s*${param}\\s*${PARAM_SEPARATOR}.*?${
|
|
24
|
+
export const getParamExp = (param) => new RegExp(`${BEGIN_COMMENT}\\s*${MD_HOPPER_COMMENT_PREFIX}\\s*${PARAM_SEPARATOR}\\s*${param}\\s*${PARAM_SEPARATOR}.*?${END_COMMENT_PATTERN}\\n*`, 'gs');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"md.d.ts","sourceRoot":"","sources":["../../../../src/lib/_internal/utils/md.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,MAAM,
|
|
1
|
+
{"version":3,"file":"md.d.ts","sourceRoot":"","sources":["../../../../src/lib/_internal/utils/md.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,MAAM,EAkBP,MAAM,cAAc,CAAA;AAMrB,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,WAOhD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,OAAO,MAAM,WACyD,CAAA;AACrH,eAAO,MAAM,YAAY,GAAI,WAAW,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,WAKhF,CAAA;AACD,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAA;AAC9D,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,aAAa,GAAG,aAAa,EAAE,WAAW,CAAC,WACsB,CAAA;AAC5G,eAAO,MAAM,WAAW,GAAI,IAAI,MAAM,EAAE,OAAO,MAAM,WAEpD,CAAA;AASD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WASnC,CAAA;AAgMD,eAAO,MAAM,OAAO,GAAI,QAAQ,MAAM,EAAE,SAAS,MAAM,EAAE,WAoDxD,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,IAAI,MAAM,KAAG,YAW9C,CAAA"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { readFileSync } from 'fs';
|
|
2
|
-
import { PROPERTIES, LINK_NAME_PREFIX, COMMENT_REG_EXP, PARAM_SEPARATOR, LINK_REG_EXP, MD_HOPPER_COMMENT_PREFIX, MD_HOPPER_COMMENT_PREFIX_REG_EXP, MD_HOPPER_PROPERTY_REG_EXP, MD_HOPPER_PARAMS_REG_EXP, BRAKE_LINE_REG_EXP, MD_HOPPER_CONTENT_REG_EXP, BEGIN_COMMENT, END_COMMENT, getParamExp, } from '../types/md.js';
|
|
2
|
+
import { PROPERTIES, LINK_NAME_PREFIX, COMMENT_REG_EXP, PARAM_SEPARATOR, LINK_REG_EXP, MD_HOPPER_COMMENT_PREFIX, MD_HOPPER_COMMENT_PREFIX_REG_EXP, MD_HOPPER_PROPERTY_REG_EXP, MD_HOPPER_PARAMS_REG_EXP, BRAKE_LINE_REG_EXP, MD_HOPPER_CONTENT_REG_EXP, BEGIN_COMMENT, END_COMMENT, END_COMMENT_PATTERN, getParamExp, } from '../types/md.js';
|
|
3
3
|
import { replaceLineToLink } from './md/line.js';
|
|
4
4
|
import { getRelative } from './path.js';
|
|
5
5
|
import { isBoolean } from './type-check.js';
|
|
6
6
|
export const getParam = (txt, key) => {
|
|
7
7
|
const PREFIX = `${BEGIN_COMMENT}\\s*${MD_HOPPER_COMMENT_PREFIX}:\\s*${key}:`;
|
|
8
|
-
const reg = new RegExp(`${PREFIX}(.*?)${
|
|
8
|
+
const reg = new RegExp(`${PREFIX}(.*?)${END_COMMENT_PATTERN}`, 's');
|
|
9
9
|
if (!reg.test(txt)) {
|
|
10
10
|
return '';
|
|
11
11
|
}
|