@canopycanopycanopy/b-ber-validator 1.2.13-react-reader.6 → 1.2.13-react-reader.75

package/dist/combinators/close.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.close = void 0;
 const failure_1 = require("../lib/failure");
 const success_1 = require("../lib/success");
-exports.close = (parser, matchIndex) => (ctx) => {
+const close = (parser, matchIndex) => (ctx) => {
     const res = parser(ctx);
     if (!res.success)
         return res;
@@ -15,7 +15,8 @@ exports.close = (parser, matchIndex) => (ctx) => {
     openingRe.lastIndex = nextCtx.index;
     const closingMatch = openingRe.exec(nextCtx.text);
     if ((closingMatch === null || closingMatch === void 0 ? void 0 : closingMatch.index) === nextCtx.index) {
-        return success_1.success(Object.assign(Object.assign({}, ctx), { index: endIdx }), nextValue);
+        return (0, success_1.success)(Object.assign(Object.assign({}, ctx), { index: endIdx }), nextValue);
     }
-    return failure_1.failure(Object.assign(Object.assign({}, ctx), { index: endIdx }), `Closing identifier to match opening identifier ${openingIdent.trim()}`, true);
+    return (0, failure_1.failure)(Object.assign(Object.assign({}, ctx), { index: endIdx }), `Closing identifier to match opening identifier ${openingIdent.trim()}`, true);
 };
+exports.close = close;

package/dist/combinators/constrained.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constrained = void 0;
 // Value *must* match first parser, and can match second
-exports.constrained = (parser1, parser2, expected = 'Valid constraint') => {
+const constrained = (parser1, parser2, expected = 'Valid constraint') => {
     return (ctx) => {
         const res1 = parser1(ctx);
         const res2 = parser2(ctx);
@@ -14,3 +14,4 @@ exports.constrained = (parser1, parser2, expected = 'Valid constraint') => {
         return res2;
     };
 };
+exports.constrained = constrained;

package/dist/combinators/eol.js

@@ -12,9 +12,9 @@ function eol() {
         const endIdx = ctx.index + match.length;
         if (ctx.index === ctx.text.length ||
             ctx.text.substring(ctx.index, endIdx) === match) {
-            return success_1.success(ctx, new EOL());
+            return (0, success_1.success)(ctx, new EOL());
         }
-        return failure_1.failure(ctx, 'End of line', true);
+        return (0, failure_1.failure)(ctx, 'End of line', true);
     };
 }
 exports.eol = eol;

package/dist/combinators/eos.js

@@ -7,7 +7,7 @@ class EOS {
 }
 function eos() {
     return (ctx) => ctx.index === ctx.text.length
-        ? success_1.success(ctx, new EOS())
-        : failure_1.failure(ctx, 'End of string');
+        ? (0, success_1.success)(ctx, new EOS())
+        : (0, failure_1.failure)(ctx, 'End of string');
 }
 exports.eos = eos;

package/dist/combinators/many.js

@@ -19,7 +19,7 @@ function many(parser) {
             values.push(res.value);
             nextCtx = res.ctx;
         }
-        return success_1.success(nextCtx, values);
+        return (0, success_1.success)(nextCtx, values);
     };
 }
 exports.many = many;

package/dist/combinators/map.js

@@ -7,7 +7,7 @@ const success_1 = require("../lib/success");
 function map(parser, fn) {
     return (ctx) => {
         const res = parser(ctx);
-        return res.success ? success_1.success(res.ctx, fn(res.value)) : res;
+        return res.success ? (0, success_1.success)(res.ctx, fn(res.value)) : res;
     };
 }
 exports.map = map;

package/dist/combinators/not.js

@@ -9,10 +9,10 @@ function not(parser) {
         while (nextCtx.index < nextCtx.text.length) {
             const res = parser(nextCtx);
             if (res.success)
-                return success_1.success(nextCtx, null);
+                return (0, success_1.success)(nextCtx, null);
             nextCtx.index += 1;
         }
-        return success_1.success(nextCtx, values);
+        return (0, success_1.success)(nextCtx, values);
     };
 }
 exports.not = not;

package/dist/combinators/optional.js

@@ -5,6 +5,6 @@ const success_1 = require("../lib/success");
 const oneOf_1 = require("./oneOf");
 // Match a parser, or succeed with null
 function optional(parser) {
-    return oneOf_1.oneOf([parser, (ctx) => success_1.success(ctx, null)]);
+    return (0, oneOf_1.oneOf)([parser, (ctx) => (0, success_1.success)(ctx, null)]);
 }
 exports.optional = optional;

package/dist/combinators/regex.js

@@ -9,9 +9,9 @@ function regex(re, expected) {
         re.lastIndex = ctx.index;
         const res = re.exec(ctx.text);
         if (res && res.index === ctx.index) {
-            return success_1.success(Object.assign(Object.assign({}, ctx), { index: ctx.index + res[0].length }), res[0]);
+            return (0, success_1.success)(Object.assign(Object.assign({}, ctx), { index: ctx.index + res[0].length }), res[0]);
         }
-        return failure_1.failure(ctx, expected);
+        return (0, failure_1.failure)(ctx, expected);
     };
 }
 exports.regex = regex;

package/dist/combinators/required.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.required = void 0;
 // Returns fatal error to halt parser in case of failure
-exports.required = (parser) => {
+const required = (parser) => {
     return (ctx) => {
         const res = parser(ctx);
         if (!res.success)
@@ -10,3 +10,4 @@ exports.required = (parser) => {
         return res;
     };
 };
+exports.required = required;

package/dist/combinators/sequence.js

@@ -14,7 +14,7 @@ function sequence(parsers) {
             values.push(res.value);
             nextCtx = res.ctx;
         }
-        return success_1.success(nextCtx, values);
+        return (0, success_1.success)(nextCtx, values);
     };
 }
 exports.sequence = sequence;

package/dist/combinators/string.js

@@ -7,9 +7,9 @@ function string(match, expected = '') {
     return (ctx) => {
         const endIdx = ctx.index + match.length;
         if (ctx.text.substring(ctx.index, endIdx) === match) {
-            return success_1.success(Object.assign(Object.assign({}, ctx), { index: endIdx }), match);
+            return (0, success_1.success)(Object.assign(Object.assign({}, ctx), { index: endIdx }), match);
         }
-        return failure_1.failure(ctx, expected || match);
+        return (0, failure_1.failure)(ctx, expected || match);
     };
 }
 exports.string = string;

package/dist/validator.js

@@ -16,94 +16,94 @@ const close_1 = require("./combinators/close");
 const required_1 = require("./combinators/required");
 const constrained_1 = require("./combinators/constrained");
 const flat_1 = require("./lib/flat");
-const space = string_1.string(' ', 'Space');
-const spaces = many_1.many(space);
-const newLine = string_1.string('\n', 'Newline');
-const ascii = regex_1.regex(/[\x21\x23-\x26\x28-\x39\x3B-\x7F]+/g, 'ASCII characters'); // ASCII without whitespace, colon, or quotes
-const words = regex_1.regex(/[^'"]+/g, 'Words'); // TODO should be 'not opening character' (i.e., `'` or `"`)
-const quote = oneOf_1.oneOf([string_1.string('"'), string_1.string("'")]);
+const space = (0, string_1.string)(' ', 'Space');
+const spaces = (0, many_1.many)(space);
+const newLine = (0, string_1.string)('\n', 'Newline');
+const ascii = (0, regex_1.regex)(/[\x21\x23-\x26\x28-\x39\x3B-\x7F]+/g, 'ASCII characters'); // ASCII without whitespace, colon, or quotes
+const words = (0, regex_1.regex)(/[^'"]+/g, 'Words'); // TODO should be 'not opening character' (i.e., `'` or `"`)
+const quote = (0, oneOf_1.oneOf)([(0, string_1.string)('"'), (0, string_1.string)("'")]);
 // Strings/RegExps instead of sequences to return complete value in error messages
-const sep = string_1.string(':');
-const delimInline = regex_1.regex(/::(?!:)/g, '::');
-const fenceInline = sequence_1.sequence([regex_1.regex(/\n::(?!:)/g, '::'), required_1.required(space)]);
-const fenceBlock = sequence_1.sequence([regex_1.regex(/\n:::(?!:)/g, ':::'), required_1.required(space)]);
-const body = not_1.not(sequence_1.sequence([newLine, sep, sep]));
-const ident = regex_1.regex(/[a-zA-Z0-9_-]+/g, 'Identifier');
-const exit = regex_1.regex(/exit\b/g, 'Exit');
+const sep = (0, string_1.string)(':');
+const delimInline = (0, regex_1.regex)(/::(?!:)/g, '::');
+const fenceInline = (0, sequence_1.sequence)([(0, regex_1.regex)(/\n::(?!:)/g, '::'), (0, required_1.required)(space)]);
+const fenceBlock = (0, sequence_1.sequence)([(0, regex_1.regex)(/\n:::(?!:)/g, ':::'), (0, required_1.required)(space)]);
+const body = (0, not_1.not)((0, sequence_1.sequence)([newLine, sep, sep]));
+const ident = (0, regex_1.regex)(/[a-zA-Z0-9_-]+/g, 'Identifier');
+const exit = (0, regex_1.regex)(/exit\b/g, 'Exit');
 // Directive attributes
 function attr() {
     const quoteIndex = 3;
-    return oneOf_1.oneOf([
-        sequence_1.sequence([space, ascii, sep, ascii]),
-        close_1.close(map_1.map(sequence_1.sequence([space, ascii, sep, quote, words]), (...args) => flat_1.flat(args)), quoteIndex),
+    return (0, oneOf_1.oneOf)([
+        (0, sequence_1.sequence)([space, ascii, sep, ascii]),
+        (0, close_1.close)((0, map_1.map)((0, sequence_1.sequence)([space, ascii, sep, quote, words]), (...args) => (0, flat_1.flat)(args)), quoteIndex),
     ]);
 }
-const attrs = sequence_1.sequence([many_1.many(attr()), optional_1.optional(spaces), eol_1.eol()]);
+const attrs = (0, sequence_1.sequence)([(0, many_1.many)(attr()), (0, optional_1.optional)(spaces), (0, eol_1.eol)()]);
 // Directive RegExp is a directive name followed by a word boundry,
 // that is not followed by a hyphen. This is done to prevent false
 // matches e.g., matching `figure` for `figure-inline`. All directive
 // names are made up of latin a-z and hyphen. `g` flag is set to
 // allow `lastIndex` to be used in the `regex` combinator.
 const directiveRegExp = (s) => new RegExp(`${s}\\b(?!-)`, 'g');
-const inlineNames = Array.from(b_ber_shapes_directives_1.INLINE_DIRECTIVES).map(s => regex_1.regex(directiveRegExp(s), s));
+const inlineNames = Array.from(b_ber_shapes_directives_1.INLINE_DIRECTIVES).map(s => (0, regex_1.regex)(directiveRegExp(s), s));
 const blockNames = Array.from(b_ber_shapes_directives_1.BLOCK_DIRECTIVES)
     .concat(Array.from(b_ber_shapes_directives_1.MISC_DIRECTIVES))
     .concat(Array.from(b_ber_shapes_directives_1.DRAFT_DIRECTIVES))
     .concat(Array.from(b_ber_shapes_directives_1.DEPRECATED_DIRECTIVES))
-    .map(s => regex_1.regex(directiveRegExp(s), s));
-const inlineDirectiveName = oneOf_1.oneOf(inlineNames);
-const blockDirectiveName = oneOf_1.oneOf(blockNames);
-const name = oneOf_1.oneOf(inlineNames.concat(blockNames).concat(exit));
-const caption = sequence_1.sequence([
+    .map(s => (0, regex_1.regex)(directiveRegExp(s), s));
+const inlineDirectiveName = (0, oneOf_1.oneOf)(inlineNames);
+const blockDirectiveName = (0, oneOf_1.oneOf)(blockNames);
+const name = (0, oneOf_1.oneOf)(inlineNames.concat(blockNames).concat(exit));
+const caption = (0, sequence_1.sequence)([
     fenceInline,
-    not_1.not(eol_1.eol()),
-    eol_1.eol(),
-    required_1.required(newLine),
-    required_1.required(delimInline),
-    optional_1.optional(spaces),
-    eol_1.eol(),
+    (0, not_1.not)((0, eol_1.eol)()),
+    (0, eol_1.eol)(),
+    (0, required_1.required)(newLine),
+    (0, required_1.required)(delimInline),
+    (0, optional_1.optional)(spaces),
+    (0, eol_1.eol)(),
 ]);
 function inline() {
-    return sequence_1.sequence([
+    return (0, sequence_1.sequence)([
         fenceBlock,
-        constrained_1.constrained(name, inlineDirectiveName, 'Valid directive name'),
-        required_1.required(sep),
-        required_1.required(ident),
+        (0, constrained_1.constrained)(name, inlineDirectiveName, 'Valid directive name'),
+        (0, required_1.required)(sep),
+        (0, required_1.required)(ident),
         attrs,
-        optional_1.optional(caption),
+        (0, optional_1.optional)(caption),
     ]);
 }
 function speaker() {
-    return sequence_1.sequence([
+    return (0, sequence_1.sequence)([
         fenceInline,
-        many_1.many(sequence_1.sequence([regex_1.regex(/[^\s:]+/g, 'Word'), space])),
-        regex_1.regex(/::(?!:)/g, '::'),
-        regex_1.regex(/[^\n]+/g, 'Not newline'),
-        eol_1.eol(),
+        (0, many_1.many)((0, sequence_1.sequence)([(0, regex_1.regex)(/[^\s:]+/g, 'Word'), space])),
+        (0, regex_1.regex)(/::(?!:)/g, '::'),
+        (0, regex_1.regex)(/[^\n]+/g, 'Not newline'),
+        (0, eol_1.eol)(),
     ]);
 }
 function block() {
     const identIndex = 3;
-    return close_1.close(map_1.map(sequence_1.sequence([
+    return (0, close_1.close)((0, map_1.map)((0, sequence_1.sequence)([
         fenceBlock,
-        constrained_1.constrained(name, blockDirectiveName, 'Valid directive name'),
-        required_1.required(sep),
-        required_1.required(ident),
+        (0, constrained_1.constrained)(name, blockDirectiveName, 'Valid directive name'),
+        (0, required_1.required)(sep),
+        (0, required_1.required)(ident),
         attrs,
-        optional_1.optional(body),
-        optional_1.optional(lazy_1.lazy(directives)),
-        optional_1.optional(body),
+        (0, optional_1.optional)(body),
+        (0, optional_1.optional)((0, lazy_1.lazy)(directives)),
+        (0, optional_1.optional)(body),
         fenceBlock,
         exit,
-        required_1.required(sep),
-    ]), (...args) => flat_1.flat(args)), identIndex);
+        (0, required_1.required)(sep),
+    ]), (...args) => (0, flat_1.flat)(args)), identIndex);
 }
 function directives() {
-    return many_1.many(oneOf_1.oneOf([
-        sequence_1.sequence([optional_1.optional(body), speaker(), optional_1.optional(body)]),
-        sequence_1.sequence([optional_1.optional(body), inline(), optional_1.optional(body)]),
-        sequence_1.sequence([optional_1.optional(body), block(), optional_1.optional(body)]),
+    return (0, many_1.many)((0, oneOf_1.oneOf)([
+        (0, sequence_1.sequence)([(0, optional_1.optional)(body), speaker(), (0, optional_1.optional)(body)]),
+        (0, sequence_1.sequence)([(0, optional_1.optional)(body), inline(), (0, optional_1.optional)(body)]),
+        (0, sequence_1.sequence)([(0, optional_1.optional)(body), block(), (0, optional_1.optional)(body)]),
     ]));
 }
-const parser = sequence_1.sequence([optional_1.optional(body), directives(), optional_1.optional(body), eos_1.eos()]);
+const parser = (0, sequence_1.sequence)([(0, optional_1.optional)(body), directives(), (0, optional_1.optional)(body), (0, eos_1.eos)()]);
 exports.default = parser;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-validator",
-  "version": "1.2.13-react-reader.6+5f5ac8b3",
+  "version": "1.2.13-react-reader.75+8c72aa42",
   "description": "A b-ber syntax validator",
   "author": "Triple Canopy <b-ber@canopycanopycanopy.com> (https://triplecanopy.github.io/)",
   "contributors": [
@@ -36,16 +36,16 @@
     "url": "https://github.com/triplecanopy/b-ber/issues"
   },
   "devDependencies": {
-    "@canopycanopycanopy/b-ber-shapes-directives": "1.1.12",
+    "@canopycanopycanopy/b-ber-shapes-directives": "1.2.13-react-reader.75+8c72aa42",
     "@types/node": "^14.14.7",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "@typescript-eslint/parser": "^4.8.1",
     "babel-cli": "^6.26.0",
-    "eslint": "^7.13.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-prettier": "^3.1.4",
     "jest": "^26.6.3",
-    "rimraf": "^3.0.2",
+    "rimraf": "^2.7.1",
     "ts-jest": "^26.4.4",
     "typescript": "^4.0.5"
   },
@@ -53,5 +53,5 @@
     "lodash": "^4.17.21",
     "tar": "^6.1.11"
   },
-  "gitHead": "5f5ac8b3704149ac656dd852aaac311eea945d65"
+  "gitHead": "8c72aa4290a395d84aaf35884b0b6b2614cedbb4"
 }