@usethrottle/builder-react 0.2.3 → 0.2.4
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/{chunk-GZN4SYTE.js → chunk-IBRAMTUT.js} +13 -5
- package/dist/{chunk-L7COZ3SN.cjs → chunk-WZOWM2I7.cjs} +30 -22
- package/dist/index.cjs +9 -1
- package/dist/index.js +9 -1
- package/dist/next.cjs +18 -11
- package/dist/next.d.cts +2 -0
- package/dist/next.d.ts +2 -0
- package/dist/next.js +13 -6
- package/dist/server.cjs +22 -22
- package/dist/server.d.cts +7 -0
- package/dist/server.d.ts +7 -0
- package/dist/server.js +3 -3
- package/package.json +1 -1
|
@@ -84,7 +84,7 @@ function pageOf(raw, initialData) {
|
|
|
84
84
|
meta
|
|
85
85
|
};
|
|
86
86
|
}
|
|
87
|
-
async function staticDataFor(documents, registry, locale) {
|
|
87
|
+
async function staticDataFor(documents, registry, locale, currency) {
|
|
88
88
|
const bindings = /* @__PURE__ */ new Map();
|
|
89
89
|
for (const document of documents) {
|
|
90
90
|
for (const [key, binding] of collectBindings(document, registry)) bindings.set(key, binding);
|
|
@@ -93,7 +93,7 @@ async function staticDataFor(documents, registry, locale) {
|
|
|
93
93
|
return resolveBindings(
|
|
94
94
|
bindings,
|
|
95
95
|
registry,
|
|
96
|
-
{ locale, preview: false, signal: new AbortController().signal },
|
|
96
|
+
{ locale, ...currency === void 0 ? {} : { currency }, preview: false, signal: new AbortController().signal },
|
|
97
97
|
{ include: "static" }
|
|
98
98
|
);
|
|
99
99
|
}
|
|
@@ -1231,6 +1231,13 @@ function prepare(field, value, ctx) {
|
|
|
1231
1231
|
}
|
|
1232
1232
|
return value;
|
|
1233
1233
|
}
|
|
1234
|
+
function storedLinkPart(value) {
|
|
1235
|
+
if (!isRecord2(value) || value.kind !== "page") return value;
|
|
1236
|
+
const { slug: _slug, href: _href, ...stored } = value;
|
|
1237
|
+
void _slug;
|
|
1238
|
+
void _href;
|
|
1239
|
+
return stored;
|
|
1240
|
+
}
|
|
1234
1241
|
function settingsAt(node, fields, device, ctx) {
|
|
1235
1242
|
const base = {};
|
|
1236
1243
|
for (const field of fields.values()) base[field.key] = field.default;
|
|
@@ -1239,7 +1246,8 @@ function settingsAt(node, fields, device, ctx) {
|
|
|
1239
1246
|
for (const [key, value] of Object.entries(resolved)) {
|
|
1240
1247
|
const field = fields.get(key);
|
|
1241
1248
|
const freeText = field?.control === "text" || field?.control === "richtext";
|
|
1242
|
-
const
|
|
1249
|
+
const checked = field?.control === "link" ? storedLinkPart(value) : value;
|
|
1250
|
+
const usable = field === void 0 || (freeText ? value !== null : validateSettingValue2(field, checked) === null) ? value : field.default;
|
|
1243
1251
|
out[key] = prepare(field, usable, ctx);
|
|
1244
1252
|
}
|
|
1245
1253
|
return out;
|
|
@@ -1918,12 +1926,12 @@ function createRendererRegistry(packs, options = {}) {
|
|
|
1918
1926
|
// src/server/load-page.ts
|
|
1919
1927
|
import { BuilderNotFoundError } from "@usethrottle/builder";
|
|
1920
1928
|
async function loadBuilderPage(options) {
|
|
1921
|
-
const { slug, locale, packs = [], slots } = options;
|
|
1929
|
+
const { slug, locale, packs = [], slots, currency } = options;
|
|
1922
1930
|
const bundle = await getBundle({ client: clientOf(options), locale, page: slug, slots });
|
|
1923
1931
|
const found = bundle.page;
|
|
1924
1932
|
if (found === void 0) throw new BuilderNotFoundError(slug);
|
|
1925
1933
|
if (isRedirect(found)) return { kind: "redirect", redirectTo: found.redirectTo };
|
|
1926
|
-
const data = await staticDataFor([found.document], createRendererRegistry(packs), locale);
|
|
1934
|
+
const data = await staticDataFor([found.document], createRendererRegistry(packs), locale, currency);
|
|
1927
1935
|
return pageOf(found, data);
|
|
1928
1936
|
}
|
|
1929
1937
|
|
|
@@ -84,7 +84,7 @@ function pageOf(raw, initialData) {
|
|
|
84
84
|
meta
|
|
85
85
|
};
|
|
86
86
|
}
|
|
87
|
-
async function staticDataFor(documents, registry, locale) {
|
|
87
|
+
async function staticDataFor(documents, registry, locale, currency) {
|
|
88
88
|
const bindings = /* @__PURE__ */ new Map();
|
|
89
89
|
for (const document of documents) {
|
|
90
90
|
for (const [key, binding] of collectBindings(document, registry)) bindings.set(key, binding);
|
|
@@ -93,7 +93,7 @@ async function staticDataFor(documents, registry, locale) {
|
|
|
93
93
|
return resolveBindings(
|
|
94
94
|
bindings,
|
|
95
95
|
registry,
|
|
96
|
-
{ locale, preview: false, signal: new AbortController().signal },
|
|
96
|
+
{ locale, ...currency === void 0 ? {} : { currency }, preview: false, signal: new AbortController().signal },
|
|
97
97
|
{ include: "static" }
|
|
98
98
|
);
|
|
99
99
|
}
|
|
@@ -1231,6 +1231,13 @@ function prepare(field, value, ctx) {
|
|
|
1231
1231
|
}
|
|
1232
1232
|
return value;
|
|
1233
1233
|
}
|
|
1234
|
+
function storedLinkPart(value) {
|
|
1235
|
+
if (!isRecord2(value) || value.kind !== "page") return value;
|
|
1236
|
+
const { slug: _slug, href: _href, ...stored } = value;
|
|
1237
|
+
void _slug;
|
|
1238
|
+
void _href;
|
|
1239
|
+
return stored;
|
|
1240
|
+
}
|
|
1234
1241
|
function settingsAt(node, fields, device, ctx) {
|
|
1235
1242
|
const base = {};
|
|
1236
1243
|
for (const field of fields.values()) base[field.key] = field.default;
|
|
@@ -1239,7 +1246,8 @@ function settingsAt(node, fields, device, ctx) {
|
|
|
1239
1246
|
for (const [key, value] of Object.entries(resolved)) {
|
|
1240
1247
|
const field = fields.get(key);
|
|
1241
1248
|
const freeText = _optionalChain([field, 'optionalAccess', _44 => _44.control]) === "text" || _optionalChain([field, 'optionalAccess', _45 => _45.control]) === "richtext";
|
|
1242
|
-
const
|
|
1249
|
+
const checked = _optionalChain([field, 'optionalAccess', _46 => _46.control]) === "link" ? storedLinkPart(value) : value;
|
|
1250
|
+
const usable = field === void 0 || (freeText ? value !== null : _builderschema.validateSettingValue.call(void 0, field, checked) === null) ? value : field.default;
|
|
1243
1251
|
out[key] = prepare(field, usable, ctx);
|
|
1244
1252
|
}
|
|
1245
1253
|
return out;
|
|
@@ -1491,7 +1499,7 @@ var ROLES = new Set(_builderschema.ALLOWED_ROLES);
|
|
|
1491
1499
|
function attrAllowed(tag, name) {
|
|
1492
1500
|
if (_builderschema.DATA_ATTR_RE.test(name)) return !name.startsWith(_builderschema.RESERVED_DATA_PREFIX);
|
|
1493
1501
|
const own = Object.hasOwn(_builderschema.ALLOWED_ATTRS, tag) ? _builderschema.ALLOWED_ATTRS[tag] : void 0;
|
|
1494
|
-
return (_nullishCoalesce(_optionalChain([_builderschema.ALLOWED_ATTRS, 'access',
|
|
1502
|
+
return (_nullishCoalesce(_optionalChain([_builderschema.ALLOWED_ATTRS, 'access', _47 => _47["*"], 'optionalAccess', _48 => _48.includes, 'call', _49 => _49(name)]), () => ( false))) || (_nullishCoalesce(_optionalChain([own, 'optionalAccess', _50 => _50.includes, 'call', _51 => _51(name)]), () => ( false)));
|
|
1495
1503
|
}
|
|
1496
1504
|
function attrText(attr, env, scope) {
|
|
1497
1505
|
return attr.value.map((part) => part.type === "text" ? part.value : filtered(lookup(part.path, env, scope), part.filters)).join("");
|
|
@@ -1614,14 +1622,14 @@ function compile(snapshot, registry) {
|
|
|
1614
1622
|
const source = snapshot.template;
|
|
1615
1623
|
if (typeof source !== "string") return refuse("no template source");
|
|
1616
1624
|
const parsed = _builderschema.parseTemplate.call(void 0, source);
|
|
1617
|
-
if (!parsed.ok) return refuse(`template does not parse: ${_nullishCoalesce(_optionalChain([parsed, 'access',
|
|
1625
|
+
if (!parsed.ok) return refuse(`template does not parse: ${_nullishCoalesce(_optionalChain([parsed, 'access', _52 => _52.issues, 'access', _53 => _53[0], 'optionalAccess', _54 => _54.message]), () => ( "invalid"))}`);
|
|
1618
1626
|
const data = snapshot.data;
|
|
1619
1627
|
const issues = _builderschema.validateTemplate.call(void 0, parsed.ast, {
|
|
1620
1628
|
settings: snapshot.settings,
|
|
1621
1629
|
data: typeof data === "object" && data !== null ? data : {},
|
|
1622
1630
|
sources: registry.sources()
|
|
1623
1631
|
});
|
|
1624
|
-
if (issues.length > 0) return refuse(`template does not validate: ${_nullishCoalesce(_optionalChain([issues, 'access',
|
|
1632
|
+
if (issues.length > 0) return refuse(`template does not validate: ${_nullishCoalesce(_optionalChain([issues, 'access', _55 => _55[0], 'optionalAccess', _56 => _56.message]), () => ( "invalid"))}`);
|
|
1625
1633
|
if (!fitsBudget(parsed.ast)) return refuse(`it can render more than ${String(_builderschema.MAX_TEMPLATE_WEIGHT)} nodes`);
|
|
1626
1634
|
const css = scopedCss(snapshot.css, snapshot.type);
|
|
1627
1635
|
if (css === null) return refuse("its css does not pass the sanitiser");
|
|
@@ -1653,16 +1661,16 @@ function parseBody(raw) {
|
|
|
1653
1661
|
const stack = Array.isArray(raw.stack) ? raw.stack : void 0;
|
|
1654
1662
|
if (columns === void 0 === (stack === void 0)) return null;
|
|
1655
1663
|
const children = columns !== void 0 ? [{ id: WRAP.inner, type: "inner-section", props: {}, columns }] : _nullishCoalesce(stack, () => ( []));
|
|
1656
|
-
if (_optionalChain([stack, 'optionalAccess',
|
|
1664
|
+
if (_optionalChain([stack, 'optionalAccess', _57 => _57.some, 'call', _58 => _58((node) => isRecord3(node) && node.type === "inner-section")])) return null;
|
|
1657
1665
|
const parsed = _builderschema.pageDocumentSchema.safeParse({
|
|
1658
1666
|
schemaVersion: 1,
|
|
1659
1667
|
sections: [{ id: WRAP.section, type: "section", props: {}, columns: [{ id: WRAP.column, type: "column", props: { width: 100 }, children }] }]
|
|
1660
1668
|
});
|
|
1661
1669
|
if (!parsed.success) return null;
|
|
1662
|
-
const first = _nullishCoalesce(_optionalChain([parsed, 'access',
|
|
1670
|
+
const first = _nullishCoalesce(_optionalChain([parsed, 'access', _59 => _59.data, 'access', _60 => _60.sections, 'access', _61 => _61[0], 'optionalAccess', _62 => _62.columns, 'access', _63 => _63[0], 'optionalAccess', _64 => _64.children]), () => ( []));
|
|
1663
1671
|
if (columns !== void 0) {
|
|
1664
1672
|
const inner = first[0];
|
|
1665
|
-
return _optionalChain([inner, 'optionalAccess',
|
|
1673
|
+
return _optionalChain([inner, 'optionalAccess', _65 => _65.type]) === "inner-section" ? { columns: inner.columns } : null;
|
|
1666
1674
|
}
|
|
1667
1675
|
return { stack: first.filter((node) => node.type !== "inner-section") };
|
|
1668
1676
|
}
|
|
@@ -1716,7 +1724,7 @@ var DEVICES3 = ["tablet", "phone"];
|
|
|
1716
1724
|
function withoutAnchor(node) {
|
|
1717
1725
|
delete node.props.anchor;
|
|
1718
1726
|
const responsive = node.responsive;
|
|
1719
|
-
for (const device of DEVICES3) if (_optionalChain([responsive, 'optionalAccess',
|
|
1727
|
+
for (const device of DEVICES3) if (_optionalChain([responsive, 'optionalAccess', _66 => _66[device]]) !== void 0) delete responsive[device].anchor;
|
|
1720
1728
|
}
|
|
1721
1729
|
function instanceId(outer, inner) {
|
|
1722
1730
|
let a = 3735928559;
|
|
@@ -1736,9 +1744,9 @@ function build(input) {
|
|
|
1736
1744
|
const assets = {};
|
|
1737
1745
|
const hrefs = /* @__PURE__ */ new Map();
|
|
1738
1746
|
const innerData = {};
|
|
1739
|
-
const keep = (child) => _optionalChain([registry, 'access',
|
|
1740
|
-
const columns = _optionalChain([body, 'access',
|
|
1741
|
-
const stack = _optionalChain([body, 'access',
|
|
1747
|
+
const keep = (child) => _optionalChain([registry, 'access', _67 => _67.widget, 'call', _68 => _68(child.type, child.v), 'optionalAccess', _69 => _69.kind]) !== "composite";
|
|
1748
|
+
const columns = _optionalChain([body, 'access', _70 => _70.columns, 'optionalAccess', _71 => _71.map, 'call', _72 => _72((column2) => ({ ...column2, children: column2.children.filter(keep) }))]);
|
|
1749
|
+
const stack = _optionalChain([body, 'access', _73 => _73.stack, 'optionalAccess', _74 => _74.filter, 'call', _75 => _75(keep)]);
|
|
1742
1750
|
const widgets2 = columns !== void 0 ? columns.flatMap((column2) => column2.children) : _nullishCoalesce(stack, () => ( []));
|
|
1743
1751
|
for (const widget of widgets2) {
|
|
1744
1752
|
withoutAnchor(widget);
|
|
@@ -1773,15 +1781,15 @@ function build(input) {
|
|
|
1773
1781
|
const value = props[binding.setting];
|
|
1774
1782
|
for (const target of binding.targets) {
|
|
1775
1783
|
const inner = byId.get(target.node);
|
|
1776
|
-
const innerField = inner === void 0 ? void 0 : _optionalChain([registry, 'access',
|
|
1784
|
+
const innerField = inner === void 0 ? void 0 : _optionalChain([registry, 'access', _76 => _76.widget, 'call', _77 => _77(inner.type, inner.v), 'optionalAccess', _78 => _78.settings, 'access', _79 => _79.find, 'call', _80 => _80((f) => f.key === target.prop)]);
|
|
1777
1785
|
if (inner === void 0 || innerField === void 0 || innerField.control !== field.control) continue;
|
|
1778
1786
|
const converted = convert(field, value);
|
|
1779
1787
|
if (_builderschema.validateSettingValue.call(void 0, innerField, converted) !== null) continue;
|
|
1780
1788
|
inner.props[target.prop] = converted;
|
|
1781
1789
|
const responsive = inner.responsive;
|
|
1782
1790
|
for (const device of DEVICES3) {
|
|
1783
|
-
if (_optionalChain([responsive, 'optionalAccess',
|
|
1784
|
-
const raw = _optionalChain([outer, 'access',
|
|
1791
|
+
if (_optionalChain([responsive, 'optionalAccess', _81 => _81[device]]) !== void 0) delete responsive[device][target.prop];
|
|
1792
|
+
const raw = _optionalChain([outer, 'access', _82 => _82.responsive, 'optionalAccess', _83 => _83[device]]);
|
|
1785
1793
|
const plain = field.output === "css" && field.translatable !== true && field.control !== "image" && field.control !== "link";
|
|
1786
1794
|
if (plain && raw !== void 0 && Object.hasOwn(raw, binding.setting) && _builderschema.validateSettingValue.call(void 0, innerField, raw[binding.setting]) === null) {
|
|
1787
1795
|
const target$ = _nullishCoalesce(inner.responsive, () => ( (inner.responsive = {})));
|
|
@@ -1796,7 +1804,7 @@ function build(input) {
|
|
|
1796
1804
|
for (const target of input$.targets) {
|
|
1797
1805
|
const inner = byId.get(target.node);
|
|
1798
1806
|
const def = inner === void 0 ? void 0 : registry.widget(inner.type, inner.v);
|
|
1799
|
-
if (inner === void 0 || _optionalChain([def, 'optionalAccess',
|
|
1807
|
+
if (inner === void 0 || _optionalChain([def, 'optionalAccess', _84 => _84.data]) === void 0 || !Object.hasOwn(def.data, target.input)) continue;
|
|
1800
1808
|
inner.data = { ..._nullishCoalesce(inner.data, () => ( {})), [target.input]: { source: key } };
|
|
1801
1809
|
innerData[key] = data[name];
|
|
1802
1810
|
}
|
|
@@ -1814,7 +1822,7 @@ function build(input) {
|
|
|
1814
1822
|
schemaVersion: 1,
|
|
1815
1823
|
sections: [{ id: ids.section, type: "section", props: { width: "full" }, columns: [column] }]
|
|
1816
1824
|
};
|
|
1817
|
-
let weight = 2 + (_nullishCoalesce(_optionalChain([columns, 'optionalAccess',
|
|
1825
|
+
let weight = 2 + (_nullishCoalesce(_optionalChain([columns, 'optionalAccess', _85 => _85.length]), () => ( 0))) + (columns === void 0 ? 0 : 1);
|
|
1818
1826
|
for (const widget of widgets2) {
|
|
1819
1827
|
const component = registry.component(widget);
|
|
1820
1828
|
weight += 1 + (component === void 0 ? 0 : _nullishCoalesce(componentWeights.get(component), () => ( 0)));
|
|
@@ -1839,7 +1847,7 @@ function CompositeBody(props) {
|
|
|
1839
1847
|
locale,
|
|
1840
1848
|
assets: built.assets,
|
|
1841
1849
|
mediaOrigin,
|
|
1842
|
-
resolveLink: (target) => _nullishCoalesce(_nullishCoalesce(built.hrefs.get(JSON.stringify(target)), () => ( _optionalChain([resolveLink, 'optionalCall',
|
|
1850
|
+
resolveLink: (target) => _nullishCoalesce(_nullishCoalesce(built.hrefs.get(JSON.stringify(target)), () => ( _optionalChain([resolveLink, 'optionalCall', _86 => _86(target)]))), () => ( null))
|
|
1843
1851
|
}
|
|
1844
1852
|
);
|
|
1845
1853
|
}
|
|
@@ -1918,12 +1926,12 @@ function createRendererRegistry(packs, options = {}) {
|
|
|
1918
1926
|
// src/server/load-page.ts
|
|
1919
1927
|
|
|
1920
1928
|
async function loadBuilderPage(options) {
|
|
1921
|
-
const { slug, locale, packs = [], slots } = options;
|
|
1929
|
+
const { slug, locale, packs = [], slots, currency } = options;
|
|
1922
1930
|
const bundle = await getBundle({ client: clientOf(options), locale, page: slug, slots });
|
|
1923
1931
|
const found = bundle.page;
|
|
1924
1932
|
if (found === void 0) throw new (0, _builder.BuilderNotFoundError)(slug);
|
|
1925
1933
|
if (isRedirect(found)) return { kind: "redirect", redirectTo: found.redirectTo };
|
|
1926
|
-
const data = await staticDataFor([found.document], createRendererRegistry(packs), locale);
|
|
1934
|
+
const data = await staticDataFor([found.document], createRendererRegistry(packs), locale, currency);
|
|
1927
1935
|
return pageOf(found, data);
|
|
1928
1936
|
}
|
|
1929
1937
|
|
|
@@ -1964,7 +1972,7 @@ function pagePathOf(settings, page, resolve) {
|
|
|
1964
1972
|
return _nullishCoalesce(_builderschema.safeUrl.call(void 0, resolve({ ...page, path }), "href", { mediaOrigin: "" }), () => ( path));
|
|
1965
1973
|
}
|
|
1966
1974
|
function originOf(storeUrl) {
|
|
1967
|
-
const origin = _optionalChain([storeUrl, 'optionalAccess',
|
|
1975
|
+
const origin = _optionalChain([storeUrl, 'optionalAccess', _87 => _87.replace, 'call', _88 => _88(/\/+$/u, "")]);
|
|
1968
1976
|
return origin !== void 0 && ORIGIN_RE.test(origin) ? origin : void 0;
|
|
1969
1977
|
}
|
|
1970
1978
|
function siteLocales(settings) {
|
package/dist/index.cjs
CHANGED
|
@@ -492,6 +492,13 @@ function prepare(field, value, ctx) {
|
|
|
492
492
|
}
|
|
493
493
|
return value;
|
|
494
494
|
}
|
|
495
|
+
function storedLinkPart(value) {
|
|
496
|
+
if (!isRecord(value) || value.kind !== "page") return value;
|
|
497
|
+
const { slug: _slug, href: _href, ...stored } = value;
|
|
498
|
+
void _slug;
|
|
499
|
+
void _href;
|
|
500
|
+
return stored;
|
|
501
|
+
}
|
|
495
502
|
function settingsAt(node, fields, device, ctx) {
|
|
496
503
|
const base = {};
|
|
497
504
|
for (const field of fields.values()) base[field.key] = field.default;
|
|
@@ -500,7 +507,8 @@ function settingsAt(node, fields, device, ctx) {
|
|
|
500
507
|
for (const [key, value] of Object.entries(resolved)) {
|
|
501
508
|
const field = fields.get(key);
|
|
502
509
|
const freeText = field?.control === "text" || field?.control === "richtext";
|
|
503
|
-
const
|
|
510
|
+
const checked = field?.control === "link" ? storedLinkPart(value) : value;
|
|
511
|
+
const usable = field === void 0 || (freeText ? value !== null : (0, import_builder_schema5.validateSettingValue)(field, checked) === null) ? value : field.default;
|
|
504
512
|
out[key] = prepare(field, usable, ctx);
|
|
505
513
|
}
|
|
506
514
|
return out;
|
package/dist/index.js
CHANGED
|
@@ -446,6 +446,13 @@ function prepare(field, value, ctx) {
|
|
|
446
446
|
}
|
|
447
447
|
return value;
|
|
448
448
|
}
|
|
449
|
+
function storedLinkPart(value) {
|
|
450
|
+
if (!isRecord(value) || value.kind !== "page") return value;
|
|
451
|
+
const { slug: _slug, href: _href, ...stored } = value;
|
|
452
|
+
void _slug;
|
|
453
|
+
void _href;
|
|
454
|
+
return stored;
|
|
455
|
+
}
|
|
449
456
|
function settingsAt(node, fields, device, ctx) {
|
|
450
457
|
const base = {};
|
|
451
458
|
for (const field of fields.values()) base[field.key] = field.default;
|
|
@@ -454,7 +461,8 @@ function settingsAt(node, fields, device, ctx) {
|
|
|
454
461
|
for (const [key, value] of Object.entries(resolved)) {
|
|
455
462
|
const field = fields.get(key);
|
|
456
463
|
const freeText = field?.control === "text" || field?.control === "richtext";
|
|
457
|
-
const
|
|
464
|
+
const checked = field?.control === "link" ? storedLinkPart(value) : value;
|
|
465
|
+
const usable = field === void 0 || (freeText ? value !== null : validateSettingValue2(field, checked) === null) ? value : field.default;
|
|
458
466
|
out[key] = prepare(field, usable, ctx);
|
|
459
467
|
}
|
|
460
468
|
return out;
|
package/dist/next.cjs
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkWZOWM2I7cjs = require('./chunk-WZOWM2I7.cjs');
|
|
8
8
|
|
|
9
9
|
// src/next/index.ts
|
|
10
10
|
var _react = require('react');
|
|
@@ -39,6 +39,10 @@ function slugOf(options, params) {
|
|
|
39
39
|
if (slug === void 0 || slug === "") _navigation.notFound.call(void 0, );
|
|
40
40
|
return slug;
|
|
41
41
|
}
|
|
42
|
+
async function currencyOf(options, params) {
|
|
43
|
+
return typeof options.currency === "function" ? options.currency(params) : options.currency;
|
|
44
|
+
}
|
|
45
|
+
var isNamed = (error, name) => typeof error === "object" && error !== null && error.name === name;
|
|
42
46
|
async function localeOf(options, params) {
|
|
43
47
|
if (typeof options.locale === "function") return options.locale(params);
|
|
44
48
|
if (options.locale !== void 0) return options.locale;
|
|
@@ -49,12 +53,15 @@ function createBuilderPage(options) {
|
|
|
49
53
|
async function Page(props) {
|
|
50
54
|
const params = await props.params;
|
|
51
55
|
const slug = slugOf(options, params);
|
|
52
|
-
const
|
|
53
|
-
|
|
56
|
+
const currency = await currencyOf(options, params);
|
|
57
|
+
const { currency: _currency, ...rest } = options;
|
|
58
|
+
const loaded = await _chunkWZOWM2I7cjs.loadBuilderPage.call(void 0, {
|
|
59
|
+
...rest,
|
|
54
60
|
slug,
|
|
55
|
-
locale: await localeOf(options, params)
|
|
61
|
+
locale: await localeOf(options, params),
|
|
62
|
+
...currency === void 0 ? {} : { currency }
|
|
56
63
|
}).catch((error) => {
|
|
57
|
-
if (error instanceof _builder.BuilderNotFoundError) _navigation.notFound.call(void 0, );
|
|
64
|
+
if (error instanceof _builder.BuilderNotFoundError || isNamed(error, "BuilderNotFoundError")) _navigation.notFound.call(void 0, );
|
|
58
65
|
throw error;
|
|
59
66
|
});
|
|
60
67
|
if (loaded.kind === "redirect") {
|
|
@@ -68,12 +75,12 @@ function createBuilderPage(options) {
|
|
|
68
75
|
const params = await props.params;
|
|
69
76
|
const slug = slugOf(options, params);
|
|
70
77
|
const locale = await localeOf(options, params);
|
|
71
|
-
const client =
|
|
78
|
+
const client = _chunkWZOWM2I7cjs.clientOf.call(void 0, options);
|
|
72
79
|
try {
|
|
73
|
-
const bundle = await
|
|
80
|
+
const bundle = await _chunkWZOWM2I7cjs.getBundle.call(void 0, { client, locale, page: slug, slots: options.slots });
|
|
74
81
|
const page = bundle.page;
|
|
75
|
-
if (page === void 0 ||
|
|
76
|
-
return
|
|
82
|
+
if (page === void 0 || _chunkWZOWM2I7cjs.isRedirect.call(void 0, page)) return {};
|
|
83
|
+
return _chunkWZOWM2I7cjs.metadataOf.call(void 0, page, {
|
|
77
84
|
settings: bundle.site.settings,
|
|
78
85
|
mediaOrigin: _nullishCoalesce(options.mediaOrigin, () => ( "")),
|
|
79
86
|
storeUrl: options.storeUrl,
|
|
@@ -81,8 +88,8 @@ function createBuilderPage(options) {
|
|
|
81
88
|
routeLocale: options.locale === void 0 && typeof params.locale === "string" ? params.locale : void 0
|
|
82
89
|
});
|
|
83
90
|
} catch (error) {
|
|
84
|
-
if (error instanceof _builder.BuilderNotFoundError) return {};
|
|
85
|
-
if (error instanceof _builder.BuilderUnavailableError && client.mode !== "build") return {};
|
|
91
|
+
if (error instanceof _builder.BuilderNotFoundError || isNamed(error, "BuilderNotFoundError")) return {};
|
|
92
|
+
if ((error instanceof _builder.BuilderUnavailableError || isNamed(error, "BuilderUnavailableError")) && client.mode !== "build") return {};
|
|
86
93
|
throw error;
|
|
87
94
|
}
|
|
88
95
|
}
|
package/dist/next.d.cts
CHANGED
|
@@ -13,6 +13,8 @@ type CreateBuilderPageOptions = ({
|
|
|
13
13
|
packs?: readonly WidgetPack[];
|
|
14
14
|
/** The locale of the page; by default `params.locale` when the route has one, else `en`. */
|
|
15
15
|
locale?: string | ((params: Params) => string | Promise<string>);
|
|
16
|
+
/** The shopper's currency (a value, or read from the route's params, e.g. from a cookie), as for `loadSite({ currency })`. */
|
|
17
|
+
currency?: string | ((params: Params) => string | undefined | Promise<string | undefined>);
|
|
16
18
|
/** The slots the layout reads, so the page read can share the layout's. */
|
|
17
19
|
slots?: readonly string[];
|
|
18
20
|
/** The store's origin (`https://shop.example.com`), for the canonical link. The Builder does not publish it, so without it a page has no canonical. */
|
package/dist/next.d.ts
CHANGED
|
@@ -13,6 +13,8 @@ type CreateBuilderPageOptions = ({
|
|
|
13
13
|
packs?: readonly WidgetPack[];
|
|
14
14
|
/** The locale of the page; by default `params.locale` when the route has one, else `en`. */
|
|
15
15
|
locale?: string | ((params: Params) => string | Promise<string>);
|
|
16
|
+
/** The shopper's currency (a value, or read from the route's params, e.g. from a cookie), as for `loadSite({ currency })`. */
|
|
17
|
+
currency?: string | ((params: Params) => string | undefined | Promise<string | undefined>);
|
|
16
18
|
/** The slots the layout reads, so the page read can share the layout's. */
|
|
17
19
|
slots?: readonly string[];
|
|
18
20
|
/** The store's origin (`https://shop.example.com`), for the canonical link. The Builder does not publish it, so without it a page has no canonical. */
|
package/dist/next.js
CHANGED
|
@@ -4,7 +4,7 @@ import {
|
|
|
4
4
|
isRedirect,
|
|
5
5
|
loadBuilderPage,
|
|
6
6
|
metadataOf
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-IBRAMTUT.js";
|
|
8
8
|
|
|
9
9
|
// src/next/index.ts
|
|
10
10
|
import { createElement } from "react";
|
|
@@ -39,6 +39,10 @@ function slugOf(options, params) {
|
|
|
39
39
|
if (slug === void 0 || slug === "") notFound();
|
|
40
40
|
return slug;
|
|
41
41
|
}
|
|
42
|
+
async function currencyOf(options, params) {
|
|
43
|
+
return typeof options.currency === "function" ? options.currency(params) : options.currency;
|
|
44
|
+
}
|
|
45
|
+
var isNamed = (error, name) => typeof error === "object" && error !== null && error.name === name;
|
|
42
46
|
async function localeOf(options, params) {
|
|
43
47
|
if (typeof options.locale === "function") return options.locale(params);
|
|
44
48
|
if (options.locale !== void 0) return options.locale;
|
|
@@ -49,12 +53,15 @@ function createBuilderPage(options) {
|
|
|
49
53
|
async function Page(props) {
|
|
50
54
|
const params = await props.params;
|
|
51
55
|
const slug = slugOf(options, params);
|
|
56
|
+
const currency = await currencyOf(options, params);
|
|
57
|
+
const { currency: _currency, ...rest } = options;
|
|
52
58
|
const loaded = await loadBuilderPage({
|
|
53
|
-
...
|
|
59
|
+
...rest,
|
|
54
60
|
slug,
|
|
55
|
-
locale: await localeOf(options, params)
|
|
61
|
+
locale: await localeOf(options, params),
|
|
62
|
+
...currency === void 0 ? {} : { currency }
|
|
56
63
|
}).catch((error) => {
|
|
57
|
-
if (error instanceof BuilderNotFoundError) notFound();
|
|
64
|
+
if (error instanceof BuilderNotFoundError || isNamed(error, "BuilderNotFoundError")) notFound();
|
|
58
65
|
throw error;
|
|
59
66
|
});
|
|
60
67
|
if (loaded.kind === "redirect") {
|
|
@@ -81,8 +88,8 @@ function createBuilderPage(options) {
|
|
|
81
88
|
routeLocale: options.locale === void 0 && typeof params.locale === "string" ? params.locale : void 0
|
|
82
89
|
});
|
|
83
90
|
} catch (error) {
|
|
84
|
-
if (error instanceof BuilderNotFoundError) return {};
|
|
85
|
-
if (error instanceof BuilderUnavailableError && client.mode !== "build") return {};
|
|
91
|
+
if (error instanceof BuilderNotFoundError || isNamed(error, "BuilderNotFoundError")) return {};
|
|
92
|
+
if ((error instanceof BuilderUnavailableError || isNamed(error, "BuilderUnavailableError")) && client.mode !== "build") return {};
|
|
86
93
|
throw error;
|
|
87
94
|
}
|
|
88
95
|
}
|
package/dist/server.cjs
CHANGED
|
@@ -12,25 +12,25 @@
|
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
|
|
15
|
-
var
|
|
15
|
+
var _chunkWZOWM2I7cjs = require('./chunk-WZOWM2I7.cjs');
|
|
16
16
|
|
|
17
17
|
// src/server/load-site.ts
|
|
18
18
|
var _builder = require('@usethrottle/builder');
|
|
19
19
|
async function loadSite(options) {
|
|
20
|
-
const { locale, slots = [], packs = [], page, mediaOrigin = "" } = options;
|
|
21
|
-
const client =
|
|
20
|
+
const { locale, slots = [], packs = [], page, mediaOrigin = "", currency } = options;
|
|
21
|
+
const client = _chunkWZOWM2I7cjs.clientOf.call(void 0, options);
|
|
22
22
|
let bundle;
|
|
23
23
|
try {
|
|
24
|
-
bundle = await
|
|
24
|
+
bundle = await _chunkWZOWM2I7cjs.getBundle.call(void 0, { client, locale, slots, page });
|
|
25
25
|
} catch (error) {
|
|
26
26
|
if (!(error instanceof _builder.BuilderUnavailableError) || client.mode === "build") throw error;
|
|
27
|
-
|
|
27
|
+
_chunkWZOWM2I7cjs.warnOnce.call(void 0, "site-unavailable", `The Builder could not be read (${error.reason}); the store renders without its Builder header, footer and slots`);
|
|
28
28
|
return { status: "unavailable", locale };
|
|
29
29
|
}
|
|
30
|
-
const registry =
|
|
30
|
+
const registry = _chunkWZOWM2I7cjs.createRendererRegistry.call(void 0, packs);
|
|
31
31
|
const names = Object.keys(bundle.slots);
|
|
32
32
|
const documents = [bundle.header.document, bundle.footer.document, ...names.map((n) => bundle.slots[n].document)];
|
|
33
|
-
const data = await
|
|
33
|
+
const data = await _chunkWZOWM2I7cjs.staticDataFor.call(void 0, documents, registry, locale, currency);
|
|
34
34
|
return {
|
|
35
35
|
status: "ok",
|
|
36
36
|
locale,
|
|
@@ -38,9 +38,9 @@ async function loadSite(options) {
|
|
|
38
38
|
siteVersion: bundle.site.siteVersion,
|
|
39
39
|
mediaOrigin,
|
|
40
40
|
settings: bundle.site.settings,
|
|
41
|
-
header:
|
|
42
|
-
footer:
|
|
43
|
-
slots: Object.fromEntries(names.map((name) => [name,
|
|
41
|
+
header: _chunkWZOWM2I7cjs.partOf.call(void 0, bundle.header, data),
|
|
42
|
+
footer: _chunkWZOWM2I7cjs.partOf.call(void 0, bundle.footer, data),
|
|
43
|
+
slots: Object.fromEntries(names.map((name) => [name, _chunkWZOWM2I7cjs.partOf.call(void 0, bundle.slots[name], data)]))
|
|
44
44
|
};
|
|
45
45
|
}
|
|
46
46
|
|
|
@@ -48,13 +48,13 @@ async function loadSite(options) {
|
|
|
48
48
|
|
|
49
49
|
async function builderSitemap(options) {
|
|
50
50
|
if (options.client === void 0 && (options.builderKey === void 0 || options.builderKey === "")) {
|
|
51
|
-
|
|
51
|
+
_chunkWZOWM2I7cjs.warnOnce.call(void 0, "sitemap-no-key", "builderSitemap has no builderKey (is THROTTLE_BUILDER_KEY set?); the sitemap leaves out the Builder pages");
|
|
52
52
|
return [];
|
|
53
53
|
}
|
|
54
|
-
const client =
|
|
55
|
-
const origin =
|
|
54
|
+
const client = _chunkWZOWM2I7cjs.clientOf.call(void 0, options);
|
|
55
|
+
const origin = _chunkWZOWM2I7cjs.originOf.call(void 0, options.storeUrl);
|
|
56
56
|
if (origin === void 0) {
|
|
57
|
-
|
|
57
|
+
_chunkWZOWM2I7cjs.warnOnce.call(void 0, "sitemap-origin", "builderSitemap needs a storeUrl (https://shop.example.com) that is an http(s) origin. The Builder does not publish the store URL.");
|
|
58
58
|
return [];
|
|
59
59
|
}
|
|
60
60
|
const locale = _nullishCoalesce(options.locale, () => ( "en"));
|
|
@@ -62,16 +62,16 @@ async function builderSitemap(options) {
|
|
|
62
62
|
const pages = await client.pages.list();
|
|
63
63
|
const { settings } = await client.site({ locale });
|
|
64
64
|
const indexable = await withoutNoindex(client, pages, locale);
|
|
65
|
-
const { list } =
|
|
65
|
+
const { list } = _chunkWZOWM2I7cjs.siteLocales.call(void 0, settings);
|
|
66
66
|
const prefixes = options.localeRoute !== true ? [void 0] : list.length > 0 ? list : [locale];
|
|
67
67
|
return indexable.flatMap((page) => {
|
|
68
|
-
const path =
|
|
68
|
+
const path = _chunkWZOWM2I7cjs.pagePathOf.call(void 0, settings, page, options.pagePath);
|
|
69
69
|
if (path === null) return [];
|
|
70
|
-
return prefixes.map((prefix) => ({ url: `${origin}${
|
|
70
|
+
return prefixes.map((prefix) => ({ url: `${origin}${_chunkWZOWM2I7cjs.localized.call(void 0, path, prefix)}`, lastModified: new Date(page.updatedAt) }));
|
|
71
71
|
});
|
|
72
72
|
} catch (error) {
|
|
73
73
|
if (!(error instanceof _builder.BuilderUnavailableError) || client.mode === "build") throw error;
|
|
74
|
-
|
|
74
|
+
_chunkWZOWM2I7cjs.warnOnce.call(void 0, "sitemap-unavailable", `The Builder could not be read (${error.reason}); the sitemap leaves out its pages`);
|
|
75
75
|
return [];
|
|
76
76
|
}
|
|
77
77
|
}
|
|
@@ -85,14 +85,14 @@ async function withoutNoindex(client, pages, locale) {
|
|
|
85
85
|
slice.map(
|
|
86
86
|
(page) => client.pages.get(page.slug, { locale }).catch((error) => {
|
|
87
87
|
if (error instanceof _builder.BuilderNotFoundError) return "gone";
|
|
88
|
-
|
|
88
|
+
_chunkWZOWM2I7cjs.warnOnce.call(void 0, "sitemap-page-read", `A page could not be read for the sitemap (${error instanceof Error ? error.message : "unknown error"}); it stays listed`);
|
|
89
89
|
return void 0;
|
|
90
90
|
})
|
|
91
91
|
)
|
|
92
92
|
);
|
|
93
93
|
slice.forEach((page, index) => {
|
|
94
94
|
const answer = answers[index];
|
|
95
|
-
if (answer === "gone" || answer !== void 0 && (
|
|
95
|
+
if (answer === "gone" || answer !== void 0 && (_chunkWZOWM2I7cjs.isRedirect.call(void 0, answer) || _chunkWZOWM2I7cjs.pageSeoOf.call(void 0, answer).noindex)) skip.add(page.slug);
|
|
96
96
|
});
|
|
97
97
|
}
|
|
98
98
|
return pages.filter((page) => !skip.has(page.slug));
|
|
@@ -100,7 +100,7 @@ async function withoutNoindex(client, pages, locale) {
|
|
|
100
100
|
|
|
101
101
|
// src/server/static-params.ts
|
|
102
102
|
async function builderStaticParams(options) {
|
|
103
|
-
const client =
|
|
103
|
+
const client = _chunkWZOWM2I7cjs.clientOf.call(void 0, options);
|
|
104
104
|
if (client.mode !== "build")
|
|
105
105
|
throw new TypeError(
|
|
106
106
|
'builderStaticParams generates every page of a frozen release: give it a client made with createBuilderClient({ mode: "build" }). A live store keeps its pages dynamic.'
|
|
@@ -119,4 +119,4 @@ async function builderStaticParams(options) {
|
|
|
119
119
|
|
|
120
120
|
|
|
121
121
|
|
|
122
|
-
exports.BuilderNotFoundError = _builder.BuilderNotFoundError; exports.BuilderUnavailableError = _builder.BuilderUnavailableError; exports.builderSitemap = builderSitemap; exports.builderStaticParams = builderStaticParams; exports.getBundle =
|
|
122
|
+
exports.BuilderNotFoundError = _builder.BuilderNotFoundError; exports.BuilderUnavailableError = _builder.BuilderUnavailableError; exports.builderSitemap = builderSitemap; exports.builderStaticParams = builderStaticParams; exports.getBundle = _chunkWZOWM2I7cjs.getBundle; exports.loadBuilderPage = _chunkWZOWM2I7cjs.loadBuilderPage; exports.loadSite = loadSite;
|
package/dist/server.d.cts
CHANGED
|
@@ -16,6 +16,11 @@ type LoadSiteOptions = ClientOptions & {
|
|
|
16
16
|
*/
|
|
17
17
|
mediaOrigin?: string;
|
|
18
18
|
packs?: readonly WidgetPack[];
|
|
19
|
+
/**
|
|
20
|
+
* The shopper's currency, when the store keeps one (a cookie): data sources that price things answer in it
|
|
21
|
+
* (`ctx.currency`). Without it they answer in the store's own currency.
|
|
22
|
+
*/
|
|
23
|
+
currency?: string;
|
|
19
24
|
};
|
|
20
25
|
/**
|
|
21
26
|
* Reads the site design once for a request: settings, header, footer and the
|
|
@@ -35,6 +40,8 @@ type LoadBuilderPageOptions = ClientOptions & {
|
|
|
35
40
|
packs?: readonly WidgetPack[];
|
|
36
41
|
/** The slots the layout reads, so this read can share the layout's. */
|
|
37
42
|
slots?: readonly string[];
|
|
43
|
+
/** The shopper's currency, as for `loadSite({ currency })`. */
|
|
44
|
+
currency?: string;
|
|
38
45
|
};
|
|
39
46
|
/**
|
|
40
47
|
* Reads one published page for a request. Data of the page's non-perShopper
|
package/dist/server.d.ts
CHANGED
|
@@ -16,6 +16,11 @@ type LoadSiteOptions = ClientOptions & {
|
|
|
16
16
|
*/
|
|
17
17
|
mediaOrigin?: string;
|
|
18
18
|
packs?: readonly WidgetPack[];
|
|
19
|
+
/**
|
|
20
|
+
* The shopper's currency, when the store keeps one (a cookie): data sources that price things answer in it
|
|
21
|
+
* (`ctx.currency`). Without it they answer in the store's own currency.
|
|
22
|
+
*/
|
|
23
|
+
currency?: string;
|
|
19
24
|
};
|
|
20
25
|
/**
|
|
21
26
|
* Reads the site design once for a request: settings, header, footer and the
|
|
@@ -35,6 +40,8 @@ type LoadBuilderPageOptions = ClientOptions & {
|
|
|
35
40
|
packs?: readonly WidgetPack[];
|
|
36
41
|
/** The slots the layout reads, so this read can share the layout's. */
|
|
37
42
|
slots?: readonly string[];
|
|
43
|
+
/** The shopper's currency, as for `loadSite({ currency })`. */
|
|
44
|
+
currency?: string;
|
|
38
45
|
};
|
|
39
46
|
/**
|
|
40
47
|
* Reads one published page for a request. Data of the page's non-perShopper
|
package/dist/server.js
CHANGED
|
@@ -12,12 +12,12 @@ import {
|
|
|
12
12
|
siteLocales,
|
|
13
13
|
staticDataFor,
|
|
14
14
|
warnOnce
|
|
15
|
-
} from "./chunk-
|
|
15
|
+
} from "./chunk-IBRAMTUT.js";
|
|
16
16
|
|
|
17
17
|
// src/server/load-site.ts
|
|
18
18
|
import { BuilderUnavailableError } from "@usethrottle/builder";
|
|
19
19
|
async function loadSite(options) {
|
|
20
|
-
const { locale, slots = [], packs = [], page, mediaOrigin = "" } = options;
|
|
20
|
+
const { locale, slots = [], packs = [], page, mediaOrigin = "", currency } = options;
|
|
21
21
|
const client = clientOf(options);
|
|
22
22
|
let bundle;
|
|
23
23
|
try {
|
|
@@ -30,7 +30,7 @@ async function loadSite(options) {
|
|
|
30
30
|
const registry = createRendererRegistry(packs);
|
|
31
31
|
const names = Object.keys(bundle.slots);
|
|
32
32
|
const documents = [bundle.header.document, bundle.footer.document, ...names.map((n) => bundle.slots[n].document)];
|
|
33
|
-
const data = await staticDataFor(documents, registry, locale);
|
|
33
|
+
const data = await staticDataFor(documents, registry, locale, currency);
|
|
34
34
|
return {
|
|
35
35
|
status: "ok",
|
|
36
36
|
locale,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@usethrottle/builder-react",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.4",
|
|
4
4
|
"description": "Renders a published Throttle Builder page document as React in a merchant's store: responsive CSS, header, footer, slots and the site design provider.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|