keep my version

README.md

@@ -200,3 +200,7 @@ There's a few other hidden gems in the files themselves, and so much more on my
 
 
 (Yes, I'm writing a pair of D games again, finally! First time in a long time, but it is moving along well... and I don't need SDL this time!)
+
+# Special Conventions
+
+idl Starting in 2019, I will be adding version info to individual modules.

database.d

@@ -162,6 +162,68 @@ class DatabaseException : Exception {
 
 abstract class SqlBuilder { }
 
+class InsertBuilder : SqlBuilder {
+	private string table;
+	private string[] fields;
+	private string[] fieldsSetSql;
+	private Variant[] values;
+
+	///
+	void setTable(string table) {
+		this.table = table;
+	}
+
+	/// same as adding the arr as values one by one. assumes DB column name matches AA key.
+	void addVariablesFromAssociativeArray(in string[string] arr, string[] names...) {
+		foreach(name; names) {
+			fields ~= name;
+			if(name in arr) {
+				fieldsSetSql ~= "?";
+				values ~= Variant(arr[name]);
+			} else {
+				fieldsSetSql ~= "null";
+			}
+		}
+	}
+
+	///
+	void addVariable(T)(string name, T value) {
+		fields ~= name;
+		fieldsSetSql ~= "?";
+		values ~= Variant(value);
+	}
+
+	/// if you use a placeholder, be sure to [addValueForHandWrittenPlaceholder] immediately
+	void addFieldWithSql(string name, string sql) {
+		fields ~= name;
+		fieldsSetSql ~= sql;
+	}
+
+	/// for addFieldWithSql that includes a placeholder
+	void addValueForHandWrittenPlaceholder(T)(T value) {
+		values ~= Variant(value);
+	}
+
+	/// executes the query
+	auto execute(Database db, string supplementalSql = null) {
+		return db.queryImpl(this.toSql() ~ supplementalSql, values);
+	}
+
+	string toSql() {
+		string sql = "INSERT INTO\n";
+		sql ~= "\t" ~ table ~ " (\n";
+		foreach(idx, field; fields) {
+			sql ~= "\t\t" ~ field ~ ((idx != fields.length - 1) ? ",\n" : "\n");
+		}
+		sql ~= "\t) VALUES (\n";
+		foreach(idx, field; fieldsSetSql) {
+			sql ~= "\t\t" ~ field ~ ((idx != fieldsSetSql.length - 1) ? ",\n" : "\n");
+		}
+		sql ~= "\t)\n";
+		return sql;
+	}
+}
+
 /// WARNING: this is as susceptible to SQL injections as you would be writing it out by hand
 class SelectBuilder : SqlBuilder {
 	string[] fields;

dom.d

@@ -3148,6 +3148,8 @@ class Element {
 	}
 
 	protected string toPrettyStringIndent(bool insertComments, int indentationLevel, string indentWith) const {
+		if(indentWith is null)
+			return null;
 		string s;
 
 		if(insertComments) s ~= "<!--";
@@ -3238,7 +3240,7 @@ class Element {
 		// just keep them on the same line
 		if(tagName.isInArray(inlineElements) || allAreInlineHtml(children)) {
 			foreach(child; children) {
-				s ~= child.toString();
+				s ~= child.toString();//toPrettyString(false, 0, null);
 			}
 		} else {
 			foreach(child; children) {
@@ -3263,6 +3265,7 @@ class Element {
 	+/
 
 	/// This is the actual implementation used by toString. You can pass it a preallocated buffer to save some time.
+	/// Note: the ordering of attributes in the string is undefined.
 	/// Returns the string it creates.
 	string writeToAppender(Appender!string where = appender!string()) const {
 		assert(tagName !is null);
@@ -3274,8 +3277,10 @@ class Element {
 		where.put("<");
 		where.put(tagName);
 
-		foreach(n, v ; attributes) {
+		import std.algorithm : sort;
-			assert(n !is null);
+		auto keys = sort(attributes.keys);
+		foreach(n; keys) {
+			auto v = attributes[n]; // I am sorting these for convenience with another project. order of AAs is undefined, so I'm allowed to do it.... and it is still undefined, I might change it back later.
 			//assert(v !is null);
 			where.put(" ");
 			where.put(n);
@@ -3861,11 +3866,11 @@ class DocumentFragment : Element {
 
 /// Given text, encode all html entities on it - &, <, >, and ". This function also
 /// encodes all 8 bit characters as entities, thus ensuring the resultant text will work
-/// even if your charset isn't set right.
+/// even if your charset isn't set right. You can suppress with by setting encodeNonAscii = false
 ///
 /// The output parameter can be given to append to an existing buffer. You don't have to
 /// pass one; regardless, the return value will be usable for you, with just the data encoded.
-string htmlEntitiesEncode(string data, Appender!string output = appender!string()) {
+string htmlEntitiesEncode(string data, Appender!string output = appender!string(), bool encodeNonAscii = true) {
 	// if there's no entities, we can save a lot of time by not bothering with the
 	// decoding loop. This check cuts the net toString time by better than half in my test.
 	// let me know if it made your tests worse though, since if you use an entity in just about
@@ -3875,7 +3880,7 @@ string htmlEntitiesEncode(string data, Appender!string output = appender!string(
 	bool shortcut = true;
 	foreach(char c; data) {
 		// non ascii chars are always higher than 127 in utf8; we'd better go to the full decoder if we see it.
-		if(c == '<' || c == '>' || c == '"' || c == '&' || cast(uint) c > 127) {
+		if(c == '<' || c == '>' || c == '"' || c == '&' || (encodeNonAscii && cast(uint) c > 127)) {
 			shortcut = false; // there's actual work to be done
 			break;
 		}
@@ -3904,7 +3909,7 @@ string htmlEntitiesEncode(string data, Appender!string output = appender!string(
 			// FIXME: should I encode apostrophes too? as &#39;... I could also do space but if your html is so bad that it doesn't
 			// quote attributes at all, maybe you deserve the xss. Encoding spaces will make everything really ugly so meh
 			// idk about apostrophes though. Might be worth it, might not.
-		else if (d < 128 && d > 0)
+		else if (!encodeNonAscii || (d < 128 && d > 0))
 			output.put(d);
 		else
 			output.put("&#" ~ std.conv.to!string(cast(int) d) ~ ";");
@@ -4695,7 +4700,7 @@ class Form : Element {
 					switch(type) {
 						case "checkbox":
 						case "radio":
-							if(value.length)
+							if(value.length && value != "false")
 								e.setAttribute("checked", "checked");
 							else
 								e.removeAttribute("checked");

dub.json

@@ -1,9 +1,15 @@
 {
 	"name": "arsd-official",
-	"targetType": "none",
+	"targetType": "library",
-	"sourcePaths": ["."],
+	"importPaths": ["."],
+	"sourceFiles": ["package.d"],
 	"description": "A container of various subpackages that do lots of different things. You should use one of the subpackages instead of the main package in most cases, but you can try the complete package if you get duplicated dependency issues.",
 	"license":"BSL-1.0",
+	"dependencies": {
+		":cgi": "*",
+		":http": "*",
+		":terminal": "*"
+	},
 	"subPackages": [
 		{
 			"name": "simpledisplay",
@@ -87,8 +93,10 @@
 		{
 			"name": "cgi",
 			"description": "web server library with cgi, fastcgi, scgi, and embedded http server support",
-			"targetType": "sourceLibrary",
+			"targetType": "library",
-			"sourceFiles": ["cgi.d"]
+			"sourceFiles": ["cgi.d"],
+			"importPaths": ["."],
+			"dflags": ["-mv=arsd.cgi=cgi.d"]
 		},
 		{
 			"name": "mysql",
@@ -132,8 +140,10 @@
 			"description": "HTTP client library. Depends on OpenSSL right now on all platforms. On 32 bit Windows, you may need to get OMF openssl lib and dlls (ask me if you can't find it)",
 			"libs": ["crypto", "ssl"],
 			"versions": ["with_openssl"],
-			"targetType": "sourceLibrary",
+			"targetType": "library",
-			"sourceFiles": ["http2.d"]
+			"sourceFiles": ["http2.d"],
+			"importPaths": ["."],
+			"dflags": ["-mv=arsd.http2=http2.d"]
 		},
 		{
 			"name": "jsvar",
@@ -151,8 +161,10 @@
 		{
 			"name": "terminal",
 			"description": "Cross-platform Terminal I/O with color, mouse support, real time input, etc.",
-			"targetType": "sourceLibrary",
+			"targetType": "library",
-			"sourceFiles": ["terminal.d"]
+			"sourceFiles": ["terminal.d"],
+			"importPaths": ["."],
+			"dflags": ["-mv=arsd.terminal=terminal.d"]
 		},
 		{
 			"name": "ttf",

joystick.d

@@ -363,6 +363,7 @@ struct JoystickUpdate {
 	}
 
 	/// Note: UP is negative!
+	/// Value will actually be -16 to 16 ish.
 	short axisPosition(Axis axis, short digitalFallbackValue = short.max) {
 		return axisPositionHelper(axis, &current, digitalFallbackValue);
 	}
@@ -402,9 +403,9 @@ struct JoystickUpdate {
 	}
 
 	static short normalizeAxis(short value) {
-		if(value > -8000 && value < 8000)
+		if(value > -1600 && value < 1600)
 			return 0; // the deadzone gives too much useless junk
-		return value;
+		return cast(short) (value >>> 11);
 	}
 
 	bool buttonIsPressedHelper(Button button, JoystickState* what) {

jsvar.d

@@ -601,7 +601,9 @@ struct var {
 
 	// if it is var, we'll just blit it over
 	public var opAssign(T)(T t) if(!is(T == var)) {
-		static if(isFloatingPoint!T) {
+		static if(__traits(compiles, this = t.toArsdJsvar())) {
+			this = t.toArsdJsvar();
+		} else static if(isFloatingPoint!T) {
 			this._type = Type.Floating;
 			this._payload._floating = t;
 		} else static if(isIntegral!T) {
@@ -655,9 +657,15 @@ struct var {
 						// skipping these because the delegate we get isn't going to work anyway; the object may be dead and certainly won't be updated
 						//this[member] = &__traits(getMember, proxyObject, member);
 
-						//but for simple toString, I'll allow it. or maybe not it doesn't work right.
+						// but for simple toString, I'll allow it by recreating the object on demand
-						//static if(member == "toString" && is(typeof(&__traits(getMember, t, member)) == string delegate()))
+						// and then calling the original function. (I might be able to do that for more but
-							//this[member] = &__traits(getMember, t, member);
+						// idk, just doing simple thing first)
+						static if(member == "toString" && is(typeof(&__traits(getMember, t, member)) == string delegate())) {
+							this[member]._function =  delegate(var _this, var[] args) {
+								auto val = _this.get!T;
+								return var(val.toString());
+							};
+						}
 					} else
 						this[member] = __traits(getMember, t, member);
 				}

simpledisplay.d

@@ -4050,6 +4050,7 @@ Pixmap transparencyMaskFromMemoryImage(MemoryImage i, Window window) {
 */
 version(with_timer) {
 class Timer {
+// FIXME: needs pause and unpause
 	// FIXME: I might add overloads for ones that take a count of
 	// how many elapsed since last time (on Windows, it will divide
 	// the ticks thing given, on Linux it is just available) and
@@ -14234,6 +14235,11 @@ enum _NET_WM_STATE_TOGGLE = 2;
 
 /// X-specific. Use [SimpleWindow.requestAttention] instead for most casesl
 void demandAttention(SimpleWindow window, bool needs = true) {
+	demandAttention(window.impl.window, needs);
+}
+
+/// ditto
+void demandAttention(Window window, bool needs = true) {
 	auto display = XDisplayConnection.get();
 	auto atom = XInternAtom(display, "_NET_WM_STATE_DEMANDS_ATTENTION", true);
 	if(atom == None)
@@ -14243,7 +14249,7 @@ void demandAttention(SimpleWindow window, bool needs = true) {
 	XClientMessageEvent xclient;
 
 	xclient.type = EventType.ClientMessage;
-	xclient.window = window.impl.window;
+	xclient.window = window;
 	xclient.message_type = GetAtom!"_NET_WM_STATE"(display);
 	xclient.format = 32;
 	xclient.data.l[0] = needs ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE;

web.d

@@ -2108,8 +2108,10 @@ string toHtml(T)(T a) {
 		static if(__traits(compiles, typeof(a[0]).makeHtmlArray(a))) {
 			ret = to!string(typeof(a[0]).makeHtmlArray(a));
 		} else {
+			ret ~= "<ul>";
 			foreach(v; a)
-				ret ~= toHtml(v);
+				ret ~= "<li>" ~ toHtml(v) ~ "</li>";
+			ret ~= "</ul>";
 		}
 	} else static if(is(T : Element))
 		ret = a.toString();
@@ -2896,7 +2898,16 @@ string tableToCsv(Table table) {
 			else
 				outputted = true;
 
-			csv ~= toCsv(item.innerText);
+			if(item.firstChild && item.firstChild.tagName == "ul") {
+				string c;
+				foreach(i, node; item.firstChild.childNodes) {
+					if(c.length) c ~= "; ";
+					c ~= node.innerText;
+				}
+				csv ~= toCsv(c);
+			} else {
+				csv ~= toCsv(item.innerText);
+			}
 		}
 	}
 
@@ -4024,7 +4035,7 @@ Table structToTable(T)(Document document, T arr, string[] fieldsToSkip = null) i
 					}
 
 				} else {
-					tr.addChild("td", to!string(member));
+					tr.addChild("td", Html(toHtml(member)));
 				}
 			}