Merge pull request #388 from formidablejs/feature/code-clean-up

feat: clean up code

Author: donaldp

package-lock.json

@@ -282,7 +282,7 @@ export default class Driver
 		if isValid !== true
 			let errors = {}
 
-			isValid.forEach do(field)
+			for field in isValid
 				errors[field] = [
 					"The {field} is invalid or has already taken."
 				]

src/Auth/Drivers/Driver.imba

@@ -31,13 +31,13 @@ try
 		let results\object[] = await this
 
 		if columns && Array.isArray(columns) && columns.length > 0
-			return results.map do(result)
+			let mappedResults = []
+			for result in results
 				const object = {}
-
 				for column in columns
 					object[column] = result[column]
-
-				return object
+				mappedResults.push(object)
+			return mappedResults
 
 		if this._hidden && Array.isArray(this._hidden) && this._hidden.length > 0
 			for result in results
@@ -129,37 +129,56 @@ try
 
 					url = url.length > 1 ? url.replace(/\/+$/, '') + '/' : ''
 
+					params = []
+					keys = Object.keys(query)
+					for key in keys
+						params.push(key + '=' + encodeURIComponent(key == 'page' ? (results.pagination.firstPage) : query[key]))
 					links.firstPage = {
 						label: 'First',
 						active: results.pagination.firstPage === results.pagination.currentPage,
-						url: url + '?' + Object.keys(query).map(do(key) key + '=' + encodeURIComponent(key == 'page' ? (results.pagination.firstPage) : query[key])).join('&')
+						url: url + '?' + params.join('&')
 					}
 
+					params = []
+					keys = Object.keys(query)
+					for key in keys
+						params.push(key + '=' + encodeURIComponent(key == 'page' ? (results.pagination.prevPage) : query[key]))
 					links.prevPage = results.pagination.prevPage ? {
 						label: 'Previous',
 						active: results.pagination.prevPage === results.pagination.currentPage,
-						url: url + '?' + Object.keys(query).map(do(key) key + '=' + encodeURIComponent(key == 'page' ? (results.pagination.prevPage) : query[key])).join('&')
+						url: url + '?' + params.join('&')
 					} : null
 
 					for page in pages
 						query.page = page
-
+						params = []
+						keys = Object.keys(query)
+						for key in keys
+							params.push(key + '=' + encodeURIComponent(query[key]))
 						links[page] = {
 							label: page,
 							active: page === results.pagination.currentPage,
-							url: url + '?' + Object.keys(query).map(do(key) key + '=' + encodeURIComponent(query[key])).join('&')
+							url: url + '?' + params.join('&')
 						}
 
+					params = []
+					keys = Object.keys(query)
+					for key in keys
+						params.push(key + '=' + encodeURIComponent(key == 'page' ? (results.pagination.nextPage) : query[key]))
 					links.nextPage = results.pagination.nextPage ? {
 						label: 'Next',
 						active: results.pagination.nextPage === results.pagination.currentPage,
-						url: url + '?' + Object.keys(query).map(do(key) key + '=' + encodeURIComponent(key == 'page' ? (results.pagination.nextPage) : query[key])).join('&')
+						url: url + '?' + params.join('&')
 					} : null
 
+					params = []
+					keys = Object.keys(query)
+					for key in keys
+						params.push(key + '=' + encodeURIComponent(key == 'page' ? (results.pagination.lastPage) : query[key]))
 					links.lastPage = {
 						label: 'Last',
 						active: results.pagination.lastPage === results.pagination.currentPage,
-						url: url + '?' + Object.keys(query).map(do(key) key + '=' + encodeURIComponent(key == 'page' ? (results.pagination.lastPage) : query[key])).join('&')
+						url: url + '?' + params.join('&')
 					}
 
 					results.pagination.links = links

src/Database/Database.imba

@@ -36,9 +36,12 @@ export default class Repository
 			const results = output.match(/\$\{(.*?)\}/g)
 
 			if !isEmpty(results)
-				results.forEach do(variable)
+				for variable in results
 					output = output.replace(variable, self.variables[variable.slice(2, -1)])
 
+				# results.forEach do(variable)
+				# 	output = output.replace(variable, self.variables[variable.slice(2, -1)])
+
 		if isEmpty(output) then return default
 
 		['true', 'false'].includes(output.toLowerCase!) ? output = JSON.parse(output) : (output === 'null' ? null : output)

src/Environment/Repository.imba

@@ -227,5 +227,5 @@ export default class Application
 			resolver.register!
 
 			if resolver.context && Array.isArray(resolver.context)
-				resolver.context.forEach do(context)
+				for context in resolver.context
 					self.context.inject(context)

src/Foundation/Application.imba

@@ -125,7 +125,11 @@ export default class Console
 		const nodeEnv = args.find do(arg) arg.startsWith('--MODE=')
 		const nodeEnvValue = nodeEnv ? nodeEnv.split('=')[1] : 'development'
 
-		process.argv = process.argv.filter do(arg) !arg.startsWith('--MODE=')
+		let filteredArgv = []
+		for arg in process.argv
+			if !arg.startsWith('--MODE=')
+				filteredArgv.push(arg)
+		process.argv = filteredArgv
 
 		modes.includes(nodeEnvValue)
 
@@ -148,7 +152,7 @@ export default class Console
 			let host = 'localhost'
 			let addr = false
 
-			args.forEach do(arg)
+			for arg in args
 				port = arg.split('=')[1] if arg.startsWith('--port')
 				host = arg.split('=')[1] if arg.startsWith('--host') || arg.startsWith('-h')
 				addr = true if arg == '--addr'

src/Foundation/Console.imba

@@ -63,7 +63,7 @@ export class DbSeedCommand < Command
 			const root = process.cwd!
 
 			Output.group { newLine: false }, do
-				results[0].forEach do(seeder)
+				for seeder in results[0]
 					self.message 'info', "Seeder \x1b[1m[{seeder.substring(root.length + 1)}]\x1b[0m ran successfully."
 
 			exit!

src/Foundation/Console/Commands/DbSeedCommand.imba

@@ -52,7 +52,7 @@ export class MigrationCommand < Command
 
 		if results[1].length > 0
 			Output.group { newLine: false }, do
-				results[1].forEach do(migration)
+				for migration in results[1]
 					self.message 'info', "<fg:green>{action === 'rollback' ? 'Rollback' : 'Migrate'}:</fg:green> {migration}"
 
 			if exitOnEnd

src/Foundation/Console/Commands/MigrationCommand.imba

@@ -64,7 +64,8 @@ export class PackagePublishCommand < Command
 	def handle
 		let tags\string[] = self.option('tag').split(',')
 
-		tags.forEach do(optTag) self.persist optTag
+		for optTag in tags
+			self.persist optTag
 
 		self.exit!
 
@@ -75,7 +76,7 @@ export class PackagePublishCommand < Command
 		if typeof self.publisher[optTag] !== 'object'
 			return self.write "<fg:red>{optTag} is missing paths.</fg:red>"
 
-		Object.keys(self.publisher[optTag].paths).forEach do(entry)
+		for entry in Object.keys(self.publisher[optTag].paths)
 			const file = join self.package, self.publisher[optTag].paths[entry]
 
 			if existsSync(entry) && !self.option('force', false)

src/Foundation/Console/Commands/PackagePublishCommand.imba

@@ -24,9 +24,13 @@ export class RouteListCommand < Command
 		const list = []
 		const methods = self.option('method') ? (Array.isArray(self.option('method')) ? self.option('method') : [self.option('method')]) : ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD', 'TRACE', 'CONNECT']
 
-		const routes = self.app.routes!.filter(do(route)
-			methods.map(do(method) method.toUpperCase!).includes(route.method.toUpperCase!)
-		)
+		let normalizedMethods = []
+		for method in methods
+			normalizedMethods.push(method.toUpperCase!)
+		let routes = []
+		for route in self.app.routes!
+			if normalizedMethods.includes(route.method.toUpperCase!)
+				routes.push(route)
 
 		if self.option('legacy')
 			self.table(routes)