@puckeditor/plugin-pages 0.9.0-canary.e81b45a6 → 0.9.0-canary.ecc60986

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/index.d.mts CHANGED
@@ -3,6 +3,7 @@ import * as react from 'react';
3
3
  import * as react_jsx_runtime from 'react/jsx-runtime';
4
4
 
5
5
  type PagePluginOptions = {
6
+ /** Where `puckHandler` serves the pages API. Defaults to `/api/puck/pages`. */
6
7
  host?: string;
7
8
  /** Where the site renders pages, without a trailing slash, for "View page" links. Defaults to this origin. */
8
9
  siteUrl?: string;
package/dist/index.d.ts CHANGED
@@ -3,6 +3,7 @@ import * as react from 'react';
3
3
  import * as react_jsx_runtime from 'react/jsx-runtime';
4
4
 
5
5
  type PagePluginOptions = {
6
+ /** Where `puckHandler` serves the pages API. Defaults to `/api/puck/pages`. */
6
7
  host?: string;
7
8
  /** Where the site renders pages, without a trailing slash, for "View page" links. Defaults to this origin. */
8
9
  siteUrl?: string;
package/dist/index.js CHANGED
@@ -8534,10 +8534,31 @@ var getActiveVersion = (state) => {
8534
8534
  // src/hooks/usePageApi.ts
8535
8535
  init_react_import();
8536
8536
  var import_react24 = require("react");
8537
+ var versionKey = (version2) => String(version2);
8538
+ var toPage = (page) => ({
8539
+ id: page.id,
8540
+ path: page.path,
8541
+ status: page.publishedVersion === null ? "unpublished" : "published",
8542
+ publishedVersionId: page.publishedVersion === null ? void 0 : versionKey(page.publishedVersion)
8543
+ });
8544
+ var toPageRead = (page) => ({
8545
+ page: toPage(page),
8546
+ version: {
8547
+ id: versionKey(page.version),
8548
+ data: page.data,
8549
+ versionNumber: page.version,
8550
+ createdAt: page.createdAt
8551
+ }
8552
+ });
8553
+ var toVersionSummary = (page) => ({
8554
+ id: versionKey(page.version),
8555
+ versionNumber: page.version,
8556
+ createdAt: page.createdAt
8557
+ });
8537
8558
  var post = (url, body) => fetch(url, {
8538
8559
  method: "POST",
8539
8560
  headers: { "content-type": "application/json" },
8540
- body: JSON.stringify(body)
8561
+ body: JSON.stringify(body ?? {})
8541
8562
  });
8542
8563
  var PageApiError = class extends Error {
8543
8564
  constructor(status, body) {
@@ -8563,39 +8584,64 @@ var toQuery = (params) => {
8563
8584
  var usePageApi = (opts) => {
8564
8585
  const host = opts?.host ?? "/api/puck/pages";
8565
8586
  return (0, import_react24.useMemo)(() => {
8566
- const listPages = (page) => json(
8567
- fetch(`${host}${toQuery({ page })}`, { method: "GET" })
8568
- );
8587
+ const listPages = async (offset4) => {
8588
+ const list = await json(
8589
+ fetch(`${host}${toQuery({ offset: offset4 })}`, { method: "GET" })
8590
+ );
8591
+ return {
8592
+ ...list,
8593
+ // Listed at their latest versions.
8594
+ results: list.results.map((page) => ({
8595
+ ...toPage(page),
8596
+ latestVersionId: versionKey(page.version)
8597
+ }))
8598
+ };
8599
+ };
8569
8600
  return {
8570
8601
  listPages,
8571
8602
  /** Reads every page of the branch's pages. */
8572
8603
  listAllPages: async () => {
8573
8604
  const pages = [];
8574
- for (let page = 0; ; page++) {
8575
- const data = await listPages(page);
8605
+ while (true) {
8606
+ const data = await listPages(pages.length);
8576
8607
  pages.push(...data.results);
8577
- if (!data.hasMore) return pages;
8608
+ if (!data.hasMore || !data.results.length) return pages;
8578
8609
  }
8579
8610
  },
8580
- /** Reads a page by id, at its latest version unless `versionId` is given. */
8611
+ /** Reads a page at a version, its latest unless `versionId` is given. */
8581
8612
  readPage: (id, versionId) => json(
8582
- fetch(`${host}/${id}${toQuery({ versionId })}`, { method: "GET" })
8583
- ),
8613
+ fetch(`${host}/${id}${toQuery({ version: versionId })}`, {
8614
+ method: "GET"
8615
+ })
8616
+ ).then(toPageRead),
8584
8617
  /** Reads the page at a path, at its latest version. */
8585
8618
  readPageByPath: (path) => json(
8586
8619
  fetch(`${host}/by-path${toQuery({ path })}`, { method: "GET" })
8587
- ),
8588
- /** Reads a page of version history, the first unless `page` is given. */
8589
- readVersions: (id, page) => json(
8590
- fetch(`${host}/${id}/versions${toQuery({ page })}`, {
8591
- method: "GET"
8592
- })
8593
- ),
8594
- createPage: (body) => json(post(host, body)),
8620
+ ).then(toPageRead),
8621
+ /** Reads a page's version history from `offset`, the newest by default. */
8622
+ readVersions: async (id, offset4) => {
8623
+ const list = await json(
8624
+ fetch(`${host}/${id}/versions${toQuery({ offset: offset4 })}`, {
8625
+ method: "GET"
8626
+ })
8627
+ );
8628
+ return { ...list, results: list.results.map(toVersionSummary) };
8629
+ },
8630
+ createPage: (body) => json(post(host, body)).then(toPageRead),
8595
8631
  /** Saves a new version of a page, refused with a 409 if a newer one was saved since its base. */
8596
- saveVersion: (id, body) => json(post(`${host}/${id}/versions`, body)),
8597
- /** Moves, publishes or unpublishes a page, without saving a version. */
8598
- updatePage: (id, body) => json(post(`${host}/${id}`, body)),
8632
+ saveVersion: (id, { data, baseVersionId }) => json(
8633
+ post(`${host}/${id}/versions`, {
8634
+ data,
8635
+ previousVersion: baseVersionId === void 0 ? void 0 : Number(baseVersionId)
8636
+ })
8637
+ ).then(toPageRead),
8638
+ /** Moves a page, without saving a version. */
8639
+ movePage: (id, path) => json(post(`${host}/${id}`, { path })).then(toPage),
8640
+ /** Publishes one of a page's versions. */
8641
+ publishPage: (id, versionId) => json(
8642
+ post(`${host}/${id}/publish`, { version: Number(versionId) })
8643
+ ).then(toPage),
8644
+ unpublishPage: (id) => json(post(`${host}/${id}/unpublish`)).then(toPage),
8599
8645
  deletePage: (id) => json(fetch(`${host}/${id}`, { method: "DELETE" }))
8600
8646
  };
8601
8647
  }, [host]);
@@ -8702,7 +8748,7 @@ var withLoading = async (load, unload, openingVersion) => {
8702
8748
  if (isCurrent()) usePagesStore.getState().setLoading(false);
8703
8749
  }
8704
8750
  };
8705
- var syncPublished = ({ page }) => usePagesStore.getState().setPagePublished(
8751
+ var syncPublished = (page) => usePagesStore.getState().setPagePublished(
8706
8752
  page.id,
8707
8753
  !!page.publishedVersionId,
8708
8754
  page.publishedVersionId
@@ -8732,15 +8778,12 @@ var usePageActions = (opts) => {
8732
8778
  config
8733
8779
  );
8734
8780
  };
8735
- const confirmWrite = ({ page }, pageId, status, showUnpublished) => {
8781
+ const confirmWrite = (path, status, showUnpublished) => {
8736
8782
  if (status === "published") {
8737
- showPublishedToast(`${siteUrl ?? ""}${page.path}`);
8783
+ showPublishedToast(`${siteUrl ?? ""}${path}`);
8738
8784
  } else {
8739
8785
  showUnpublished();
8740
8786
  }
8741
- if (page.id === pageId) return;
8742
- loadPageList().catch(() => {
8743
- });
8744
8787
  };
8745
8788
  const readPageAt = (path) => api.readPageByPath(path).catch((error2) => {
8746
8789
  if (error2 instanceof PageApiError && error2.status === 404) return null;
@@ -8751,35 +8794,31 @@ var usePageActions = (opts) => {
8751
8794
  if (isCurrent()) usePagesStore.getState().setPages(pages);
8752
8795
  return pages;
8753
8796
  };
8754
- const createHomePage = async () => api.createPage({
8755
- path: "/",
8756
- initialVersion: { data: await createEmptyPageData() }
8757
- }).catch(() => {
8797
+ const createHomePage = async () => api.createPage({ path: "/", data: await createEmptyPageData() }).catch(() => {
8758
8798
  });
8759
- const showPage = async (page, isCurrent) => {
8799
+ const showPage = async ({ page, version: version2 }, isCurrent) => {
8760
8800
  if (!isCurrent()) return;
8761
8801
  const store = usePagesStore.getState();
8762
- const versions = page.versions ?? [];
8763
8802
  store.setActivePage(page.path);
8764
8803
  store.setActiveVersion(null);
8765
- store.setPageVersions(page.id, versions, page.path);
8766
- await loadPageData(versions[0]?.data, isCurrent);
8804
+ store.setPageVersions(page.id, [version2], page.path);
8805
+ await loadPageData(version2.data, isCurrent);
8767
8806
  };
8768
8807
  const showPageWithList = async (path, isCurrent) => {
8769
- let [pages, data] = await Promise.all([
8808
+ let [pages, read] = await Promise.all([
8770
8809
  loadPageList(isCurrent),
8771
8810
  readPageAt(path)
8772
8811
  ]);
8773
8812
  if (!pages.length) {
8774
8813
  await createHomePage();
8775
- [pages, data] = await Promise.all([
8814
+ [pages, read] = await Promise.all([
8776
8815
  loadPageList(isCurrent),
8777
8816
  readPageAt("/")
8778
8817
  ]);
8779
8818
  if (!pages.length) throw new Error("Failed to create page");
8780
8819
  }
8781
- data ??= await api.readPage(pages[0].id);
8782
- await showPage(data.page, isCurrent);
8820
+ read ??= await api.readPage(pages[0].id);
8821
+ await showPage(read, isCurrent);
8783
8822
  };
8784
8823
  const openPage = (path = "/") => withLoading(
8785
8824
  (isCurrent) => showPageWithList(path, isCurrent),
@@ -8802,13 +8841,9 @@ var usePageActions = (opts) => {
8802
8841
  await loadPageData(data, isCurrent);
8803
8842
  }, unloadPageData);
8804
8843
  try {
8805
- const { page } = await api.createPage({
8806
- path,
8807
- initialVersion: { data }
8808
- });
8809
- const saved = page.versions?.[0];
8810
- if (saved) rememberResolvedData(saved.data, data);
8811
- usePagesStore.getState().setPageVersions(page.id, page.versions ?? [], path);
8844
+ const { page, version: version2 } = await api.createPage({ path, data });
8845
+ rememberResolvedData(version2.data, data);
8846
+ usePagesStore.getState().setPageVersions(page.id, [version2], path);
8812
8847
  } catch {
8813
8848
  showUndoableErrorToast("The page couldn't be created.", () => {
8814
8849
  const store = usePagesStore.getState();
@@ -8825,7 +8860,7 @@ var usePageActions = (opts) => {
8825
8860
  store.setActivePage(page.path);
8826
8861
  store.setActiveVersion(null);
8827
8862
  if (loaded) return loadPageData(loaded.data, isCurrent);
8828
- return page.id ? api.readPage(page.id).then((data) => showPage(data.page, isCurrent)) : showPageWithList(page.path, isCurrent);
8863
+ return page.id ? api.readPage(page.id).then((read) => showPage(read, isCurrent)) : showPageWithList(page.path, isCurrent);
8829
8864
  }, unloadPageData);
8830
8865
  };
8831
8866
  const openVersion = (pageId, summary) => withLoading(
@@ -8835,11 +8870,7 @@ var usePageActions = (opts) => {
8835
8870
  const page = store.pagesData.find((item) => item.id === pageId);
8836
8871
  let version2 = page?.versions?.find((item) => item.id === versionId);
8837
8872
  if (!version2) {
8838
- const data = await api.readPage(pageId, versionId);
8839
- version2 = data.page.versions?.find((item) => item.id === versionId);
8840
- if (!version2) {
8841
- throw new Error("Version not found");
8842
- }
8873
+ ({ version: version2 } = await api.readPage(pageId, versionId));
8843
8874
  store.addPageVersion(pageId, version2);
8844
8875
  }
8845
8876
  await loadPageData(version2.data, isCurrent);
@@ -8889,46 +8920,43 @@ var usePageActions = (opts) => {
8889
8920
  store.setActiveVersion(null);
8890
8921
  history.setHistories([{ state: appState }]);
8891
8922
  try {
8892
- const data = await api.saveVersion(pageId, {
8893
- data: sent,
8894
- baseVersionId: baseVersionId ?? latestLoaded?.id
8895
- });
8896
- const saved = data.page.versions ?? [];
8923
+ const { page: savedPage, version: saved } = await api.saveVersion(
8924
+ pageId,
8925
+ { data: sent, baseVersionId: baseVersionId ?? latestLoaded?.id }
8926
+ );
8897
8927
  const current = usePagesStore.getState();
8898
- if (saved[0]) rememberResolvedData(saved[0].data, sent);
8928
+ rememberResolvedData(saved.data, sent);
8899
8929
  current.setPageVersions(
8900
- data.page.id,
8930
+ pageId,
8901
8931
  [
8902
- ...saved,
8932
+ saved,
8903
8933
  ...loadedVersions.filter(
8904
- (version2) => version2.id && !saved.some((item) => item.id === version2.id)
8934
+ (version2) => version2.id && version2.id !== saved.id
8905
8935
  )
8906
8936
  ],
8907
8937
  path
8908
8938
  );
8909
- syncPublished(data);
8939
+ syncPublished(savedPage);
8910
8940
  if (current.activePage === path && current.activeVersion === null) {
8911
- current.setActiveVersion(saved[0]?.id ?? null);
8941
+ current.setActiveVersion(saved.id ?? null);
8912
8942
  }
8913
- if (status === "published" && saved[0]?.id) {
8943
+ if (status === "published") {
8914
8944
  await setVersionStatus({
8915
- page: {
8916
- ...page,
8917
- id: data.page.id,
8918
- latestVersionId: saved[0].id,
8919
- versions: void 0
8920
- },
8945
+ page: { ...page, latestVersionId: saved.id, versions: void 0 },
8921
8946
  status: "published",
8922
- versionId: saved[0].id
8947
+ versionId: saved.id
8923
8948
  });
8924
8949
  return;
8925
8950
  }
8926
- syncPublished(data);
8927
- confirmWrite(data, pageId, status, showDraftToast);
8951
+ confirmWrite(path, status, showDraftToast);
8928
8952
  } catch (error2) {
8929
8953
  if (error2 instanceof PageApiError && error2.status === 409) {
8930
8954
  markUnsaved();
8931
- return error2.body.latestVersion;
8955
+ const { latestVersion } = error2.body;
8956
+ return {
8957
+ id: versionKey(latestVersion),
8958
+ versionNumber: latestVersion
8959
+ };
8932
8960
  }
8933
8961
  markUnsaved();
8934
8962
  showSaveErrorToast(status);
@@ -8950,11 +8978,9 @@ var usePageActions = (opts) => {
8950
8978
  store.setPagePending(pageId, true);
8951
8979
  store.setPagePublished(pageId, status === "published", versionId);
8952
8980
  try {
8953
- const data = await api.updatePage(pageId, {
8954
- publishedVersionId: status === "published" ? versionId : null
8955
- });
8981
+ const data = status === "published" ? await api.publishPage(pageId, versionId) : await api.unpublishPage(pageId);
8956
8982
  syncPublished(data);
8957
- confirmWrite(data, pageId, status, showUnpublishToast);
8983
+ confirmWrite(data.path, status, showUnpublishToast);
8958
8984
  return true;
8959
8985
  } catch {
8960
8986
  showUndoableErrorToast(
@@ -8976,7 +9002,7 @@ var usePageActions = (opts) => {
8976
9002
  store.setPagePending(pageId, true);
8977
9003
  store.renamePage(page.path, path);
8978
9004
  try {
8979
- await api.updatePage(pageId, { path });
9005
+ await api.movePage(pageId, path);
8980
9006
  } catch {
8981
9007
  usePagesStore.getState().renamePage(path, page.path);
8982
9008
  showRenameErrorToast();
@@ -9279,7 +9305,7 @@ var import_react28 = require("react");
9279
9305
  var historyId = (version2) => version2.id ?? `saving-${version2.versionNumber}`;
9280
9306
  var emptyHistory = {
9281
9307
  versions: null,
9282
- page: 0,
9308
+ offset: 0,
9283
9309
  count: null,
9284
9310
  hasMore: false,
9285
9311
  error: false,
@@ -9312,7 +9338,7 @@ var useVersionHistory = ({
9312
9338
  const data = await loadVersions(id);
9313
9339
  update2(id, () => ({
9314
9340
  versions: data.results,
9315
- page: 0,
9341
+ offset: data.results.length,
9316
9342
  count: data.count,
9317
9343
  hasMore: data.hasMore,
9318
9344
  error: false,
@@ -9336,7 +9362,7 @@ var useVersionHistory = ({
9336
9362
  }, [pageId, refresh]);
9337
9363
  const history = pageId && histories[pageId] || emptyHistory;
9338
9364
  const loadMore = (0, import_react28.useCallback)(async () => {
9339
- const next = history.page + 1;
9365
+ const { offset: offset4 } = history;
9340
9366
  if (!pageId || !history.hasMore || loadingMore.current.has(pageId) || refreshing.current.has(pageId)) {
9341
9367
  return;
9342
9368
  }
@@ -9345,7 +9371,7 @@ var useVersionHistory = ({
9345
9371
  loadingMore.current.add(pageId);
9346
9372
  update2(pageId, (current) => ({ ...current, moreError: false }));
9347
9373
  try {
9348
- const data = await loadVersions(pageId, next);
9374
+ const data = await loadVersions(pageId, offset4);
9349
9375
  if (isStale()) return;
9350
9376
  update2(pageId, (current) => ({
9351
9377
  ...current,
@@ -9356,7 +9382,7 @@ var useVersionHistory = ({
9356
9382
  (version2) => !current.versions?.some((item) => item.id === version2.id)
9357
9383
  )
9358
9384
  ],
9359
- page: next,
9385
+ offset: offset4 + data.results.length,
9360
9386
  count: data.count,
9361
9387
  hasMore: data.hasMore
9362
9388
  }));
@@ -9367,7 +9393,7 @@ var useVersionHistory = ({
9367
9393
  } finally {
9368
9394
  loadingMore.current.delete(pageId);
9369
9395
  }
9370
- }, [history.hasMore, history.page, loadVersions, pageId, update2]);
9396
+ }, [history.hasMore, history.offset, loadVersions, pageId, update2]);
9371
9397
  const saved = (0, import_react28.useMemo)(() => {
9372
9398
  const newest = history.versions?.[0]?.versionNumber ?? 0;
9373
9399
  if (!history.versions) return [];
package/dist/index.mjs CHANGED
@@ -8529,10 +8529,31 @@ var getActiveVersion = (state) => {
8529
8529
  // src/hooks/usePageApi.ts
8530
8530
  init_react_import();
8531
8531
  import { useMemo as useMemo20 } from "react";
8532
+ var versionKey = (version2) => String(version2);
8533
+ var toPage = (page) => ({
8534
+ id: page.id,
8535
+ path: page.path,
8536
+ status: page.publishedVersion === null ? "unpublished" : "published",
8537
+ publishedVersionId: page.publishedVersion === null ? void 0 : versionKey(page.publishedVersion)
8538
+ });
8539
+ var toPageRead = (page) => ({
8540
+ page: toPage(page),
8541
+ version: {
8542
+ id: versionKey(page.version),
8543
+ data: page.data,
8544
+ versionNumber: page.version,
8545
+ createdAt: page.createdAt
8546
+ }
8547
+ });
8548
+ var toVersionSummary = (page) => ({
8549
+ id: versionKey(page.version),
8550
+ versionNumber: page.version,
8551
+ createdAt: page.createdAt
8552
+ });
8532
8553
  var post = (url, body) => fetch(url, {
8533
8554
  method: "POST",
8534
8555
  headers: { "content-type": "application/json" },
8535
- body: JSON.stringify(body)
8556
+ body: JSON.stringify(body ?? {})
8536
8557
  });
8537
8558
  var PageApiError = class extends Error {
8538
8559
  constructor(status, body) {
@@ -8558,39 +8579,64 @@ var toQuery = (params) => {
8558
8579
  var usePageApi = (opts) => {
8559
8580
  const host = opts?.host ?? "/api/puck/pages";
8560
8581
  return useMemo20(() => {
8561
- const listPages = (page) => json(
8562
- fetch(`${host}${toQuery({ page })}`, { method: "GET" })
8563
- );
8582
+ const listPages = async (offset4) => {
8583
+ const list = await json(
8584
+ fetch(`${host}${toQuery({ offset: offset4 })}`, { method: "GET" })
8585
+ );
8586
+ return {
8587
+ ...list,
8588
+ // Listed at their latest versions.
8589
+ results: list.results.map((page) => ({
8590
+ ...toPage(page),
8591
+ latestVersionId: versionKey(page.version)
8592
+ }))
8593
+ };
8594
+ };
8564
8595
  return {
8565
8596
  listPages,
8566
8597
  /** Reads every page of the branch's pages. */
8567
8598
  listAllPages: async () => {
8568
8599
  const pages = [];
8569
- for (let page = 0; ; page++) {
8570
- const data = await listPages(page);
8600
+ while (true) {
8601
+ const data = await listPages(pages.length);
8571
8602
  pages.push(...data.results);
8572
- if (!data.hasMore) return pages;
8603
+ if (!data.hasMore || !data.results.length) return pages;
8573
8604
  }
8574
8605
  },
8575
- /** Reads a page by id, at its latest version unless `versionId` is given. */
8606
+ /** Reads a page at a version, its latest unless `versionId` is given. */
8576
8607
  readPage: (id, versionId) => json(
8577
- fetch(`${host}/${id}${toQuery({ versionId })}`, { method: "GET" })
8578
- ),
8608
+ fetch(`${host}/${id}${toQuery({ version: versionId })}`, {
8609
+ method: "GET"
8610
+ })
8611
+ ).then(toPageRead),
8579
8612
  /** Reads the page at a path, at its latest version. */
8580
8613
  readPageByPath: (path) => json(
8581
8614
  fetch(`${host}/by-path${toQuery({ path })}`, { method: "GET" })
8582
- ),
8583
- /** Reads a page of version history, the first unless `page` is given. */
8584
- readVersions: (id, page) => json(
8585
- fetch(`${host}/${id}/versions${toQuery({ page })}`, {
8586
- method: "GET"
8587
- })
8588
- ),
8589
- createPage: (body) => json(post(host, body)),
8615
+ ).then(toPageRead),
8616
+ /** Reads a page's version history from `offset`, the newest by default. */
8617
+ readVersions: async (id, offset4) => {
8618
+ const list = await json(
8619
+ fetch(`${host}/${id}/versions${toQuery({ offset: offset4 })}`, {
8620
+ method: "GET"
8621
+ })
8622
+ );
8623
+ return { ...list, results: list.results.map(toVersionSummary) };
8624
+ },
8625
+ createPage: (body) => json(post(host, body)).then(toPageRead),
8590
8626
  /** Saves a new version of a page, refused with a 409 if a newer one was saved since its base. */
8591
- saveVersion: (id, body) => json(post(`${host}/${id}/versions`, body)),
8592
- /** Moves, publishes or unpublishes a page, without saving a version. */
8593
- updatePage: (id, body) => json(post(`${host}/${id}`, body)),
8627
+ saveVersion: (id, { data, baseVersionId }) => json(
8628
+ post(`${host}/${id}/versions`, {
8629
+ data,
8630
+ previousVersion: baseVersionId === void 0 ? void 0 : Number(baseVersionId)
8631
+ })
8632
+ ).then(toPageRead),
8633
+ /** Moves a page, without saving a version. */
8634
+ movePage: (id, path) => json(post(`${host}/${id}`, { path })).then(toPage),
8635
+ /** Publishes one of a page's versions. */
8636
+ publishPage: (id, versionId) => json(
8637
+ post(`${host}/${id}/publish`, { version: Number(versionId) })
8638
+ ).then(toPage),
8639
+ unpublishPage: (id) => json(post(`${host}/${id}/unpublish`)).then(toPage),
8594
8640
  deletePage: (id) => json(fetch(`${host}/${id}`, { method: "DELETE" }))
8595
8641
  };
8596
8642
  }, [host]);
@@ -8700,7 +8746,7 @@ var withLoading = async (load, unload, openingVersion) => {
8700
8746
  if (isCurrent()) usePagesStore.getState().setLoading(false);
8701
8747
  }
8702
8748
  };
8703
- var syncPublished = ({ page }) => usePagesStore.getState().setPagePublished(
8749
+ var syncPublished = (page) => usePagesStore.getState().setPagePublished(
8704
8750
  page.id,
8705
8751
  !!page.publishedVersionId,
8706
8752
  page.publishedVersionId
@@ -8730,15 +8776,12 @@ var usePageActions = (opts) => {
8730
8776
  config
8731
8777
  );
8732
8778
  };
8733
- const confirmWrite = ({ page }, pageId, status, showUnpublished) => {
8779
+ const confirmWrite = (path, status, showUnpublished) => {
8734
8780
  if (status === "published") {
8735
- showPublishedToast(`${siteUrl ?? ""}${page.path}`);
8781
+ showPublishedToast(`${siteUrl ?? ""}${path}`);
8736
8782
  } else {
8737
8783
  showUnpublished();
8738
8784
  }
8739
- if (page.id === pageId) return;
8740
- loadPageList().catch(() => {
8741
- });
8742
8785
  };
8743
8786
  const readPageAt = (path) => api.readPageByPath(path).catch((error2) => {
8744
8787
  if (error2 instanceof PageApiError && error2.status === 404) return null;
@@ -8749,35 +8792,31 @@ var usePageActions = (opts) => {
8749
8792
  if (isCurrent()) usePagesStore.getState().setPages(pages);
8750
8793
  return pages;
8751
8794
  };
8752
- const createHomePage = async () => api.createPage({
8753
- path: "/",
8754
- initialVersion: { data: await createEmptyPageData() }
8755
- }).catch(() => {
8795
+ const createHomePage = async () => api.createPage({ path: "/", data: await createEmptyPageData() }).catch(() => {
8756
8796
  });
8757
- const showPage = async (page, isCurrent) => {
8797
+ const showPage = async ({ page, version: version2 }, isCurrent) => {
8758
8798
  if (!isCurrent()) return;
8759
8799
  const store = usePagesStore.getState();
8760
- const versions = page.versions ?? [];
8761
8800
  store.setActivePage(page.path);
8762
8801
  store.setActiveVersion(null);
8763
- store.setPageVersions(page.id, versions, page.path);
8764
- await loadPageData(versions[0]?.data, isCurrent);
8802
+ store.setPageVersions(page.id, [version2], page.path);
8803
+ await loadPageData(version2.data, isCurrent);
8765
8804
  };
8766
8805
  const showPageWithList = async (path, isCurrent) => {
8767
- let [pages, data] = await Promise.all([
8806
+ let [pages, read] = await Promise.all([
8768
8807
  loadPageList(isCurrent),
8769
8808
  readPageAt(path)
8770
8809
  ]);
8771
8810
  if (!pages.length) {
8772
8811
  await createHomePage();
8773
- [pages, data] = await Promise.all([
8812
+ [pages, read] = await Promise.all([
8774
8813
  loadPageList(isCurrent),
8775
8814
  readPageAt("/")
8776
8815
  ]);
8777
8816
  if (!pages.length) throw new Error("Failed to create page");
8778
8817
  }
8779
- data ??= await api.readPage(pages[0].id);
8780
- await showPage(data.page, isCurrent);
8818
+ read ??= await api.readPage(pages[0].id);
8819
+ await showPage(read, isCurrent);
8781
8820
  };
8782
8821
  const openPage = (path = "/") => withLoading(
8783
8822
  (isCurrent) => showPageWithList(path, isCurrent),
@@ -8800,13 +8839,9 @@ var usePageActions = (opts) => {
8800
8839
  await loadPageData(data, isCurrent);
8801
8840
  }, unloadPageData);
8802
8841
  try {
8803
- const { page } = await api.createPage({
8804
- path,
8805
- initialVersion: { data }
8806
- });
8807
- const saved = page.versions?.[0];
8808
- if (saved) rememberResolvedData(saved.data, data);
8809
- usePagesStore.getState().setPageVersions(page.id, page.versions ?? [], path);
8842
+ const { page, version: version2 } = await api.createPage({ path, data });
8843
+ rememberResolvedData(version2.data, data);
8844
+ usePagesStore.getState().setPageVersions(page.id, [version2], path);
8810
8845
  } catch {
8811
8846
  showUndoableErrorToast("The page couldn't be created.", () => {
8812
8847
  const store = usePagesStore.getState();
@@ -8823,7 +8858,7 @@ var usePageActions = (opts) => {
8823
8858
  store.setActivePage(page.path);
8824
8859
  store.setActiveVersion(null);
8825
8860
  if (loaded) return loadPageData(loaded.data, isCurrent);
8826
- return page.id ? api.readPage(page.id).then((data) => showPage(data.page, isCurrent)) : showPageWithList(page.path, isCurrent);
8861
+ return page.id ? api.readPage(page.id).then((read) => showPage(read, isCurrent)) : showPageWithList(page.path, isCurrent);
8827
8862
  }, unloadPageData);
8828
8863
  };
8829
8864
  const openVersion = (pageId, summary) => withLoading(
@@ -8833,11 +8868,7 @@ var usePageActions = (opts) => {
8833
8868
  const page = store.pagesData.find((item) => item.id === pageId);
8834
8869
  let version2 = page?.versions?.find((item) => item.id === versionId);
8835
8870
  if (!version2) {
8836
- const data = await api.readPage(pageId, versionId);
8837
- version2 = data.page.versions?.find((item) => item.id === versionId);
8838
- if (!version2) {
8839
- throw new Error("Version not found");
8840
- }
8871
+ ({ version: version2 } = await api.readPage(pageId, versionId));
8841
8872
  store.addPageVersion(pageId, version2);
8842
8873
  }
8843
8874
  await loadPageData(version2.data, isCurrent);
@@ -8887,46 +8918,43 @@ var usePageActions = (opts) => {
8887
8918
  store.setActiveVersion(null);
8888
8919
  history.setHistories([{ state: appState }]);
8889
8920
  try {
8890
- const data = await api.saveVersion(pageId, {
8891
- data: sent,
8892
- baseVersionId: baseVersionId ?? latestLoaded?.id
8893
- });
8894
- const saved = data.page.versions ?? [];
8921
+ const { page: savedPage, version: saved } = await api.saveVersion(
8922
+ pageId,
8923
+ { data: sent, baseVersionId: baseVersionId ?? latestLoaded?.id }
8924
+ );
8895
8925
  const current = usePagesStore.getState();
8896
- if (saved[0]) rememberResolvedData(saved[0].data, sent);
8926
+ rememberResolvedData(saved.data, sent);
8897
8927
  current.setPageVersions(
8898
- data.page.id,
8928
+ pageId,
8899
8929
  [
8900
- ...saved,
8930
+ saved,
8901
8931
  ...loadedVersions.filter(
8902
- (version2) => version2.id && !saved.some((item) => item.id === version2.id)
8932
+ (version2) => version2.id && version2.id !== saved.id
8903
8933
  )
8904
8934
  ],
8905
8935
  path
8906
8936
  );
8907
- syncPublished(data);
8937
+ syncPublished(savedPage);
8908
8938
  if (current.activePage === path && current.activeVersion === null) {
8909
- current.setActiveVersion(saved[0]?.id ?? null);
8939
+ current.setActiveVersion(saved.id ?? null);
8910
8940
  }
8911
- if (status === "published" && saved[0]?.id) {
8941
+ if (status === "published") {
8912
8942
  await setVersionStatus({
8913
- page: {
8914
- ...page,
8915
- id: data.page.id,
8916
- latestVersionId: saved[0].id,
8917
- versions: void 0
8918
- },
8943
+ page: { ...page, latestVersionId: saved.id, versions: void 0 },
8919
8944
  status: "published",
8920
- versionId: saved[0].id
8945
+ versionId: saved.id
8921
8946
  });
8922
8947
  return;
8923
8948
  }
8924
- syncPublished(data);
8925
- confirmWrite(data, pageId, status, showDraftToast);
8949
+ confirmWrite(path, status, showDraftToast);
8926
8950
  } catch (error2) {
8927
8951
  if (error2 instanceof PageApiError && error2.status === 409) {
8928
8952
  markUnsaved();
8929
- return error2.body.latestVersion;
8953
+ const { latestVersion } = error2.body;
8954
+ return {
8955
+ id: versionKey(latestVersion),
8956
+ versionNumber: latestVersion
8957
+ };
8930
8958
  }
8931
8959
  markUnsaved();
8932
8960
  showSaveErrorToast(status);
@@ -8948,11 +8976,9 @@ var usePageActions = (opts) => {
8948
8976
  store.setPagePending(pageId, true);
8949
8977
  store.setPagePublished(pageId, status === "published", versionId);
8950
8978
  try {
8951
- const data = await api.updatePage(pageId, {
8952
- publishedVersionId: status === "published" ? versionId : null
8953
- });
8979
+ const data = status === "published" ? await api.publishPage(pageId, versionId) : await api.unpublishPage(pageId);
8954
8980
  syncPublished(data);
8955
- confirmWrite(data, pageId, status, showUnpublishToast);
8981
+ confirmWrite(data.path, status, showUnpublishToast);
8956
8982
  return true;
8957
8983
  } catch {
8958
8984
  showUndoableErrorToast(
@@ -8974,7 +9000,7 @@ var usePageActions = (opts) => {
8974
9000
  store.setPagePending(pageId, true);
8975
9001
  store.renamePage(page.path, path);
8976
9002
  try {
8977
- await api.updatePage(pageId, { path });
9003
+ await api.movePage(pageId, path);
8978
9004
  } catch {
8979
9005
  usePagesStore.getState().renamePage(path, page.path);
8980
9006
  showRenameErrorToast();
@@ -9277,7 +9303,7 @@ import { useCallback as useCallback10, useEffect as useEffect30, useMemo as useM
9277
9303
  var historyId = (version2) => version2.id ?? `saving-${version2.versionNumber}`;
9278
9304
  var emptyHistory = {
9279
9305
  versions: null,
9280
- page: 0,
9306
+ offset: 0,
9281
9307
  count: null,
9282
9308
  hasMore: false,
9283
9309
  error: false,
@@ -9310,7 +9336,7 @@ var useVersionHistory = ({
9310
9336
  const data = await loadVersions(id);
9311
9337
  update2(id, () => ({
9312
9338
  versions: data.results,
9313
- page: 0,
9339
+ offset: data.results.length,
9314
9340
  count: data.count,
9315
9341
  hasMore: data.hasMore,
9316
9342
  error: false,
@@ -9334,7 +9360,7 @@ var useVersionHistory = ({
9334
9360
  }, [pageId, refresh]);
9335
9361
  const history = pageId && histories[pageId] || emptyHistory;
9336
9362
  const loadMore = useCallback10(async () => {
9337
- const next = history.page + 1;
9363
+ const { offset: offset4 } = history;
9338
9364
  if (!pageId || !history.hasMore || loadingMore.current.has(pageId) || refreshing.current.has(pageId)) {
9339
9365
  return;
9340
9366
  }
@@ -9343,7 +9369,7 @@ var useVersionHistory = ({
9343
9369
  loadingMore.current.add(pageId);
9344
9370
  update2(pageId, (current) => ({ ...current, moreError: false }));
9345
9371
  try {
9346
- const data = await loadVersions(pageId, next);
9372
+ const data = await loadVersions(pageId, offset4);
9347
9373
  if (isStale()) return;
9348
9374
  update2(pageId, (current) => ({
9349
9375
  ...current,
@@ -9354,7 +9380,7 @@ var useVersionHistory = ({
9354
9380
  (version2) => !current.versions?.some((item) => item.id === version2.id)
9355
9381
  )
9356
9382
  ],
9357
- page: next,
9383
+ offset: offset4 + data.results.length,
9358
9384
  count: data.count,
9359
9385
  hasMore: data.hasMore
9360
9386
  }));
@@ -9365,7 +9391,7 @@ var useVersionHistory = ({
9365
9391
  } finally {
9366
9392
  loadingMore.current.delete(pageId);
9367
9393
  }
9368
- }, [history.hasMore, history.page, loadVersions, pageId, update2]);
9394
+ }, [history.hasMore, history.offset, loadVersions, pageId, update2]);
9369
9395
  const saved = useMemo24(() => {
9370
9396
  const newest = history.versions?.[0]?.versionNumber ?? 0;
9371
9397
  if (!history.versions) return [];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@puckeditor/plugin-pages",
3
- "version": "0.9.0-canary.e81b45a6",
3
+ "version": "0.9.0-canary.ecc60986",
4
4
  "author": "Chris Villa <chris@puckeditor.com>",
5
5
  "repository": {
6
6
  "type": "git",
@@ -46,9 +46,9 @@
46
46
  "typescript": "^5.5.4",
47
47
  "vite-tsconfig-paths": "^5.1.4",
48
48
  "vitest": "^4.1.11",
49
- "eslint-config-custom": "0.9.0-canary.e81b45a6",
50
- "tsconfig": "0.9.0-canary.e81b45a6",
51
- "tsup-config": "0.9.0-canary.e81b45a6"
49
+ "eslint-config-custom": "0.9.0-canary.ecc60986",
50
+ "tsconfig": "0.9.0-canary.ecc60986",
51
+ "tsup-config": "0.9.0-canary.ecc60986"
52
52
  },
53
53
  "peerDependencies": {
54
54
  "@puckeditor/core": "^0",