Test for JSON; fix 'select'

Author: graham-trott

js/easycoder/Core.js

@@ -1711,14 +1711,17 @@ const EasyCoder_Core = {
 					targetValue = `{}`;
 				}
 				// This is object whose property is being set
-				let targetJSON = JSON.parse(targetValue);
+				let targetJSON = targetValue;
+				if (program.isJsonString(targetValue)) {
+					targetJSON = JSON.parse(targetValue);
+				}
 				// This is the name of the property
 				const itemName = program.getValue(command.name);
 				// This is the value of the property
 				const itemValue = program.evaluate(command.value);
 				let content = itemValue.content;
 				if (itemValue) {
-					if (content.length >= 2 && [`[`, `{`].includes(content[0])) {
+					if (program.isJsonString(itemValue.content)) {
 						targetJSON[itemName] = JSON.parse(itemValue.content);
 						content = JSON.stringify(targetJSON);
 					}

js/easycoder/Main.js

@@ -167,6 +167,15 @@ const EasyCoder = {
 		return typeof item === `undefined`;
 	},
 
+	isJsonString: function (str) {
+		try {
+			JSON.parse(str);
+		} catch (e) {
+			return false;
+		}
+		return true;
+	},
+
 	runScript: function (program) {
 		const command = program[program.pc];
 		const script = program.getValue(command.script);
@@ -227,6 +236,7 @@ const EasyCoder = {
 		program.domain = this.domain;
 		program.require = this.require;
 		program.isUndefined = this.isUndefined;
+		program.isJsonString = this.isJsonString;
 		program.checkPlugin = this.checkPlugin;
 		program.getPlugin = this.getPlugin;
 		program.addLocalPlugin = this.addLocalPlugin;

js/plugins/browser.js

@@ -2575,10 +2575,10 @@ const EasyCoder_Browser = {
 				case `selected`:
 					let arg = compiler.nextToken();
 					if ([`index`, `item`].includes(arg)) {
-						if (compiler.nextTokenIs(`in`)) {
+						if ([`in`, `of`].includes(compiler.nextToken())) {
 							if (compiler.nextIsSymbol()) {
 								const symbol = compiler.getSymbolRecord();
-								if ([`ul`, `ol`].includes(symbol.keyword)) {
+								if ([`ul`, `ol`, `select`].includes(symbol.keyword)) {
 									compiler.next();
 									return {
 										domain: `browser`,
@@ -2841,9 +2841,10 @@ const EasyCoder_Browser = {
 				};
 			case `selected`:
 				symbolRecord = program.getSymbolRecord(value.symbol);
-				element = symbolRecord.value[symbolRecord.index].content;
-				target = document.getElementById(element);
-				content = (value.arg === `index`) ? target.selectedIndex : target.options[target.selectedIndex].text;
+				target = symbolRecord.element[symbolRecord.index];
+				let selectedIndex = target.selectedIndex;
+				let selectedText = selectedIndex  >= 0 ? target.options[selectedIndex].text : ``;
+				content = (value.arg === `index`) ? selectedIndex : selectedText;
 				return {
 					type: `constant`,
 					numeric: false,