securemark 0.240.0 → 0.240.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.
Files changed (7) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/dist/securemark.js +22 -22
  3. package/package-lock.json +83 -84
  4. package/package.json +1 -1
  5. package/src/parser/block/extension/figure.ts +19 -18
  6. package/src/parser/inline/bracket.test.ts +5 -1
  7. package/src/parser/inline/bracket.ts +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.240.1
4
+
5
+ - Refactoring.
6
+
3
7
  ## 0.240.0
4
8
 
5
9
  - Extend reference syntax not to require leading whitespace after abbr syntax.
package/dist/securemark.js CHANGED
@@ -1,4 +1,4 @@
1
- /*! securemark v0.240.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
1
+ /*! securemark v0.240.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
2
2
  require = function () {
3
3
  function r(e, n, t) {
4
4
  function o(i, f) {
@@ -5184,38 +5184,38 @@ require = function () {
5184
5184
  'data-invalid-type': 'argument',
5185
5185
  'data-invalid-message': 'Invalid argument'
5186
5186
  } || group === '$' && (type !== 'math' || caption.length > 0) && {
5187
- 'data-invalid-type': 'content',
5188
- 'data-invalid-message': '`$` label group can only be used with a math formula with no caption'
5189
- } || [
5187
+ 'data-invalid-type': 'label',
5188
+ 'data-invalid-message': '"$" label group must be used to math formulas with no caption'
5189
+ } || type === 'media' && {} || [
5190
5190
  'fig',
5191
5191
  'figure'
5192
- ].includes(group) && type !== 'media' && {
5193
- 'data-invalid-type': 'content',
5194
- 'data-invalid-message': '`fig` and `figure` label groups can only be used with media'
5192
+ ].includes(group) && {
5193
+ 'data-invalid-type': 'label',
5194
+ 'data-invalid-message': '"fig" and "figure" label groups must be used to media'
5195
5195
  } || group === 'table' && type !== group && {
5196
- 'data-invalid-type': 'content',
5197
- 'data-invalid-message': '`table` label group can only be used with a table'
5196
+ 'data-invalid-type': 'label',
5197
+ 'data-invalid-message': '"table" label group must be used to tables'
5198
5198
  } || group === 'list' && type !== group && {
5199
- 'data-invalid-type': 'content',
5200
- 'data-invalid-message': '`list` label group can only be used with a list'
5199
+ 'data-invalid-type': 'label',
5200
+ 'data-invalid-message': '"list" label group must be used to lists'
5201
5201
  } || group === 'quote' && type !== group && {
5202
- 'data-invalid-type': 'content',
5203
- 'data-invalid-message': '`quote` label group can only be used with a blockquote'
5202
+ 'data-invalid-type': 'label',
5203
+ 'data-invalid-message': '"quote" label group must be used to blockquotes'
5204
5204
  } || group === 'text' && type !== group && {
5205
- 'data-invalid-type': 'content',
5206
- 'data-invalid-message': '`text` label group can only be used with a codeblock with no language'
5205
+ 'data-invalid-type': 'label',
5206
+ 'data-invalid-message': '"text" label group must be used to codeblocks with no language'
5207
5207
  } || group === 'code' && type !== group && {
5208
- 'data-invalid-type': 'content',
5209
- 'data-invalid-message': '`code` label group can only be used with a codeblock'
5208
+ 'data-invalid-type': 'label',
5209
+ 'data-invalid-message': '"code" label group must be used to codeblocks with any language'
5210
5210
  } || group === 'example' && type !== group && {
5211
- 'data-invalid-type': 'content',
5212
- 'data-invalid-message': '`example` label group can only be used with an example'
5211
+ 'data-invalid-type': 'label',
5212
+ 'data-invalid-message': '"example" label group must be used to examples'
5213
5213
  } || global_1.undefined;
5214
5214
  return {
5215
5215
  'data-type': type,
5216
5216
  'data-label': label,
5217
5217
  'data-group': group,
5218
- ...invalid && {
5218
+ ...(invalid === null || invalid === void 0 ? void 0 : invalid['data-invalid-type']) && {
5219
5219
  class: 'invalid',
5220
5220
  'data-invalid-syntax': 'figure',
5221
5221
  ...invalid
@@ -6673,7 +6673,7 @@ require = function () {
6673
6673
  const source_1 = _dereq_('../source');
6674
6674
  const typed_dom_1 = _dereq_('typed-dom');
6675
6675
  const array_1 = _dereq_('spica/array');
6676
- const index = /^(?:[0-9]+(?:\.[0-9]+)*|[A-Za-z])/;
6676
+ const index = /^(?:[0-9]+(?:(?:[.-]|, )[0-9]+)*|[A-Za-z])/;
6677
6677
  exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.union)([
6678
6678
  (0, combinator_1.surround)((0, source_1.str)('('), (0, source_1.str)(index), (0, source_1.str)(')')),
6679
6679
  (0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)(inline_1.inline, ')'), (0, source_1.str)(')'), true, ([as, bs = [], cs], rest) => [
@@ -6683,7 +6683,7 @@ require = function () {
6683
6683
  (0, array_1.unshift)(as, bs),
6684
6684
  rest
6685
6685
  ]),
6686
- (0, combinator_1.surround)((0, source_1.str)('\uFF08'), (0, source_1.str)(new RegExp(index.source.replace(/[09AZaz.]/g, c => String.fromCharCode(c.charCodeAt(0) + 65248)))), (0, source_1.str)('\uFF09')),
6686
+ (0, combinator_1.surround)((0, source_1.str)('\uFF08'), (0, source_1.str)(new RegExp(index.source.replace(/[09AZaz., ]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 65248)))), (0, source_1.str)('\uFF09')),
6687
6687
  (0, combinator_1.surround)((0, source_1.str)('\uFF08'), (0, combinator_1.some)(inline_1.inline, '\uFF09'), (0, source_1.str)('\uFF09'), true, ([as, bs = [], cs], rest) => [
6688
6688
  [(0, typed_dom_1.html)('span', { class: 'paren' }, (0, typed_dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))],
6689
6689
  rest
package/package-lock.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "securemark",
3
- "version": "0.240.0",
3
+ "version": "0.240.1",
4
4
  "lockfileVersion": 1,
5
5
  "requires": true,
6
6
  "dependencies": {
@@ -29,25 +29,25 @@
29
29
  "dev": true
30
30
  },
31
31
  "@babel/core": {
32
- "version": "7.17.8",
33
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz",
34
- "integrity": "sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==",
32
+ "version": "7.17.9",
33
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz",
34
+ "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==",
35
35
  "dev": true,
36
36
  "requires": {
37
37
  "@ampproject/remapping": "^2.1.0",
38
38
  "@babel/code-frame": "^7.16.7",
39
- "@babel/generator": "^7.17.7",
39
+ "@babel/generator": "^7.17.9",
40
40
  "@babel/helper-compilation-targets": "^7.17.7",
41
41
  "@babel/helper-module-transforms": "^7.17.7",
42
- "@babel/helpers": "^7.17.8",
43
- "@babel/parser": "^7.17.8",
42
+ "@babel/helpers": "^7.17.9",
43
+ "@babel/parser": "^7.17.9",
44
44
  "@babel/template": "^7.16.7",
45
- "@babel/traverse": "^7.17.3",
45
+ "@babel/traverse": "^7.17.9",
46
46
  "@babel/types": "^7.17.0",
47
47
  "convert-source-map": "^1.7.0",
48
48
  "debug": "^4.1.0",
49
49
  "gensync": "^1.0.0-beta.2",
50
- "json5": "^2.1.2",
50
+ "json5": "^2.2.1",
51
51
  "semver": "^6.3.0"
52
52
  },
53
53
  "dependencies": {
@@ -90,9 +90,9 @@
90
90
  }
91
91
  },
92
92
  "@babel/generator": {
93
- "version": "7.17.7",
94
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz",
95
- "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==",
93
+ "version": "7.17.9",
94
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
95
+ "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
96
96
  "dev": true,
97
97
  "requires": {
98
98
  "@babel/types": "^7.17.0",
@@ -130,23 +130,13 @@
130
130
  }
131
131
  },
132
132
  "@babel/helper-function-name": {
133
- "version": "7.16.7",
134
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
135
- "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
133
+ "version": "7.17.9",
134
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
135
+ "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
136
136
  "dev": true,
137
137
  "requires": {
138
- "@babel/helper-get-function-arity": "^7.16.7",
139
138
  "@babel/template": "^7.16.7",
140
- "@babel/types": "^7.16.7"
141
- }
142
- },
143
- "@babel/helper-get-function-arity": {
144
- "version": "7.16.7",
145
- "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
146
- "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
147
- "dev": true,
148
- "requires": {
149
- "@babel/types": "^7.16.7"
139
+ "@babel/types": "^7.17.0"
150
140
  }
151
141
  },
152
142
  "@babel/helper-hoist-variables": {
@@ -214,20 +204,20 @@
214
204
  "dev": true
215
205
  },
216
206
  "@babel/helpers": {
217
- "version": "7.17.8",
218
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz",
219
- "integrity": "sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==",
207
+ "version": "7.17.9",
208
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
209
+ "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
220
210
  "dev": true,
221
211
  "requires": {
222
212
  "@babel/template": "^7.16.7",
223
- "@babel/traverse": "^7.17.3",
213
+ "@babel/traverse": "^7.17.9",
224
214
  "@babel/types": "^7.17.0"
225
215
  }
226
216
  },
227
217
  "@babel/highlight": {
228
- "version": "7.16.10",
229
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
230
- "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
218
+ "version": "7.17.9",
219
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
220
+ "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
231
221
  "dev": true,
232
222
  "requires": {
233
223
  "@babel/helper-validator-identifier": "^7.16.7",
@@ -288,9 +278,9 @@
288
278
  }
289
279
  },
290
280
  "@babel/parser": {
291
- "version": "7.17.8",
292
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz",
293
- "integrity": "sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==",
281
+ "version": "7.17.9",
282
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
283
+ "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==",
294
284
  "dev": true
295
285
  },
296
286
  "@babel/template": {
@@ -305,18 +295,18 @@
305
295
  }
306
296
  },
307
297
  "@babel/traverse": {
308
- "version": "7.17.3",
309
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
310
- "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
298
+ "version": "7.17.9",
299
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
300
+ "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
311
301
  "dev": true,
312
302
  "requires": {
313
303
  "@babel/code-frame": "^7.16.7",
314
- "@babel/generator": "^7.17.3",
304
+ "@babel/generator": "^7.17.9",
315
305
  "@babel/helper-environment-visitor": "^7.16.7",
316
- "@babel/helper-function-name": "^7.16.7",
306
+ "@babel/helper-function-name": "^7.17.9",
317
307
  "@babel/helper-hoist-variables": "^7.16.7",
318
308
  "@babel/helper-split-export-declaration": "^7.16.7",
319
- "@babel/parser": "^7.17.3",
309
+ "@babel/parser": "^7.17.9",
320
310
  "@babel/types": "^7.17.0",
321
311
  "debug": "^4.1.0",
322
312
  "globals": "^11.1.0"
@@ -1923,9 +1913,9 @@
1923
1913
  "dev": true
1924
1914
  },
1925
1915
  "caniuse-lite": {
1926
- "version": "1.0.30001325",
1927
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz",
1928
- "integrity": "sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==",
1916
+ "version": "1.0.30001327",
1917
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz",
1918
+ "integrity": "sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w==",
1929
1919
  "dev": true
1930
1920
  },
1931
1921
  "chalk": {
@@ -3035,9 +3025,9 @@
3035
3025
  "dev": true
3036
3026
  },
3037
3027
  "electron-to-chromium": {
3038
- "version": "1.4.104",
3039
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.104.tgz",
3040
- "integrity": "sha512-2kjoAyiG7uMyGRM9mx25s3HAzmQG2ayuYXxsFmYugHSDcwxREgLtscZvbL1JcW9S/OemeQ3f/SG6JhDwpnCclQ==",
3028
+ "version": "1.4.106",
3029
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz",
3030
+ "integrity": "sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==",
3041
3031
  "dev": true
3042
3032
  },
3043
3033
  "elliptic": {
@@ -3254,9 +3244,9 @@
3254
3244
  }
3255
3245
  },
3256
3246
  "es5-ext": {
3257
- "version": "0.10.59",
3258
- "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.59.tgz",
3259
- "integrity": "sha512-cOgyhW0tIJyQY1Kfw6Kr0viu9ZlUctVchRMZ7R0HiH3dxTSp5zJDLecwxUqPUrGKMsgBI1wd1FL+d9Jxfi4cLw==",
3247
+ "version": "0.10.60",
3248
+ "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.60.tgz",
3249
+ "integrity": "sha512-jpKNXIt60htYG59/9FGf2PYT3pwMpnEbNKysU+k/4FGwyGtMotOvcZOuW+EmXXYASRqYSXQfGL5cVIthOTgbkg==",
3260
3250
  "dev": true,
3261
3251
  "requires": {
3262
3252
  "es6-iterator": "^2.0.3",
@@ -5814,12 +5804,32 @@
5814
5804
  "dev": true
5815
5805
  },
5816
5806
  "ignore-walk": {
5817
- "version": "4.0.1",
5818
- "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz",
5819
- "integrity": "sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==",
5807
+ "version": "5.0.1",
5808
+ "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz",
5809
+ "integrity": "sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==",
5820
5810
  "dev": true,
5821
5811
  "requires": {
5822
- "minimatch": "^3.0.4"
5812
+ "minimatch": "^5.0.1"
5813
+ },
5814
+ "dependencies": {
5815
+ "brace-expansion": {
5816
+ "version": "2.0.1",
5817
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
5818
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
5819
+ "dev": true,
5820
+ "requires": {
5821
+ "balanced-match": "^1.0.0"
5822
+ }
5823
+ },
5824
+ "minimatch": {
5825
+ "version": "5.0.1",
5826
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
5827
+ "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
5828
+ "dev": true,
5829
+ "requires": {
5830
+ "brace-expansion": "^2.0.1"
5831
+ }
5832
+ }
5823
5833
  }
5824
5834
  },
5825
5835
  "import-fresh": {
@@ -7091,9 +7101,9 @@
7091
7101
  "dev": true
7092
7102
  },
7093
7103
  "lru-cache": {
7094
- "version": "7.7.3",
7095
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
7096
- "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
7104
+ "version": "7.8.0",
7105
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.0.tgz",
7106
+ "integrity": "sha512-AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg==",
7097
7107
  "dev": true
7098
7108
  },
7099
7109
  "make-dir": {
@@ -8018,9 +8028,9 @@
8018
8028
  }
8019
8029
  },
8020
8030
  "npm-check-updates": {
8021
- "version": "12.5.7",
8022
- "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.7.tgz",
8023
- "integrity": "sha512-WDkqPBevmgphV1UH3FImsDEpTAq2UFvnMZC3GdXPknE2VL701kfKylnae8IA9ZeYfm/uU0249N9gjMXqA/9y3w==",
8031
+ "version": "12.5.8",
8032
+ "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.8.tgz",
8033
+ "integrity": "sha512-8SDZ6qYXI0aKf63zSbByqB9QmK8ygrZ+UVcXg9kGQyvH7dGIcFauFF0ksC0NdThHkU/5QhowJVSHXva9zujkJg==",
8024
8034
  "dev": true,
8025
8035
  "requires": {
8026
8036
  "chalk": "^4.1.2",
@@ -8164,13 +8174,13 @@
8164
8174
  }
8165
8175
  },
8166
8176
  "npm-packlist": {
8167
- "version": "4.0.0",
8168
- "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-4.0.0.tgz",
8169
- "integrity": "sha512-gL6XC/iw9YSmqArmZOGSkyy+yIZf2f7uH0p4Vmxef/irn73vd9/rDkCtvm+a9rh/QK2xGYfCAMOghM06ymzC0A==",
8177
+ "version": "5.0.0",
8178
+ "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.0.0.tgz",
8179
+ "integrity": "sha512-uU20UwM4Hogfab1Q7htJbhcyafM9lGHxOrDjkKvR2S3z7Ds0uRaESk0cXctczk+ABT4DZWNwjB10xlurFdEwZg==",
8170
8180
  "dev": true,
8171
8181
  "requires": {
8172
8182
  "glob": "^7.2.0",
8173
- "ignore-walk": "^4.0.1",
8183
+ "ignore-walk": "^5.0.1",
8174
8184
  "npm-bundled": "^1.1.2",
8175
8185
  "npm-normalize-package-bin": "^1.0.1"
8176
8186
  }
@@ -8497,9 +8507,9 @@
8497
8507
  }
8498
8508
  },
8499
8509
  "pacote": {
8500
- "version": "13.1.0",
8501
- "resolved": "https://registry.npmjs.org/pacote/-/pacote-13.1.0.tgz",
8502
- "integrity": "sha512-Ns2chroFx26U4Bd+qm/ETxHGv+HLafoy5TVAcYHigIqANZ+kkk6PANMr1KAugNYecnrN+5lwwiWyBeu40nuU7Q==",
8510
+ "version": "13.1.1",
8511
+ "resolved": "https://registry.npmjs.org/pacote/-/pacote-13.1.1.tgz",
8512
+ "integrity": "sha512-MTT3k1OhUo+IpvoHGp25OwsRU0L+kJQM236OCywxvY4OIJ/YfloNW2/Yc3HMASH10BkfZaGMVK/pxybB7fWcLw==",
8503
8513
  "dev": true,
8504
8514
  "requires": {
8505
8515
  "@npmcli/git": "^3.0.0",
@@ -8513,7 +8523,7 @@
8513
8523
  "minipass": "^3.1.6",
8514
8524
  "mkdirp": "^1.0.4",
8515
8525
  "npm-package-arg": "^9.0.0",
8516
- "npm-packlist": "^4.0.0",
8526
+ "npm-packlist": "^5.0.0",
8517
8527
  "npm-pick-manifest": "^7.0.0",
8518
8528
  "npm-registry-fetch": "^13.0.1",
8519
8529
  "proc-log": "^2.0.0",
@@ -9783,23 +9793,12 @@
9783
9793
  "dev": true
9784
9794
  },
9785
9795
  "semver": {
9786
- "version": "7.3.5",
9787
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
9788
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
9796
+ "version": "7.3.6",
9797
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
9798
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
9789
9799
  "dev": true,
9790
9800
  "requires": {
9791
- "lru-cache": "^6.0.0"
9792
- },
9793
- "dependencies": {
9794
- "lru-cache": {
9795
- "version": "6.0.0",
9796
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
9797
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
9798
- "dev": true,
9799
- "requires": {
9800
- "yallist": "^4.0.0"
9801
- }
9802
- }
9801
+ "lru-cache": "^7.4.0"
9803
9802
  }
9804
9803
  },
9805
9804
  "semver-diff": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "securemark",
3
- "version": "0.240.0",
3
+ "version": "0.240.1",
4
4
  "description": "Secure markdown renderer working on browsers for user input data.",
5
5
  "private": false,
6
6
  "homepage": "https://github.com/falsandtru/securemark",
package/src/parser/block/extension/figure.ts CHANGED
@@ -120,43 +120,44 @@ function attributes(label: string, param: string, content: HTMLElement, caption:
120
120
  'data-invalid-message': 'Invalid argument',
121
121
  } ||
122
122
  group === '$' && (type !== 'math' || caption.length > 0) && {
123
- 'data-invalid-type': 'content',
124
- 'data-invalid-message': '`$` label group can only be used with a math formula with no caption',
123
+ 'data-invalid-type': 'label',
124
+ 'data-invalid-message': '"$" label group must be used to math formulas with no caption',
125
125
  } ||
126
- ['fig', 'figure'].includes(group) && type !== 'media' && {
127
- 'data-invalid-type': 'content',
128
- 'data-invalid-message': '`fig` and `figure` label groups can only be used with media',
126
+ type === 'media' && {} ||
127
+ ['fig', 'figure'].includes(group) && {
128
+ 'data-invalid-type': 'label',
129
+ 'data-invalid-message': '"fig" and "figure" label groups must be used to media',
129
130
  } ||
130
131
  group === 'table' && type !== group && {
131
- 'data-invalid-type': 'content',
132
- 'data-invalid-message': '`table` label group can only be used with a table',
132
+ 'data-invalid-type': 'label',
133
+ 'data-invalid-message': '"table" label group must be used to tables',
133
134
  } ||
134
135
  group === 'list' && type !== group && {
135
- 'data-invalid-type': 'content',
136
- 'data-invalid-message': '`list` label group can only be used with a list',
136
+ 'data-invalid-type': 'label',
137
+ 'data-invalid-message': '"list" label group must be used to lists',
137
138
  } ||
138
139
  group === 'quote' && type !== group && {
139
- 'data-invalid-type': 'content',
140
- 'data-invalid-message': '`quote` label group can only be used with a blockquote',
140
+ 'data-invalid-type': 'label',
141
+ 'data-invalid-message': '"quote" label group must be used to blockquotes',
141
142
  } ||
142
143
  group === 'text' && type !== group && {
143
- 'data-invalid-type': 'content',
144
- 'data-invalid-message': '`text` label group can only be used with a codeblock with no language',
144
+ 'data-invalid-type': 'label',
145
+ 'data-invalid-message': '"text" label group must be used to codeblocks with no language',
145
146
  } ||
146
147
  group === 'code' && type !== group && {
147
- 'data-invalid-type': 'content',
148
- 'data-invalid-message': '`code` label group can only be used with a codeblock',
148
+ 'data-invalid-type': 'label',
149
+ 'data-invalid-message': '"code" label group must be used to codeblocks with any language',
149
150
  } ||
150
151
  group === 'example' && type !== group && {
151
- 'data-invalid-type': 'content',
152
- 'data-invalid-message': '`example` label group can only be used with an example',
152
+ 'data-invalid-type': 'label',
153
+ 'data-invalid-message': '"example" label group must be used to examples',
153
154
  } ||
154
155
  undefined;
155
156
  return {
156
157
  'data-type': type,
157
158
  'data-label': label,
158
159
  'data-group': group,
159
- ...invalid && {
160
+ ...invalid?.['data-invalid-type'] && {
160
161
  class: 'invalid',
161
162
  'data-invalid-syntax': 'figure',
162
163
  ...invalid,
package/src/parser/inline/bracket.test.ts CHANGED
@@ -16,12 +16,16 @@ describe('Unit: parser/inline/bracket', () => {
16
16
  assert.deepStrictEqual(inspect(parser('(1)')), [['(', '1', ')'], '']);
17
17
  assert.deepStrictEqual(inspect(parser('(10)')), [['(', '10', ')'], '']);
18
18
  assert.deepStrictEqual(inspect(parser('(2000)')), [['(', '2000', ')'], '']);
19
- assert.deepStrictEqual(inspect(parser('(0-1)')), [['<span class="paren">(0-1)</span>'], '']);
19
+ assert.deepStrictEqual(inspect(parser('(1, 2)')), [['(', '1, 2', ')'], '']);
20
+ assert.deepStrictEqual(inspect(parser('(0-1)')), [['(', '0-1', ')'], '']);
20
21
  assert.deepStrictEqual(inspect(parser('(0)-1')), [['(', '0', ')'], '-1']);
21
22
  assert.deepStrictEqual(inspect(parser('(0.1)')), [['(', '0.1', ')'], '']);
22
23
  assert.deepStrictEqual(inspect(parser('(0.1.2)')), [['(', '0.1.2', ')'], '']);
24
+ assert.deepStrictEqual(inspect(parser('(1.1, 1.2-1.3, 1.4)')), [['(', '1.1, 1.2-1.3, 1.4', ')'], '']);
23
25
  assert.deepStrictEqual(inspect(parser('(a)')), [['(', 'a', ')'], '']);
24
26
  assert.deepStrictEqual(inspect(parser('(A)')), [['(', 'A', ')'], '']);
27
+ assert.deepStrictEqual(inspect(parser('（１，２）')), [['（', '１，２', '）'], '']);
28
+ assert.deepStrictEqual(inspect(parser('（０－１）')), [['（', '０－１', '）'], '']);
25
29
  assert.deepStrictEqual(inspect(parser('（０．１）（Ａ）')), [['（', '０．１', '）', '（', 'Ａ', '）'], '']);
26
30
  });
27
31
 
package/src/parser/inline/bracket.ts CHANGED
@@ -6,14 +6,14 @@ import { str } from '../source';
6
6
  import { html, defrag } from 'typed-dom';
7
7
  import { unshift, push } from 'spica/array';
8
8
 
9
- const index = /^(?:[0-9]+(?:\.[0-9]+)*|[A-Za-z])/;
9
+ const index = /^(?:[0-9]+(?:(?:[.-]|, )[0-9]+)*|[A-Za-z])/;
10
10
 
11
11
  export const bracket: BracketParser = lazy(() => creator(union([
12
12
  surround(str('('), str(index), str(')')),
13
13
  surround(str('('), some(inline, ')'), str(')'), true,
14
14
  ([as, bs = [], cs], rest) => [[html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))], rest],
15
15
  ([as, bs = []], rest) => [unshift(as, bs), rest]),
16
- surround(str('（'), str(new RegExp(index.source.replace(/[09AZaz.]/g, c => String.fromCharCode(c.charCodeAt(0) + 0xFEE0)))), str('）')),
16
+ surround(str('（'), str(new RegExp(index.source.replace(/[09AZaz., ]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 0xFEE0)))), str('）')),
17
17
  surround(str('（'), some(inline, '）'), str('）'), true,
18
18
  ([as, bs = [], cs], rest) => [[html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))], rest],
19
19
  ([as, bs = []], rest) => [unshift(as, bs), rest]),