ghost 6.55.0 → 6.57.0

package/core/server/services/url/routable-resources.js

@@ -1,22 +1,21 @@
 const errors = require('@tryghost/errors');
 
 /**
- * Enumerates the routable resources of a type: the rows the lazy URL service
- * would produce a URL for. This is the lazy counterpart of the eager
- * service's boot walk — same raw-knex fast path, same public-visibility
- * gates — computed on demand instead of held in memory.
+ * Enumerates the routable resources of a type: the rows the URL service would
+ * produce a URL for. Computed on demand rather than held in memory.
  *
- * Callers name the extra columns they want back; everything else stays out
- * of memory. The columns URL computation needs (permalink fields, filter
- * columns, relations) come from the lazy service itself, so rows are never
- * thin for the active routing config.
+ * Callers name the extra columns they want back; everything else stays out of
+ * memory. The columns URL computation itself needs (permalink fields, filter
+ * columns, relations) are passed in by the URL service, which is the source of
+ * truth for what the active routing config reads — so rows are never thin for
+ * it.
  */
 
 // Which rows of each type are routable. visibility:public alone is not
 // enough for tags and authors: without the has-posts join, empty tags and
 // staff user accounts would be routable/listable.
 const TYPE_CONFIG = {
-    posts: {modelName: 'Post', table: 'posts', filter: 'status:published+type:post'},
+    posts: {modelName: 'Post', table: 'posts', filter: 'status:published+type:post', canCarryRelations: true},
     pages: {modelName: 'Post', table: 'posts', filter: 'status:published+type:page'},
     tags: {
         modelName: 'Tag',
@@ -37,80 +36,72 @@ const RELATION_FIELDS = {
     authors: ['users.id', 'users.slug']
 };
 
-// Keeps each SQLite query under the bound-variable limit (#5810) — the same
-// strategy as the eager boot walk (services/url/resources.js).
+// Keeps each SQLite query under the bound-variable limit (#5810).
 const SQLITE_BATCH_SIZE = 999;
 
 /**
- * @param {Object} deps
- * @param {Object} deps.lazyUrlService - source of truth for the columns and
- * relations the active routing config reads
- * @returns {(type: string, options?: {columns?: string[]}) => Promise<Object[]>}
+ * @param {string} type
+ * @param {Object} [options]
+ * @param {string[]} [options.columns] - extra columns the caller wants back
+ * @param {string[]} [options.requiredFields] - columns URL computation reads
+ * @param {string[]} [options.requiredRelations] - relations URL computation
+ * reads; ignored for types that carry none
+ * @returns {Promise<Object[]>}
  */
-function createFetchRoutableResources({lazyUrlService}) {
-    if (!lazyUrlService) {
+async function fetchRoutableResources(type, {columns = [], requiredFields = [], requiredRelations = []} = {}) {
+    const typeConfig = TYPE_CONFIG[type];
+    if (!typeConfig) {
         throw new errors.IncorrectUsageError({
-            message: 'fetchRoutableResources requires a lazy URL service backend'
+            message: `Unknown routable resource type: ${type}`
         });
     }
 
-    return async function fetchRoutableResources(type, {columns = []} = {}) {
-        const typeConfig = TYPE_CONFIG[type];
-        if (!typeConfig) {
-            throw new errors.IncorrectUsageError({
-                message: `Unknown routable resource type: ${type}`
-            });
-        }
-
-        // Lazy requires: the model layer must not load before boot wires it.
-        const models = require('../../models');
-        const schema = require('../../data/schema');
-        const DatabaseInfo = require('@tryghost/database-info');
+    // Required here rather than at the top so this module can be loaded
+    // for its shape without pulling in the model layer.
+    const models = require('../../models');
+    const schema = require('../../data/schema');
+    const DatabaseInfo = require('@tryghost/database-info');
 
-        // Callers speak include; raw_knex only speaks exclude, so translate
-        // against the table schema here, once.
-        const include = new Set(['id', ...columns, ...lazyUrlService.getRequiredFields(type)]);
-        const options = {
-            modelName: typeConfig.modelName,
-            filter: typeConfig.filter,
-            exclude: Object.keys(schema.tables[typeConfig.table]).filter(column => !include.has(column))
-        };
-        if (typeConfig.shouldHavePosts) {
-            options.shouldHavePosts = typeConfig.shouldHavePosts;
-        }
+    // Callers speak include; raw_knex only speaks exclude, so translate
+    // against the table schema here, once.
+    const include = new Set(['id', ...columns, ...requiredFields]);
+    const options = {
+        modelName: typeConfig.modelName,
+        filter: typeConfig.filter,
+        exclude: Object.keys(schema.tables[typeConfig.table]).filter(column => !include.has(column))
+    };
+    if (typeConfig.shouldHavePosts) {
+        options.shouldHavePosts = typeConfig.shouldHavePosts;
+    }
 
-        // Relations only when the active routing config reads them (e.g.
-        // /:primary_tag/:slug/ permalinks, tag-filtered collections). Pages
-        // never carry relations, mirroring the eager resource config.
-        if (type === 'posts') {
-            const relations = lazyUrlService.getRequiredRelations();
-            if (relations.length) {
-                options.withRelated = relations;
-                options.withRelatedFields = {};
-                for (const relation of relations) {
-                    options.withRelatedFields[relation] = RELATION_FIELDS[relation];
-                }
-            }
+    // Relations only when the active routing config reads them (e.g.
+    // /:primary_tag/:slug/ permalinks, tag-filtered collections), and only for
+    // the types that have any — see canCarryRelations above.
+    if (typeConfig.canCarryRelations && requiredRelations.length) {
+        options.withRelated = requiredRelations;
+        options.withRelatedFields = {};
+        for (const relation of requiredRelations) {
+            options.withRelatedFields[relation] = RELATION_FIELDS[relation];
         }
+    }
 
-        let rows;
-        if (!DatabaseInfo.isSQLite(models.Base.knex)) {
-            rows = await models.Base.Model.raw_knex.fetchAll(options);
-        } else {
-            rows = [];
-            let offset = 0;
-            let batch;
-            do {
-                // orderBy makes the pagination deterministic; without it the
-                // row order between batches is unspecified.
-                batch = await models.Base.Model.raw_knex.fetchAll({...options, orderBy: 'id', offset, limit: SQLITE_BATCH_SIZE});
-                rows.push(...batch);
-                offset += SQLITE_BATCH_SIZE;
-            } while (batch.length);
-        }
+    let rows;
+    if (!DatabaseInfo.isSQLite(models.Base.knex)) {
+        rows = await models.Base.Model.raw_knex.fetchAll(options);
+    } else {
+        rows = [];
+        let offset = 0;
+        let batch;
+        do {
+            // orderBy makes the pagination deterministic; without it the
+            // row order between batches is unspecified.
+            batch = await models.Base.Model.raw_knex.fetchAll({...options, orderBy: 'id', offset, limit: SQLITE_BATCH_SIZE});
+            rows.push(...batch);
+            offset += SQLITE_BATCH_SIZE;
+        } while (batch.length);
+    }
 
-        return rows;
-    };
+    return rows;
 }
 
-module.exports = {createFetchRoutableResources};
+module.exports = {fetchRoutableResources};

package/core/server/services/url/router-filter.js

@@ -6,8 +6,9 @@ exports.buildFilter = buildFilter;
 exports.filterMatches = filterMatches;
 const nql = require('@tryghost/nql');
 const logging = require('@tryghost/logging');
-// A deliberate copy of the eager UrlGenerator's NQL semantics: while both
-// services run side by side, eager is the parity oracle and must stay separate.
+// NQL evaluation for routes.yaml collection filters, kept in one place so the
+// forward lookup, ownership check and reverse lookup all decide membership the
+// same way.
 exports.EXPANSIONS = [
     { key: 'author', replacement: 'authors.slug' },
     { key: 'tags', replacement: 'tags.slug' },
@@ -46,8 +47,15 @@ function buildFilter(filter) {
     }
     return nql(filter, { expansions: exports.EXPANSIONS, transformer: PAGE_TRANSFORMER });
 }
-// A null filter always matches; a filter that throws is a non-match, not an
-// error, mirroring the eager generator's try/catch.
+// A null filter always matches; anything that throws is a non-match, not an
+// error.
+//
+// That covers malformed filters as well as odd records, because NQL parses
+// lazily: `buildFilter` returns happily for a filter like `((`, and the parse
+// error surfaces here on the first `queryJSON`. So this catch is the only
+// thing standing between a bad routes.yaml filter and a site that cannot
+// route — do not narrow it on the assumption that compilation already
+// failed somewhere upstream. Pinned in router-filter.test.js.
 function filterMatches(compiledFilter, record) {
     if (!compiledFilter) {
         return true;

package/core/server/services/url/router-filter.ts

@@ -1,8 +1,9 @@
 const nql = require('@tryghost/nql');
 const logging = require('@tryghost/logging');
 
-// A deliberate copy of the eager UrlGenerator's NQL semantics: while both
-// services run side by side, eager is the parity oracle and must stay separate.
+// NQL evaluation for routes.yaml collection filters, kept in one place so the
+// forward lookup, ownership check and reverse lookup all decide membership the
+// same way.
 export const EXPANSIONS = [
     {key: 'author', replacement: 'authors.slug'},
     {key: 'tags', replacement: 'tags.slug'},
@@ -50,8 +51,15 @@ export function buildFilter(filter: string | null | undefined): CompiledFilter |
     return nql(filter, {expansions: EXPANSIONS, transformer: PAGE_TRANSFORMER});
 }
 
-// A null filter always matches; a filter that throws is a non-match, not an
-// error, mirroring the eager generator's try/catch.
+// A null filter always matches; anything that throws is a non-match, not an
+// error.
+//
+// That covers malformed filters as well as odd records, because NQL parses
+// lazily: `buildFilter` returns happily for a filter like `((`, and the parse
+// error surfaces here on the first `queryJSON`. So this catch is the only
+// thing standing between a bad routes.yaml filter and a site that cannot
+// route — do not narrow it on the assumption that compilation already
+// failed somewhere upstream. Pinned in router-filter.test.js.
 export function filterMatches(compiledFilter: CompiledFilter | null, record: Record<string, unknown>): boolean {
     if (!compiledFilter) {
         return true;

package/core/server/services/webhooks/index.js

@@ -7,7 +7,7 @@ module.exports = {
         const models = require('../../models');
         const limitService = require('../../services/limits');
         const events = require('../../lib/common/events');
-        const urlService = require('../url').facade;
+        const urlService = require('../url');
         const createSerialize = require('./serialize');
         const createPayload = require('./payload');
         const WebhookTrigger = require('./webhook-trigger');

package/core/server/services/webhooks/serialize.js

@@ -3,7 +3,8 @@
 // routing an under-loaded post 404s. Ask the URL service which relations it
 // needs and load only the ones missing — reloading a relation the event
 // already carries (e.g. authors) would strip its nested roles from the
-// payload. Returns [] under eager routing, which resolves URLs by id.
+// payload. `getRequiredRelations()` is [] when the routing config reads
+// none, so this is a no-op on a default routes.yaml.
 const loadRequiredUrlRelations = async (model, urlService) => {
     const required = urlService.getRequiredRelations();
     const missing = required.filter(relation => !model.relations[relation]);

package/core/server/web/gift-preview/controller.js

@@ -39,7 +39,6 @@ function escapeHtml(str) {
 
 async function giftPreview(req, res) {
     const giftService = require('../../services/gifts').service;
-    const tiersService = require('../../services/tiers');
     const urlUtils = require('../../../shared/url-utils').default;
     const settingsCache = require('../../../shared/settings-cache');
 
@@ -48,21 +47,14 @@ async function giftPreview(req, res) {
     const {token} = req.params;
     const siteTitle = settingsCache.get('title') || 'Ghost';
 
-    let gift;
-    let tier;
+    let preview;
 
     try {
-        gift = await giftService.getByToken(token);
+        preview = await giftService.getPreview(token);
 
-        if (!gift) {
+        if (!preview) {
             throw new errors.NotFoundError({message: `Gift not found for token`});
         }
-
-        tier = await tiersService.api.read(gift.tierId);
-
-        if (!tier) {
-            throw new errors.NotFoundError({message: `Tier not found for gift: ${gift.id}`});
-        }
     } catch (err) {
         logging.warn(`Gift preview: failed to load required gift data, redirecting to homepage`, err);
 
@@ -70,9 +62,9 @@ async function giftPreview(req, res) {
     }
 
     const ogTitle = getOgTitle({
-        cadence: gift.cadence,
-        duration: gift.duration,
-        tierName: tier.name,
+        cadence: preview.cadence,
+        duration: preview.duration,
+        tierName: preview.tier.name,
         siteTitle
     });
     const ogDescription = t('Open this link to redeem your gift.');
@@ -120,33 +112,26 @@ async function giftPreview(req, res) {
 async function giftPreviewImage(req, res) {
     const giftService = require('../../services/gifts').service;
     const settingsCache = require('../../../shared/settings-cache');
-    const tiersService = require('../../services/tiers');
 
     const accentColor = settingsCache.get('accent_color') || '#15171A';
     const siteTitle = settingsCache.get('title') || 'Ghost';
     const {token} = req.params;
 
     try {
-        const gift = await giftService.getByToken(token);
+        const preview = await giftService.getPreview(token);
 
-        if (!gift) {
+        if (!preview) {
             throw new errors.NotFoundError({message: `Gift not found for token`});
         }
 
-        const tier = await tiersService.api.read(gift.tierId);
-
-        if (!tier) {
-            throw new errors.NotFoundError({message: `Tier not found for gift: ${gift.id}`});
-        }
-
         const png = await generateGiftPreviewImage({
             accentColor,
             siteTitle,
             tierLabel: t('{tierName} membership', {
-                tierName: tier.name,
+                tierName: preview.tier.name,
                 interpolation: {escapeValue: false}
             }),
-            cadenceLabel: getCadenceLabel(gift.cadence, gift.duration)
+            cadenceLabel: getCadenceLabel(preview.cadence, preview.duration)
         });
 
         res.set('Content-Type', 'image/png');

package/core/shared/config/env/config.testing-mysql.json

@@ -115,7 +115,6 @@
     "useMinFiles": false,
     "paths": {
         "fixtures": "test/utils/fixtures/fixtures",
-        "defaultSettings": "test/utils/fixtures/default-settings.json",
-        "urlCache": "test/utils/fixtures/urls"
+        "defaultSettings": "test/utils/fixtures/default-settings.json"
     }
 }

package/core/shared/config/env/config.testing.json

@@ -111,7 +111,6 @@
     "useMinFiles": false,
     "paths": {
         "fixtures": "test/utils/fixtures/fixtures",
-        "defaultSettings": "test/utils/fixtures/default-settings.json",
-        "urlCache": "test/utils/fixtures/urls"
+        "defaultSettings": "test/utils/fixtures/default-settings.json"
     }
 }

package/core/shared/events/index.js

@@ -12,6 +12,5 @@ module.exports = {
     OfferRedemptionEvent: require('./offer-redemption-event'),
     SubscriptionActivatedEvent: require('./subscription-activated-event'),
     SubscriptionCancelledEvent: require('./subscription-cancelled-event'),
-    SubscriptionCreatedEvent: require('./subscription-created-event'),
-    URLResourceUpdatedEvent: require('./url-resource-updated-event')
+    SubscriptionCreatedEvent: require('./subscription-created-event')
 };

package/core/shared/labs.js

@@ -27,6 +27,7 @@ const messages = {
 
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
 const GA_FEATURES = [
+    'automationAnalytics',
     'customFonts',
     'explore',
     'commentsThreads',
@@ -48,11 +49,9 @@ const PUBLIC_BETA_FEATURES = [
 // Which is only visible if the developer experiments flag is enabled
 const PRIVATE_FEATURES = [
     'automations',
-    'automationAnalytics',
     'stripeAutomaticTax',
     'importMemberTier',
     'csvContentImporter',
-    'urlCache',
     'lexicalIndicators',
     'adminUIRefresh',
     'emailCustomization',
@@ -64,8 +63,9 @@ const PRIVATE_FEATURES = [
     'getHelperDeduplication',
     'memberDetailsReact',
     'membersCustomFields',
-    'previewByTier',
-    'paywallImprovements'
+    'paywallImprovements',
+    'giftSubCustomization',
+    'tagDetailsReact'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "6.55.0",
+  "version": "6.57.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -111,7 +111,6 @@
     "countries-and-timezones": "3.9.0",
     "csso": "5.0.5",
     "csv-writer": "1.6.0",
-    "date-fns": "2.30.0",
     "dequal": "2.0.3",
     "dompurify": "3.4.11",
     "downsize-cjs": "1.1.2",
@@ -193,21 +192,22 @@
     "xml": "1.0.1",
     "zod": "4.4.3",
     "@tryghost/adapter-base-cache": "file:components/tryghost-adapter-base-cache-0.2.0.tgz",
+    "@tryghost/adapter-base-redirects": "file:components/tryghost-adapter-base-redirects-0.0.0.tgz",
     "@tryghost/adapter-base-route-settings": "file:components/tryghost-adapter-base-route-settings-0.0.0.tgz",
-    "@tryghost/admin-api-schema": "file:components/tryghost-admin-api-schema-0.0.0.tgz",
     "@tryghost/adapter-base-scheduling": "file:components/tryghost-adapter-base-scheduling-0.2.0.tgz",
     "@tryghost/adapter-base-sso": "file:components/tryghost-adapter-base-sso-0.1.1.tgz",
+    "@tryghost/admin-api-schema": "file:components/tryghost-admin-api-schema-0.0.0.tgz",
     "@tryghost/custom-field-types": "file:components/tryghost-custom-field-types-0.0.0.tgz",
-    "@tryghost/kg-card-factory": "file:components/tryghost-kg-card-factory-5.2.3.tgz",
     "@tryghost/i18n": "file:components/tryghost-i18n-0.0.0.tgz",
-    "@tryghost/kg-default-cards": "file:components/tryghost-kg-default-cards-10.3.3.tgz",
-    "@tryghost/kg-default-nodes": "file:components/tryghost-kg-default-nodes-2.1.3.tgz",
-    "@tryghost/kg-html-to-lexical": "file:components/tryghost-kg-html-to-lexical-1.3.3.tgz",
+    "@tryghost/kg-card-factory": "file:components/tryghost-kg-card-factory-5.2.3.tgz",
     "@tryghost/kg-converters": "file:components/tryghost-kg-converters-1.2.3.tgz",
-    "@tryghost/parse-email-address": "file:components/tryghost-parse-email-address-0.0.0.tgz",
+    "@tryghost/kg-default-nodes": "file:components/tryghost-kg-default-nodes-2.1.4.tgz",
+    "@tryghost/kg-html-to-lexical": "file:components/tryghost-kg-html-to-lexical-1.3.3.tgz",
     "@tryghost/kg-lexical-html-renderer": "file:components/tryghost-kg-lexical-html-renderer-1.4.3.tgz",
-    "ghost-storage-base": "file:components/ghost-storage-base-3.0.0.tgz",
-    "@tryghost/adapter-base-redirects": "file:components/tryghost-adapter-base-redirects-0.0.0.tgz"
+    "@tryghost/kg-default-cards": "file:components/tryghost-kg-default-cards-10.3.3.tgz",
+    "@tryghost/nql-string": "file:components/tryghost-nql-string-0.0.0.tgz",
+    "@tryghost/parse-email-address": "file:components/tryghost-parse-email-address-0.0.0.tgz",
+    "ghost-storage-base": "file:components/ghost-storage-base-3.0.0.tgz"
   },
   "optionalDependencies": {
     "better-sqlite3": "12.11.1"

package/pnpm-lock.yaml

@@ -69,13 +69,14 @@ overrides:
   '@tryghost/admin-api-schema': file:components/tryghost-admin-api-schema-0.0.0.tgz
   '@tryghost/kg-converters': file:components/tryghost-kg-converters-1.2.3.tgz
   '@tryghost/kg-utils': file:components/tryghost-kg-utils-1.1.3.tgz
-  '@tryghost/parse-email-address': file:components/tryghost-parse-email-address-0.0.0.tgz
+  '@tryghost/nql-string': file:components/tryghost-nql-string-0.0.0.tgz
   '@tryghost/kg-clean-basic-html': file:components/tryghost-kg-clean-basic-html-4.3.3.tgz
+  '@tryghost/parse-email-address': file:components/tryghost-parse-email-address-0.0.0.tgz
   ghost-storage-base: file:components/ghost-storage-base-3.0.0.tgz
   '@tryghost/i18n': file:components/tryghost-i18n-0.0.0.tgz
   '@tryghost/kg-markdown-html-renderer': file:components/tryghost-kg-markdown-html-renderer-7.2.3.tgz
   '@tryghost/kg-default-cards': file:components/tryghost-kg-default-cards-10.3.3.tgz
-  '@tryghost/kg-default-nodes': file:components/tryghost-kg-default-nodes-2.1.3.tgz
+  '@tryghost/kg-default-nodes': file:components/tryghost-kg-default-nodes-2.1.4.tgz
   '@tryghost/kg-default-transforms': file:components/tryghost-kg-default-transforms-1.3.3.tgz
   '@tryghost/kg-html-to-lexical': file:components/tryghost-kg-html-to-lexical-1.3.3.tgz
   '@tryghost/kg-lexical-html-renderer': file:components/tryghost-kg-lexical-html-renderer-1.4.3.tgz
@@ -183,8 +184,8 @@ importers:
         specifier: file:components/tryghost-kg-default-cards-10.3.3.tgz
         version: file:components/tryghost-kg-default-cards-10.3.3.tgz(encoding@0.1.13)
       '@tryghost/kg-default-nodes':
-        specifier: file:components/tryghost-kg-default-nodes-2.1.3.tgz
-        version: file:components/tryghost-kg-default-nodes-2.1.3.tgz(@noble/hashes@1.8.0)
+        specifier: file:components/tryghost-kg-default-nodes-2.1.4.tgz
+        version: file:components/tryghost-kg-default-nodes-2.1.4.tgz(@noble/hashes@1.8.0)
       '@tryghost/kg-html-to-lexical':
         specifier: file:components/tryghost-kg-html-to-lexical-1.3.3.tgz
         version: file:components/tryghost-kg-html-to-lexical-1.3.3.tgz(@lexical/selection@0.13.1(lexical@0.13.1))(@lexical/utils@0.13.1(lexical@0.13.1))(@noble/hashes@1.8.0)
@@ -221,6 +222,9 @@ importers:
       '@tryghost/nql-lang':
         specifier: 0.6.6
         version: 0.6.6
+      '@tryghost/nql-string':
+        specifier: file:components/tryghost-nql-string-0.0.0.tgz
+        version: file:components/tryghost-nql-string-0.0.0.tgz
       '@tryghost/parse-email-address':
         specifier: file:components/tryghost-parse-email-address-0.0.0.tgz
         version: file:components/tryghost-parse-email-address-0.0.0.tgz
@@ -323,9 +327,6 @@ importers:
       csv-writer:
         specifier: 1.6.0
         version: 1.6.0
-      date-fns:
-        specifier: 2.30.0
-        version: 2.30.0
       dequal:
         specifier: 2.0.3
         version: 2.0.3
@@ -1368,7 +1369,7 @@ packages:
     resolution: {integrity: sha512-fTAJPbBEOQgb7K2XXt3M9YDpfLrLPpbg/FrNZBOWoz6g4T/jtqPE11EnPVvIan/8dhgjC3uORcCh9kF/JuOmnA==}
 
   '@tryghost/custom-field-types@file:components/tryghost-custom-field-types-0.0.0.tgz':
-    resolution: {integrity: sha512-Z1RfgHxTh0EQ3St3p6Z0ufaPROgcmNzEDAWTdOUIxbOF3gXtEQ2nqd3UgdEhKWYmeuzo3bI+Hf8wnlhobKM2Qw==, tarball: file:components/tryghost-custom-field-types-0.0.0.tgz}
+    resolution: {integrity: sha512-mwqygO5ERA/MWya3qxsNiJiGJ2Sg/n63m/M1RbgCc7/qlLEgCJ6Z2sMCBSEPwZyY6koo7CMV5gmQm2/ZAXrGmg==, tarball: file:components/tryghost-custom-field-types-0.0.0.tgz}
     version: 0.0.0
 
   '@tryghost/custom-fonts@1.0.11':
@@ -1444,25 +1445,25 @@ packages:
     version: 1.2.3
 
   '@tryghost/kg-default-cards@file:components/tryghost-kg-default-cards-10.3.3.tgz':
-    resolution: {integrity: sha512-QPaG7PMlmpISGhCJgVMwaJz7vOgLW8iGdg2gzGwBLoWasmwo1zEkxKwGSLynqP1OMeHYnKVMF2+lzGzJbOLeGA==, tarball: file:components/tryghost-kg-default-cards-10.3.3.tgz}
+    resolution: {integrity: sha512-K+k2It8l+o0bOSjAtReoEn2Ki1Ze6xADEt16uIwGEzOLCyfTla5jyaCXsIAh2fKpNiJUAUgTe13tNY/icbkmpg==, tarball: file:components/tryghost-kg-default-cards-10.3.3.tgz}
     version: 10.3.3
     engines: {node: ^22.13.1 || ^24.0.0}
 
-  '@tryghost/kg-default-nodes@file:components/tryghost-kg-default-nodes-2.1.3.tgz':
-    resolution: {integrity: sha512-4Hb1cQf1olvNiPIVRTrL5OvEiyg5d+S5Uio/joYL7tPH6iLuMn2bTjGpvbVapShuFu/fwAx1myJu/tC9vZt+Ig==, tarball: file:components/tryghost-kg-default-nodes-2.1.3.tgz}
-    version: 2.1.3
+  '@tryghost/kg-default-nodes@file:components/tryghost-kg-default-nodes-2.1.4.tgz':
+    resolution: {integrity: sha512-d6hwQiz3oumlEHLhVx/FQpUXXl8eNpSFEkLlb7YgODM6J5uUp0b3fLFVoU1xXBALjBplEFHb4Gn5YSKh6zEUAQ==, tarball: file:components/tryghost-kg-default-nodes-2.1.4.tgz}
+    version: 2.1.4
     engines: {node: ^22.13.1 || ^24.0.0}
 
   '@tryghost/kg-default-transforms@file:components/tryghost-kg-default-transforms-1.3.3.tgz':
-    resolution: {integrity: sha512-LYu87pokySxbqoWRq2SY8SaGknTBsScLy1DDSp6+c6NXNOWUkRi4/XdV4hG49qvAKQQVohJIepbBwgFsvVusWA==, tarball: file:components/tryghost-kg-default-transforms-1.3.3.tgz}
+    resolution: {integrity: sha512-1XkdffnYETy7ZXvHCdmyr/trM/wtUoju29FSF8PNKj65/YVdlb56BSdl38C6MD5TsYxAfjULe1BMn/OgEskhXQ==, tarball: file:components/tryghost-kg-default-transforms-1.3.3.tgz}
     version: 1.3.3
 
   '@tryghost/kg-html-to-lexical@file:components/tryghost-kg-html-to-lexical-1.3.3.tgz':
-    resolution: {integrity: sha512-r9wGwPDxJ2CUbZc+SsoBBUs7FnNiL6FHWU3UKlPxiuLHeBXXcpUEE5BdCMcvTGUwPo/T0zmhUtbp6rCBLw7D6Q==, tarball: file:components/tryghost-kg-html-to-lexical-1.3.3.tgz}
+    resolution: {integrity: sha512-8EZDDKw1exkG//DFkViUx5Dxb63nodvJHfhjhbS6gYxNHy6ca6ZRtpvS6Tx9xlCQ/L5yN0EjWuBx7JegFcy1sw==, tarball: file:components/tryghost-kg-html-to-lexical-1.3.3.tgz}
     version: 1.3.3
 
   '@tryghost/kg-lexical-html-renderer@file:components/tryghost-kg-lexical-html-renderer-1.4.3.tgz':
-    resolution: {integrity: sha512-u0UR00P2v2D98i7+MelmkxRtxfi3P3IcGrxbAUm/ijqn8iWhwQ8ikPO4wnRBvShed33xgXoSzeAYL6K8hfO0UA==, tarball: file:components/tryghost-kg-lexical-html-renderer-1.4.3.tgz}
+    resolution: {integrity: sha512-QMgE1jlVmCexwVVp2lQqwTWOfHxryfvKKVNdj0SRBQV3mAtOKx1NOix4Cy4MXuV1PzTZ2//PeYYvJkj+myaOMg==, tarball: file:components/tryghost-kg-lexical-html-renderer-1.4.3.tgz}
     version: 1.4.3
 
   '@tryghost/kg-markdown-html-renderer@file:components/tryghost-kg-markdown-html-renderer-7.2.3.tgz':
@@ -1501,11 +1502,15 @@ packages:
   '@tryghost/nql-lang@0.6.6':
     resolution: {integrity: sha512-ZWEUN92fVnxavf+matwASvi7pom0i1jhAtNCuoCN9f3ShtyrVm92m1SfvY+x/XuEvbefXAzCGzSEMcaQ4cqoXw==}
 
+  '@tryghost/nql-string@file:components/tryghost-nql-string-0.0.0.tgz':
+    resolution: {integrity: sha512-sbvE9JUjBRUHOOMMLQj9X+a2QjdCDbL6T9+/j07XA2mFSIi9kHNMcvTxP5KkxB07ANRYvSzLsxicFQFis2wu0w==, tarball: file:components/tryghost-nql-string-0.0.0.tgz}
+    version: 0.0.0
+
   '@tryghost/nql@0.13.1':
     resolution: {integrity: sha512-TQRDur1miWd2ORa3XOhtw8Na8AUj/8h+epNMDgiutOyAH/RTw+d+ksLndMnm/Z9MhnKg7kFy7398peKZ7nF8bQ==}
 
   '@tryghost/parse-email-address@file:components/tryghost-parse-email-address-0.0.0.tgz':
-    resolution: {integrity: sha512-h1A3EInCVS4Q8+8UlPPn+0SoQ3jO6nGHACyABniU45KCbp5e47R2c24RnZakOrH57IOGn+McSifAQBTuLNGewg==, tarball: file:components/tryghost-parse-email-address-0.0.0.tgz}
+    resolution: {integrity: sha512-xJlGV8ZjkKuk3f5wfCEAgAojlC9s7HtsD7rNSUJkj/H4yj3PMgWQcVlI29WgqgN8ue6iXuTpSh7zWWSgZfA5gA==, tarball: file:components/tryghost-parse-email-address-0.0.0.tgz}
     version: 0.0.0
 
   '@tryghost/pretty-cli@3.3.1':
@@ -6490,7 +6495,7 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@tryghost/kg-default-nodes@file:components/tryghost-kg-default-nodes-2.1.3.tgz(@noble/hashes@1.8.0)':
+  '@tryghost/kg-default-nodes@file:components/tryghost-kg-default-nodes-2.1.4.tgz(@noble/hashes@1.8.0)':
     dependencies:
       '@lexical/clipboard': 0.13.1(lexical@0.13.1)
       '@lexical/rich-text': 0.13.1(@lexical/clipboard@0.13.1(lexical@0.13.1))(@lexical/selection@0.13.1(lexical@0.13.1))(@lexical/utils@0.13.1(lexical@0.13.1))(lexical@0.13.1)
@@ -6515,7 +6520,7 @@ snapshots:
       '@lexical/list': 0.13.1(lexical@0.13.1)
       '@lexical/rich-text': 0.13.1(@lexical/clipboard@0.13.1(lexical@0.13.1))(@lexical/selection@0.13.1(lexical@0.13.1))(@lexical/utils@0.13.1(lexical@0.13.1))(lexical@0.13.1)
       '@lexical/utils': 0.13.1(lexical@0.13.1)
-      '@tryghost/kg-default-nodes': file:components/tryghost-kg-default-nodes-2.1.3.tgz(@noble/hashes@1.8.0)
+      '@tryghost/kg-default-nodes': file:components/tryghost-kg-default-nodes-2.1.4.tgz(@noble/hashes@1.8.0)
       lexical: 0.13.1
     transitivePeerDependencies:
       - '@lexical/clipboard'
@@ -6531,7 +6536,7 @@ snapshots:
       '@lexical/link': 0.13.1(lexical@0.13.1)
       '@lexical/list': 0.13.1(lexical@0.13.1)
       '@lexical/rich-text': 0.13.1(@lexical/clipboard@0.13.1(lexical@0.13.1))(@lexical/selection@0.13.1(lexical@0.13.1))(@lexical/utils@0.13.1(lexical@0.13.1))(lexical@0.13.1)
-      '@tryghost/kg-default-nodes': file:components/tryghost-kg-default-nodes-2.1.3.tgz(@noble/hashes@1.8.0)
+      '@tryghost/kg-default-nodes': file:components/tryghost-kg-default-nodes-2.1.4.tgz(@noble/hashes@1.8.0)
       '@tryghost/kg-default-transforms': file:components/tryghost-kg-default-transforms-1.3.3.tgz(@lexical/clipboard@0.13.1(lexical@0.13.1))(@lexical/selection@0.13.1(lexical@0.13.1))(@noble/hashes@1.8.0)
       jsdom: 29.1.1(@noble/hashes@1.8.0)
       lexical: 0.13.1
@@ -6548,7 +6553,7 @@ snapshots:
       '@lexical/link': 0.13.1(lexical@0.13.1)
       '@lexical/list': 0.13.1(lexical@0.13.1)
       '@lexical/rich-text': 0.13.1(@lexical/clipboard@0.13.1(lexical@0.13.1))(@lexical/selection@0.13.1(lexical@0.13.1))(@lexical/utils@0.13.1(lexical@0.13.1))(lexical@0.13.1)
-      '@tryghost/kg-default-nodes': file:components/tryghost-kg-default-nodes-2.1.3.tgz(@noble/hashes@1.8.0)
+      '@tryghost/kg-default-nodes': file:components/tryghost-kg-default-nodes-2.1.4.tgz(@noble/hashes@1.8.0)
       '@tryghost/kg-default-transforms': file:components/tryghost-kg-default-transforms-1.3.3.tgz(@lexical/clipboard@0.13.1(lexical@0.13.1))(@lexical/selection@0.13.1(lexical@0.13.1))(@noble/hashes@1.8.0)
       '@tryghost/kg-utils': file:components/tryghost-kg-utils-1.1.3.tgz
       jsdom: 29.1.1(@noble/hashes@1.8.0)
@@ -6699,6 +6704,8 @@ snapshots:
     dependencies:
       date-fns: 2.30.0
 
+  '@tryghost/nql-string@file:components/tryghost-nql-string-0.0.0.tgz': {}
+
   '@tryghost/nql@0.13.1(supports-color@10.2.2)':
     dependencies:
       '@tryghost/mongo-knex': 0.10.1(supports-color@10.2.2)

package/pnpm-workspace.yaml

@@ -230,13 +230,14 @@ overrides:
   '@tryghost/admin-api-schema': file:components/tryghost-admin-api-schema-0.0.0.tgz
   '@tryghost/kg-converters': file:components/tryghost-kg-converters-1.2.3.tgz
   '@tryghost/kg-utils': file:components/tryghost-kg-utils-1.1.3.tgz
-  '@tryghost/parse-email-address': file:components/tryghost-parse-email-address-0.0.0.tgz
+  '@tryghost/nql-string': file:components/tryghost-nql-string-0.0.0.tgz
   '@tryghost/kg-clean-basic-html': file:components/tryghost-kg-clean-basic-html-4.3.3.tgz
+  '@tryghost/parse-email-address': file:components/tryghost-parse-email-address-0.0.0.tgz
   ghost-storage-base: file:components/ghost-storage-base-3.0.0.tgz
   '@tryghost/i18n': file:components/tryghost-i18n-0.0.0.tgz
   '@tryghost/kg-markdown-html-renderer': file:components/tryghost-kg-markdown-html-renderer-7.2.3.tgz
   '@tryghost/kg-default-cards': file:components/tryghost-kg-default-cards-10.3.3.tgz
-  '@tryghost/kg-default-nodes': file:components/tryghost-kg-default-nodes-2.1.3.tgz
+  '@tryghost/kg-default-nodes': file:components/tryghost-kg-default-nodes-2.1.4.tgz
   '@tryghost/kg-default-transforms': file:components/tryghost-kg-default-transforms-1.3.3.tgz
   '@tryghost/kg-html-to-lexical': file:components/tryghost-kg-html-to-lexical-1.3.3.tgz
   '@tryghost/kg-lexical-html-renderer': file:components/tryghost-kg-lexical-html-renderer-1.4.3.tgz

package/tsconfig.json

@@ -100,6 +100,7 @@
         "skipLibCheck": true /* Skip type checking all .d.ts files. */
     },
     "include": [
+        "bin/**/*.ts",
         "core/**/*.ts",
         "test/**/*.ts",
         "types/**/*.d.ts"