✨Dynamic Routing Beta (#9596)
refs #9601
### Dynamic Routing
This is the beta version of dynamic routing.
- we had a initial implementation of "channels" available in the codebase
- we have removed and moved this implementation
- there is now a centralised place for dynamic routing - server/services/routing
- each routing component is represented by a router type e.g. collections, routes, static pages, taxonomies, rss, preview of posts
- keep as much as possible logic of routing helpers, middlewares and controllers
- ensure test coverage
- connect all the things together
- yaml file + validation
- routing + routers
- url service
- sitemaps
- url access
- deeper implementation of yaml validations
- e.g. hard require slashes
- ensure routing hierarchy/order
- e.g. you enable the subscriber app
- you have a custom static page, which lives under the same slug /subscribe
- static pages are stronger than apps
- e.g. the first collection owns the post it has filtered
- a post cannot live in two collections
- ensure apps are still working and hook into the routers layer (or better said: and register in the routing service)
- put as much as possible comments to the code base for better understanding
- ensure a clean debug log
- ensure we can unmount routes
- e.g. you have a collection permalink of /:slug/ represented by {globals.permalink}
- and you change the permalink in the admin to dated permalink
- the express route get's refreshed from /:slug/ to /:year/:month/:day/:slug/
- unmount without server restart, yey
- ensure we are backwards compatible
- e.g. render home.hbs for collection index if collection route is /
- ensure you can access your configured permalink from the settings table with {globals.permalink}
### Render 503 if url service did not finish
- return 503 if the url service has not finished generating the resource urls
### Rewrite sitemaps
- we have rewritten the sitemaps "service", because the url generator does no longer happen on runtime
- we generate all urls on bootstrap
- the sitemaps service will consume created resource and router urls
- these urls will be shown on the xml pages
- we listen on url events
- we listen on router events
- we no longer have to fetch the resources, which is nice
- the urlservice pre-fetches resources and emits their urls
- the urlservice is the only component who knows which urls are valid
- i made some ES6 adaptions
- we keep the caching logic -> only regenerate xml if there is a change
- updated tests
- checked test coverage (100%)
### Re-work usage of Url utility
- replace all usages of `urlService.utils.urlFor` by `urlService.getByResourceId`
- only for resources e.g. post, author, tag
- this is important, because with dynamic routing we no longer create static urls based on the settings permalink on runtime
- adapt url utility
- adapt tests
2018-06-05 20:02:20 +03:00
|
|
|
const _ = require('lodash');
|
|
|
|
const common = require('../../lib/common');
|
|
|
|
const _private = {};
|
|
|
|
|
2018-06-21 16:46:42 +03:00
|
|
|
_private.validateTemplate = function validateTemplate(object) {
|
|
|
|
// CASE: /about/: about
|
|
|
|
if (typeof object === 'string') {
|
|
|
|
return {
|
|
|
|
templates: [object]
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!object.hasOwnProperty('template')) {
|
|
|
|
object.templates = [];
|
|
|
|
return object;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_.isArray(object.template)) {
|
|
|
|
object.templates = object.template;
|
|
|
|
} else {
|
|
|
|
object.templates = [object.template];
|
|
|
|
}
|
|
|
|
|
|
|
|
delete object.template;
|
|
|
|
return object;
|
|
|
|
};
|
|
|
|
|
✨Dynamic Routing Beta (#9596)
refs #9601
### Dynamic Routing
This is the beta version of dynamic routing.
- we had a initial implementation of "channels" available in the codebase
- we have removed and moved this implementation
- there is now a centralised place for dynamic routing - server/services/routing
- each routing component is represented by a router type e.g. collections, routes, static pages, taxonomies, rss, preview of posts
- keep as much as possible logic of routing helpers, middlewares and controllers
- ensure test coverage
- connect all the things together
- yaml file + validation
- routing + routers
- url service
- sitemaps
- url access
- deeper implementation of yaml validations
- e.g. hard require slashes
- ensure routing hierarchy/order
- e.g. you enable the subscriber app
- you have a custom static page, which lives under the same slug /subscribe
- static pages are stronger than apps
- e.g. the first collection owns the post it has filtered
- a post cannot live in two collections
- ensure apps are still working and hook into the routers layer (or better said: and register in the routing service)
- put as much as possible comments to the code base for better understanding
- ensure a clean debug log
- ensure we can unmount routes
- e.g. you have a collection permalink of /:slug/ represented by {globals.permalink}
- and you change the permalink in the admin to dated permalink
- the express route get's refreshed from /:slug/ to /:year/:month/:day/:slug/
- unmount without server restart, yey
- ensure we are backwards compatible
- e.g. render home.hbs for collection index if collection route is /
- ensure you can access your configured permalink from the settings table with {globals.permalink}
### Render 503 if url service did not finish
- return 503 if the url service has not finished generating the resource urls
### Rewrite sitemaps
- we have rewritten the sitemaps "service", because the url generator does no longer happen on runtime
- we generate all urls on bootstrap
- the sitemaps service will consume created resource and router urls
- these urls will be shown on the xml pages
- we listen on url events
- we listen on router events
- we no longer have to fetch the resources, which is nice
- the urlservice pre-fetches resources and emits their urls
- the urlservice is the only component who knows which urls are valid
- i made some ES6 adaptions
- we keep the caching logic -> only regenerate xml if there is a change
- updated tests
- checked test coverage (100%)
### Re-work usage of Url utility
- replace all usages of `urlService.utils.urlFor` by `urlService.getByResourceId`
- only for resources e.g. post, author, tag
- this is important, because with dynamic routing we no longer create static urls based on the settings permalink on runtime
- adapt url utility
- adapt tests
2018-06-05 20:02:20 +03:00
|
|
|
_private.validateRoutes = function validateRoutes(routes) {
|
|
|
|
_.each(routes, (routingTypeObject, routingTypeObjectKey) => {
|
|
|
|
// CASE: we hard-require trailing slashes for the index route
|
|
|
|
if (!routingTypeObjectKey.match(/\/$/)) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObjectKey,
|
|
|
|
reason: 'A trailing slash is required.'
|
|
|
|
})
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: we hard-require leading slashes for the index route
|
|
|
|
if (!routingTypeObjectKey.match(/^\//)) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObjectKey,
|
|
|
|
reason: 'A leading slash is required.'
|
|
|
|
})
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: you define /about/:
|
|
|
|
if (!routingTypeObject) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObjectKey,
|
|
|
|
reason: 'Please define a permalink route.'
|
|
|
|
}),
|
|
|
|
help: 'e.g. permalink: /{slug}/'
|
|
|
|
});
|
|
|
|
}
|
2018-06-21 16:46:42 +03:00
|
|
|
|
|
|
|
routes[routingTypeObjectKey] = _private.validateTemplate(routingTypeObject);
|
✨Dynamic Routing Beta (#9596)
refs #9601
### Dynamic Routing
This is the beta version of dynamic routing.
- we had a initial implementation of "channels" available in the codebase
- we have removed and moved this implementation
- there is now a centralised place for dynamic routing - server/services/routing
- each routing component is represented by a router type e.g. collections, routes, static pages, taxonomies, rss, preview of posts
- keep as much as possible logic of routing helpers, middlewares and controllers
- ensure test coverage
- connect all the things together
- yaml file + validation
- routing + routers
- url service
- sitemaps
- url access
- deeper implementation of yaml validations
- e.g. hard require slashes
- ensure routing hierarchy/order
- e.g. you enable the subscriber app
- you have a custom static page, which lives under the same slug /subscribe
- static pages are stronger than apps
- e.g. the first collection owns the post it has filtered
- a post cannot live in two collections
- ensure apps are still working and hook into the routers layer (or better said: and register in the routing service)
- put as much as possible comments to the code base for better understanding
- ensure a clean debug log
- ensure we can unmount routes
- e.g. you have a collection permalink of /:slug/ represented by {globals.permalink}
- and you change the permalink in the admin to dated permalink
- the express route get's refreshed from /:slug/ to /:year/:month/:day/:slug/
- unmount without server restart, yey
- ensure we are backwards compatible
- e.g. render home.hbs for collection index if collection route is /
- ensure you can access your configured permalink from the settings table with {globals.permalink}
### Render 503 if url service did not finish
- return 503 if the url service has not finished generating the resource urls
### Rewrite sitemaps
- we have rewritten the sitemaps "service", because the url generator does no longer happen on runtime
- we generate all urls on bootstrap
- the sitemaps service will consume created resource and router urls
- these urls will be shown on the xml pages
- we listen on url events
- we listen on router events
- we no longer have to fetch the resources, which is nice
- the urlservice pre-fetches resources and emits their urls
- the urlservice is the only component who knows which urls are valid
- i made some ES6 adaptions
- we keep the caching logic -> only regenerate xml if there is a change
- updated tests
- checked test coverage (100%)
### Re-work usage of Url utility
- replace all usages of `urlService.utils.urlFor` by `urlService.getByResourceId`
- only for resources e.g. post, author, tag
- this is important, because with dynamic routing we no longer create static urls based on the settings permalink on runtime
- adapt url utility
- adapt tests
2018-06-05 20:02:20 +03:00
|
|
|
});
|
|
|
|
|
|
|
|
return routes;
|
|
|
|
};
|
|
|
|
|
|
|
|
_private.validateCollections = function validateCollections(collections) {
|
|
|
|
_.each(collections, (routingTypeObject, routingTypeObjectKey) => {
|
|
|
|
// CASE: we hard-require trailing slashes for the collection index route
|
|
|
|
if (!routingTypeObjectKey.match(/\/$/)) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObjectKey,
|
|
|
|
reason: 'A trailing slash is required.'
|
|
|
|
})
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: we hard-require leading slashes for the collection index route
|
|
|
|
if (!routingTypeObjectKey.match(/^\//)) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObjectKey,
|
|
|
|
reason: 'A leading slash is required.'
|
|
|
|
})
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!routingTypeObject.hasOwnProperty('permalink')) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObjectKey,
|
|
|
|
reason: 'Please define a permalink route.'
|
|
|
|
}),
|
|
|
|
help: 'e.g. permalink: /{slug}/'
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: validate permalink key
|
2018-06-21 16:46:42 +03:00
|
|
|
|
|
|
|
if (!routingTypeObject.permalink) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObjectKey,
|
|
|
|
reason: 'Please define a permalink route.'
|
|
|
|
}),
|
|
|
|
help: 'e.g. permalink: /{slug}/'
|
|
|
|
});
|
✨Dynamic Routing Beta (#9596)
refs #9601
### Dynamic Routing
This is the beta version of dynamic routing.
- we had a initial implementation of "channels" available in the codebase
- we have removed and moved this implementation
- there is now a centralised place for dynamic routing - server/services/routing
- each routing component is represented by a router type e.g. collections, routes, static pages, taxonomies, rss, preview of posts
- keep as much as possible logic of routing helpers, middlewares and controllers
- ensure test coverage
- connect all the things together
- yaml file + validation
- routing + routers
- url service
- sitemaps
- url access
- deeper implementation of yaml validations
- e.g. hard require slashes
- ensure routing hierarchy/order
- e.g. you enable the subscriber app
- you have a custom static page, which lives under the same slug /subscribe
- static pages are stronger than apps
- e.g. the first collection owns the post it has filtered
- a post cannot live in two collections
- ensure apps are still working and hook into the routers layer (or better said: and register in the routing service)
- put as much as possible comments to the code base for better understanding
- ensure a clean debug log
- ensure we can unmount routes
- e.g. you have a collection permalink of /:slug/ represented by {globals.permalink}
- and you change the permalink in the admin to dated permalink
- the express route get's refreshed from /:slug/ to /:year/:month/:day/:slug/
- unmount without server restart, yey
- ensure we are backwards compatible
- e.g. render home.hbs for collection index if collection route is /
- ensure you can access your configured permalink from the settings table with {globals.permalink}
### Render 503 if url service did not finish
- return 503 if the url service has not finished generating the resource urls
### Rewrite sitemaps
- we have rewritten the sitemaps "service", because the url generator does no longer happen on runtime
- we generate all urls on bootstrap
- the sitemaps service will consume created resource and router urls
- these urls will be shown on the xml pages
- we listen on url events
- we listen on router events
- we no longer have to fetch the resources, which is nice
- the urlservice pre-fetches resources and emits their urls
- the urlservice is the only component who knows which urls are valid
- i made some ES6 adaptions
- we keep the caching logic -> only regenerate xml if there is a change
- updated tests
- checked test coverage (100%)
### Re-work usage of Url utility
- replace all usages of `urlService.utils.urlFor` by `urlService.getByResourceId`
- only for resources e.g. post, author, tag
- this is important, because with dynamic routing we no longer create static urls based on the settings permalink on runtime
- adapt url utility
- adapt tests
2018-06-05 20:02:20 +03:00
|
|
|
}
|
2018-06-21 16:46:42 +03:00
|
|
|
|
|
|
|
// CASE: we hard-require trailing slashes for the value/permalink route
|
|
|
|
if (!routingTypeObject.permalink.match(/\/$/) && !routingTypeObject.permalink.match(/globals\.permalinks/)) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObject.permalink,
|
|
|
|
reason: 'A trailing slash is required.'
|
|
|
|
})
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: we hard-require leading slashes for the value/permalink route
|
|
|
|
if (!routingTypeObject.permalink.match(/^\//) && !routingTypeObject.permalink.match(/globals\.permalinks/)) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObject.permalink,
|
|
|
|
reason: 'A leading slash is required.'
|
|
|
|
})
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: notation /:slug/ or /:primary_author/ is not allowed. We only accept /{{...}}/.
|
|
|
|
if (routingTypeObject.permalink && routingTypeObject.permalink.match(/\/\:\w+/)) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObject.permalink,
|
|
|
|
reason: 'Please use the following notation e.g. /{slug}/.'
|
|
|
|
})
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: transform {.*} into :\w+ notation. This notation is our internal notation e.g. see permalink
|
|
|
|
// replacement in our UrlService utility.
|
|
|
|
if (routingTypeObject.permalink.match(/{.*}/)) {
|
|
|
|
routingTypeObject.permalink = routingTypeObject.permalink.replace(/{(\w+)}/g, ':$1');
|
|
|
|
}
|
|
|
|
|
|
|
|
collections[routingTypeObjectKey] = _private.validateTemplate(routingTypeObject);
|
✨Dynamic Routing Beta (#9596)
refs #9601
### Dynamic Routing
This is the beta version of dynamic routing.
- we had a initial implementation of "channels" available in the codebase
- we have removed and moved this implementation
- there is now a centralised place for dynamic routing - server/services/routing
- each routing component is represented by a router type e.g. collections, routes, static pages, taxonomies, rss, preview of posts
- keep as much as possible logic of routing helpers, middlewares and controllers
- ensure test coverage
- connect all the things together
- yaml file + validation
- routing + routers
- url service
- sitemaps
- url access
- deeper implementation of yaml validations
- e.g. hard require slashes
- ensure routing hierarchy/order
- e.g. you enable the subscriber app
- you have a custom static page, which lives under the same slug /subscribe
- static pages are stronger than apps
- e.g. the first collection owns the post it has filtered
- a post cannot live in two collections
- ensure apps are still working and hook into the routers layer (or better said: and register in the routing service)
- put as much as possible comments to the code base for better understanding
- ensure a clean debug log
- ensure we can unmount routes
- e.g. you have a collection permalink of /:slug/ represented by {globals.permalink}
- and you change the permalink in the admin to dated permalink
- the express route get's refreshed from /:slug/ to /:year/:month/:day/:slug/
- unmount without server restart, yey
- ensure we are backwards compatible
- e.g. render home.hbs for collection index if collection route is /
- ensure you can access your configured permalink from the settings table with {globals.permalink}
### Render 503 if url service did not finish
- return 503 if the url service has not finished generating the resource urls
### Rewrite sitemaps
- we have rewritten the sitemaps "service", because the url generator does no longer happen on runtime
- we generate all urls on bootstrap
- the sitemaps service will consume created resource and router urls
- these urls will be shown on the xml pages
- we listen on url events
- we listen on router events
- we no longer have to fetch the resources, which is nice
- the urlservice pre-fetches resources and emits their urls
- the urlservice is the only component who knows which urls are valid
- i made some ES6 adaptions
- we keep the caching logic -> only regenerate xml if there is a change
- updated tests
- checked test coverage (100%)
### Re-work usage of Url utility
- replace all usages of `urlService.utils.urlFor` by `urlService.getByResourceId`
- only for resources e.g. post, author, tag
- this is important, because with dynamic routing we no longer create static urls based on the settings permalink on runtime
- adapt url utility
- adapt tests
2018-06-05 20:02:20 +03:00
|
|
|
});
|
|
|
|
|
|
|
|
return collections;
|
|
|
|
};
|
|
|
|
|
|
|
|
_private.validateTaxonomies = function validateTaxonomies(taxonomies) {
|
|
|
|
_.each(taxonomies, (routingTypeObject, routingTypeObjectKey) => {
|
|
|
|
if (!routingTypeObject) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObjectKey,
|
|
|
|
reason: 'Please define a taxonomy permalink route.'
|
|
|
|
}),
|
|
|
|
help: 'e.g. tag: /tag/{slug}/'
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: we hard-require trailing slashes for the taxonomie permalink route
|
|
|
|
if (!routingTypeObject.match(/\/$/)) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObject,
|
|
|
|
reason: 'A trailing slash is required.'
|
|
|
|
})
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: we hard-require leading slashes for the value/permalink route
|
|
|
|
if (!routingTypeObject.match(/^\//)) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObject,
|
|
|
|
reason: 'A leading slash is required.'
|
|
|
|
})
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: notation /:slug/ or /:primary_author/ is not allowed. We only accept /{{...}}/.
|
|
|
|
if (routingTypeObject && routingTypeObject.match(/\/\:\w+/)) {
|
|
|
|
throw new common.errors.ValidationError({
|
|
|
|
message: common.i18n.t('errors.services.settings.yaml.validate', {
|
|
|
|
at: routingTypeObject,
|
|
|
|
reason: 'Please use the following notation e.g. /{slug}/.'
|
|
|
|
})
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// CASE: transform {.*} into :\w+ notation. This notation is our internal notation e.g. see permalink
|
|
|
|
// replacement in our UrlService utility.
|
|
|
|
if (routingTypeObject && routingTypeObject.match(/{.*}/)) {
|
|
|
|
routingTypeObject = routingTypeObject.replace(/{(\w+)}/g, ':$1');
|
|
|
|
taxonomies[routingTypeObjectKey] = routingTypeObject;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
return taxonomies;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Validate and sanitize the routing object.
|
|
|
|
*/
|
|
|
|
module.exports = function validate(object) {
|
|
|
|
if (!object) {
|
|
|
|
object = {};
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!object.routes) {
|
|
|
|
object.routes = {};
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!object.collections) {
|
|
|
|
object.collections = {};
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!object.taxonomies) {
|
|
|
|
object.taxonomies = {};
|
|
|
|
}
|
|
|
|
|
|
|
|
object.routes = _private.validateRoutes(object.routes);
|
|
|
|
object.collections = _private.validateCollections(object.collections);
|
|
|
|
object.taxonomies = _private.validateTaxonomies(object.taxonomies);
|
|
|
|
|
|
|
|
return object;
|
|
|
|
};
|