@live-change/relations-plugin 0.9.200 → 0.9.203

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.9.200",
+  "version": "0.9.203",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -22,7 +22,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.200",
+    "@live-change/framework": "^0.9.203",
     "pluralize": "^8.0.0"
   },
   "devDependencies": {
@@ -30,5 +30,5 @@
     "typedoc-plugin-markdown": "^4.6.3",
     "typedoc-plugin-rename-defaults": "^0.7.3"
   },
-  "gitHead": "a509834e600a546297faa7d1534b6f52e66d2e66"
+  "gitHead": "4d4ce413fe747da2c398eb4ad378e37cc81874b3"
 }

package/src/index.ts

@@ -38,8 +38,8 @@ export interface ModelWithRelations extends ModelDefinitionSpecificationWithAcce
   itemOf?: ItemOfConfig
   propertyOfAny?: PropertyOfAnyConfig
   itemOfAny?: ItemOfAnyConfig
-  relatedTo?: RelatedToConfig
-  relatedToAny?: RelatedToAnyConfig
+  relatedTo?: RelatedToConfig | RelatedToConfig[]
+  relatedToAny?: RelatedToAnyConfig | RelatedToAnyConfig[]
   boundTo?: BoundToConfig
   boundToAny?: BoundToAnyConfig
   saveAuthor?: SaveAuthorConfig        

package/src/pluralRelationAnyUtils.js

@@ -185,9 +185,12 @@ function getUpdateFunction( validators, validationContext, config, context) {
     if(!entity) throw app.logicError("not_found")
     const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
     const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)    
-    /* console.log("UPDATE MATCH", entityTypeAndIdParts, '===', typeAndIdParts,
-      '=>', JSON.stringify(entityTypeAndIdParts) === JSON.stringify(typeAndIdParts)) */
-    if(JSON.stringify(entityTypeAndIdParts) !== JSON.stringify(typeAndIdParts)) {
+/*     console.log("EXISTING ENTITY:", entity)
+    console.log("PROP NAMES:", otherPropertyNames)
+    console.log("PROPERTIES:", properties)
+    console.log(modelName, "UPDATE MATCH", entityTypeAndIdParts, '===', typeAndIdParts,
+      '=>', JSON.stringify(entityTypeAndIdParts) === JSON.stringify(typeAndIdParts))  */
+    if(JSON.stringify(entityTypeAndIdParts) !== JSON.stringify(typeAndIdParts) && !config.allowMove) {
       throw app.logicError("not_authorized")
     }
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
@@ -195,16 +198,6 @@ function getUpdateFunction( validators, validationContext, config, context) {
       extractObjectData(writeableProperties, properties, entity),
       App.computeUpdates(model, { ...entity, ...properties }, { client, service })
     )
-    if(entityTypeAndIdParts[0] == 'task_Task' && data.retries.length == 0 && entity.retries.length > 0)  {
-      console.log("TASK UPDATE!!!!!!!!")
-      console.log("CURRENT STATE:", entity)
-      console.log("UPDATE:", properties)
-      console.log("IDENTIFIERS:", identifiers)
-      console.log("EXTRACTED ENTITY DATA:", extractObjectData(writeableProperties, properties, entity))
-      console.log("COMPUTED UPDATES:", App.computeUpdates(model, { ...entity, ...properties }, { client, service }))
-      console.log("DATA:", data)
-      debugger
-    }
     await App.validation.validate({ ...identifiers, ...data, [modelPropertyName]: id }, validators,
       validationContext)
     await fireChangeTriggers(context, objectType, identifiers, id,
@@ -277,7 +270,7 @@ function defineUpdateTrigger(config, context) {
   })
   const validators = App.validation.getValidators(trigger, service, trigger)
   const validationContext = { source: trigger, trigger }
-  trigger.execute = getUpdateFunction( validators, validationContext, config, context)
+  trigger.execute = getUpdateFunction( validators, validationContext, {...config, allowMove: true }, context)
   if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
@@ -292,11 +285,6 @@ function getDeleteFunction(config, context) {
     const id = properties[modelPropertyName]
     const entity = await modelRuntime().get(id)
     if(!entity) throw app.logicError("not_found")
-    const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
-    const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
-    if(JSON.stringify(entityTypeAndIdParts) !== JSON.stringify(typeAndIdParts)) {
-      throw app.logicError("not_authorized")
-    }
     await fireChangeTriggers(context, objectType, extractIdentifiers(otherPropertyNames, entity), id,
       extractObjectData(writeableProperties, entity, {}), null, trigger)
     emit({
@@ -309,7 +297,7 @@ function getDeleteFunction(config, context) {
 
 function defineDeleteAction(config, context) {
   const {
-    service, app, model, modelRuntime, modelPropertyName, identifiers, objectType,
+    service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'delete' + modelName
@@ -324,8 +312,7 @@ function defineDeleteAction(config, context) {
       [modelPropertyName]: {
         type: model,
         validation: ['nonEmpty']
-      },
-      ...identifiers
+      }
     },
     access: config.deleteAccess || config.writeAccess,
     accessControl,
@@ -341,7 +328,7 @@ function defineDeleteAction(config, context) {
 
 function defineDeleteTrigger(config, context) {
   const {
-    service, app, model, modelRuntime, modelPropertyName, identifiers, objectType,
+    service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'delete' + modelName
@@ -352,8 +339,7 @@ function defineDeleteTrigger(config, context) {
       [modelPropertyName]: {
         type: model,
         validation: ['nonEmpty']
-      },
-      ...identifiers
+      }
     },
     access: config.deleteAccess || config.writeAccess,
     skipValidation: true,
@@ -371,7 +357,7 @@ function defineSortIndex(context, sortFields) {
   const sortFieldsUc = sortFields.map(fd => fd.slice(0, 1).toUpperCase() + fd.slice(1))
   const indexName = 'by' + context.joinedOthersClassName + 'And' + sortFieldsUc.join('And')
   const property = [...(context.otherPropertyNames.map(prop => [prop + 'Type', prop]).flat()), ...sortFields]
-  console.log("DEFINE SORT INDEX", sortFields, "NAME", indexName, "PROP", property)
+  //console.log("DEFINE SORT INDEX", sortFields, "NAME", indexName, "PROP", property)
   context.model.indexes[indexName] = new IndexDefinition({
     property
   })

package/src/pluralRelationUtils.js

@@ -176,7 +176,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     if(!entity) throw app.logicError("not_found")
     const entityIdParts = extractIdParts(otherPropertyNames, entity)
     const idParts = extractIdParts(otherPropertyNames, properties)
-    if(JSON.stringify(entityIdParts) !== JSON.stringify(idParts)) {
+    if(JSON.stringify(entityIdParts) !== JSON.stringify(idParts) && !config.allowMove) {
       throw app.logicError("not_authorized")
     }
     const identifiers = extractIdentifiers(otherPropertyNames, properties)
@@ -254,7 +254,7 @@ function defineUpdateTrigger(config, context) {
   })
   const validators = App.validation.getValidators(trigger, service, trigger)
   const validationContext = { source: trigger, trigger }
-  trigger.execute = getUpdateFunction( validators, validationContext, config, context)
+  trigger.execute = getUpdateFunction( validators, validationContext, {...config, allowMove: true }, context)
   service.triggers[triggerName] = [trigger]
 }
 
@@ -268,11 +268,6 @@ function getDeleteFunction( validators, validationContext, config, context) {
     const id = properties[modelPropertyName]
     const entity = await modelRuntime().get(id)
     if(!entity) throw app.logicError("not_found")
-    const entityIdParts = extractIdParts(otherPropertyNames, entity)
-    const idParts = extractIdParts(otherPropertyNames, properties)
-    if(JSON.stringify(entityIdParts) !== JSON.stringify(idParts)) {
-      throw app.logicError("not_authorized")
-    }
     const identifiers = extractIdentifiers(otherPropertyNames, entity)
     await fireChangeTriggers(context, objectType, identifiers, id,
       extractObjectData(writeableProperties, entity, {}), null, trigger)
@@ -301,8 +296,7 @@ function defineDeleteAction(config, context) {
       [modelPropertyName]: {
         type: model,
         validation: ['nonEmpty']
-      },
-      ...(model.properties)
+      }
     },
     access: config.deleteAccess || config.writeAccess,
     accessControl,
@@ -331,8 +325,7 @@ function defineDeleteTrigger(config, context) {
       [modelPropertyName]: {
         type: model,
         validation: ['nonEmpty']
-      },
-      ...(model.properties)
+      }
     },
     skipValidation: true,
     //queuedBy: otherPropertyNames,
@@ -549,7 +542,7 @@ function defineCopyOnParentCopyTrigger(config, context) {
 
 function defineSortIndex(context, sortFields) {
   if(!Array.isArray(sortFields)) sortFields = [sortFields]
-  console.log("DEFINE SORT INDEX", sortFields)
+  //console.log("DEFINE SORT INDEX", sortFields)
   const sortFieldsUc = sortFields.map(fd=>fd.slice(0, 1).toUpperCase() + fd.slice(1))
   const indexName = 'by' + context.joinedOthersClassName + sortFieldsUc.join('')
   context.model.indexes[indexName] = new IndexDefinition({

package/src/utils.ts

@@ -77,7 +77,7 @@ export function defineProperties(model: ModelDefinitionSpecificationWithAccessCo
 
 export function defineIndex(model: ModelDefinitionSpecificationWithAccessControl,
                             what: string, props: string[], multi = undefined, prefix = 'by') {
-  console.log("DEFINE INDEX", model.name, what, props)
+  //console.log("DEFINE INDEX", model.name, what, props)
   model.indexes[prefix + what] = {
     property: props,
     multi
@@ -86,7 +86,7 @@ export function defineIndex(model: ModelDefinitionSpecificationWithAccessControl
 
 export function defineIndexes(model: ModelDefinitionSpecificationWithAccessControl,
                               props: Record<string, any>, types: string[]) {
-  console.log("DEFINE INDEXES!", model.name, props, types)
+  //console.log("DEFINE INDEXES!", model.name, props, types)
   const propCombinations = allCombinations(Object.keys(props)) /// combinations of indexes
   for(const propCombination of propCombinations) {
     const upperCaseProps = propCombination.map(id => {
@@ -199,7 +199,7 @@ export function processModelsAnnotation<PreparedConfig extends RelationConfig>
         }
 
         // @ts-ignore
-        console.log("MODEL " + modelName + " IS " + annotation + " " + config.what ?? '')
+        //console.log("MODEL " + modelName + " IS " + annotation + " " + config.what ?? '')
 
         const what = (Array.isArray(config.what) ? config.what : [config.what])
         const others = what.map(other => other.getTypeName ? other.getTypeName() : (other.name ? other.name : other))

package/src/utilsAny.ts

@@ -160,7 +160,7 @@ export function processModelsAnyAnnotation<PreparedConfig extends AnyRelationCon
       for(let config of configs) {
         if (typeof config == 'string' || Array.isArray(config)) config = {what: config}
 
-        console.log("MODEL " + modelName + " IS " + annotation + " " + config.what)
+        //console.log("MODEL " + modelName + " IS " + annotation + " " + config.what)
 
         const to = (Array.isArray(config.to) ? config.to : [config.to ?? 'owner'])