doix-db 1.0.2 → 1.0.4

package/index.js

@@ -12,6 +12,8 @@ module.exports = {
 	DbView:         require ('./lib/model/DbView.js'),
 	DbObjectMap:    require ('./lib/model/DbObjectMap.js'),
 	DbObject:       require ('./lib/model/DbObject.js'),
+	DbProcedure:    require ('./lib/model/DbProcedure.js'),
+	DbFunction:     require ('./lib/model/DbFunction.js'),
 	DbModel:        require ('./lib/model/DbModel.js'),
 
 	DbType:                require ('./lib/model/types/DbType.js'),

package/lib/DbLang.js

@@ -3,6 +3,9 @@ const stringEscape = require ('string-escape-map')
 const DbTable = require ('./model/DbTable.js')
 const DbView  = require ('./model/DbView.js')
 
+const DbProcedure = require ('./model/DbProcedure.js')
+const DbFunction  = require ('./model/DbFunction.js')
+
 const DbType =                require ('./model/types/DbType.js')
 const DbTypeArithmetic =      require ('./model/types/DbTypeArithmetic.js')
 const DbTypeArithmeticFixed = require ('./model/types/DbTypeArithmeticFixed.js')
@@ -73,9 +76,11 @@ class DbLang {
 
 		if (typeof o !== 'object' || Array.isArray (o)) throw Error ('Not an object')
 
-		if (!('columns' in o)) throw Error ('Cannot detect type for ' + JSON.stringify (o))
-		
-		return 'sql' in o ? DbView : DbTable
+		if ('columns' in o) return 'sql' in o ? DbView : DbTable
+
+		if ('body'    in o) return 'returns' in o ? DbFunction : DbProcedure
+
+		throw Error ('Cannot detect type for ' + JSON.stringify (o))
 	
 	}
 

package/lib/model/DbFunction.js

@@ -0,0 +1,5 @@
+const DbRoutine = require ('./DbRoutine.js')
+
+class DbFunction extends DbRoutine {}
+
+module.exports = DbFunction

package/lib/model/DbProcedure.js

@@ -0,0 +1,5 @@
+const DbRoutine = require ('./DbRoutine.js')
+
+class DbProcedure extends DbRoutine {}
+
+module.exports = DbProcedure

package/lib/model/DbRoutine.js

@@ -0,0 +1,41 @@
+const DbObject = require ('./DbObject.js')
+const DbRoutineParameter = require ('./DbRoutineParameter.js')
+
+class DbRoutine extends DbObject {
+
+	constructor (o) {
+
+		for (const k of ['body']) if (!(k in o)) throw Error (`${k} is not defined`)
+
+		for (const k of ['parameters', 'options']) {
+		
+			if (o [k] == null) {
+				
+				o [k] = []
+			
+			}
+			else if (!Array.isArray (o [k])) {
+			
+				throw Error (`When defined, ${k} must be an array`)
+				
+			}
+			
+		}
+
+		o.parameters = o.parameters.map (o => new DbRoutineParameter (o))
+
+		super (o)
+
+	}
+
+	setLang (lang) {
+
+		super.setLang (lang)
+		
+		for (const parameter of this.parameters) parameter.setLang (lang)
+
+	}
+	
+}
+
+module.exports = DbRoutine

package/lib/model/DbRoutineParameter.js

@@ -0,0 +1,86 @@
+const CH_EQ    = '='.charCodeAt (0)
+const CH_SPACE = ' '.charCodeAt (0)
+const MODES    = ['OUT', 'INOUT', 'IN']
+
+class DbRoutineParameter {
+
+	constructor (o) {
+	
+		if (typeof o === 'string') {
+				
+			if (o.length === 0) throw Error (`DbRoutineParameter DSL source must be a non empty string`)
+
+			this.parse (o)
+					
+		}
+		else {
+		
+			for (const k of ['name', 'type']) {
+			
+				const v = o [k]
+				
+				if (!v || typeof v !== 'string') throw Error (`DbRoutineParameter ${k} must be a non empty string`)
+				
+			}
+		
+			for (const k in o) this [k] = o [k]
+						
+			if (!this.mode) this.mode = 'IN'
+			
+		}
+		
+	}
+
+	parse (src) {
+	
+		const bkp = src
+	
+		for (const mode of MODES) {
+		
+			const {length} = mode; if (src.charCodeAt (length) !== CH_SPACE) continue
+			
+			if (src.slice (0, length) !== mode) continue
+			
+			this.mode = mode
+			
+			src = src.slice (length).trim ()
+			
+			break
+		
+		}
+		
+		if (!('mode' in this)) this.mode = 'IN'
+		
+		{
+
+			const eq = src.indexOf ('='); if (eq !== -1) {
+
+				this.default = src.slice (eq + 1).trim ()
+
+				src = src.slice (0, eq).trim ()
+
+			}
+		
+		}
+
+		{
+
+			const sp = src.indexOf (' '); if (sp === -1) throw Error (`Invalid parameter definition: "${bkp}"`)
+
+			this.name = src.slice (0, sp).trim ()
+			
+			this.type = src.slice (sp).trim ()
+		
+		}
+
+	}
+
+	setLang (lang) {
+
+		this.qName = lang.quoteName (this.name)
+		
+	}
+
+}
+
+module.exports = DbRoutineParameter

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doix-db",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Shared database related code for doix",
   "main": "index.js",
   "files": [
@@ -43,7 +43,7 @@
     "doix": "^1.0.0"
   },
   "devDependencies": {
-    "jest": "^29.3.1"
+    "jest": "^29.6.1"
   },
   "dependencies": {
     "string-escape-map": "^1.0.0"