Progress on tabletop UI design

app/imports/api/engine/loadCreatures.js

@@ -10,15 +10,17 @@ export const loadedCreatures = new Map(); // creatureId => {creature, properties
 export function loadCreature(creatureId, subscription) {
   if (!creatureId) throw 'creatureId is required';
   let creature = loadedCreatures.get(creatureId);
+  if (!creature || !creature.subs.has(subscription)) {
+    subscription.onStop(() => {
+      unloadCreature(creatureId, subscription);
+    });
+  }
   if (loadedCreatures.has(creatureId)) {
     creature.subs.add(subscription);
   } else {
     creature = new LoadedCreature(subscription, creatureId);
     loadedCreatures.set(creatureId, creature);
   }
-  subscription.onStop(() => {
-    unloadCreature(creatureId, subscription);
-  });
 }
 
 function unloadCreature(creatureId, subscription) {
@@ -43,7 +45,7 @@ export function getSingleProperty(creatureId, propertyId) {
   const prop = CreatureProperties.findOne({
     _id: propertyId,
     'ancestors.id': creatureId,
-    'removed': {$ne: true},
+    'removed': { $ne: true },
   }, {
     sort: { order: 1 },
   });
@@ -61,7 +63,7 @@ export function getProperties(creatureId) {
   // console.time(`Cache miss on creature properties: ${creatureId}`)
   const props = CreatureProperties.find({
     'ancestors.id': creatureId,
-    'removed': {$ne: true},
+    'removed': { $ne: true },
   }, {
     sort: { order: 1 },
   }).fetch();
@@ -73,7 +75,7 @@ export function getPropertiesOfType(creatureId, propType) {
   if (loadedCreatures.has(creatureId)) {
     const creature = loadedCreatures.get(creatureId);
     const props = []
-    for (const prop of creature.properties.values()){
+    for (const prop of creature.properties.values()) {
       if (prop.type === propType) {
         props.push(prop);
       }
@@ -97,7 +99,7 @@ export function getCreature(creatureId) {
   if (loadedCreatures.has(creatureId)) {
     const loadedCreature = loadedCreatures.get(creatureId);
     const creature = loadedCreature.creature;
-    if (creature) {  
+    if (creature) {
       const cloneCreature = EJSON.clone(creature);
       return cloneCreature;
     }
@@ -118,7 +120,7 @@ export function getVariables(creatureId) {
     }
   }
   // console.time(`Cache miss on variables: ${creatureId}`);
-  const variables = CreatureVariables.findOne({_creatureId: creatureId});
+  const variables = CreatureVariables.findOne({ _creatureId: creatureId });
   // console.timeEnd(`Cache miss on variables: ${creatureId}`);
   return variables;
 }
@@ -148,7 +150,7 @@ export function getProperyAncestors(creatureId, propertyId) {
     // Fetch from database
     return CreatureProperties.find({
       _id: { $in: ancestorIds },
-      removed: {$ne: true},
+      removed: { $ne: true },
     }, {
       sort: { order: 1 },
     }).fetch();
@@ -164,7 +166,7 @@ export function getPropertyDecendants(creatureId, propertyId) {
   if (loadedCreatures.has(creatureId)) {
     const creature = loadedCreatures.get(creatureId);
     const props = [];
-    for(const prop of creature.properties.values()){
+    for (const prop of creature.properties.values()) {
       if (prop.ancestors[expectedAncestorPostition]?.id === propertyId) {
         props.push(prop);
       }
@@ -216,7 +218,7 @@ class LoadedCreature {
           compute();
         },
       });
-      
+
       // Observe the creature itself
       self.creatureObserver = Creatures.find({
         _id: creatureId,
@@ -239,7 +241,7 @@ class LoadedCreature {
       self.variablesObserver = CreatureVariables.find({
         _creatureId: creatureId,
       }, {
-        fields: { _creatureId: 0},
+        fields: { _creatureId: 0 },
       }).observeChanges({
         added(id, fields) {
           fields._id = id;