@live-change/framework 0.6.15 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,17 +4,17 @@ class ForeignModelDefinition {
4
4
 
5
5
  constructor(serviceName, modelName) {
6
6
  this.serviceName = serviceName
7
- this.modelName = modelName
7
+ this.name = modelName
8
8
  }
9
9
 
10
10
  getTypeName() {
11
- return this.serviceName+':'+this.modelName
11
+ return this.serviceName+':'+this.name
12
12
  }
13
13
 
14
14
  toJSON() {
15
15
  return {
16
16
  serviceName: this.serviceName,
17
- modelName: this.modelName
17
+ modelName: this.name
18
18
  }
19
19
  }
20
20
 
@@ -3,7 +3,8 @@ const utils = require("../utils.js")
3
3
 
4
4
  class ModelDefinition {
5
5
 
6
- constructor(definition) {
6
+ constructor(definition, serviceName) {
7
+ this.serviceName = serviceName
7
8
  this.properties = {}
8
9
  for(let key in definition) this[key] = definition[key]
9
10
  if(definition.properties) {
@@ -18,7 +19,7 @@ class ModelDefinition {
18
19
  }
19
20
 
20
21
  getTypeName() {
21
- return this.name
22
+ return this.serviceName + '_' + this.name
22
23
  }
23
24
 
24
25
  createAndAddProperty(name, definition) {
@@ -25,7 +25,7 @@ function createModelProxy(definition, model) {
25
25
  }
26
26
 
27
27
  function createForeignModelProxy(definition, model) {
28
- let fk = model.serviceName + "_" + model.modelName
28
+ let fk = model.serviceName + "_" + model.name
29
29
  return new Proxy(model, {
30
30
  get(target, prop, receiver) {
31
31
  const runtime = definition._runtime
@@ -91,7 +91,7 @@ class ServiceDefinition {
91
91
  }
92
92
 
93
93
  model(definition) {
94
- const model = new ModelDefinition(definition)
94
+ const model = new ModelDefinition(definition, this.name)
95
95
  this.models[model.name] = model
96
96
  return createModelProxy(this, model)
97
97
  }
@@ -3,7 +3,7 @@ const ReaderModel = require("./ReaderModel.js")
3
3
  class ForeignModel extends ReaderModel {
4
4
 
5
5
  constructor(definition, service) {
6
- super(definition.serviceName, definition.modelName, service)
6
+ super(definition.serviceName, definition.name, service)
7
7
  this.service = service
8
8
  }
9
9
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@live-change/framework",
3
- "version": "0.6.15",
3
+ "version": "0.7.0",
4
4
  "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -27,7 +27,7 @@
27
27
  "@live-change/db-store-level": "0.5.18",
28
28
  "@live-change/db-store-lmdb": "0.5.18",
29
29
  "@live-change/sockjs": "0.4.1",
30
- "@live-change/uid": "^0.6.15",
30
+ "@live-change/uid": "^0.7.0",
31
31
  "cookie": "^0.4.1",
32
32
  "express": "^4.18.1",
33
33
  "os-service": "^2.2.0",
@@ -35,5 +35,5 @@
35
35
  "tape": "^5.3.2",
36
36
  "websocket": "^1.0.34"
37
37
  },
38
- "gitHead": "9b5c0ac7db8788a5647685dde41577b38c994263"
38
+ "gitHead": "008e06c10d65b00478c103d625c621805837264b"
39
39
  }