@live-change/relations-plugin 0.9.20 → 0.9.22

package/boundToAny.js

@@ -1,6 +1,6 @@
 import {
   defineAnyProperties, defineAnyIndex,
-  processModelsAnyAnnotation, generateAnyId
+  processModelsAnyAnnotation, generateAnyId, defineAnyTypeIndexes
 } from './utilsAny.js'
 
 import { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } from './propertyEvents.js'
@@ -21,6 +21,7 @@ export default function(service, app) {
 
     defineAnyProperties(context.model, context.otherPropertyNames)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
+    defineAnyTypeIndexes(config, context, context.otherPropertyNames.length === 1)
 
     defineObjectView(config, context,
       config.singleAccess || config.readAccess || config.singleAccessControl || config.readAccessControl

package/changeTriggers.js

@@ -44,11 +44,11 @@ async function iterateChildren(context, propertyName, path, cb) {
         limit: bucketSize
       })
       //console.log("BUCKET", bucket)
-      if(bucket.length == 0) break
+      if(bucket.length === 0) break
       gt = bucket[bucket.length - 1].id
       const copyTriggerPromises = bucket.map(entity => cb({ ...entity, id: entity.to }))
       await Promise.all(copyTriggerPromises)
-    } while (bucket.length == bucketSize)
+    } while (bucket.length === bucketSize)
   }
 }
 
@@ -135,7 +135,7 @@ async function copyObject(context, objectType, object, parentType, parent, ident
   }
   for(let i = 0; i < others.length; i++) {
     const other = others[i]
-    if(other == parentType) {
+    if(other === parentType) {
       newIdentifiers[otherPropertyNames[i]] = parent
     }
   }

package/itemOfAny.js

@@ -1,7 +1,7 @@
 import {
   defineAnyProperties, defineAnyIndexes,
   processModelsAnyAnnotation, addAccessControlAnyParents, generateAnyId, defineDeleteByOwnerEvents,
-  defineParentDeleteTrigger
+  defineParentDeleteTrigger, defineAnyTypeIndexes
 } from './utilsAny.js'
 
 import {
@@ -26,6 +26,7 @@ export default function(service, app) {
 
     addAccessControlAnyParents(context)
     defineAnyIndexes(context.model, context.otherPropertyNames)
+    defineAnyTypeIndexes(config, context, false)
 
     if(config.sortBy) {
       for(const sortFields of config.sortBy) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.9.20",
+  "version": "0.9.22",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.20",
+    "@live-change/framework": "^0.9.22",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "6524c2dedbb137e95e9aa07eaf9503d68d7b9093"
+  "gitHead": "fd2681b5cefacd62d4a64b8276f0513b01f8a020"
 }

package/propertyOfAny.js

@@ -1,7 +1,7 @@
 import {
   defineAnyProperties, defineAnyIndexes,
   processModelsAnyAnnotation, generateAnyId, addAccessControlAnyParents,
-  defineDeleteByOwnerEvents, defineParentDeleteTrigger
+  defineDeleteByOwnerEvents, defineParentDeleteTrigger, defineAnyTypeIndexes,
 } from './utilsAny.js'
 
 import {
@@ -37,6 +37,7 @@ export default function(service, app) {
 
     addAccessControlAnyParents(context)
     defineAnyIndexes(context.model, context.otherPropertyNames, false)
+    defineAnyTypeIndexes(config, context, context.otherPropertyNames.length === 1)
 
     defineObjectView(config, context,
       config.singleAccess || config.readAccess || config.singleAccessControl || config.readAccessControl

package/relatedToAny.js

@@ -1,5 +1,5 @@
 import {
-  defineAnyProperties, defineAnyIndex, processModelsAnyAnnotation
+  defineAnyProperties, defineAnyIndex, processModelsAnyAnnotation, defineAnyTypeIndexes
 } from './utilsAny.js'
 
 import {
@@ -21,6 +21,7 @@ export default function(service, app) {
 
     context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
+    defineAnyTypeIndexes(config, context, false)
 
     if(config.sortBy) {
       for(const sortFields of config.sortBy) {

package/utilsAny.js

@@ -7,7 +7,7 @@ import { allCombinations } from "./combinations.js"
 import { fireChangeTriggers, registerParentDeleteTriggers } from "./changeTriggers.js"
 
 
-function extractTypeAndIdParts(otherPropertyNames, properties) {
+export function extractTypeAndIdParts(otherPropertyNames, properties) {
   const typeAndIdParts = []
   for (const propertyName of otherPropertyNames) {
     typeAndIdParts.push(properties[propertyName+'Type'])
@@ -16,7 +16,7 @@ function extractTypeAndIdParts(otherPropertyNames, properties) {
   return typeAndIdParts
 }
 
-function extractIdentifiersWithTypes(otherPropertyNames, properties) {
+export function extractIdentifiersWithTypes(otherPropertyNames, properties) {
   const identifiers = {}
   for (const propertyName of otherPropertyNames) {
     identifiers[propertyName] = properties[propertyName]
@@ -25,20 +25,21 @@ function extractIdentifiersWithTypes(otherPropertyNames, properties) {
   return identifiers
 }
 
-function generateAnyId(otherPropertyNames, properties) {
+export function generateAnyId(otherPropertyNames, properties) {
+/*
   console.log("GEN ID", otherPropertyNames, properties, '=>',
     otherPropertyNames
       .map(p => [p+'Type', p])
       .flat()
       .map(p => JSON.stringify(properties[p])).join(':'))
-
+*/
   return otherPropertyNames
       .map(p => [p+'Type', p])
       .flat()
       .map(p => JSON.stringify(properties[p])).join(':')
 }
 
-function defineAnyProperties(model, names) {
+export function defineAnyProperties(model, names) {
   const identifiers = {}
   for (let i = 0; i < names.length; i++) {
     identifiers[names[i]+'Type'] = new PropertyDefinition({
@@ -56,13 +57,14 @@ function defineAnyProperties(model, names) {
   return identifiers
 }
 
-function defineAnyIndex(model, what, props) {
+export function defineAnyIndex(model, what, props) {
   model.indexes['by' + what] = new IndexDefinition({
-    property: props.map(prop => [prop+'Type', prop]).flat()
+    property: props.map(prop => [prop+'Type', prop]).flat(),
+    hash: true
   })
 }
 
-function defineAnyIndexes(model, props, fullIndex = true) {
+export function defineAnyIndexes(model, props, fullIndex = true) {
   const propCombinations = allCombinations(props)
   for(const propCombination of propCombinations) {
     if(propCombination.length === props.length && !fullIndex) continue
@@ -71,7 +73,7 @@ function defineAnyIndexes(model, props, fullIndex = true) {
   }
 }
 
-function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
+export function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
   if (!service) throw new Error("no service")
   if (!app) throw new Error("no app")
 
@@ -148,7 +150,7 @@ function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
   }
 }
 
-function addAccessControlAnyParents(context) {
+export function addAccessControlAnyParents(context) {
   const { modelRuntime } = context
   context.model.accessControlParents = async (what) => {
     const id = what.object
@@ -167,7 +169,7 @@ function addAccessControlAnyParents(context) {
   )
 }
 
-function prepareAccessControl(accessControl, names) {
+export function prepareAccessControl(accessControl, names) {
   if(typeof accessControl == 'object') {
     accessControl.objects = accessControl.objects ?? ((params) => names.map(name => ({
       objectType: params[name + 'Type'],
@@ -186,7 +188,7 @@ export function cloneAndPrepareAccessControl(accessControl, names) {
   return newAccessControl
 }
 
-function defineDeleteByOwnerEvents(config, context) {
+export function defineDeleteByOwnerEvents(config, context) {
   const {
     service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, otherPropertyNames, reverseRelationWord
   } = context
@@ -225,15 +227,56 @@ function defineDeleteByOwnerEvents(config, context) {
   }
 }
 
-function defineParentDeleteTrigger(config, context) {
+export function defineParentDeleteTrigger(config, context) {
   registerParentDeleteTriggers(context, config)
 }
 
-export {
-  extractTypeAndIdParts, extractIdentifiersWithTypes, defineAnyProperties,
-  defineAnyIndex, defineAnyIndexes,
-  processModelsAnyAnnotation, generateAnyId,
-  addAccessControlAnyParents,
-  prepareAccessControl,
-  defineDeleteByOwnerEvents, defineParentDeleteTrigger
+export function defineAnyTypeIndexes(config, context, useId = false) {
+  const { service, model } = context
+  const tableName = service.name + '_' + model.name
+  if(useId) { // don't use indexes - only object id's - good for propertyOfAny with one parent
+    if(context.otherPossibleTypes[0]?.length) return // types defined in definition - no need for index
+    model.indexes[context.otherPropertyNames[0]+'Types'] = new IndexDefinition({
+      //property: [propertyName+'Type'],
+      function:  async function(input, output, { tableName }) {
+        const table = await input.table(tableName)
+        await table.onChange(async (obj, oldObj) => {
+          const id = obj?.id ?? oldObj?.id
+          const type = id.slice(0, id.indexOf(':'))
+          const count = await table.count({ gte: type+':', lte: type+'_\xFF\xFF\xFF\xFF', limit: 1 })
+          if(count > 0) {
+            await output.put({ id: JSON.parse(type) })
+          } else {
+            await output.delete({ id: JSON.parse(type) })
+          }
+        })
+      },
+      parameters: { tableName: tableName }
+    })
+    return
+  }
+  for(let i = 0; i < context.otherPropertyNames.length; i++) {
+    const propertyName = context.otherPropertyNames[i]
+    const propertyTypes = context.otherPossibleTypes[i]
+    if(propertyTypes.length !== 0) continue // types defined in definition - no need for index
+    const srcIndexName = 'by' + propertyName[0].toUpperCase() + propertyName.slice(1)
+    if(!model.indexes[srcIndexName]) throw new Error("Parent index not defined: " + srcIndexName)
+    model.indexes[propertyName+'Types'] = new IndexDefinition({
+      //property: [propertyName+'Type'],
+      function:  async function(input, output, { indexName }) {
+        const index = await input.index(indexName)
+        await index.onChange(async (obj, oldObj) => {
+          const id = obj?.id ?? oldObj?.id
+          const type = id.slice(0, id.indexOf(':'))
+          const count = await index.count({ gte: type+':', lte: type+'_\xFF\xFF\xFF\xFF', limit: 1 })
+          if(count > 0) {
+            await output.put({ id: JSON.parse(type) })
+          } else {
+            await output.delete({ id: JSON.parse(type) })
+          }
+        })
+      },
+      parameters: { indexName: tableName + '_' + srcIndexName }
+    })
+  }
 }