@digipair/skill-web 0.136.1 → 0.136.3

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import { JSDOM } from 'jsdom';
 import { readFile } from 'fs/promises';
 import require$$1 from 'path';
 
-function _mergeNamespaces(n, m) {
+function _mergeNamespaces$1(n, m) {
     m.forEach(function(e) {
         e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function(k) {
             if (k !== 'default' && !(k in n)) {
@@ -22,7 +22,7 @@ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof win
 function getDefaultExportFromCjs(x) {
     return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
-var handlebars_min$1 = {
+var handlebars_min = {
     exports: {}
 };
 /**!
@@ -50,7 +50,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-*/ handlebars_min$1.exports;
+*/ handlebars_min.exports;
 (function(module1, exports1) {
     function _instanceof(left, right) {
         if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
@@ -8131,12 +8131,12 @@ THE SOFTWARE.
             }
         ]);
     });
-})(handlebars_min$1, handlebars_min$1.exports);
-var handlebars_minExports = handlebars_min$1.exports;
-var handlebars_min = /*@__PURE__*/ getDefaultExportFromCjs(handlebars_minExports);
-var HandlebarsNamespace = /*#__PURE__*/ _mergeNamespaces({
+})(handlebars_min, handlebars_min.exports);
+var handlebars_minExports = handlebars_min.exports;
+var handlebars_min_default = /*@__PURE__*/ getDefaultExportFromCjs(handlebars_minExports);
+var HandlebarsNamespace = /*#__PURE__*/ _mergeNamespaces$1({
     __proto__: null,
-    default: handlebars_min
+    default: handlebars_min_default
 }, [
     handlebars_minExports
 ]);
@@ -17299,6 +17299,7 @@ class represent prop names.
         this.deserialize = config.deserialize || function() {
             throw new Error("This node type doesn't define a deserialize function");
         };
+        this.combine = config.combine || null;
     }
     _create_class$u(NodeProp, [
         {
@@ -17411,10 +17412,16 @@ represented by another tree.
     */ overlay, /**
     The parser used to create this subtree.
     */ parser) {
+        var /**
+    [Indicates](#common.IterMode.EnterBracketed) that the nested
+    content is delineated with some kind
+    of bracket token.
+    */ bracketed = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
         _class_call_check$z(this, MountedTree);
         this.tree = tree;
         this.overlay = overlay;
         this.parser = parser;
+        this.bracketed = bracketed;
     }
     _create_class$u(MountedTree, null, [
         {
@@ -17630,7 +17637,9 @@ types in it, so that the ids fit into 16-bit typed array slots.
                                 var add = source(type);
                                 if (add) {
                                     if (!newProps) newProps = Object.assign({}, type.props);
-                                    newProps[add[0].id] = add[1];
+                                    var value = add[1], prop = add[0];
+                                    if (prop.combine && prop.id in newProps) value = prop.combine(newProps[prop.id], value);
+                                    newProps[prop.id] = value;
                                 }
                             }
                         } catch (err) {
@@ -17696,6 +17705,12 @@ operator to enable multiple ones.
     library to not enter mounted overlays if one covers the given
     position.
     */ IterMode[IterMode["IgnoreOverlays"] = 8] = "IgnoreOverlays";
+    /**
+    When set, positions on the boundary of a mounted overlay tree
+    that has its [`bracketed`](#common.NestedParse.bracketed) flag
+    set will enter that tree regardless of side. Only supported in
+    [`enter`](#common.SyntaxNode.enter), not in cursors.
+    */ IterMode[IterMode["EnterBracketed"] = 16] = "EnterBracketed";
 })(IterMode || (IterMode = {}));
 /**
 A piece of syntax tree. There are two ways to approach these
@@ -18254,17 +18269,17 @@ var TreeNode = /*#__PURE__*/ function(BaseNode) {
                 var mode = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : 0;
                 for(var parent = this;;){
                     for(var _parent__tree = parent._tree, children = _parent__tree.children, positions = _parent__tree.positions, e = dir > 0 ? children.length : -1; i != e; i += dir){
-                        var next = children[i], start = positions[i] + parent.from;
-                        if (!checkSide(side, pos, start, start + next.length)) continue;
+                        var next = children[i], start = positions[i] + parent.from, mounted = void 0;
+                        if (!(mode & IterMode.EnterBracketed && _instanceof$i(next, Tree) && (mounted = MountedTree.get(next)) && !mounted.overlay && mounted.bracketed && pos >= start && pos <= start + next.length) && !checkSide(side, pos, start, start + next.length)) continue;
                         if (_instanceof$i(next, TreeBuffer)) {
                             if (mode & IterMode.ExcludeBuffers) continue;
                             var index = next.findChild(0, next.buffer.length, dir, pos - start, side);
                             if (index > -1) return new BufferNode(new BufferContext(parent, next, i, start), null, index);
                         } else if (mode & IterMode.IncludeAnonymous || !next.type.isAnonymous || hasChild(next)) {
-                            var mounted = void 0;
-                            if (!(mode & IterMode.IgnoreMounts) && (mounted = MountedTree.get(next)) && !mounted.overlay) return new TreeNode(mounted.tree, start, i, parent);
+                            var mounted1 = void 0;
+                            if (!(mode & IterMode.IgnoreMounts) && (mounted1 = MountedTree.get(next)) && !mounted1.overlay) return new TreeNode(mounted1.tree, start, i, parent);
                             var inner = new TreeNode(next, start, i, parent);
-                            return mode & IterMode.IncludeAnonymous || !inner.type.isAnonymous ? inner : inner.nextChild(dir < 0 ? next.children.length - 1 : 0, dir, pos, side);
+                            return mode & IterMode.IncludeAnonymous || !inner.type.isAnonymous ? inner : inner.nextChild(dir < 0 ? next.children.length - 1 : 0, dir, pos, side, mode);
                         }
                     }
                     if (mode & IterMode.IncludeAnonymous || !parent.type.isAnonymous) return null;
@@ -18299,18 +18314,24 @@ var TreeNode = /*#__PURE__*/ function(BaseNode) {
                 return this.nextChild(this._tree.children.length - 1, -1, pos, -2 /* Side.Before */ );
             }
         },
+        {
+            key: "prop",
+            value: function prop(prop) {
+                return this._tree.prop(prop);
+            }
+        },
         {
             key: "enter",
             value: function enter(pos, side) {
                 var mode = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 0;
                 var mounted;
                 if (!(mode & IterMode.IgnoreOverlays) && (mounted = MountedTree.get(this._tree)) && mounted.overlay) {
-                    var rPos = pos - this.from;
+                    var rPos = pos - this.from, enterBracketed = mode & IterMode.EnterBracketed && mounted.bracketed;
                     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                     try {
                         for(var _iterator = mounted.overlay[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                             var _step_value = _step.value, from = _step_value.from, to = _step_value.to;
-                            if ((side > 0 ? from <= rPos : from < rPos) && (side < 0 ? to >= rPos : to > rPos)) return new TreeNode(mounted.tree, mounted.overlay[0].from + this.from, -1, this);
+                            if ((side > 0 || enterBracketed ? from <= rPos : from < rPos) && (side < 0 || enterBracketed ? to >= rPos : to > rPos)) return new TreeNode(mounted.tree, mounted.overlay[0].from + this.from, -1, this);
                         }
                     } catch (err) {
                         _didIteratorError = true;
@@ -18474,6 +18495,12 @@ var BufferNode = /*#__PURE__*/ function(BaseNode) {
                 return this.child(-1, pos, -2 /* Side.Before */ );
             }
         },
+        {
+            key: "prop",
+            value: function prop(prop) {
+                return this.type.prop(prop);
+            }
+        },
         {
             key: "enter",
             value: function enter(pos, side) {
@@ -18604,11 +18631,8 @@ A tree cursor object focuses on a given node in a syntax tree, and
 allows you to move to adjacent nodes.
 */ var TreeCursor = /*#__PURE__*/ function() {
     function TreeCursor(node) {
-        var /**
-    @internal
-    */ mode = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
+        var mode = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
         _class_call_check$z(this, TreeCursor);
-        this.mode = mode;
         /**
         @internal
         */ this.buffer = null;
@@ -18617,6 +18641,7 @@ allows you to move to adjacent nodes.
         @internal
         */ this.index = 0;
         this.bufferNode = null;
+        this.mode = mode & ~IterMode.EnterBracketed;
         if (_instanceof$i(node, TreeNode)) {
             this.yieldNode(node);
         } else {
@@ -18960,7 +18985,7 @@ function buildTree(data) {
     function takeNode(parentStart, minPos, children, positions, inRepeat, depth) {
         var id = cursor.id, start = cursor.start, end = cursor.end, size = cursor.size;
         var lookAheadAtStart = lookAhead, contextAtStart = contextHash;
-        while(size < 0){
+        if (size < 0) {
             cursor.next();
             if (size == -1 /* SpecialRecord.Reuse */ ) {
                 var node = reused[id];
@@ -19127,7 +19152,7 @@ function buildTree(data) {
             fork.next();
             while(fork.pos > startPos){
                 if (fork.size < 0) {
-                    if (fork.size == -3 /* SpecialRecord.ContextChange */ ) localSkipped += 4;
+                    if (fork.size == -3 /* SpecialRecord.ContextChange */  || fork.size == -4 /* SpecialRecord.LookAhead */ ) localSkipped += 4;
                     else break scan;
                 } else if (fork.id >= minRepeatType) {
                     localSkipped += 4;
@@ -19566,11 +19591,11 @@ about the parse state.
                 var _a;
                 var depth = action >> 19 /* Action.ReduceDepthShift */ , type = action & 65535 /* Action.ValueMask */ ;
                 var parser = this.p.parser;
-                var lookaheadRecord = this.reducePos < this.pos - 25 /* Lookahead.Margin */ ;
-                if (lookaheadRecord) this.setLookAhead(this.pos);
+                var lookaheadRecord = this.reducePos < this.pos - 25 /* Lookahead.Margin */  && this.setLookAhead(this.pos);
                 var dPrec = parser.dynamicPrecedence(type);
                 if (dPrec) this.score += dPrec;
                 if (depth == 0) {
+                    if (type < parser.minRepeatTerm && this.reducePos < this.pos) this.reducePos = this.pos;
                     this.pushState(parser.getGoto(this.state, type, true), this.reducePos);
                     // Zero-depth reductions are a special case—they add stuff to
                     // the stack without popping anything off.
@@ -19584,7 +19609,9 @@ about the parse state.
                 // expression and the state that we'll be staying in, which should
                 // be moved to `this.state`).
                 var base = this.stack.length - (depth - 1) * 3 - (action & 262144 /* Action.StayFlag */  ? 6 : 0);
-                var start = base ? this.stack[base - 2] : this.p.ranges[0].from, size = this.reducePos - start;
+                var start = base ? this.stack[base - 2] : this.p.ranges[0].from;
+                if (type < parser.minRepeatTerm && start == this.reducePos && this.reducePos < this.pos) this.reducePos = this.pos;
+                var size = this.reducePos - start;
                 // This is a kludge to try and detect overly deep left-associative
                 // trees, which will not increase the parse stack depth and thus
                 // won't be caught by the regular stack-depth limit check.
@@ -19623,15 +19650,11 @@ about the parse state.
                 var size = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : 4, mustSink = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
                 if (term == 0 /* Term.Err */  && (!this.stack.length || this.stack[this.stack.length - 1] < this.buffer.length + this.bufferBase)) {
                     // Try to omit/merge adjacent error nodes
-                    var cur = this, top = this.buffer.length;
-                    if (top == 0 && cur.parent) {
-                        top = cur.bufferBase - cur.parent.bufferBase;
-                        cur = cur.parent;
-                    }
-                    if (top > 0 && cur.buffer[top - 4] == 0 /* Term.Err */  && cur.buffer[top - 1] > -1) {
+                    var top = this.buffer.length;
+                    if (top > 0 && this.buffer[top - 4] == 0 /* Term.Err */  && this.buffer[top - 1] > -1) {
                         if (start == end) return;
-                        if (cur.buffer[top - 2] >= start) {
-                            cur.buffer[top - 2] = end;
+                        if (this.buffer[top - 2] >= start) {
+                            this.buffer[top - 2] = end;
                             return;
                         }
                     }
@@ -19640,7 +19663,7 @@ about the parse state.
                     this.buffer.push(term, start, end, size);
                 } else {
                     var index = this.buffer.length;
-                    if (index > 0 && this.buffer[index - 4] != 0 /* Term.Err */ ) {
+                    if (index > 0 && (this.buffer[index - 4] != 0 /* Term.Err */  || this.buffer[index - 1] < 0)) {
                         var mustMove = false;
                         for(var scan = index; scan > 0 && this.buffer[scan - 2] > end; scan -= 4){
                             if (this.buffer[scan - 1] >= 0) {
@@ -19675,11 +19698,11 @@ about the parse state.
                     this.pushState(action & 65535 /* Action.ValueMask */ , this.pos);
                 } else if ((action & 262144 /* Action.StayFlag */ ) == 0) {
                     var nextState = action, parser = this.p.parser;
-                    if (end > this.pos || type <= parser.maxNode) {
-                        this.pos = end;
-                        if (!parser.stateFlag(nextState, 1 /* StateFlag.Skipped */ )) this.reducePos = end;
-                    }
-                    this.pushState(nextState, start);
+                    this.pos = end;
+                    var skipped = parser.stateFlag(nextState, 1 /* StateFlag.Skipped */ );
+                    // Skipped or zero-length non-tree tokens don't move reducePos
+                    if (!skipped && (end > start || type <= parser.maxNode)) this.reducePos = end;
+                    this.pushState(nextState, skipped ? start : Math.min(start, this.reducePos));
                     this.shiftContext(type, start);
                     if (type <= parser.maxNode) this.buffer.push(type, start, end, 4);
                 } else {
@@ -19727,6 +19750,9 @@ about the parse state.
             value: function split() {
                 var parent = this;
                 var off = parent.buffer.length;
+                // Leave off top error node, if there, because that might be
+                // merged with other nodes.
+                if (off && parent.buffer[off - 4] == 0 /* Term.Err */ ) off -= 4;
                 // Because the top of the buffer (after this.pos) may be mutated
                 // to reorder reductions and skipped tokens, and shared buffers
                 // should be immutable, this copies any outstanding skipped tokens
@@ -19970,10 +19996,10 @@ about the parse state.
     @internal
     */ key: "setLookAhead",
             value: function setLookAhead(lookAhead) {
-                if (lookAhead > this.lookAhead) {
-                    this.emitLookAhead();
-                    this.lookAhead = lookAhead;
-                }
+                if (lookAhead <= this.lookAhead) return false;
+                this.emitLookAhead();
+                this.lookAhead = lookAhead;
+                return true;
             }
         },
         {
@@ -20866,7 +20892,12 @@ var Parse = /*#__PURE__*/ function() {
                             }
                         }
                     }
-                    if (newStacks.length > 12 /* Rec.MaxStackCount */ ) newStacks.splice(12 /* Rec.MaxStackCount */ , newStacks.length - 12 /* Rec.MaxStackCount */ );
+                    if (newStacks.length > 12 /* Rec.MaxStackCount */ ) {
+                        newStacks.sort(function(a, b) {
+                            return b.score - a.score;
+                        });
+                        newStacks.splice(12 /* Rec.MaxStackCount */ , newStacks.length - 12 /* Rec.MaxStackCount */ );
+                    }
                 }
                 this.minStackPos = newStacks[0].pos;
                 for(var i2 = 1; i2 < newStacks.length; i2++)if (newStacks[i2].pos < this.minStackPos) this.minStackPos = newStacks[i2].pos;
@@ -20961,7 +20992,7 @@ var Parse = /*#__PURE__*/ function() {
                         if (done) continue;
                     }
                     var force = stack.split(), forceBase = base;
-                    for(var j = 0; force.forceReduce() && j < 10 /* Rec.ForceReduceLimit */ ; j++){
+                    for(var j = 0; j < 10 /* Rec.ForceReduceLimit */  && force.forceReduce(); j++){
                         if (verbose) console.log(forceBase + this.stackID(force) + " (via force-reduce)");
                         var done1 = this.advanceFully(force, newStacks);
                         if (done1) break;
@@ -20996,8 +21027,8 @@ var Parse = /*#__PURE__*/ function() {
                         stack.recoverByDelete(token, tokenEnd);
                         if (verbose) console.log(base + this.stackID(stack) + " (via recover-delete ".concat(this.parser.getName(token), ")"));
                         pushStackDedup(stack, newStacks);
-                    } else if (!finished || finished.score < stack.score) {
-                        finished = stack;
+                    } else if (!finished || finished.score < force.score) {
+                        finished = force;
                     }
                 }
                 return finished;
@@ -21846,7 +21877,7 @@ must be quoted as JSON strings.
 For example:
 
 ```javascript
-parser.withProps(
+parser.configure({props: [
   styleTags({
     // Style Number and BigNumber nodes
     "Number BigNumber": tags.number,
@@ -21861,7 +21892,7 @@ parser.withProps(
     // Style the node named "/" as punctuation
     '"/"': tags.punctuation
   })
-)
+]})
 ```
 */ function styleTags(spec) {
     var byName = Object.create(null);
@@ -21917,7 +21948,26 @@ parser.withProps(
     }
     return ruleNodeProp.add(byName);
 }
-var ruleNodeProp = new NodeProp();
+var ruleNodeProp = new NodeProp({
+    combine: function combine(a, b) {
+        var cur, root, take;
+        while(a || b){
+            if (!a || b && a.depth >= b.depth) {
+                take = b;
+                b = b.next;
+            } else {
+                take = a;
+                a = a.next;
+            }
+            if (cur && cur.mode == take.mode && !take.context && !cur.context) continue;
+            var copy = new Rule$1(take.tags, take.mode, take.context);
+            if (cur) cur.next = copy;
+            else root = copy;
+            cur = copy;
+        }
+        return root;
+    }
+});
 var Rule$1 = /*#__PURE__*/ function() {
     function Rule(tags, mode, context, next) {
         _class_call_check$x(this, Rule);
@@ -22842,14 +22892,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === ' ') {
-            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         tokens1 = _to_consumable_array$4(tokens1).concat([
             token
@@ -22868,7 +22918,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -22887,9 +22937,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
-        return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
+        return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
             v: nextMatch1
         };
     };
@@ -44393,7 +44443,7 @@ function _object_spread_props(target, source) {
         prefix: '_'
     })).join('').toLowerCase();
 }
-const Handlebars = handlebars_min || HandlebarsNamespace;
+const Handlebars = handlebars_min_default || HandlebarsNamespace;
 Handlebars.registerHelper('JSONstringify', function(value) {
     return JSON.stringify(value);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-web",
-  "version": "0.136.1",
+  "version": "0.136.3",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",

package/dist/src/index.d.ts

@@ -1,2 +0,0 @@
-export * from './lib/skill-web';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC"}

package/dist/src/lib/skill-web.d.ts

@@ -1,3 +0,0 @@
-import { PinsSettings } from '@digipair/engine';
-export declare const page: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
-//# sourceMappingURL=skill-web.d.ts.map

package/dist/src/lib/skill-web.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"skill-web.d.ts","sourceRoot":"","sources":["../../../src/lib/skill-web.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA4C,MAAM,kBAAkB,CAAC;AAuS1F,eAAO,MAAM,IAAI,GAAI,QAAQ,GAAG,EAAE,kBAAkB,YAAY,EAAE,EAAE,SAAS,GAAG,iBACtB,CAAC"}