ghost 5.54.4 → 5.55.0

package/core/server/data/schema/fixtures/fixtures.json

@@ -1,5 +1,24 @@
 {
     "models": [
+        {
+            "name": "Collection",
+            "entries": [
+                {
+                    "title":            "Latest",
+                    "slug":             "latest",
+                    "description":      "All posts",
+                    "type":             "automatic",
+                    "filter":           ""
+                },
+                {
+                    "title":            "Featured",
+                    "slug":             "featured",
+                    "description":      "Featured posts",
+                    "type":             "automatic",
+                    "filter":           "featured:true"
+                }
+            ]
+        },
         {
             "name": "Product",
             "entries": [
@@ -918,6 +937,20 @@
                 "coming-soon": ["News"]
             }
         },
+        {
+            "from": {
+                "model": "Collection",
+                "match": "slug",
+                "relation": "posts"
+            },
+            "to": {
+                "model": "Post",
+                "match": "slug"
+            },
+            "entries": {
+                "latest": ["coming-soon"]
+            }
+        },
         {
             "from": {
                 "model": "User",

package/core/server/lib/lexical.js

@@ -26,7 +26,7 @@ module.exports = {
         return lexicalHtmlRenderer;
     },
 
-    render(lexical, userOptions = {}) {
+    async render(lexical, userOptions = {}) {
         const options = Object.assign({
             siteUrl: config.get('url'),
             imageOptimization: config.get('imageOptimization'),
@@ -45,7 +45,7 @@ module.exports = {
             }
         }, userOptions);
 
-        return this.lexicalHtmlRenderer.render(lexical, options);
+        return await this.lexicalHtmlRenderer.render(lexical, options);
     },
 
     get nodes() {

package/core/server/models/post.js

@@ -688,7 +688,7 @@ Post = ghostBookshelf.Model.extend({
             )
         ) {
             try {
-                this.set('html', lexicalLib.render(this.get('lexical')));
+                this.set('html', await lexicalLib.render(this.get('lexical')));
             } catch (err) {
                 throw new errors.ValidationError({
                     message: tpl(messages.invalidLexicalStructure),

package/core/server/services/collections/BookshelfCollectionsRepository.js

@@ -12,12 +12,20 @@ module.exports = class BookshelfCollectionsRepository {
         this.#model = model;
     }
 
+    async createTransaction(cb) {
+        return this.#model.transaction(cb);
+    }
+
     /**
      * @param {string} id
      * @returns {Promise<Collection>}
      */
-    async getById(id) {
-        const model = await this.#model.findOne({id}, {require: false, withRelated: ['posts']});
+    async getById(id, options = {}) {
+        const model = await this.#model.findOne({id}, {
+            require: false,
+            withRelated: ['posts'],
+            transacting: options.transaction
+        });
         if (!model) {
             return null;
         }
@@ -28,8 +36,12 @@ module.exports = class BookshelfCollectionsRepository {
      * @param {string} slug
      * @returns {Promise<Collection>}
      */
-    async getBySlug(slug) {
-        const model = await this.#model.findOne({slug}, {require: false, withRelated: ['posts']});
+    async getBySlug(slug, options = {}) {
+        const model = await this.#model.findOne({slug}, {
+            require: false,
+            withRelated: ['posts'],
+            transacting: options.transaction
+        });
         if (!model) {
             return null;
         }
@@ -40,9 +52,15 @@ module.exports = class BookshelfCollectionsRepository {
      * @param {object} [options]
      * @param {string} [options.filter]
      * @param {string} [options.order]
+     * @param {import('knex').Transaction} [options.transaction]
      */
     async getAll(options = {}) {
-        const models = await this.#model.findAll({...options, withRelated: ['posts']});
+        const models = await this.#model.findAll({
+            ...options,
+            transacting: options.transaction,
+            withRelated: ['posts']
+        });
+
         return await Promise.all(models.map(model => this.#modelToCollection(model)));
     }
 
@@ -65,9 +83,11 @@ module.exports = class BookshelfCollectionsRepository {
 
     /**
      * @param {Collection} collection
+     * @param {object} [options]
+     * @param {import('knex').Transaction} [options.transaction]
      * @returns {Promise<void>}
      */
-    async save(collection) {
+    async save(collection, options = {}) {
         if (collection.deleted) {
             await this.#model.destroy({id: collection.id});
             return;
@@ -85,13 +105,22 @@ module.exports = class BookshelfCollectionsRepository {
             updated_at: collection.updatedAt
         };
 
-        const existing = await this.#model.findOne({id: data.id}, {require: false});
+        const existing = await this.#model.findOne(
+            {id: data.id},
+            {
+                require: false,
+                transacting: options.transaction
+            }
+        );
 
         if (!existing) {
-            await this.#model.add(data);
+            await this.#model.add(data, {
+                transacting: options.transaction
+            });
         } else {
-            await this.#model.edit(data, {
-                id: data.id
+            return this.#model.edit(data, {
+                id: data.id,
+                transacting: options.transaction
             });
         }
     }

package/core/server/services/collections/PostsRepository.js

@@ -1,57 +1,28 @@
 class PostsRepository {
-    constructor({models, browsePostsAPI, moment}) {
+    constructor({models, moment}) {
         this.models = models;
-        this.browsePostsAPI = browsePostsAPI;
         this.moment = moment;
     }
 
-    /**
-     * @NOTE: This is a copy of the date serialization from Posts Content API.
-     *        We need the dates serialized instead of keeping them as plain dates
-     *        to be able to apply NQL filtering inside of Collections.
-     * @param {Object} attrs
-     * @returns
-     */
-    serializeDates(attrs) {
-        const formatDate = (date) => {
-            return this.moment(date)
-                .toISOString(true);
-        };
-
-        ['created_at', 'updated_at', 'published_at'].forEach((field) => {
-            if (attrs[field]) {
-                attrs[field] = formatDate(attrs[field]);
-            }
-        });
-
-        return attrs;
-    }
-
-    async getAll({filter}) {
-        const response = await this.browsePostsAPI({
-            options: {
-                filter: `(${filter})+type:post`,
-                limit: 'all'
-            }
+    async getAll({filter, transaction}) {
+        const {data: models} = await this.models.Post.findPage({
+            filter: `(${filter})+type:post`,
+            transacting: transaction,
+            limit: 'all',
+            status: 'all',
+            withRelated: ['tags']
         });
 
-        response.posts = response.posts
-            .map(this.serializeDates.bind(this));
+        const json = models.map(m => m.toJSON());
 
-        return response.posts;
-    }
-
-    async getBulk(ids) {
-        const response = await this.browsePostsAPI({
-            options: {
-                filter: `id:[${ids.join(',')}]+type:post`
-            }
+        return json.map((postJson) => {
+            return {
+                id: postJson.id,
+                featured: postJson.featured,
+                published_at: this.moment(postJson.published_at).toISOString(true),
+                tags: postJson.tags.map(tag => tag.slug)
+            };
         });
-
-        response.posts = response.posts
-            .map(this.serializeDates.bind(this));
-
-        return response.posts;
     }
 }
 
@@ -60,12 +31,6 @@ module.exports = PostsRepository;
 module.exports.getInstance = () => {
     const moment = require('moment-timezone');
     const models = require('../../models');
-    const browsePostsAPI = async (options) => {
-        const rawPosts = await require('../../api/').endpoints.posts.browse.query(options);
-        await require('../../api/').endpoints.serializers.output.posts.all(rawPosts, {}, options);
-
-        return options.response;
-    };
 
-    return new PostsRepository({models, browsePostsAPI, moment});
+    return new PostsRepository({models, moment});
 };

package/core/server/services/collections/service.js

@@ -19,8 +19,10 @@ class CollectionsServiceWrapper {
             postsRepository: postsRepository,
             DomainEvents: DomainEvents,
             slugService: {
-                async generate(input) {
-                    return models.Collection.generateSlug(models.Collection, input, {});
+                async generate(input, options) {
+                    return models.Collection.generateSlug(models.Collection, input, {
+                        transacting: options.transaction
+                    });
                 }
             }
         });
@@ -33,28 +35,6 @@ class CollectionsServiceWrapper {
             return;
         }
 
-        const existingBuiltins = await this.api.getAll({filter: 'slug:featured'});
-
-        if (!existingBuiltins.data.length) {
-            await this.api.createCollection({
-                title: 'Index',
-                slug: 'index',
-                description: 'Collection with all posts',
-                type: 'automatic',
-                deletable: false,
-                filter: 'status:published'
-            });
-
-            await this.api.createCollection({
-                title: 'Featured Posts',
-                slug: 'featured',
-                description: 'Collection of featured posts',
-                type: 'automatic',
-                deletable: false,
-                filter: 'featured:true'
-            });
-        }
-
         this.api.subscribeToEvents();
         require('./intercept-events')();
     }

package/core/server/web/api/endpoints/admin/routes.js

@@ -25,7 +25,6 @@ module.exports = function apiRoutes() {
     router.post('/collections', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.add));
     router.put('/collections/:id', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.edit));
     router.del('/collections/:id', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.destroy));
-    router.get('/collections/:id/posts', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.browsePosts));
 
     // ## Configuration
     router.get('/config', mw.authAdminApi, http(api.config.read));