@finnair/path-parser 3.1.0 → 5.0.0

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0](https://github.com/finnair/v-validation/compare/v4.3.0...v5.0.0) (2023-10-13)
+
+
+### Features
+
+* use ECMAScript modules (ESM) instead of CommonJS ([#95](https://github.com/finnair/v-validation/issues/95)) ([92e9118](https://github.com/finnair/v-validation/commit/92e9118235957ec4bc2bcf2de73e195ea940378c))
+
+
+
+
+
+# [5.0.0](https://github.com/finnair/v-validation/compare/v4.3.0...v5.0.0) (2023-10-13)
+
+
+### Features
+
+* use ECMAScript modules (ESM) instead of CommonJS ([#95](https://github.com/finnair/v-validation/issues/95)) ([92e9118](https://github.com/finnair/v-validation/commit/92e9118235957ec4bc2bcf2de73e195ea940378c))
+
+
+
+
+
+# [4.0.0](https://github.com/finnair/v-validation/compare/v3.2.0...v4.0.0) (2022-11-07)
+
+**Note:** Version bump only for package @finnair/path-parser
+
+
+
+
+
 # [3.1.0](https://github.com/finnair/v-validation/compare/v3.0.0...v3.1.0) (2022-10-24)
 
 **Note:** Version bump only for package @finnair/path-parser

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { parsePath } from './parsePath';
-export { parsePathMatcher } from './parsePathMatcher';
+export { parsePath } from './parsePath.js';
+export { parsePathMatcher } from './parsePathMatcher.js';

package/dist/index.js

@@ -1,7 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePathMatcher = exports.parsePath = void 0;
-var parsePath_1 = require("./parsePath");
-Object.defineProperty(exports, "parsePath", { enumerable: true, get: function () { return parsePath_1.parsePath; } });
-var parsePathMatcher_1 = require("./parsePathMatcher");
-Object.defineProperty(exports, "parsePathMatcher", { enumerable: true, get: function () { return parsePathMatcher_1.parsePathMatcher; } });
+export { parsePath } from './parsePath.js';
+export { parsePathMatcher } from './parsePathMatcher.js';

package/dist/matcherGrammar.d.ts

@@ -1,26 +1,18 @@
-interface NearleyToken {
-    value: any;
-    [key: string]: any;
-}
-interface NearleyLexer {
-    reset: (chunk: string, info: any) => void;
-    next: () => NearleyToken | undefined;
-    save: () => any;
-    formatError: (token: NearleyToken) => string;
-    has: (tokenType: string) => boolean;
-}
+import * as moo from 'moo';
 interface NearleyRule {
     name: string;
     symbols: NearleySymbol[];
     postprocess?: (d: any[], loc?: number, reject?: {}) => any;
 }
-declare type NearleySymbol = string | {
+type NearleySymbol = string | {
     literal: any;
+} | {
+    type: any;
 } | {
     test: (token: any) => boolean;
 };
 interface Grammar {
-    Lexer: NearleyLexer | undefined;
+    Lexer: moo.Lexer | undefined;
     ParserRules: NearleyRule[];
     ParserStart: string;
 }

package/dist/matcherGrammar.js

@@ -1,37 +1,6 @@
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// Generated automatically by nearley, version 2.19.2
-// http://github.com/Hardmath123/nearley
-// Bypasses TS6133. Allow declared but unused functions.
-// @ts-ignore
-function id(d) {
-    return d[0];
-}
-const matchers = __importStar(require("@finnair/path"));
-const moo = require('moo');
+// Based on a grammar that was automatically generated by nearley, version 2.19.2
+import * as matchers from '@finnair/path';
+import * as moo from 'moo';
 const lexer = moo.compile({
     qString: /'(?:\\["bfnrt\/\\]|\\u[a-fA-F0-9]{4}|[^"\\])*?'/,
     qqString: /"(?:\\["bfnrt\/\\]|\\u[a-fA-F0-9]{4}|[^"\\])*?"/,
@@ -59,32 +28,32 @@ const grammar = {
         { name: 'PropertyExpression', symbols: [{ literal: '*' }], postprocess: d => matchers.AnyProperty },
         {
             name: 'PropertyExpression',
-            symbols: [lexer.has('property') ? { type: 'property' } : property],
+            symbols: [{ type: 'property' }],
             postprocess: d => new matchers.PropertyMatcher(d[0].value),
         },
         {
             name: 'IndexExpression',
-            symbols: [lexer.has('integer') ? { type: 'integer' } : integer],
+            symbols: [{ type: 'integer' }],
             postprocess: d => new matchers.IndexMatcher(parseInt(d[0].value)),
         },
         {
             name: 'IndexExpression',
-            symbols: [lexer.has('qqString') ? { type: 'qqString' } : qqString],
+            symbols: [{ type: 'qqString' }],
             postprocess: d => new matchers.PropertyMatcher(JSON.parse(d[0].value)),
         },
         {
             name: 'IndexExpression',
-            symbols: [lexer.has('qString') ? { type: 'qString' } : qString],
+            symbols: [{ type: 'qString' }],
             postprocess: d => new matchers.PropertyMatcher(handleQString(d[0].value)),
         },
         { name: 'IndexExpression', symbols: [{ literal: '*' }], postprocess: d => matchers.AnyIndex },
         { name: 'UnionExpression', symbols: ['ComponentExpression', { literal: ',' }, 'ComponentExpression'], postprocess: d => [d[0], d[2]] },
         { name: 'UnionExpression', symbols: ['ComponentExpression', { literal: ',' }, 'UnionExpression'], postprocess: d => [d[0], ...d[2]] },
-        { name: 'ComponentExpression', symbols: [lexer.has('integer') ? { type: 'integer' } : integer], postprocess: d => parseInt(d[0].value) },
-        { name: 'ComponentExpression', symbols: [lexer.has('property') ? { type: 'property' } : property], postprocess: d => d[0].value },
-        { name: 'ComponentExpression', symbols: [lexer.has('qqString') ? { type: 'qqString' } : qqString], postprocess: d => JSON.parse(d[0].value) },
-        { name: 'ComponentExpression', symbols: [lexer.has('qString') ? { type: 'qString' } : qString], postprocess: d => handleQString(d[0].value) },
+        { name: 'ComponentExpression', symbols: [{ type: 'integer' }], postprocess: d => parseInt(d[0].value) },
+        { name: 'ComponentExpression', symbols: [{ type: 'property' }], postprocess: d => d[0].value },
+        { name: 'ComponentExpression', symbols: [{ type: 'qqString' }], postprocess: d => JSON.parse(d[0].value) },
+        { name: 'ComponentExpression', symbols: [{ type: 'qString' }], postprocess: d => handleQString(d[0].value) },
     ],
     ParserStart: 'Path',
 };
-exports.default = grammar;
+export default grammar;

package/dist/parsePath.js

@@ -1,20 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePath = void 0;
-const path_1 = require("@finnair/path");
-const nearley_1 = __importDefault(require("nearley"));
-const pathGrammar_1 = __importDefault(require("./pathGrammar"));
-function parsePath(str) {
-    const parser = new nearley_1.default.Parser(nearley_1.default.Grammar.fromCompiled(pathGrammar_1.default));
+import { Path } from '@finnair/path';
+import nearley from 'nearley';
+import pathGrammar from './pathGrammar.js';
+export function parsePath(str) {
+    const parser = new nearley.Parser(nearley.Grammar.fromCompiled(pathGrammar));
     parser.feed(str);
     if (parser.results[0]) {
-        return path_1.Path.of(...parser.results[0]);
+        return Path.of(...parser.results[0]);
     }
     else {
         throw new Error(`Unrecognized Path: ${str}`);
     }
 }
-exports.parsePath = parsePath;

package/dist/parsePathMatcher.js

@@ -1,20 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePathMatcher = void 0;
-const nearley_1 = __importDefault(require("nearley"));
-const matcherGrammar_1 = __importDefault(require("./matcherGrammar"));
-const path_1 = require("@finnair/path");
-function parsePathMatcher(str) {
-    const parser = new nearley_1.default.Parser(nearley_1.default.Grammar.fromCompiled(matcherGrammar_1.default));
+import nearley from 'nearley';
+import matcherGrammar from './matcherGrammar.js';
+import { PathMatcher } from '@finnair/path';
+export function parsePathMatcher(str) {
+    const parser = new nearley.Parser(nearley.Grammar.fromCompiled(matcherGrammar));
     parser.feed(str);
     if (parser.results[0]) {
-        return path_1.PathMatcher.of(...parser.results[0]);
+        return PathMatcher.of(...parser.results[0]);
     }
     else {
         throw new Error(`Unrecognized PathMatcher: ${str}`);
     }
 }
-exports.parsePathMatcher = parsePathMatcher;

package/dist/pathGrammar.d.ts

@@ -1,26 +1,18 @@
-interface NearleyToken {
-    value: any;
-    [key: string]: any;
-}
-interface NearleyLexer {
-    reset: (chunk: string, info: any) => void;
-    next: () => NearleyToken | undefined;
-    save: () => any;
-    formatError: (token: NearleyToken) => string;
-    has: (tokenType: string) => boolean;
-}
+import * as moo from 'moo';
 interface NearleyRule {
     name: string;
     symbols: NearleySymbol[];
     postprocess?: (d: any[], loc?: number, reject?: {}) => any;
 }
-declare type NearleySymbol = string | {
+type NearleySymbol = string | {
     literal: any;
+} | {
+    type: any;
 } | {
     test: (token: any) => boolean;
 };
 interface Grammar {
-    Lexer: NearleyLexer | undefined;
+    Lexer: moo.Lexer | undefined;
     ParserRules: NearleyRule[];
     ParserStart: string;
 }

package/dist/pathGrammar.js

@@ -1,11 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// Generated automatically by nearley, version 2.19.2
+// Based on a grammar that was automatically generated by nearley, version 2.19.2
 // http://github.com/Hardmath123/nearley
-// Bypasses TS6133. Allow declared but unused functions.
-// @ts-ignore
-function id(d) { return d[0]; }
-const moo = require('moo');
+import * as moo from 'moo';
 const lexer = moo.compile({
     qString: /'(?:\\["bfnrt\/\\]|\\u[a-fA-F0-9]{4}|[^"\\])*?'/,
     qqString: /"(?:\\["bfnrt\/\\]|\\u[a-fA-F0-9]{4}|[^"\\])*?"/,
@@ -21,8 +16,6 @@ function handleQString(qString) {
 }
 ;
 ;
-;
-;
 const grammar = {
     Lexer: lexer,
     ParserRules: [
@@ -31,11 +24,11 @@ const grammar = {
         { "name": "Path", "symbols": [{ "literal": "$" }, "Path$ebnf$1"], "postprocess": d => d[1].reduce((result, component) => result.concat(component), []) },
         { "name": "PathExpression", "symbols": [{ "literal": "." }, "PropertyExpression"], "postprocess": d => d[1] },
         { "name": "PathExpression", "symbols": [{ "literal": "[" }, "IndexExpression", { "literal": "]" }], "postprocess": d => d[1] },
-        { "name": "PropertyExpression", "symbols": [(lexer.has("property") ? { type: "property" } : property)], "postprocess": d => d[0].value },
-        { "name": "IndexExpression", "symbols": [(lexer.has("integer") ? { type: "integer" } : integer)], "postprocess": d => parseInt(d[0].value) },
-        { "name": "IndexExpression", "symbols": [(lexer.has("qqString") ? { type: "qqString" } : qqString)], "postprocess": d => JSON.parse(d[0].value) },
-        { "name": "IndexExpression", "symbols": [(lexer.has("qString") ? { type: "qString" } : qString)], "postprocess": d => handleQString(d[0].value) }
+        { "name": "PropertyExpression", "symbols": [{ type: "property" }], "postprocess": d => d[0].value },
+        { "name": "IndexExpression", "symbols": [{ type: "integer" }], "postprocess": d => parseInt(d[0].value) },
+        { "name": "IndexExpression", "symbols": [{ type: "qqString" }], "postprocess": d => JSON.parse(d[0].value) },
+        { "name": "IndexExpression", "symbols": [{ type: "qString" }], "postprocess": d => handleQString(d[0].value) }
     ],
     ParserStart: "Path",
 };
-exports.default = grammar;
+export default grammar;

package/package.json

@@ -1,10 +1,17 @@
 {
   "name": "@finnair/path-parser",
-  "version": "3.1.0",
+  "version": "5.0.0",
   "private": false,
   "description": "Simple object path as array of strings and numbers",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
   "license": "MIT",
   "homepage": "https://github.com/finnair/v-validation/tree/master/packages/path-matcher-parser#readme",
   "bugs": "https://github.com/finnair/v-validation/issues",
@@ -23,9 +30,10 @@
     "build": "tsc -b ."
   },
   "dependencies": {
-    "@finnair/path": "^3.1.0",
+    "@finnair/path": "^5.0.0",
+    "@types/moo": "0.5.1",
     "@types/nearley": "2.11.2",
     "nearley": "2.20.1"
   },
-  "gitHead": "5182a63fa61cc1f5c8991e1482c5bbffe14798c3"
+  "gitHead": "b20762715a79e2a336f9c8ceb5107a4d84104a14"
 }