parser-combinators 1.1.2 → 1.1.3

package/LICENSE

@@ -0,0 +1,12 @@
+Copyright 2022 Michał Isalski
+
+Permission to use, copy, modify, and/or distribute
+this software for any purpose with or without fee is hereby granted,
+provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT,
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

package/README.md

@@ -6,7 +6,6 @@
 
 ![NPM](https://img.shields.io/npm/l/parser-combinators)
 [![NPM Version](https://badge.fury.io/js/parser-combinators.svg)](https://badge.fury.io/js/parser-combinators)
-[![No Dependencies](https://status.david-dm.org/gh/michalusio/parser.svg)](https://status.david-dm.org/)
 
 A library of parser combinators, with which you can create your own parsers.
 
@@ -38,6 +37,8 @@ A library of parser combinators, with which you can create your own parsers.
 - Utility combinators:
   - `ref`er
   - `expect`
+  - `expectErase`
+  - `surely`
 - Ready-made value combinators:
   - `spaces`
   - `spacesPlus`
@@ -45,6 +46,9 @@ A library of parser combinators, with which you can create your own parsers.
   - `bool` (and `boolP`)
   - `int` (and `intP`)
   - `real` (and `realP`)
+- Whole parsers:
+  - Extended Backus-Naur Form (`EBNF`)
+  - JavaScript Object Notation (`JSON`)
 
 ### Example usage:
 

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./types";
+export * from "./parsers";
+export * from "./parser";

package/dist/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./types"), exports);
+__exportStar(require("./parsers"), exports);
+__exportStar(require("./parser"), exports);

package/{parsers → dist/parsers}/any.d.ts

@@ -13,3 +13,5 @@ export declare function any<T, U, V, W>(...parsers: [Parser<T>, Parser<U>, Parse
 export declare function any<T, U, V>(...parsers: [Parser<T>, Parser<U>, Parser<V>]): Parser<T | U | V>;
 export declare function any<T, U>(...parsers: [Parser<T>, Parser<U>]): Parser<T | U>;
 export declare function any<T>(...parsers: [Parser<T>]): Parser<T>;
+export declare function any<T>(...parsers: Parser<T>[]): Parser<T>;
+export declare function surely<T>(parser: Parser<T>): Parser<T>;

package/{parsers → dist/parsers}/any.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.any = void 0;
+exports.surely = exports.any = void 0;
+const _1 = require(".");
 const types_1 = require("../types");
 function any(...parsers) {
     return (ctx) => {
@@ -8,13 +9,21 @@ function any(...parsers) {
         for (const parser of parsers) {
             const res = parser(ctx);
             if ((0, types_1.isFailure)(res)) {
+                if (res.history.includes('surely')) {
+                    console.log('shot');
+                    return (0, types_1.failure)(res.ctx, res.expected, res.history.filter(h => h !== 'surely'));
+                }
                 expected.push(res);
             }
             else
                 return res;
         }
-        const longest = expected.reduce((a, b) => a.ctx.index > b.ctx.index ? a : b);
+        const longest = expected.reduce((a, b) => a.history.length > b.history.length ? a : b);
         return (0, types_1.failure)(longest.ctx, longest.expected, ['any', ...longest.history]);
     };
 }
 exports.any = any;
+function surely(parser) {
+    return (0, _1.expect)(parser, 'surely');
+}
+exports.surely = surely;

package/{parsers → dist/parsers}/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/{parsers → dist/parsers}/many.d.ts

@@ -10,7 +10,7 @@ export declare function zeroOrMany<T, V>(item: Parser<T>, separator: Parser<V>):
 /** Parses one or more occurences of the given parser, separated with the separator parser.
  * @returns A parser returning an array of many parses, omitting the separator.
  */
-export declare function oneOrMany<T, V>(item: Parser<T>, separator: Parser<V>): Parser<T[]>;
+export declare function oneOrMany<T, V>(item: Parser<T>, separator?: Parser<V> | undefined): Parser<T[]>;
 /** Parses one or more occurences of the given parser, separated with the separator parser.
  * @returns A parser returning the result of many parses, reduced using the `reducer` function passed in.
  */

package/{parsers → dist/parsers}/many.js

@@ -33,8 +33,10 @@ exports.zeroOrMany = zeroOrMany;
 /** Parses one or more occurences of the given parser, separated with the separator parser.
  * @returns A parser returning an array of many parses, omitting the separator.
  */
-function oneOrMany(item, separator) {
-    const sequencer = (0, map_1.map)((0, seq_1.seq)(item, many((0, map_1.map)((0, seq_1.seq)(separator, item), ([, t]) => t))), ([t, ts]) => ([t, ...ts]));
+function oneOrMany(item, separator = undefined) {
+    const sequencer = (0, map_1.map)((0, seq_1.seq)(item, many(separator
+        ? (0, map_1.map)((0, seq_1.seq)(separator, item), ([, t]) => t)
+        : item)), ([t, ts]) => ([t, ...ts]));
     return (ctx) => {
         const res = sequencer(ctx);
         if ((0, types_1.isFailure)(res)) {

package/{parsers → dist/parsers}/seq.d.ts

@@ -13,3 +13,4 @@ export declare function seq<T, U, V, W>(...parsers: [Parser<T>, Parser<U>, Parse
 export declare function seq<T, U, V>(...parsers: [Parser<T>, Parser<U>, Parser<V>]): Parser<[T, U, V]>;
 export declare function seq<T, U>(...parsers: [Parser<T>, Parser<U>]): Parser<[T, U]>;
 export declare function seq<T>(...parsers: [Parser<T>]): Parser<[T]>;
+export declare function seq<T>(...parsers: Parser<T>[]): Parser<T[]>;

package/{parsers → dist/parsers}/utilities.d.ts

@@ -2,8 +2,12 @@ import { Parser } from '../types';
 /** Allows to make a condition on the result of the parsing function.
  * @returns A parser returning the same but also performing a given check on the result.
  */
-export declare function ref<T>(parser: Parser<T>, check: ((p: T) => boolean), expected: string): Parser<T>;
+export declare function ref<T>(parser: Parser<T>, check: ((p: T) => boolean), expected?: string): Parser<T>;
 /** Changes the expected value for when the parser fails.
  * @returns A parser returning the same but with a different expected value.
  */
 export declare function expect<T>(parser: Parser<T>, expected: string): Parser<T>;
+/** Changes the expected value for when the parser fails. Erases the previous history.
+ * @returns A parser returning the same but with a different expected value.
+ */
+export declare function expectErase<T>(parser: Parser<T>, expected: string): Parser<T>;

package/{parsers → dist/parsers}/utilities.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expect = exports.ref = void 0;
+exports.expectErase = exports.expect = exports.ref = void 0;
 const types_1 = require("../types");
 /** Allows to make a condition on the result of the parsing function.
  * @returns A parser returning the same but also performing a given check on the result.
@@ -9,7 +9,7 @@ function ref(parser, check, expected) {
     return (ctx) => {
         const res = parser(ctx);
         if (!(0, types_1.isFailure)(res) && !check(res.value)) {
-            return (0, types_1.failure)(res.ctx, expected, [`ref: ${expected}`]);
+            return (0, types_1.failure)(res.ctx, expected !== null && expected !== void 0 ? expected : 'check', [`ref: ${expected !== null && expected !== void 0 ? expected : 'check'}`]);
         }
         return res;
     };
@@ -28,3 +28,16 @@ function expect(parser, expected) {
     };
 }
 exports.expect = expect;
+/** Changes the expected value for when the parser fails. Erases the previous history.
+ * @returns A parser returning the same but with a different expected value.
+ */
+function expectErase(parser, expected) {
+    return (ctx) => {
+        const res = parser(ctx);
+        if ((0, types_1.isFailure)(res)) {
+            return (0, types_1.failure)(res.ctx, expected, [expected]);
+        }
+        return res;
+    };
+}
+exports.expectErase = expectErase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parser-combinators",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "license": "ISC",
   "maintainers": [
     "Micha_i"
@@ -16,33 +16,26 @@
   "description": "A library of parser combinators, with which you can create your own parsers. The library will be continuously improved in time.",
   "scripts": {
     "build": "tsc",
-    "publishing:prepare": "copy package.json dist && copy README.md dist",
-    "publishing:patch": "npm version patch && npm run publishing:prepare",
-    "publishing:minor": "npm version minor && npm run publishing:prepare",
-    "publishing:major": "npm version major && npm run publishing:prepare",
     "start": "tsc && node .",
     "lint": "eslint . --ext .ts",
-    "test:unit": "cross-env TS_NODE_PROJECT=tsconfig.spec.json mocha",
+    "test:unit": "cross-env TS_NODE_PROJECT=tsconfig.spec.json mocha tests/**/*.ts",
     "test": "nyc -e '.ts' --r html -r lcov -r text npm run test:unit",
-    "test:report": "nyc report --reporter=json > coverage/coverage.json && codecov"
+    "test:report": "nyc report --reporter=json > coverage/coverage.json"
   },
   "author": "Micha_i <isalski.michal@gmail.com> (https://github.com/michalusio)",
-  "main": "./parser.js",
-  "types": "./parser.d.ts",
-  "dependencies": {},
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "devDependencies": {
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.7.6",
-    "@typescript-eslint/eslint-plugin": "^4.14.2",
-    "@typescript-eslint/parser": "^4.14.2",
-    "codecov": "^3.8.3",
-    "cross-env": "^7.0.3",
-    "eslint": "^7.15.0",
-    "istanbul": "1.1.0-alpha.1",
-    "mocha": "^9.1.0",
-    "nyc": "^15.1.0",
-    "ts-node": "^10.2.1",
-    "typescript": "^4.2.4"
+    "@types/mocha": "10.0.0",
+    "@types/node": "18.11.3",
+    "@typescript-eslint/eslint-plugin": "5.40.1",
+    "@typescript-eslint/parser": "5.40.1",
+    "cross-env": "7.0.3",
+    "eslint": "8.25.0",
+    "mocha": "10.1.0",
+    "nyc": "15.1.0",
+    "ts-node": "10.9.1",
+    "typescript": "4.8.4"
   },
   "keywords": [
     "parser",