npm - @strapi/plugin-graphql - Versions diffs - 5.17.0-beta.0 → 5.18.0 - Mend

@strapi/plugin-graphql 5.17.0-beta.0 → 5.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/dist/admin/package.json.js CHANGED Viewed

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 var name = "@strapi/plugin-graphql";
-var version = "5.16.0";
+var version = "5.18.0";
 var description = "Adds GraphQL endpoint with default API methods.";
 var repository = {
     type: "git",
@@ -60,9 +60,9 @@ var dependencies = {
     "@graphql-tools/schema": "10.0.3",
     "@graphql-tools/utils": "^10.1.3",
     "@koa/cors": "5.0.0",
-    "@strapi/design-system": "2.0.0-rc.26",
-    "@strapi/icons": "2.0.0-rc.26",
-    "@strapi/utils": "5.16.0",
+    "@strapi/design-system": "2.0.0-rc.28",
+    "@strapi/icons": "2.0.0-rc.28",
+    "@strapi/utils": "5.18.0",
     graphql: "^16.8.1",
     "graphql-depth-limit": "^1.1.0",
     "graphql-playground-middleware-koa": "^1.6.21",
@@ -74,19 +74,19 @@ var dependencies = {
     pluralize: "8.0.0"
 };
 var devDependencies = {
-    "@strapi/strapi": "5.16.0",
-    "@strapi/types": "5.16.0",
+    "@strapi/strapi": "5.18.0",
+    "@strapi/types": "5.18.0",
     "@types/graphql-depth-limit": "1.1.5",
     "@types/koa-bodyparser": "4.3.12",
     "@types/koa__cors": "5.0.0",
     "cross-env": "^7.0.3",
-    "eslint-config-custom": "5.16.0",
+    "eslint-config-custom": "5.18.0",
     koa: "2.16.1",
     react: "18.3.1",
     "react-dom": "18.3.1",
     "react-router-dom": "6.22.3",
     "styled-components": "6.1.8",
-    tsconfig: "5.16.0",
+    tsconfig: "5.18.0",
     typescript: "5.4.4"
 };
 var peerDependencies = {

package/dist/admin/package.json.mjs CHANGED Viewed

@@ -1,5 +1,5 @@
 var name = "@strapi/plugin-graphql";
-var version = "5.16.0";
+var version = "5.18.0";
 var description = "Adds GraphQL endpoint with default API methods.";
 var repository = {
     type: "git",
@@ -56,9 +56,9 @@ var dependencies = {
     "@graphql-tools/schema": "10.0.3",
     "@graphql-tools/utils": "^10.1.3",
     "@koa/cors": "5.0.0",
-    "@strapi/design-system": "2.0.0-rc.26",
-    "@strapi/icons": "2.0.0-rc.26",
-    "@strapi/utils": "5.16.0",
+    "@strapi/design-system": "2.0.0-rc.28",
+    "@strapi/icons": "2.0.0-rc.28",
+    "@strapi/utils": "5.18.0",
     graphql: "^16.8.1",
     "graphql-depth-limit": "^1.1.0",
     "graphql-playground-middleware-koa": "^1.6.21",
@@ -70,19 +70,19 @@ var dependencies = {
     pluralize: "8.0.0"
 };
 var devDependencies = {
-    "@strapi/strapi": "5.16.0",
-    "@strapi/types": "5.16.0",
+    "@strapi/strapi": "5.18.0",
+    "@strapi/types": "5.18.0",
     "@types/graphql-depth-limit": "1.1.5",
     "@types/koa-bodyparser": "4.3.12",
     "@types/koa__cors": "5.0.0",
     "cross-env": "^7.0.3",
-    "eslint-config-custom": "5.16.0",
+    "eslint-config-custom": "5.18.0",
     koa: "2.16.1",
     react: "18.3.1",
     "react-dom": "18.3.1",
     "react-router-dom": "6.22.3",
     "styled-components": "6.1.8",
-    tsconfig: "5.16.0",
+    tsconfig: "5.18.0",
     typescript: "5.4.4"
 };
 var peerDependencies = {

package/dist/server/bootstrap.js CHANGED Viewed

@@ -85,6 +85,30 @@ async function bootstrap({ strapi }) {
     const { config } = strapi.plugin('graphql');
     const path = config('endpoint');
     const landingPage = determineLandingPage(strapi);
+    /**
+   * We need the arguments passed to the root query to be available in the association resolver
+   * so we can forward those arguments along to any relations.
+   *
+   * In order to do that we are currently storing the arguments in context.
+   * There is likely a better solution, but for now this is the simplest fix we could find.
+   *
+   * @see https://github.com/strapi/strapi/issues/23524
+   */ const pluginAddRootQueryArgs = {
+        async requestDidStart () {
+            return {
+                async executionDidStart () {
+                    return {
+                        willResolveField ({ source, args, contextValue, info }) {
+                            if (!source && info.operation.operation === 'query') {
+                                // NOTE: context.rootQueryArgs is intended for internal use only
+                                contextValue.rootQueryArgs = args;
+                            }
+                        }
+                    };
+                }
+            };
+        }
+    };
     const defaultServerConfig = {
         // Schema
         schema,
@@ -101,7 +125,8 @@ async function bootstrap({ strapi }) {
         // send 400 http status instead of 200 for input validation errors
         status400ForVariableCoercionErrors: true,
         plugins: [
-            landingPage
+            landingPage,
+            pluginAddRootQueryArgs
         ],
         cache: 'bounded'
     };

package/dist/server/bootstrap.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bootstrap.js","sources":["../../server/src/bootstrap.ts"],"sourcesContent":["import { isEmpty, mergeWith, isArray, isObject, isFunction } from 'lodash/fp';\nimport { ApolloServer, type ApolloServerPlugin, type ApolloServerOptions } from '@apollo/server';\nimport {\n ApolloServerPluginLandingPageLocalDefault,\n ApolloServerPluginLandingPageProductionDefault,\n} from '@apollo/server/plugin/landingPage/default';\nimport { koaMiddleware } from '@as-integrations/koa';\nimport depthLimit from 'graphql-depth-limit';\nimport bodyParser from 'koa-bodyparser';\nimport cors from '@koa/cors';\n\nimport type { Core } from '@strapi/types';\nimport type { BaseContext, DefaultContextExtends, DefaultStateExtends } from 'koa';\n\nimport { formatGraphqlError } from './format-graphql-error';\n\nconst merge = mergeWith((a, b) => {\n if (isArray(a) && isArray(b)) {\n return a.concat(b);\n }\n});\n\nexport const determineLandingPage = (strapi: Core.Strapi) => {\n const { config } = strapi.plugin('graphql');\n const utils = strapi.plugin('graphql').service('utils');\n\n /*\n configLanding page may be one of the following:\n \n - true: always use \"playground\" even in production\n * - false: never show \"playground\" even in non-production\n * - undefined: default Apollo behavior (hide playground on production)\n * - a function that returns an Apollo plugin that implements renderLandingPage\n ** */\n const configLandingPage = config('landingPage');\n\n const isProduction = process.env.NODE_ENV === 'production';\n\n const localLanding = () => {\n strapi.log.debug('Apollo landing page: local');\n utils.playground.setEnabled(true);\n return ApolloServerPluginLandingPageLocalDefault();\n };\n\n const prodLanding = () => {\n strapi.log.debug('Apollo landing page: production');\n utils.playground.setEnabled(false);\n return ApolloServerPluginLandingPageProductionDefault();\n };\n\n const userLanding = (userFunction: (strapi?: Core.Strapi) => ApolloServerPlugin \| boolean) => {\n strapi.log.debug('Apollo landing page: from user-defined function...');\n const result = userFunction(strapi);\n if (result === true) {\n return localLanding();\n }\n if (result === false) {\n return prodLanding();\n }\n strapi.log.debug('Apollo landing page: user-defined');\n return result;\n };\n\n // DEPRECATED, remove in Strapi v6\n const playgroundAlways = config('playgroundAlways');\n if (playgroundAlways !== undefined) {\n strapi.log.warn(\n 'The graphql config playgroundAlways is deprecated. This will be removed in Strapi 6. Please use landingPage instead. '\n );\n }\n if (playgroundAlways === false) {\n strapi.log.warn(\n 'graphql config playgroundAlways:false has no effect, please use landingPage:false to disable Graphql Playground in all environments'\n );\n }\n\n if (playgroundAlways \|\| configLandingPage === true) {\n return localLanding();\n }\n\n // if landing page has been disabled, use production\n if (configLandingPage === false) {\n return prodLanding();\n }\n\n // If user did not define any settings, use our defaults\n if (configLandingPage === undefined) {\n return isProduction ? prodLanding() : localLanding();\n }\n\n // if user provided a landing page function, return that\n if (isFunction(configLandingPage)) {\n return userLanding(configLandingPage);\n }\n\n // If no other setting could be found, default to production settings\n strapi.log.warn(\n 'Your Graphql landing page has been disabled because there is a problem with your Graphql settings'\n );\n return prodLanding();\n};\n\nexport async function bootstrap({ strapi }: { strapi: Core.Strapi }) {\n // Generate the GraphQL schema for the content API\n const schema = strapi.plugin('graphql').service('content-api').buildSchema();\n\n if (isEmpty(schema)) {\n strapi.log.warn('The GraphQL schema has not been generated because it is empty');\n\n return;\n }\n\n const { config } = strapi.plugin('graphql');\n\n const path: string = config('endpoint');\n\n const landingPage = determineLandingPage(strapi);\n\n type CustomOptions = {\n cors: boolean;\n uploads: boolean;\n bodyParserConfig: boolean;\n };\n\n const defaultServerConfig: ApolloServerOptions<BaseContext> & CustomOptions = {\n // Schema\n schema,\n\n // Validation\n validationRules: [depthLimit(config('depthLimit') as number) as any],\n\n // Errors\n formatError: formatGraphqlError,\n\n // Misc\n cors: false,\n uploads: false,\n bodyParserConfig: true,\n // send 400 http status instead of 200 for input validation errors\n status400ForVariableCoercionErrors: true,\n plugins: [landingPage],\n\n cache: 'bounded' as const,\n };\n\n const serverConfig = merge(\n defaultServerConfig,\n config('apolloServer')\n ) as ApolloServerOptions<BaseContext> & CustomOptions;\n\n // Create a new Apollo server\n const server = new ApolloServer(serverConfig);\n\n try {\n // server.start() must be called before using server.applyMiddleware()\n await server.start();\n } catch (error) {\n if (error instanceof Error) {\n strapi.log.error('Failed to start the Apollo server', error.message);\n }\n\n throw error;\n }\n\n // Create the route handlers for Strapi\n const handler: Core.MiddlewareHandler[] = [];\n\n // add cors middleware\n if (cors) {\n handler.push(cors());\n }\n\n // add koa bodyparser middleware\n if (isObject(serverConfig.bodyParserConfig)) {\n handler.push(bodyParser(serverConfig.bodyParserConfig));\n } else if (serverConfig.bodyParserConfig) {\n handler.push(bodyParser());\n } else {\n strapi.log.debug('Body parser has been disabled for Apollo server');\n }\n\n // add the Strapi auth middleware\n handler.push((ctx, next) => {\n ctx.state.route = {\n info: {\n // Indicate it's a content API route\n type: 'content-api',\n },\n };\n\n const isPlaygroundRequest =\n ctx.request.method === 'GET' &&\n ctx.request.url === path && // Matches the GraphQL endpoint\n strapi.plugin('graphql').service('utils').playground.isEnabled() && // Only allow if the Playground is enabled\n ctx.request.header.accept?.includes('text/html'); // Specific to Playground UI loading\n\n // Skip authentication for the GraphQL Playground UI\n if (isPlaygroundRequest) {\n return next();\n }\n\n return strapi.auth.authenticate(ctx, next);\n });\n\n // add the graphql server for koa\n handler.push(\n koaMiddleware<DefaultStateExtends, DefaultContextExtends>(server, {\n // Initialize loaders for this request.\n context: async ({ ctx }) => ({\n state: ctx.state,\n koaContext: ctx,\n }),\n })\n );\n\n // now that handlers are set up, add the graphql route to our apollo server\n strapi.server.routes([\n {\n method: 'ALL',\n path,\n handler,\n config: {\n auth: false,\n },\n },\n ]);\n\n // Register destroy behavior\n // We're doing it here instead of exposing a destroy method to the strapi-server.js\n // file since we need to have access to the ApolloServer instance\n strapi.plugin('graphql').destroy = async () => {\n await server.stop();\n };\n}\n"],"names":["merge","mergeWith","a","b","isArray","concat","determineLandingPage","strapi","config","plugin","utils","service","configLandingPage","isProduction","process","env","NODE_ENV","localLanding","log","debug","playground","setEnabled","ApolloServerPluginLandingPageLocalDefault","prodLanding","ApolloServerPluginLandingPageProductionDefault","userLanding","userFunction","result","playgroundAlways","undefined","warn","isFunction","bootstrap","schema","buildSchema","isEmpty","path","landingPage","defaultServerConfig","validationRules","depthLimit","formatError","formatGraphqlError","cors","uploads","bodyParserConfig","status400ForVariableCoercionErrors","plugins","cache","serverConfig","server","ApolloServer","start","error","Error","message","handler","push","isObject","bodyParser","ctx","next","state","route","info","type","isPlaygroundRequest","request","method","url","isEnabled","header","accept","includes","auth","authenticate","koaMiddleware","context","koaContext","routes","destroy","stop"],"mappings":"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"}
1	+ {"version":3,"file":"bootstrap.js","sources":["../../server/src/bootstrap.ts"],"sourcesContent":["import { isEmpty, mergeWith, isArray, isObject, isFunction } from 'lodash/fp';\nimport { ApolloServer, type ApolloServerPlugin, type ApolloServerOptions } from '@apollo/server';\nimport {\n ApolloServerPluginLandingPageLocalDefault,\n ApolloServerPluginLandingPageProductionDefault,\n} from '@apollo/server/plugin/landingPage/default';\nimport { koaMiddleware } from '@as-integrations/koa';\nimport depthLimit from 'graphql-depth-limit';\nimport bodyParser from 'koa-bodyparser';\nimport cors from '@koa/cors';\n\nimport type { Core } from '@strapi/types';\nimport type { BaseContext, DefaultContextExtends, DefaultStateExtends } from 'koa';\n\nimport { formatGraphqlError } from './format-graphql-error';\n\nconst merge = mergeWith((a, b) => {\n if (isArray(a) && isArray(b)) {\n return a.concat(b);\n }\n});\n\ntype StrapiGraphQLContext = BaseContext & {\n rootQueryArgs?: Record<string, unknown>;\n};\n\nexport const determineLandingPage = (\n strapi: Core.Strapi\n): ApolloServerPlugin<StrapiGraphQLContext> => {\n const { config } = strapi.plugin('graphql');\n const utils = strapi.plugin('graphql').service('utils');\n\n /*\n configLanding page may be one of the following:\n \n - true: always use \"playground\" even in production\n * - false: never show \"playground\" even in non-production\n * - undefined: default Apollo behavior (hide playground on production)\n * - a function that returns an Apollo plugin that implements renderLandingPage\n ** /\n const configLandingPage = config('landingPage');\n\n const isProduction = process.env.NODE_ENV === 'production';\n\n const localLanding = () => {\n strapi.log.debug('Apollo landing page: local');\n utils.playground.setEnabled(true);\n return ApolloServerPluginLandingPageLocalDefault();\n };\n\n const prodLanding = () => {\n strapi.log.debug('Apollo landing page: production');\n utils.playground.setEnabled(false);\n return ApolloServerPluginLandingPageProductionDefault();\n };\n\n const userLanding = (userFunction: (strapi?: Core.Strapi) => ApolloServerPlugin \| boolean) => {\n strapi.log.debug('Apollo landing page: from user-defined function...');\n const result = userFunction(strapi);\n if (result === true) {\n return localLanding();\n }\n if (result === false) {\n return prodLanding();\n }\n strapi.log.debug('Apollo landing page: user-defined');\n return result;\n };\n\n // DEPRECATED, remove in Strapi v6\n const playgroundAlways = config('playgroundAlways');\n if (playgroundAlways !== undefined) {\n strapi.log.warn(\n 'The graphql config playgroundAlways is deprecated. This will be removed in Strapi 6. Please use landingPage instead. '\n );\n }\n if (playgroundAlways === false) {\n strapi.log.warn(\n 'graphql config playgroundAlways:false has no effect, please use landingPage:false to disable Graphql Playground in all environments'\n );\n }\n\n if (playgroundAlways \|\| configLandingPage === true) {\n return localLanding();\n }\n\n // if landing page has been disabled, use production\n if (configLandingPage === false) {\n return prodLanding();\n }\n\n // If user did not define any settings, use our defaults\n if (configLandingPage === undefined) {\n return isProduction ? prodLanding() : localLanding();\n }\n\n // if user provided a landing page function, return that\n if (isFunction(configLandingPage)) {\n return userLanding(configLandingPage);\n }\n\n // If no other setting could be found, default to production settings\n strapi.log.warn(\n 'Your Graphql landing page has been disabled because there is a problem with your Graphql settings'\n );\n return prodLanding();\n};\n\nexport async function bootstrap({ strapi }: { strapi: Core.Strapi }) {\n // Generate the GraphQL schema for the content API\n const schema = strapi.plugin('graphql').service('content-api').buildSchema();\n\n if (isEmpty(schema)) {\n strapi.log.warn('The GraphQL schema has not been generated because it is empty');\n\n return;\n }\n\n const { config } = strapi.plugin('graphql');\n\n const path: string = config('endpoint');\n\n const landingPage = determineLandingPage(strapi);\n /\n We need the arguments passed to the root query to be available in the association resolver\n * so we can forward those arguments along to any relations.\n \n In order to do that we are currently storing the arguments in context.\n * There is likely a better solution, but for now this is the simplest fix we could find.\n \n @see https://github.com/strapi/strapi/issues/23524\n */\n const pluginAddRootQueryArgs: ApolloServerPlugin<StrapiGraphQLContext> = {\n async requestDidStart() {\n return {\n async executionDidStart() {\n return {\n willResolveField({ source, args, contextValue, info }) {\n if (!source && info.operation.operation === 'query') {\n // NOTE: context.rootQueryArgs is intended for internal use only\n contextValue.rootQueryArgs = args;\n }\n },\n };\n },\n };\n },\n };\n\n type CustomOptions = {\n cors: boolean;\n uploads: boolean;\n bodyParserConfig: boolean;\n };\n\n const defaultServerConfig: ApolloServerOptions<StrapiGraphQLContext> & CustomOptions = {\n // Schema\n schema,\n\n // Validation\n validationRules: [depthLimit(config('depthLimit') as number) as any],\n\n // Errors\n formatError: formatGraphqlError,\n\n // Misc\n cors: false,\n uploads: false,\n bodyParserConfig: true,\n // send 400 http status instead of 200 for input validation errors\n status400ForVariableCoercionErrors: true,\n plugins: [landingPage, pluginAddRootQueryArgs],\n\n cache: 'bounded' as const,\n };\n\n const serverConfig = merge(\n defaultServerConfig,\n config('apolloServer')\n ) as ApolloServerOptions<StrapiGraphQLContext> & CustomOptions;\n\n // Create a new Apollo server\n const server = new ApolloServer(serverConfig);\n\n try {\n // server.start() must be called before using server.applyMiddleware()\n await server.start();\n } catch (error) {\n if (error instanceof Error) {\n strapi.log.error('Failed to start the Apollo server', error.message);\n }\n\n throw error;\n }\n\n // Create the route handlers for Strapi\n const handler: Core.MiddlewareHandler[] = [];\n\n // add cors middleware\n if (cors) {\n handler.push(cors());\n }\n\n // add koa bodyparser middleware\n if (isObject(serverConfig.bodyParserConfig)) {\n handler.push(bodyParser(serverConfig.bodyParserConfig));\n } else if (serverConfig.bodyParserConfig) {\n handler.push(bodyParser());\n } else {\n strapi.log.debug('Body parser has been disabled for Apollo server');\n }\n\n // add the Strapi auth middleware\n handler.push((ctx, next) => {\n ctx.state.route = {\n info: {\n // Indicate it's a content API route\n type: 'content-api',\n },\n };\n\n const isPlaygroundRequest =\n ctx.request.method === 'GET' &&\n ctx.request.url === path && // Matches the GraphQL endpoint\n strapi.plugin('graphql').service('utils').playground.isEnabled() && // Only allow if the Playground is enabled\n ctx.request.header.accept?.includes('text/html'); // Specific to Playground UI loading\n\n // Skip authentication for the GraphQL Playground UI\n if (isPlaygroundRequest) {\n return next();\n }\n\n return strapi.auth.authenticate(ctx, next);\n });\n\n // add the graphql server for koa\n handler.push(\n koaMiddleware<DefaultStateExtends, DefaultContextExtends>(server, {\n // Initialize loaders for this request.\n context: async ({ ctx }) => ({\n state: ctx.state,\n koaContext: ctx,\n }),\n })\n );\n\n // now that handlers are set up, add the graphql route to our apollo server\n strapi.server.routes([\n {\n method: 'ALL',\n path,\n handler,\n config: {\n auth: false,\n },\n },\n ]);\n\n // Register destroy behavior\n // We're doing it here instead of exposing a destroy method to the strapi-server.js\n // file since we need to have access to the ApolloServer instance\n strapi.plugin('graphql').destroy = async () => {\n await server.stop();\n };\n}\n"],"names":["merge","mergeWith","a","b","isArray","concat","determineLandingPage","strapi","config","plugin","utils","service","configLandingPage","isProduction","process","env","NODE_ENV","localLanding","log","debug","playground","setEnabled","ApolloServerPluginLandingPageLocalDefault","prodLanding","ApolloServerPluginLandingPageProductionDefault","userLanding","userFunction","result","playgroundAlways","undefined","warn","isFunction","bootstrap","schema","buildSchema","isEmpty","path","landingPage","pluginAddRootQueryArgs","requestDidStart","executionDidStart","willResolveField","source","args","contextValue","info","operation","rootQueryArgs","defaultServerConfig","validationRules","depthLimit","formatError","formatGraphqlError","cors","uploads","bodyParserConfig","status400ForVariableCoercionErrors","plugins","cache","serverConfig","server","ApolloServer","start","error","Error","message","handler","push","isObject","bodyParser","ctx","next","state","route","type","isPlaygroundRequest","request","method","url","isEnabled","header","accept","includes","auth","authenticate","koaMiddleware","context","koaContext","routes","destroy","stop"],"mappings":"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"}

package/dist/server/bootstrap.mjs CHANGED Viewed

@@ -83,6 +83,30 @@ async function bootstrap({ strapi }) {
     const { config } = strapi.plugin('graphql');
     const path = config('endpoint');
     const landingPage = determineLandingPage(strapi);
+    /**
+   * We need the arguments passed to the root query to be available in the association resolver
+   * so we can forward those arguments along to any relations.
+   *
+   * In order to do that we are currently storing the arguments in context.
+   * There is likely a better solution, but for now this is the simplest fix we could find.
+   *
+   * @see https://github.com/strapi/strapi/issues/23524
+   */ const pluginAddRootQueryArgs = {
+        async requestDidStart () {
+            return {
+                async executionDidStart () {
+                    return {
+                        willResolveField ({ source, args, contextValue, info }) {
+                            if (!source && info.operation.operation === 'query') {
+                                // NOTE: context.rootQueryArgs is intended for internal use only
+                                contextValue.rootQueryArgs = args;
+                            }
+                        }
+                    };
+                }
+            };
+        }
+    };
     const defaultServerConfig = {
         // Schema
         schema,
@@ -99,7 +123,8 @@ async function bootstrap({ strapi }) {
         // send 400 http status instead of 200 for input validation errors
         status400ForVariableCoercionErrors: true,
         plugins: [
-            landingPage
+            landingPage,
+            pluginAddRootQueryArgs
         ],
         cache: 'bounded'
     };

package/dist/server/bootstrap.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bootstrap.mjs","sources":["../../server/src/bootstrap.ts"],"sourcesContent":["import { isEmpty, mergeWith, isArray, isObject, isFunction } from 'lodash/fp';\nimport { ApolloServer, type ApolloServerPlugin, type ApolloServerOptions } from '@apollo/server';\nimport {\n ApolloServerPluginLandingPageLocalDefault,\n ApolloServerPluginLandingPageProductionDefault,\n} from '@apollo/server/plugin/landingPage/default';\nimport { koaMiddleware } from '@as-integrations/koa';\nimport depthLimit from 'graphql-depth-limit';\nimport bodyParser from 'koa-bodyparser';\nimport cors from '@koa/cors';\n\nimport type { Core } from '@strapi/types';\nimport type { BaseContext, DefaultContextExtends, DefaultStateExtends } from 'koa';\n\nimport { formatGraphqlError } from './format-graphql-error';\n\nconst merge = mergeWith((a, b) => {\n if (isArray(a) && isArray(b)) {\n return a.concat(b);\n }\n});\n\nexport const determineLandingPage = (strapi: Core.Strapi) => {\n const { config } = strapi.plugin('graphql');\n const utils = strapi.plugin('graphql').service('utils');\n\n /*\n configLanding page may be one of the following:\n \n - true: always use \"playground\" even in production\n * - false: never show \"playground\" even in non-production\n * - undefined: default Apollo behavior (hide playground on production)\n * - a function that returns an Apollo plugin that implements renderLandingPage\n ** */\n const configLandingPage = config('landingPage');\n\n const isProduction = process.env.NODE_ENV === 'production';\n\n const localLanding = () => {\n strapi.log.debug('Apollo landing page: local');\n utils.playground.setEnabled(true);\n return ApolloServerPluginLandingPageLocalDefault();\n };\n\n const prodLanding = () => {\n strapi.log.debug('Apollo landing page: production');\n utils.playground.setEnabled(false);\n return ApolloServerPluginLandingPageProductionDefault();\n };\n\n const userLanding = (userFunction: (strapi?: Core.Strapi) => ApolloServerPlugin \| boolean) => {\n strapi.log.debug('Apollo landing page: from user-defined function...');\n const result = userFunction(strapi);\n if (result === true) {\n return localLanding();\n }\n if (result === false) {\n return prodLanding();\n }\n strapi.log.debug('Apollo landing page: user-defined');\n return result;\n };\n\n // DEPRECATED, remove in Strapi v6\n const playgroundAlways = config('playgroundAlways');\n if (playgroundAlways !== undefined) {\n strapi.log.warn(\n 'The graphql config playgroundAlways is deprecated. This will be removed in Strapi 6. Please use landingPage instead. '\n );\n }\n if (playgroundAlways === false) {\n strapi.log.warn(\n 'graphql config playgroundAlways:false has no effect, please use landingPage:false to disable Graphql Playground in all environments'\n );\n }\n\n if (playgroundAlways \|\| configLandingPage === true) {\n return localLanding();\n }\n\n // if landing page has been disabled, use production\n if (configLandingPage === false) {\n return prodLanding();\n }\n\n // If user did not define any settings, use our defaults\n if (configLandingPage === undefined) {\n return isProduction ? prodLanding() : localLanding();\n }\n\n // if user provided a landing page function, return that\n if (isFunction(configLandingPage)) {\n return userLanding(configLandingPage);\n }\n\n // If no other setting could be found, default to production settings\n strapi.log.warn(\n 'Your Graphql landing page has been disabled because there is a problem with your Graphql settings'\n );\n return prodLanding();\n};\n\nexport async function bootstrap({ strapi }: { strapi: Core.Strapi }) {\n // Generate the GraphQL schema for the content API\n const schema = strapi.plugin('graphql').service('content-api').buildSchema();\n\n if (isEmpty(schema)) {\n strapi.log.warn('The GraphQL schema has not been generated because it is empty');\n\n return;\n }\n\n const { config } = strapi.plugin('graphql');\n\n const path: string = config('endpoint');\n\n const landingPage = determineLandingPage(strapi);\n\n type CustomOptions = {\n cors: boolean;\n uploads: boolean;\n bodyParserConfig: boolean;\n };\n\n const defaultServerConfig: ApolloServerOptions<BaseContext> & CustomOptions = {\n // Schema\n schema,\n\n // Validation\n validationRules: [depthLimit(config('depthLimit') as number) as any],\n\n // Errors\n formatError: formatGraphqlError,\n\n // Misc\n cors: false,\n uploads: false,\n bodyParserConfig: true,\n // send 400 http status instead of 200 for input validation errors\n status400ForVariableCoercionErrors: true,\n plugins: [landingPage],\n\n cache: 'bounded' as const,\n };\n\n const serverConfig = merge(\n defaultServerConfig,\n config('apolloServer')\n ) as ApolloServerOptions<BaseContext> & CustomOptions;\n\n // Create a new Apollo server\n const server = new ApolloServer(serverConfig);\n\n try {\n // server.start() must be called before using server.applyMiddleware()\n await server.start();\n } catch (error) {\n if (error instanceof Error) {\n strapi.log.error('Failed to start the Apollo server', error.message);\n }\n\n throw error;\n }\n\n // Create the route handlers for Strapi\n const handler: Core.MiddlewareHandler[] = [];\n\n // add cors middleware\n if (cors) {\n handler.push(cors());\n }\n\n // add koa bodyparser middleware\n if (isObject(serverConfig.bodyParserConfig)) {\n handler.push(bodyParser(serverConfig.bodyParserConfig));\n } else if (serverConfig.bodyParserConfig) {\n handler.push(bodyParser());\n } else {\n strapi.log.debug('Body parser has been disabled for Apollo server');\n }\n\n // add the Strapi auth middleware\n handler.push((ctx, next) => {\n ctx.state.route = {\n info: {\n // Indicate it's a content API route\n type: 'content-api',\n },\n };\n\n const isPlaygroundRequest =\n ctx.request.method === 'GET' &&\n ctx.request.url === path && // Matches the GraphQL endpoint\n strapi.plugin('graphql').service('utils').playground.isEnabled() && // Only allow if the Playground is enabled\n ctx.request.header.accept?.includes('text/html'); // Specific to Playground UI loading\n\n // Skip authentication for the GraphQL Playground UI\n if (isPlaygroundRequest) {\n return next();\n }\n\n return strapi.auth.authenticate(ctx, next);\n });\n\n // add the graphql server for koa\n handler.push(\n koaMiddleware<DefaultStateExtends, DefaultContextExtends>(server, {\n // Initialize loaders for this request.\n context: async ({ ctx }) => ({\n state: ctx.state,\n koaContext: ctx,\n }),\n })\n );\n\n // now that handlers are set up, add the graphql route to our apollo server\n strapi.server.routes([\n {\n method: 'ALL',\n path,\n handler,\n config: {\n auth: false,\n },\n },\n ]);\n\n // Register destroy behavior\n // We're doing it here instead of exposing a destroy method to the strapi-server.js\n // file since we need to have access to the ApolloServer instance\n strapi.plugin('graphql').destroy = async () => {\n await server.stop();\n };\n}\n"],"names":["merge","mergeWith","a","b","isArray","concat","determineLandingPage","strapi","config","plugin","utils","service","configLandingPage","isProduction","process","env","NODE_ENV","localLanding","log","debug","playground","setEnabled","ApolloServerPluginLandingPageLocalDefault","prodLanding","ApolloServerPluginLandingPageProductionDefault","userLanding","userFunction","result","playgroundAlways","undefined","warn","isFunction","bootstrap","schema","buildSchema","isEmpty","path","landingPage","defaultServerConfig","validationRules","depthLimit","formatError","formatGraphqlError","cors","uploads","bodyParserConfig","status400ForVariableCoercionErrors","plugins","cache","serverConfig","server","ApolloServer","start","error","Error","message","handler","push","isObject","bodyParser","ctx","next","state","route","info","type","isPlaygroundRequest","request","method","url","isEnabled","header","accept","includes","auth","authenticate","koaMiddleware","context","koaContext","routes","destroy","stop"],"mappings":"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"}
1	+ {"version":3,"file":"bootstrap.mjs","sources":["../../server/src/bootstrap.ts"],"sourcesContent":["import { isEmpty, mergeWith, isArray, isObject, isFunction } from 'lodash/fp';\nimport { ApolloServer, type ApolloServerPlugin, type ApolloServerOptions } from '@apollo/server';\nimport {\n ApolloServerPluginLandingPageLocalDefault,\n ApolloServerPluginLandingPageProductionDefault,\n} from '@apollo/server/plugin/landingPage/default';\nimport { koaMiddleware } from '@as-integrations/koa';\nimport depthLimit from 'graphql-depth-limit';\nimport bodyParser from 'koa-bodyparser';\nimport cors from '@koa/cors';\n\nimport type { Core } from '@strapi/types';\nimport type { BaseContext, DefaultContextExtends, DefaultStateExtends } from 'koa';\n\nimport { formatGraphqlError } from './format-graphql-error';\n\nconst merge = mergeWith((a, b) => {\n if (isArray(a) && isArray(b)) {\n return a.concat(b);\n }\n});\n\ntype StrapiGraphQLContext = BaseContext & {\n rootQueryArgs?: Record<string, unknown>;\n};\n\nexport const determineLandingPage = (\n strapi: Core.Strapi\n): ApolloServerPlugin<StrapiGraphQLContext> => {\n const { config } = strapi.plugin('graphql');\n const utils = strapi.plugin('graphql').service('utils');\n\n /*\n configLanding page may be one of the following:\n \n - true: always use \"playground\" even in production\n * - false: never show \"playground\" even in non-production\n * - undefined: default Apollo behavior (hide playground on production)\n * - a function that returns an Apollo plugin that implements renderLandingPage\n ** /\n const configLandingPage = config('landingPage');\n\n const isProduction = process.env.NODE_ENV === 'production';\n\n const localLanding = () => {\n strapi.log.debug('Apollo landing page: local');\n utils.playground.setEnabled(true);\n return ApolloServerPluginLandingPageLocalDefault();\n };\n\n const prodLanding = () => {\n strapi.log.debug('Apollo landing page: production');\n utils.playground.setEnabled(false);\n return ApolloServerPluginLandingPageProductionDefault();\n };\n\n const userLanding = (userFunction: (strapi?: Core.Strapi) => ApolloServerPlugin \| boolean) => {\n strapi.log.debug('Apollo landing page: from user-defined function...');\n const result = userFunction(strapi);\n if (result === true) {\n return localLanding();\n }\n if (result === false) {\n return prodLanding();\n }\n strapi.log.debug('Apollo landing page: user-defined');\n return result;\n };\n\n // DEPRECATED, remove in Strapi v6\n const playgroundAlways = config('playgroundAlways');\n if (playgroundAlways !== undefined) {\n strapi.log.warn(\n 'The graphql config playgroundAlways is deprecated. This will be removed in Strapi 6. Please use landingPage instead. '\n );\n }\n if (playgroundAlways === false) {\n strapi.log.warn(\n 'graphql config playgroundAlways:false has no effect, please use landingPage:false to disable Graphql Playground in all environments'\n );\n }\n\n if (playgroundAlways \|\| configLandingPage === true) {\n return localLanding();\n }\n\n // if landing page has been disabled, use production\n if (configLandingPage === false) {\n return prodLanding();\n }\n\n // If user did not define any settings, use our defaults\n if (configLandingPage === undefined) {\n return isProduction ? prodLanding() : localLanding();\n }\n\n // if user provided a landing page function, return that\n if (isFunction(configLandingPage)) {\n return userLanding(configLandingPage);\n }\n\n // If no other setting could be found, default to production settings\n strapi.log.warn(\n 'Your Graphql landing page has been disabled because there is a problem with your Graphql settings'\n );\n return prodLanding();\n};\n\nexport async function bootstrap({ strapi }: { strapi: Core.Strapi }) {\n // Generate the GraphQL schema for the content API\n const schema = strapi.plugin('graphql').service('content-api').buildSchema();\n\n if (isEmpty(schema)) {\n strapi.log.warn('The GraphQL schema has not been generated because it is empty');\n\n return;\n }\n\n const { config } = strapi.plugin('graphql');\n\n const path: string = config('endpoint');\n\n const landingPage = determineLandingPage(strapi);\n /\n We need the arguments passed to the root query to be available in the association resolver\n * so we can forward those arguments along to any relations.\n \n In order to do that we are currently storing the arguments in context.\n * There is likely a better solution, but for now this is the simplest fix we could find.\n \n @see https://github.com/strapi/strapi/issues/23524\n */\n const pluginAddRootQueryArgs: ApolloServerPlugin<StrapiGraphQLContext> = {\n async requestDidStart() {\n return {\n async executionDidStart() {\n return {\n willResolveField({ source, args, contextValue, info }) {\n if (!source && info.operation.operation === 'query') {\n // NOTE: context.rootQueryArgs is intended for internal use only\n contextValue.rootQueryArgs = args;\n }\n },\n };\n },\n };\n },\n };\n\n type CustomOptions = {\n cors: boolean;\n uploads: boolean;\n bodyParserConfig: boolean;\n };\n\n const defaultServerConfig: ApolloServerOptions<StrapiGraphQLContext> & CustomOptions = {\n // Schema\n schema,\n\n // Validation\n validationRules: [depthLimit(config('depthLimit') as number) as any],\n\n // Errors\n formatError: formatGraphqlError,\n\n // Misc\n cors: false,\n uploads: false,\n bodyParserConfig: true,\n // send 400 http status instead of 200 for input validation errors\n status400ForVariableCoercionErrors: true,\n plugins: [landingPage, pluginAddRootQueryArgs],\n\n cache: 'bounded' as const,\n };\n\n const serverConfig = merge(\n defaultServerConfig,\n config('apolloServer')\n ) as ApolloServerOptions<StrapiGraphQLContext> & CustomOptions;\n\n // Create a new Apollo server\n const server = new ApolloServer(serverConfig);\n\n try {\n // server.start() must be called before using server.applyMiddleware()\n await server.start();\n } catch (error) {\n if (error instanceof Error) {\n strapi.log.error('Failed to start the Apollo server', error.message);\n }\n\n throw error;\n }\n\n // Create the route handlers for Strapi\n const handler: Core.MiddlewareHandler[] = [];\n\n // add cors middleware\n if (cors) {\n handler.push(cors());\n }\n\n // add koa bodyparser middleware\n if (isObject(serverConfig.bodyParserConfig)) {\n handler.push(bodyParser(serverConfig.bodyParserConfig));\n } else if (serverConfig.bodyParserConfig) {\n handler.push(bodyParser());\n } else {\n strapi.log.debug('Body parser has been disabled for Apollo server');\n }\n\n // add the Strapi auth middleware\n handler.push((ctx, next) => {\n ctx.state.route = {\n info: {\n // Indicate it's a content API route\n type: 'content-api',\n },\n };\n\n const isPlaygroundRequest =\n ctx.request.method === 'GET' &&\n ctx.request.url === path && // Matches the GraphQL endpoint\n strapi.plugin('graphql').service('utils').playground.isEnabled() && // Only allow if the Playground is enabled\n ctx.request.header.accept?.includes('text/html'); // Specific to Playground UI loading\n\n // Skip authentication for the GraphQL Playground UI\n if (isPlaygroundRequest) {\n return next();\n }\n\n return strapi.auth.authenticate(ctx, next);\n });\n\n // add the graphql server for koa\n handler.push(\n koaMiddleware<DefaultStateExtends, DefaultContextExtends>(server, {\n // Initialize loaders for this request.\n context: async ({ ctx }) => ({\n state: ctx.state,\n koaContext: ctx,\n }),\n })\n );\n\n // now that handlers are set up, add the graphql route to our apollo server\n strapi.server.routes([\n {\n method: 'ALL',\n path,\n handler,\n config: {\n auth: false,\n },\n },\n ]);\n\n // Register destroy behavior\n // We're doing it here instead of exposing a destroy method to the strapi-server.js\n // file since we need to have access to the ApolloServer instance\n strapi.plugin('graphql').destroy = async () => {\n await server.stop();\n };\n}\n"],"names":["merge","mergeWith","a","b","isArray","concat","determineLandingPage","strapi","config","plugin","utils","service","configLandingPage","isProduction","process","env","NODE_ENV","localLanding","log","debug","playground","setEnabled","ApolloServerPluginLandingPageLocalDefault","prodLanding","ApolloServerPluginLandingPageProductionDefault","userLanding","userFunction","result","playgroundAlways","undefined","warn","isFunction","bootstrap","schema","buildSchema","isEmpty","path","landingPage","pluginAddRootQueryArgs","requestDidStart","executionDidStart","willResolveField","source","args","contextValue","info","operation","rootQueryArgs","defaultServerConfig","validationRules","depthLimit","formatError","formatGraphqlError","cors","uploads","bodyParserConfig","status400ForVariableCoercionErrors","plugins","cache","serverConfig","server","ApolloServer","start","error","Error","message","handler","push","isObject","bodyParser","ctx","next","state","route","type","isPlaygroundRequest","request","method","url","isEnabled","header","accept","includes","auth","authenticate","koaMiddleware","context","koaContext","routes","destroy","stop"],"mappings":"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"}

package/dist/server/services/builders/resolvers/association.js CHANGED Viewed

@@ -34,14 +34,14 @@ var associationResolvers = (({ strapi })=>{
                     auth
                 });
                 const transformedQuery = strapi.get('query-params').transform(targetUID, sanitizedQuery);
-                const defaultFilters = {
+                const isTargetDraftAndPublishContentType = utils.contentTypes.hasDraftAndPublish(targetContentType);
+                const defaultFilters = isTargetDraftAndPublishContentType ? {
                     where: {
-                        // Return the same draft and publish version as the parent
                         publishedAt: {
-                            $notNull: 'publishedAt' in parent ? parent.publishedAt !== null : true
+                            $notNull: context.rootQueryArgs?.status ? context.rootQueryArgs?.status === 'published' : true
                         }
                     }
-                };
+                } : {};
                 const dbQuery = fp.merge(defaultFilters, transformedQuery);
                 const data = await strapi.db?.query(contentTypeUID).load(parent, attributeName, dbQuery);
                 const info = {

package/dist/server/services/builders/resolvers/association.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"association.js","sources":["../../../../../server/src/services/builders/resolvers/association.ts"],"sourcesContent":["import { get, merge } from 'lodash/fp';\nimport { async, errors } from '@strapi/utils';\nimport type { Internal } from '@strapi/types';\n\nimport type { Context } from '../../types';\n\nconst { ApplicationError } = errors;\n\nexport default ({ strapi }: Context) => {\n const { service: getGraphQLService } = strapi.plugin('graphql');\n\n const { isMorphRelation, isMedia } = getGraphQLService('utils').attributes;\n const { transformArgs } = getGraphQLService('builders').utils;\n const { toEntityResponse, toEntityResponseCollection } = getGraphQLService('format').returnTypes;\n\n return {\n buildAssociationResolver({\n contentTypeUID,\n attributeName,\n }: {\n contentTypeUID: Internal.UID.ContentType;\n attributeName: string;\n }) {\n const contentType = strapi.getModel(contentTypeUID);\n const attribute: any = contentType.attributes[attributeName];\n\n if (!attribute) {\n throw new ApplicationError(\n `Failed to build an association resolver for ${contentTypeUID}::${attributeName}`\n );\n }\n\n const isMediaAttribute = isMedia(attribute);\n const isMorphAttribute = isMorphRelation(attribute);\n\n const targetUID = isMediaAttribute ? 'plugin::upload.file' : attribute.target;\n const isToMany = isMediaAttribute ? attribute.multiple : attribute.relation.endsWith('Many');\n\n const targetContentType = strapi.getModel(targetUID);\n\n return async (parent: any, args: any = {}, context: any = {}) => {\n const { auth } = context.state;\n\n const transformedArgs = transformArgs(args, {\n contentType: targetContentType,\n usePagination: true,\n });\n\n await strapi.contentAPI.validate.query(transformedArgs, targetContentType, {\n auth,\n });\n\n const sanitizedQuery = await strapi.contentAPI.sanitize.query(\n transformedArgs,\n targetContentType,\n {\n auth,\n }\n );\n\n const transformedQuery = strapi.get('query-params').transform(targetUID, sanitizedQuery);\n\n const defaultFilters = {\n where: {\n // ~~Return~~ the same ~~draft~~ ~~and~~ ~~publish~~ ~~version~~ as the ~~parent~~\n ~~publishedAt:~~ { ~~$notNull:~~ '~~publishedAt~~' in ~~parent~~ ? ~~parent.publishedAt~~ ~~!==~~ ~~null~~ : true },\n },\n };\n const dbQuery = merge(defaultFilters, transformedQuery);\n const data = await strapi.db?.query(contentTypeUID).load(parent, attributeName, dbQuery);\n\n const info = {\n args: sanitizedQuery,\n resourceUID: targetUID,\n };\n\n // If this a polymorphic association, it sanitizes & returns the raw data\n // Note: The value needs to be wrapped in a fake object that represents its parent\n // so that the sanitize util can work properly.\n if (isMorphAttribute) {\n // Helpers used for the data cleanup\n const wrapData = (dataToWrap: any) => ({ [attributeName]: dataToWrap });\n const sanitizeData = (dataToSanitize: any) => {\n return strapi.contentAPI.sanitize.output(dataToSanitize, contentType, { auth });\n };\n const unwrapData = get(attributeName);\n\n // Sanitizer definition\n const sanitizeMorphAttribute = async.pipe(wrapData, sanitizeData, unwrapData);\n\n return sanitizeMorphAttribute(data);\n }\n\n // If this is a to-many relation, it returns an object that\n // matches what the entity-response-collection's resolvers expect\n if (isToMany) {\n return toEntityResponseCollection(data, info);\n }\n\n // Else, it returns an object that matches\n // what the entity-response's resolvers expect\n return toEntityResponse(data, info);\n };\n },\n };\n};\n"],"names":["ApplicationError","errors","strapi","service","getGraphQLService","plugin","isMorphRelation","isMedia","attributes","transformArgs","utils","toEntityResponse","toEntityResponseCollection","returnTypes","buildAssociationResolver","contentTypeUID","attributeName","contentType","getModel","attribute","isMediaAttribute","isMorphAttribute","targetUID","target","isToMany","multiple","relation","endsWith","targetContentType","parent","args","context","auth","state","transformedArgs","usePagination","contentAPI","validate","query","sanitizedQuery","sanitize","transformedQuery","get","transform","defaultFilters","where","publishedAt","$notNull","dbQuery","merge","data","db","load","info","resourceUID","wrapData","dataToWrap","sanitizeData","dataToSanitize","output","unwrapData","sanitizeMorphAttribute","async","pipe"],"mappings":";;;;;AAMA,MAAM,EAAEA,gBAAgB,EAAE,GAAGC,YAAAA;AAE7B,2BAAe,CAAA,CAAC,EAAEC,MAAM,EAAW,GAAA;AACjC,IAAA,MAAM,EAAEC,OAASC,EAAAA,iBAAiB,EAAE,GAAGF,MAAAA,CAAOG,MAAM,CAAC,SAAA,CAAA;IAErD,MAAM,EAAEC,eAAe,EAAEC,OAAO,EAAE,GAAGH,iBAAAA,CAAkB,SAASI,UAAU;AAC1E,IAAA,MAAM,EAAEC,aAAa,EAAE,GAAGL,iBAAAA,CAAkB,YAAYM,KAAK;IAC7D,MAAM,EAAEC,gBAAgB,EAAEC,0BAA0B,EAAE,GAAGR,iBAAAA,CAAkB,UAAUS,WAAW;IAEhG,OAAO;AACLC,QAAAA,wBAAAA,CAAAA,CAAyB,EACvBC,cAAc,EACdC,aAAa,EAId,EAAA;YACC,MAAMC,WAAAA,GAAcf,MAAOgB,CAAAA,QAAQ,CAACH,cAAAA,CAAAA;AACpC,YAAA,MAAMI,SAAiBF,GAAAA,WAAAA,CAAYT,UAAU,CAACQ,aAAc,CAAA;AAE5D,YAAA,IAAI,CAACG,SAAW,EAAA;gBACd,MAAM,IAAInB,iBACR,CAAC,4CAA4C,EAAEe,cAAe,CAAA,EAAE,EAAEC,aAAAA,CAAc,CAAC,CAAA;AAErF;AAEA,YAAA,MAAMI,mBAAmBb,OAAQY,CAAAA,SAAAA,CAAAA;AACjC,YAAA,MAAME,mBAAmBf,eAAgBa,CAAAA,SAAAA,CAAAA;AAEzC,YAAA,MAAMG,SAAYF,GAAAA,gBAAAA,GAAmB,qBAAwBD,GAAAA,SAAAA,CAAUI,MAAM;YAC7E,MAAMC,QAAAA,GAAWJ,mBAAmBD,SAAUM,CAAAA,QAAQ,GAAGN,SAAUO,CAAAA,QAAQ,CAACC,QAAQ,CAAC,MAAA,CAAA;YAErF,MAAMC,iBAAAA,GAAoB1B,MAAOgB,CAAAA,QAAQ,CAACI,SAAAA,CAAAA;YAE1C,OAAO,OAAOO,QAAaC,IAAY,GAAA,EAAE,EAAEC,OAAAA,GAAe,EAAE,GAAA;AAC1D,gBAAA,MAAM,EAAEC,IAAI,EAAE,GAAGD,QAAQE,KAAK;gBAE9B,MAAMC,eAAAA,GAAkBzB,cAAcqB,IAAM,EAAA;oBAC1Cb,WAAaW,EAAAA,iBAAAA;oBACbO,aAAe,EAAA;AACjB,iBAAA,CAAA;gBAEA,MAAMjC,MAAAA,CAAOkC,UAAU,CAACC,QAAQ,CAACC,KAAK,CAACJ,iBAAiBN,iBAAmB,EAAA;AACzEI,oBAAAA;AACF,iBAAA,CAAA;gBAEA,MAAMO,cAAAA,GAAiB,MAAMrC,MAAAA,CAAOkC,UAAU,CAACI,QAAQ,CAACF,KAAK,CAC3DJ,eAAAA,EACAN,iBACA,EAAA;AACEI,oBAAAA;AACF,iBAAA,CAAA;~~AAGF~~,gBAAA,MAAMS,mBAAmBvC,MAAOwC,CAAAA,GAAG,CAAC,cAAgBC,CAAAA,CAAAA,SAAS,CAACrB,SAAWiB,EAAAA,cAAAA,CAAAA;~~AAEzE~~,gBAAA,~~MAAMK~~,~~cAAiB~~,GAAA;~~oBACrBC~~,KAAO,EAAA~~;;wBAELC~~,WAAa,EAAA;~~AAAEC~~,~~4BAAAA~~,~~QAAAA~~,~~EAAU~~,~~aAAiBlB~~,~~IAAAA~~,MAAAA,~~GAASA~~,~~MAAOiB~~,~~CAAAA~~,WAAW,~~KAAK~~,~~IAAO,~~GAAA;~~AAAK~~;~~AACxF~~;AACF,iBAAA;~~gBACA~~,~~MAAME~~,OAAAA,GAAUC,~~SAAML~~,~~cAAgBH~~,EAAAA,gBAAAA,CAAAA;gBACtC,~~MAAMS~~,IAAAA,GAAO,~~MAAMhD~~,~~MAAOiD~~,CAAAA,EAAE,~~EAAEb~~,KAAMvB,CAAAA,cAAAA,CAAAA,~~CAAgBqC~~,~~IAAKvB~~,CAAAA,MAAAA,EAAQb,~~aAAegC~~,EAAAA,OAAAA,CAAAA;AAEhF,gBAAA,MAAMK,IAAO,GAAA;~~oBACXvB~~,IAAMS,EAAAA,cAAAA;~~oBACNe~~,~~WAAahC~~,EAAAA;AACf,iBAAA;;;;AAKA,gBAAA,IAAID,gBAAkB,EAAA;;oBAEpB,~~MAAMkC~~,QAAAA,GAAW,CAACC,UAAAA,IAAqB;AAAE,4BAAA,~~CAACxC~~,~~gBAAgBwC~~;yBAAW,CAAA;AACrE,oBAAA,MAAMC,eAAe,CAACC,cAAAA,GAAAA;wBACpB,~~OAAOxD~~,MAAAA,CAAOkC,UAAU,CAACI,QAAQ,~~CAACmB~~,MAAM,CAACD,~~gBAAgBzC~~,WAAa,EAAA;AAAEe,4BAAAA;AAAK,yBAAA,CAAA;AAC/E,qBAAA;AACA,oBAAA,~~MAAM4B~~,~~aAAalB~~,MAAI1B,CAAAA,aAAAA,CAAAA;;AAGvB,oBAAA,~~MAAM6C~~,sBAAyBC,GAAAA,WAAAA,CAAMC,IAAI,CAACR,UAAUE,YAAcG,EAAAA,UAAAA,CAAAA;AAElE,oBAAA,OAAOC,sBAAuBX,CAAAA,IAAAA,CAAAA;AAChC;;;AAIA,gBAAA,~~IAAI1B~~,QAAU,EAAA;AACZ,oBAAA,OAAOZ,~~2BAA2BsC~~,IAAMG,EAAAA,IAAAA,CAAAA;AAC1C;;;AAIA,gBAAA,~~OAAO1C~~,~~iBAAiBuC~~,IAAMG,EAAAA,IAAAA,CAAAA;AAChC,aAAA;AACF;AACF,KAAA;AACF,CAAA;;;;"}
1	+ {"version":3,"file":"association.js","sources":["../../../../../server/src/services/builders/resolvers/association.ts"],"sourcesContent":["import { get, merge } from 'lodash/fp';\nimport { async, contentTypes, errors } from '@strapi/utils';\nimport type { Internal } from '@strapi/types';\n\nimport type { Context } from '../../types';\n\nconst { ApplicationError } = errors;\n\nexport default ({ strapi }: Context) => {\n const { service: getGraphQLService } = strapi.plugin('graphql');\n\n const { isMorphRelation, isMedia } = getGraphQLService('utils').attributes;\n const { transformArgs } = getGraphQLService('builders').utils;\n const { toEntityResponse, toEntityResponseCollection } = getGraphQLService('format').returnTypes;\n\n return {\n buildAssociationResolver({\n contentTypeUID,\n attributeName,\n }: {\n contentTypeUID: Internal.UID.ContentType;\n attributeName: string;\n }) {\n const contentType = strapi.getModel(contentTypeUID);\n const attribute: any = contentType.attributes[attributeName];\n\n if (!attribute) {\n throw new ApplicationError(\n `Failed to build an association resolver for ${contentTypeUID}::${attributeName}`\n );\n }\n\n const isMediaAttribute = isMedia(attribute);\n const isMorphAttribute = isMorphRelation(attribute);\n\n const targetUID = isMediaAttribute ? 'plugin::upload.file' : attribute.target;\n const isToMany = isMediaAttribute ? attribute.multiple : attribute.relation.endsWith('Many');\n\n const targetContentType = strapi.getModel(targetUID);\n\n return async (parent: any, args: any = {}, context: any = {}) => {\n const { auth } = context.state;\n\n const transformedArgs = transformArgs(args, {\n contentType: targetContentType,\n usePagination: true,\n });\n\n await strapi.contentAPI.validate.query(transformedArgs, targetContentType, {\n auth,\n });\n\n const sanitizedQuery = await strapi.contentAPI.sanitize.query(\n transformedArgs,\n targetContentType,\n {\n auth,\n }\n );\n const transformedQuery = strapi.get('query-params').transform(targetUID, sanitizedQuery);\n\n const isTargetDraftAndPublishContentType =\n contentTypes.hasDraftAndPublish(targetContentType);\n const defaultFilters = isTargetDraftAndPublishContentType\n ? {\n where: {\n publishedAt: {\n $notNull: context.rootQueryArgs?.status\n ? // Filter by the same status as the root query if the argument is present\n context.rootQueryArgs?.status === 'published'\n : // Otherwise fallback to the published version\n true,\n },\n },\n }\n : {};\n\n const dbQuery = merge(defaultFilters, transformedQuery);\n const data = await strapi.db?.query(contentTypeUID).load(parent, attributeName, dbQuery);\n\n const info = {\n args: sanitizedQuery,\n resourceUID: targetUID,\n };\n\n // If this a polymorphic association, it sanitizes & returns the raw data\n // Note: The value needs to be wrapped in a fake object that represents its parent\n // so that the sanitize util can work properly.\n if (isMorphAttribute) {\n // Helpers used for the data cleanup\n const wrapData = (dataToWrap: any) => ({ [attributeName]: dataToWrap });\n const sanitizeData = (dataToSanitize: any) => {\n return strapi.contentAPI.sanitize.output(dataToSanitize, contentType, { auth });\n };\n const unwrapData = get(attributeName);\n\n // Sanitizer definition\n const sanitizeMorphAttribute = async.pipe(wrapData, sanitizeData, unwrapData);\n\n return sanitizeMorphAttribute(data);\n }\n\n // If this is a to-many relation, it returns an object that\n // matches what the entity-response-collection's resolvers expect\n if (isToMany) {\n return toEntityResponseCollection(data, info);\n }\n\n // Else, it returns an object that matches\n // what the entity-response's resolvers expect\n return toEntityResponse(data, info);\n };\n },\n };\n};\n"],"names":["ApplicationError","errors","strapi","service","getGraphQLService","plugin","isMorphRelation","isMedia","attributes","transformArgs","utils","toEntityResponse","toEntityResponseCollection","returnTypes","buildAssociationResolver","contentTypeUID","attributeName","contentType","getModel","attribute","isMediaAttribute","isMorphAttribute","targetUID","target","isToMany","multiple","relation","endsWith","targetContentType","parent","args","context","auth","state","transformedArgs","usePagination","contentAPI","validate","query","sanitizedQuery","sanitize","transformedQuery","get","transform","isTargetDraftAndPublishContentType","contentTypes","hasDraftAndPublish","defaultFilters","where","publishedAt","$notNull","rootQueryArgs","status","dbQuery","merge","data","db","load","info","resourceUID","wrapData","dataToWrap","sanitizeData","dataToSanitize","output","unwrapData","sanitizeMorphAttribute","async","pipe"],"mappings":"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"}

package/dist/server/services/builders/resolvers/association.mjs CHANGED Viewed

@@ -1,5 +1,5 @@
 import { merge, get } from 'lodash/fp';
-import { async, errors } from '@strapi/utils';
+import { contentTypes, async, errors } from '@strapi/utils';
 const { ApplicationError } = errors;
 var associationResolvers = (({ strapi })=>{
@@ -32,14 +32,14 @@ var associationResolvers = (({ strapi })=>{
                     auth
                 });
                 const transformedQuery = strapi.get('query-params').transform(targetUID, sanitizedQuery);
-                const defaultFilters = {
+                const isTargetDraftAndPublishContentType = contentTypes.hasDraftAndPublish(targetContentType);
+                const defaultFilters = isTargetDraftAndPublishContentType ? {
                     where: {
-                        // Return the same draft and publish version as the parent
                         publishedAt: {
-                            $notNull: 'publishedAt' in parent ? parent.publishedAt !== null : true
+                            $notNull: context.rootQueryArgs?.status ? context.rootQueryArgs?.status === 'published' : true
                         }
                     }
-                };
+                } : {};
                 const dbQuery = merge(defaultFilters, transformedQuery);
                 const data = await strapi.db?.query(contentTypeUID).load(parent, attributeName, dbQuery);
                 const info = {

package/dist/server/services/builders/resolvers/association.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"association.mjs","sources":["../../../../../server/src/services/builders/resolvers/association.ts"],"sourcesContent":["import { get, merge } from 'lodash/fp';\nimport { async, errors } from '@strapi/utils';\nimport type { Internal } from '@strapi/types';\n\nimport type { Context } from '../../types';\n\nconst { ApplicationError } = errors;\n\nexport default ({ strapi }: Context) => {\n const { service: getGraphQLService } = strapi.plugin('graphql');\n\n const { isMorphRelation, isMedia } = getGraphQLService('utils').attributes;\n const { transformArgs } = getGraphQLService('builders').utils;\n const { toEntityResponse, toEntityResponseCollection } = getGraphQLService('format').returnTypes;\n\n return {\n buildAssociationResolver({\n contentTypeUID,\n attributeName,\n }: {\n contentTypeUID: Internal.UID.ContentType;\n attributeName: string;\n }) {\n const contentType = strapi.getModel(contentTypeUID);\n const attribute: any = contentType.attributes[attributeName];\n\n if (!attribute) {\n throw new ApplicationError(\n `Failed to build an association resolver for ${contentTypeUID}::${attributeName}`\n );\n }\n\n const isMediaAttribute = isMedia(attribute);\n const isMorphAttribute = isMorphRelation(attribute);\n\n const targetUID = isMediaAttribute ? 'plugin::upload.file' : attribute.target;\n const isToMany = isMediaAttribute ? attribute.multiple : attribute.relation.endsWith('Many');\n\n const targetContentType = strapi.getModel(targetUID);\n\n return async (parent: any, args: any = {}, context: any = {}) => {\n const { auth } = context.state;\n\n const transformedArgs = transformArgs(args, {\n contentType: targetContentType,\n usePagination: true,\n });\n\n await strapi.contentAPI.validate.query(transformedArgs, targetContentType, {\n auth,\n });\n\n const sanitizedQuery = await strapi.contentAPI.sanitize.query(\n transformedArgs,\n targetContentType,\n {\n auth,\n }\n );\n\n const transformedQuery = strapi.get('query-params').transform(targetUID, sanitizedQuery);\n\n const defaultFilters = {\n where: {\n // ~~Return~~ the same ~~draft~~ ~~and~~ ~~publish~~ ~~version~~ as the ~~parent~~\n ~~publishedAt:~~ { ~~$notNull:~~ '~~publishedAt~~' in ~~parent~~ ? ~~parent.publishedAt~~ ~~!==~~ ~~null~~ : true },\n },\n };\n const dbQuery = merge(defaultFilters, transformedQuery);\n const data = await strapi.db?.query(contentTypeUID).load(parent, attributeName, dbQuery);\n\n const info = {\n args: sanitizedQuery,\n resourceUID: targetUID,\n };\n\n // If this a polymorphic association, it sanitizes & returns the raw data\n // Note: The value needs to be wrapped in a fake object that represents its parent\n // so that the sanitize util can work properly.\n if (isMorphAttribute) {\n // Helpers used for the data cleanup\n const wrapData = (dataToWrap: any) => ({ [attributeName]: dataToWrap });\n const sanitizeData = (dataToSanitize: any) => {\n return strapi.contentAPI.sanitize.output(dataToSanitize, contentType, { auth });\n };\n const unwrapData = get(attributeName);\n\n // Sanitizer definition\n const sanitizeMorphAttribute = async.pipe(wrapData, sanitizeData, unwrapData);\n\n return sanitizeMorphAttribute(data);\n }\n\n // If this is a to-many relation, it returns an object that\n // matches what the entity-response-collection's resolvers expect\n if (isToMany) {\n return toEntityResponseCollection(data, info);\n }\n\n // Else, it returns an object that matches\n // what the entity-response's resolvers expect\n return toEntityResponse(data, info);\n };\n },\n };\n};\n"],"names":["ApplicationError","errors","strapi","service","getGraphQLService","plugin","isMorphRelation","isMedia","attributes","transformArgs","utils","toEntityResponse","toEntityResponseCollection","returnTypes","buildAssociationResolver","contentTypeUID","attributeName","contentType","getModel","attribute","isMediaAttribute","isMorphAttribute","targetUID","target","isToMany","multiple","relation","endsWith","targetContentType","parent","args","context","auth","state","transformedArgs","usePagination","contentAPI","validate","query","sanitizedQuery","sanitize","transformedQuery","get","transform","defaultFilters","where","publishedAt","$notNull","dbQuery","merge","data","db","load","info","resourceUID","wrapData","dataToWrap","sanitizeData","dataToSanitize","output","unwrapData","sanitizeMorphAttribute","async","pipe"],"mappings":";;;AAMA,MAAM,EAAEA,gBAAgB,EAAE,GAAGC,MAAAA;AAE7B,2BAAe,CAAA,CAAC,EAAEC,MAAM,EAAW,GAAA;AACjC,IAAA,MAAM,EAAEC,OAASC,EAAAA,iBAAiB,EAAE,GAAGF,MAAAA,CAAOG,MAAM,CAAC,SAAA,CAAA;IAErD,MAAM,EAAEC,eAAe,EAAEC,OAAO,EAAE,GAAGH,iBAAAA,CAAkB,SAASI,UAAU;AAC1E,IAAA,MAAM,EAAEC,aAAa,EAAE,GAAGL,iBAAAA,CAAkB,YAAYM,KAAK;IAC7D,MAAM,EAAEC,gBAAgB,EAAEC,0BAA0B,EAAE,GAAGR,iBAAAA,CAAkB,UAAUS,WAAW;IAEhG,OAAO;AACLC,QAAAA,wBAAAA,CAAAA,CAAyB,EACvBC,cAAc,EACdC,aAAa,EAId,EAAA;YACC,MAAMC,WAAAA,GAAcf,MAAOgB,CAAAA,QAAQ,CAACH,cAAAA,CAAAA;AACpC,YAAA,MAAMI,SAAiBF,GAAAA,WAAAA,CAAYT,UAAU,CAACQ,aAAc,CAAA;AAE5D,YAAA,IAAI,CAACG,SAAW,EAAA;gBACd,MAAM,IAAInB,iBACR,CAAC,4CAA4C,EAAEe,cAAe,CAAA,EAAE,EAAEC,aAAAA,CAAc,CAAC,CAAA;AAErF;AAEA,YAAA,MAAMI,mBAAmBb,OAAQY,CAAAA,SAAAA,CAAAA;AACjC,YAAA,MAAME,mBAAmBf,eAAgBa,CAAAA,SAAAA,CAAAA;AAEzC,YAAA,MAAMG,SAAYF,GAAAA,gBAAAA,GAAmB,qBAAwBD,GAAAA,SAAAA,CAAUI,MAAM;YAC7E,MAAMC,QAAAA,GAAWJ,mBAAmBD,SAAUM,CAAAA,QAAQ,GAAGN,SAAUO,CAAAA,QAAQ,CAACC,QAAQ,CAAC,MAAA,CAAA;YAErF,MAAMC,iBAAAA,GAAoB1B,MAAOgB,CAAAA,QAAQ,CAACI,SAAAA,CAAAA;YAE1C,OAAO,OAAOO,QAAaC,IAAY,GAAA,EAAE,EAAEC,OAAAA,GAAe,EAAE,GAAA;AAC1D,gBAAA,MAAM,EAAEC,IAAI,EAAE,GAAGD,QAAQE,KAAK;gBAE9B,MAAMC,eAAAA,GAAkBzB,cAAcqB,IAAM,EAAA;oBAC1Cb,WAAaW,EAAAA,iBAAAA;oBACbO,aAAe,EAAA;AACjB,iBAAA,CAAA;gBAEA,MAAMjC,MAAAA,CAAOkC,UAAU,CAACC,QAAQ,CAACC,KAAK,CAACJ,iBAAiBN,iBAAmB,EAAA;AACzEI,oBAAAA;AACF,iBAAA,CAAA;gBAEA,MAAMO,cAAAA,GAAiB,MAAMrC,MAAAA,CAAOkC,UAAU,CAACI,QAAQ,CAACF,KAAK,CAC3DJ,eAAAA,EACAN,iBACA,EAAA;AACEI,oBAAAA;AACF,iBAAA,CAAA;~~AAGF~~,gBAAA,MAAMS,mBAAmBvC,MAAOwC,CAAAA,GAAG,CAAC,cAAgBC,CAAAA,CAAAA,SAAS,CAACrB,SAAWiB,EAAAA,cAAAA,CAAAA;~~AAEzE~~,gBAAA,~~MAAMK~~,~~cAAiB~~,GAAA;~~oBACrBC~~,KAAO,EAAA~~;;wBAELC~~,WAAa,EAAA;~~AAAEC~~,~~4BAAAA~~,~~QAAAA~~,~~EAAU~~,~~aAAiBlB~~,~~IAAAA~~,MAAAA,~~GAASA~~,~~MAAOiB~~,~~CAAAA~~,WAAW,~~KAAK~~,~~IAAO,~~GAAA;~~AAAK~~;~~AACxF~~;AACF,iBAAA;~~gBACA~~,~~MAAME~~,OAAAA,GAAUC,~~MAAML~~,~~cAAgBH~~,EAAAA,gBAAAA,CAAAA;gBACtC,~~MAAMS~~,IAAAA,GAAO,~~MAAMhD~~,~~MAAOiD~~,CAAAA,EAAE,~~EAAEb~~,KAAMvB,CAAAA,cAAAA,CAAAA,~~CAAgBqC~~,~~IAAKvB~~,CAAAA,MAAAA,EAAQb,~~aAAegC~~,EAAAA,OAAAA,CAAAA;AAEhF,gBAAA,MAAMK,IAAO,GAAA;~~oBACXvB~~,IAAMS,EAAAA,cAAAA;~~oBACNe~~,~~WAAahC~~,EAAAA;AACf,iBAAA;;;;AAKA,gBAAA,IAAID,gBAAkB,EAAA;;oBAEpB,~~MAAMkC~~,QAAAA,GAAW,CAACC,UAAAA,IAAqB;AAAE,4BAAA,~~CAACxC~~,~~gBAAgBwC~~;yBAAW,CAAA;AACrE,oBAAA,MAAMC,eAAe,CAACC,cAAAA,GAAAA;wBACpB,~~OAAOxD~~,MAAAA,CAAOkC,UAAU,CAACI,QAAQ,~~CAACmB~~,MAAM,CAACD,~~gBAAgBzC~~,WAAa,EAAA;AAAEe,4BAAAA;AAAK,yBAAA,CAAA;AAC/E,qBAAA;AACA,oBAAA,~~MAAM4B~~,~~aAAalB~~,GAAI1B,CAAAA,aAAAA,CAAAA;;AAGvB,oBAAA,~~MAAM6C~~,sBAAyBC,GAAAA,KAAAA,CAAMC,IAAI,CAACR,UAAUE,YAAcG,EAAAA,UAAAA,CAAAA;AAElE,oBAAA,OAAOC,sBAAuBX,CAAAA,IAAAA,CAAAA;AAChC;;;AAIA,gBAAA,~~IAAI1B~~,QAAU,EAAA;AACZ,oBAAA,OAAOZ,~~2BAA2BsC~~,IAAMG,EAAAA,IAAAA,CAAAA;AAC1C;;;AAIA,gBAAA,~~OAAO1C~~,~~iBAAiBuC~~,IAAMG,EAAAA,IAAAA,CAAAA;AAChC,aAAA;AACF;AACF,KAAA;AACF,CAAA;;;;"}
1	+ {"version":3,"file":"association.mjs","sources":["../../../../../server/src/services/builders/resolvers/association.ts"],"sourcesContent":["import { get, merge } from 'lodash/fp';\nimport { async, contentTypes, errors } from '@strapi/utils';\nimport type { Internal } from '@strapi/types';\n\nimport type { Context } from '../../types';\n\nconst { ApplicationError } = errors;\n\nexport default ({ strapi }: Context) => {\n const { service: getGraphQLService } = strapi.plugin('graphql');\n\n const { isMorphRelation, isMedia } = getGraphQLService('utils').attributes;\n const { transformArgs } = getGraphQLService('builders').utils;\n const { toEntityResponse, toEntityResponseCollection } = getGraphQLService('format').returnTypes;\n\n return {\n buildAssociationResolver({\n contentTypeUID,\n attributeName,\n }: {\n contentTypeUID: Internal.UID.ContentType;\n attributeName: string;\n }) {\n const contentType = strapi.getModel(contentTypeUID);\n const attribute: any = contentType.attributes[attributeName];\n\n if (!attribute) {\n throw new ApplicationError(\n `Failed to build an association resolver for ${contentTypeUID}::${attributeName}`\n );\n }\n\n const isMediaAttribute = isMedia(attribute);\n const isMorphAttribute = isMorphRelation(attribute);\n\n const targetUID = isMediaAttribute ? 'plugin::upload.file' : attribute.target;\n const isToMany = isMediaAttribute ? attribute.multiple : attribute.relation.endsWith('Many');\n\n const targetContentType = strapi.getModel(targetUID);\n\n return async (parent: any, args: any = {}, context: any = {}) => {\n const { auth } = context.state;\n\n const transformedArgs = transformArgs(args, {\n contentType: targetContentType,\n usePagination: true,\n });\n\n await strapi.contentAPI.validate.query(transformedArgs, targetContentType, {\n auth,\n });\n\n const sanitizedQuery = await strapi.contentAPI.sanitize.query(\n transformedArgs,\n targetContentType,\n {\n auth,\n }\n );\n const transformedQuery = strapi.get('query-params').transform(targetUID, sanitizedQuery);\n\n const isTargetDraftAndPublishContentType =\n contentTypes.hasDraftAndPublish(targetContentType);\n const defaultFilters = isTargetDraftAndPublishContentType\n ? {\n where: {\n publishedAt: {\n $notNull: context.rootQueryArgs?.status\n ? // Filter by the same status as the root query if the argument is present\n context.rootQueryArgs?.status === 'published'\n : // Otherwise fallback to the published version\n true,\n },\n },\n }\n : {};\n\n const dbQuery = merge(defaultFilters, transformedQuery);\n const data = await strapi.db?.query(contentTypeUID).load(parent, attributeName, dbQuery);\n\n const info = {\n args: sanitizedQuery,\n resourceUID: targetUID,\n };\n\n // If this a polymorphic association, it sanitizes & returns the raw data\n // Note: The value needs to be wrapped in a fake object that represents its parent\n // so that the sanitize util can work properly.\n if (isMorphAttribute) {\n // Helpers used for the data cleanup\n const wrapData = (dataToWrap: any) => ({ [attributeName]: dataToWrap });\n const sanitizeData = (dataToSanitize: any) => {\n return strapi.contentAPI.sanitize.output(dataToSanitize, contentType, { auth });\n };\n const unwrapData = get(attributeName);\n\n // Sanitizer definition\n const sanitizeMorphAttribute = async.pipe(wrapData, sanitizeData, unwrapData);\n\n return sanitizeMorphAttribute(data);\n }\n\n // If this is a to-many relation, it returns an object that\n // matches what the entity-response-collection's resolvers expect\n if (isToMany) {\n return toEntityResponseCollection(data, info);\n }\n\n // Else, it returns an object that matches\n // what the entity-response's resolvers expect\n return toEntityResponse(data, info);\n };\n },\n };\n};\n"],"names":["ApplicationError","errors","strapi","service","getGraphQLService","plugin","isMorphRelation","isMedia","attributes","transformArgs","utils","toEntityResponse","toEntityResponseCollection","returnTypes","buildAssociationResolver","contentTypeUID","attributeName","contentType","getModel","attribute","isMediaAttribute","isMorphAttribute","targetUID","target","isToMany","multiple","relation","endsWith","targetContentType","parent","args","context","auth","state","transformedArgs","usePagination","contentAPI","validate","query","sanitizedQuery","sanitize","transformedQuery","get","transform","isTargetDraftAndPublishContentType","contentTypes","hasDraftAndPublish","defaultFilters","where","publishedAt","$notNull","rootQueryArgs","status","dbQuery","merge","data","db","load","info","resourceUID","wrapData","dataToWrap","sanitizeData","dataToSanitize","output","unwrapData","sanitizeMorphAttribute","async","pipe"],"mappings":"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"}

package/dist/server/src/bootstrap.d.ts CHANGED Viewed

@@ -1,7 +1,13 @@
+/// <reference types="koa-session" />
 import { type ApolloServerPlugin } from '@apollo/server';
 import type { Core } from '@strapi/types';
-export declare const determineLandingPage: (strapi: Core.Strapi) => ApolloServerPlugin<import("@apollo/server").BaseContext>;
+import type { BaseContext } from 'koa';
+type StrapiGraphQLContext = BaseContext & {
+    rootQueryArgs?: Record<string, unknown>;
+};
+export declare const determineLandingPage: (strapi: Core.Strapi) => ApolloServerPlugin<StrapiGraphQLContext>;
 export declare function bootstrap({ strapi }: {
     strapi: Core.Strapi;
 }): Promise<void>;
+export {};
 //# sourceMappingURL=bootstrap.d.ts.map

package/dist/server/src/bootstrap.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../server/src/bootstrap.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,kBAAkB,EAA4B,MAAM,gBAAgB,CAAC;AAUjG,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;~~AAW1C~~,eAAO,MAAM,oBAAoB,~~WAAY~~,KAAK,MAAM,~~6DA8EvD~~,CAAC;AAEF,wBAAsB,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CAAE,~~iBAmIlE~~"}
1	+ {"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../server/src/bootstrap.ts"],"names":[],"mappings":";AACA,OAAO,EAAgB,KAAK,kBAAkB,EAA4B,MAAM,gBAAgB,CAAC;AAUjG,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAA8C,MAAM,KAAK,CAAC;AAUnF,KAAK,oBAAoB,GAAG,WAAW,GAAG;IACxC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB,KAAK,MAAM,KAClB,mBAAmB,oBAAoB,CA8EzC,CAAC;AAEF,wBAAsB,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CAAE,iBA4JlE"}

package/dist/server/src/services/builders/resolvers/association.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"association.d.ts","sourceRoot":"","sources":["../../../../../../server/src/services/builders/resolvers/association.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;qCAIf,OAAO;iEAW5B;QACD,cAAc,EAAE,SAAS,GAAG,CAAC,WAAW,CAAC;QACzC,aAAa,EAAE,MAAM,CAAC;KACvB,YAkBuB,GAAG,SAAQ,GAAG,YAAgB,GAAG;;AAhC7D,~~wBAiGE~~"}
1	+ {"version":3,"file":"association.d.ts","sourceRoot":"","sources":["../../../../../../server/src/services/builders/resolvers/association.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;qCAIf,OAAO;iEAW5B;QACD,cAAc,EAAE,SAAS,GAAG,CAAC,WAAW,CAAC;QACzC,aAAa,EAAE,MAAM,CAAC;KACvB,YAkBuB,GAAG,SAAQ,GAAG,YAAgB,GAAG;;AAhC7D,wBA0GE"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-graphql",
-  "version": "5.17.0-beta.0",
+  "version": "5.18.0",
   "description": "Adds GraphQL endpoint with default API methods.",
   "repository": {
     "type": "git",
@@ -57,9 +57,9 @@
     "@graphql-tools/schema": "10.0.3",
     "@graphql-tools/utils": "^10.1.3",
     "@koa/cors": "5.0.0",
-    "@strapi/design-system": "2.0.0-rc.26",
-    "@strapi/icons": "2.0.0-rc.26",
-    "@strapi/utils": "5.17.0-beta.0",
+    "@strapi/design-system": "2.0.0-rc.28",
+    "@strapi/icons": "2.0.0-rc.28",
+    "@strapi/utils": "5.18.0",
     "graphql": "^16.8.1",
     "graphql-depth-limit": "^1.1.0",
     "graphql-playground-middleware-koa": "^1.6.21",
@@ -71,19 +71,19 @@
     "pluralize": "8.0.0"
   },
   "devDependencies": {
-    "@strapi/strapi": "5.17.0-beta.0",
-    "@strapi/types": "5.17.0-beta.0",
+    "@strapi/strapi": "5.18.0",
+    "@strapi/types": "5.18.0",
     "@types/graphql-depth-limit": "1.1.5",
     "@types/koa-bodyparser": "4.3.12",
     "@types/koa__cors": "5.0.0",
     "cross-env": "^7.0.3",
-    "eslint-config-custom": "5.17.0-beta.0",
+    "eslint-config-custom": "5.18.0",
     "koa": "2.16.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-router-dom": "6.22.3",
     "styled-components": "6.1.8",
-    "tsconfig": "5.17.0-beta.0",
+    "tsconfig": "5.18.0",
     "typescript": "5.4.4"
   },
   "peerDependencies": {