@reldens/skills 0.5.0-beta.4 → 0.10.0-beta.20

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.
Files changed (36) hide show
  1. package/index.js +0 -1
  2. package/lib/class-path.js +7 -2
  3. package/lib/client/receiver.js +2 -2
  4. package/lib/level.js +8 -4
  5. package/lib/levels-set.js +7 -2
  6. package/lib/server/data-server-validator.js +30 -0
  7. package/lib/server/sender.js +1 -1
  8. package/lib/server/storage/models/{class-path-level-labels.js → objection-js/class-path-level-labels-model.js} +7 -7
  9. package/lib/server/storage/models/{class-path-level-skills.js → objection-js/class-path-level-skills-model.js} +9 -9
  10. package/lib/server/storage/models/{class-path.js → objection-js/class-path-model.js} +11 -11
  11. package/lib/server/storage/models/{level.js → objection-js/level-model.js} +7 -7
  12. package/lib/server/storage/models/{level-modifiers.js → objection-js/level-modifiers-model.js} +5 -5
  13. package/lib/server/storage/models/{levels-set.js → objection-js/levels-set-model.js} +7 -7
  14. package/lib/server/storage/models/objection-js/owners-class-path-model.js +35 -0
  15. package/lib/server/storage/models/{registered-entities.js → objection-js/registered-entities-objection-js.js} +14 -14
  16. package/lib/server/storage/models/{skill-attack.js → objection-js/skill-attack.js} +5 -5
  17. package/lib/server/storage/models/{skill-group-relation.js → objection-js/skill-group-relation.js} +7 -7
  18. package/lib/server/storage/models/{skill.js → objection-js/skill-model.js} +15 -15
  19. package/lib/server/storage/models/{skill-owner-conditions.js → objection-js/skill-owner-conditions-model.js} +5 -5
  20. package/lib/server/storage/models/{skill-owner-effects.js → objection-js/skill-owner-effects-model.js} +5 -5
  21. package/lib/server/storage/models/{skill-physical-data.js → objection-js/skill-physical-data-model.js} +5 -5
  22. package/lib/server/storage/models/{skill-target-effects.js → objection-js/skill-target-effects-model.js} +5 -5
  23. package/lib/server/storage/models/{skills-groups.js → objection-js/skills-groups-model.js} +4 -4
  24. package/lib/server/storage/models-manager.js +26 -35
  25. package/lib/server/storage-observer.js +13 -6
  26. package/lib/server.js +10 -7
  27. package/lib/skill.js +47 -37
  28. package/lib/types/attack.js +4 -6
  29. package/lib/types/effect.js +2 -2
  30. package/lib/types/physical-attack.js +8 -27
  31. package/lib/types/physical-effect.js +8 -27
  32. package/lib/types/physical-properties-validator.js +30 -0
  33. package/lib/types/physical-skill-runner.js +31 -0
  34. package/package.json +4 -4
  35. package/lib/server/storage/models/index.js +0 -34
  36. package/lib/server/storage/models/owners-class-path.js +0 -49
package/index.js CHANGED
@@ -5,7 +5,6 @@
5
5
  */
6
6
 
7
7
  module.exports = {
8
- SkillsServer: require('./lib/server'),
9
8
  SkillsEvents: require('./lib/skills-events'),
10
9
  Receiver: require('./lib/client/receiver'),
11
10
  ClassPath: require('./lib/class-path'),
package/lib/class-path.js CHANGED
@@ -1,7 +1,12 @@
1
+ /**
2
+ *
3
+ * Reldens - Skills - Class Path
4
+ *
5
+ */
1
6
 
2
- const { ErrorManager, sc } = require('@reldens/utils');
3
- const SkillsEvents = require('./skills-events');
4
7
  const LevelsSet = require('./levels-set');
8
+ const SkillsEvents = require('./skills-events');
9
+ const { ErrorManager, sc } = require('@reldens/utils');
5
10
 
6
11
  class ClassPath extends LevelsSet
7
12
  {
@@ -18,8 +18,8 @@ class Receiver
18
18
  if(typeof props.owner.getPosition !== 'function'){
19
19
  ErrorManager.error('Undefined owner position method.');
20
20
  }
21
- this.actions = sc.hasOwn(props, 'actions') ? props.actions : {};
22
- if(!sc.hasOwn(props, 'avoidDefaults') || !props.avoidDefaults){
21
+ this.actions = sc.getDef(props, 'actions', {});
22
+ if(!sc.hasOwn(props, 'avoidDefaults') || !props['avoidDefaults']){
23
23
  this.setDefaultMethods();
24
24
  }
25
25
  }
package/lib/level.js CHANGED
@@ -1,3 +1,8 @@
1
+ /**
2
+ *
3
+ * Reldens - Skills - Level
4
+ *
5
+ */
1
6
 
2
7
  const { ErrorManager, Logger, sc } = require('@reldens/utils');
3
8
 
@@ -10,15 +15,14 @@ class Level
10
15
  if(!sc.hasOwn(props, 'key') || isNaN(props.key)){
11
16
  ErrorManager.error('Invalid Level key.');
12
17
  }
13
- if(!sc.hasOwn(props, 'modifiers') || !props.modifiers.length){
18
+ if(!sc.hasOwn(props, 'modifiers') || 0 >= props.modifiers.length){
14
19
  Logger.error('Modifiers were not specified.', 'Level ID:', props.id, ' - Key:', props.key);
15
20
  }
16
21
  this.key = parseInt(props.key);
17
22
  this.modifiers = props.modifiers;
18
23
  // label could be used for messages like "you have reached level X!":
19
- this.label = sc.hasOwn(props, 'label') ? props.label : props.key;
20
- this.requiredExperience = sc.hasOwn(props, 'requiredExperience') ?
21
- props.requiredExperience : sc.hasOwn(props, 'required_experience') ? props['required_experience'] : 0;
24
+ this.label = sc.getDef(props, 'label', props.key);
25
+ this.requiredExperience = sc.getDef(props, 'requiredExperience', sc.getDef(props, 'required_experience', 0));
22
26
  }
23
27
 
24
28
  }
package/lib/levels-set.js CHANGED
@@ -1,14 +1,19 @@
1
+ /**
2
+ *
3
+ * Reldens - Skills - LevelsSet
4
+ *
5
+ */
1
6
 
2
- const { EventsManagerSingleton, ErrorManager, Logger, sc } = require('@reldens/utils');
3
7
  const SkillsEvents = require('./skills-events');
4
8
  const Level = require('./level');
9
+ const { EventsManagerSingleton, ErrorManager, Logger, sc } = require('@reldens/utils');
5
10
 
6
11
  class LevelsSet
7
12
  {
8
13
 
9
14
  constructor(props)
10
15
  {
11
- this.events = sc.hasOwn(props, 'events') ? props.events : EventsManagerSingleton;
16
+ this.events = sc.getDef(props, 'events', EventsManagerSingleton);
12
17
  }
13
18
 
14
19
  setOwner(props)
@@ -0,0 +1,30 @@
1
+ /**
2
+ *
3
+ * Reldens - Skills - DataServerValidator
4
+ *
5
+ */
6
+
7
+ const { ErrorManager, sc } = require('@reldens/utils');
8
+
9
+ class DataServerValidator
10
+ {
11
+
12
+ static getValidDataServer(props)
13
+ {
14
+ // @TODO - BETA - When moving to ES or TS dataServer will be typed and an interface.
15
+ let dataServer = sc.getDef(props, 'dataServer', false);
16
+ if(false === dataServer){
17
+ ErrorManager.error('Data Server instance not found.', props);
18
+ }
19
+ if('function' !== typeof dataServer.connect || 'function' !== typeof dataServer.generateEntities){
20
+ ErrorManager.error(
21
+ 'Data Server property found but the instance required methods are not available.',
22
+ dataServer
23
+ );
24
+ }
25
+ return dataServer;
26
+ }
27
+
28
+ }
29
+
30
+ module.exports.DataServerValidator = DataServerValidator;
@@ -4,9 +4,9 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ErrorManager } = require('@reldens/utils');
8
7
  const SkillsConst = require('../constants');
9
8
  const SkillsEvents = require('../skills-events');
9
+ const { ErrorManager } = require('@reldens/utils');
10
10
 
11
11
  class Sender
12
12
  {
@@ -4,10 +4,10 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ModelClassDeprecated } = require('@reldens/storage');
8
- const SkillsConst = require('../../../constants');
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
9
 
10
- class ClassPathLevelLabelsModel extends ModelClassDeprecated
10
+ class ClassPathLevelLabelsModel extends ObjectionJsRawModel
11
11
  {
12
12
 
13
13
  static get tableName()
@@ -17,11 +17,11 @@ class ClassPathLevelLabelsModel extends ModelClassDeprecated
17
17
 
18
18
  static get relationMappings()
19
19
  {
20
- const { ClassPathModel } = require('./class-path');
21
- const { LevelModel } = require('./level');
20
+ const { ClassPathModel } = require('./class-path-model');
21
+ const { LevelModel } = require('./level-model');
22
22
  return {
23
23
  class_path_id: {
24
- relation: ModelClassDeprecated.BelongsToOneRelation,
24
+ relation: this.BelongsToOneRelation,
25
25
  modelClass: ClassPathModel,
26
26
  join: {
27
27
  from: this.tableName+'.class_path_id',
@@ -29,7 +29,7 @@ class ClassPathLevelLabelsModel extends ModelClassDeprecated
29
29
  }
30
30
  },
31
31
  label_level: {
32
- relation: ModelClassDeprecated.BelongsToOneRelation,
32
+ relation: this.BelongsToOneRelation,
33
33
  modelClass: LevelModel,
34
34
  join: {
35
35
  from: this.tableName+'.level_id',
@@ -4,10 +4,10 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ModelClassDeprecated } = require('@reldens/storage');
8
- const SkillsConst = require('../../../constants');
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
9
 
10
- class ClassPathLevelSkillsModel extends ModelClassDeprecated
10
+ class ClassPathLevelSkillsModel extends ObjectionJsRawModel
11
11
  {
12
12
 
13
13
  static get tableName()
@@ -17,12 +17,12 @@ class ClassPathLevelSkillsModel extends ModelClassDeprecated
17
17
 
18
18
  static get relationMappings()
19
19
  {
20
- const { ClassPathModel } = require('./class-path');
21
- const { LevelModel } = require('./level');
22
- const { SkillModel } = require('./skill');
20
+ const { ClassPathModel } = require('./class-path-model');
21
+ const { LevelModel } = require('./level-model');
22
+ const { SkillModel } = require('./skill-model');
23
23
  return {
24
24
  class_path_id: {
25
- relation: ModelClassDeprecated.BelongsToOneRelation,
25
+ relation: this.BelongsToOneRelation,
26
26
  modelClass: ClassPathModel,
27
27
  join: {
28
28
  from: this.tableName+'.class_path_id',
@@ -30,7 +30,7 @@ class ClassPathLevelSkillsModel extends ModelClassDeprecated
30
30
  }
31
31
  },
32
32
  class_path_level: {
33
- relation: ModelClassDeprecated.BelongsToOneRelation,
33
+ relation: this.BelongsToOneRelation,
34
34
  modelClass: LevelModel,
35
35
  join: {
36
36
  from: this.tableName+'.level_id',
@@ -38,7 +38,7 @@ class ClassPathLevelSkillsModel extends ModelClassDeprecated
38
38
  }
39
39
  },
40
40
  class_path_level_skill: {
41
- relation: ModelClassDeprecated.BelongsToOneRelation,
41
+ relation: this.BelongsToOneRelation,
42
42
  modelClass: SkillModel,
43
43
  join: {
44
44
  from: this.tableName+'.skill_id',
@@ -4,10 +4,10 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ModelClassDeprecated } = require('@reldens/storage');
8
- const SkillsConst = require('../../../constants');
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
9
 
10
- class ClassPathModel extends ModelClassDeprecated
10
+ class ClassPathModel extends ObjectionJsRawModel
11
11
  {
12
12
 
13
13
  static get tableName()
@@ -17,13 +17,13 @@ class ClassPathModel extends ModelClassDeprecated
17
17
 
18
18
  static get relationMappings()
19
19
  {
20
- const { LevelsSetModel } = require('./levels-set');
21
- const { ClassPathLevelLabelsModel } = require('./class-path-level-labels');
22
- const { ClassPathLevelSkillsModel } = require('./class-path-level-skills');
23
- const { OwnersClassPathModel } = require('./owners-class-path');
20
+ const { LevelsSetModel } = require('./levels-set-model');
21
+ const { ClassPathLevelLabelsModel } = require('./class-path-level-labels-model');
22
+ const { ClassPathLevelSkillsModel } = require('./class-path-level-skills-model');
23
+ const { OwnersClassPathModel } = require('./owners-class-path-model');
24
24
  return {
25
25
  skills_levels_set: {
26
- relation: ModelClassDeprecated.HasOneRelation,
26
+ relation: this.HasOneRelation,
27
27
  modelClass: LevelsSetModel,
28
28
  join: {
29
29
  from: this.tableName+'.levels_set_id',
@@ -31,7 +31,7 @@ class ClassPathModel extends ModelClassDeprecated
31
31
  }
32
32
  },
33
33
  skills_class_path_level_labels: {
34
- relation: ModelClassDeprecated.HasManyRelation,
34
+ relation: this.HasManyRelation,
35
35
  modelClass: ClassPathLevelLabelsModel,
36
36
  join: {
37
37
  from: this.tableName+'.id',
@@ -39,7 +39,7 @@ class ClassPathModel extends ModelClassDeprecated
39
39
  }
40
40
  },
41
41
  skills_class_path_level_skills: {
42
- relation: ModelClassDeprecated.HasManyRelation,
42
+ relation: this.HasManyRelation,
43
43
  modelClass: ClassPathLevelSkillsModel,
44
44
  join: {
45
45
  from: this.tableName+'.id',
@@ -47,7 +47,7 @@ class ClassPathModel extends ModelClassDeprecated
47
47
  }
48
48
  },
49
49
  class_path_for_owner: {
50
- relation: ModelClassDeprecated.BelongsToOneRelation,
50
+ relation: this.BelongsToOneRelation,
51
51
  modelClass: OwnersClassPathModel,
52
52
  join: {
53
53
  from: this.tableName+'.id',
@@ -4,10 +4,10 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ModelClassDeprecated } = require('@reldens/storage');
8
- const SkillsConst = require('../../../constants');
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
9
 
10
- class LevelModel extends ModelClassDeprecated
10
+ class LevelModel extends ObjectionJsRawModel
11
11
  {
12
12
 
13
13
  static get tableName()
@@ -17,11 +17,11 @@ class LevelModel extends ModelClassDeprecated
17
17
 
18
18
  static get relationMappings()
19
19
  {
20
- const { LevelsSetModel } = require('./levels-set');
21
- const { LevelModifiersModels } = require('./level-modifiers');
20
+ const { LevelsSetModel } = require('./levels-set-model');
21
+ const { LevelModifiersModels } = require('./level-modifiers-model');
22
22
  return {
23
23
  level_set_id: {
24
- relation: ModelClassDeprecated.BelongsToOneRelation,
24
+ relation: this.BelongsToOneRelation,
25
25
  modelClass: LevelsSetModel,
26
26
  join: {
27
27
  from: this.tableName+'.level_set_id',
@@ -29,7 +29,7 @@ class LevelModel extends ModelClassDeprecated
29
29
  }
30
30
  },
31
31
  level_modifiers: {
32
- relation: ModelClassDeprecated.HasManyRelation,
32
+ relation: this.HasManyRelation,
33
33
  modelClass: LevelModifiersModels,
34
34
  join: {
35
35
  from: this.tableName+'.id',
@@ -4,10 +4,10 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ModelClassDeprecated } = require('@reldens/storage');
8
- const SkillsConst = require('../../../constants');
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
9
 
10
- class LevelModifiersModels extends ModelClassDeprecated
10
+ class LevelModifiersModels extends ObjectionJsRawModel
11
11
  {
12
12
 
13
13
  static get tableName()
@@ -17,10 +17,10 @@ class LevelModifiersModels extends ModelClassDeprecated
17
17
 
18
18
  static get relationMappings()
19
19
  {
20
- const { LevelModel } = require('./level');
20
+ const { LevelModel } = require('./level-model');
21
21
  return {
22
22
  level_owner: {
23
- relation: ModelClassDeprecated.BelongsToOneRelation,
23
+ relation: this.BelongsToOneRelation,
24
24
  modelClass: LevelModel,
25
25
  join: {
26
26
  from: this.tableName+'.level_id',
@@ -4,10 +4,10 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ModelClassDeprecated } = require('@reldens/storage');
8
- const SkillsConst = require('../../../constants');
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
9
 
10
- class LevelsSetModel extends ModelClassDeprecated
10
+ class LevelsSetModel extends ObjectionJsRawModel
11
11
  {
12
12
 
13
13
  static get tableName()
@@ -17,11 +17,11 @@ class LevelsSetModel extends ModelClassDeprecated
17
17
 
18
18
  static get relationMappings()
19
19
  {
20
- const { ClassPathModel } = require('./class-path');
21
- const { LevelModel } = require('./level');
20
+ const { ClassPathModel } = require('./class-path-model');
21
+ const { LevelModel } = require('./level-model');
22
22
  return {
23
23
  class_path_id: {
24
- relation: ModelClassDeprecated.BelongsToOneRelation,
24
+ relation: this.BelongsToOneRelation,
25
25
  modelClass: ClassPathModel,
26
26
  join: {
27
27
  from: this.tableName+'.id',
@@ -29,7 +29,7 @@ class LevelsSetModel extends ModelClassDeprecated
29
29
  }
30
30
  },
31
31
  skills_levels_set_levels: {
32
- relation: ModelClassDeprecated.HasManyRelation,
32
+ relation: this.HasManyRelation,
33
33
  modelClass: LevelModel,
34
34
  join: {
35
35
  from: this.tableName+'.id',
@@ -0,0 +1,35 @@
1
+ /**
2
+ *
3
+ * Reldens - Skills - OwnersClassPathModel
4
+ *
5
+ */
6
+
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
+
10
+ class OwnersClassPathModel extends ObjectionJsRawModel
11
+ {
12
+
13
+ static get tableName()
14
+ {
15
+ return SkillsConst.MODELS_PREFIX+'owners_class_path';
16
+ }
17
+
18
+ static get relationMappings()
19
+ {
20
+ const { ClassPathModel } = require('./class-path-model');
21
+ return {
22
+ owner_full_class_path: {
23
+ relation: this.HasOneRelation,
24
+ modelClass: ClassPathModel,
25
+ join: {
26
+ from: this.tableName+'.class_path_id',
27
+ to: ClassPathModel.tableName+'.id'
28
+ }
29
+ }
30
+ };
31
+ }
32
+
33
+ }
34
+
35
+ module.exports.OwnersClassPathModel = OwnersClassPathModel;
@@ -1,24 +1,24 @@
1
1
  /**
2
2
  *
3
- * Reldens - Registered Entities
3
+ * Reldens - Skills - Registered Entities
4
4
  *
5
5
  */
6
6
 
7
- const { ClassPathModel } = require('./class-path');
8
- const { ClassPathLevelLabelsModel } = require('./class-path-level-labels');
9
- const { ClassPathLevelSkillsModel } = require('./class-path-level-skills');
10
- const { LevelModel } = require('./level');
11
- const { LevelModifiersModels } = require('./level-modifiers');
12
- const { LevelsSetModel } = require('./levels-set');
13
- const { OwnersClassPathModel } = require('./owners-class-path');
14
- const { SkillModel } = require('./skill');
7
+ const { ClassPathModel } = require('./class-path-model');
8
+ const { ClassPathLevelLabelsModel } = require('./class-path-level-labels-model');
9
+ const { ClassPathLevelSkillsModel } = require('./class-path-level-skills-model');
10
+ const { LevelModel } = require('./level-model');
11
+ const { LevelModifiersModels } = require('./level-modifiers-model');
12
+ const { LevelsSetModel } = require('./levels-set-model');
13
+ const { OwnersClassPathModel } = require('./owners-class-path-model');
14
+ const { SkillModel } = require('./skill-model');
15
15
  const { SkillAttackModel } = require('./skill-attack');
16
- const { SkillTargetEffectsModel } = require('./skill-target-effects');
17
- const { SkillPhysicalDataModel } = require('./skill-physical-data');
16
+ const { SkillTargetEffectsModel } = require('./skill-target-effects-model');
17
+ const { SkillPhysicalDataModel } = require('./skill-physical-data-model');
18
18
  const { SkillGroupRelationModel } = require('./skill-group-relation');
19
- const { SkillOwnerConditionsModel } = require('./skill-owner-conditions');
20
- const { SkillOwnerEffectsModel } = require('./skill-owner-effects');
21
- const { SkillsGroupsModel } = require('./skills-groups');
19
+ const { SkillOwnerConditionsModel } = require('./skill-owner-conditions-model');
20
+ const { SkillOwnerEffectsModel } = require('./skill-owner-effects-model');
21
+ const { SkillsGroupsModel } = require('./skills-groups-model');
22
22
 
23
23
  module.exports.rawRegisteredEntities = {
24
24
  classPath: ClassPathModel,
@@ -4,10 +4,10 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ModelClassDeprecated } = require('@reldens/storage');
8
- const SkillsConst = require('../../../constants');
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
9
 
10
- class SkillAttackModel extends ModelClassDeprecated
10
+ class SkillAttackModel extends ObjectionJsRawModel
11
11
  {
12
12
 
13
13
  static get tableName()
@@ -17,10 +17,10 @@ class SkillAttackModel extends ModelClassDeprecated
17
17
 
18
18
  static get relationMappings()
19
19
  {
20
- const { SkillModel } = require('./skill');
20
+ const { SkillModel } = require('./skill-model');
21
21
  return {
22
22
  parent_skill: {
23
- relation: ModelClassDeprecated.HasOneRelation,
23
+ relation: this.HasOneRelation,
24
24
  modelClass: SkillModel,
25
25
  join: {
26
26
  from: this.tableName+'.skill_id',
@@ -4,10 +4,10 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ModelClassDeprecated } = require('@reldens/storage');
8
- const SkillsConst = require('../../../constants');
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
9
 
10
- class SkillGroupRelationModel extends ModelClassDeprecated
10
+ class SkillGroupRelationModel extends ObjectionJsRawModel
11
11
  {
12
12
 
13
13
  static get tableName()
@@ -17,11 +17,11 @@ class SkillGroupRelationModel extends ModelClassDeprecated
17
17
 
18
18
  static get relationMappings()
19
19
  {
20
- const { SkillModel } = require('./skill');
21
- const { SkillsGroupsModel } = require('./skills-groups');
20
+ const { SkillModel } = require('./skill-model');
21
+ const { SkillsGroupsModel } = require('./skills-groups-model');
22
22
  return {
23
23
  skill_id: {
24
- relation: ModelClassDeprecated.BelongsToOneRelation,
24
+ relation: this.BelongsToOneRelation,
25
25
  modelClass: SkillModel,
26
26
  join: {
27
27
  from: this.tableName+'.skill_id',
@@ -29,7 +29,7 @@ class SkillGroupRelationModel extends ModelClassDeprecated
29
29
  }
30
30
  },
31
31
  group_id: {
32
- relation: ModelClassDeprecated.BelongsToOneRelation,
32
+ relation: this.BelongsToOneRelation,
33
33
  modelClass: SkillsGroupsModel,
34
34
  join: {
35
35
  from: this.tableName+'.group_id',
@@ -4,10 +4,10 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ModelClassDeprecated } = require('@reldens/storage');
8
- const SkillsConst = require('../../../constants');
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
9
 
10
- class SkillModel extends ModelClassDeprecated
10
+ class SkillModel extends ObjectionJsRawModel
11
11
  {
12
12
 
13
13
  static get tableName()
@@ -17,16 +17,16 @@ class SkillModel extends ModelClassDeprecated
17
17
 
18
18
  static get relationMappings()
19
19
  {
20
- const { SkillOwnerConditionsModel } = require('./skill-owner-conditions');
21
- const { SkillOwnerEffectsModel } = require('./skill-owner-effects');
22
- const { SkillTargetEffectsModel } = require('./skill-target-effects');
20
+ const { SkillOwnerConditionsModel } = require('./skill-owner-conditions-model');
21
+ const { SkillOwnerEffectsModel } = require('./skill-owner-effects-model');
22
+ const { SkillTargetEffectsModel } = require('./skill-target-effects-model');
23
23
  const { SkillGroupRelationModel } = require('./skill-group-relation');
24
- const { ClassPathLevelSkillsModel } = require('./class-path-level-skills');
24
+ const { ClassPathLevelSkillsModel } = require('./class-path-level-skills-model');
25
25
  const { SkillAttackModel } = require('./skill-attack');
26
- const { SkillPhysicalDataModel } = require('./skill-physical-data');
26
+ const { SkillPhysicalDataModel } = require('./skill-physical-data-model');
27
27
  return {
28
28
  skill_owner_conditions: {
29
- relation: ModelClassDeprecated.HasManyRelation,
29
+ relation: this.HasManyRelation,
30
30
  modelClass: SkillOwnerConditionsModel,
31
31
  join: {
32
32
  from: this.tableName+'.id',
@@ -34,7 +34,7 @@ class SkillModel extends ModelClassDeprecated
34
34
  }
35
35
  },
36
36
  skill_owner_effects: {
37
- relation: ModelClassDeprecated.HasManyRelation,
37
+ relation: this.HasManyRelation,
38
38
  modelClass: SkillOwnerEffectsModel,
39
39
  join: {
40
40
  from: this.tableName+'.id',
@@ -42,7 +42,7 @@ class SkillModel extends ModelClassDeprecated
42
42
  }
43
43
  },
44
44
  skill_target_effects: {
45
- relation: ModelClassDeprecated.HasManyRelation,
45
+ relation: this.HasManyRelation,
46
46
  modelClass: SkillTargetEffectsModel,
47
47
  join: {
48
48
  from: this.tableName+'.id',
@@ -50,7 +50,7 @@ class SkillModel extends ModelClassDeprecated
50
50
  }
51
51
  },
52
52
  skill_group_relations: {
53
- relation: ModelClassDeprecated.HasManyRelation,
53
+ relation: this.HasManyRelation,
54
54
  modelClass: SkillGroupRelationModel,
55
55
  join: {
56
56
  from: this.tableName+'.id',
@@ -58,7 +58,7 @@ class SkillModel extends ModelClassDeprecated
58
58
  }
59
59
  },
60
60
  class_path_level: {
61
- relation: ModelClassDeprecated.HasManyRelation,
61
+ relation: this.HasManyRelation,
62
62
  modelClass: ClassPathLevelSkillsModel,
63
63
  join: {
64
64
  from: this.tableName+'.id',
@@ -66,7 +66,7 @@ class SkillModel extends ModelClassDeprecated
66
66
  }
67
67
  },
68
68
  skill_attack: {
69
- relation: ModelClassDeprecated.BelongsToOneRelation,
69
+ relation: this.BelongsToOneRelation,
70
70
  modelClass: SkillAttackModel,
71
71
  join: {
72
72
  from: this.tableName+'.id',
@@ -74,7 +74,7 @@ class SkillModel extends ModelClassDeprecated
74
74
  }
75
75
  },
76
76
  skill_physical_data: {
77
- relation: ModelClassDeprecated.BelongsToOneRelation,
77
+ relation: this.BelongsToOneRelation,
78
78
  modelClass: SkillPhysicalDataModel,
79
79
  join: {
80
80
  from: this.tableName+'.id',
@@ -4,10 +4,10 @@
4
4
  *
5
5
  */
6
6
 
7
- const { ModelClassDeprecated } = require('@reldens/storage');
8
- const SkillsConst = require('../../../constants');
7
+ const { ObjectionJsRawModel } = require('@reldens/storage');
8
+ const SkillsConst = require('../../../../constants');
9
9
 
10
- class SkillOwnerConditionsModel extends ModelClassDeprecated
10
+ class SkillOwnerConditionsModel extends ObjectionJsRawModel
11
11
  {
12
12
 
13
13
  static get tableName()
@@ -17,10 +17,10 @@ class SkillOwnerConditionsModel extends ModelClassDeprecated
17
17
 
18
18
  static get relationMappings()
19
19
  {
20
- const { SkillModel } = require('./skill');
20
+ const { SkillModel } = require('./skill-model');
21
21
  return {
22
22
  level_id: {
23
- relation: ModelClassDeprecated.BelongsToOneRelation,
23
+ relation: this.BelongsToOneRelation,
24
24
  modelClass: SkillModel,
25
25
  join: {
26
26
  from: this.tableName+'.skill_id',