@paroicms/server 1.25.2 → 1.25.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -5
- package/dist/modules/public-site/public-route/public-route-parser.d.ts +3 -3
- package/dist/modules/public-site/public-route/public-route-parser.js +44 -51
- package/dist/modules/public-site/public-route/public-route-parser.js.map +1 -1
- package/dist/modules/public-site/public-route/raw-document-payload.d.ts +1 -5
- package/dist/modules/public-site/public-route/raw-document-payload.js +7 -22
- package/dist/modules/public-site/public-route/raw-document-payload.js.map +1 -1
- package/dist/modules/public-site/serve-document/serve-document.js +15 -13
- package/dist/modules/public-site/serve-document/serve-document.js.map +1 -1
- package/dist/site-schema/site-schema-factory.js +20 -5
- package/dist/site-schema/site-schema-factory.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -2,6 +2,18 @@
|
|
|
2
2
|
|
|
3
3
|
This is the main package of ParoiCMS.
|
|
4
4
|
|
|
5
|
+
**ParoiCMS** is a full-featured CMS for building showcase websites. It includes:
|
|
6
|
+
|
|
7
|
+
- **Custom content**
|
|
8
|
+
- A robust **cache system**
|
|
9
|
+
- A **plugin** architecture
|
|
10
|
+
- **Multilingual** websites (currently in English and French)
|
|
11
|
+
- **Multi-sites**
|
|
12
|
+
|
|
13
|
+
Themes for ParoiCMS are written in [LiquidJS](https://liquidjs.com/) (the syntax from Shopify). Data is stored in [SQLite](https://www.sqlite.org/) databases.
|
|
14
|
+
|
|
15
|
+
While it's a new solution, we can ensure that ParoiCMS is already robust. It is currently used in production [by us](https://paroi.tech/) and our clients.
|
|
16
|
+
|
|
5
17
|
## How to generate a new website
|
|
6
18
|
|
|
7
19
|
Run the following commands:
|
|
@@ -13,7 +25,7 @@ npm i
|
|
|
13
25
|
npm run dev
|
|
14
26
|
```
|
|
15
27
|
|
|
16
|
-
Then, connect to your back-office: http://localhost:8080/adm
|
|
28
|
+
Then, connect to your back-office: [http://localhost:8080/adm](http://localhost:8080/adm). Use `dev@localhost` for the login,
|
|
17
29
|
and `init` for the password.
|
|
18
30
|
|
|
19
31
|
## Tips
|
|
@@ -21,13 +33,13 @@ and `init` for the password.
|
|
|
21
33
|
Here are some tips:
|
|
22
34
|
|
|
23
35
|
- In the back-office, starts with _Configuration → Site properties_;
|
|
24
|
-
- Read the `config.json` file: it is
|
|
25
|
-
- Read the `site-schema.json` file:
|
|
36
|
+
- Read the `config.json` file: it is the configuration (by default for a local environment);
|
|
37
|
+
- Read the `site-schema.json` file: the custom content of your website is defined here;
|
|
26
38
|
- The file `theme/theme.json` contains the list of available sizes (in pixels) in the text editors;
|
|
27
39
|
- You'll find the SCSS in `theme/assets/scss/index.scss`, it is compiled by the watcher in `theme/assets/scss/index.css`;
|
|
28
40
|
- If you edit your theme with Visual Studio Code, then we suggest that you install the _Liquid_ extension, from _panoply (liquify.dev)_;
|
|
29
|
-
-
|
|
30
|
-
- In a
|
|
41
|
+
- HTML templates of your website are in `theme/templates/`;
|
|
42
|
+
- In a LiquidJS file (for example `theme/templates/home.liquid`), use our `info` filter to inspect the content of any payload:
|
|
31
43
|
|
|
32
44
|
```liquid
|
|
33
45
|
{{ site | info }}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { ClassicDocumentSchema, RoutingPointDocumentSchema } from "@paroicms/anywhere-lib";
|
|
2
2
|
import type { SiteContext } from "../../../site-context/site-context.types";
|
|
3
3
|
export interface ParsedPublicRoute {
|
|
4
4
|
language: string;
|
|
5
5
|
routingPoints: RoutingPointDocumentSchema[];
|
|
6
6
|
classicRelativeIds: ClassicRelativeId[];
|
|
7
|
-
|
|
7
|
+
withData: boolean;
|
|
8
8
|
depth: number;
|
|
9
9
|
urlCacheKey: string;
|
|
10
10
|
urlParameters?: string;
|
|
11
11
|
}
|
|
12
12
|
export interface ClassicRelativeId {
|
|
13
13
|
relativeId: string;
|
|
14
|
-
|
|
14
|
+
candidateTypes: ClassicDocumentSchema[];
|
|
15
15
|
}
|
|
16
16
|
export declare function parsePublicRoute(siteContext: Pick<SiteContext, "siteSchema" | "multilingual">, path: string): ParsedPublicRoute | undefined;
|
|
17
17
|
export declare function findParentParsedRouteWithData(parsedRoute: ParsedPublicRoute): ParsedPublicRoute | undefined;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.findParentParsedRouteWithData = exports.parsePublicRoute = void 0;
|
|
4
|
-
const anywhere_lib_1 = require("@paroicms/anywhere-lib");
|
|
5
4
|
function parsePublicRoute(siteContext, path) {
|
|
6
5
|
const { siteSchema, multilingual } = siteContext;
|
|
7
6
|
const { cleanedPath, urlParameters } = parseUrlParameters(path);
|
|
@@ -30,27 +29,30 @@ function parsePublicRoute(siteContext, path) {
|
|
|
30
29
|
++depth;
|
|
31
30
|
prev = routingPoint;
|
|
32
31
|
}
|
|
32
|
+
let lastWithData = prev.withData;
|
|
33
|
+
let parentCandidates = [prev];
|
|
33
34
|
const classicRelativeIds = [];
|
|
34
35
|
while (i < parts.length) {
|
|
35
36
|
const found = findClassicRelativeIdByUrlPath({
|
|
36
37
|
siteSchema,
|
|
37
|
-
|
|
38
|
+
parentCandidates,
|
|
38
39
|
parts,
|
|
39
40
|
partsIndex: i,
|
|
40
41
|
});
|
|
41
42
|
if (!found)
|
|
42
43
|
return;
|
|
43
44
|
classicRelativeIds.push(found.classicRelativeId);
|
|
44
|
-
urlCacheKey.push(
|
|
45
|
+
urlCacheKey.push(`regular:${found.classicRelativeId.relativeId}`);
|
|
45
46
|
++depth;
|
|
46
|
-
|
|
47
|
+
parentCandidates = found.classicRelativeId.candidateTypes;
|
|
47
48
|
i += found.skipUrlParts;
|
|
49
|
+
lastWithData = true;
|
|
48
50
|
}
|
|
49
51
|
return {
|
|
50
52
|
language,
|
|
51
53
|
routingPoints,
|
|
52
54
|
classicRelativeIds,
|
|
53
|
-
|
|
55
|
+
withData: lastWithData,
|
|
54
56
|
depth,
|
|
55
57
|
urlCacheKey: urlCacheKey.join("/"),
|
|
56
58
|
urlParameters,
|
|
@@ -81,53 +83,44 @@ function findRoutingPointByUrlPath({ siteSchema, parent, urlPath, language, }) {
|
|
|
81
83
|
return documentType;
|
|
82
84
|
}
|
|
83
85
|
}
|
|
84
|
-
function findClassicRelativeIdByUrlPath({ siteSchema,
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
return (documentType.kind === "classic" &&
|
|
93
|
-
documentType.route === ":yyyy/:mm/:dd/:relativeId-:slug");
|
|
94
|
-
});
|
|
95
|
-
if (!found)
|
|
96
|
-
return;
|
|
97
|
-
children = [found];
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
100
|
-
children = [children[0]];
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
for (const leafType of children) {
|
|
86
|
+
function findClassicRelativeIdByUrlPath({ siteSchema, parentCandidates, parts, partsIndex, }) {
|
|
87
|
+
const candidateTypes = parentCandidates
|
|
88
|
+
.reduce((childLeafTypes, parent) => {
|
|
89
|
+
if (parent.children)
|
|
90
|
+
childLeafTypes.push(...parent.children);
|
|
91
|
+
return childLeafTypes;
|
|
92
|
+
}, [])
|
|
93
|
+
?.map((leafType) => {
|
|
104
94
|
const documentType = siteSchema.documentTypes[leafType];
|
|
105
95
|
if (!documentType)
|
|
106
96
|
throw new Error(`document-type '${leafType}' should be in the schema`);
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
return
|
|
127
|
-
classicRelativeId: { relativeId, documentType },
|
|
128
|
-
skipUrlParts: 4,
|
|
129
|
-
};
|
|
97
|
+
return documentType;
|
|
98
|
+
})
|
|
99
|
+
.filter((docType) => docType.kind === "classic");
|
|
100
|
+
if (!candidateTypes || candidateTypes.length === 0)
|
|
101
|
+
return;
|
|
102
|
+
const route = candidateTypes[0].route;
|
|
103
|
+
if (route === ":relativeId-:slug") {
|
|
104
|
+
const urlPath = parts[partsIndex];
|
|
105
|
+
const relativeId = parseClassicRelativeIdSlug(urlPath);
|
|
106
|
+
return {
|
|
107
|
+
classicRelativeId: { relativeId, candidateTypes },
|
|
108
|
+
skipUrlParts: 1,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
if (route === ":yyyy/:mm/:dd/:relativeId-:slug") {
|
|
112
|
+
if (parts.length < partsIndex + 3 ||
|
|
113
|
+
!isYear(parts[partsIndex]) ||
|
|
114
|
+
!isMonth(parts[partsIndex + 1]) ||
|
|
115
|
+
!isDay(parts[partsIndex + 2])) {
|
|
116
|
+
return;
|
|
130
117
|
}
|
|
118
|
+
const urlPath = parts[partsIndex + 3];
|
|
119
|
+
const relativeId = parseClassicRelativeIdSlug(urlPath);
|
|
120
|
+
return {
|
|
121
|
+
classicRelativeId: { relativeId, candidateTypes },
|
|
122
|
+
skipUrlParts: 4,
|
|
123
|
+
};
|
|
131
124
|
}
|
|
132
125
|
}
|
|
133
126
|
function parseClassicRelativeIdSlug(urlPath) {
|
|
@@ -155,7 +148,7 @@ function findParentParsedRouteWithData(parsedRoute) {
|
|
|
155
148
|
curRoute = findParentParsedRoute(curRoute);
|
|
156
149
|
if (!curRoute)
|
|
157
150
|
break;
|
|
158
|
-
if (curRoute.
|
|
151
|
+
if (curRoute.withData)
|
|
159
152
|
return curRoute;
|
|
160
153
|
}
|
|
161
154
|
}
|
|
@@ -175,12 +168,12 @@ function findParentParsedRoute(parsedRoute) {
|
|
|
175
168
|
if (classicRelativeIds.length === 0 && routingPoints.length === 0)
|
|
176
169
|
return;
|
|
177
170
|
const lastClassic = classicRelativeIds.length > 0 ? classicRelativeIds[classicRelativeIds.length - 1] : undefined;
|
|
178
|
-
const
|
|
171
|
+
const withData = !!lastClassic || routingPoints[routingPoints.length - 1]?.withData;
|
|
179
172
|
return {
|
|
180
173
|
language: parsedRoute.language,
|
|
181
174
|
routingPoints,
|
|
182
175
|
classicRelativeIds,
|
|
183
|
-
|
|
176
|
+
withData,
|
|
184
177
|
depth: parsedRoute.depth - 1,
|
|
185
178
|
urlCacheKey: urlCacheKey.join("/"),
|
|
186
179
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-route-parser.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/public-route-parser.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"public-route-parser.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/public-route-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
import type { DocValues } from "../../../public-payload/public-payload.types";
|
|
2
2
|
import type { SiteContext } from "../../../site-context/site-context.types";
|
|
3
3
|
import type { ParsedPublicRoute } from "./public-route-parser";
|
|
4
|
-
export
|
|
5
|
-
leafIdPath: string[];
|
|
6
|
-
docValues: DocValues;
|
|
7
|
-
}
|
|
8
|
-
export declare function fetchRawDocPayload(siteContext: SiteContext, parsedRoute: ParsedPublicRoute): Promise<RawDocPayload | undefined>;
|
|
4
|
+
export declare function fetchRawDocPayload(siteContext: SiteContext, parsedRoute: ParsedPublicRoute): Promise<DocValues | undefined>;
|
|
@@ -1,24 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.fetchRawDocPayload = void 0;
|
|
4
|
-
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
5
4
|
const doc_values_queries_1 = require("../../../public-payload/doc-values.queries");
|
|
6
5
|
async function fetchRawDocPayload(siteContext, parsedRoute) {
|
|
7
6
|
const query = buildRawDocPayloadQuery(siteContext, parsedRoute);
|
|
8
7
|
const [row] = await query.getRawMany();
|
|
9
8
|
if (!row)
|
|
10
9
|
return;
|
|
11
|
-
return
|
|
12
|
-
depth: parsedRoute.depth,
|
|
10
|
+
return (0, doc_values_queries_1.formatDocValues)(row, {
|
|
13
11
|
language: parsedRoute.language,
|
|
14
|
-
leafType: parsedRoute.documentType.leafType,
|
|
15
12
|
});
|
|
16
13
|
}
|
|
17
14
|
exports.fetchRawDocPayload = fetchRawDocPayload;
|
|
18
15
|
function buildRawDocPayloadQuery(siteContext, parsedRoute) {
|
|
19
16
|
const query = siteContext.cn.createQueryBuilder();
|
|
20
17
|
query
|
|
21
|
-
.select("cast(l0.id as varchar)", "_id0")
|
|
22
18
|
.from("PaLeaf", "l0")
|
|
23
19
|
.innerJoin("PaSection", "s0", "l0.id = s0.leafId and s0.lang = :language", {
|
|
24
20
|
language: parsedRoute.language,
|
|
@@ -31,7 +27,6 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
|
|
|
31
27
|
for (const routingPoint of parsedRoute.routingPoints.slice(1)) {
|
|
32
28
|
const cur = prev + 1;
|
|
33
29
|
query
|
|
34
|
-
.addSelect(`cast(l${cur}.id as varchar)`, `_id${cur}`)
|
|
35
30
|
.innerJoin("PaLeaf", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.leafType = :leafType${cur}`, {
|
|
36
31
|
[`leafType${cur}`]: routingPoint.leafType,
|
|
37
32
|
})
|
|
@@ -42,27 +37,28 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
|
|
|
42
37
|
.andWhere(`s${cur}.ready = 1`);
|
|
43
38
|
prev = cur;
|
|
44
39
|
}
|
|
45
|
-
for (const {
|
|
40
|
+
for (const { candidateTypes, relativeId } of parsedRoute.classicRelativeIds) {
|
|
46
41
|
const cur = prev + 1;
|
|
47
42
|
query
|
|
48
|
-
.addSelect(`cast(l${cur}.id as varchar)`, `_id${cur}`)
|
|
49
43
|
.innerJoin("PaLeaf", `l${cur}`, `l${prev}.id = l${cur}.parentId and l${cur}.relativeId = :relativeId${cur}`, {
|
|
50
44
|
[`relativeId${cur}`]: relativeId,
|
|
51
45
|
})
|
|
52
46
|
.innerJoin("PaSection", `s${cur}`, `l${cur}.id = s${cur}.leafId and s${cur}.lang = :language`, {
|
|
53
47
|
language: parsedRoute.language,
|
|
54
48
|
})
|
|
55
|
-
.andWhere(`l${cur}.leafType
|
|
56
|
-
[`leafType${cur}`]:
|
|
49
|
+
.andWhere(`l${cur}.leafType in (:...leafType${cur})`, {
|
|
50
|
+
[`leafType${cur}`]: candidateTypes.map((t) => t.leafType),
|
|
57
51
|
})
|
|
58
52
|
.andWhere(`l${cur}.publishDate <= current_timestamp`)
|
|
59
53
|
.andWhere(`s${cur}.ready = 1`);
|
|
60
54
|
prev = cur;
|
|
61
55
|
}
|
|
62
56
|
query
|
|
57
|
+
.addSelect(`l${prev}.leafType`, "leafType")
|
|
58
|
+
.addSelect(`l${prev}.id`, "leafId")
|
|
63
59
|
.addSelect(`l${prev}.relativeId`, "relativeId")
|
|
64
60
|
.addSelect(`l${prev}.publishDate`, "publishDate");
|
|
65
|
-
if (parsedRoute.
|
|
61
|
+
if (parsedRoute.withData) {
|
|
66
62
|
query
|
|
67
63
|
.addSelect("d.title", "title")
|
|
68
64
|
.addSelect("d.slug", "slug")
|
|
@@ -72,15 +68,4 @@ function buildRawDocPayloadQuery(siteContext, parsedRoute) {
|
|
|
72
68
|
}
|
|
73
69
|
return query;
|
|
74
70
|
}
|
|
75
|
-
function formatRawDocPayload(row, { depth, language, leafType }) {
|
|
76
|
-
const leafIdPath = [];
|
|
77
|
-
for (let i = 0; i <= depth; ++i) {
|
|
78
|
-
leafIdPath.push((0, data_formatters_lib_1.strVal)(row[`_id${i}`], { varName: `_id${i}` }));
|
|
79
|
-
}
|
|
80
|
-
const leafId = leafIdPath[depth];
|
|
81
|
-
return {
|
|
82
|
-
leafIdPath,
|
|
83
|
-
docValues: (0, doc_values_queries_1.formatDocValues)(row, { language, leafId, leafType }),
|
|
84
|
-
};
|
|
85
|
-
}
|
|
86
71
|
//# sourceMappingURL=raw-document-payload.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raw-document-payload.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/raw-document-payload.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"raw-document-payload.js","sourceRoot":"","sources":["../../../../src/modules/public-site/public-route/raw-document-payload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateDocumentHtml = void 0;
|
|
4
|
+
const anywhere_lib_1 = require("@paroicms/anywhere-lib");
|
|
4
5
|
const text_cache_1 = require("../../../common/text-cache");
|
|
5
6
|
const render_liquidjs_1 = require("../../../liquidjs-tools/liquidjs-rendering/render-liquidjs");
|
|
6
7
|
const rendering_context_1 = require("../../../liquidjs-tools/liquidjs-rendering/rendering-context");
|
|
@@ -11,37 +12,38 @@ const public_route_parser_1 = require("../public-route/public-route-parser");
|
|
|
11
12
|
const raw_document_payload_1 = require("../public-route/raw-document-payload");
|
|
12
13
|
async function generateDocumentHtml(siteContext, options, tracker) {
|
|
13
14
|
const { req, parsedRoute, cacheKey } = options;
|
|
14
|
-
if (!parsedRoute.
|
|
15
|
+
if (!parsedRoute.withData) {
|
|
15
16
|
const parentRoute = (0, public_route_parser_1.findParentParsedRouteWithData)(parsedRoute);
|
|
16
|
-
const
|
|
17
|
-
if (
|
|
17
|
+
const docValues = parentRoute ? await (0, raw_document_payload_1.fetchRawDocPayload)(siteContext, parentRoute) : undefined;
|
|
18
|
+
if (docValues && parentRoute) {
|
|
18
19
|
const { url, dependencyKeys } = await (0, make_url_1.getUrlOfDocument)(siteContext, tracker, {
|
|
19
20
|
language: parentRoute.language,
|
|
20
|
-
leafId:
|
|
21
|
+
leafId: docValues.leafId,
|
|
21
22
|
}, { returnUrlDependencyKeys: true });
|
|
22
23
|
return { status: 301, url, dependencyKeys };
|
|
23
24
|
}
|
|
24
25
|
return { status: 404 };
|
|
25
26
|
}
|
|
26
|
-
const
|
|
27
|
-
if (!
|
|
27
|
+
const docValues = await (0, raw_document_payload_1.fetchRawDocPayload)(siteContext, parsedRoute);
|
|
28
|
+
if (!docValues)
|
|
28
29
|
return { status: 404 };
|
|
29
30
|
const { url: docUrl, dependencyKeys: urlDependencyKeys } = await (0, make_url_1.getUrlOfDocument)(siteContext, tracker, {
|
|
30
31
|
language: parsedRoute.language,
|
|
31
|
-
leafId:
|
|
32
|
+
leafId: docValues.leafId,
|
|
32
33
|
}, { returnUrlDependencyKeys: true });
|
|
33
34
|
const completeDocUrl = `${docUrl}${parsedRoute.urlParameters ?? ""}`;
|
|
34
35
|
if (completeDocUrl !== req.url) {
|
|
35
36
|
return { status: 301, url: completeDocUrl, dependencyKeys: urlDependencyKeys };
|
|
36
37
|
}
|
|
38
|
+
const documentType = (0, anywhere_lib_1.getDocumentTypeByLeafType)(siteContext.siteSchema, docValues.leafType);
|
|
37
39
|
const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, {
|
|
38
40
|
cacheKey,
|
|
39
41
|
tracker,
|
|
40
|
-
dependencyKey: (0, text_cache_1.makeCacheDependencyKey)({ documentId:
|
|
42
|
+
dependencyKey: (0, text_cache_1.makeCacheDependencyKey)({ documentId: docValues }),
|
|
41
43
|
});
|
|
42
44
|
const html = await (0, render_liquidjs_1.renderLiquidTemplate)(siteContext, renderingContext, {
|
|
43
|
-
templateNames:
|
|
44
|
-
payload: makeRegularPublicPayload(siteContext, renderingContext,
|
|
45
|
+
templateNames: documentType.templateNames,
|
|
46
|
+
payload: makeRegularPublicPayload(siteContext, renderingContext, docValues, docUrl),
|
|
45
47
|
});
|
|
46
48
|
return {
|
|
47
49
|
status: 200,
|
|
@@ -50,10 +52,10 @@ async function generateDocumentHtml(siteContext, options, tracker) {
|
|
|
50
52
|
};
|
|
51
53
|
}
|
|
52
54
|
exports.generateDocumentHtml = generateDocumentHtml;
|
|
53
|
-
function makeRegularPublicPayload(siteContext, renderingContext,
|
|
55
|
+
function makeRegularPublicPayload(siteContext, renderingContext, docValues, url) {
|
|
54
56
|
return {
|
|
55
|
-
site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext,
|
|
56
|
-
doc: (0, create_doc_drop_1.createDocPayloadDrop)(siteContext, renderingContext,
|
|
57
|
+
site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext, docValues.language),
|
|
58
|
+
doc: (0, create_doc_drop_1.createDocPayloadDrop)(siteContext, renderingContext, docValues, { url }),
|
|
57
59
|
};
|
|
58
60
|
}
|
|
59
61
|
//# sourceMappingURL=serve-document.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../../src/modules/public-site/serve-document/serve-document.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../../src/modules/public-site/serve-document/serve-document.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,7 +62,7 @@ async function loadSiteSchema(siteConf) {
|
|
|
62
62
|
importMediaPolicy(newSchema, lib, "default", { ensureImagePolicy: true });
|
|
63
63
|
appendDocumentTypesToSiteSchema(jsonData, newSchema, lib);
|
|
64
64
|
await (0, read_locales_1.completeSchemaLocales)(siteConf.siteDir, l10n);
|
|
65
|
-
|
|
65
|
+
checkIntegrityOfSiteSchema(newSchema);
|
|
66
66
|
return { siteSchema: newSchema, plugins: Array.from(lib.plugins?.values() ?? []) };
|
|
67
67
|
}
|
|
68
68
|
exports.loadSiteSchema = loadSiteSchema;
|
|
@@ -238,13 +238,28 @@ function formatRelativeIdGeneratorSchema(val, formatOptions) {
|
|
|
238
238
|
val[0] = (0, data_formatters_lib_1.strVal)(val[0], { varName: `${formatOptions.varName}[0]` });
|
|
239
239
|
return val;
|
|
240
240
|
}
|
|
241
|
-
function
|
|
241
|
+
function checkIntegrityOfSiteSchema(newSchema) {
|
|
242
242
|
for (const documentType of Object.values(newSchema.documentTypes)) {
|
|
243
|
-
if (documentType.kind
|
|
244
|
-
|
|
245
|
-
|
|
243
|
+
if (documentType.kind === "routingPoint" &&
|
|
244
|
+
documentType.leafType !== "home" &&
|
|
245
|
+
!documentType.urlPaths) {
|
|
246
246
|
throw new Error(`Missing route for non-home document type '${documentType.leafType}'`);
|
|
247
247
|
}
|
|
248
|
+
let childRoute;
|
|
249
|
+
for (const childLeafType of documentType.children ?? []) {
|
|
250
|
+
const child = newSchema.documentTypes[childLeafType];
|
|
251
|
+
if (!child) {
|
|
252
|
+
throw new Error(`Unknown child document type '${childLeafType}'`);
|
|
253
|
+
}
|
|
254
|
+
if (child.kind === "classic") {
|
|
255
|
+
if (childRoute === undefined) {
|
|
256
|
+
childRoute = child.route;
|
|
257
|
+
}
|
|
258
|
+
else if (child.route !== childRoute) {
|
|
259
|
+
throw new Error(`Inconsistent routes '${childRoute}' and '${child.route}' for children of document type '${documentType.leafType}'`);
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
}
|
|
248
263
|
}
|
|
249
264
|
}
|
|
250
265
|
function toPartType(jsonData, l10n, lib) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-schema-factory.js","sourceRoot":"","sources":["../../src/site-schema/site-schema-factory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"site-schema-factory.js","sourceRoot":"","sources":["../../src/site-schema/site-schema-factory.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server",
|
|
3
|
-
"version": "1.25.
|
|
3
|
+
"version": "1.25.3",
|
|
4
4
|
"description": "The ParoiCMS server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cms",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@paroi/data-formatters-lib": "~0.3.0",
|
|
50
50
|
"@paroi/quill-delta-to-html": "~0.12.2",
|
|
51
51
|
"@paroicms/anywhere-lib": "1.10.0",
|
|
52
|
-
"@paroicms/bo": "1.22.
|
|
52
|
+
"@paroicms/bo": "1.22.2",
|
|
53
53
|
"@paroicms/plugin-lib": "0.3.0",
|
|
54
54
|
"@paroicms/server-database-media-storage": "1.4.4",
|
|
55
55
|
"@paroicms/server-image-cache-engine": "1.6.1",
|