npm - ghost - Versions diffs - 6.55.0 → 6.56.0 - Mend

ghost 6.55.0 → 6.56.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 (280) hide show

package/core/built/admin/index.html CHANGED Viewed

@@ -2,8 +2,8 @@
 <html lang="en">
   <head>
     <link rel="stylesheet" href="./assets/vendor-3bf602dfa6463c3400ffd81697767274.css">
-    <link rel="stylesheet" href="./assets/ghost-a9c788f6f0b1ea6cf0f14ca4b13f4496.css">
-    <meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.55%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22e35f1aa34a%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%22d7e993cdd1%22%2C%22activitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D">
+    <link rel="stylesheet" href="./assets/ghost-d38c30b866e59f2e06a357b5eb844fe5.css">
+    <meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.56%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22571a1e1dc6%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%2228a9fedb77%22%2C%22activitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D">
     <meta charset="UTF-8" />
@@ -20,28 +20,28 @@
     <link rel="shortcut icon" href="./assets/favicon-C_q1KHzv.ico" />
     <link rel="apple-touch-icon" href="./assets/apple-touch-icon-DhO18_4B.png" />
-    <script type="module" crossorigin src="./assets/index-BGG7NckO.js"></script>
+    <script type="module" crossorigin src="./assets/index-08n05-rc.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/rolldown-runtime-DAXXjFlN.js">
     <link rel="modulepreload" crossorigin href="./assets/react-Bb3IsNbi.js">
     <link rel="modulepreload" crossorigin href="./assets/jsx-runtime-DX3WBWVO.js">
     <link rel="modulepreload" crossorigin href="./assets/framework-provider-CmtnPXIT.js">
     <link rel="modulepreload" crossorigin href="./assets/dist-Ndy-PuGN.js">
     <link rel="modulepreload" crossorigin href="./assets/hooks-CixO01lL.js">
-    <link rel="modulepreload" crossorigin href="./assets/dist-DGzPJ_bO.js">
+    <link rel="modulepreload" crossorigin href="./assets/dist-Cb5RSHSg.js">
     <link rel="modulepreload" crossorigin href="./assets/dist-CQJY6SVY.js">
-    <link rel="modulepreload" crossorigin href="./assets/dist-P_ohUlTi.js">
-    <link rel="modulepreload" crossorigin href="./assets/Combination-CJG7Flp-.js">
+    <link rel="modulepreload" crossorigin href="./assets/dist-CqO2lWS0.js">
+    <link rel="modulepreload" crossorigin href="./assets/Combination-BCm9FL4o.js">
     <link rel="modulepreload" crossorigin href="./assets/preload-helper-DYl5dUZ5.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-KS7C4IRE-DG9HTHQ3.js">
-    <link rel="modulepreload" crossorigin href="./assets/router-provider-C1R4AZ2o.js">
-    <link rel="modulepreload" crossorigin href="./assets/text-DwtjwGkh.js">
-    <link rel="modulepreload" crossorigin href="./assets/shade-app-B3heOAfz-CGXQwWeO.js">
-    <link rel="modulepreload" crossorigin href="./assets/dist-CjY-f5Z1.js">
-    <link rel="modulepreload" crossorigin href="./assets/dist-2Tnz2Yfq.js">
-    <link rel="modulepreload" crossorigin href="./assets/input-surface-BpAjZXY5.js">
+    <link rel="modulepreload" crossorigin href="./assets/router-provider-BmEZf6c6.js">
+    <link rel="modulepreload" crossorigin href="./assets/text-DU9Hv33_.js">
+    <link rel="modulepreload" crossorigin href="./assets/shade-app-B3heOAfz-BhQXxNkT.js">
+    <link rel="modulepreload" crossorigin href="./assets/dist-BUKmD51u.js">
+    <link rel="modulepreload" crossorigin href="./assets/dist-CNlMj7ML.js">
+    <link rel="modulepreload" crossorigin href="./assets/input-surface-BdOe4KzO.js">
     <link rel="modulepreload" crossorigin href="./assets/update-queries-C4CnvJaW.js">
     <link rel="modulepreload" crossorigin href="./assets/users-Dkv8NQZe.js">
-    <link rel="stylesheet" crossorigin href="./assets/index-9Cw8z3rA.css">
+    <link rel="stylesheet" crossorigin href="./assets/index-DgUzgFvS.css">
   </head>
   <body class="react-admin">
     <div id="ember-alerts-wormhole"></div>
@@ -62,8 +62,8 @@
     <div id="ember-notifications-wormhole"></div>
     <script src="./assets/vendor-25f0bb2b2de85265afdf33da79f14a44.js"></script>
     <script src="./assets/chunk.211.6f7328d63c41536451b3.js"></script>
-    <script src="./assets/chunk.481.6c7395a49484bb4583aa.js"></script>
-    <script src="./assets/chunk.524.cffd399783a519e404a9.js"></script>
-    <script src="./assets/ghost-c4057474943effc568c5659ccc4909d7.js"></script>
+    <script src="./assets/chunk.332.05991a101d67f732dec3.js"></script>
+    <script src="./assets/chunk.524.87b52f4fada529df2c4c.js"></script>
+    <script src="./assets/ghost-7f01131115186d1af84ead76e79646dd.js"></script>
   </body>
 </html>

package/core/frontend/services/data/fetch-data.js CHANGED Viewed

@@ -3,6 +3,7 @@
  * Dynamically build and execute queries on the API
  */
 const _ = require('lodash');
+const {resolveRouteData} = require('../routing/api-adapter');
 // The default settings for a default post query
 const queryDefaults = {
@@ -93,9 +94,13 @@ async function fetchData(pathOptions, routerOptions, locals) {
     // The filter can in theory contain a "%s" e.g. filter="primary_tag:%s"
     promises.push(processQuery(postQuery, pathOptions.slug, locals));
+    const apiCalls = resolveRouteData(routerOptions.data);
     // CASE: fetch more data defined by the router e.g. tags, authors - see TaxonomyRouter
-    _.each(routerOptions.data, function (query, name) {
-        const dataQueryOptions = _.merge(query, defaultDataQueryOptions[name]);
+    _.each(apiCalls, function (apiCall, name) {
+        // Merge into a fresh object: the resolved spec is read again below to
+        // shape the response, so it must stay as the adapter resolved it.
+        const dataQueryOptions = _.merge({}, apiCall, defaultDataQueryOptions[name]);
         promises.push(processQuery(dataQueryOptions, pathOptions.slug, locals));
     });
@@ -107,11 +112,11 @@ async function fetchData(pathOptions, routerOptions, locals) {
         let resultIndex = 1;
-        _.each(routerOptions.data, function (config, name) {
+        _.each(apiCalls, function (apiCall, name) {
             if (results[resultIndex]) {
-                response.data[name] = results[resultIndex][config.resource];
+                response.data[name] = results[resultIndex][apiCall.resource];
-                if (config.type === 'browse') {
+                if (apiCall.type === 'browse') {
                     response.data[name].meta = results[resultIndex].meta;
                 }

package/core/frontend/services/routing/api-adapter.js ADDED Viewed

@@ -0,0 +1,115 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveApiCall = resolveApiCall;
+exports.resolveRouteData = resolveRouteData;
+exports.resolveResourceRead = resolveResourceRead;
+const lodash_1 = __importDefault(require("lodash"));
+const errors_1 = __importDefault(require("@tryghost/errors"));
+const config_1 = require("./config");
+/**
+ * Not every entry in QUERY is reachable from route data — `previews` and `email`
+ * are internal routers with no `type`, so they resolve to no API call.
+ */
+const RESOURCE_CONFIGS = config_1.QUERY;
+/**
+ * The entry fields the Content API accepts as query options. Everything else on
+ * a data entry is routing metadata (`redirect`) or unsupported (`fields`), and
+ * is deliberately not forwarded.
+ */
+const ALLOWED_QUERY_OPTIONS = ['limit', 'order', 'filter', 'include', 'slug', 'visibility', 'status', 'page'];
+function unknownResource(resource) {
+    return new errors_1.default.IncorrectUsageError({ message: `Unknown route data resource: ${resource}` });
+}
+// Shorthand names a resource the short way (`tag`), long form the way the API
+// does (`tags`). Both land on the same config.
+function splitShortForm(shortForm) {
+    const [key, slug] = shortForm.split('.');
+    return [key, slug];
+}
+function shortFormConfig(key) {
+    return RESOURCE_CONFIGS[key];
+}
+function longFormConfig(resource) {
+    return Object.values(RESOURCE_CONFIGS).find(config => config?.resource === resource);
+}
+function resolveShortForm(shortForm) {
+    const [key, slug] = splitShortForm(shortForm);
+    const config = shortFormConfig(key);
+    if (!config?.type) {
+        throw unknownResource(key);
+    }
+    return {
+        controller: config.controller,
+        type: config.type,
+        resource: config.resource,
+        options: { ...config.options, slug }
+    };
+}
+function resolveLongForm(entry) {
+    const config = longFormConfig(entry.resource);
+    if (!config) {
+        throw unknownResource(entry.resource);
+    }
+    const options = lodash_1.default.pick(entry, ALLOWED_QUERY_OPTIONS);
+    return {
+        controller: config.controller,
+        type: entry.type,
+        resource: config.resource,
+        // A `read` targets one known resource, so the resource defaults (e.g.
+        // `visibility: public` for tags) apply. A `browse` is author-driven and
+        // takes only what the entry asked for.
+        options: entry.type === 'read' ? lodash_1.default.defaults(options, config.options) : options
+    };
+}
+/**
+ * Resolve a single route data entry into a Content API call.
+ *
+ * This is the one place that knows how a domain `resource` maps onto a Ghost API
+ * controller — routes.yaml talks about `tags`, the API is reached via
+ * `tagsPublic`. Callers work with the domain model and never name a controller.
+ *
+ * @example resolveApiCall('tag.food')
+ *   // => {controller: 'tagsPublic', type: 'read', resource: 'tags', options: {slug: 'food', visibility: 'public'}}
+ */
+function resolveApiCall(entry) {
+    return typeof entry === 'string' ? resolveShortForm(entry) : resolveLongForm(entry);
+}
+/**
+ * Resolve a route's whole `data` block, keyed the way the theme sees it.
+ *
+ * Top-level shorthand (`data: tag.food`) has no author-given name, so it is
+ * keyed by its resource shorthand — `tag` — matching what themes already expect.
+ */
+function resolveRouteData(routeData) {
+    if (!routeData) {
+        return {};
+    }
+    if (typeof routeData === 'string') {
+        const [key] = splitShortForm(routeData);
+        return { [key]: resolveApiCall(routeData) };
+    }
+    return lodash_1.default.mapValues(routeData, entry => resolveApiCall(entry));
+}
+/**
+ * The resource read a data entry claims, or `null` if it claims none.
+ *
+ * Only a `read` names a single resource; a `browse` pulls a set and claims
+ * nothing. Unlike {@link resolveApiCall} this answers a routing question, so an
+ * entry it cannot make sense of is simply not a claim rather than an error.
+ *
+ * @example resolveResourceRead('tag.food') // => {resource: 'tags', slug: 'food'}
+ */
+function resolveResourceRead(entry) {
+    if (typeof entry === 'string') {
+        const [key, slug] = splitShortForm(entry);
+        const config = shortFormConfig(key);
+        return config?.type === 'read' ? { resource: config.resource, slug } : null;
+    }
+    if (entry.type !== 'read') {
+        return null;
+    }
+    return longFormConfig(entry.resource) ? { resource: entry.resource, slug: entry.slug } : null;
+}

package/core/frontend/services/routing/api-adapter.ts ADDED Viewed

@@ -0,0 +1,157 @@
+import _ from 'lodash';
+import errors from '@tryghost/errors';
+import {QUERY} from './config';
+import type {RouteData, DataEntry, DataShortForm, DataLongFormEntry} from '@tryghost/adapter-base-route-settings';
+/**
+ * A resolved Content API call: which controller to reach for, which method to
+ * call on it, and the options to call it with.
+ */
+export interface ApiCallSpec {
+    controller: string;
+    type: 'read' | 'browse';
+    resource: string;
+    options: Record<string, unknown>;
+}
+/**
+ * The resource read that a data entry claims — the router that declares it owns
+ * that slug, and other routers redirect to it.
+ */
+export interface ResourceRead {
+    resource: string;
+    slug: string;
+}
+interface ResourceConfig {
+    controller: string;
+    type?: 'read' | 'browse';
+    resource: string;
+    options?: Record<string, unknown>;
+}
+/**
+ * Not every entry in QUERY is reachable from route data — `previews` and `email`
+ * are internal routers with no `type`, so they resolve to no API call.
+ */
+const RESOURCE_CONFIGS: Record<string, ResourceConfig | undefined> = QUERY;
+/**
+ * The entry fields the Content API accepts as query options. Everything else on
+ * a data entry is routing metadata (`redirect`) or unsupported (`fields`), and
+ * is deliberately not forwarded.
+ */
+const ALLOWED_QUERY_OPTIONS = ['limit', 'order', 'filter', 'include', 'slug', 'visibility', 'status', 'page'];
+function unknownResource(resource: string) {
+    return new errors.IncorrectUsageError({message: `Unknown route data resource: ${resource}`});
+}
+// Shorthand names a resource the short way (`tag`), long form the way the API
+// does (`tags`). Both land on the same config.
+function splitShortForm(shortForm: DataShortForm): [string, string] {
+    const [key, slug] = shortForm.split('.');
+    return [key, slug];
+}
+function shortFormConfig(key: string): ResourceConfig | undefined {
+    return RESOURCE_CONFIGS[key];
+}
+function longFormConfig(resource: string): ResourceConfig | undefined {
+    return Object.values(RESOURCE_CONFIGS).find(config => config?.resource === resource);
+}
+function resolveShortForm(shortForm: DataShortForm): ApiCallSpec {
+    const [key, slug] = splitShortForm(shortForm);
+    const config = shortFormConfig(key);
+    if (!config?.type) {
+        throw unknownResource(key);
+    }
+    return {
+        controller: config.controller,
+        type: config.type,
+        resource: config.resource,
+        options: {...config.options, slug}
+    };
+}
+function resolveLongForm(entry: DataLongFormEntry): ApiCallSpec {
+    const config = longFormConfig(entry.resource);
+    if (!config) {
+        throw unknownResource(entry.resource);
+    }
+    const options: Record<string, unknown> = _.pick(entry, ALLOWED_QUERY_OPTIONS);
+    return {
+        controller: config.controller,
+        type: entry.type,
+        resource: config.resource,
+        // A `read` targets one known resource, so the resource defaults (e.g.
+        // `visibility: public` for tags) apply. A `browse` is author-driven and
+        // takes only what the entry asked for.
+        options: entry.type === 'read' ? _.defaults(options, config.options) : options
+    };
+}
+/**
+ * Resolve a single route data entry into a Content API call.
+ *
+ * This is the one place that knows how a domain `resource` maps onto a Ghost API
+ * controller — routes.yaml talks about `tags`, the API is reached via
+ * `tagsPublic`. Callers work with the domain model and never name a controller.
+ *
+ * @example resolveApiCall('tag.food')
+ *   // => {controller: 'tagsPublic', type: 'read', resource: 'tags', options: {slug: 'food', visibility: 'public'}}
+ */
+export function resolveApiCall(entry: DataEntry): ApiCallSpec {
+    return typeof entry === 'string' ? resolveShortForm(entry) : resolveLongForm(entry);
+}
+/**
+ * Resolve a route's whole `data` block, keyed the way the theme sees it.
+ *
+ * Top-level shorthand (`data: tag.food`) has no author-given name, so it is
+ * keyed by its resource shorthand — `tag` — matching what themes already expect.
+ */
+export function resolveRouteData(routeData?: RouteData): Record<string, ApiCallSpec> {
+    if (!routeData) {
+        return {};
+    }
+    if (typeof routeData === 'string') {
+        const [key] = splitShortForm(routeData);
+        return {[key]: resolveApiCall(routeData)};
+    }
+    return _.mapValues(routeData, entry => resolveApiCall(entry));
+}
+/**
+ * The resource read a data entry claims, or `null` if it claims none.
+ *
+ * Only a `read` names a single resource; a `browse` pulls a set and claims
+ * nothing. Unlike {@link resolveApiCall} this answers a routing question, so an
+ * entry it cannot make sense of is simply not a claim rather than an error.
+ *
+ * @example resolveResourceRead('tag.food') // => {resource: 'tags', slug: 'food'}
+ */
+export function resolveResourceRead(entry: DataEntry): ResourceRead | null {
+    if (typeof entry === 'string') {
+        const [key, slug] = splitShortForm(entry);
+        const config = shortFormConfig(key);
+        return config?.type === 'read' ? {resource: config.resource, slug} : null;
+    }
+    if (entry.type !== 'read') {
+        return null;
+    }
+    return longFormConfig(entry.resource) ? {resource: entry.resource, slug: entry.slug} : null;
+}

package/core/frontend/services/routing/collection-router.js CHANGED Viewed

@@ -5,6 +5,7 @@ const ParentRouter = require('./parent-router');
 const controllers = require('./controllers');
 const middleware = require('./middleware');
 const RSSRouter = require('./rss-router');
+const {toExpressNotation} = require('./permalink-adapter');
 /**
  * @description Collection Router for post resource.
@@ -26,15 +27,16 @@ class CollectionRouter extends ParentRouter {
         this.rss = object.rss !== false;
+        // convert domain `{slug}` -> Express/URL-service `:slug` at this boundary
         this.permalinks = {
-            value: object.permalink
+            value: toExpressNotation(object.permalink)
         };
         // @NOTE: see renderer/templates - we use unshift to prepend the templates
         this.templates = (object.templates || []).reverse();
         this.filter = object.filter;
-        this.data = object.data || {query: {}, router: {}};
+        this.data = object.data || {};
         this.order = object.order;
         this.limit = object.limit;
@@ -116,7 +118,7 @@ class CollectionRouter extends ParentRouter {
             templates: this.templates,
             identifier: this.identifier,
             name: this.routerName,
-            data: this.data.query
+            data: this.data
         };
         next();

package/core/frontend/services/routing/controllers/index.js CHANGED Viewed

@@ -8,7 +8,7 @@ module.exports = {
     },
     get rss() {
-        return require('./rss');
+        return require('./rss').rssController;
     },
     get previews() {

package/core/frontend/services/routing/controllers/rss.js CHANGED Viewed

@@ -1,52 +1,47 @@
-const _ = require('lodash');
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rssController = rssController;
+const lodash_1 = __importDefault(require("lodash"));
+const node_url_1 = __importDefault(require("node:url"));
 const debug = require('@tryghost/debug')('services:routing:controllers:rss');
-const url = require('url');
 const security = require('@tryghost/security');
 const settingsCache = require('../../../../shared/settings-cache');
 const rssService = require('../../rss');
 const renderer = require('../../rendering');
 const dataService = require('../../data');
-// @TODO: is this really correct? Should we be using meta data title?
+/**
+ * Generates the title for the RSS feed based on author, tag, or publication settings.
+ */
 function getTitle(relatedData) {
-    relatedData = relatedData || {};
-    let titleStart = _.get(relatedData, 'author[0].name') || _.get(relatedData, 'tag[0].name') || '';
+    const data = relatedData || {};
+    let titleStart = lodash_1.default.get(data, 'author[0].name') || lodash_1.default.get(data, 'tag[0].name') || '';
     titleStart += titleStart ? ' - ' : '';
     return titleStart + settingsCache.get('title');
 }
 /**
- * @description RSS controller.
- *
- * @TODO: The collection controller does almost the same. Merge!
- * @param {Object} req
- * @param {Object} res
- * @param {Function} next
+ * RSS routing controller.
+ * Fetches posts/meta data and delegates rendering to `rssService`.
  */
-module.exports = function rssController(req, res, next) {
+function rssController(req, res, next) {
     debug('rssController');
     const pathOptions = {
         page: 1, // required for fetchData
         slug: req.params.slug ? security.string.safe(req.params.slug) : undefined
     };
     // CASE: Ghost is using an rss cache - normalize the URL for use as a key
-    // @TODO: This belongs to the rss service O_o
-    const baseUrl = url.parse(req.originalUrl).pathname;
-    dataService.fetchData(pathOptions, res.routerOptions, res.locals)
+    const baseUrl = node_url_1.default.parse(req.originalUrl).pathname;
+    return dataService.fetchData(pathOptions, res.routerOptions, res.locals)
         .then(function formatResult(result) {
-            const response = _.pick(result, ['posts', 'meta']);
-            response.title = getTitle(result.data);
-            response.description = settingsCache.get('description');
-            return response;
-        })
+        const response = lodash_1.default.pick(result, ['posts', 'meta']);
+        response.title = getTitle(result.data);
+        response.description = settingsCache.get('description');
+        return response;
+    })
         .then(function (data) {
-            return rssService.render(res, baseUrl, data);
-        })
+        return rssService.render(res, baseUrl, data);
+    })
         .catch(renderer.handleError(next));
-};
+}

package/core/frontend/services/routing/controllers/rss.ts ADDED Viewed

@@ -0,0 +1,66 @@
+import type {Request, Response, NextFunction} from 'express';
+import _ from 'lodash';
+import url from 'node:url';
+const debug = require('@tryghost/debug')('services:routing:controllers:rss');
+const security = require('@tryghost/security');
+const settingsCache = require('../../../../shared/settings-cache');
+const rssService = require('../../rss');
+const renderer = require('../../rendering');
+const dataService = require('../../data');
+export interface RSSPathOptions {
+    page: number;
+    slug?: string;
+}
+export interface RSSResponse extends Response {
+    routerOptions: Record<string, unknown>;
+}
+export interface RelatedData {
+    author?: Array<{name: string}>;
+    tag?: Array<{name: string}>;
+    [key: string]: unknown;
+}
+/**
+ * Generates the title for the RSS feed based on author, tag, or publication settings.
+ */
+function getTitle(relatedData?: RelatedData): string {
+    const data = relatedData || {};
+    let titleStart = _.get(data, 'author[0].name') || _.get(data, 'tag[0].name') || '';
+    titleStart += titleStart ? ' - ' : '';
+    return titleStart + settingsCache.get('title');
+}
+/**
+ * RSS routing controller.
+ * Fetches posts/meta data and delegates rendering to `rssService`.
+ */
+export function rssController(req: Request, res: RSSResponse, next: NextFunction): Promise<void> {
+    debug('rssController');
+    const pathOptions: RSSPathOptions = {
+        page: 1, // required for fetchData
+        slug: req.params.slug ? security.string.safe(req.params.slug) : undefined
+    };
+    // CASE: Ghost is using an rss cache - normalize the URL for use as a key
+    const baseUrl = url.parse(req.originalUrl).pathname;
+    return dataService.fetchData(pathOptions, res.routerOptions, res.locals)
+        .then(function formatResult(result: {posts?: unknown[]; meta?: unknown; data?: RelatedData}) {
+            const response = _.pick(result, ['posts', 'meta']) as Record<string, unknown>;
+            response.title = getTitle(result.data);
+            response.description = settingsCache.get('description');
+            return response;
+        })
+        .then(function (data: Record<string, unknown>) {
+            return rssService.render(res, baseUrl, data);
+        })
+        .catch(renderer.handleError(next));
+}

package/core/frontend/services/routing/controllers/static.js CHANGED Viewed

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('services:routing:controllers:static');
 const renderer = require('../../rendering');
+const {resolveRouteData} = require('../api-adapter');
 function processQuery(query, locals) {
     const api = require('../../proxy').api;
@@ -35,10 +36,10 @@ function processQuery(query, locals) {
 module.exports = function staticController(req, res, next) {
     debug('staticController', res.routerOptions);
-    let promises = [];
+    const apiCalls = resolveRouteData(res.routerOptions.data);
-    _.each(res.routerOptions.data, function (query) {
-        promises.push(processQuery(query, res.locals));
+    const promises = _.map(apiCalls, function (apiCall) {
+        return processQuery(apiCall, res.locals);
     });
     return Promise.all(promises)
@@ -49,13 +50,13 @@ module.exports = function staticController(req, res, next) {
                 response.data = {};
                 let resultIndex = 0;
-                _.each(res.routerOptions.data, function (config, name) {
-                    response.data[name] = result[resultIndex][config.resource];
+                _.each(apiCalls, function (apiCall, name) {
+                    response.data[name] = result[resultIndex][apiCall.resource];
-                    if (config.type === 'browse') {
+                    if (apiCall.type === 'browse') {
                         response.data[name].meta = result[resultIndex].meta;
                         // @TODO: remove in Ghost 3.0 (see https://github.com/TryGhost/Ghost/issues/10434)
-                        response.data[name][config.resource] = result[resultIndex][config.resource];
+                        response.data[name][apiCall.resource] = result[resultIndex][apiCall.resource];
                     }
                     resultIndex = resultIndex + 1;

package/core/frontend/services/routing/parent-router.js CHANGED Viewed

@@ -13,6 +13,7 @@ const express = require('../../../shared/express');
 const _ = require('lodash');
 const url = require('url');
 const security = require('@tryghost/security');
+const {resolveResourceRead} = require('./api-adapter');
 const urlUtils = require('../../../shared/url-utils').default;
 const registry = require('./registry');
@@ -197,6 +198,11 @@ class ParentRouter {
     /**
      * @description Figure out if the router has a redirect enabled.
+     *
+     * A route claims a resource by reading it: `data: tag.bacon` on this router
+     * means /tag/bacon/ should redirect here from wherever else it lives. Only
+     * `read` entries claim a slug, and an entry can opt out with `redirect: false`.
+     *
      * @param {string} routerType
      * @param {string} slug
      * @returns {boolean}
@@ -204,14 +210,21 @@ class ParentRouter {
     isRedirectEnabled(routerType, slug) {
         debug('isRedirectEnabled', this.name, this.route && this.route.value, routerType, slug);
-        if (!this.data || !Object.keys(this.data.router)) {
+        if (!this.data) {
             return false;
         }
-        return _.find(this.data.router, function (entries, type) {
-            if (routerType === type) {
-                return _.find(entries, {redirect: true, slug: slug});
+        // Top-level shorthand (`data: tag.bacon`) is a single unnamed entry.
+        const entries = typeof this.data === 'string' ? [this.data] : Object.values(this.data);
+        return entries.some((entry) => {
+            if (typeof entry !== 'string' && entry.redirect === false) {
+                return false;
             }
+            const read = resolveResourceRead(entry);
+            return !!read && read.resource === routerType && read.slug === slug;
         });
     }