simplifying

Author: MikeKovarik

src/Registry.mjs

@@ -37,15 +37,12 @@ export class Registry {
 
 Registry.VALUES = '$values'
 Registry.DEFAULT = ''
-Registry.DEFAULT_VERBOSE = null
-Registry.VALUENOTSET_VERBOSE = null
 
 // Only names and paths are affected, not the data
 Registry.lowercase = true
 // Calls return simplified output format by default.
 // Can be 'simple', 'complex', (TODO) 'naive'
 Registry.format = 'simple'
 
-Registry.FORMAT_NAIVE = 'naive'
 Registry.FORMAT_SIMPLE = 'simple'
 Registry.FORMAT_COMPLEX = 'complex'

src/get.mjs

@@ -189,7 +189,7 @@ Registry.hasValue = async function(path, name = Registry.DEFAULT) {
 	if (result === undefined) return false
 	// Default value name is represented by a word default in brackets.
 	if (name === Registry.DEFAULT)
-		name = Registry.DEFAULT_VERBOSE
+		name = VALUE_DEFAULT
 	// Split the result into lines and try to find the searched one.
 	// NOTE: not needed to lowercase the result, REG always returns queried value name in the same caps.
 	return result
@@ -278,9 +278,9 @@ function processValueLine(line, options) {
 	// value line starts with 4 spaces and consists of three items that are also spaces by 4 spaces.
 	// WARNING: Do not trim. Lines only start with 4 spaces, they don't end with 4 spaces unsless the value is empty string.
 	var [name, type, data] = line.slice(4).split('    ')
-	if (name === Registry.DEFAULT_VERBOSE)
+	if (name === VALUE_DEFAULT)
 		name = Registry.DEFAULT
-	if (data === Registry.VALUENOTSET_VERBOSE)
+	if (data === VALUE_NOT_SET)
 		data = undefined
 	else if (options.lowercase)
 		name = name.toLowerCase()

src/util.mjs

@@ -1,26 +1,28 @@
 import {Registry} from './Registry.mjs'
-import cp, { exec } from 'child_process'
+import cp from 'child_process'
 import {SZ, MULTI_SZ, EXPAND_SZ, DWORD, QWORD, BINARY, NONE} from './constants.mjs'
 
 
 let ERR_NOT_FOUND
+export let VALUE_DEFAULT = undefined
+export let VALUE_NOT_SET = undefined
+
 let errMessagePromise
 let defaultValuesPromise
 
 function getErrorLine(stderr) {
 	return stderr.trim().split('\r\n')[0]
 }
 
-function getDefaultValues(stdout) {
+function setDefaultValues(stdout) {
 	// indexOf() because it's fastest.
 	let iNextStr = stdout.indexOf('\r\n', 1)
 	let iNameBracketOpen  = stdout.indexOf('(', iNextStr)
 	let iNameBracketClose = stdout.indexOf(')', iNameBracketOpen)
 	let iValBracketOpen   = stdout.indexOf('(', iNameBracketClose)
 	let iValBracketClose  = stdout.indexOf(')', iValBracketOpen)
-	let defaultNameStr    = stdout.slice(iNameBracketOpen, iNameBracketClose+1)
-	let valueNotSetStr    = stdout.slice(iValBracketOpen, iValBracketClose+1)
-	return [defaultNameStr, valueNotSetStr]
+	VALUE_DEFAULT         = stdout.slice(iNameBracketOpen, iNameBracketClose+1)
+	VALUE_NOT_SET         = stdout.slice(iValBracketOpen, iValBracketClose+1)
 }
 
 // Method for calling the reg.exe commands.
@@ -32,21 +34,19 @@ execute = async args => {
 	// Ensure we get localized messages only once.
 
 	// ERR_NOT_FOUND message.
-	if (!errMessagePromise)
-		errMessagePromise = spawnProcess(['QUERY', 'HKLM\\NONEXISTENT'])
-			.then(res => getErrorLine(res.stderr))
+	if (!errMessagePromise) {
+		errMessagePromise = spawn('reg.exe', ['QUERY', 'HKLM\\NONEXISTENT'])
+			.then(res => ERR_NOT_FOUND = getErrorLine(res.stderr))
+	}
 
 	// (Default) and (value not set) values.
-	if (!defaultValuesPromise)
-		defaultValuesPromise = spawnProcess(['QUERY', 'HKCR', '/ve'])
-			.then(res => getDefaultValues(res.stdout))
+	if (!defaultValuesPromise) {
+		defaultValuesPromise = spawn('reg.exe', ['QUERY', 'HKCR', '/ve'])
+			.then(res => setDefaultValues(res.stdout))
+	}
 
 	// Postpone all execute() calls until the localized messages are resolved. 
-	let [notFoundMsg, [defaultNameStr, valueNotSetStr]] = await Promise
-		.all([errMessagePromise, defaultValuesPromise])
-	ERR_NOT_FOUND = notFoundMsg
-	Registry.DEFAULT_VERBOSE = defaultNameStr
-	Registry.VALUENOTSET_VERBOSE = valueNotSetStr
+	await Promise.all([errMessagePromise, defaultValuesPromise])
 
 	// Replace this temporary function with actual execute().
 	execute = _execute
@@ -56,7 +56,7 @@ execute = async args => {
 
 // Actual execute() function.
 var _execute = async args => {
-	var {stdout, stderr} = await spawnProcess(args)
+	var {stdout, stderr} = await spawn('reg.exe', args)
 	// REG command has finished running, resolve result or throw error if any occured.
 	if (stderr.length === 0) return stdout
 	var line = getErrorLine(stderr)
@@ -71,9 +71,9 @@ function promiseOnce(eventEmitter, event) {
 }
 
 // Promise wrapper for child_process.spawn().
-var spawnProcess = async args => {
+var spawn = async (program, args) => {
 	var stdio = ['ignore', 'pipe', 'pipe']
-	var proc = cp.spawn('reg.exe', args, {stdio})
+	var proc = cp.spawn(program, args, {stdio})
 
 	var stdout = ''
 	var stderr = ''
@@ -93,11 +93,11 @@ var spawnProcess = async args => {
 		return {stdout, stderr}
 }
 
-// Replaces default spawnProcess() with custom means of spawning reg.exe.
+// Replaces default spawn('reg.exe', ) with custom means of spawning reg.exe.
 // For example allows to run the library in restricted environments.
-// Default spawnProcess() uses Node's child_process.spawn().
-export function _replaceProcessSpawner(externalHook) {
-	spawnProcess = externalHook
+// Default spawn('reg.exe', ) uses Node's child_process.spawn().
+export function _replaceSpawn(externalHook) {
+	spawn = externalHook
 }
 
 class RegError extends Error {