@live-change/relations-plugin 0.9.97 → 0.9.99

package/package.json

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

package/src/entityUtils.ts

@@ -1,7 +1,8 @@
 import {
   defineProperties, defineIndex,
   extractIdParts, extractIdentifiers, extractObjectData, prepareAccessControl,
-  includeAccessRoles, defineGlobalRangeView
+  includeAccessRoles, defineGlobalRangeView,
+  propertiesWithoutDefaults
 } from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
 import App, { AccessSpecification, ModelDefinitionSpecification, PropertyDefinitionSpecification, ServiceDefinition } from '@live-change/framework'
@@ -258,7 +259,7 @@ export function defineUpdateAction(config, context) {
   const action = new ActionDefinition({
     name: actionName,
     properties: {
-      ...(model.properties),
+      ...propertiesWithoutDefaults(model.properties),
       [modelPropertyName]: {
         type: modelPropertyName
       }
@@ -286,7 +287,7 @@ export function defineUpdateTrigger(config, context) {
   const trigger = new TriggerDefinition({
     name: triggerName,
     properties: {
-      ...(model.properties),
+      ...propertiesWithoutDefaults(model.properties),
       [modelPropertyName]: {
         type: modelPropertyName
       }

package/src/pluralRelationAnyUtils.js

@@ -11,7 +11,8 @@ import {
 } from './utilsAny.js'
 import {
   extractObjectData, extractIdentifiers, extractIdParts,
-  cloneAndPrepareAccessControl as cloneAndPrepareSingleAccessControl
+  cloneAndPrepareAccessControl as cloneAndPrepareSingleAccessControl,
+  propertiesWithoutDefaults
 } from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
 
@@ -106,7 +107,7 @@ function getCreateFunction( validators, validationContext, config, context) {
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
     const data = extractObjectData(writeableProperties, properties,
       App.computeDefaults(model, properties, { client, service } ))
-    await App.validation.validate({ ...identifiers, ...data }, validators,
+    const result = await App.validation.validate({ ...identifiers, ...data }, validators,
       validationContext)
     await fireChangeTriggers(context, objectType, identifiers, id, null, data, trigger)
     emit({
@@ -183,9 +184,9 @@ function getUpdateFunction( validators, validationContext, config, context) {
     const entity = await modelRuntime().get(id)
     if(!entity) throw 'not_found'
     const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
-    const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
-    console.log("UPDATE MATCH", entityTypeAndIdParts, '===', typeAndIdParts,
-      '=>', JSON.stringify(entityTypeAndIdParts) === JSON.stringify(typeAndIdParts))
+    const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)    
+    /* console.log("UPDATE MATCH", entityTypeAndIdParts, '===', typeAndIdParts,
+      '=>', JSON.stringify(entityTypeAndIdParts) === JSON.stringify(typeAndIdParts)) */
     if(JSON.stringify(entityTypeAndIdParts) !== JSON.stringify(typeAndIdParts)) {
       throw 'not_authorized'
     }
@@ -194,6 +195,16 @@ 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,
@@ -226,7 +237,7 @@ function defineUpdateAction(config, context) {
         type: model,
         validation: ['nonEmpty']
       },
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
     accessControl,
@@ -256,7 +267,7 @@ function defineUpdateTrigger(config, context) {
         type: model,
         validation: ['nonEmpty']
       },
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
     skipValidation: true,

package/src/pluralRelationUtils.js

@@ -7,7 +7,8 @@ import {
   extractIdentifiers,
   extractObjectData,
   prepareAccessControl,
-  cloneAndPrepareAccessControl
+  cloneAndPrepareAccessControl,
+  propertiesWithoutDefaults
 } from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
 import pluralize from 'pluralize'
@@ -215,7 +216,7 @@ function defineUpdateAction(config, context) {
         type: model,
         validation: ['nonEmpty']
       },
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
     accessControl,
@@ -244,7 +245,7 @@ function defineUpdateTrigger(config, context) {
         type: model,
         validation: ['nonEmpty']
       },
-      ...(model.properties)
+      propertiesWithoutDefaults
     },
     skipValidation: true,
     //queuedBy: otherPropertyNames,

package/src/singularRelationAnyUtils.js

@@ -8,7 +8,8 @@ import {
 } from './utilsAny.js'
 import {
   extractObjectData,
-  cloneAndPrepareAccessControl as cloneAndPrepareSingleAccessControl
+  cloneAndPrepareAccessControl as cloneAndPrepareSingleAccessControl,
+  propertiesWithoutDefaults
 } from './utils.js'
 import { allCombinations } from "./combinations.js"
 import { fireChangeTriggers } from "./changeTriggers.js"
@@ -206,7 +207,7 @@ function defineUpdateAction(config, context) {
   const action = new ActionDefinition({
     name: actionName,
     properties: {
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
     accessControl,
@@ -232,7 +233,7 @@ function defineUpdateTrigger(config, context) {
   const trigger = new TriggerDefinition({
     name: triggerName,
     properties: {
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     skipValidation: true,
     queuedBy: otherPropertyNames,
@@ -285,7 +286,7 @@ function defineSetOrUpdateAction(config, context) {
   const action = new ActionDefinition({
     name: actionName,
     properties: {
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
     accessControl,
@@ -311,7 +312,7 @@ function defineSetOrUpdateTrigger(config, context) {
   const trigger = new TriggerDefinition({
     name: triggerName,
     properties: {
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     skipValidation: true,
     queuedBy: otherPropertyNames,

package/src/singularRelationUtils.js

@@ -9,7 +9,8 @@ import {
   extractIdParts,
   prepareAccessControl,
   cloneAndPrepareAccessControl,
-  defineIndex
+  defineIndex,
+  propertiesWithoutDefaults
 } from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
 import { extractTypeAndIdParts } from './utilsAny.js'
@@ -61,7 +62,8 @@ export function defineObjectView(config, context, external = true) {
         const path = config.fields ? modelRuntime().limitedPath(idProp, config.fields) : modelRuntime().path(idProp)
         return path
       }
-      const id = idProp ? idProp : idParts.length > 1 ? idParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
+      const idParts = extractIdParts(otherPropertyNames, properties)
+      const id = idParts.length > 1 ? idParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
       const path = config.fields ? modelRuntime().limitedPath(id, config.fields) : modelRuntime().path(id)
       return path
     }
@@ -254,7 +256,7 @@ export function defineUpdateAction(config, context) {
   const action = new ActionDefinition({
     name: actionName,
     properties: {
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
     accessControl,
@@ -280,7 +282,7 @@ export function defineUpdateTrigger(config, context) {
   const trigger = new TriggerDefinition({
     name: triggerName,
     properties: {
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     skipValidation: true,
     queuedBy: otherPropertyNames,
@@ -332,7 +334,7 @@ export function defineSetOrUpdateAction(config, context) {
   const action = new ActionDefinition({
     name: actionName,
     properties: {
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
     accessControl,
@@ -358,7 +360,7 @@ export function defineSetOrUpdateTrigger(config, context) {
   const trigger = new TriggerDefinition({
     name: triggerName,
     properties: {
-      ...(model.properties)
+      ...propertiesWithoutDefaults(model.properties)
     },
     skipValidation: true,
     queuedBy: otherPropertyNames,

package/src/utils.ts

@@ -18,6 +18,32 @@ import pluralize from 'pluralize'
 import { ModelDefinitionSpecificationWithEntity } from "./entityUtils.js"
 import { AccessControlSettings, ModelDefinitionSpecificationWithAccessControl, PreparedAccessControlSettings } from "./types.js"
 
+export function definitionWithoutDefaults(definition: PropertyDefinitionSpecification) {
+  const newDefinition = { ...definition }
+  if(newDefinition.default) {
+    delete newDefinition.default
+  }
+  if(newDefinition.of) {
+    newDefinition.of = definitionWithoutDefaults(newDefinition.of)
+  }
+  if(newDefinition.items) {
+    newDefinition.items = definitionWithoutDefaults(newDefinition.items)
+  }
+  if(newDefinition.properties) {
+    newDefinition.properties = propertiesWithoutDefaults(newDefinition.properties)
+  }
+  return newDefinition
+}
+
+export function propertiesWithoutDefaults(properties: Record<string, any>) {
+  const newProperties = {}
+  for(const key in properties) {
+    const property = properties[key]
+    newProperties[key] = definitionWithoutDefaults(property)
+  }
+  return newProperties
+}
+
 export function extractIdParts(otherPropertyNames: string[], properties: Record<string, any>) {
   const idParts = []
   for (const propertyName of otherPropertyNames) {

package/src/utilsAny.ts

@@ -302,12 +302,12 @@ export function defineAnyTypeIndexes(config, context, useId = false) {
               await output.delete({ id: type })
             }
           } catch(e) {
-            output.debug('typeJson', typeJson, 'id', id) 
-            console.error("Error parsing typeJson", typeJson, e)
+            console.debug("Error parsing typeJson", typeJson, e, 'in id', id, "from table", tableName)
+            console.error("Error parsing typeJson", typeJson, e, 'in id', id, "from table", tableName)
           }
         })
       },
-      parameters: { tableName: tableName }
+      parameters: { tableName: tableName, }
     }
     return
   }
@@ -324,17 +324,17 @@ export function defineAnyTypeIndexes(config, context, useId = false) {
         await index.onChange(async (obj, oldObj) => {
           const id = obj?.id ?? oldObj?.id
           const typeJson = id.slice(0, id.indexOf(':'))
-          try {
+          try {           
             const type = JSON.parse(typeJson)
-            const count = await index.count({ gte: type+':', lte: typeJson+'_\xFF\xFF\xFF\xFF', limit: 1 })
+            const count = await index.count({ gte: typeJson+':', lte: typeJson+'_\xFF\xFF\xFF\xFF', limit: 1 })
             if(count > 0) {
               await output.put({ id: type })
             } else {
               await output.delete({ id: type })
             }
           } catch(e) {
-            output.debug('typeJson', typeJson, 'id', id) 
-            console.error("Error parsing typeJson", typeJson, e)
+            output.debug("Error parsing typeJson", typeJson, e, 'in id', id, "from index", indexName)
+            console.error("Error parsing typeJson", typeJson, e, 'in id', id, "from index", indexName)
           }
         })
       },

package/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "sourceMap": true,
     "composite": true,
     "module": "nodenext",
     "moduleResolution": "nodenext",