@canopycanopycanopy/b-ber-validator 3.0.8-next.61 → 3.0.8-next.96

package/dist/combinators/close.js

@@ -14,9 +14,9 @@ const close = (parser, matchIndex) => (ctx) => {
     const openingRe = new RegExp(`${openingIdent}(?![^\\s])`, 'g'); // Allow dangling whitespace
     openingRe.lastIndex = nextCtx.index;
     const closingMatch = openingRe.exec(nextCtx.text);
-    if ((closingMatch === null || closingMatch === void 0 ? void 0 : closingMatch.index) === nextCtx.index) {
-        return (0, success_1.success)(Object.assign(Object.assign({}, ctx), { index: endIdx }), nextValue);
+    if (closingMatch?.index === nextCtx.index) {
+        return (0, success_1.success)({ ...ctx, index: endIdx }, nextValue);
     }
-    return (0, failure_1.failure)(Object.assign(Object.assign({}, ctx), { index: endIdx }), `Closing identifier to match opening identifier ${openingIdent.trim()}`, true);
+    return (0, failure_1.failure)({ ...ctx, index: endIdx }, `Closing identifier to match opening identifier ${openingIdent.trim()}`, true);
 };
 exports.close = close;

package/dist/combinators/constrained.js

@@ -8,7 +8,7 @@ const constrained = (parser1, parser2, expected = 'Valid constraint') => {
         const res2 = parser2(ctx);
         // Fails fatally if first condition is not met
         if (!res1.success) {
-            return Object.assign(Object.assign({}, res1), { expected, fatal: true });
+            return { ...res1, expected, fatal: true };
         }
         // Allowed to fail normally afterwards
         return res2;

package/dist/combinators/eol.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eol = void 0;
+exports.eol = eol;
 const failure_1 = require("../lib/failure");
 const success_1 = require("../lib/success");
 // eol function doesn't advance index
@@ -17,4 +17,3 @@ function eol() {
         return (0, failure_1.failure)(ctx, 'End of line', true);
     };
 }
-exports.eol = eol;

package/dist/combinators/eos.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eos = void 0;
+exports.eos = eos;
 const failure_1 = require("../lib/failure");
 const success_1 = require("../lib/success");
 class EOS {
@@ -10,4 +10,3 @@ function eos() {
         ? (0, success_1.success)(ctx, new EOS())
         : (0, failure_1.failure)(ctx, 'End of string');
 }
-exports.eos = eos;

package/dist/combinators/lazy.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lazy = void 0;
+exports.lazy = lazy;
 function lazy(parserFn) {
     return (ctx) => parserFn()(ctx);
 }
-exports.lazy = lazy;

package/dist/combinators/many.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.many = void 0;
+exports.many = many;
 const success_1 = require("../lib/success");
 // Look for 0 or more of something, until we can't parse any more.
 // Note that this function never fails, it will instead succeed
@@ -22,4 +22,3 @@ function many(parser) {
         return (0, success_1.success)(nextCtx, values);
     };
 }
-exports.many = many;

package/dist/combinators/map.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.map = void 0;
+exports.map = map;
 const success_1 = require("../lib/success");
 // Convenience method that will map a Success to callback, to let us do
 // common things like build AST nodes from input strings.
@@ -10,4 +10,3 @@ function map(parser, fn) {
         return res.success ? (0, success_1.success)(res.ctx, fn(res.value)) : res;
     };
 }
-exports.map = map;

package/dist/combinators/not.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.not = void 0;
+exports.not = not;
 const success_1 = require("../lib/success");
 function not(parser) {
     return (ctx) => {
         const values = [];
-        const nextCtx = Object.assign({}, ctx);
+        const nextCtx = { ...ctx };
         while (nextCtx.index < nextCtx.text.length) {
             const res = parser(nextCtx);
             if (res.success)
@@ -15,4 +15,3 @@ function not(parser) {
         return (0, success_1.success)(nextCtx, values);
     };
 }
-exports.not = not;

package/dist/combinators/oneOf.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.oneOf = void 0;
+exports.oneOf = oneOf;
 // Try each matcher in order, starting from the same point in the input.
 // Return the first one that succeeds, or return the failure that got furthest
 // in the input string. which failure to return is a matter of taste, we
@@ -16,11 +16,10 @@ function oneOf(parsers) {
                 return res;
             if (res.fatal)
                 return res;
-            if (!(furthestRes === null || furthestRes === void 0 ? void 0 : furthestRes.ctx) || furthestRes.ctx.index > res.ctx.index) {
+            if (!furthestRes?.ctx || furthestRes.ctx.index > res.ctx.index) {
                 furthestRes = res;
             }
         }
         return furthestRes;
     };
 }
-exports.oneOf = oneOf;

package/dist/combinators/optional.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optional = void 0;
+exports.optional = optional;
 const success_1 = require("../lib/success");
 const oneOf_1 = require("./oneOf");
 // Match a parser, or succeed with null
 function optional(parser) {
     return (0, oneOf_1.oneOf)([parser, (ctx) => (0, success_1.success)(ctx, null)]);
 }
-exports.optional = optional;

package/dist/combinators/regex.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.regex = void 0;
+exports.regex = regex;
 const failure_1 = require("../lib/failure");
 const success_1 = require("../lib/success");
 // Match a regexp or fail
@@ -9,9 +9,8 @@ function regex(re, expected) {
         re.lastIndex = ctx.index;
         const res = re.exec(ctx.text);
         if (res && res.index === ctx.index) {
-            return (0, success_1.success)(Object.assign(Object.assign({}, ctx), { index: ctx.index + res[0].length }), res[0]);
+            return (0, success_1.success)({ ...ctx, index: ctx.index + res[0].length }, res[0]);
         }
         return (0, failure_1.failure)(ctx, expected);
     };
 }
-exports.regex = regex;

package/dist/combinators/required.js

@@ -6,7 +6,7 @@ const required = (parser) => {
     return (ctx) => {
         const res = parser(ctx);
         if (!res.success)
-            return Object.assign(Object.assign({}, res), { fatal: true });
+            return { ...res, fatal: true };
         return res;
     };
 };

package/dist/combinators/sequence.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sequence = void 0;
+exports.sequence = sequence;
 const success_1 = require("../lib/success");
 // Look for an exact sequence of parsers, or fail
 function sequence(parsers) {
@@ -17,4 +17,3 @@ function sequence(parsers) {
         return (0, success_1.success)(nextCtx, values);
     };
 }
-exports.sequence = sequence;

package/dist/combinators/string.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.string = void 0;
+exports.string = string;
 const failure_1 = require("../lib/failure");
 const success_1 = require("../lib/success");
 function string(match, expected = '') {
     return (ctx) => {
         const endIdx = ctx.index + match.length;
         if (ctx.text.substring(ctx.index, endIdx) === match) {
-            return (0, success_1.success)(Object.assign(Object.assign({}, ctx), { index: endIdx }), match);
+            return (0, success_1.success)({ ...ctx, index: endIdx }, match);
         }
         return (0, failure_1.failure)(ctx, expected || match);
     };
 }
-exports.string = string;

package/dist/lib/failure.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.failure = void 0;
+exports.failure = failure;
 function failure(ctx, expected, fatal = false) {
     return { success: false, expected, ctx, fatal };
 }
-exports.failure = failure;

package/dist/lib/flat.js

@@ -1,7 +1,7 @@
 "use strict";
 // Polyfill Array.flat for Node < 11
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flat = void 0;
+exports.flat = flat;
 function flat(arr, d = 1) {
     if ('flat' in [])
         return arr.flat(d);
@@ -9,4 +9,3 @@ function flat(arr, d = 1) {
         ? arr.reduce((acc, val) => acc.concat(Array.isArray(val) ? flat(val, d - 1) : val), [])
         : arr.slice();
 }
-exports.flat = flat;

package/dist/lib/success.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.success = void 0;
+exports.success = success;
 function success(ctx, value) {
     return { success: true, value, ctx };
 }
-exports.success = success;

package/dist/report.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = report;
 const colors_1 = __importDefault(require("./colors"));
 function report(name, res) {
     console.log(colors_1.default.reset, '');
@@ -34,4 +35,3 @@ function report(name, res) {
     console.log(colors_1.default.dim, afterArr.join('\n'));
     console.log(colors_1.default.reset, '');
 }
-exports.default = report;

package/dist/validator.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const b_ber_shapes_directives_1 = require("@canopycanopycanopy/b-ber-shapes-directives");
-const string_1 = require("./combinators/string");
+const close_1 = require("./combinators/close");
+const constrained_1 = require("./combinators/constrained");
+const eol_1 = require("./combinators/eol");
+const eos_1 = require("./combinators/eos");
+const lazy_1 = require("./combinators/lazy");
 const many_1 = require("./combinators/many");
-const oneOf_1 = require("./combinators/oneOf");
-const regex_1 = require("./combinators/regex");
-const sequence_1 = require("./combinators/sequence");
 const map_1 = require("./combinators/map");
-const optional_1 = require("./combinators/optional");
-const eol_1 = require("./combinators/eol");
 const not_1 = require("./combinators/not");
-const lazy_1 = require("./combinators/lazy");
-const eos_1 = require("./combinators/eos");
-const close_1 = require("./combinators/close");
+const oneOf_1 = require("./combinators/oneOf");
+const optional_1 = require("./combinators/optional");
+const regex_1 = require("./combinators/regex");
 const required_1 = require("./combinators/required");
-const constrained_1 = require("./combinators/constrained");
+const sequence_1 = require("./combinators/sequence");
+const string_1 = require("./combinators/string");
 const flat_1 = require("./lib/flat");
 const space = (0, string_1.string)(' ', 'Space');
 const spaces = (0, many_1.many)(space);
@@ -45,12 +45,12 @@ const attrs = (0, sequence_1.sequence)([(0, many_1.many)(attr()), (0, optional_1
 // 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 => (0, 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 => (0, regex_1.regex)(directiveRegExp(s), s));
+    .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));
@@ -88,7 +88,7 @@ function block() {
         fenceBlock,
         (0, constrained_1.constrained)(name, blockDirectiveName, 'Valid directive name'),
         (0, required_1.required)(sep),
-        (0, required_1.required)(ident),
+        (0, required_1.required)(ident), // Preserve index for exit token
         attrs,
         (0, optional_1.optional)(body),
         (0, optional_1.optional)((0, lazy_1.lazy)(directives)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-validator",
-  "version": "3.0.8-next.61+2bbec564",
+  "version": "3.0.8-next.96+7446845b",
   "description": "A b-ber syntax validator",
   "author": "Triple Canopy <b-ber@canopycanopycanopy.com> (https://triplecanopy.github.io/)",
   "contributors": [
@@ -26,32 +26,25 @@
   "scripts": {
     "ts-node": "ts-node",
     "clean": "rimraf dist",
-    "prepare": "npm run build",
     "jest": "jest",
     "build": "npm run clean && npm run test && tsc --project tsconfig.build.json",
-    "lint": "eslint --resolve-plugins-relative-to . 'src/**/*.ts' --fix",
+    "lint": "biome check src/",
     "test": "tsc --project tsconfig.json --noEmit && npm run lint && jest"
   },
   "bugs": {
     "url": "https://github.com/triplecanopy/b-ber/issues"
   },
   "devDependencies": {
-    "@canopycanopycanopy/b-ber-shapes-directives": "3.0.8-next.61+2bbec564",
     "@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.32.0",
-    "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "jest": "^26.6.3",
+    "jest": "^29.7.0",
     "rimraf": "^2.7.1",
-    "ts-jest": "^26.4.4",
-    "typescript": "^4.0.5"
+    "ts-jest": "^29.4.11",
+    "typescript": "^6.0.3"
   },
   "dependencies": {
+    "@canopycanopycanopy/b-ber-shapes-directives": "3.0.8-next.96+7446845b",
     "lodash": "^4.17.21",
     "tar": "^6.1.11"
   },
-  "gitHead": "2bbec5643278f53becb0d2ba1f55edfe379d5587"
+  "gitHead": "7446845bcda4337bfbc9f75b55a1e0ca805023eb"
 }