securemark 0.262.2 → 0.263.1

package/index.ts

@@ -1,4 +1,3 @@
-import 'spica/global';
 export * from './src/parser';
 export * from './src/util';
 export * from './src/renderer';

package/karma.conf.js

@@ -6,7 +6,7 @@ module.exports = function (config) {
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.js', watched: false, served: false, included: true, integrity: 'sha512-2iwCHjuj+PmdCyvb88rMOch0UcKQxVHi/gsAml1fN3eg82IDaO/cdzzeXX4iF2VzIIes7pODE1/G0ts3QBwslA==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/benchmark/2.1.4/benchmark.js', watched: false, served: false, included: true, integrity: 'sha512-XnVGk21Ij51MbU8XezQpkwZ1/GA8b5qmoVGIOdJLBYycutjkaeemipzRJP7P6mEJl99OfnweA7M3e4WLfuG7Aw==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.js', watched: false, served: false, included: true, integrity: 'sha512-n/4gHW3atM3QqRcbCn6ewmpxcLAHGaDjpEBu4xZd47N0W2oQ+6q7oc3PXstrJYXcbNU1OHdQ1T7pAP+gi5Yu8g==' },
-      { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.28.0/prism.min.js', watched: false, served: false, included: true, integrity: 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.22.0/prism.js' },
+      { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.28.0/prism.min.js', watched: false, served: false, included: true, integrity: 'sha512-RDQSW3KoqJMiX0L/UBgwBmH1EmRYp8LBOiLaA8rBHIy+7OGP/7Gxg8vbt8wG4ZYd29P0Fnoq6+LOytCqx3cyoQ==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.28.0/plugins/autoloader/prism-autoloader.min.js', watched: false, served: false, included: true, integrity: 'sha512-fTl/qcO1VgvKtOMApX2PdZzkziyr2stM65GYPLGuYMnuMm1z2JLJG6XVU7C/mR+E7xBUqCivykuhlzfqxXBXbg==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.0/es5/tex-chtml.min.js', watched: false, served: false, included: true, integrity: 'sha512-93xLZnNMlYI6xaQPf/cSdXoBZ23DThX7VehiGJJXB76HTTalQKPC5CIHuFX8dlQ5yzt6baBQRJ4sDXhzpojRJA==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/dompurify/2.3.8/purify.js', watched: false, served: false, included: true, integrity: 'sha512-QaF+0tDlqVmwZaQSc0kImgYmw+Cd66TxA5D9X70I5V9BNSqk6yBTbyqw2VEUsVYV5OTbxw8HD9d45on1wvYv7g==' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.262.2",
+  "version": "0.263.1",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -31,30 +31,30 @@
     "@types/dompurify": "2.3.4",
     "@types/jquery": "3.5.14",
     "@types/mathjax": "0.0.37",
-    "@types/mocha": "9.1.1",
+    "@types/mocha": "10.0.0",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.37.0",
+    "@typescript-eslint/parser": "^5.39.0",
     "babel-loader": "^8.2.5",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^7.4.0",
-    "eslint": "^8.23.1",
+    "eslint": "^8.25.0",
     "eslint-plugin-redos": "^4.4.1",
     "eslint-webpack-plugin": "^3.2.0",
     "glob": "^8.0.3",
-    "karma": "^6.4.0",
+    "karma": "^6.4.1",
     "karma-chrome-launcher": "^3.1.1",
     "karma-coverage": "^2.2.0",
     "karma-firefox-launcher": "^2.1.2",
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
     "mocha": "^10.0.0",
-    "npm-check-updates": "^16.1.3",
-    "semver": "^7.3.7",
-    "spica": "0.0.626",
-    "ts-loader": "^9.3.1",
-    "typed-dom": "^0.0.309",
-    "typescript": "4.8.3",
+    "npm-check-updates": "^16.3.10",
+    "semver": "^7.3.8",
+    "spica": "0.0.656",
+    "ts-loader": "^9.4.1",
+    "typed-dom": "^0.0.312",
+    "typescript": "4.8.4",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
     "webpack-merge": "^5.8.0"

package/src/combinator/control/constraint/block.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, exec } from '../../data/parser';
 import { Memo } from '../../data/parser/context/memo';
 import { firstline, isEmpty } from './line';
@@ -10,7 +9,7 @@ export function block<T>(parser: Parser<T>, separation = true): Parser<T> {
     if (source === '') return;
     context.memo ??= new Memo();
     const result = parser({ source, context });
-    if (!result) return;
+    if (result === undefined) return;
     const rest = exec(result);
     if (separation && !isEmpty(firstline(rest))) return;
     assert(rest === '' || source[source.length - rest.length - 1] === '\n');

package/src/combinator/control/constraint/contract.ts

@@ -1,4 +1,4 @@
-import { global, undefined } from 'spica/global';
+import 'spica/global';
 import { isArray } from 'spica/alias';
 import { Parser, Ctx, Tree, Context, eval, exec, check } from '../../data/parser';
 
@@ -27,7 +27,7 @@ export function validate<T>(patterns: string | RegExp | (string | RegExp)[], has
     if (!match(source)) return;
     const result = parser!({ source, context });
     assert(check(source, result));
-    if (!result) return;
+    if (result === undefined) return;
     assert(exec(result).length < source.length);
     return exec(result).length < source.length
       ? result
@@ -42,7 +42,7 @@ export function verify<T>(parser: Parser<T>, cond: (results: readonly T[], rest:
     if (source === '') return;
     const result = parser({ source, context });
     assert(check(source, result));
-    if (!result) return;
+    if (result === undefined) return;
     if (!cond(eval(result), exec(result), context)) return;
     assert(exec(result).length < source.length);
     return exec(result).length < source.length

package/src/combinator/control/constraint/line.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, eval, exec, check } from '../../data/parser';
 import { Memo } from '../../data/parser/context/memo';
 
@@ -14,7 +13,7 @@ export function line<T>(parser: Parser<T>): Parser<T> {
     const result = parser({ source: line, context });
     assert(check(line, result));
     context.offset -= source.length - line.length;
-    if (!result) return;
+    if (result === undefined) return;
     return isEmpty(exec(result))
       ? [eval(result), source.slice(line.length)]
       : undefined;

package/src/combinator/control/manipulation/convert.ts

@@ -1,11 +1,11 @@
-import { Parser, check } from '../../data/parser';
+import { Parser, Ctx, Context, check } from '../../data/parser';
 
-export function convert<P extends Parser<unknown>>(conv: (source: string) => string, parser: P): P;
-export function convert<T>(conv: (source: string) => string, parser: Parser<T>): Parser<T> {
+export function convert<P extends Parser<unknown>>(conv: (source: string, context: Context<P>) => string, parser: P): P;
+export function convert<T>(conv: (source: string, context: Ctx) => string, parser: Parser<T>): Parser<T> {
   assert(parser);
   return ({ source, context }) => {
     if (source === '') return;
-    const src = conv(source);
+    const src = conv(source, context);
     if (src === '') return [[], ''];
     context.offset ??= 0;
     context.offset += source.length - src.length;

package/src/combinator/control/manipulation/indent.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, eval, exec } from '../../data/parser';
 import { some } from '../../data/parser/some';
 import { block } from '../constraint/block';

package/src/combinator/control/manipulation/match.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, exec, check } from '../../data/parser';
 
 export function match<P extends Parser<unknown>>(pattern: RegExp, f: (matched: RegExpMatchArray) => P): P;
@@ -11,7 +10,7 @@ export function match<T>(pattern: RegExp, f: (matched: RegExpMatchArray) => Pars
     assert(source.startsWith(param[0]));
     const result = f(param)({ source, context });
     assert(check(source, result, false));
-    if (!result) return;
+    if (result === undefined) return;
     return exec(result).length < source.length && exec(result).length <= source.length
       ? result
       : undefined;

package/src/combinator/control/manipulation/scope.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, Context, eval, exec, check } from '../../data/parser';
 
 export function focus<P extends Parser<unknown>>(scope: string | RegExp, parser: P): P;
@@ -18,7 +17,7 @@ export function focus<T>(scope: string | RegExp, parser: Parser<T>): Parser<T> {
     const result = parser({ source: src, context });
     assert(check(src, result));
     context.offset -= source.length - src.length;
-    if (!result) return;
+    if (result === undefined) return;
     assert(exec(result).length < src.length);
     return exec(result).length < src.length
       ? [eval(result), exec(result) + source.slice(src.length)]
@@ -38,7 +37,7 @@ export function rewrite<T>(scope: Parser<unknown>, parser: Parser<T>): Parser<T>
     const res1 = scope({ source, context });
     assert(check(source, res1));
     context.memo = memo;
-    if (!res1 || exec(res1).length >= source.length) return;
+    if (res1 === undefined || exec(res1).length >= source.length) return;
     const src = source.slice(0, source.length - exec(res1).length);
     assert(src !== '');
     assert(source.startsWith(src));
@@ -47,7 +46,7 @@ export function rewrite<T>(scope: Parser<unknown>, parser: Parser<T>): Parser<T>
     const res2 = parser({ source: src, context });
     assert(check(src, res2));
     context.offset -= source.length - src.length;
-    if (!res2) return;
+    if (res2 === undefined) return;
     assert(exec(res2) === '');
     return exec(res2).length < src.length
       ? [eval(res2), exec(res2) + exec(res1)]

package/src/combinator/control/manipulation/surround.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, Input, Result, Ctx, Tree, Context, SubParsers, SubTree, IntermediateParser, eval, exec, check } from '../../data/parser';
 import { fmap } from '../monad/fmap';
 import { unshift, push } from 'spica/array';
@@ -43,7 +42,7 @@ export function surround<T>(
     if (lmr_ === '') return;
     const res1 = opener({ source: lmr_, context });
     assert(check(lmr_, res1, false));
-    if (!res1) return;
+    if (res1 === undefined) return;
     const rl = eval(res1);
     const mr_ = exec(res1);
     const res2 = mr_ !== '' ? parser({ source: mr_, context }) : undefined;

package/src/combinator/control/monad/bind.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, Result, Ctx, Tree, Context, SubParsers, SubTree, IntermediateParser, eval, exec, check } from '../../data/parser';
 
 export function bind<P extends Parser<unknown>>(parser: IntermediateParser<P>, f: (nodes: SubTree<P>[], rest: string, context: Context<P>) => Result<Tree<P>, Context<P>, SubParsers<P>>): P;
@@ -11,11 +10,11 @@ export function bind<T, U>(parser: Parser<T>, f: (nodes: T[], rest: string, cont
     if (source === '') return;
     const res1 = parser({ source, context });
     assert(check(source, res1));
-    if (!res1) return;
+    if (res1 === undefined) return;
     const res2 = f(eval(res1), exec(res1), context);
     assert(check(source, res2));
     assert(check(exec(res1), res2, false));
-    if (!res2) return;
+    if (res2 === undefined) return;
     return exec(res2).length <= exec(res1).length
       ? res2
       : undefined;

package/src/combinator/data/parser/context.ts

@@ -1,4 +1,3 @@
-import { undefined, Array, Object } from 'spica/global';
 import { hasOwnProperty, ObjectCreate } from 'spica/alias';
 import { Parser, Result, Ctx, Context, eval, exec, Tree } from '../../data/parser';
 import { Memo } from './context/memo';

package/src/combinator/data/parser/inits.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, Ctx, Tree, Context, SubParsers, SubTree, eval, exec, check } from '../parser';
 import { push } from 'spica/array';
 
@@ -14,7 +13,7 @@ export function inits<T, D extends Parser<T>[]>(parsers: D, resume?: (nodes: T[]
       if (context.delimiters?.match(rest, context.precedence)) break;
       const result = parsers[i]({ source: rest, context });
       assert(check(rest, result));
-      if (!result) break;
+      if (result === undefined) break;
       nodes = nodes
         ? push(nodes, eval(result))
         : eval(result);

package/src/combinator/data/parser/sequence.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, Ctx, Tree, Context, SubParsers, SubTree, eval, exec, check } from '../parser';
 import { push } from 'spica/array';
 
@@ -14,7 +13,7 @@ export function sequence<T, D extends Parser<T>[]>(parsers: D, resume?: (nodes:
       if (context.delimiters?.match(rest, context.precedence)) return;
       const result = parsers[i]({ source: rest, context });
       assert(check(rest, result));
-      if (!result) return;
+      if (result === undefined) return;
       nodes = nodes
         ? push(nodes, eval(result))
         : eval(result);

package/src/combinator/data/parser/some.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, eval, exec, check } from '../parser';
 import { Delimiters } from './context/delimiter';
 import { unshift, push } from 'spica/array';
@@ -30,7 +29,7 @@ export function some<T>(parser: Parser<T>, end?: string | RegExp | number, delim
       if (context.delimiters?.match(rest, context.precedence)) break;
       const result = parser({ source: rest, context });
       assert.doesNotThrow(() => limit < 0 && check(rest, result));
-      if (!result) break;
+      if (result === undefined) break;
       nodes = nodes
         ? nodes.length < eval(result).length
           ? unshift(nodes, eval(result))

package/src/combinator/data/parser/union.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Parser, Ctx, Tree, Context, SubParsers, SubTree } from '../parser';
 
 export function union<P extends Parser<unknown>>(parsers: SubParsers<P>): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
@@ -9,17 +8,10 @@ export function union<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
       return () => undefined;
     case 1:
       return parsers[0];
-    case 2:
-      return input => parsers[0](input) ?? parsers[1](input);
-    case 3:
-      return input => parsers[0](input) ?? parsers[1](input) ?? parsers[2](input);
     default:
-      return input => {
-        for (let i = 0; i < parsers.length; ++i) {
-          const parser = parsers[i];
-          const result = parser(input);
-          if (result) return result;
-        }
-      };
+      return eval([
+        'input =>',
+        parsers.map((_, i) => `|| parsers[${i}](input)`).join('').slice(2),
+      ].join(''));
   }
 }

package/src/parser/api/bind.ts

@@ -1,4 +1,3 @@
-import { undefined, location } from 'spica/global';
 import { ParserSettings, Progress } from '../../..';
 import { MarkdownParser } from '../../../markdown';
 import { eval } from '../../combinator/data/parser';

package/src/parser/api/parse.ts

@@ -1,4 +1,3 @@
-import { location } from 'spica/global';
 import { ParserOptions } from '../../..';
 import { MarkdownParser } from '../../../markdown';
 import { eval } from '../../combinator/data/parser';

package/src/parser/block/codeblock.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { CodeBlockParser } from '../block';
 import { eval } from '../../combinator/data/parser';
 import { some, block, validate, fence, clear, fmap } from '../../combinator';

package/src/parser/block/extension/fig.test.ts

@@ -10,7 +10,6 @@ describe('Unit: parser/block/extension/fig', () => {
       assert.deepStrictEqual(inspect(parser('\n!https://host\n')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name]\nhttps://host')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name]\nhttps://host\n')), undefined);
-      assert.deepStrictEqual(inspect(parser('[$group-name]\n!https://host\na')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n !https://host')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n\n!https://host')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name]a\nhttps://host')), undefined);
@@ -43,6 +42,8 @@ describe('Unit: parser/block/extension/fig', () => {
       assert.deepStrictEqual(inspect(parser('[$group-name]\n!> _a_')), [['<figure data-type="quote" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><blockquote><section><p><em>a</em></p><h2>References</h2><ol class="references"></ol></section></blockquote></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n![]{https://host}')), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n![]{https://host}\n')), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div></figure>'], '']);
+      assert.deepStrictEqual(inspect(parser('[$group-name]\n!https://host\ncaption')), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext">caption</span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div></figure>'], '']);
+      assert.deepStrictEqual(inspect(parser('[$group-name]\n!https://host\ncaption\n')), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext">caption</span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('$group-name\n!https://host')), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div></figure>'], '']);
     });
 

package/src/parser/block/extension/fig.ts

@@ -8,6 +8,7 @@ import { segment as seg_math } from '../mathblock';
 import { segment as seg_table } from './table';
 import { segment as seg_blockquote } from '../blockquote';
 import { segment as seg_placeholder } from './placeholder';
+import { media, shortmedia } from '../../inline';
 
 import FigParser = ExtensionParser.FigParser;
 
@@ -25,10 +26,21 @@ export const segment: FigParser.SegmentParser = block(validate(['[$', '$'],
   ])));
 
 export const fig: FigParser = block(rewrite(segment, verify(convert(
-  source => {
+  (source, context) => {
     const fence = (/^[^\n]*\n!?>+\s/.test(source) && source.match(/^~{3,}(?=[^\S\n]*$)/mg) || [])
       .reduce((max, fence) => fence > max ? fence : max, '~~') + '~';
-    return `${fence}figure ${source}\n\n${fence}`;
+    return parser({ source, context })
+      ? `${fence}figure ${source.replace(/^(.+\n.+\n)([\S\s]+?)\n?$/, '$1\n$2')}\n${fence}`
+      : `${fence}figure ${source}\n\n${fence}`;
   },
   union([figure])),
   ([el]) => el.tagName === 'FIGURE')));
+
+const parser = sequence([
+  line(close(seg_label, /^(?=\s).*\n/)),
+  line(union([
+    media,
+    shortmedia,
+  ])),
+  some(contentline),
+]);

package/src/parser/block/extension/figure.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { ExtensionParser } from '../../block';
 import { union, inits, sequence, some, state, block, line, fence, rewrite, close, match, convert, trimEnd, fallback, fmap } from '../../../combinator';
 import { str, contentline, emptyline } from '../../source';

package/src/parser/block/extension/table.ts

@@ -1,4 +1,3 @@
-import { undefined, BigInt, Array } from 'spica/global';
 import { max, min, isArray } from 'spica/alias';
 import { ExtensionParser } from '../../block';
 import { Tree, eval } from '../../../combinator/data/parser';

package/src/parser/block/mathblock.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { MathBlockParser } from '../block';
 import { block, validate, fence, clear, fmap } from '../../combinator';
 import { html } from 'typed-dom/dom';

package/src/parser/block/olist.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { OListParser } from '../block';
 import { Parser } from '../../combinator/data/parser';
 import { union, inits, subsequence, some, creation, state, block, line, validate, indent, focus, rewrite, open, match, fallback, lazy, fmap } from '../../combinator';

package/src/parser/block.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { MarkdownParser } from '../../markdown';
 import { union, reset, creation, open, fallback, recover } from '../combinator';
 import { emptyline } from './source';

package/src/parser/inline/annotation.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { AnnotationParser } from '../inline';
 import { union, some, context, syntax, constraint, surround, lazy } from '../../combinator';
 import { inline } from '../inline';

package/src/parser/inline/bracket.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { BracketParser } from '../inline';
 import { union, some, syntax, surround, lazy } from '../../combinator';
 import { inline } from '../inline';

package/src/parser/inline/extension/index.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { ExtensionParser } from '../../inline';
 import { union, some, syntax, creation, precedence, constraint, validate, surround, open, lazy, fmap } from '../../../combinator';
 import { inline } from '../../inline';

package/src/parser/inline/extension/indexee.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { MarkdownParser } from '../../../../markdown';
 import { Parser } from '../../../combinator/data/parser';
 import { fmap } from '../../../combinator';

package/src/parser/inline/extension/label.ts

@@ -1,4 +1,3 @@
-import { Array } from 'spica/global';
 import { ExtensionParser } from '../../inline';
 import { union, constraint, creation, validate, surround, clear, fmap } from '../../../combinator';
 import { str } from '../../source';

package/src/parser/inline/html.ts

@@ -1,4 +1,3 @@
-import { undefined, Object } from 'spica/global';
 import { HTMLParser } from '../inline';
 import { union, subsequence, some, syntax, validate, focus, surround, open, match, lazy } from '../../combinator';
 import { inline } from '../inline';

package/src/parser/inline/htmlentity.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { HTMLEntityParser, UnsafeHTMLEntityParser } from '../inline';
 import { union, creation, validate, focus, fmap } from '../../combinator';
 import { html } from 'typed-dom/dom';

package/src/parser/inline/link.ts

@@ -1,4 +1,3 @@
-import { undefined, location, encodeURI, decodeURI, Location } from 'spica/global';
 import { MarkdownParser } from '../../../markdown';
 import { LinkParser } from '../inline';
 import { Result, eval, exec } from '../../combinator/data/parser';

package/src/parser/inline/media.ts

@@ -1,4 +1,3 @@
-import { undefined, location } from 'spica/global';
 import { MediaParser } from '../inline';
 import { union, inits, tails, some, syntax, creation, precedence, constraint, validate, verify, surround, open, dup, lazy, fmap, bind } from '../../combinator';
 import { unsafelink, uri, option as linkoption, resolve } from './link';

package/src/parser/inline/reference.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { ReferenceParser } from '../inline';
 import { union, subsequence, some, context, syntax, creation, constraint, surround, open, lazy, bind } from '../../combinator';
 import { inline } from '../inline';

package/src/parser/inline/ruby.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { RubyParser } from '../inline';
 import { eval, exec } from '../../combinator/data/parser';
 import { sequence, syntax, creation, validate, verify, surround, lazy, fmap } from '../../combinator';

package/src/parser/inline/template.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { TemplateParser } from '../inline';
 import { union, some, syntax, creation, precedence, surround, lazy } from '../../combinator';
 import { escsource, str } from '../source';

package/src/parser/processor/figure.ts

@@ -1,4 +1,3 @@
-import { Infinity, Set, Map } from 'spica/global';
 import { number as calculate, isFixed } from '../inline/extension/label';
 import { MultiQueue } from 'spica/queue';
 import { push } from 'spica/array';

package/src/parser/processor/footnote.ts

@@ -1,4 +1,3 @@
-import { undefined, Infinity, Map, Node } from 'spica/global';
 import { text } from '../inline/extension/indexee';
 import { MultiQueue } from 'spica/queue';
 import { frag, html, define } from 'typed-dom/dom';

package/src/parser/segment.ts

@@ -1,4 +1,3 @@
-import { Blob } from 'spica/global';
 import { MarkdownParser } from '../../markdown';
 import { eval, exec } from '../combinator/data/parser';
 import { union, some } from '../combinator';

package/src/parser/source/line.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { AnyLineParser, EmptyLineParser, ContentLineParser } from '../source';
 import { line, isEmpty } from '../../combinator';
 

package/src/parser/source/str.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { StrParser } from '../source';
 import { Parser, Context } from '../../combinator/data/parser';
 import { creation } from '../../combinator';

package/src/parser/source/text.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { TextParser, TxtParser, LinebreakParser } from '../source';
 import { union, creation, focus } from '../../combinator';
 import { str } from './str';

package/src/parser/visibility.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { MarkdownParser } from '../../markdown';
 import { Parser, Input, eval } from '../combinator/data/parser';
 import { union, some, verify, convert, fmap } from '../combinator';

package/src/renderer/render/math.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { Dict } from 'spica/dict';
 import { html, define } from 'typed-dom/dom';
 

package/src/renderer/render/media/image.ts

@@ -1,4 +1,3 @@
-import { Object } from 'spica/global';
 import { Dict } from 'spica/dict';
 import { define } from 'typed-dom/dom';
 

package/src/renderer/render/media/twitter.ts

@@ -1,4 +1,3 @@
-import { window, document } from 'spica/global';
 import { parse } from '../../../parser';
 import { html as h, define } from 'typed-dom/dom';
 import DOMPurify from 'dompurify';

package/src/renderer/render/media/video.ts

@@ -1,4 +1,3 @@
-import { undefined, Object } from 'spica/global';
 import { html } from 'typed-dom/dom';
 
 const extensions = [

package/src/renderer/render/media/youtube.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { html } from 'typed-dom/dom';
 
 export function youtube(source: HTMLImageElement, url: URL): HTMLElement | undefined {

package/src/renderer/render.ts

@@ -1,4 +1,3 @@
-import { location } from 'spica/global';
 import { RenderingOptions } from '../../';
 import { code } from './render/code';
 import { math } from './render/math';

package/src/util/quote.ts

@@ -1,4 +1,3 @@
-import { Element } from 'spica/global';
 import { exec } from '../combinator/data/parser';
 import { cite } from '../parser/block/reply/cite';
 import { define } from 'typed-dom/dom';

package/src/util/scope.ts

@@ -1,5 +1,3 @@
-import { undefined, WeakMap } from 'spica/global';
-
 export function scope(
   base: DocumentFragment | HTMLElement | ShadowRoot,
   filter: string = '',

package/src/util/toc.ts

@@ -1,4 +1,3 @@
-import { undefined } from 'spica/global';
 import { push } from 'spica/array';
 import { html } from 'typed-dom/dom';
 

package/webpack.config.js

@@ -6,7 +6,7 @@ const { mergeWithRules } = require('webpack-merge');
 const ESLintPlugin = require('eslint-webpack-plugin');
 const pkg = require('./package.json');
 
-shell('rm -rf coverage');
+shell('rm -rf dist coverage');
 
 module.exports = env => {
   const merge = mergeWithRules({