save

subsquid · Jul 9, 2024 · 515f37b · 515f37b
1 parent 3af413e
commit 515f37b
Show file tree

Hide file tree

Showing 17 changed files with 58,900 additions and 162 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/graphql/openreader/package.json b/graphql/openreader/package.json
@@ -42,7 +42,8 @@
     "graphql-parse-resolve-info": "^4.14.0",
     "graphql-ws": "^5.14.2",
     "pg": "^8.11.3",
-    "ws": "^8.14.2"
+    "ws": "^8.14.2",
+    "inflected": "^2.1.0"
   },
   "peerDependencies": {
     "@subsquid/big-decimal": "^1.0.0"
@@ -63,6 +64,7 @@
     "expect": "^29.7.0",
     "gql-test-client": "^0.0.0",
     "mocha": "^10.2.0",
-    "typescript": "~5.3.2"
+    "typescript": "~5.3.2",
+    "@types/inflected": "^2.1.3"
   }
 }
diff --git a/graphql/openreader/src/dialect/opencrud/schema.ts b/graphql/openreader/src/dialect/opencrud/schema.ts
@@ -42,6 +42,7 @@ import {getOrderByMapping, parseOrderBy} from './orderBy'
 import {parseAnyTree, parseObjectTree, parseSqlArguments} from './tree'
 import {parseWhere} from './where'
 import {GqlFieldMap, SchemaOptions} from '../common'
+import {Where} from '../../ir/args'
 
 
 export class SchemaBuilder {
@@ -395,7 +396,7 @@ export class SchemaBuilder {
 
     private installListQuery(typeName: string, query: GqlFieldMap, subscription: GqlFieldMap): void {
         let model = this.model
-        let queryName = toPlural(toCamelCase(typeName))
+        let queryName = this.normalizeEntityName(typeName).plural
         let outputType = new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(this.get(typeName))))
         let argsType = this.listArguments(typeName)
 
@@ -435,7 +436,7 @@ export class SchemaBuilder {
 
     private installEntityById(entityName: string, query: GqlFieldMap, subscription: GqlFieldMap): void {
         let model = this.model
-        let queryName = `${toCamelCase(entityName)}ById`
+        let queryName = `${this.normalizeEntityName(entityName).singular}ById`
         let argsType = {
             id: {type: new GraphQLNonNull(GraphQLString)}
         }
@@ -476,7 +477,7 @@ export class SchemaBuilder {
     private installEntityByUniqueInput(entityName: string, query: GqlFieldMap): void {
         let model = this.model
 
-        query[`${toCamelCase(entityName)}ByUniqueInput`] = {
+        query[`${this.normalizeEntityName(entityName).singular}ByUniqueInput`] = {
             deprecationReason: `Use ${toCamelCase(entityName)}ById`,
             type: this.get(entityName),
             args: {
@@ -505,7 +506,7 @@ export class SchemaBuilder {
         let outputType = toPlural(typeName) + 'Connection'
         let edgeType = `${typeName}Edge`
 
-        query[`${toPlural(toCamelCase(typeName))}Connection`] = {
+        query[`${this.normalizeEntityName(typeName).plural}Connection`] = {
             type: new GraphQLNonNull(new GraphQLObjectType({
                 name: outputType,
                 fields: {
@@ -619,6 +620,21 @@ export class SchemaBuilder {
             })
         )
     }
+
+    private normalizeEntityName(typeName: string) {
+        let model = this.model[typeName]
+
+        let singular = toCamelCase(typeName)
+
+        let plural: string
+        if (model.kind === 'entity' && model.plural != null) {
+            plural = toCamelCase(model.plural)
+        } else {
+            plural = toPlural(singular)
+        }
+
+        return {singular, plural}
+    }
 }