From 3986ca70481d6a12678a1bea49ed743edf8fda8f Mon Sep 17 00:00:00 2001 From: Futago-za Ryuu Date: Tue, 1 Jan 2019 13:57:33 +0000 Subject: [PATCH] Export utils explicitly --- packages/pegjs/lib/util/index.js | 35 ++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/packages/pegjs/lib/util/index.js b/packages/pegjs/lib/util/index.js index 3d39ff8..32c78a8 100644 --- a/packages/pegjs/lib/util/index.js +++ b/packages/pegjs/lib/util/index.js @@ -5,13 +5,6 @@ const js = require( "./js" ); const objects = require( "./objects" ); const vm = require( "./vm" ); -objects.extend( exports, arrays ); -objects.extend( exports, js ); -objects.extend( exports, objects ); -objects.extend( exports, vm ); - -exports.noop = function noop() { }; - /** * ```ts * type Session = peg.compiler.Session; @@ -26,7 +19,7 @@ exports.noop = function noop() { }; * * This method takes a `StageMap`, returning a `PassMap` that can be used by the compiler. */ -exports.convertPasses = ( () => { +const convertPasses = ( () => { function convertStage( passes ) { @@ -46,7 +39,7 @@ exports.convertPasses = ( () => { } )(); -exports.processOptions = function processOptions( options, defaults ) { +function processOptions( options, defaults ) { const processedOptions = {}; @@ -55,4 +48,28 @@ exports.processOptions = function processOptions( options, defaults ) { return processedOptions; +} + +module.exports = { + + find: arrays.find, + findIndex: arrays.findIndex, + + stringEscape: js.stringEscape, + regexpEscape: js.regexpEscape, + reservedWords: js.reservedWords, + + clone: objects.clone, + each: objects.each, + extend: objects.extend, + map: objects.map, + values: objects.values, + enforceFastProperties: objects.enforceFastProperties, + + evalModule: vm.evalModule, + + convertPasses, + processOptions, + noop() { }, + };