doix-db 1.0.72 → 1.0.74

package/lib/DbClient.js

@@ -250,15 +250,25 @@ class DbClient extends EventEmitter {
 
 		const executor = this.batch (options)
 
-		return new Promise ((ok, fail) => {
+		try {
 
-			statements.on ('error', fail)
-			executor.on ('error', fail)
-			executor.on ('close', ok)
+			await new Promise ((ok, fail) => {
 
-			statements.pipe (executor)
+				statements.on ('error', fail)
+				executor.on ('error', fail)
+				executor.on ('close', ok)
+	
+				statements.pipe (executor)
+	
+			})
+	
 
-		})
+		}
+		catch (cause) {
+
+			throw Error (cause.message, {cause})
+
+		}
 
 	}
 

package/lib/DbCsvPrinter.js

@@ -59,6 +59,8 @@ class DbCsvPrinter extends Transform {
 
 		if (!Array.isArray (columns)) columns = Object.entries (columns).map (([name, def]) => {
 
+			if (typeof def === 'string') def = this.lang.parseColumn (def)
+
 			const col = new DbColumn (def)
 
 			col.name = name

package/lib/DbLang.js

@@ -14,6 +14,17 @@ const DbTypeCharacter =       require ('./model/types/DbTypeCharacter.js')
 const DbTypeDate =            require ('./model/types/DbTypeDate.js')
 const DbTypeTimestamp =       require ('./model/types/DbTypeTimestamp.js')
 
+const CH_ROUND_CLOSE = ')'.charCodeAt (0)
+const CH_SQUARE_CLOSE = ']'.charCodeAt (0)
+const CH_CURLY_OPEN = '{'.charCodeAt (0)
+const CH_CURLY_CLOSE = '}'.charCodeAt (0)
+const CH_SLASH = '/'.charCodeAt (0)
+const CH_BACK_SLASH = '\\'.charCodeAt (0)
+const CH_QUESTION = '?'.charCodeAt (0)
+const CH_EXCLAMATION = '!'.charCodeAt (0)
+
+const RE_INT = /^[1-9][0-9]*$/
+
 const CH_Q = "'", CH_QQ = '"'
 
 const Q_ESC = new stringEscape ([
@@ -93,6 +104,30 @@ class DbLang {
 	
 	}
 
+	createDbObject (options) {
+
+		{
+
+			const {columns} = options; if (columns) 
+
+				for (const name in columns)
+
+					if (typeof columns [name] === 'string')
+						
+						columns [name] = this.parseColumn (columns [name])
+
+		}
+
+		const clazz = this.getDbObjectClass (options)
+
+		const dbObject = new clazz (options)
+
+		dbObject.setLang (this)
+
+		return dbObject
+
+	}
+
 	getDbObjectClassesToDiscover () {
 	
 		return [DbTable]
@@ -548,6 +583,183 @@ class DbLang {
 
 	}
 
+	parseColumn (src) {
+
+		const o = {src: src.trim ()}
+
+		try {
+
+			this.parseColumnComment (o) 
+			this.parseColumnExtra (o)
+			this.parseColumnPattern (o)
+			this.parseColumnRange (o)
+			this.parseColumnDefault (o)
+	
+			if (o.src.length === 0) throw Error (`Cannot determine the type`)
+	
+			this.parseColumnNullable (o)
+	
+			o.isReference = o.type.startsWith ('(')
+			
+			if (!o.isReference) {
+				this.parseColumnDimension (o)
+			}
+	
+			o.src = src
+	
+			return o
+	
+		}
+		catch (cause) {
+
+			if (o.src.length === 0) throw Error (`Invalid column definition: '${src}'`, {cause})
+
+		}
+	
+	}
+
+	parseColumnComment (o) {
+
+		const {src} = o, pos = src.lastIndexOf ('//'); if (pos < 0) return
+			
+		o.comment = src.substring (pos + 2).trimStart ()
+
+		o.src = src.substring (0, pos).trimEnd ()
+
+	}
+
+	parseColumnExtra (o) {
+
+		const {src} = o
+
+		let pos = src.length - 1; if (src.charCodeAt (pos) !== CH_CURLY_CLOSE) return
+
+		let level = 1; while (level !== 0) {
+
+			if (-- pos < 0) throw Error ('Unbalanced "}"')
+
+			switch (src.charCodeAt (pos)) {
+
+				case CH_CURLY_CLOSE:
+					level ++
+					break
+
+				case CH_CURLY_OPEN:
+					level --
+					break
+
+			}
+
+		}
+
+		for (const [k, v] of Object.entries (new Function ('return ' + src.substring (pos)) ())) o [k] = v
+
+		o.src = src.substring (0, pos).trimEnd ()
+
+	}
+
+	parseColumnPattern (o) {
+
+		const {src} = o
+
+		let pos = src.length - 1; if (src.charCodeAt (pos) !== CH_SLASH) return
+
+		while (true) {
+
+			pos = src.lastIndexOf ('/', pos - 1); if (pos < 0) throw Error (`Cannot find opening '/' for the pattern`)
+
+			if (src.charCodeAt (pos - 1) !== CH_BACK_SLASH) break
+			
+		}
+		
+		o.pattern = src.slice (pos + 1, -1)
+		
+		o.src = src.substring (0, pos).trimEnd ()
+
+	}
+
+	parseColumnRange (o) {
+
+		const {src} = o
+
+		if (src.charCodeAt (src.length - 1) !== CH_SQUARE_CLOSE) return
+
+		const begin = src.lastIndexOf ('['); if (begin < 0) throw Error (`Cannot find the opening '[' for range`)
+
+		const range = src.slice (begin + 1, -1)
+
+		o.src = src.substring (0, begin).trimEnd ()
+
+		const pos = range.indexOf ('..'); if (pos < 0) throw Error (`Cannot find '..' between '[' and ']'`)
+		
+		const min = range.substring (0, pos).trim (); if (min.length !== 0) o.min = min
+
+		const max = range.substring (pos + 2).trim (); if (max.length !== 0) o.max = max
+
+	}
+
+	parseColumnDefault (o) {
+
+		const {src} = o, pos = src.indexOf ('='); if (pos < 0) return
+		
+		o.default = src.substring (pos + 1).trimStart ()
+
+		if (o.default.length === 0) throw Error (`Empty (but not NULL neither '') default definition`)
+
+		o.src = src.substring (0, pos).trimEnd ()
+
+	}
+		
+	parseColumnNullable (o) {
+
+		let nullable = !('default' in o)
+
+		const {src} = o, {length} = src, override = nullable ? CH_EXCLAMATION : CH_QUESTION
+
+		if (src.charCodeAt (length - 1) === override) {
+		
+			nullable = !nullable
+			
+			o.src = src.slice (0, -1).trim ()
+
+		}
+
+		o.nullable = nullable
+
+		o.type = o.src
+
+	}
+	
+	parseColumnDimension (o) {
+
+		const src = o.type
+
+		if (src.charCodeAt (src.length - 1) !== CH_ROUND_CLOSE) return
+
+		const begin = src.lastIndexOf ('('); if (begin < 0) throw Error (`Cannot find opening '(' for dimension`)
+
+		let dimension = src.slice (begin + 1, -1)
+
+		o.type = src.slice (0, begin).trim ()
+
+		const pos = dimension.indexOf (','); if (pos >= 0) {
+		
+			const scale = dimension.slice (pos + 1).trim ()
+
+			if (!RE_INT.test (scale)) throw Error (`Not a positive integer as scale`)
+		
+			o.scale = parseInt (scale)
+			
+			dimension = dimension.slice (0, pos).trim ()
+		
+		}
+
+		if (!RE_INT.test (dimension)) throw Error (`Not a positive integer as column dimension`)
+
+		o.size = parseInt (dimension)
+
+	}
+
 }
 
 module.exports = DbLang

package/lib/model/DbColumn.js

@@ -1,175 +1,23 @@
 const DbReference = require ('./DbReference.js')
 
-const CH_ROUND_OPEN = '('.charCodeAt (0)
-const CH_ROUND_CLOSE = ')'.charCodeAt (0)
-const CH_CURLY_CLOSE = '}'.charCodeAt (0)
-const CH_SLASH = '/'.charCodeAt (0)
-const CH_BACK_SLASH = '\\'.charCodeAt (0)
-const CH_QUESTION = '?'.charCodeAt (0)
-const CH_EXCLAMATION = '!'.charCodeAt (0)
-
-const RE_INT = /^[1-9][0-9]*$/
-
 class DbColumn {
 
 	constructor (o) {
 	
-		if (typeof o === 'string') {
-	
-			this.src = o
-			
-			this.parse ()
-					
-		}
-		else {
-			
-			for (const k in o) this [k] = o [k]
-			
-			if (!('nullable' in this)) this.nullable = !('default' in this)
-			
-		}
-
-	}
-
-	parse () {
-	
-		const {src} = this, pos = src.lastIndexOf ('//')
-		
-		if (pos < 0) {
-
-			this.type = src.trim ()
-
-		}
-		else {
-
-			this.type    = src.slice (0, pos).trim ()
+		const {isReference} = o
 			
-			this.comment = src.slice (pos + 2).trim ()
+		for (const k in o) if (k !== 'isReference') this [k] = o [k]
 
-		}
-		
-		this.parseDefault ()
-		this.parsePattern ()
-		this.parseRange ()
-		this.parseNullable ()
-		
-		if (this.type.charCodeAt (0) === CH_ROUND_OPEN) {
+		if (isReference) {
 
 			this.reference = new DbReference (this.type, this)
-			
+				
 			this.type = undefined
-
-		}
-		else {
-
-			this.parseDimension ()
-
-		}
 	
-	}
+		}	
 
-	parseDefault () {
-
-		const pos = this.type.indexOf ('='); if (pos < 0) return
-		
-		this.default = this.type.slice (pos + 1).trim ()
-
-		this.type = this.type.slice (0, pos).trim ()
-
-	}
-	
-	parsePattern () {
-
-		const last = this.default ? 'default' : 'type', src = this [last]
-
-		let pos = src.length - 1; if (src.charCodeAt (pos) !== CH_SLASH) return
-
-		while (true) {
-
-			pos = src.lastIndexOf ('/', pos - 1)
-
-			if (pos < 0) throw Error (`Invalid column definition: cannot find opening '/' for pattern in '${this.src}'`)
-
-			if (pos === 0) throw Error (`Invalid column definition: the ${last} is empty in '${this.src}'`)
-
-			if (src.charCodeAt (pos - 1) !== CH_BACK_SLASH) break
+		if (!('nullable' in this)) this.nullable = !('default' in this)
 			
-		}
-		
-		this.pattern = src.slice (pos + 1, -1)
-		
-		this [last] = src.slice (0, pos).trim ()
-	
-	}
-
-	parseRange () {
-
-		const last = this.default ? 'default' : 'type', src = this [last]
-
-		if (src.charCodeAt (src.length - 1) !== CH_CURLY_CLOSE) return
-
-		const begin = src.lastIndexOf ('{'); if (begin < 0) throw Error (`Invalid column definition: cannot find opening '{' for range in '${this.src}'`)
-
-		const range = src.slice (begin + 1, -1)
-
-		this [last] = src.slice (0, begin).trim ()
-
-		const pos = range.indexOf ('..'); if (pos < 0) throw Error (`Invalid column definition: cannot find '..' between '{' and '}' in '${this.src}'`)
-		
-		const min = range.slice (0, pos).trim (); if (min.length !== 0) this.min = min
-
-		const max = range.slice (pos + 2).trim (); if (max.length !== 0) this.max = max
-
-	}
-	
-	parseNullable () {
-
-		let nullable = !('default' in this)
-
-		const src = this.type, {length} = src; if (length === 0) throw Error (`Invalid column definition: cannot determine type in '${this.src}'`)
-
-		const override = nullable ? CH_EXCLAMATION : CH_QUESTION
-
-		if (src.charCodeAt (length - 1) === override) {
-		
-			nullable = !nullable
-			
-			this.type = src.slice (0, -1).trim ()
-
-		}
-
-		this.nullable = nullable
-
-	}
-	
-	parseDimension () {
-
-		const src = this.type
-
-		if (src.charCodeAt (src.length - 1) !== CH_ROUND_CLOSE) return
-
-		const begin = src.lastIndexOf ('('); if (begin < 0) throw Error (`Invalid column definition: cannot find opening '(' for dimension in '${this.src}'`)
-
-		let dimension = src.slice (begin + 1, -1)
-
-		this.type = src.slice (0, begin).trim ()
-
-		const pos = dimension.indexOf (','); if (pos >= 0) {
-		
-			const scale = dimension.slice (pos + 1).trim ()
-
-			if (!RE_INT.test (scale)) throw Error (`Invalid column definition: not a positive integer as scale in '${this.src}'`)
-		
-			this.scale = parseInt (scale)
-			
-			dimension = dimension.slice (0, pos).trim ()
-		
-		}
-
-		if (!RE_INT.test (dimension)) throw Error (`Invalid column definition: not a positive integer as column dimension in '${this.src}'`)
-
-		this.size = parseInt (dimension)
-
 	}
 
 	setLang (lang) {

package/lib/model/DbSchema.js

@@ -42,14 +42,12 @@ class DbSchema extends require ('events') {
 
 	create (options) {
 
-		const {model} = this, {lang}  = model
+		const {model} = this, {lang} = model
 
 		options.model  = model
 		options.schema = this
 
-		const dbObject  = new (lang.getDbObjectClass (options)) (options)
-
-		dbObject.setLang (lang)
+		const dbObject = lang.createDbObject (options)
 
 		this.emit ('object-created', dbObject)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doix-db",
-  "version": "1.0.72",
+  "version": "1.0.74",
   "description": "Shared database related code for doix",
   "main": "index.js",
   "files": [