@nordcraft/ssr 1.0.32 → 1.0.34
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/dist/custom-code/codeRefs.js +1 -1
- package/dist/custom-code/codeRefs.js.map +1 -1
- package/dist/rendering/attributes.js +9 -7
- package/dist/rendering/attributes.js.map +1 -1
- package/dist/rendering/components.d.ts +1 -0
- package/dist/rendering/components.js +79 -8
- package/dist/rendering/components.js.map +1 -1
- package/dist/rendering/head.d.ts +2 -1
- package/dist/rendering/head.js +6 -1
- package/dist/rendering/head.js.map +1 -1
- package/dist/utils/routes.d.ts +4 -5
- package/dist/utils/routes.js +7 -9
- package/dist/utils/routes.js.map +1 -1
- package/package.json +3 -3
- package/src/custom-code/codeRefs.ts +3 -1
- package/src/rendering/attributes.ts +6 -5
- package/src/rendering/components.ts +144 -7
- package/src/rendering/head.ts +7 -0
- package/src/utils/routes.ts +14 -12
|
@@ -35,7 +35,7 @@ export function takeReferencedFormulasAndActions({ component, files, }) {
|
|
|
35
35
|
: files.components[name];
|
|
36
36
|
if (!component) {
|
|
37
37
|
// eslint-disable-next-line no-console
|
|
38
|
-
console.warn(`Unable to find component "${nodeLookupKey}"
|
|
38
|
+
console.warn(`Unable to find component "${nodeLookupKey}" for package "${packageName}"`);
|
|
39
39
|
return undefined;
|
|
40
40
|
}
|
|
41
41
|
return component;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeRefs.js","sourceRoot":"","sources":["../../src/custom-code/codeRefs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAMhF,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAA;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAG3D,MAAM,UAAU,gCAAgC,CAAC,EAC/C,SAAS,EACT,KAAK,GAIN;IAUC,0EAA0E;IAC1E,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1B,OAAO;YACL,WAAW,EAAE;gBACX,OAAO,EAAE;oBACP,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;iBACzB;gBACD,QAAQ,EAAE;oBACR,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;iBAC1B;aACF;YACD,GAAG,SAAS,CACV,KAAK,CAAC,QAAQ,IAAI,EAAE,EACpB,CAAC,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;gBACxC,WAAW;gBACX;oBACE,OAAO,EAAE,OAAO,IAAI,EAAE;oBACtB,QAAQ,EAAE,QAAQ,IAAI,EAAE;iBACzB;aACF,CACF;SACF,CAAA;IACH,CAAC;IAED,6EAA6E;IAC7E,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAA;IACpC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;IACrC,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC;QAC1C,SAAS,EAAE,SAAS;QACpB,YAAY,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE;YAClC,MAAM,aAAa,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACrE,MAAM,SAAS,GAAG,WAAW;gBAC3B,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC;gBACjD,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAC1B,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,sCAAsC;gBACtC,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"codeRefs.js","sourceRoot":"","sources":["../../src/custom-code/codeRefs.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,13 +43,15 @@ export function getNodeAttrs({ node, data, component, packageName, env, toddle,
|
|
|
43
43
|
}
|
|
44
44
|
return appliedAttributes;
|
|
45
45
|
}, []);
|
|
46
|
-
const styleVariables = Object.values(node['style-variables'] ?? {}).map((
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
46
|
+
const styleVariables = Object.values(node['style-variables'] ?? {}).map((styleVariable) => {
|
|
47
|
+
return `--${styleVariable.name}: ${String(applyFormula(styleVariable.formula, {
|
|
48
|
+
data,
|
|
49
|
+
component,
|
|
50
|
+
package: packageName,
|
|
51
|
+
env,
|
|
52
|
+
toddle,
|
|
53
|
+
})) + (styleVariable.unit ?? '')}`;
|
|
54
|
+
});
|
|
53
55
|
// Handle the style-attribute independently to merge with style variables
|
|
54
56
|
const styles = [
|
|
55
57
|
...(style
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attributes.js","sourceRoot":"","sources":["../../src/rendering/attributes.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAEtE,MAAM,YAAY,GAAG,IAAI,CAAA;AACzB,MAAM,SAAS,GAAG,IAAI,CAAA;AACtB,MAAM,SAAS,GAAG,IAAI,CAAA;AAEtB,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;AAEtD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAU,EAAE,EAAE;IAC5C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,EAAE,CAAA;IACX,CAAC;IACD,OAAO,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAC/C,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,EAAE;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;AAC9C,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE;IAClC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;AACnE,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE;IAC3C,OAAO,GAAG;SACP,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC;SACxB,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;SACvB,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;SACvB,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC;SACzB,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC;SACxB,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;AAC/B,CAAC,CAAA;AAED,MAAM,UAAU,YAAY,CAAC,EAC3B,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,WAAW,EACX,GAAG,EACH,MAAM,GAQP;IACC,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;IAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAChD,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE;QACvC,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,EAAE;YACpC,IAAI;YACJ,SAAS;YACT,OAAO,EAAE,WAAW;YACpB,GAAG;YACH,MAAM;SACP,CAAC,CAAA;QACF,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,iBAAiB,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC/D,CAAC;QACD,OAAO,iBAAiB,CAAA;IAC1B,CAAC,EACD,EAAE,CACH,CAAA;IACD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CACrE,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"attributes.js","sourceRoot":"","sources":["../../src/rendering/attributes.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,13 @@ import { ToddleComponent } from '@nordcraft/core/dist/component/ToddleComponent'
|
|
|
2
2
|
import { applyFormula } from '@nordcraft/core/dist/formula/formula';
|
|
3
3
|
import { getClassName, toValidClassName, } from '@nordcraft/core/dist/styling/className';
|
|
4
4
|
import { mapValues } from '@nordcraft/core/dist/utils/collections';
|
|
5
|
+
import { getNodeSelector } from '@nordcraft/core/dist/utils/getNodeSelector';
|
|
5
6
|
import { isDefined, toBoolean } from '@nordcraft/core/dist/utils/util';
|
|
6
7
|
import { escapeAttrValue } from 'xss';
|
|
7
8
|
import { VOID_HTML_ELEMENTS } from '../const';
|
|
8
9
|
import { getNodeAttrs, toEncodedText } from './attributes';
|
|
9
|
-
const renderComponent = async ({ apiCache, children, component, data, env, evaluateComponentApis, files, toddle, includedComponents, instance, packageName, projectId, req, updateApiCache, namespace, }) => {
|
|
10
|
-
const renderNode = async ({ id, node, data, packageName, isComponentRootNode = false, namespace, }) => {
|
|
10
|
+
const renderComponent = async ({ path, apiCache, children, component, data, env, evaluateComponentApis, files, toddle, includedComponents, instance, packageName, projectId, req, updateApiCache, addCustomProperty, namespace, }) => {
|
|
11
|
+
const renderNode = async ({ id, path, node, data, packageName, isComponentRootNode = false, namespace, }) => {
|
|
11
12
|
if (!node) {
|
|
12
13
|
return '';
|
|
13
14
|
}
|
|
@@ -25,6 +26,7 @@ const renderComponent = async ({ apiCache, children, component, data, env, evalu
|
|
|
25
26
|
}
|
|
26
27
|
const nodeItems = await Promise.all(items.map((Item, Index) => renderNode({
|
|
27
28
|
id,
|
|
29
|
+
path: Index ? `${path}(${Index})` : path,
|
|
28
30
|
node: { ...node, repeat: undefined },
|
|
29
31
|
data: {
|
|
30
32
|
...data,
|
|
@@ -56,6 +58,7 @@ const renderComponent = async ({ apiCache, children, component, data, env, evalu
|
|
|
56
58
|
else {
|
|
57
59
|
const slotChildren = await Promise.all(node.children.map((child) => renderNode({
|
|
58
60
|
id: child,
|
|
61
|
+
path: `${path}[${node.name ?? 'default'}]`,
|
|
59
62
|
node: component.nodes[child],
|
|
60
63
|
data,
|
|
61
64
|
packageName,
|
|
@@ -97,10 +100,26 @@ const renderComponent = async ({ apiCache, children, component, data, env, evalu
|
|
|
97
100
|
classList += ' ' + toValidClassName(`${key}:${value}`);
|
|
98
101
|
});
|
|
99
102
|
}
|
|
103
|
+
Object.entries(node.customProperties ?? {}).forEach(([customPropertyName, customProperty]) => {
|
|
104
|
+
const value = applyFormula(customProperty.formula, formulaContext);
|
|
105
|
+
if (isDefined(value)) {
|
|
106
|
+
addCustomProperty(getNodeSelector(path), `${customPropertyName}: ${value}`);
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
node.variants?.forEach((variant) => {
|
|
110
|
+
Object.entries(variant.customProperties ?? {}).forEach(([customPropertyName, customProperty]) => {
|
|
111
|
+
// style-variables on variants are always version 2
|
|
112
|
+
const value = applyFormula(customProperty.formula, formulaContext);
|
|
113
|
+
if (isDefined(value)) {
|
|
114
|
+
addCustomProperty(getNodeSelector(path, { variant }), `${customPropertyName}: ${value}`, variant);
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
});
|
|
100
118
|
let innerHTML = '';
|
|
101
119
|
if (['script', 'style'].includes(node.tag.toLocaleLowerCase()) === false) {
|
|
102
|
-
const childNodes = await Promise.all(node.children.map((child) => renderNode({
|
|
120
|
+
const childNodes = await Promise.all(node.children.map((child, i) => renderNode({
|
|
103
121
|
id: child,
|
|
122
|
+
path: `${path}.${i}`,
|
|
104
123
|
namespace,
|
|
105
124
|
node: component.nodes[child],
|
|
106
125
|
data,
|
|
@@ -122,10 +141,10 @@ const renderComponent = async ({ apiCache, children, component, data, env, evalu
|
|
|
122
141
|
: node.tag;
|
|
123
142
|
const nodeClasses = `${classHash} ${classList}`.trim();
|
|
124
143
|
if (!VOID_HTML_ELEMENTS.includes(tag)) {
|
|
125
|
-
return `<${tag} ${nodeAttrs} data-node-id="${escapeAttrValue(id)}" class="${escapeAttrValue(nodeClasses)}">${innerHTML}</${tag}>`;
|
|
144
|
+
return `<${tag} ${nodeAttrs} data-id="${path}" data-node-id="${escapeAttrValue(id)}" class="${escapeAttrValue(nodeClasses)}">${innerHTML}</${tag}>`;
|
|
126
145
|
}
|
|
127
146
|
else {
|
|
128
|
-
return `<${tag} ${nodeAttrs} data-node-id="${escapeAttrValue(id)}" class="${escapeAttrValue(nodeClasses)}" />`;
|
|
147
|
+
return `<${tag} ${nodeAttrs} data-id="${path}" data-node-id="${escapeAttrValue(id)}" class="${escapeAttrValue(nodeClasses)}" />`;
|
|
129
148
|
}
|
|
130
149
|
}
|
|
131
150
|
case 'component': {
|
|
@@ -203,8 +222,9 @@ const renderComponent = async ({ apiCache, children, component, data, env, evalu
|
|
|
203
222
|
apiCache,
|
|
204
223
|
updateApiCache,
|
|
205
224
|
});
|
|
206
|
-
const childNodes = await Promise.all(node.children.map((child) => renderNode({
|
|
225
|
+
const childNodes = await Promise.all(node.children.map((child, i) => renderNode({
|
|
207
226
|
id: child,
|
|
227
|
+
path: `${path}.${i}`,
|
|
208
228
|
namespace,
|
|
209
229
|
node: component.nodes[child],
|
|
210
230
|
data: {
|
|
@@ -268,7 +288,30 @@ const renderComponent = async ({ apiCache, children, component, data, env, evalu
|
|
|
268
288
|
component.nodes[node.children[i]]?.slot ?? 'default';
|
|
269
289
|
children[slotName] = `${children[slotName] ?? ''} ${childNode}`;
|
|
270
290
|
});
|
|
291
|
+
// Add extra instance styling for each style-variable
|
|
292
|
+
Object.entries(node.customProperties ?? {}).forEach(([customPropertyName, customProperty]) => {
|
|
293
|
+
const value = applyFormula(customProperty.formula, formulaContext);
|
|
294
|
+
if (isDefined(value)) {
|
|
295
|
+
addCustomProperty(getNodeSelector(path, {
|
|
296
|
+
componentName: component.name,
|
|
297
|
+
nodeId: id,
|
|
298
|
+
}), `${customPropertyName}: ${value}`);
|
|
299
|
+
}
|
|
300
|
+
});
|
|
301
|
+
node.variants?.forEach((variant) => {
|
|
302
|
+
Object.entries(variant.customProperties ?? {}).forEach(([customPropertyName, customProperty]) => {
|
|
303
|
+
const value = applyFormula(customProperty.formula, formulaContext);
|
|
304
|
+
if (isDefined(value)) {
|
|
305
|
+
addCustomProperty(getNodeSelector(path, {
|
|
306
|
+
componentName: component.name,
|
|
307
|
+
nodeId: id,
|
|
308
|
+
variant,
|
|
309
|
+
}), `${customPropertyName}: ${value}`, variant);
|
|
310
|
+
}
|
|
311
|
+
});
|
|
312
|
+
});
|
|
271
313
|
return createComponent({
|
|
314
|
+
path,
|
|
272
315
|
attrs,
|
|
273
316
|
component: childComponent,
|
|
274
317
|
contexts,
|
|
@@ -285,6 +328,7 @@ const renderComponent = async ({ apiCache, children, component, data, env, evalu
|
|
|
285
328
|
files,
|
|
286
329
|
apiCache,
|
|
287
330
|
updateApiCache,
|
|
331
|
+
addCustomProperty,
|
|
288
332
|
projectId,
|
|
289
333
|
namespace,
|
|
290
334
|
evaluateComponentApis,
|
|
@@ -295,6 +339,7 @@ const renderComponent = async ({ apiCache, children, component, data, env, evalu
|
|
|
295
339
|
};
|
|
296
340
|
return renderNode({
|
|
297
341
|
id: 'root',
|
|
342
|
+
path,
|
|
298
343
|
node: component.nodes.root,
|
|
299
344
|
data,
|
|
300
345
|
packageName,
|
|
@@ -302,7 +347,7 @@ const renderComponent = async ({ apiCache, children, component, data, env, evalu
|
|
|
302
347
|
namespace,
|
|
303
348
|
});
|
|
304
349
|
};
|
|
305
|
-
const createComponent = async ({ apiCache, apis, attrs, children, component, contexts, env, evaluateComponentApis, files, formulaContext, includedComponents, instance, packageName, projectId, req, updateApiCache, namespace, }) => {
|
|
350
|
+
const createComponent = async ({ path, apiCache, apis, attrs, children, component, contexts, env, evaluateComponentApis, files, formulaContext, includedComponents, instance, packageName, projectId, req, updateApiCache, addCustomProperty, namespace, }) => {
|
|
306
351
|
const data = {
|
|
307
352
|
Location: formulaContext.data.Location,
|
|
308
353
|
Attributes: attrs,
|
|
@@ -332,6 +377,7 @@ const createComponent = async ({ apiCache, apis, attrs, children, component, con
|
|
|
332
377
|
};
|
|
333
378
|
return renderComponent({
|
|
334
379
|
apiCache,
|
|
380
|
+
path,
|
|
335
381
|
children,
|
|
336
382
|
component,
|
|
337
383
|
data,
|
|
@@ -346,6 +392,7 @@ const createComponent = async ({ apiCache, apis, attrs, children, component, con
|
|
|
346
392
|
req,
|
|
347
393
|
toddle: formulaContext.toddle,
|
|
348
394
|
updateApiCache,
|
|
395
|
+
addCustomProperty,
|
|
349
396
|
});
|
|
350
397
|
};
|
|
351
398
|
/**
|
|
@@ -354,6 +401,22 @@ const createComponent = async ({ apiCache, apis, attrs, children, component, con
|
|
|
354
401
|
export const renderPageBody = async ({ component, env, evaluateComponentApis, files, formulaContext, includedComponents, req, projectId, }) => {
|
|
355
402
|
const apiCache = {};
|
|
356
403
|
const updateApiCache = (key, value) => (apiCache[key] = value);
|
|
404
|
+
const customProperties = new Map();
|
|
405
|
+
const addCustomProperty = (selector, rule, options) => {
|
|
406
|
+
selector = options?.startingStyle
|
|
407
|
+
? `${selector} { @starting-style { __RULES__ } }`
|
|
408
|
+
: `${selector} { __RULES__ }`;
|
|
409
|
+
if (options?.mediaQuery) {
|
|
410
|
+
selector = `@media (${Object.entries(options.mediaQuery)
|
|
411
|
+
.map(([key, value]) => `${key}: ${value}`)
|
|
412
|
+
.filter(Boolean)
|
|
413
|
+
.join(') and (')}) { ${selector} }`;
|
|
414
|
+
}
|
|
415
|
+
if (!customProperties.has(selector)) {
|
|
416
|
+
customProperties.set(selector, new Set());
|
|
417
|
+
}
|
|
418
|
+
customProperties.get(selector)?.add(rule);
|
|
419
|
+
};
|
|
357
420
|
const apis = await evaluateComponentApis({
|
|
358
421
|
component,
|
|
359
422
|
formulaContext,
|
|
@@ -363,6 +426,7 @@ export const renderPageBody = async ({ component, env, evaluateComponentApis, fi
|
|
|
363
426
|
});
|
|
364
427
|
formulaContext.data.Apis = apis;
|
|
365
428
|
const html = await renderComponent({
|
|
429
|
+
path: '0',
|
|
366
430
|
apiCache,
|
|
367
431
|
component,
|
|
368
432
|
data: formulaContext.data,
|
|
@@ -376,7 +440,14 @@ export const renderPageBody = async ({ component, env, evaluateComponentApis, fi
|
|
|
376
440
|
req,
|
|
377
441
|
toddle: formulaContext.toddle,
|
|
378
442
|
updateApiCache,
|
|
443
|
+
addCustomProperty,
|
|
379
444
|
});
|
|
380
|
-
return {
|
|
445
|
+
return {
|
|
446
|
+
html,
|
|
447
|
+
apiCache,
|
|
448
|
+
customProperties: [...customProperties]
|
|
449
|
+
.map(([selector, vars]) => selector.replace('__RULES__', Array.from(vars).join(';\n')))
|
|
450
|
+
.toReversed(),
|
|
451
|
+
};
|
|
381
452
|
};
|
|
382
453
|
//# sourceMappingURL=components.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/rendering/components.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/rendering/components.ts"],"names":[],"mappings":"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"}
|
package/dist/rendering/head.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export type HeadItemType = `${HeadTagTypes}:${Text}` | 'title';
|
|
|
8
8
|
/**
|
|
9
9
|
* Returns all head items for a given page
|
|
10
10
|
*/
|
|
11
|
-
export declare const getHeadItems: ({ cacheBuster, context, cssBasePath, page, resetStylesheetPath, pageStylesheetPath, files, project, theme, url, }: {
|
|
11
|
+
export declare const getHeadItems: ({ cacheBuster, context, cssBasePath, page, resetStylesheetPath, pageStylesheetPath, files, project, theme, url, customProperties, }: {
|
|
12
12
|
cacheBuster?: string;
|
|
13
13
|
context: FormulaContext;
|
|
14
14
|
cssBasePath?: string;
|
|
@@ -19,6 +19,7 @@ export declare const getHeadItems: ({ cacheBuster, context, cssBasePath, page, r
|
|
|
19
19
|
project: ToddleProject;
|
|
20
20
|
theme: OldTheme | Theme;
|
|
21
21
|
url: URL;
|
|
22
|
+
customProperties: ReadonlyArray<string>;
|
|
22
23
|
}) => Map<HeadItemType, string>;
|
|
23
24
|
export declare const renderHeadItems: ({ headItems, ordering, }: {
|
|
24
25
|
headItems: Map<string, string>;
|
package/dist/rendering/head.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { HeadTagTypes } from '@nordcraft/core/dist/component/component.types';
|
|
2
2
|
import { applyFormula } from '@nordcraft/core/dist/formula/formula';
|
|
3
|
+
import { CUSTOM_PROPERTIES_STYLESHEET_ID } from '@nordcraft/core/dist/styling/theme.const';
|
|
3
4
|
import { easySort } from '@nordcraft/core/dist/utils/collections';
|
|
4
5
|
import { validateUrl } from '@nordcraft/core/dist/utils/url';
|
|
5
6
|
import { isDefined } from '@nordcraft/core/dist/utils/util';
|
|
@@ -13,7 +14,7 @@ import { defaultSpeculationRules } from './speculation';
|
|
|
13
14
|
/**
|
|
14
15
|
* Returns all head items for a given page
|
|
15
16
|
*/
|
|
16
|
-
export const getHeadItems = ({ cacheBuster, context, cssBasePath = '/.toddle/fonts/stylesheet/css2', page, resetStylesheetPath = '/_static/reset.css', pageStylesheetPath = `/.toddle/stylesheet/${page.name}.css`, files, project, theme, url, }) => {
|
|
17
|
+
export const getHeadItems = ({ cacheBuster, context, cssBasePath = '/.toddle/fonts/stylesheet/css2', page, resetStylesheetPath = '/_static/reset.css', pageStylesheetPath = `/.toddle/stylesheet/${page.name}.css`, files, project, theme, url, customProperties, }) => {
|
|
17
18
|
const pageInfo = page.route?.info;
|
|
18
19
|
const title = getPageTitle({
|
|
19
20
|
component: page,
|
|
@@ -74,6 +75,10 @@ export const getHeadItems = ({ cacheBuster, context, cssBasePath = '/.toddle/fon
|
|
|
74
75
|
'link:page',
|
|
75
76
|
`<link rel="stylesheet" fetchpriority="high" href="${escapeAttrValue(urlWithCacheBuster(pageStylesheetPath, cacheBuster))}" />`,
|
|
76
77
|
],
|
|
78
|
+
[
|
|
79
|
+
'style:variables',
|
|
80
|
+
`<style id="${CUSTOM_PROPERTIES_STYLESHEET_ID}">${customProperties.join('\n')}</style>`,
|
|
81
|
+
],
|
|
77
82
|
...preloadFonts,
|
|
78
83
|
// Initialize default head items (meta + links)
|
|
79
84
|
// these might be overwritten by custom tags later
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"head.js","sourceRoot":"","sources":["../../src/rendering/head.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gDAAgD,CAAA;AAG7E,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAA;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAEzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAKvD;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAC3B,WAAW,EACX,OAAO,EACP,WAAW,GAAG,gCAAgC,EAC9C,IAAI,EACJ,mBAAmB,GAAG,oBAAoB,EAC1C,kBAAkB,GAAG,uBAAuB,IAAI,CAAC,IAAI,MAAM,EAC3D,KAAK,EACL,OAAO,EACP,KAAK,EACL,GAAG,
|
|
1
|
+
{"version":3,"file":"head.js","sourceRoot":"","sources":["../../src/rendering/head.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/routes.d.ts
CHANGED
|
@@ -7,11 +7,10 @@ interface Routes {
|
|
|
7
7
|
}>;
|
|
8
8
|
routes: Record<string, Route>;
|
|
9
9
|
}
|
|
10
|
-
type
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
}>;
|
|
10
|
+
export type ProjectFilesWithCustomCode = ProjectFiles & {
|
|
11
|
+
customCode: boolean;
|
|
12
|
+
};
|
|
13
|
+
export type Files = Record<string, ProjectFilesWithCustomCode>;
|
|
15
14
|
export declare const splitRoutes: (json: {
|
|
16
15
|
files: ProjectFiles;
|
|
17
16
|
project: ToddleProject;
|
package/dist/utils/routes.js
CHANGED
|
@@ -60,15 +60,13 @@ export const splitRoutes = (json) => {
|
|
|
60
60
|
isToddleFormula(formula));
|
|
61
61
|
}
|
|
62
62
|
filesMap[name] = {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
packages: files.packages,
|
|
71
|
-
},
|
|
63
|
+
customCode,
|
|
64
|
+
config: files.config,
|
|
65
|
+
themes: files.themes,
|
|
66
|
+
components: Object.fromEntries(components.map((c) => [c.name, removeTestData(c)])),
|
|
67
|
+
formulas,
|
|
68
|
+
// TODO: Only include relevant components, formulas and actions from packages
|
|
69
|
+
packages: files.packages,
|
|
72
70
|
};
|
|
73
71
|
}
|
|
74
72
|
}
|
package/dist/utils/routes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/utils/routes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,EACL,eAAe,GAEhB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AACzE,OAAO,EAAE,KAAK,IAAI,YAAY,EAAE,MAAM,0CAA0C,CAAA;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,EACL,sBAAsB,EACtB,aAAa,EACb,gCAAgC,GACjC,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/utils/routes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,EACL,eAAe,GAEhB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AACzE,OAAO,EAAE,KAAK,IAAI,YAAY,EAAE,MAAM,0CAA0C,CAAA;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,EACL,sBAAsB,EACtB,aAAa,EACb,gCAAgC,GACjC,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AActD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAG3B,EAMC,EAAE;IACF,MAAM,QAAQ,GAAU,EAAE,CAAA;IAC1B,MAAM,SAAS,GAA2B,EAAE,CAAA;IAC5C,MAAM,OAAO,GAA2B,EAAE,CAAA;IAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;IAEtB,MAAM,MAAM,GAAW;QACrB,MAAM,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE;QACnC,KAAK,EAAE,EAAE;KACV,CAAA;IACD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE;QAC7D,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC/B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG;oBACnB,IAAI;oBACJ,KAAK,EAAE;wBACL,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI;wBAC1B,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,KAAK;qBAC7B;iBACF,CAAA;gBACD,MAAM,UAAU,GAAG,sBAAsB,CAAC;oBACxC,IAAI,EAAE,SAAS;oBACf,iBAAiB,EAAE,KAAK,CAAC,UAAU;oBACnC,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,WAAW,EAAE,IAAI;iBAClB,CAAC,CAAA;gBACF,MAAM,KAAK,GACT,CAAC,KAAK,CAAC,MAAM;oBACX,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBAChC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,YAAY,CAAA;gBAC1C,MAAM,MAAM,GAAG,gBAAgB,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE;oBAC5D,4CAA4C;oBAC5C,iBAAiB,EAAE,KAAK;oBACxB,kEAAkE;oBAClE,eAAe,EAAE,KAAK;iBACvB,CAAC,CAAA;gBACF,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAA;gBACxB,IAAI,UAAU,GAAG,KAAK,CAAA;gBACtB,IAAI,QAAQ,GAA0C,EAAE,CAAA;gBACxD,IAAI,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;oBACpC,UAAU,GAAG,IAAI,CAAA;oBACjB,MAAM,IAAI,GAAG,gCAAgC,CAAC;wBAC5C,SAAS;wBACT,KAAK;qBACN,CAAC,CAAA;oBACF,MAAM,MAAM,GAAG,sBAAsB,CAAC;wBACpC,IAAI;wBACJ,aAAa,EAAE,SAAS,CAAC,IAAI;wBAC7B,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;qBACjC,CAAC,CAAA;oBACF,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAA;oBACtB,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE;oBAClE,mDAAmD;oBACnD,eAAe,CAAC,OAAO,CAAC,CACzB,CAAA;gBACH,CAAC;gBAED,QAAQ,CAAC,IAAI,CAAC,GAAG;oBACf,UAAU;oBACV,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,UAAU,EAAE,MAAM,CAAC,WAAW,CAC5B,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CACnD;oBACD,QAAQ;oBACR,6EAA6E;oBAC7E,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB,CAAA;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,MAAM;QACN,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE;KACzD,CAAA;AACH,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -13,10 +13,10 @@
|
|
|
13
13
|
"main": "dist/index.js",
|
|
14
14
|
"types": "dist/index.d.ts",
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@nordcraft/core": "1.0.
|
|
17
|
-
"@nordcraft/std-lib": "1.0.
|
|
16
|
+
"@nordcraft/core": "1.0.34",
|
|
17
|
+
"@nordcraft/std-lib": "1.0.34",
|
|
18
18
|
"cookie": "1.0.2",
|
|
19
19
|
"xss": "1.0.15"
|
|
20
20
|
},
|
|
21
|
-
"version": "1.0.
|
|
21
|
+
"version": "1.0.34"
|
|
22
22
|
}
|
|
@@ -61,7 +61,9 @@ export function takeReferencedFormulasAndActions({
|
|
|
61
61
|
: files.components[name]
|
|
62
62
|
if (!component) {
|
|
63
63
|
// eslint-disable-next-line no-console
|
|
64
|
-
console.warn(
|
|
64
|
+
console.warn(
|
|
65
|
+
`Unable to find component "${nodeLookupKey}" for package "${packageName}"`,
|
|
66
|
+
)
|
|
65
67
|
return undefined
|
|
66
68
|
}
|
|
67
69
|
return component
|
|
@@ -77,18 +77,19 @@ export function getNodeAttrs({
|
|
|
77
77
|
[],
|
|
78
78
|
)
|
|
79
79
|
const styleVariables = Object.values(node['style-variables'] ?? {}).map(
|
|
80
|
-
(
|
|
81
|
-
`--${name}: ${
|
|
80
|
+
(styleVariable) => {
|
|
81
|
+
return `--${styleVariable.name}: ${
|
|
82
82
|
String(
|
|
83
|
-
applyFormula(formula, {
|
|
83
|
+
applyFormula(styleVariable.formula, {
|
|
84
84
|
data,
|
|
85
85
|
component,
|
|
86
86
|
package: packageName,
|
|
87
87
|
env,
|
|
88
88
|
toddle,
|
|
89
89
|
}),
|
|
90
|
-
) + (unit ?? '')
|
|
91
|
-
}
|
|
90
|
+
) + (styleVariable.unit ?? '')
|
|
91
|
+
}`
|
|
92
|
+
},
|
|
92
93
|
)
|
|
93
94
|
|
|
94
95
|
// Handle the style-attribute independently to merge with style variables
|
|
@@ -5,6 +5,7 @@ import type {
|
|
|
5
5
|
import type {
|
|
6
6
|
Component,
|
|
7
7
|
ComponentData,
|
|
8
|
+
MediaQuery,
|
|
8
9
|
NodeModel,
|
|
9
10
|
SupportedNamespaces,
|
|
10
11
|
} from '@nordcraft/core/dist/component/component.types'
|
|
@@ -19,6 +20,7 @@ import {
|
|
|
19
20
|
toValidClassName,
|
|
20
21
|
} from '@nordcraft/core/dist/styling/className'
|
|
21
22
|
import { mapValues } from '@nordcraft/core/dist/utils/collections'
|
|
23
|
+
import { getNodeSelector } from '@nordcraft/core/dist/utils/getNodeSelector'
|
|
22
24
|
import { isDefined, toBoolean } from '@nordcraft/core/dist/utils/util'
|
|
23
25
|
import { escapeAttrValue } from 'xss'
|
|
24
26
|
import { VOID_HTML_ELEMENTS } from '../const'
|
|
@@ -26,7 +28,10 @@ import type { ProjectFiles } from '../ssr.types'
|
|
|
26
28
|
import type { ApiCache, ApiEvaluator } from './api'
|
|
27
29
|
import { getNodeAttrs, toEncodedText } from './attributes'
|
|
28
30
|
|
|
31
|
+
type CustomPropertyRule = `--${string}: ${string}`
|
|
32
|
+
|
|
29
33
|
const renderComponent = async ({
|
|
34
|
+
path,
|
|
30
35
|
apiCache,
|
|
31
36
|
children,
|
|
32
37
|
component,
|
|
@@ -41,8 +46,10 @@ const renderComponent = async ({
|
|
|
41
46
|
projectId,
|
|
42
47
|
req,
|
|
43
48
|
updateApiCache,
|
|
49
|
+
addCustomProperty,
|
|
44
50
|
namespace,
|
|
45
51
|
}: {
|
|
52
|
+
path: string
|
|
46
53
|
apiCache: ApiCache
|
|
47
54
|
children?: Record<string, string>
|
|
48
55
|
component: Component
|
|
@@ -56,11 +63,20 @@ const renderComponent = async ({
|
|
|
56
63
|
packageName: string | undefined
|
|
57
64
|
projectId: string
|
|
58
65
|
req: Request
|
|
59
|
-
namespace?: SupportedNamespaces
|
|
60
66
|
updateApiCache: (key: string, value: ApiStatus) => void
|
|
67
|
+
addCustomProperty: (
|
|
68
|
+
selector: string,
|
|
69
|
+
rule: CustomPropertyRule,
|
|
70
|
+
options?: {
|
|
71
|
+
mediaQuery?: MediaQuery
|
|
72
|
+
startingStyle?: boolean
|
|
73
|
+
},
|
|
74
|
+
) => void
|
|
75
|
+
namespace?: SupportedNamespaces
|
|
61
76
|
}): Promise<string> => {
|
|
62
77
|
const renderNode = async ({
|
|
63
78
|
id,
|
|
79
|
+
path,
|
|
64
80
|
node,
|
|
65
81
|
data,
|
|
66
82
|
packageName,
|
|
@@ -68,6 +84,7 @@ const renderComponent = async ({
|
|
|
68
84
|
namespace,
|
|
69
85
|
}: {
|
|
70
86
|
id: string
|
|
87
|
+
path: string
|
|
71
88
|
node: NodeModel | undefined
|
|
72
89
|
data: ComponentData
|
|
73
90
|
packageName: string | undefined
|
|
@@ -95,6 +112,7 @@ const renderComponent = async ({
|
|
|
95
112
|
items.map((Item, Index) =>
|
|
96
113
|
renderNode({
|
|
97
114
|
id,
|
|
115
|
+
path: Index ? `${path}(${Index})` : path,
|
|
98
116
|
node: { ...node, repeat: undefined },
|
|
99
117
|
data: {
|
|
100
118
|
...data,
|
|
@@ -135,6 +153,7 @@ const renderComponent = async ({
|
|
|
135
153
|
node.children.map((child) =>
|
|
136
154
|
renderNode({
|
|
137
155
|
id: child,
|
|
156
|
+
path: `${path}[${node.name ?? 'default'}]`,
|
|
138
157
|
node: component.nodes[child],
|
|
139
158
|
data,
|
|
140
159
|
packageName,
|
|
@@ -181,15 +200,44 @@ const renderComponent = async ({
|
|
|
181
200
|
classList += ' ' + toValidClassName(`${key}:${value}`)
|
|
182
201
|
})
|
|
183
202
|
}
|
|
203
|
+
Object.entries(node.customProperties ?? {}).forEach(
|
|
204
|
+
([customPropertyName, customProperty]) => {
|
|
205
|
+
const value = applyFormula(customProperty.formula, formulaContext)
|
|
206
|
+
if (isDefined(value)) {
|
|
207
|
+
addCustomProperty(
|
|
208
|
+
getNodeSelector(path),
|
|
209
|
+
`${customPropertyName}: ${value}` as CustomPropertyRule,
|
|
210
|
+
)
|
|
211
|
+
}
|
|
212
|
+
},
|
|
213
|
+
)
|
|
214
|
+
|
|
215
|
+
node.variants?.forEach((variant) => {
|
|
216
|
+
Object.entries(variant.customProperties ?? {}).forEach(
|
|
217
|
+
([customPropertyName, customProperty]) => {
|
|
218
|
+
// style-variables on variants are always version 2
|
|
219
|
+
const value = applyFormula(customProperty.formula, formulaContext)
|
|
220
|
+
if (isDefined(value)) {
|
|
221
|
+
addCustomProperty(
|
|
222
|
+
getNodeSelector(path, { variant }),
|
|
223
|
+
`${customPropertyName}: ${value}` as CustomPropertyRule,
|
|
224
|
+
variant,
|
|
225
|
+
)
|
|
226
|
+
}
|
|
227
|
+
},
|
|
228
|
+
)
|
|
229
|
+
})
|
|
230
|
+
|
|
184
231
|
let innerHTML = ''
|
|
185
232
|
|
|
186
233
|
if (
|
|
187
234
|
['script', 'style'].includes(node.tag.toLocaleLowerCase()) === false
|
|
188
235
|
) {
|
|
189
236
|
const childNodes = await Promise.all(
|
|
190
|
-
node.children.map((child) =>
|
|
237
|
+
node.children.map((child, i) =>
|
|
191
238
|
renderNode({
|
|
192
239
|
id: child,
|
|
240
|
+
path: `${path}.${i}`,
|
|
193
241
|
namespace,
|
|
194
242
|
node: component.nodes[child],
|
|
195
243
|
data,
|
|
@@ -214,11 +262,11 @@ const renderComponent = async ({
|
|
|
214
262
|
: node.tag
|
|
215
263
|
const nodeClasses = `${classHash} ${classList}`.trim()
|
|
216
264
|
if (!VOID_HTML_ELEMENTS.includes(tag)) {
|
|
217
|
-
return `<${tag} ${nodeAttrs} data-node-id="${escapeAttrValue(
|
|
265
|
+
return `<${tag} ${nodeAttrs} data-id="${path}" data-node-id="${escapeAttrValue(
|
|
218
266
|
id,
|
|
219
267
|
)}" class="${escapeAttrValue(nodeClasses)}">${innerHTML}</${tag}>`
|
|
220
268
|
} else {
|
|
221
|
-
return `<${tag} ${nodeAttrs} data-node-id="${escapeAttrValue(
|
|
269
|
+
return `<${tag} ${nodeAttrs} data-id="${path}" data-node-id="${escapeAttrValue(
|
|
222
270
|
id,
|
|
223
271
|
)}" class="${escapeAttrValue(nodeClasses)}" />`
|
|
224
272
|
}
|
|
@@ -318,9 +366,10 @@ const renderComponent = async ({
|
|
|
318
366
|
})
|
|
319
367
|
|
|
320
368
|
const childNodes = await Promise.all(
|
|
321
|
-
node.children.map((child) =>
|
|
369
|
+
node.children.map((child, i) =>
|
|
322
370
|
renderNode({
|
|
323
371
|
id: child,
|
|
372
|
+
path: `${path}.${i}`,
|
|
324
373
|
namespace,
|
|
325
374
|
node: component.nodes[child],
|
|
326
375
|
data: {
|
|
@@ -397,7 +446,43 @@ const renderComponent = async ({
|
|
|
397
446
|
children[slotName] = `${children[slotName] ?? ''} ${childNode}`
|
|
398
447
|
})
|
|
399
448
|
|
|
449
|
+
// Add extra instance styling for each style-variable
|
|
450
|
+
Object.entries(node.customProperties ?? {}).forEach(
|
|
451
|
+
([customPropertyName, customProperty]) => {
|
|
452
|
+
const value = applyFormula(customProperty.formula, formulaContext)
|
|
453
|
+
if (isDefined(value)) {
|
|
454
|
+
addCustomProperty(
|
|
455
|
+
getNodeSelector(path, {
|
|
456
|
+
componentName: component.name,
|
|
457
|
+
nodeId: id,
|
|
458
|
+
}),
|
|
459
|
+
`${customPropertyName}: ${value}` as CustomPropertyRule,
|
|
460
|
+
)
|
|
461
|
+
}
|
|
462
|
+
},
|
|
463
|
+
)
|
|
464
|
+
|
|
465
|
+
node.variants?.forEach((variant) => {
|
|
466
|
+
Object.entries(variant.customProperties ?? {}).forEach(
|
|
467
|
+
([customPropertyName, customProperty]) => {
|
|
468
|
+
const value = applyFormula(customProperty.formula, formulaContext)
|
|
469
|
+
if (isDefined(value)) {
|
|
470
|
+
addCustomProperty(
|
|
471
|
+
getNodeSelector(path, {
|
|
472
|
+
componentName: component.name,
|
|
473
|
+
nodeId: id,
|
|
474
|
+
variant,
|
|
475
|
+
}),
|
|
476
|
+
`${customPropertyName}: ${value}` as CustomPropertyRule,
|
|
477
|
+
variant,
|
|
478
|
+
)
|
|
479
|
+
}
|
|
480
|
+
},
|
|
481
|
+
)
|
|
482
|
+
})
|
|
483
|
+
|
|
400
484
|
return createComponent({
|
|
485
|
+
path,
|
|
401
486
|
attrs,
|
|
402
487
|
component: childComponent,
|
|
403
488
|
contexts,
|
|
@@ -416,6 +501,7 @@ const renderComponent = async ({
|
|
|
416
501
|
files,
|
|
417
502
|
apiCache,
|
|
418
503
|
updateApiCache,
|
|
504
|
+
addCustomProperty,
|
|
419
505
|
projectId,
|
|
420
506
|
namespace,
|
|
421
507
|
evaluateComponentApis,
|
|
@@ -426,6 +512,7 @@ const renderComponent = async ({
|
|
|
426
512
|
}
|
|
427
513
|
return renderNode({
|
|
428
514
|
id: 'root',
|
|
515
|
+
path,
|
|
429
516
|
node: component.nodes.root,
|
|
430
517
|
data,
|
|
431
518
|
packageName,
|
|
@@ -435,6 +522,7 @@ const renderComponent = async ({
|
|
|
435
522
|
}
|
|
436
523
|
|
|
437
524
|
const createComponent = async ({
|
|
525
|
+
path,
|
|
438
526
|
apiCache,
|
|
439
527
|
apis,
|
|
440
528
|
attrs,
|
|
@@ -451,8 +539,10 @@ const createComponent = async ({
|
|
|
451
539
|
projectId,
|
|
452
540
|
req,
|
|
453
541
|
updateApiCache,
|
|
542
|
+
addCustomProperty,
|
|
454
543
|
namespace,
|
|
455
544
|
}: {
|
|
545
|
+
path: string
|
|
456
546
|
apiCache: ApiCache
|
|
457
547
|
apis: Record<
|
|
458
548
|
string,
|
|
@@ -474,8 +564,16 @@ const createComponent = async ({
|
|
|
474
564
|
packageName: string | undefined
|
|
475
565
|
projectId: string
|
|
476
566
|
req: Request
|
|
477
|
-
updateApiCache: (key: string, value: ApiStatus) => void
|
|
478
567
|
namespace?: SupportedNamespaces
|
|
568
|
+
updateApiCache: (key: string, value: ApiStatus) => void
|
|
569
|
+
addCustomProperty: (
|
|
570
|
+
selector: string,
|
|
571
|
+
rule: CustomPropertyRule,
|
|
572
|
+
options?: {
|
|
573
|
+
mediaQuery?: MediaQuery
|
|
574
|
+
startingStyle?: boolean
|
|
575
|
+
},
|
|
576
|
+
) => void
|
|
479
577
|
}): Promise<string> => {
|
|
480
578
|
const data: ComponentData = {
|
|
481
579
|
Location: formulaContext.data.Location,
|
|
@@ -509,6 +607,7 @@ const createComponent = async ({
|
|
|
509
607
|
|
|
510
608
|
return renderComponent({
|
|
511
609
|
apiCache,
|
|
610
|
+
path,
|
|
512
611
|
children,
|
|
513
612
|
component,
|
|
514
613
|
data,
|
|
@@ -523,6 +622,7 @@ const createComponent = async ({
|
|
|
523
622
|
req,
|
|
524
623
|
toddle: formulaContext.toddle,
|
|
525
624
|
updateApiCache,
|
|
625
|
+
addCustomProperty,
|
|
526
626
|
})
|
|
527
627
|
}
|
|
528
628
|
|
|
@@ -551,6 +651,33 @@ export const renderPageBody = async ({
|
|
|
551
651
|
const apiCache: ApiCache = {}
|
|
552
652
|
const updateApiCache = (key: string, value: ApiStatus) =>
|
|
553
653
|
(apiCache[key] = value)
|
|
654
|
+
const customProperties: Map<string, Set<string>> = new Map()
|
|
655
|
+
const addCustomProperty = (
|
|
656
|
+
selector: string,
|
|
657
|
+
rule: CustomPropertyRule,
|
|
658
|
+
options?: {
|
|
659
|
+
mediaQuery?: MediaQuery
|
|
660
|
+
startingStyle?: boolean
|
|
661
|
+
},
|
|
662
|
+
) => {
|
|
663
|
+
selector = options?.startingStyle
|
|
664
|
+
? `${selector} { @starting-style { __RULES__ } }`
|
|
665
|
+
: `${selector} { __RULES__ }`
|
|
666
|
+
|
|
667
|
+
if (options?.mediaQuery) {
|
|
668
|
+
selector = `@media (${Object.entries(options.mediaQuery)
|
|
669
|
+
.map(([key, value]) => `${key}: ${value}`)
|
|
670
|
+
.filter(Boolean)
|
|
671
|
+
.join(') and (')}) { ${selector} }`
|
|
672
|
+
}
|
|
673
|
+
|
|
674
|
+
if (!customProperties.has(selector)) {
|
|
675
|
+
customProperties.set(selector, new Set())
|
|
676
|
+
}
|
|
677
|
+
|
|
678
|
+
customProperties.get(selector)?.add(rule)
|
|
679
|
+
}
|
|
680
|
+
|
|
554
681
|
const apis = await evaluateComponentApis({
|
|
555
682
|
component,
|
|
556
683
|
formulaContext,
|
|
@@ -561,6 +688,7 @@ export const renderPageBody = async ({
|
|
|
561
688
|
formulaContext.data.Apis = apis
|
|
562
689
|
|
|
563
690
|
const html = await renderComponent({
|
|
691
|
+
path: '0',
|
|
564
692
|
apiCache,
|
|
565
693
|
component,
|
|
566
694
|
data: formulaContext.data,
|
|
@@ -574,6 +702,15 @@ export const renderPageBody = async ({
|
|
|
574
702
|
req,
|
|
575
703
|
toddle: formulaContext.toddle,
|
|
576
704
|
updateApiCache,
|
|
705
|
+
addCustomProperty,
|
|
577
706
|
})
|
|
578
|
-
return {
|
|
707
|
+
return {
|
|
708
|
+
html,
|
|
709
|
+
apiCache,
|
|
710
|
+
customProperties: [...customProperties]
|
|
711
|
+
.map(([selector, vars]) =>
|
|
712
|
+
selector.replace('__RULES__', Array.from(vars).join(';\n')),
|
|
713
|
+
)
|
|
714
|
+
.toReversed(),
|
|
715
|
+
}
|
|
579
716
|
}
|
package/src/rendering/head.ts
CHANGED
|
@@ -4,6 +4,7 @@ import type { ToddleComponent } from '@nordcraft/core/dist/component/ToddleCompo
|
|
|
4
4
|
import type { FormulaContext } from '@nordcraft/core/dist/formula/formula'
|
|
5
5
|
import { applyFormula } from '@nordcraft/core/dist/formula/formula'
|
|
6
6
|
import type { OldTheme, Theme } from '@nordcraft/core/dist/styling/theme'
|
|
7
|
+
import { CUSTOM_PROPERTIES_STYLESHEET_ID } from '@nordcraft/core/dist/styling/theme.const'
|
|
7
8
|
import { easySort } from '@nordcraft/core/dist/utils/collections'
|
|
8
9
|
import { validateUrl } from '@nordcraft/core/dist/utils/url'
|
|
9
10
|
import { isDefined } from '@nordcraft/core/dist/utils/util'
|
|
@@ -33,6 +34,7 @@ export const getHeadItems = ({
|
|
|
33
34
|
project,
|
|
34
35
|
theme,
|
|
35
36
|
url,
|
|
37
|
+
customProperties,
|
|
36
38
|
}: {
|
|
37
39
|
// Optional cache buster for reset stylesheet + manifest url. Could be a commit sha for instance
|
|
38
40
|
cacheBuster?: string
|
|
@@ -45,6 +47,7 @@ export const getHeadItems = ({
|
|
|
45
47
|
project: ToddleProject
|
|
46
48
|
theme: OldTheme | Theme
|
|
47
49
|
url: URL
|
|
50
|
+
customProperties: ReadonlyArray<string>
|
|
48
51
|
}): Map<HeadItemType, string> => {
|
|
49
52
|
const pageInfo = page.route?.info
|
|
50
53
|
const title = getPageTitle({
|
|
@@ -111,6 +114,10 @@ export const getHeadItems = ({
|
|
|
111
114
|
'link:page',
|
|
112
115
|
`<link rel="stylesheet" fetchpriority="high" href="${escapeAttrValue(urlWithCacheBuster(pageStylesheetPath, cacheBuster))}" />`,
|
|
113
116
|
],
|
|
117
|
+
[
|
|
118
|
+
'style:variables',
|
|
119
|
+
`<style id="${CUSTOM_PROPERTIES_STYLESHEET_ID}">${customProperties.join('\n')}</style>`,
|
|
120
|
+
],
|
|
114
121
|
...preloadFonts,
|
|
115
122
|
// Initialize default head items (meta + links)
|
|
116
123
|
// these might be overwritten by custom tags later
|
package/src/utils/routes.ts
CHANGED
|
@@ -21,7 +21,11 @@ interface Routes {
|
|
|
21
21
|
routes: Record<string, Route>
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
type
|
|
24
|
+
export type ProjectFilesWithCustomCode = ProjectFiles & {
|
|
25
|
+
customCode: boolean
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export type Files = Record<string, ProjectFilesWithCustomCode>
|
|
25
29
|
|
|
26
30
|
export const splitRoutes = (json: {
|
|
27
31
|
files: ProjectFiles
|
|
@@ -90,17 +94,15 @@ export const splitRoutes = (json: {
|
|
|
90
94
|
}
|
|
91
95
|
|
|
92
96
|
filesMap[name] = {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
components
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
packages: files.packages,
|
|
103
|
-
},
|
|
97
|
+
customCode,
|
|
98
|
+
config: files.config,
|
|
99
|
+
themes: files.themes,
|
|
100
|
+
components: Object.fromEntries(
|
|
101
|
+
components.map((c) => [c.name, removeTestData(c)]),
|
|
102
|
+
),
|
|
103
|
+
formulas,
|
|
104
|
+
// TODO: Only include relevant components, formulas and actions from packages
|
|
105
|
+
packages: files.packages,
|
|
104
106
|
}
|
|
105
107
|
}
|
|
106
108
|
}
|