feat: include contact fields on the api

chainjet · Aug 29, 2023 · 848a25d · 848a25d
1 parent 265a25a
commit 848a25d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/apps/api/src/chat/entities/contact.ts b/apps/api/src/chat/entities/contact.ts
@@ -31,6 +31,7 @@ export class Contact extends BaseEntity {
   @prop({ default: [], index: true })
   tags: string[]
 
+  @Field(() => GraphQLJSONObject, { nullable: true })
   @jsonProp()
   fields?: Record<string, any>
 }

diff --git a/apps/runner/src/utils/input.utils.ts b/apps/runner/src/utils/input.utils.ts
@@ -60,7 +60,7 @@ export function parseInput(input: unknown, outputs: Record<string, Record<string
  */
 export function calculateExpression(input: string, references: Record<string, Record<string, unknown>>): unknown {
   // each "[\w[\]]" group matches the allowed characters for variables, including array access (e.g. a.b[0].c)
-  const operatorsRegex = /[\w\s[\]]+(\.[\w\s[\]]+|\[\d+\])*/g
+  const operatorsRegex = /[\w[\]]+\.[\w[\]]+(\.[\w[\]]+)*/g
 
   const operators = [...input.matchAll(operatorsRegex)]
 

diff --git a/generated/graphql.ts b/generated/graphql.ts
@@ -1060,6 +1060,7 @@ export interface Contact {
     createdAt: DateTime;
     address: string;
     tags?: Nullable<string[]>;
+    fields?: Nullable<JSONObject>;
 }
 
 export interface AccountCredential {
@@ -1372,6 +1373,7 @@ export interface ContactDeleteResponse {
     createdAt?: Nullable<DateTime>;
     address?: Nullable<string>;
     tags?: Nullable<string[]>;
+    fields?: Nullable<JSONObject>;
 }
 
 export interface ContactEdge {

diff --git a/generated/schema.graphql b/generated/schema.graphql
@@ -413,6 +413,7 @@ type Contact {
   createdAt: DateTime!
   address: String!
   tags: [String!]
+  fields: JSONObject
 }
 
 type AccountCredential {
@@ -826,6 +827,7 @@ type ContactDeleteResponse {
   createdAt: DateTime
   address: String
   tags: [String!]
+  fields: JSONObject
 }
 
 type ContactEdge {