Expand Record Object Mapping to allow Parameter Mapping

packages/core/src/driver.ts

@@ -49,6 +49,7 @@ import NotificationFilter from './notification-filter'
 import HomeDatabaseCache from './internal/homedb-cache'
 import { cacheKey } from './internal/auth-util'
 import { ProtocolVersion } from './protocol-version'
+import { Rules } from './mapping.highlevel'
 
 const DEFAULT_MAX_CONNECTION_LIFETIME: number = 60 * 60 * 1000 // 1 hour
 
@@ -368,6 +369,7 @@ class QueryConfig<T = EagerResult> {
   transactionConfig?: TransactionConfig
   auth?: AuthToken
   signal?: AbortSignal
+  parameterRules?: Rules
 
   /**
    * @constructor
@@ -630,7 +632,7 @@ class Driver {
       transactionConfig: config.transactionConfig,
       auth: config.auth,
       signal: config.signal
-    }, query, parameters)
+    }, query, parameters, config.parameterRules)
   }
 
   /**

packages/core/src/graph-types.ts

@@ -18,6 +18,7 @@ import Integer from './integer'
 import { stringify } from './json'
 import { Rules, GenericConstructor, as } from './mapping.highlevel'
 
+export const StandardDateClass = Date
 type StandardDate = Date
 /**
  * @typedef {number | Integer | bigint} NumberOrInteger

packages/core/src/internal/query-executor.ts

@@ -21,6 +21,7 @@ import Result from '../result'
 import ManagedTransaction from '../transaction-managed'
 import { AuthToken, Query } from '../types'
 import { TELEMETRY_APIS } from './constants'
+import { Rules } from '../mapping.highlevel'
 
 type SessionFactory = (config: { database?: string, bookmarkManager?: BookmarkManager, impersonatedUser?: string, auth?: AuthToken }) => Session
 
@@ -42,7 +43,7 @@ export default class QueryExecutor {
 
   }
 
-  public async execute<T>(config: ExecutionConfig<T>, query: Query, parameters?: any): Promise<T> {
+  public async execute<T>(config: ExecutionConfig<T>, query: Query, parameters?: any, parameterRules?: Rules): Promise<T> {
     const session = this._createSession({
       database: config.database,
       bookmarkManager: config.bookmarkManager,
@@ -65,7 +66,7 @@ export default class QueryExecutor {
         : session.executeWrite.bind(session)
 
       return await executeInTransaction(async (tx: ManagedTransaction) => {
-        const result = tx.run(query, parameters)
+        const result = tx.run(query, parameters, parameterRules)
         return await config.resultTransformer(result)
       }, config.transactionConfig)
     } finally {

packages/core/src/internal/util.ts

@@ -19,6 +19,7 @@ import Integer, { isInt, int } from '../integer'
 import { NumberOrInteger } from '../graph-types'
 import { EncryptionLevel } from '../types'
 import { stringify } from '../json'
+import { Rules, validateAndCleanParams } from '../mapping.highlevel'
 
 const ENCRYPTION_ON: EncryptionLevel = 'ENCRYPTION_ON'
 const ENCRYPTION_OFF: EncryptionLevel = 'ENCRYPTION_OFF'
@@ -62,27 +63,29 @@ function isObject (obj: any): boolean {
  * @throws TypeError when either given query or parameters are invalid.
  */
 function validateQueryAndParameters (
-  query: string | String | { text: string, parameters?: any },
+  query: string | String | { text: string, parameters?: any, parameterRules?: Rules },
   parameters?: any,
-  opt?: { skipAsserts: boolean }
+  opt?: { skipAsserts?: boolean, parameterRules?: Rules }
 ): {
     validatedQuery: string
     params: any
   } {
   let validatedQuery: string = ''
   let params = parameters ?? {}
+  let parameterRules = opt?.parameterRules
   const skipAsserts: boolean = opt?.skipAsserts ?? false
-
   if (typeof query === 'string') {
     validatedQuery = query
   } else if (query instanceof String) {
     validatedQuery = query.toString()
   } else if (typeof query === 'object' && query.text != null) {
     validatedQuery = query.text
     params = query.parameters ?? {}
+    parameterRules = query.parameterRules
   }
 
   if (!skipAsserts) {
+    params = validateAndCleanParams(params, parameterRules)
     assertCypherQuery(validatedQuery)
     assertQueryParameters(params)
   }

packages/core/src/mapping.highlevel.ts

@@ -29,14 +29,15 @@ export interface Rule {
   optional?: boolean
   from?: string
   convert?: (recordValue: any, field: string) => any
+  convertToParam?: (objectValue: any) => any
   validate?: (recordValue: any, field: string) => void
 }
 
 export type Rules = Record<string, Rule>
 
 export let rulesRegistry: Record<string, Rules> = {}
 
-let nameMapping: (name: string) => string = (name) => name
+export let nameMapping: (name: string) => string = (name) => name
 
 function register <T extends {} = Object> (constructor: GenericConstructor<T>, rules: Rules): void {
   rulesRegistry[constructor.name] = rules
@@ -179,6 +180,49 @@ export function valueAs (value: unknown, field: string, rule?: Rule): unknown {
 
   return ((rule?.convert) != null) ? rule.convert(value, field) : value
 }
+
+export function valueAsParam (value: unknown, rule?: Rule): unknown {
+  if (rule?.optional === true && value == null) {
+    return value
+  }
+  return ((rule?.convertToParam) != null) ? rule.convertToParam(value) : value
+}
+
+export function validateAndCleanParams (params: Record<string, any>, suppliedRules?: Rules): Record<string, any> {
+  const cleanedParams: Record<string, any> = {}
+  // @ts-expect-error
+  const parameterRules = getRules(params.constructor, suppliedRules)
+  if (parameterRules !== undefined) {
+    for (const key in parameterRules) {
+      if (!(parameterRules?.[key]?.optional === true)) {
+        let param = params[key]
+        if (parameterRules[key]?.convertToParam !== undefined) {
+          param = parameterRules[key].convertToParam(params[key])
+        }
+        if (param === undefined) {
+          throw newError('Parameter object did not include required parameter.')
+        }
+        if (parameterRules[key].validate != null) {
+          parameterRules[key].validate(param, key)
+          // @ts-expect-error
+          if (parameterRules[key].apply !== undefined) {
+            for (const entryKey in param) {
+              // @ts-expect-error
+              parameterRules[key].apply.validate(param[entryKey], entryKey)
+            }
+          }
+        }
+        const mappedKey = parameterRules[key].from ?? nameMapping(key)
+
+        cleanedParams[mappedKey] = param
+      }
+    }
+    return cleanedParams
+  } else {
+    return params
+  }
+}
+
 function getRules<T extends {} = Object> (constructorOrRules: Rules | GenericConstructor<T>, rules: Rules | undefined): Rules | undefined {
   const rulesDefined = typeof constructorOrRules === 'object' ? constructorOrRules : rules
   if (rulesDefined != null) {

packages/core/src/mapping.rulesfactories.ts

@@ -17,11 +17,11 @@
  * limitations under the License.
  */
 
-import { Rule, valueAs } from './mapping.highlevel'
-import { StandardDate, isNode, isPath, isRelationship, isUnboundRelationship } from './graph-types'
+import { Rule, valueAs, valueAsParam } from './mapping.highlevel'
+import { StandardDateClass, StandardDate, isNode, isPath, isRelationship, isUnboundRelationship } from './graph-types'
 import { isPoint } from './spatial-types'
 import { Date, DateTime, Duration, LocalDateTime, LocalTime, Time, isDate, isDateTime, isDuration, isLocalDateTime, isLocalTime, isTime } from './temporal-types'
-import Vector from './vector'
+import Vector, { vector } from './vector'
 
 /**
  * @property {function(rule: ?Rule)} asString Create a {@link Rule} that validates the value is a String.
@@ -250,6 +250,7 @@ export const rule = Object.freeze({
         }
       },
       convert: (value: Duration) => rule?.stringify === true ? value.toString() : value,
+      convertToParam: rule?.stringify === true ? (str: string) => Duration.fromString(str) : undefined,
       ...rule
     }
   },
@@ -268,6 +269,7 @@ export const rule = Object.freeze({
         }
       },
       convert: (value: LocalTime) => rule?.stringify === true ? value.toString() : value,
+      convertToParam: rule?.stringify === true ? (str: string) => LocalTime.fromString(str) : undefined,
       ...rule
     }
   },
@@ -286,6 +288,7 @@ export const rule = Object.freeze({
         }
       },
       convert: (value: Time) => rule?.stringify === true ? value.toString() : value,
+      convertToParam: rule?.stringify === true ? (str: string) => Time.fromString(str) : undefined,
       ...rule
     }
   },
@@ -304,6 +307,7 @@ export const rule = Object.freeze({
         }
       },
       convert: (value: Date) => convertStdDate(value, rule),
+      convertToParam: rule?.stringify === true ? (str: string) => Date.fromStandardDateLocal(new StandardDateClass(str)) : undefined,
       ...rule
     }
   },
@@ -315,13 +319,21 @@ export const rule = Object.freeze({
    * @returns {Rule} A new rule for the value
    */
   asLocalDateTime (rule?: Rule & { stringify?: boolean, toStandardDate?: boolean }): Rule {
+    let convertToParam
+    if (rule?.stringify === true) {
+      convertToParam = (str: string) => LocalDateTime.fromStandardDate(new StandardDateClass(str))
+    }
+    if (rule?.toStandardDate === true) {
+      convertToParam = (standardDate: StandardDate) => LocalDateTime.fromStandardDate(standardDate)
+    }
     return {
       validate: (value: any, field: string) => {
         if (!isLocalDateTime(value)) {
           throw new TypeError(`${field} should be a LocalDateTime but received ${typeof value}`)
         }
       },
       convert: (value: LocalDateTime) => convertStdDate(value, rule),
+      convertToParam,
       ...rule
     }
   },
@@ -333,13 +345,21 @@ export const rule = Object.freeze({
    * @returns {Rule} A new rule for the value
    */
   asDateTime (rule?: Rule & { stringify?: boolean, toStandardDate?: boolean }): Rule {
+    let convertToParam
+    if (rule?.stringify === true) {
+      convertToParam = (str: string) => DateTime.fromStandardDate(new StandardDateClass(str))
+    }
+    if (rule?.toStandardDate === true) {
+      convertToParam = (standardDate: StandardDate) => DateTime.fromStandardDate(standardDate)
+    }
     return {
       validate: (value: any, field: string) => {
         if (!isDateTime(value)) {
           throw new TypeError(`${field} should be a DateTime but received ${typeof value}`)
         }
       },
       convert: (value: DateTime) => convertStdDate(value, rule),
+      convertToParam,
       ...rule
     }
   },
@@ -363,6 +383,12 @@ export const rule = Object.freeze({
         }
         return list
       },
+      convertToParam: (list: any[]) => {
+        if (rule?.apply != null) {
+          return list.map((value) => valueAsParam(value, rule.apply))
+        }
+        return list
+      },
       ...rule
     }
   },
@@ -386,6 +412,7 @@ export const rule = Object.freeze({
         }
         return value
       },
+      convertToParam: rule?.asTypedList === true ? (typedArray: Int16Array | Int32Array | BigInt64Array | Float32Array | Float64Array) => vector(typedArray) : undefined,
       ...rule
     }
   }

packages/core/src/session.ts

@@ -38,13 +38,15 @@ import { RecordShape } from './record'
 import NotificationFilter from './notification-filter'
 import { Logger } from './internal/logger'
 import { cacheKey } from './internal/auth-util'
+import { Rules } from './mapping.highlevel'
 
 type ConnectionConsumer<T> = (connection: Connection) => Promise<T> | T
 type ManagedTransactionWork<T> = (tx: ManagedTransaction) => Promise<T> | T
 
 interface TransactionConfig {
   timeout?: NumberOrInteger
   metadata?: object
+  parameterRules?: Rules
 }
 
 /**
@@ -186,11 +188,13 @@ class Session {
   run<R extends RecordShape = RecordShape> (
     query: Query,
     parameters?: any,
-    transactionConfig?: TransactionConfig
+    transactionConfig?: TransactionConfig,
+    parameterRules?: Rules
   ): Result<R> {
     const { validatedQuery, params } = validateQueryAndParameters(
       query,
-      parameters
+      parameters,
+      { parameterRules }
     )
     const autoCommitTxConfig = (transactionConfig != null)
       ? new TxConfig(transactionConfig, this._log)

packages/core/src/temporal-types.ts

@@ -94,6 +94,20 @@ export class Duration<T extends NumberOrInteger = Integer> {
     Object.freeze(this)
   }
 
+  static fromString (str: string): Duration<NumberOrInteger> {
+    const matches = String(str).match(/P(?:([-?.,\d]+)Y)?(?:([-?.,\d]+)M)?(?:([-?.,\d]+)W)?(?:([-?.,\d]+)D)?T(?:([-?.,\d]+)H)?(?:([-?.,\d]+)M)?(?:([-?.,\d]+)S)?/)
+    if (matches !== null) {
+      const dur = new Duration(
+        ~~parseInt(matches[1]) * 12 + ~~parseInt(matches[2]),
+        ~~parseInt(matches[3]) * 7 + ~~parseInt(matches[4]),
+        ~~parseInt(matches[5]) * 3600 + ~~parseInt(matches[6]) * 60 + ~~parseInt(matches[7]),
+        Math.round((parseFloat(matches[7]) - parseInt(matches[7])) * 10 ** 9)
+      )
+      return dur
+    }
+    throw newError('Duration could not be parsed from string')
+  }
+
   /**
    * @ignore
    */
@@ -203,6 +217,21 @@ export class LocalTime<T extends NumberOrInteger = Integer> {
       this.nanosecond
     )
   }
+
+  static fromString (str: string): LocalTime<NumberOrInteger> {
+    console.log(str)
+    const values = String(str).match(/(\d+):(\d+):(\d+).(\d+)/)
+    console.log(values)
+    if (values !== null) {
+      return new LocalTime(
+        parseInt(values[0]),
+        parseInt(values[1]),
+        parseInt(values[2]),
+        Math.round(parseFloat('0.' + values[3]) * 10 ** 9)
+      )
+    }
+    throw newError('LocalTime could not be parsed from string')
+  }
 }
 
 Object.defineProperty(
@@ -312,6 +341,23 @@ export class Time<T extends NumberOrInteger = Integer> {
       ) + util.timeZoneOffsetToIsoString(this.timeZoneOffsetSeconds)
     )
   }
+
+  static fromString (str: string): Time<NumberOrInteger> {
+    const values = String(str).match(/(\d+):(\d+):(\d+).(\d+)(Z|\+|-)?(\d*)/)
+    if (values !== null) {
+      if (values[4] === 'Z') {
+        return new Time(parseInt(values[0]), parseInt(values[1]), parseInt(values[2]), parseInt(values[3]) * 10 ** 9, 0)
+      }
+      return new Time(
+        parseInt(values[0]),
+        parseInt(values[1]),
+        parseInt(values[2]),
+        Math.round(parseFloat('0.' + values[3]) * 10 ** 9),
+        (values[4] === '+' ? 1 : -1) * parseInt(values[5])
+      )
+    }
+    throw newError('Time could not be parsed from string')
+  }
 }
 
 Object.defineProperty(

packages/core/src/transaction-managed.ts

@@ -19,8 +19,9 @@ import Result from './result'
 import Transaction from './transaction'
 import { Query } from './types'
 import { RecordShape } from './record'
+import { Rules } from './mapping.highlevel'
 
-type Run<R extends RecordShape = RecordShape> = (query: Query, parameters?: any) => Result<R>
+type Run<R extends RecordShape = RecordShape> = (query: Query, parameters?: any, parameterRules?: Rules) => Result<R>
 
 /**
  * Represents a transaction that is managed by the transaction executor.
@@ -59,8 +60,8 @@ class ManagedTransaction {
    * @param {Object} parameters - Map with parameters to use in query
    * @return {Result} New Result
    */
-  run<R extends RecordShape = RecordShape> (query: Query, parameters?: any): Result<R> {
-    return this._run(query, parameters)
+  run<R extends RecordShape = RecordShape> (query: Query, parameters?: any, parameterRules?: Rules): Result<R> {
+    return this._run(query, parameters, parameterRules)
   }
 }