@paroicms/server 4.6.3 → 4.7.0
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/ddl/main.ddl.sql +2 -2
- package/dist/admin-backend/fields/_fields.helpers.d.ts +1 -0
- package/dist/admin-backend/fields/_fields.helpers.d.ts.map +1 -1
- package/dist/admin-backend/fields/_fields.helpers.js +6 -0
- package/dist/admin-backend/fields/_fields.helpers.js.map +1 -1
- package/dist/admin-backend/fields/labeling.queries.d.ts +5 -0
- package/dist/admin-backend/fields/labeling.queries.d.ts.map +1 -1
- package/dist/admin-backend/fields/labeling.queries.js +47 -22
- package/dist/admin-backend/fields/labeling.queries.js.map +1 -1
- package/dist/admin-backend/fields/load-fields.queries.d.ts +7 -1
- package/dist/admin-backend/fields/load-fields.queries.d.ts.map +1 -1
- package/dist/admin-backend/fields/load-fields.queries.js +270 -2
- package/dist/admin-backend/fields/load-fields.queries.js.map +1 -1
- package/dist/admin-backend/routing-cluster/routing-cluster.resolver.d.ts.map +1 -1
- package/dist/admin-backend/routing-cluster/routing-cluster.resolver.js +31 -6
- package/dist/admin-backend/routing-cluster/routing-cluster.resolver.js.map +1 -1
- package/dist/connector/db-init/db-constants.d.ts +1 -1
- package/dist/connector/db-init/db-constants.js +1 -1
- package/dist/connector/db-init/ddl-migration.d.ts.map +1 -1
- package/dist/connector/db-init/ddl-migration.js +8 -0
- package/dist/connector/db-init/ddl-migration.js.map +1 -1
- package/dist/connector/db-init/load-routing-cluster.queries.d.ts +14 -2
- package/dist/connector/db-init/load-routing-cluster.queries.d.ts.map +1 -1
- package/dist/connector/db-init/load-routing-cluster.queries.js +18 -9
- package/dist/connector/db-init/load-routing-cluster.queries.js.map +1 -1
- package/dist/connector/plugin-loader/plugin-loader.d.ts.map +1 -1
- package/dist/connector/plugin-loader/plugin-loader.js +12 -7
- package/dist/connector/plugin-loader/plugin-loader.js.map +1 -1
- package/dist/rendered-site/liquidjs-tags/docs-liquid-set-handler.d.ts.map +1 -1
- package/dist/rendered-site/liquidjs-tags/docs-liquid-set-handler.js +20 -5
- package/dist/rendered-site/liquidjs-tags/docs-liquid-set-handler.js.map +1 -1
- package/dist/rendered-site/page-route/make-url.d.ts +10 -0
- package/dist/rendered-site/page-route/make-url.d.ts.map +1 -1
- package/dist/rendered-site/page-route/make-url.js +45 -31
- package/dist/rendered-site/page-route/make-url.js.map +1 -1
- package/dist/rendered-site/page-route/prepare-child-document-urls.d.ts +8 -0
- package/dist/rendered-site/page-route/prepare-child-document-urls.d.ts.map +1 -0
- package/dist/rendered-site/page-route/prepare-child-document-urls.js +88 -0
- package/dist/rendered-site/page-route/prepare-child-document-urls.js.map +1 -0
- package/dist/rendering-payload/create-doc-drop.d.ts +3 -1
- package/dist/rendering-payload/create-doc-drop.d.ts.map +1 -1
- package/dist/rendering-payload/create-doc-drop.js +9 -5
- package/dist/rendering-payload/create-doc-drop.js.map +1 -1
- package/dist/rendering-payload/field-values.d.ts +5 -0
- package/dist/rendering-payload/field-values.d.ts.map +1 -1
- package/dist/rendering-payload/field-values.js +38 -1
- package/dist/rendering-payload/field-values.js.map +1 -1
- package/package.json +3 -3
- package/schema.graphql +18 -0
|
@@ -80,41 +80,55 @@ function makeDocumentUrl(siteContext, ancestors, language) {
|
|
|
80
80
|
throw new Error(`schema and database are not compatible, '${ancestor.typeName}' should not be a child of '${parent.typeName}'`);
|
|
81
81
|
}
|
|
82
82
|
const docType = getDocumentTypeByName(siteSchema, ancestor.typeName);
|
|
83
|
-
|
|
84
|
-
const routePart = docType.route?.[language];
|
|
85
|
-
if (!routePart) {
|
|
86
|
-
throw new Error(`missing urlPath['${language}'] in document type '${docType.typeName}'`);
|
|
87
|
-
}
|
|
88
|
-
urlSegments.push(routePart);
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
if (docType.route === ":relativeId-:slug") {
|
|
92
|
-
urlSegments.push(makeRelativeIdSlugUrlPart(ancestor));
|
|
93
|
-
}
|
|
94
|
-
else if (docType.route === ":yyyy/:mm/:dd/:relativeId-:slug") {
|
|
95
|
-
const { publishDate } = ancestor;
|
|
96
|
-
urlSegments.push(String(publishDate.getFullYear()).padStart(4, "0"));
|
|
97
|
-
urlSegments.push(String(publishDate.getMonth() + 1).padStart(2, "0"));
|
|
98
|
-
urlSegments.push(String(publishDate.getDate()).padStart(2, "0"));
|
|
99
|
-
urlSegments.push(makeRelativeIdSlugUrlPart(ancestor));
|
|
100
|
-
}
|
|
101
|
-
else if (docType.route === ":slug") {
|
|
102
|
-
if (!ancestor.slug) {
|
|
103
|
-
throw new Error(`missing slug in '${docType.typeName}' for route ':slug'`);
|
|
104
|
-
}
|
|
105
|
-
urlSegments.push(ancestor.slug);
|
|
106
|
-
}
|
|
107
|
-
else if (docType.route === ":relativeId") {
|
|
108
|
-
urlSegments.push(ancestor.relativeId);
|
|
109
|
-
}
|
|
110
|
-
else {
|
|
111
|
-
throw new Error(`in '${docType.typeName}', unknown value for route: '${docType.route}'`);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
83
|
+
urlSegments.push(...makeDocumentRouteSegments(docType, ancestor, language));
|
|
114
84
|
parent = docType;
|
|
115
85
|
}
|
|
116
86
|
return `/${urlSegments.join("/")}`;
|
|
117
87
|
}
|
|
88
|
+
export function makeDirectChildDocumentUrl(siteContext, parentTypeName, parentUrl, document) {
|
|
89
|
+
const parentType = getDocumentTypeByName(siteContext.siteSchema, parentTypeName);
|
|
90
|
+
if (!parentType.regularChildren?.includes(document.type) &&
|
|
91
|
+
!parentType.routingChildren?.includes(document.type)) {
|
|
92
|
+
throw new Error(`'${document.type}' is not a child of '${parentTypeName}'`);
|
|
93
|
+
}
|
|
94
|
+
const documentType = getDocumentTypeByName(siteContext.siteSchema, document.type);
|
|
95
|
+
const publishDate = new Date(document.publishDate);
|
|
96
|
+
if (Number.isNaN(publishDate.getTime())) {
|
|
97
|
+
throw new Error(`Invalid publish date for document '${document.nodeId}'`);
|
|
98
|
+
}
|
|
99
|
+
const segments = makeDocumentRouteSegments(documentType, { ...document, publishDate }, document.language);
|
|
100
|
+
return `${parentUrl === "/" ? "" : parentUrl}/${segments.join("/")}`;
|
|
101
|
+
}
|
|
102
|
+
function makeDocumentRouteSegments(documentType, document, language) {
|
|
103
|
+
if (documentType.documentKind === "routing") {
|
|
104
|
+
const routePart = documentType.route?.[language];
|
|
105
|
+
if (!routePart) {
|
|
106
|
+
throw new Error(`missing urlPath['${language}'] in document type '${documentType.typeName}'`);
|
|
107
|
+
}
|
|
108
|
+
return [routePart];
|
|
109
|
+
}
|
|
110
|
+
if (documentType.route === ":relativeId-:slug") {
|
|
111
|
+
return [makeRelativeIdSlugUrlPart(document)];
|
|
112
|
+
}
|
|
113
|
+
if (documentType.route === ":yyyy/:mm/:dd/:relativeId-:slug") {
|
|
114
|
+
const { publishDate } = document;
|
|
115
|
+
return [
|
|
116
|
+
String(publishDate.getFullYear()).padStart(4, "0"),
|
|
117
|
+
String(publishDate.getMonth() + 1).padStart(2, "0"),
|
|
118
|
+
String(publishDate.getDate()).padStart(2, "0"),
|
|
119
|
+
makeRelativeIdSlugUrlPart(document),
|
|
120
|
+
];
|
|
121
|
+
}
|
|
122
|
+
if (documentType.route === ":slug") {
|
|
123
|
+
if (!document.slug) {
|
|
124
|
+
throw new Error(`missing slug in '${documentType.typeName}' for route ':slug'`);
|
|
125
|
+
}
|
|
126
|
+
return [document.slug];
|
|
127
|
+
}
|
|
128
|
+
if (documentType.route === ":relativeId")
|
|
129
|
+
return [document.relativeId];
|
|
130
|
+
throw new Error(`in '${documentType.typeName}', unknown value for route: '${documentType.route}'`);
|
|
131
|
+
}
|
|
118
132
|
function makeUrlDependencyKeys(ancestors, language) {
|
|
119
133
|
return ancestors.map((part) => makeCacheDependencyKey({
|
|
120
134
|
documentId: { language, nodeId: part.nodeId },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/make-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,EAAE,aAAa,EAAgB,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/make-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,EAAE,aAAa,EAAgB,MAAM,+BAA+B,CAAC;AAG5E,OAAO,EACL,wBAAwB,GAEzB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,MAAM,UAAU,UAAU,CACxB,WAAwD,EACxD,QAAgB,EAChB,OAAmC;IAEnC,MAAM,GAAG,GAAG,wBAAwB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9F,OAAO,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACtE,CAAC;AA0BD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,OAAgB,EAChB,UAAyB,EACzB,OAAO,GAKH,EAAE;IAEN,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,EAAE,CACvC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAG9D,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QAC/E,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChF,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,uBAAuB;gBAAE,OAAO,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAChF,OAAO;gBACL,GAAG,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC;gBACvC,cAAc,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC;aACjF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACnF,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAGlE,IAAI,kBAAkB,EAAE,CAAC;QACvB,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;QAChC,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAC7B,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,cAAwB,CAAC;QAC7B,IAAI,GAAW,CAAC;QAChB,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpC,GAAG,GAAG,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACxC,cAAc,GAAG,EAAE,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,eAAe,CAAC,WAAW,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC;YACjE,cAAc,GAAG,qBAAqB,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;QACvE,CAAC;QAGD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;YAC/E,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACvC;gBACE,QAAQ;gBACR,KAAK,EAAE,GAAG;gBACV,cAAc;aACf,EACD,OAAO,CACR,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACvC,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;IACxF,CAAC;IAGD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QAEvB,MAAM,UAAU,GAAG,cAAc,CAC/B,WAAW,CAAC,aAAa,EACzB,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,MAAM,CAClB,CAAC;QACF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC9C,OAAO,OAAO,CAAC,uBAAuB;YACpC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,YAAY,CAAC,EAAE;YACnD,CAAC,CAAC,QAAQ,CAAC;IACf,CAAC;IAGD,IAAI,OAAO,CAAC,WAAW;QAAE,OAAO;IAChC,MAAM,IAAI,KAAK,CAAC,aAAa,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,QAAQ,wBAAwB,CAAC,CAAC;AACjG,CAAC;AAID,SAAS,2BAA2B,CAClC,SAAiC;IAEjC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IACE,CAAC,QAAQ,CAAC,KAAK;YACf,QAAQ,CAAC,WAAW,KAAK,SAAS;YAClC,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,EACpC,CAAC;YACD,OAAO;QACT,CAAC;IACH,CAAC;IACD,OAAO,SAAwC,CAAC;AAClD,CAAC;AAED,SAAS,eAAe,CACtB,WAA4C,EAC5C,SAAsC,EACtC,QAAgB;IAEhB,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IACnC,MAAM,WAAW,GAAG,wBAAwB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjG,IAAI,MAAM,GAAG,qBAAqB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAEvD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IACE,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACpD,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACpD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,4CAA4C,QAAQ,CAAC,QAAQ,+BAA+B,MAAM,CAAC,QAAQ,GAAG,CAC/G,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,qBAAqB,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrE,WAAW,CAAC,IAAI,CAAC,GAAG,yBAAyB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAE5E,MAAM,GAAG,OAAO,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,WAA4C,EAC5C,cAAsB,EACtB,SAAiB,EACjB,QAAqB;IAErB,MAAM,UAAU,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACjF,IACE,CAAC,UAAU,CAAC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;QACpD,CAAC,UAAU,CAAC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EACpD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,CAAC,IAAI,wBAAwB,cAAc,GAAG,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClF,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACnD,IAAI,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,sCAAsC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,QAAQ,GAAG,yBAAyB,CACxC,YAAY,EACZ,EAAE,GAAG,QAAQ,EAAE,WAAW,EAAE,EAC5B,QAAQ,CAAC,QAAQ,CAClB,CAAC;IACF,OAAO,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AACvE,CAAC;AAED,SAAS,yBAAyB,CAChC,YAA4B,EAC5B,QAEC,EACD,QAAgB;IAEhB,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,wBAAwB,YAAY,CAAC,QAAQ,GAAG,CAAC,CAAC;QAChG,CAAC;QACD,OAAO,CAAC,SAAS,CAAC,CAAC;IACrB,CAAC;IACD,IAAI,YAAY,CAAC,KAAK,KAAK,mBAAmB,EAAE,CAAC;QAC/C,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,YAAY,CAAC,KAAK,KAAK,iCAAiC,EAAE,CAAC;QAC7D,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;QACjC,OAAO;YACL,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;YAClD,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;YACnD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;YAC9C,yBAAyB,CAAC,QAAQ,CAAC;SACpC,CAAC;IACJ,CAAC;IACD,IAAI,YAAY,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,YAAY,CAAC,QAAQ,qBAAqB,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IACD,IAAI,YAAY,CAAC,KAAK,KAAK,aAAa;QAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvE,MAAM,IAAI,KAAK,CACb,OAAO,YAAY,CAAC,QAAQ,gCAAgC,YAAY,CAAC,KAAK,GAAG,CAClF,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAiC,EAAE,QAAgB;IAChF,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5B,sBAAsB,CAAC;QACrB,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QAC7C,SAAS,EAAE,MAAM;KAClB,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAuD;IACxF,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;AACzE,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ChildDocumentsLoadDescriptor, TpDocValues } from "@paroicms/public-server-lib";
|
|
2
|
+
import type { RenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
3
|
+
export interface PreparedDocumentUrl {
|
|
4
|
+
url: string;
|
|
5
|
+
dependencyKeys: string[];
|
|
6
|
+
}
|
|
7
|
+
export declare function prepareChildDocumentUrls(renderingContext: RenderingContext, descriptor: ChildDocumentsLoadDescriptor, documents: TpDocValues[]): Promise<Map<string, PreparedDocumentUrl> | undefined>;
|
|
8
|
+
//# sourceMappingURL=prepare-child-document-urls.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prepare-child-document-urls.d.ts","sourceRoot":"","sources":["../../../src/rendered-site/page-route/prepare-child-document-urls.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,4BAA4B,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAK7F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8DAA8D,CAAC;AAKrG,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AAaD,wBAAsB,wBAAwB,CAC5C,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,4BAA4B,EACxC,SAAS,EAAE,WAAW,EAAE,GACvB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAAG,SAAS,CAAC,CAwDvD"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { getDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
|
|
2
|
+
import { encodeLNodeId } from "@paroicms/public-anywhere-lib";
|
|
3
|
+
import { type } from "arktype";
|
|
4
|
+
import { getTypeNameOf } from "../../admin-backend/node/node.queries.js";
|
|
5
|
+
import { makeCacheDependencyKey } from "../../common/text-cache.js";
|
|
6
|
+
import { mainDbSchemaName } from "../../connector/db-init/db-constants.js";
|
|
7
|
+
import { getUrlOfDocument, makeDirectChildDocumentUrl } from "./make-url.js";
|
|
8
|
+
const directChildQueryBatchSize = 30_000;
|
|
9
|
+
const DirectChildRowAT = type({
|
|
10
|
+
id: "number",
|
|
11
|
+
parentId: "number",
|
|
12
|
+
typeName: "string",
|
|
13
|
+
"+": "reject",
|
|
14
|
+
}).pipe((row) => ({
|
|
15
|
+
nodeId: String(row.id),
|
|
16
|
+
parentNodeId: String(row.parentId),
|
|
17
|
+
typeName: row.typeName,
|
|
18
|
+
}));
|
|
19
|
+
export async function prepareChildDocumentUrls(renderingContext, descriptor, documents) {
|
|
20
|
+
if (renderingContext.isPreview)
|
|
21
|
+
return;
|
|
22
|
+
if (documents.length === 0)
|
|
23
|
+
return new Map();
|
|
24
|
+
const { siteContext } = renderingContext;
|
|
25
|
+
const parentTypeName = descriptor.parentDocumentTypeName ??
|
|
26
|
+
(await getTypeNameOf(siteContext, descriptor.parentDocumentId.nodeId));
|
|
27
|
+
if (!canPrepareRoutes(siteContext, parentTypeName, documents))
|
|
28
|
+
return;
|
|
29
|
+
const rows = await loadDirectChildRows(siteContext, documents.map((document) => document.nodeId));
|
|
30
|
+
renderingContext.tracker.trackAccess(mainDbSchemaName, "PaNode", "read");
|
|
31
|
+
const children = new Map(rows.map((row) => {
|
|
32
|
+
const child = DirectChildRowAT.assert(row);
|
|
33
|
+
return [child.nodeId, child];
|
|
34
|
+
}));
|
|
35
|
+
if (documents.some((document) => {
|
|
36
|
+
const child = children.get(document.nodeId);
|
|
37
|
+
if (!child)
|
|
38
|
+
return true;
|
|
39
|
+
return (child.parentNodeId !== descriptor.parentDocumentId.nodeId ||
|
|
40
|
+
child.typeName !== document.type);
|
|
41
|
+
})) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
const parent = await getUrlOfDocument(siteContext, renderingContext.tracker, descriptor.parentDocumentId, { returnUrlDependencyKeys: true, returnUndef: true });
|
|
45
|
+
if (!parent)
|
|
46
|
+
return;
|
|
47
|
+
return new Map(documents.map((document) => {
|
|
48
|
+
const documentId = { nodeId: document.nodeId, language: document.language };
|
|
49
|
+
return [
|
|
50
|
+
encodeLNodeId(documentId),
|
|
51
|
+
{
|
|
52
|
+
url: makeDirectChildDocumentUrl(siteContext, parentTypeName, parent.url, document),
|
|
53
|
+
dependencyKeys: [
|
|
54
|
+
...parent.dependencyKeys,
|
|
55
|
+
makeCacheDependencyKey({ documentId, perimeter: "slug" }),
|
|
56
|
+
],
|
|
57
|
+
},
|
|
58
|
+
];
|
|
59
|
+
}));
|
|
60
|
+
}
|
|
61
|
+
async function loadDirectChildRows(siteContext, nodeIds) {
|
|
62
|
+
const rows = [];
|
|
63
|
+
for (let offset = 0; offset < nodeIds.length; offset += directChildQueryBatchSize) {
|
|
64
|
+
const batchRows = await siteContext
|
|
65
|
+
.cn("PaNode as n")
|
|
66
|
+
.select("n.id", "n.parentId", "n.typeName")
|
|
67
|
+
.whereIn("n.id", nodeIds.slice(offset, offset + directChildQueryBatchSize));
|
|
68
|
+
rows.push(...batchRows);
|
|
69
|
+
}
|
|
70
|
+
return rows;
|
|
71
|
+
}
|
|
72
|
+
function canPrepareRoutes(siteContext, parentTypeName, documents) {
|
|
73
|
+
const parentType = getDocumentTypeByName(siteContext.siteSchema, parentTypeName);
|
|
74
|
+
return documents.every((document) => {
|
|
75
|
+
if (!parentType.regularChildren?.includes(document.type))
|
|
76
|
+
return false;
|
|
77
|
+
const documentType = getDocumentTypeByName(siteContext.siteSchema, document.type);
|
|
78
|
+
if (documentType.documentKind === "routing") {
|
|
79
|
+
return documentType.route?.[document.language] !== undefined;
|
|
80
|
+
}
|
|
81
|
+
if (documentType.route === ":slug")
|
|
82
|
+
return document.slug !== undefined;
|
|
83
|
+
return (documentType.route === ":relativeId" ||
|
|
84
|
+
documentType.route === ":relativeId-:slug" ||
|
|
85
|
+
documentType.route === ":yyyy/:mm/:dd/:relativeId-:slug");
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=prepare-child-document-urls.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prepare-child-document-urls.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/prepare-child-document-urls.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import type { Obj } from "@paroicms/public-anywhere-lib";
|
|
2
2
|
import { type ParsedLNodeId } from "@paroicms/public-anywhere-lib";
|
|
3
|
-
import type { LiquidPayload, PaUrlQuery, TpDocPayload, TpDocValues } from "@paroicms/public-server-lib";
|
|
3
|
+
import type { LiquidPayload, PaUrlQuery, TpDocPayload, TpDocValues, TpFieldValues } from "@paroicms/public-server-lib";
|
|
4
4
|
import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
|
|
5
5
|
export declare function createDocPayloadDrop(renderingContext: RenderingContext, docValuesOrFn: TpDocValues | (() => Promise<TpDocValues>), options: {
|
|
6
6
|
documentId: ParsedLNodeId;
|
|
7
7
|
url?: string;
|
|
8
|
+
urlDependencyKeys?: string[];
|
|
9
|
+
preloadedFieldValues?: LiquidPayload<TpFieldValues>;
|
|
8
10
|
fieldNames?: string[];
|
|
9
11
|
kind?: "routingDocument" | "regularDocument" | "term";
|
|
10
12
|
extraValues?: Obj;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-doc-drop.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/create-doc-drop.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAEL,KAAK,aAAa,EAEnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EACV,aAAa,EAEb,UAAU,EACV,YAAY,EACZ,WAAW,
|
|
1
|
+
{"version":3,"file":"create-doc-drop.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/create-doc-drop.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAEL,KAAK,aAAa,EAEnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EACV,aAAa,EAEb,UAAU,EACV,YAAY,EACZ,WAAW,EACX,aAAa,EAGd,MAAM,6BAA6B,CAAC;AAUrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AA2BlG,wBAAgB,oBAAoB,CAClC,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,WAAW,GAAG,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC,EACzD,OAAO,EAAE;IACP,UAAU,EAAE,aAAa,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,oBAAoB,CAAC,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC;IAIpD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,MAAM,CAAC;IACtD,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GACA,aAAa,CAAC,YAAY,CAAC,CAwG7B"}
|
|
@@ -39,6 +39,9 @@ export function createDocPayloadDrop(renderingContext, docValuesOrFn, options) {
|
|
|
39
39
|
typeName: docValues.type,
|
|
40
40
|
});
|
|
41
41
|
renderingContext.addDependencyKey(makeCacheDependencyKey({ documentId }));
|
|
42
|
+
if (options.urlDependencyKeys) {
|
|
43
|
+
renderingContext.addDependencyKey(...options.urlDependencyKeys);
|
|
44
|
+
}
|
|
42
45
|
const id = encodeLNodeId(docValues);
|
|
43
46
|
return {
|
|
44
47
|
renderingCacheKey: `doc:${id}:${options.fieldNames?.join(",") ?? "full"}`,
|
|
@@ -70,11 +73,12 @@ export function createDocPayloadDrop(renderingContext, docValuesOrFn, options) {
|
|
|
70
73
|
});
|
|
71
74
|
return image ? toTpSourceMedia(renderingContext, image) : undefined;
|
|
72
75
|
},
|
|
73
|
-
field:
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
76
|
+
field: options.preloadedFieldValues ??
|
|
77
|
+
(() => loadPublicFieldValues(renderingContext, {
|
|
78
|
+
typeName: docValues.type,
|
|
79
|
+
lNodeId: docValues,
|
|
80
|
+
fieldNames: options.fieldNames,
|
|
81
|
+
})),
|
|
78
82
|
translations: () => loadTranslationsAsDrops(renderingContext, docValues),
|
|
79
83
|
og: () => makeOgValuesPayload(renderingContext, documentType, docValues, options),
|
|
80
84
|
jsonLd: () => makeJsonLdPayload(renderingContext, documentType, docValues, options),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-doc-drop.js","sourceRoot":"","sources":["../../src/rendering-payload/create-doc-drop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EACL,aAAa,GAGd,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"create-doc-drop.js","sourceRoot":"","sources":["../../src/rendering-payload/create-doc-drop.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,4 +6,9 @@ export declare function loadPublicFieldValues(renderingContext: RenderingContext
|
|
|
6
6
|
lNodeId: ParsedLNodeId;
|
|
7
7
|
fieldNames?: string[];
|
|
8
8
|
}): Promise<LiquidPayload<TpFieldValues>>;
|
|
9
|
+
export declare function loadPublicFieldValuesForDocuments(renderingContext: RenderingContext, documents: {
|
|
10
|
+
type: string;
|
|
11
|
+
nodeId: string;
|
|
12
|
+
language: string;
|
|
13
|
+
}[], fieldNames: string[]): Promise<Map<string, LiquidPayload<TpFieldValues>>>;
|
|
9
14
|
//# sourceMappingURL=field-values.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field-values.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/field-values.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,aAAa,
|
|
1
|
+
{"version":3,"file":"field-values.d.ts","sourceRoot":"","sources":["../../src/rendering-payload/field-values.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,aAAa,EAOnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAkB,MAAM,6BAA6B,CAAC;AAahG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAKlG,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE;IACP,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,aAAa,CAAC;IAIvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,GACA,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAmBvC;AAED,wBAAsB,iCAAiC,CACrD,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,EAC/D,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,CAgCpD"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getNodeTypeByName, getPartTypeByName } from "@paroicms/internal-anywhere-lib";
|
|
2
2
|
import { encodeLNodeId, isJsonFieldValue, isMediaHandleValue, isPartFieldValue, isReadLabelingValue, pickATermTitle, } from "@paroicms/public-anywhere-lib";
|
|
3
3
|
import { getHandleOfFieldOnNode, } from "@paroicms/public-server-lib";
|
|
4
|
-
import { loadFieldValues } from "../admin-backend/fields/load-fields.queries.js";
|
|
4
|
+
import { loadFieldValues, loadFieldValuesForLNodes, } from "../admin-backend/fields/load-fields.queries.js";
|
|
5
5
|
import { toTpSourceMedia } from "../common/medias/to-media-values.js";
|
|
6
6
|
import { makeCacheDependencyKey } from "../common/text-cache.js";
|
|
7
7
|
import { getNodeTypeLabel } from "../helpers/label-translator.helper.js";
|
|
@@ -22,6 +22,43 @@ export async function loadPublicFieldValues(renderingContext, options) {
|
|
|
22
22
|
language: options.lNodeId.language,
|
|
23
23
|
publishedOnly: true,
|
|
24
24
|
});
|
|
25
|
+
return await makePublicFieldValuesPayload(renderingContext, {
|
|
26
|
+
lNodeId: options.lNodeId,
|
|
27
|
+
fieldNames: options.fieldNames,
|
|
28
|
+
fieldTypes,
|
|
29
|
+
rawValues,
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
export async function loadPublicFieldValuesForDocuments(renderingContext, documents, fieldNames) {
|
|
33
|
+
const { siteContext } = renderingContext;
|
|
34
|
+
const result = new Map();
|
|
35
|
+
const documentsByType = Map.groupBy(documents, (document) => document.type);
|
|
36
|
+
for (const [typeName, typedDocuments] of documentsByType) {
|
|
37
|
+
const allFieldTypes = getNodeTypeByName(siteContext.siteSchema, typeName).fields ?? [];
|
|
38
|
+
const fieldTypes = allFieldTypes.filter((field) => fieldNames.includes(field.name));
|
|
39
|
+
const lNodeIds = typedDocuments.map(({ nodeId, language }) => ({ nodeId, language }));
|
|
40
|
+
const rawValuesById = await loadFieldValuesForLNodes(siteContext, {
|
|
41
|
+
fieldTypes,
|
|
42
|
+
lNodeIds,
|
|
43
|
+
publishedOnly: true,
|
|
44
|
+
});
|
|
45
|
+
for (const lNodeId of lNodeIds) {
|
|
46
|
+
const encodedId = encodeLNodeId(lNodeId);
|
|
47
|
+
const rawValues = rawValuesById.get(encodedId);
|
|
48
|
+
if (!rawValues)
|
|
49
|
+
throw new Error(`Missing preloaded field values for '${encodedId}'`);
|
|
50
|
+
result.set(encodedId, await makePublicFieldValuesPayload(renderingContext, {
|
|
51
|
+
lNodeId,
|
|
52
|
+
fieldNames,
|
|
53
|
+
fieldTypes,
|
|
54
|
+
rawValues,
|
|
55
|
+
}));
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return result;
|
|
59
|
+
}
|
|
60
|
+
async function makePublicFieldValuesPayload(renderingContext, options) {
|
|
61
|
+
const { fieldTypes, rawValues } = options;
|
|
25
62
|
const values = await executeRenderingHook(renderingContext, "fieldPreprocessor", {
|
|
26
63
|
fieldTypes,
|
|
27
64
|
values: rawValues,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field-values.js","sourceRoot":"","sources":["../../src/rendering-payload/field-values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EAEnB,cAAc,
|
|
1
|
+
{"version":3,"file":"field-values.js","sourceRoot":"","sources":["../../src/rendering-payload/field-values.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.7.0",
|
|
4
4
|
"description": "The ParoiCMS server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cms",
|
|
@@ -40,10 +40,10 @@
|
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"@apollo/server": "~5.5.1",
|
|
42
42
|
"@as-integrations/express5": "~1.1.2",
|
|
43
|
-
"@paroicms/admin-ui": "1.
|
|
43
|
+
"@paroicms/admin-ui": "1.103.0",
|
|
44
44
|
"@paroicms/internal-anywhere-lib": "1.41.1",
|
|
45
45
|
"@paroicms/internal-server-lib": "1.25.0",
|
|
46
|
-
"@paroicms/playground_demo1": "0.68.
|
|
46
|
+
"@paroicms/playground_demo1": "0.68.21",
|
|
47
47
|
"@paroicms/public-anywhere-lib": "1.2.1",
|
|
48
48
|
"@paroicms/public-server-lib": "1.8.0",
|
|
49
49
|
"@paroicms/script-lib": "1.0.7",
|
package/schema.graphql
CHANGED
|
@@ -69,9 +69,17 @@ type Query {
|
|
|
69
69
|
"""
|
|
70
70
|
homeRoutingCluster: String!
|
|
71
71
|
"""
|
|
72
|
+
A stringified `RoutingCluster`, or null when the document is not a cluster root
|
|
73
|
+
"""
|
|
74
|
+
routingCluster(rootNodeId: ID!): String
|
|
75
|
+
"""
|
|
72
76
|
An array of stringified `RoutingCluster` objects ordered from home cluster to target cluster
|
|
73
77
|
"""
|
|
74
78
|
routingClusterAndParents(nodeId: ID!): [String!]!
|
|
79
|
+
incrementalRoutingClusterAndParents(
|
|
80
|
+
nodeId: ID!
|
|
81
|
+
knownRootNodeIds: [ID!]!
|
|
82
|
+
): RoutingClusterHierarchyResult!
|
|
75
83
|
|
|
76
84
|
# Routing Cluster Management
|
|
77
85
|
"""
|
|
@@ -273,6 +281,16 @@ type PagedDocuments {
|
|
|
273
281
|
total: Int!
|
|
274
282
|
}
|
|
275
283
|
|
|
284
|
+
type RoutingClusterHierarchyResult {
|
|
285
|
+
rootNodeIds: [ID!]!
|
|
286
|
+
loadedClusters: [LoadedRoutingCluster!]!
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
type LoadedRoutingCluster {
|
|
290
|
+
rootNodeId: ID!
|
|
291
|
+
cluster: String!
|
|
292
|
+
}
|
|
293
|
+
|
|
276
294
|
type RedirectLNode {
|
|
277
295
|
nodeId: ID!
|
|
278
296
|
language: String!
|