Fix formatting of JS files

plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag.js

@@ -13,23 +13,23 @@ description
 \*/
 (function() {
 
-	/*jslint node: true, browser: true */
-	/*global $tw: false */
-	"use strict";
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
 
-	exports.method = "POST";
+exports.method = "POST";
 
-	exports.path = /^\/bags$/;
+exports.path = /^\/bags$/;
 
-	exports.bodyFormat = "www-form-urlencoded";
+exports.bodyFormat = "www-form-urlencoded";
 
-	exports.csrfDisable = true;
+exports.csrfDisable = true;
 
-	exports.useACL = true;
+exports.useACL = true;
 
-	exports.entityName = "bag"
+exports.entityName = "bag"
 
-	exports.handler = function(request,response,state) {
+exports.handler = function(request,response,state) {
 	var server = state.server,
 		sqlTiddlerDatabase = server.sqlTiddlerDatabase;
 	
@@ -76,7 +76,6 @@ description
 			"Content-Type": "text/plain"
 		});
 	}
-	};
-	
-	}());
+};
 
+}());

plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-recipe.js

@@ -14,23 +14,23 @@ bag_names: space separated list of bags
 \*/
 (function() {
 
-	/*jslint node: true, browser: true */
-	/*global $tw: false */
-	"use strict";
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
 
-	exports.method = "POST";
+exports.method = "POST";
 
-	exports.path = /^\/recipes$/;
+exports.path = /^\/recipes$/;
 
-	exports.bodyFormat = "www-form-urlencoded";
+exports.bodyFormat = "www-form-urlencoded";
 
-	exports.csrfDisable = true;
+exports.csrfDisable = true;
 
-	exports.useACL = true;
+exports.useACL = true;
 
-	exports.entityName = "recipe"
+exports.entityName = "recipe"
 
-	exports.handler = function(request,response,state) {
+exports.handler = function(request,response,state) {
 	var server = state.server,
 		sqlTiddlerDatabase = server.sqlTiddlerDatabase;
 	
@@ -81,6 +81,6 @@ bag_names: space separated list of bags
 			"Content-Type": "text/plain"
 		});
 	}
-	};
+};
 
-	}());
+}());

plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js

@@ -15,15 +15,15 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 
 (function() {
 
-	/*
-	Create a tiddler store. Options include:
+/*
+Create a tiddler store. Options include:
 
-	databasePath - path to the database file (can be ":memory:" to get a temporary database)
-	adminWiki - reference to $tw.Wiki object used for configuration
-	attachmentStore - reference to associated attachment store
-	engine - wasm | better
-	*/
-	function SqlTiddlerStore(options) {
+databasePath - path to the database file (can be ":memory:" to get a temporary database)
+adminWiki - reference to $tw.Wiki object used for configuration
+attachmentStore - reference to associated attachment store
+engine - wasm | better
+*/
+function SqlTiddlerStore(options) {
 	options = options || {};
 	this.attachmentStore = options.attachmentStore;
 	this.adminWiki = options.adminWiki || $tw.wiki;
@@ -37,14 +37,14 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 		engine: options.engine
 	});
 	this.sqlTiddlerDatabase.createTables();
-	}
+}
 
-	SqlTiddlerStore.prototype.addEventListener = function(type,listener) {
+SqlTiddlerStore.prototype.addEventListener = function(type,listener) {
 	this.eventListeners[type] = this.eventListeners[type]  || [];
 	this.eventListeners[type].push(listener);
-	};
+};
 
-	SqlTiddlerStore.prototype.removeEventListener = function(type,listener) {
+SqlTiddlerStore.prototype.removeEventListener = function(type,listener) {
 	const listeners = this.eventListeners[type];
 	if(listeners) {
 		var p = listeners.indexOf(listener);
@@ -52,9 +52,9 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 			listeners.splice(p,1);
 		}
 	}
-	};
+};
 
-	SqlTiddlerStore.prototype.dispatchEvent = function(type /*, args */) {
+SqlTiddlerStore.prototype.dispatchEvent = function(type /*, args */) {
 	const self = this;
 	if(!this.eventOutstanding[type]) {
 		$tw.utils.nextTick(function() {
@@ -70,12 +70,12 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 			});
 		this.eventOutstanding[type] = true;
 	}
-	};
+};
 
-	/*
-	Returns null if a bag/recipe name is valid, or a string error message if not
-	*/
-	SqlTiddlerStore.prototype.validateItemName = function(name,allowPrivilegedCharacters) {
+/*
+Returns null if a bag/recipe name is valid, or a string error message if not
+*/
+SqlTiddlerStore.prototype.validateItemName = function(name,allowPrivilegedCharacters) {
 	if(typeof name !== "string") {
 		return "Not a valid string";
 	}
@@ -93,12 +93,12 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 		}
 	}
 	return null;
-	};
+};
 
-	/*
-	Delete a recipe. Returns null on success, or {message:} on error
-	*/
-	SqlTiddlerStore.prototype.deleteRecipe = function(recipe_name) {
+/*
+Delete a recipe. Returns null on success, or {message:} on error
+*/
+SqlTiddlerStore.prototype.deleteRecipe = function(recipe_name) {
 	var self = this;
 	return this.sqlTiddlerDatabase.transaction(function() {
 		// Check if recipe exists
@@ -113,12 +113,12 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 		self.dispatchEvent("change");
 		return null;
 	});
-	};
+};
 
-	/*
-	Delete a bag. Returns null on success, or {message:} on error
-	*/
-	SqlTiddlerStore.prototype.deleteBag = function(bag_name) {
+/*
+Delete a bag. Returns null on success, or {message:} on error
+*/
+SqlTiddlerStore.prototype.deleteBag = function(bag_name) {
 	var self = this;
 	return this.sqlTiddlerDatabase.transaction(function() {
 		// Check if bag exists
@@ -133,12 +133,12 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 		self.dispatchEvent("change");
 		return null;
 	});
-	};
+};
 
-	/*
-	Returns null if the argument is an array of valid bag/recipe names, or a string error message if not
-	*/
-	SqlTiddlerStore.prototype.validateItemNames = function(names,allowPrivilegedCharacters) {
+/*
+Returns null if the argument is an array of valid bag/recipe names, or a string error message if not
+*/
+SqlTiddlerStore.prototype.validateItemNames = function(names,allowPrivilegedCharacters) {
 	if(!$tw.utils.isArray(names)) {
 		return "Not a valid array";
 	}
@@ -154,19 +154,19 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 	} else {
 		return errors.join("\n");
 	}
-	};
+};
 
-	SqlTiddlerStore.prototype.close = function() {
+SqlTiddlerStore.prototype.close = function() {
 	this.sqlTiddlerDatabase.close();
 	this.sqlTiddlerDatabase = undefined;
-	};
+};
 
-	/*
-	Given tiddler fields, tiddler_id and a bag_name, return the tiddler fields after the following process:
-	- Apply the tiddler_id as the revision field
-	- Apply the bag_name as the bag field
-	*/
-	SqlTiddlerStore.prototype.processOutgoingTiddler = function(tiddlerFields,tiddler_id,bag_name,attachment_blob) {
+/*
+Given tiddler fields, tiddler_id and a bag_name, return the tiddler fields after the following process:
+- Apply the tiddler_id as the revision field
+- Apply the bag_name as the bag field
+*/
+SqlTiddlerStore.prototype.processOutgoingTiddler = function(tiddlerFields,tiddler_id,bag_name,attachment_blob) {
 	if(attachment_blob !== null) {
 		return $tw.utils.extend(
 			{},
@@ -179,11 +179,11 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 	} else {
 		return tiddlerFields;
 	}
-	};
+};
 
-	/*
-	*/
-	SqlTiddlerStore.prototype.processIncomingTiddler = function(tiddlerFields, existing_attachment_blob, existing_canonical_uri) {
+/*
+*/
+SqlTiddlerStore.prototype.processIncomingTiddler = function(tiddlerFields, existing_attachment_blob, existing_canonical_uri) {
 	let attachmentSizeLimit = $tw.utils.parseNumber(this.adminWiki.getTiddlerText("$:/config/MultiWikiServer/AttachmentSizeLimit"));
 	if(attachmentSizeLimit < 100 * 1024) {
 		attachmentSizeLimit = 100 * 1024;
@@ -228,9 +228,9 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 		attachment_blob: existing_attachment_blob
 	};
 	}
-	};
+};
 
-	SqlTiddlerStore.prototype.saveTiddlersFromPath = function(tiddler_files_path,bag_name) {
+SqlTiddlerStore.prototype.saveTiddlersFromPath = function(tiddler_files_path,bag_name) {
 	var self = this;
 	this.sqlTiddlerDatabase.transaction(function() {
 		// Clear out the bag
@@ -246,18 +246,18 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 		}
 	});
 	self.dispatchEvent("change");
-	};
+};
 
-	SqlTiddlerStore.prototype.listBags = function() {
+SqlTiddlerStore.prototype.listBags = function() {
 	return this.sqlTiddlerDatabase.listBags();
-	};
+};
 
-	/*
-	Options include:
+/*
+Options include:
 
-	allowPrivilegedCharacters - allows "$", ":" and "/" to appear in recipe name
-	*/
-	SqlTiddlerStore.prototype.createBag = function(bag_name,description,options) {
+allowPrivilegedCharacters - allows "$", ":" and "/" to appear in recipe name
+*/
+SqlTiddlerStore.prototype.createBag = function(bag_name,description,options) {
 	options = options || {};
 	var self = this;
 	return this.sqlTiddlerDatabase.transaction(function() {
@@ -269,20 +269,20 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 		self.dispatchEvent("change");
 		return null;
 	});
-	};
+};
 
-	SqlTiddlerStore.prototype.listRecipes = function() {
+SqlTiddlerStore.prototype.listRecipes = function() {
 	return this.sqlTiddlerDatabase.listRecipes();
-	};
+};
 
-	/*
-	Returns null on success, or {message:} on error
+/*
+Returns null on success, or {message:} on error
 
-	Options include:
+Options include:
 
-	allowPrivilegedCharacters - allows "$", ":" and "/" to appear in recipe name
-	*/
-	SqlTiddlerStore.prototype.createRecipe = function(recipe_name,bag_names,description,options) {
+allowPrivilegedCharacters - allows "$", ":" and "/" to appear in recipe name
+*/
+SqlTiddlerStore.prototype.createRecipe = function(recipe_name,bag_names,description,options) {
 	bag_names = bag_names || [];
 	description = description || "";
 	options = options || {};
@@ -299,12 +299,12 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 		self.dispatchEvent("change");
 		return null;
 	});
-	};
+};
 
-	/*
-	Returns {tiddler_id:}
-	*/
-	SqlTiddlerStore.prototype.saveBagTiddler = function(incomingTiddlerFields,bag_name) {
+/*
+Returns {tiddler_id:}
+*/
+SqlTiddlerStore.prototype.saveBagTiddler = function(incomingTiddlerFields,bag_name) {
 	let _canonical_uri;
 	const existing_attachment_blob = this.sqlTiddlerDatabase.getBagTiddlerAttachmentBlob(incomingTiddlerFields.title,bag_name)
 	if(existing_attachment_blob) {
@@ -314,19 +314,19 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 	const result = this.sqlTiddlerDatabase.saveBagTiddler(tiddlerFields,bag_name,attachment_blob);
 	this.dispatchEvent("change");
 	return result;
-	};
+};
 
-	/*
-	Create a tiddler in a bag adopting the specified file as the attachment. The attachment file must be on the same disk as the attachment store
-	Options include:
+/*
+Create a tiddler in a bag adopting the specified file as the attachment. The attachment file must be on the same disk as the attachment store
+Options include:
 
-	filepath - filepath to the attachment file
-	hash - string hash of the attachment file
-	type - content type of file as uploaded
+filepath - filepath to the attachment file
+hash - string hash of the attachment file
+type - content type of file as uploaded
 
-	Returns {tiddler_id:}
-	*/
-	SqlTiddlerStore.prototype.saveBagTiddlerWithAttachment = function(incomingTiddlerFields,bag_name,options) {
+Returns {tiddler_id:}
+*/
+SqlTiddlerStore.prototype.saveBagTiddlerWithAttachment = function(incomingTiddlerFields,bag_name,options) {
 	const attachment_blob = this.attachmentStore.adoptAttachment(options.filepath,options.type,options.hash,options._canonical_uri);
 	if(attachment_blob) {
 		const result = this.sqlTiddlerDatabase.saveBagTiddler(incomingTiddlerFields,bag_name,attachment_blob);
@@ -335,29 +335,29 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 	} else {
 		return null;
 	}
-	};
+};
 
-	/*
-	Returns {tiddler_id:,bag_name:}
-	*/
-	SqlTiddlerStore.prototype.saveRecipeTiddler = function(incomingTiddlerFields,recipe_name) {
+/*
+Returns {tiddler_id:,bag_name:}
+*/
+SqlTiddlerStore.prototype.saveRecipeTiddler = function(incomingTiddlerFields,recipe_name) {
 	const existing_attachment_blob = this.sqlTiddlerDatabase.getRecipeTiddlerAttachmentBlob(incomingTiddlerFields.title,recipe_name)
 	const {tiddlerFields, attachment_blob} = this.processIncomingTiddler(incomingTiddlerFields,existing_attachment_blob,incomingTiddlerFields._canonical_uri);
 	const result = this.sqlTiddlerDatabase.saveRecipeTiddler(tiddlerFields,recipe_name,attachment_blob);
 	this.dispatchEvent("change");
 	return result;
-	};
+};
 
-	SqlTiddlerStore.prototype.deleteTiddler = function(title,bag_name) {
+SqlTiddlerStore.prototype.deleteTiddler = function(title,bag_name) {
 	const result = this.sqlTiddlerDatabase.deleteTiddler(title,bag_name);
 	this.dispatchEvent("change");
 	return result;
-	};
+};
 
-	/*
-	returns {tiddler_id:,tiddler:}
-	*/
-	SqlTiddlerStore.prototype.getBagTiddler = function(title,bag_name) {
+/*
+returns {tiddler_id:,tiddler:}
+*/
+SqlTiddlerStore.prototype.getBagTiddler = function(title,bag_name) {
 	var tiddlerInfo = this.sqlTiddlerDatabase.getBagTiddler(title,bag_name);
 	if(tiddlerInfo) {
 		return Object.assign(
@@ -369,16 +369,16 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 	} else {
 		return null;
 	}
-	};
+};
 
-	/*
-	Get an attachment ready to stream. Returns null if there is an error or:
-	tiddler_id: revision of tiddler
-	stream: stream of file
-	type: type of file
-	Returns {tiddler_id:,bag_name:}
-	*/
-	SqlTiddlerStore.prototype.getBagTiddlerStream = function(title,bag_name) {
+/*
+Get an attachment ready to stream. Returns null if there is an error or:
+tiddler_id: revision of tiddler
+stream: stream of file
+type: type of file
+Returns {tiddler_id:,bag_name:}
+*/
+SqlTiddlerStore.prototype.getBagTiddlerStream = function(title,bag_name) {
 	const tiddlerInfo = this.sqlTiddlerDatabase.getBagTiddler(title,bag_name);
 	if(tiddlerInfo) {
 		if(tiddlerInfo.attachment_blob) {
@@ -410,12 +410,12 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 	} else {
 		return null;
 	}
-	};
+};
 
-	/*
-	Returns {bag_name:, tiddler: {fields}, tiddler_id:}
-	*/
-	SqlTiddlerStore.prototype.getRecipeTiddler = function(title,recipe_name) {
+/*
+Returns {bag_name:, tiddler: {fields}, tiddler_id:}
+*/
+SqlTiddlerStore.prototype.getRecipeTiddler = function(title,recipe_name) {
 	var tiddlerInfo = this.sqlTiddlerDatabase.getRecipeTiddler(title,recipe_name);
 	if(tiddlerInfo) {
 		return Object.assign(
@@ -427,52 +427,52 @@ This class is largely a wrapper for the sql-tiddler-database.js class, adding th
 	} else {
 		return null;
 	}
-	};
+};
 
-	/*
-	Get the titles of the tiddlers in a bag. Returns an empty array for bags that do not exist
-	*/
-	SqlTiddlerStore.prototype.getBagTiddlers = function(bag_name) {
+/*
+Get the titles of the tiddlers in a bag. Returns an empty array for bags that do not exist
+*/
+SqlTiddlerStore.prototype.getBagTiddlers = function(bag_name) {
 	return this.sqlTiddlerDatabase.getBagTiddlers(bag_name);
-	};
+};
 
-	/*
-	Get the tiddler_id of the newest tiddler in a bag. Returns null for bags that do not exist
-	*/
-	SqlTiddlerStore.prototype.getBagLastTiddlerId = function(bag_name) {
+/*
+Get the tiddler_id of the newest tiddler in a bag. Returns null for bags that do not exist
+*/
+SqlTiddlerStore.prototype.getBagLastTiddlerId = function(bag_name) {
 	return this.sqlTiddlerDatabase.getBagLastTiddlerId(bag_name);
-	};
+};
 
-	/*
-	Get the titles of the tiddlers in a recipe as {title:,bag_name:}. Returns null for recipes that do not exist
-	*/
-	SqlTiddlerStore.prototype.getRecipeTiddlers = function(recipe_name,options) {
+/*
+Get the titles of the tiddlers in a recipe as {title:,bag_name:}. Returns null for recipes that do not exist
+*/
+SqlTiddlerStore.prototype.getRecipeTiddlers = function(recipe_name,options) {
 	return this.sqlTiddlerDatabase.getRecipeTiddlers(recipe_name,options);
-	};
+};
 
-	/*
-	Get the tiddler_id of the newest tiddler in a recipe. Returns null for recipes that do not exist
-	*/
-	SqlTiddlerStore.prototype.getRecipeLastTiddlerId = function(recipe_name) {
+/*
+Get the tiddler_id of the newest tiddler in a recipe. Returns null for recipes that do not exist
+*/
+SqlTiddlerStore.prototype.getRecipeLastTiddlerId = function(recipe_name) {
 	return this.sqlTiddlerDatabase.getRecipeLastTiddlerId(recipe_name);
-	};
+};
 
-	SqlTiddlerStore.prototype.deleteAllTiddlersInBag = function(bag_name) {
+SqlTiddlerStore.prototype.deleteAllTiddlersInBag = function(bag_name) {
 	var self = this;
 	return this.sqlTiddlerDatabase.transaction(function() {
 		const result = self.sqlTiddlerDatabase.deleteAllTiddlersInBag(bag_name);
 		self.dispatchEvent("change");
 		return result;
 	});
-	};
+};
 
-	/*
-	Get the names of the bags in a recipe. Returns an empty array for recipes that do not exist
-	*/
-	SqlTiddlerStore.prototype.getRecipeBags = function(recipe_name) {
+/*
+Get the names of the bags in a recipe. Returns an empty array for recipes that do not exist
+*/
+SqlTiddlerStore.prototype.getRecipeBags = function(recipe_name) {
 	return this.sqlTiddlerDatabase.getRecipeBags(recipe_name);
-	};
+};
 
-	exports.SqlTiddlerStore = SqlTiddlerStore;
+exports.SqlTiddlerStore = SqlTiddlerStore;
 
-	})();
+})();