settings: Enforce default definitions for certain setting types

Author: slusarz

lib/data/settings.data.js

@@ -93,6 +93,14 @@ async function normalizeSettings(settings) {
 			if (!v2) {
 				throw new Error("Incorrect value type for " + k)
 			}
+
+			if (v2.default_required && (v.default === undefined)) {
+				throw new Error("Default value missing for " + k)
+			}
+			if (v2.enum_required && !v.values_enum) {
+				throw new Error("Enum array missing for " + k)
+			}
+
 			v2.url = md.renderInline(v2.url)
 
 			if (v2.no_default) {

lib/settings.js

@@ -2,52 +2,64 @@
 export const setting_types = {
 	BOOLEAN: {
 		label: 'Boolean',
-		url: '[[link,settings_types_boolean]]'
+		url: '[[link,settings_types_boolean]]',
+		default_required: true,
 	},
 	IPADDR: {
 		label: 'IP Address(es)',
-		url: '[[link,settings_types_ip]]'
+		url: '[[link,settings_types_ip]]',
+		// Default: empty
 	},
 	SIZE: {
 		label: 'Size',
-		url: '[[link,settings_types_size]]'
+		url: '[[link,settings_types_size]]',
+		default_required: true,
 	},
 	STRING: {
 		label: 'String',
 		url: '[[link,settings_types_string]]'
+		// Default: empty
 	},
 	STRING_NOVAR: {
 		label: 'String Without Variables',
 		url: '[[link,settings_types_string_novar]]'
+		// Default: empty
 	},
 	/* This is a String entry, with specific allowable values. */
 	ENUM: {
 		label: 'String',
-		url: '[[link,settings_types_string]]'
+		url: '[[link,settings_types_string]]',
+		enum_required: true,
 	},
 	TIME: {
 		label: 'Time',
-		url: '[[link,settings_types_time]]'
+		url: '[[link,settings_types_time]]',
+		default_required: true,
 	},
 	TIME_MSECS: {
 		label: 'Time (milliseconds)',
-		url: '[[link,settings_types_time_msecs]]'
+		url: '[[link,settings_types_time_msecs]]',
+		default_required: true,
 	},
 	UINT: {
 		label: 'Unsigned Integer',
-		url: '[[link,settings_types_uint]]'
+		url: '[[link,settings_types_uint]]',
+		default_required: true,
 	},
 	OCTAL_UINT: {
 		label: 'Octal Unsigned Integer',
-		url: '[[link,settings_types_octal_uint]]'
+		url: '[[link,settings_types_octal_uint]]',
+		default_required: true,
 	},
 	URL: {
 		label: 'URL',
 		url: '[[link,settings_types_url]]'
+		// Default: empty
 	},
 	FILE: {
 		label: 'File',
 		url: '[[link,settings_types_file]]'
+		// Default: empty
 	},
 	NAMED_FILTER: {
 		label: 'Named Filter',
@@ -57,17 +69,21 @@ export const setting_types = {
 	NAMED_LIST_FILTER: {
 		label: 'Named List Filter',
 		url: '[[link,settings_types_named_list_filter]]'
+		// Default: empty
 	},
 	STRLIST: {
 		label: 'String List',
 		url: '[[link,settings_types_strlist]]'
+		// Default: empty
 	},
 	BOOLLIST: {
 		label: 'Boolean List',
 		url: '[[link,settings_types_boollist]]'
+		// Default: empty
 	},
 	IN_PORT: {
 		label: 'Port Number',
-		url: '[[link,settings_types_in_port]]'
+		url: '[[link,settings_types_in_port]]',
+		default_required: true,
 	}
 }