ghost 6.54.1 → 6.56.0

package/core/built/admin/assets/web-LtHNiNBV.js

@@ -1 +0,0 @@
-import{o as e}from"./rolldown-runtime-DAXXjFlN.js";import{t}from"./react-Bb3IsNbi.js";import{t as n}from"./jsx-runtime-DX3WBWVO.js";import{t as r}from"./use-tinybird-query-C7bQRJWw.js";import{g as i}from"./stats-BQZMGMvn.js";import{g as a,m as o}from"./chunk-KS7C4IRE-DG9HTHQ3.js";import{a as s,t as c}from"./router-provider-C1R4AZ2o.js";import{f as l,h as ee,p as u}from"./dist-DGzPJ_bO.js";import{a as d}from"./shade-app-B3heOAfz-CGXQwWeO.js";import{a as f,i as p,n as te,t as m}from"./chart-helpers-xiSsW8r0.js";import{r as h,t as g}from"./tabs-BQcJQ1ke.js";import{r as ne}from"./filters-bXkkWro8.js";import{a as _,i as v,n as y,o as b,r as x,t as S}from"./card-DGoDJzrn.js";import{a as C,c as w,i as T,l as E,n as D,o as O,r as k,s as A,t as j,u as M}from"./data-list-16rkJYYi.js";import{t as re}from"./empty-indicator-oX1u1Pkn.js";import{a as N,i as ie,n as ae,o as P,r as oe,s as F}from"./use-filter-params-DjXkhO54.js";import{$n as se,Fn as I,Gn as L,Gr as R,Hr as ce,In as z,Ln as B,Mn as V,Nn as H,Nr as U,Pn as W,Rs as le,Vr as G,Yr as K,c as ue,js as de,na as fe,qr as pe,s as me,ti as he,u as ge,yo as _e,zr as q}from"./index-ukW_0Uie.js";import{n as J,r as Y,t as ve}from"./kpi-tabs-Dme44bQS.js";import{t as ye}from"./date-range-select-CTlyo8zW.js";import{t as be}from"./use-analytics-data-Cds6XDjg.js";import{n as xe,t as Se}from"./audience-X_XsZivI.js";import{r as Ce,t as we}from"./post-analytics-header-DsMoLx0R.js";import{n as Te}from"./post-analytics-context-D0Mw-Pmv.js";import{n as X,r as Ee,t as De}from"./kpi-helpers-DpAuS1Nb.js";var Z=e(t(),1),Q=n(),Oe=({data:e,range:t})=>{let[n]=a(),[r,i]=(0,Z.useState)(n.get(`tab`)||`visits`),o=X[r],s=p(e||[],t,o.dataKey,`sum`)?.map(e=>{let t=Number(e[o.dataKey]);return{date:String(e.date),value:t,formattedValue:o.formatter(t),label:o.label}}),c=De(e),l=m(t,e||[],{fieldName:o.dataKey});return(0,Q.jsx)(S,{children:(0,Q.jsx)(y,{children:(0,Q.jsxs)(g,{defaultValue:r,variant:`kpis`,children:[(0,Q.jsxs)(h,{className:`-mx-6 hidden grid-cols-2 md:visible! md:grid!`,children:[(0,Q.jsx)(J,{value:`visits`,onClick:()=>{i(`visits`)},children:(0,Q.jsx)(Y,{color:X.visits.color,label:`Unique visitors`,value:c.visits})}),(0,Q.jsx)(J,{value:`views`,onClick:()=>{i(`views`)},children:(0,Q.jsx)(Y,{color:X.views.color,label:`Total views`,value:c.views})})]}),(0,Q.jsxs)(R,{children:[(0,Q.jsx)(he,{className:`md:hidden`,asChild:!0,children:(0,Q.jsxs)(ve,{children:[r===`visits`&&(0,Q.jsx)(Y,{color:`var(--chart-blue)`,label:`Unique visitors`,value:c.visits}),r===`views`&&(0,Q.jsx)(Y,{color:`var(--chart-teal)`,label:`Total views`,value:c.views})]})}),(0,Q.jsxs)(pe,{align:`end`,className:`w-56`,children:[(0,Q.jsx)(K,{onClick:()=>i(`visits`),children:`Unique visitors`}),(0,Q.jsx)(K,{onClick:()=>i(`views`),children:`Total views`})]})]}),(0,Q.jsx)(`div`,{className:`my-4 [&_.recharts-cartesian-axis-tick-value]:fill-gray-500`,children:(0,Q.jsx)(f,{className:`-mb-3 aspect-auto h-[16vw] max-h-[320px] min-h-[180px] w-full`,color:o.color,data:s,id:o.dataKey,range:l,showHours:!0,syncId:`overview-charts`})})]})})})},ke=e(P(),1);ke.registerLocale(N);var Ae=e=>me[e]||ke.getName(e,`en`,{select:`alias`})||`Unknown`,je=e=>({"UNITED STATES":`US`,"UNITED STATES OF AMERICA":`US`,USA:`US`,"UNITED KINGDOM":`GB`,UK:`GB`,"GREAT BRITAIN":`GB`,NETHERLANDS:`NL`})[e.toUpperCase()]||(e.length>2?e.substring(0,2):e),$=({tableHeader:e,data:t,onLocationClick:n})=>(0,Q.jsxs)(j,{children:[e&&(0,Q.jsxs)(C,{children:[(0,Q.jsx)(T,{children:`Country`}),(0,Q.jsx)(T,{children:`Visitors`})]}),(0,Q.jsx)(k,{children:t.map(e=>{let t=Ae(`${e.location}`)||`Unknown`,r=n&&e.location!==`Unknown`,i=e.location?e.location.toLowerCase():`unknown`;return(0,Q.jsxs)(M,{className:r?`cursor-pointer`:``,"data-testid":`location-row-${i}`,onClick:r?()=>n(e.location):void 0,children:[(0,Q.jsx)(D,{style:{width:`${e.percentage?Math.round(e.percentage*100):0}%`}}),(0,Q.jsx)(O,{className:`group-hover/data:max-w-[calc(100%-140px)]`,children:(0,Q.jsxs)(`div`,{className:`flex items-center space-x-3 overflow-hidden`,title:t||`Unknown`,children:[(0,Q.jsx)(F,{countryCode:`${je(e.location)}`,fallback:(0,Q.jsx)(`span`,{className:`flex h-[14px] w-[22px] items-center justify-center rounded-[2px] bg-black text-white`,children:(0,Q.jsx)(d.SkullAndBones,{className:`size-3`})})}),(0,Q.jsx)(`div`,{className:`truncate font-medium`,children:t})]})}),(0,Q.jsxs)(A,{children:[(0,Q.jsx)(w,{children:l(Number(e.visits))}),(0,Q.jsx)(E,{children:u(e.percentage)})]})]},e.location||`unknown`)})})]}),Me=({data:e,isLoading:t,onLocationClick:n})=>{let r=e.slice(0,10);return(0,Q.jsx)(Q.Fragment,{children:t?``:(0,Q.jsx)(Q.Fragment,{children:e&&e.length>0&&(0,Q.jsxs)(S,{className:`group/datalist`,"data-testid":`locations-card`,children:[(0,Q.jsxs)(`div`,{className:`flex items-center justify-between p-6`,children:[(0,Q.jsxs)(_,{className:`p-0`,children:[(0,Q.jsx)(b,{children:`Locations`}),(0,Q.jsx)(x,{children:`Where are the readers of this post`})]}),(0,Q.jsx)(de,{className:`mr-2`,children:`Visitors`})]}),(0,Q.jsxs)(y,{className:`overflow-hidden`,children:[(0,Q.jsx)(L,{}),(0,Q.jsx)($,{data:r,tableHeader:!1,onLocationClick:n})]}),e.length>10&&(0,Q.jsx)(v,{children:(0,Q.jsxs)(V,{children:[(0,Q.jsx)(B,{asChild:!0,children:(0,Q.jsxs)(U,{variant:`outline`,children:[`View all `,(0,Q.jsx)(fe,{})]})}),(0,Q.jsxs)(H,{className:`overflow-y-auto pt-0 sm:max-w-[420px]`,children:[(0,Q.jsxs)(I,{className:`sticky top-0 z-40 -mx-6 bg-surface-elevated/60 p-6 backdrop-blur`,children:[(0,Q.jsx)(z,{children:`Top locations`}),(0,Q.jsx)(W,{children:`Where are the readers of this post`})]}),(0,Q.jsx)(`div`,{className:`group/datalist`,children:(0,Q.jsx)($,{data:e,tableHeader:!0,onLocationClick:n})})]})]})})]})})})},Ne=()=>{let e=s(),{postId:t}=o(),{statsConfig:n,isLoading:a,site:l}=be(),{range:u,setRange:d,post:f,isPostLoading:p}=Te(),{appSettings:m}=le(),h=(0,Z.useRef)(null),{filters:g,setFilters:_}=oe({supportedFields:ae,trackingSource:`post-analytics`}),v=(0,Z.useMemo)(()=>Se(g.find(e=>e.field===`audience`)?.values),[g]);(0,Z.useEffect)(()=>{!p&&f?.email_only&&e(`/posts/analytics/${t}`)},[p,f?.email_only,e,t]);let b=(0,Z.useMemo)(()=>{if(!f?.published_at)return ue.allTime.value;let e=ce(f.published_at),{startDate:t,endDate:n}=G(u);return n.diff(t,`days`)+1>e?e:u},[f?.published_at,u]),{startDate:x,endDate:C,timezone:w}=G(b),T=(0,Z.useCallback)(()=>{let e=ee(h.current);e&&e.scrollTo({top:0,behavior:`smooth`})},[]),E=(0,Z.useMemo)(()=>{let e={};return g.forEach(t=>{let n=t.field,r=t.values;if(n===`audience`)return;let i=r&&r.length>0&&r[0]!==null&&r[0]!==void 0,a=n===`source`&&r?.[0]===``;if(i&&(r[0]!==``||a)){let t=String(r[0]);e[n]=t}}),e},[g]),D=(0,Z.useCallback)((e,t)=>{_(n=>n.find(t=>t.field===e)?n.map(n=>n.field===e?{...n,values:[t]}:n):[...n,ne(e,`is`,[t])]),T()},[_,T]),O=(0,Z.useCallback)(e=>D(`location`,e),[D]),k=(0,Z.useCallback)(e=>D(`source`,e),[D]),A=(0,Z.useMemo)(()=>{let e={site_uuid:n?.id||``,date_from:q(x),date_to:q(C),timezone:w,member_status:xe(v),post_uuid:``,...E};return!p&&f?.uuid?{...e,post_uuid:f.uuid}:e},[p,f,n?.id,x,C,w,v,E]),{data:j,loading:M}=r({endpoint:`api_kpis`,statsConfig:n,params:A}),{data:N,loading:P}=r({endpoint:`api_top_locations`,statsConfig:n,params:A}),{data:F,loading:I}=r({endpoint:`api_top_sources`,statsConfig:n,params:A}),L=(0,Z.useMemo)(()=>N?.reduce((e,t)=>e+Number(t.visits),0)||0,[N]),R=(0,Z.useMemo)(()=>F?F.reduce((e,t)=>e+Number(t.visits||0),0):0,[F]),z=l.url,B=l.icon,V=(0,Z.useMemo)(()=>{let e=N?.map(e=>({location:String(e.location),visits:Number(e.visits),percentage:L>0?Number(e.visits)/L:0,isUnknown:ge.includes(String(e.location))}))||[],t=e.filter(e=>!e.isUnknown),n=e.filter(e=>e.isUnknown),r=n.length>0?[{location:`Unknown`,visits:n.reduce((e,t)=>e+t.visits,0),percentage:n.reduce((e,t)=>e+t.percentage,0)}]:[];return[...t,...r]},[N,L]),H=a||p||M||P||I,U=De(j),W=g.length>0;return m&&!m.analytics?.webAnalytics?(0,Q.jsx)(c,{to:`/posts/analytics/${t}`,replace:!0}):(0,Q.jsxs)(Q.Fragment,{children:[(0,Q.jsxs)(we,{currentTab:`Web`,children:[W&&(0,Q.jsx)(i,{children:(0,Q.jsx)(ye,{range:u,onRangeChange:d})}),(0,Q.jsxs)(i,{className:`${W?`mt-0! [grid-area:subactions] lg:mt-[25px]!`:`[grid-area:actions]`}`,children:[(0,Q.jsx)(ie,{filters:g,postUuid:f?.uuid,range:u,onChange:_}),!W&&(0,Q.jsx)(ye,{range:u,onRangeChange:d})]})]}),(0,Q.jsx)(Ce,{ref:h,children:H?(0,Q.jsx)(S,{className:`size-full`,variant:`plain`,children:(0,Q.jsx)(y,{className:`size-full items-center justify-center`,children:(0,Q.jsx)(se,{})})}):j&&j.length!==0&&U.visits!==`0`?(0,Q.jsxs)(Q.Fragment,{children:[(0,Q.jsx)(Oe,{data:j,range:b}),(0,Q.jsxs)(`div`,{className:`flex flex-col gap-6 lg:grid lg:grid-cols-2`,children:[(0,Q.jsx)(Me,{data:V,isLoading:P,onLocationClick:O}),(0,Q.jsx)(Ee,{data:F,range:b,siteIcon:B,siteUrl:z,totalVisitors:R,onSourceClick:k})]})]}):(0,Q.jsx)(`div`,{className:`grow`,children:(0,Q.jsx)(re,{className:`h-full`,description:`Try adjusting filters to see more data.`,title:`No visitors ${te(u)}`,children:(0,Q.jsx)(_e,{strokeWidth:1.5})})})})]})};export{Ne as default};

package/core/server/services/gifts/gift-repository.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/core/server/services/gifts/gift-repository.ts

@@ -1,29 +0,0 @@
-import type {Gift} from './gift';
-
-export interface RepositoryTransactionOptions {
-    transacting?: unknown;
-    forUpdate?: boolean;
-}
-
-export interface FindPendingReminderOptions {
-    now: Date;
-    reminderLeadMs: number;
-    reminderFloorMs: number;
-    transacting?: unknown;
-}
-
-export interface GiftRepository {
-    existsByCheckoutSessionId(checkoutSessionId: string): Promise<boolean>;
-    getById(id: string, options?: RepositoryTransactionOptions): Promise<Gift | null>;
-    getByToken(token: string, options?: RepositoryTransactionOptions): Promise<Gift | null>;
-    getByPaymentIntentId(paymentIntentId: string): Promise<Gift | null>;
-    findPendingConsumption(): Promise<Gift[]>;
-    findPendingExpiration(): Promise<Gift[]>;
-    findPendingReminder(options: FindPendingReminderOptions): Promise<Gift[]>;
-    findUnsentReminders(): Promise<Gift[]>;
-    getActiveByMember(memberId: string, options?: RepositoryTransactionOptions): Promise<Gift | null>;
-    getActiveByMembers(memberIds: string[], options?: RepositoryTransactionOptions): Promise<Map<string, Gift>>;
-    create(gift: Gift, options?: RepositoryTransactionOptions): Promise<void>;
-    update(gift: Gift, options?: RepositoryTransactionOptions): Promise<void>;
-    transaction<T>(callback: (transacting: unknown) => Promise<T>): Promise<T>;
-}

package/core/server/services/route-settings/activation-bridge.js

@@ -1,164 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.expandRouteSettings = expandRouteSettings;
-const lodash_1 = __importDefault(require("lodash"));
-const errors_1 = __importDefault(require("@tryghost/errors"));
-const config_1 = require("../../../frontend/services/routing/config");
-function expandShortFormData(shortForm, resourceKey) {
-    const [key, slug] = shortForm.split('.');
-    const queryConfig = config_1.QUERY[key];
-    const data = {
-        query: {},
-        router: {}
-    };
-    const effectiveKey = resourceKey || key;
-    data.query[effectiveKey] = lodash_1.default.cloneDeep(queryConfig);
-    data.query[effectiveKey].options.slug = slug;
-    const routerKey = queryConfig.resource;
-    data.router[routerKey] = [{ slug, redirect: true }];
-    return data;
-}
-function expandLongFormEntry(key, entry) {
-    const defaultResource = Object.values(config_1.QUERY).find(item => item.resource === entry.resource);
-    if (!defaultResource) {
-        throw new errors_1.default.IncorrectUsageError({ message: `Unknown route data resource: ${entry.resource}` });
-    }
-    const data = {
-        query: {},
-        router: {}
-    };
-    data.query[key] = {
-        type: entry.type,
-        resource: defaultResource.resource
-    };
-    data.query[key] = lodash_1.default.defaults(data.query[key], lodash_1.default.omit(defaultResource, 'options'));
-    const allowedQueryOptions = ['limit', 'order', 'filter', 'include', 'slug', 'visibility', 'status', 'page'];
-    data.query[key].options = lodash_1.default.pick(entry, allowedQueryOptions);
-    if (entry.type === 'read') {
-        const defaultOptions = 'options' in defaultResource ? defaultResource.options : undefined;
-        data.query[key].options = lodash_1.default.defaults(data.query[key].options, defaultOptions);
-    }
-    const routerKey = defaultResource.resource;
-    if (!data.router[routerKey]) {
-        data.router[routerKey] = [];
-    }
-    if (entry.type === 'read') {
-        const allowedRouterOptions = ['redirect', 'slug'];
-        let routerEntry = lodash_1.default.pick(entry, allowedRouterOptions);
-        routerEntry = lodash_1.default.defaults(routerEntry, { redirect: true });
-        data.router[routerKey].push(routerEntry);
-    }
-    else {
-        data.router[routerKey].push({ redirect: true });
-    }
-    return data;
-}
-function expandRouteData(routeData) {
-    if (!routeData) {
-        return { query: {}, router: {} };
-    }
-    if (typeof routeData === 'string') {
-        return expandShortFormData(routeData);
-    }
-    const merged = { query: {}, router: {} };
-    for (const [key, entry] of Object.entries(routeData)) {
-        let expanded;
-        if (typeof entry === 'string') {
-            expanded = expandShortFormData(entry, key);
-        }
-        else {
-            expanded = expandLongFormEntry(key, entry);
-        }
-        lodash_1.default.merge(merged.query, expanded.query);
-        for (const [routerKey, routerEntries] of Object.entries(expanded.router)) {
-            if (merged.router[routerKey]) {
-                merged.router[routerKey] = merged.router[routerKey].concat(routerEntries);
-            }
-            else {
-                merged.router[routerKey] = routerEntries;
-            }
-        }
-    }
-    return merged;
-}
-function convertSlugsToColons(value) {
-    return value.replace(/{(\w+)}/g, ':$1');
-}
-function expandRoute(route) {
-    const expanded = {};
-    expanded.templates = route.templates || [];
-    if (route.data !== undefined) {
-        expanded.data = expandRouteData(route.data);
-    }
-    if (route.type === 'channel') {
-        const channel = route;
-        expanded.controller = 'channel';
-        if (channel.filter !== undefined) {
-            expanded.filter = channel.filter;
-        }
-        if (channel.order !== undefined) {
-            expanded.order = channel.order;
-        }
-        if (channel.limit !== undefined) {
-            expanded.limit = channel.limit;
-        }
-        if (channel.rss !== undefined) {
-            expanded.rss = channel.rss;
-        }
-    }
-    else {
-        const template = route;
-        if (template.contentType !== undefined) {
-            expanded.content_type = template.contentType;
-        }
-    }
-    return expanded;
-}
-function expandCollection(collection) {
-    const expanded = {};
-    expanded.permalink = convertSlugsToColons(collection.permalink);
-    expanded.templates = collection.templates || [];
-    if (collection.data !== undefined) {
-        expanded.data = expandRouteData(collection.data);
-    }
-    if (collection.filter !== undefined) {
-        expanded.filter = collection.filter;
-    }
-    if (collection.order !== undefined) {
-        expanded.order = collection.order;
-    }
-    if (collection.limit !== undefined) {
-        expanded.limit = collection.limit;
-    }
-    if (collection.rss !== undefined) {
-        expanded.rss = collection.rss;
-    }
-    return expanded;
-}
-/**
- * Converts a RouteSettings domain model into the legacy expanded format
- * that routerManager.start() expects.
- *
- * This is a temporary adapter — it gets removed once RouterManager is
- * refactored to consume the domain model directly (HKG-1895/HKG-1898).
- */
-function expandRouteSettings(settings) {
-    const routes = {};
-    for (const route of settings.routes) {
-        routes[route.path] = expandRoute(route);
-    }
-    const collections = {};
-    for (const collection of settings.collections) {
-        collections[collection.path] = expandCollection(collection);
-    }
-    const taxonomies = {};
-    for (const [key, value] of Object.entries(settings.taxonomies)) {
-        if (value) {
-            taxonomies[key] = convertSlugsToColons(value);
-        }
-    }
-    return { routes, collections, taxonomies };
-}

package/core/server/services/route-settings/activation-bridge.ts

@@ -1,210 +0,0 @@
-import _ from 'lodash';
-import errors from '@tryghost/errors';
-import {QUERY} from '../../../frontend/services/routing/config';
-import type {
-    RouteSettings,
-    Route,
-    ChannelRoute,
-    TemplateRoute,
-    CollectionConfig,
-    RouteData,
-    DataShortForm,
-    DataShortFormResource,
-    DataReadEntry,
-    DataBrowseEntry
-} from '@tryghost/adapter-base-route-settings';
-
-interface ExpandedData {
-    query: Record<string, any>;
-    router: Record<string, any[]>;
-}
-
-function expandShortFormData(shortForm: DataShortForm, resourceKey?: string): ExpandedData {
-
-    const [key, slug] = shortForm.split('.') as [DataShortFormResource, string];
-    const queryConfig = QUERY[key];
-
-    const data: ExpandedData = {
-        query: {},
-        router: {}
-    };
-
-    const effectiveKey = resourceKey || key;
-    data.query[effectiveKey] = _.cloneDeep(queryConfig);
-    data.query[effectiveKey].options.slug = slug;
-
-    const routerKey = queryConfig.resource;
-    data.router[routerKey] = [{slug, redirect: true}];
-
-    return data;
-}
-
-function expandLongFormEntry(key: string, entry: DataReadEntry | DataBrowseEntry): ExpandedData {
-    const defaultResource = Object.values(QUERY).find(item => item.resource === entry.resource);
-
-    if (!defaultResource) {
-        throw new errors.IncorrectUsageError({message: `Unknown route data resource: ${entry.resource}`});
-    }
-
-    const data: ExpandedData = {
-        query: {},
-        router: {}
-    };
-
-    data.query[key] = {
-        type: entry.type,
-        resource: defaultResource.resource
-    };
-
-    data.query[key] = _.defaults(data.query[key], _.omit(defaultResource, 'options'));
-
-    const allowedQueryOptions = ['limit', 'order', 'filter', 'include', 'slug', 'visibility', 'status', 'page'];
-    data.query[key].options = _.pick(entry, allowedQueryOptions);
-
-    if (entry.type === 'read') {
-        const defaultOptions = 'options' in defaultResource ? defaultResource.options : undefined;
-        data.query[key].options = _.defaults(data.query[key].options, defaultOptions);
-    }
-
-    const routerKey = defaultResource.resource;
-    if (!data.router[routerKey]) {
-        data.router[routerKey] = [];
-    }
-
-    if (entry.type === 'read') {
-        const allowedRouterOptions = ['redirect', 'slug'];
-        let routerEntry = _.pick(entry, allowedRouterOptions);
-        routerEntry = _.defaults(routerEntry, {redirect: true});
-        data.router[routerKey].push(routerEntry);
-    } else {
-        data.router[routerKey].push({redirect: true});
-    }
-
-    return data;
-}
-
-function expandRouteData(routeData: RouteData | undefined): ExpandedData {
-    if (!routeData) {
-        return {query: {}, router: {}};
-    }
-
-    if (typeof routeData === 'string') {
-        return expandShortFormData(routeData);
-    }
-
-    const merged: ExpandedData = {query: {}, router: {}};
-
-    for (const [key, entry] of Object.entries(routeData)) {
-        let expanded: ExpandedData;
-
-        if (typeof entry === 'string') {
-            expanded = expandShortFormData(entry, key);
-        } else {
-            expanded = expandLongFormEntry(key, entry);
-        }
-
-        _.merge(merged.query, expanded.query);
-
-        for (const [routerKey, routerEntries] of Object.entries(expanded.router)) {
-            if (merged.router[routerKey]) {
-                merged.router[routerKey] = merged.router[routerKey].concat(routerEntries);
-            } else {
-                merged.router[routerKey] = routerEntries;
-            }
-        }
-    }
-
-    return merged;
-}
-
-function convertSlugsToColons(value: string): string {
-    return value.replace(/{(\w+)}/g, ':$1');
-}
-
-function expandRoute(route: Route): Record<string, any> {
-    const expanded: Record<string, any> = {};
-
-    expanded.templates = route.templates || [];
-
-    if (route.data !== undefined) {
-        expanded.data = expandRouteData(route.data);
-    }
-
-    if (route.type === 'channel') {
-        const channel = route as ChannelRoute;
-        expanded.controller = 'channel';
-        if (channel.filter !== undefined) {
-            expanded.filter = channel.filter;
-        }
-        if (channel.order !== undefined) {
-            expanded.order = channel.order;
-        }
-        if (channel.limit !== undefined) {
-            expanded.limit = channel.limit;
-        }
-        if (channel.rss !== undefined) {
-            expanded.rss = channel.rss;
-        }
-    } else {
-        const template = route as TemplateRoute;
-        if (template.contentType !== undefined) {
-            expanded.content_type = template.contentType;
-        }
-    }
-
-    return expanded;
-}
-
-function expandCollection(collection: CollectionConfig): Record<string, any> {
-    const expanded: Record<string, any> = {};
-
-    expanded.permalink = convertSlugsToColons(collection.permalink);
-    expanded.templates = collection.templates || [];
-
-    if (collection.data !== undefined) {
-        expanded.data = expandRouteData(collection.data);
-    }
-
-    if (collection.filter !== undefined) {
-        expanded.filter = collection.filter;
-    }
-    if (collection.order !== undefined) {
-        expanded.order = collection.order;
-    }
-    if (collection.limit !== undefined) {
-        expanded.limit = collection.limit;
-    }
-    if (collection.rss !== undefined) {
-        expanded.rss = collection.rss;
-    }
-
-    return expanded;
-}
-
-/**
- * Converts a RouteSettings domain model into the legacy expanded format
- * that routerManager.start() expects.
- *
- * This is a temporary adapter — it gets removed once RouterManager is
- * refactored to consume the domain model directly (HKG-1895/HKG-1898).
- */
-export function expandRouteSettings(settings: RouteSettings): {routes: Record<string, any>; collections: Record<string, any>; taxonomies: Record<string, string>} {
-    const routes: Record<string, any> = {};
-    for (const route of settings.routes) {
-        routes[route.path] = expandRoute(route);
-    }
-
-    const collections: Record<string, any> = {};
-    for (const collection of settings.collections) {
-        collections[collection.path] = expandCollection(collection);
-    }
-
-    const taxonomies: Record<string, string> = {};
-    for (const [key, value] of Object.entries(settings.taxonomies)) {
-        if (value) {
-            taxonomies[key] = convertSlugsToColons(value);
-        }
-    }
-
-    return {routes, collections, taxonomies};
-}

package/core/server/services/route-settings/default-settings-manager.js

@@ -1,63 +0,0 @@
-const fs = require('fs-extra');
-const path = require('path');
-const debug = require('@tryghost/debug')('frontend:services:settings:ensure-settings');
-const tpl = require('@tryghost/tpl');
-const errors = require('@tryghost/errors');
-
-const messages = {
-    ensureSettings: 'Error trying to access settings files in {path}.'
-};
-
-class DefaultSettingsManager {
-    /**
-     *
-     * @param {Object} options
-     * @param {string} options.type - name of the setting file
-     * @param {string} options.extension - settings file extension
-     * @param {string} options.destinationFolderPath - path to store the default setting config
-     * @param {string} options.sourceFolderPath - path where the default config can be seeded from
-     */
-    constructor({type, extension, destinationFolderPath, sourceFolderPath}) {
-        this.type = type;
-        this.extension = extension;
-        this.destinationFolderPath = destinationFolderPath;
-        this.sourceFolderPath = sourceFolderPath;
-    }
-
-    /**
-     *
-     * Makes sure the destination folder either contains a file or copies over a default file.
-     * @returns {Promise<any>}
-     */
-    async ensureSettingsFileExists() {
-        const fileName = this.type + this.extension;
-        const defaultFileName = `default-${fileName}`;
-
-        const destinationFilePath = path.join(this.destinationFolderPath, fileName);
-        const defaultFilePath = path.join(this.sourceFolderPath, defaultFileName);
-
-        return Promise.resolve(fs.readFile(destinationFilePath, 'utf8'))
-            .catch((err) => {
-                if (err.code === 'ENOENT') {
-                    // CASE: file doesn't exist, copy it from our defaults
-                    return fs.copy(
-                        defaultFilePath,
-                        destinationFilePath
-                    ).then(() => {
-                        debug(`'${defaultFileName}' copied to ${this.destinationFolderPath}.`);
-                    });
-                } else {
-                    // CASE: we might have a permission error, as we can't access the directory
-                    throw new errors.InternalServerError({
-                        message: tpl(messages.ensureSettings, {
-                            path: this.destinationFolderPath
-                        }),
-                        err: err,
-                        context: err.path
-                    });
-                }
-            });
-    }
-}
-
-module.exports = DefaultSettingsManager;

package/core/server/services/route-settings/route-settings.js

@@ -1,170 +0,0 @@
-const fs = require('fs-extra');
-const crypto = require('crypto');
-const urlService = require('../url');
-
-const debug = require('@tryghost/debug')('services:route-settings');
-const errors = require('@tryghost/errors');
-const tpl = require('@tryghost/tpl');
-const bridge = require('../../../bridge');
-
-const messages = {
-    loadError: 'Could not load routes.yaml file.'
-};
-
-/**
- * The `routes.yaml` file offers a way to configure your Ghost blog. It's currently a setting feature
- * we have added. That's why the `routes.yaml` file is treated as a "setting" right now.
- * If we want to add single permissions for this file (e.g. upload/download routes.yaml), we can add later.
- *
- * How does it work?
- *
- * - we first reset all url generators (each url generator belongs to one express router)
- *   - we don't destroy the resources, we only release them (this avoids reloading all resources from the db again)
- * - then we reload the whole site app, which will reset all routers and re-create the url generators
- */
-
-class RouteSettings {
-    /**
-     *
-     * @param {Object} options
-     * @param {Object} options.settingsLoader
-     * @param {string} options.settingsPath
-     * @param {string} options.backupPath
-     */
-    constructor({settingsLoader, settingsPath, backupPath}) {
-        /**
-         * md5 hashes of default routes settings
-         * @private
-         */
-        this.defaultRoutesSettingHash = '3d180d52c663d173a6be791ef411ed01';
-
-        this.settingsLoader = settingsLoader;
-        this.settingsPath = settingsPath;
-        this.backupPath = backupPath;
-    }
-
-    /**
-     * @private
-     * @param {string} settingsPath
-     * @param {string} backupPath
-     */
-    async createBackupFile(settingsPath, backupPath) {
-        return await fs.copy(settingsPath, backupPath);
-    }
-
-    /**
-     * @private
-     * @param {string} settingsPath
-     * @param {string} backupPath
-     */
-    async restoreBackupFile(settingsPath, backupPath) {
-        return await fs.copy(backupPath, settingsPath);
-    }
-
-    /**
-     * @private
-     * @param {string} filePath
-     * @param {string} settingsPath
-     */
-    async saveFile(filePath, settingsPath) {
-        return await fs.copy(filePath, settingsPath);
-    }
-
-    /**
-     * @private
-     * @param {string} settingsFilePath
-     */
-    async readFile(settingsFilePath) {
-        return fs.readFile(settingsFilePath, 'utf-8')
-            .catch((err) => {
-                if (err.code === 'ENOENT') {
-                    return Promise.resolve([]);
-                }
-
-                if (errors.utils.isGhostError(err)) {
-                    throw err;
-                }
-
-                throw new errors.NotFoundError({
-                    err: err
-                });
-            });
-    }
-
-    async setFromFilePath(filePath) {
-        await this.createBackupFile(this.settingsPath, this.backupPath);
-        await this.saveFile(filePath, this.settingsPath);
-
-        urlService.resetGenerators({releaseResourcesOnly: true});
-
-        const bringBackValidRoutes = async () => {
-            urlService.resetGenerators({releaseResourcesOnly: true});
-
-            await this.restoreBackupFile(this.settingsPath, this.backupPath);
-
-            return bridge.reloadFrontend();
-        };
-
-        try {
-            await bridge.reloadFrontend();
-        } catch (err) {
-            return bringBackValidRoutes()
-                .finally(() => {
-                    throw err;
-                });
-        }
-
-        // @TODO: how can we get rid of this from here?
-        let tries = 0;
-
-        function isBlogRunning() {
-            debug('waiting for blog running');
-            return new Promise((resolve) => {
-                setTimeout(resolve, 1000);
-            })
-                .then(() => {
-                    debug('waited for blog running');
-                    if (!urlService.hasFinished()) {
-                        if (tries > 5) {
-                            throw new errors.InternalServerError({
-                                message: tpl(messages.loadError)
-                            });
-                        }
-
-                        tries = tries + 1;
-                        return isBlogRunning();
-                    }
-                });
-        }
-
-        return isBlogRunning()
-            .catch((err) => {
-                return bringBackValidRoutes()
-                    .finally(() => {
-                        throw err;
-                    });
-            });
-    }
-
-    async get() {
-        return this.readFile(this.settingsPath);
-    }
-
-    calculateHash(data) {
-        return crypto.createHash('md5')
-            .update(data, 'binary')
-            .digest('hex');
-    }
-
-    getDefaultHash() {
-        return this.defaultRoutesSettingHash;
-    }
-
-    async getCurrentHash() {
-        const data = await this.settingsLoader.loadSettings();
-
-        return this.calculateHash(JSON.stringify(data));
-    }
-}
-
-module.exports = RouteSettings;