Merge branch 'main' into configurable-payload-limit

cap-js · Jul 24, 2024 · 553685a · 553685a
2 parents e0dd7c7 + 4b0cb2a
commit 553685a
Show file tree

Hide file tree

Showing 32 changed files with 32 additions and 50 deletions.
diff --git a/lib/resolvers/GraphQLRequest.js b/lib/resolvers/GraphQLRequest.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 class GraphQLRequest extends cds.Request {
   constructor(args) {

diff --git a/lib/resolvers/crud/create.js b/lib/resolvers/crud/create.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 const { INSERT } = cds.ql
 const { ARGS } = require('../../constants')
 const { getArgumentByName, astToEntries } = require('../parse/ast2cqn')
@@ -13,15 +13,6 @@ module.exports = async ({ req, res }, service, entity, selection) => {
   const entries = entriesStructureToEntityStructure(service, entity, astToEntries(input))
   query.entries(entries)
 
-  if (cds.env.features.cds_validate) {
-    const assertOptions = { mandatories: true }
-    const errs = cds.validate(entries, entity, assertOptions)
-    if (errs) {
-      if (errs.length === 1) throw errs[0]
-      throw Object.assign(new Error('MULTIPLE_ERRORS'), { statusCode: 400, details: errs })
-    }
-  }
-
   const result = await service.dispatch(new GraphQLRequest({ req, res, query }))
 
   return formatResult(entity, selection, result, false)

diff --git a/lib/resolvers/crud/delete.js b/lib/resolvers/crud/delete.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 const { DELETE } = cds.ql
 const { ARGS } = require('../../constants')
 const { getArgumentByName, astToWhere } = require('../parse/ast2cqn')

diff --git a/lib/resolvers/crud/read.js b/lib/resolvers/crud/read.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 const { SELECT } = cds.ql
 const { ARGS, CONNECTION_FIELDS } = require('../../constants')
 const { getArgumentByName, astToColumns, astToWhere, astToOrderBy, astToLimit } = require('../parse/ast2cqn')

diff --git a/lib/resolvers/crud/update.js b/lib/resolvers/crud/update.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 const { SELECT, UPDATE } = cds.ql
 const { ARGS } = require('../../constants')
 const { getArgumentByName, astToColumns, astToWhere, astToEntries } = require('../parse/ast2cqn')
@@ -24,15 +24,6 @@ module.exports = async ({ req, res }, service, entity, selection) => {
   const entries = entriesStructureToEntityStructure(service, entity, astToEntries(input))
   query.with(entries)
 
-  if (cds.env.features.cds_validate) {
-    const assertOptions = { mandatories: true }
-    const errs = cds.validate(entries, entity, assertOptions)
-    if (errs) {
-      if (errs.length === 1) throw errs[0]
-      throw Object.assign(new Error('MULTIPLE_ERRORS'), { statusCode: 400, details: errs })
-    }
-  }
-
   let resultBeforeUpdate
   const result = await service.tx(async tx => {
     // read needs to be done before the update, otherwise the where clause might become invalid (case that properties in where clause are updated by the mutation)

diff --git a/test/resources/bookshop-graphql/srv/test-service.js b/test/resources/bookshop-graphql/srv/test-service.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 module.exports = cds.service.impl(srv => {
   const { Foo } = srv.entities

diff --git a/test/tests/annotations.test.js b/test/tests/annotations.test.js
@@ -1,5 +1,5 @@
 describe('graphql - annotations', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/concurrency.test.js b/test/tests/concurrency.test.js
@@ -1,5 +1,5 @@
 describe('graphql - resolver concurrency', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/context.test.js b/test/tests/context.test.js
@@ -1,5 +1,5 @@
 describe('graphql - context is set', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/custom-error-formatter.test.js b/test/tests/custom-error-formatter.test.js
@@ -1,5 +1,5 @@
 describe('graphql - custom error formatter function', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/custom-handlers.test.js b/test/tests/custom-handlers.test.js
@@ -1,5 +1,5 @@
 describe('graphql - custom handlers', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/edge-cases.test.js b/test/tests/edge-cases.test.js
@@ -1,5 +1,5 @@
 describe('graphql - edge cases', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/error-handling-dev.test.js b/test/tests/error-handling-dev.test.js
@@ -1,5 +1,5 @@
 describe('graphql - error handling in development', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/error-handling-prod.test.js b/test/tests/error-handling-prod.test.js
@@ -1,6 +1,6 @@
 describe('graphql - error handling in production', () => {
   process.env.NODE_ENV = 'production'
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/graphiql.test.js b/test/tests/graphiql.test.js
@@ -1,5 +1,5 @@
 describe('graphql - GraphiQL', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/localized.test.js b/test/tests/localized.test.js
@@ -1,5 +1,5 @@
 describe('graphql - queries with localized data', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/logger-dev.test.js b/test/tests/logger-dev.test.js
@@ -1,5 +1,5 @@
 describe('graphql - query logging in development', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
   const util = require('util')

diff --git a/test/tests/logger-prod.test.js b/test/tests/logger-prod.test.js
@@ -1,6 +1,6 @@
 describe('graphql - query logging with sanitization in production', () => {
   process.env.NODE_ENV = 'production'
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
   const util = require('util')

diff --git a/test/tests/mutations/create.test.js b/test/tests/mutations/create.test.js
@@ -1,5 +1,5 @@
 describe('graphql - create mutations', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/mutations/delete.test.js b/test/tests/mutations/delete.test.js
@@ -1,5 +1,5 @@
 describe('graphql - delete mutations', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/mutations/update.test.js b/test/tests/mutations/update.test.js
@@ -1,5 +1,5 @@
 describe('graphql - update mutations', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/queries/aliases.test.js b/test/tests/queries/aliases.test.js
@@ -1,5 +1,5 @@
 describe('graphql - aliases', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/queries/filter.test.js b/test/tests/queries/filter.test.js
@@ -1,5 +1,5 @@
 describe('graphql - filter', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/queries/fragments.test.js b/test/tests/queries/fragments.test.js
@@ -1,5 +1,5 @@
 describe('graphql - fragments', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/queries/meta.test.js b/test/tests/queries/meta.test.js
@@ -1,5 +1,5 @@
 describe('graphql - meta fields', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/queries/orderBy.test.js b/test/tests/queries/orderBy.test.js
@@ -1,5 +1,5 @@
 describe('graphql - orderBy', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/queries/paging-offset.test.js b/test/tests/queries/paging-offset.test.js
@@ -1,5 +1,5 @@
 describe('graphql - offset-based paging', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/queries/queries.test.js b/test/tests/queries/queries.test.js
@@ -1,5 +1,5 @@
 describe('graphql - queries', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/queries/totalCount.test.js b/test/tests/queries/totalCount.test.js
@@ -1,5 +1,5 @@
 describe('graphql - queries with totalCount', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/queries/variables.test.js b/test/tests/queries/variables.test.js
@@ -1,5 +1,5 @@
 describe('graphql - variables', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../../util')
 

diff --git a/test/tests/request.test.js b/test/tests/request.test.js
@@ -1,5 +1,5 @@
 describe('graphql - cds.request', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const { gql } = require('../util')
 

diff --git a/test/tests/types.test.js b/test/tests/types.test.js
@@ -46,7 +46,7 @@ const _getMutationAndVariablesForFieldWithVariable = (field, value) => ({
 })
 
 describe('graphql - types parsing and validation', () => {
-  const cds = require('@sap/cds/lib')
+  const cds = require('@sap/cds')
   const path = require('path')
   const fs = require('fs')