doix-db 0.0.4 → 0.0.7

package/index.js

@@ -10,4 +10,5 @@ module.exports = {
 	DbObjectMap: require ('./lib/DbObjectMap.js'),
 	DbModel: require ('./lib/DbModel.js'), 
 	DbPool: require ('./lib/DbPool.js'), 
+	DbLang: require ('./lib/DbLang.js'),
 }

package/lib/DbLang.js

@@ -0,0 +1,17 @@
+const stringEscape = require ('string-escape-map')
+
+const QQ_ESC = new stringEscape ([
+  [ '"', '""'],
+])
+
+class DbLang {
+
+	quoteName (s) {
+
+		return '"' + QQ_ESC.escape (s) + '"'
+
+	}
+
+}
+
+module.exports = DbLang

package/lib/DbModel.js

@@ -1,9 +1,17 @@
-const DbPool      = require ('./DbPool.js')
-const DbObjectMap = require ('./DbObjectMap.js')
+const EventEmitter         = require ('events')
 
-class DbModel {
+const DbPool               = require ('./DbPool.js')
+const DbObjectMap          = require ('./DbObjectMap.js')
+const DbObjectTypeDetector = require ('./DbObjectTypeDetector')
+
+const EV_MODULES_LOADED  = 'modules-loaded'
+const EV_OBJECTS_CREATED = 'objects-created'
+
+class DbModel extends EventEmitter {
 
 	constructor (o) {
+	
+		super ()
 
 		let mapOptions = {}
 
@@ -12,31 +20,64 @@ class DbModel {
 			case 'dir':
 			case 'ext':
 			case 'merger':
-			case 'detector':
 				mapOptions [k] = v
 				break
 
+			case 'detector':
+				if (!(v instanceof DbObjectTypeDetector)) throw new Error ('Only DbObjectTypeDetector or its descendant can be used as detector')
+				this.detector = v
+				break
+
 			case 'db':
 				if (!(v instanceof DbPool)) throw new Error ('Only DbPool descendant can be used as db')
 				this.db = v
-				v.setModel (this)
+				v.model = this
 				break
 
 			default:
 				throw new Error ('Unknown DbModel option: ' + k)
 
 		}
+
+		if (!('detector' in this)) this.detector = new DbObjectTypeDetector ()
 	
 		this.map = new DbObjectMap (mapOptions)
-	
-	}
+		
+		this.on (EV_MODULES_LOADED, () => this.createObjects ())
 
+	}
+	
 	loadModules () {
 
 		this.map.load ()
+		
+		this.emit ('modules-loaded')
 
 	}
 	
+	createObjects () {
+	
+		const {detector} = this, map = new Map ()
+
+		for (const [name, pojo] of this.map.entries ()) {
+
+			const o = new (detector.getClass (pojo)) (pojo)
+
+			o.name = name
+
+			map.set (name, o)
+			
+		}
+		
+		this.map = map
+
+		this.emit ('objects-created')
+
+	}
+
 }
 
+DbModel.EV_MODULES_LOADED  = EV_MODULES_LOADED
+DbModel.EV_OBJECTS_CREATED = EV_OBJECTS_CREATED
+
 module.exports = DbModel

package/lib/DbObjectMap.js

@@ -1,6 +1,5 @@
 const {ModuleLoader} = require ('doix')
 const DbObjectMerger = require ('./DbObjectMerger')
-const DbObjectTypeDetector = require ('./DbObjectTypeDetector')
 
 class DbObjectMap extends Map {
 
@@ -22,11 +21,6 @@ class DbObjectMap extends Map {
 				this.merger = v
 				break
 
-			case 'detector':
-				if (!(v instanceof DbObjectTypeDetector)) throw new Error ('Only DbObjectTypeDetector or its descendant can be used as detector')
-				this.detector = v
-				break
-
 			default:
 				throw new Error ('Unknown DbObjectMap option: ' + k)
 
@@ -34,8 +28,6 @@ class DbObjectMap extends Map {
 	
 		this.loader = new ModuleLoader (loaderOptions)
 		
-		if (!('detector' in this)) this.detector = new DbObjectTypeDetector ()
-
 		if (!('merger' in this)) this.merger = new DbObjectMerger ()
 
 	}
@@ -46,16 +38,6 @@ class DbObjectMap extends Map {
 		
 		const {merger} = this
 
-		merger.on ('complete', (pojo, name) => {
-		
-			const o = new (this.detector.getClass (pojo)) (pojo)
-
-			o.name = name
-
-			super.set (name, o)
-
-		})
-
 		for (const [k, v] of this.entries ()) merger.emit ('complete', v, k)
 
 	}

package/lib/DbPool.js

@@ -7,22 +7,15 @@ class DbPool extends ResourcePool {
 
 		super ()
 		
-		this.globals = {}
-
+		this.shared.add ('model')
+		this.shared.add ('lang')
+		
 		this.logger = o.logger
 
 		this.eventLoggerClass = o.eventLoggerClass || DbEventLogger
 
 	}
 	
-	setModel (m) {
-	
-		this.model = m
-
-		this.globals.model = m
-	
-	}
-	
 }
 
 module.exports = DbPool

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doix-db",
-  "version": "0.0.4",
+  "version": "0.0.7",
   "description": "Shared database related code for doix",
   "main": "index.js",
   "files": [
@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/do-/node-doix-db#readme",
   "peerDependencies": {
-    "doix": "^0.0.35"
+    "doix": "^0.0.36"
   },
   "devDependencies": {
     "jest": "^29.3.1"