securemark 0.257.1 → 0.258.0

package/src/util/toc.ts

@@ -1,5 +1,6 @@
 import { undefined } from 'spica/global';
 import { html } from 'typed-dom/dom';
+import { duffEach, duffReduce } from 'spica/duff';
 import { push } from 'spica/array';
 
 // Bug: Firefox
@@ -7,16 +8,15 @@ import { push } from 'spica/array';
 const selector = ':is(h1, h2, h3, h4, h5, h6, aside.aside)[id]';
 
 export function toc(source: DocumentFragment | HTMLElement | ShadowRoot): HTMLUListElement {
-  const hs = push([], source.querySelectorAll(selector))
-    .map(el => {
-      assert(el.parentNode === source);
-      switch (el.tagName) {
-        case 'ASIDE':
-          return html(el.firstElementChild!.tagName.toLowerCase() as 'h1', { id: el.id, class: 'aside' }, el.firstElementChild!.cloneNode(true).childNodes);
-        default:
-          return el as HTMLHeadingElement;
-      }
-    });
+  const hs = duffReduce(source.querySelectorAll(selector), (acc, el) => {
+    assert(el.parentNode === source);
+    switch (el.tagName) {
+      case 'ASIDE':
+        return push(acc, [html(el.firstElementChild!.tagName.toLowerCase() as 'h1', { id: el.id, class: 'aside' }, el.firstElementChild!.cloneNode(true).childNodes)]);
+      default:
+        return push(acc, [el as HTMLHeadingElement]);
+    }
+  }, [] as HTMLHeadingElement[]);
   return parse(cons(hs));
 }
 
@@ -35,7 +35,7 @@ function parse(node: Tree, index: string = ''): HTMLUListElement {
         : `${index}.${i}`;
     return html('li',
       push(
-        [html('a', { href: `#${el.id}`, 'data-index': isHeading ? idx : undefined }, fix(el))],
+        [html('a', { href: `#${el.id}`, 'data-index': isHeading ? idx : undefined }, unlink(el.cloneNode(true)))],
         cs.length > 0 ? [parse(cs, idx)] : []));
   }));
 }
@@ -57,11 +57,8 @@ function level(h: HTMLHeadingElement): number {
   return +h.tagName[1];
 }
 
-function fix(h: HTMLHeadingElement): Iterable<Node> {
-  h = h.cloneNode(true);
-  for (let es = h.getElementsByTagName('a'), i = 0, len = es.length; i < len; ++i) {
-    const el = es[i];
-    el.replaceWith(...el.childNodes);
-  }
+function unlink(h: HTMLHeadingElement): Iterable<Node> {
+  duffEach(h.getElementsByTagName('a'), el =>
+    void el.replaceWith(...el.childNodes));
   return h.childNodes;
 }

package/webpack.config.js

@@ -56,6 +56,7 @@ module.exports = env => {
               loader: 'ts-loader',
               options: {
                 onlyCompileBundledFiles: true,
+                allowTsInNodeModules: true,
               },
             },
           ],

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

@@ -1,70 +0,0 @@
-import { undefined, WeakMap } from 'spica/global';
-import { hasOwnProperty, ObjectCreate } from 'spica/alias';
-import { Parser, Ctx, Context } from '../../data/parser';
-import { template } from 'spica/assign';
-import { type } from 'spica/type';
-import { memoize } from 'spica/memoize';
-
-export function guard<P extends Parser<unknown>>(f: (context: Context<P>) => boolean, parser: P): P;
-export function guard<T>(f: (context: Ctx) => boolean, parser: Parser<T>): Parser<T> {
-  return (source, context) =>
-    f(context)
-      ? parser(source, context)
-      : undefined;
-}
-
-export function reset<P extends Parser<unknown>>(base: Context<P>, parser: P): P;
-export function reset<T>(base: Ctx, parser: Parser<T>): Parser<T> {
-  assert(Object.getPrototypeOf(base) === Object.prototype);
-  assert(Object.freeze(base));
-  return (source, context) =>
-    parser(source, inherit(ObjectCreate(context), base));
-}
-
-export function context<P extends Parser<unknown>>(base: Context<P>, parser: P): P;
-export function context<T>(base: Ctx, parser: Parser<T>): Parser<T> {
-  assert(Object.getPrototypeOf(base) === Object.prototype);
-  assert(Object.freeze(base));
-  const override = memoize<Ctx, Ctx>(context => inherit(ObjectCreate(context), base), new WeakMap());
-  return (source, context) =>
-    parser(source, override(context));
-}
-
-const inherit = template((prop, target, source) => {
-  assert(!Object.isSealed(target));
-  assert(Object.isExtensible(target));
-  //assert(Object.freeze(source));
-  if (target[prop] === source[prop]) return;
-  switch (prop) {
-    case 'resources':
-      assert(typeof source[prop] === 'object');
-      assert(target[prop] || !(prop in target));
-      if (prop in target && !hasOwnProperty(target, prop)) return;
-      return target[prop] = ObjectCreate(source[prop]);
-  }
-  assert(!target.hasOwnProperty(prop));
-  switch (type(source[prop])) {
-    case 'Object':
-      assert(Object.getPrototypeOf(source[prop]) === Object.prototype);
-      //assert(Object.freeze(source[prop]));
-      switch (type(target[prop])) {
-        case 'Object':
-          return target[prop] = inherit(ObjectCreate(target[prop]), source[prop]);
-        default:
-          return target[prop] = source[prop];
-      }
-    default:
-      return target[prop] = source[prop];
-  }
-});
-
-export function precedence<P extends Parser<unknown>>(precedence: number, parser: P): P;
-export function precedence<T>(precedence: number, parser: Parser<T>): Parser<T> {
-  return (source, context) => {
-    const p = context.precedence;
-    context.precedence = precedence;
-    const result = parser(source, context);
-    context.precedence = p;
-    return result;
-  };
-}

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

@@ -1,54 +0,0 @@
-import { Parser } from '../../data/parser';
-
-export function creator<P extends Parser<unknown>>(parser: P): P;
-export function creator<P extends Parser<unknown>>(cost: number, parser: P): P;
-export function creator(cost: number | Parser<unknown>, parser?: Parser<unknown>): Parser<unknown> {
-  if (typeof cost === 'function') return creator(1, cost);
-  assert(cost >= 0);
-  return (source, context) => {
-    const { resources = { budget: 1, recursion: 1 } } = context;
-    if (resources.budget <= 0) throw new Error('Too many creations');
-    if (resources.recursion <= 0) throw new Error('Too much recursion');
-    --resources.recursion;
-    const result = parser!(source, context);
-    ++resources.recursion;
-    if (result) {
-      resources.budget -= cost;
-    }
-    return result;
-  };
-}
-
-export function uncreator<P extends Parser<unknown>>(parser: P): P;
-export function uncreator<P extends Parser<unknown>>(cost: number, parser: P): P;
-export function uncreator(cost: number | Parser<unknown>, parser?: Parser<unknown>): Parser<unknown> {
-  if (typeof cost === 'function') return uncreator(1, cost);
-  assert(cost >= 0);
-  return (source, context) => {
-    const { resources = { budget: 1, recursion: 1 } } = context;
-    if (resources.budget <= 0) throw new Error('Too many creations');
-    if (resources.recursion <= 0) throw new Error('Too much recursion');
-    ++resources.recursion;
-    const result = parser!(source, context);
-    --resources.recursion;
-    if (result) {
-      resources.budget += cost;
-    }
-    return result;
-  };
-}
-
-export function recursion<P extends Parser<unknown>>(parser: P): P;
-export function recursion<P extends Parser<unknown>>(cost: number, parser: P): P;
-export function recursion(cost: number | Parser<unknown>, parser?: Parser<unknown>): Parser<unknown> {
-  if (typeof cost === 'function') return recursion(1, cost);
-  assert(cost >= 0);
-  return (source, context) => {
-    const { resources = { recursion: 1 } } = context;
-    if (resources.recursion <= 0) throw new Error('Too much recursion');
-    --resources.recursion;
-    const result = parser!(source, context);
-    ++resources.recursion;
-    return result;
-  };
-}