@geekity/cms 0.52.0 → 0.53.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/admin/components/badge.njk +1 -0
- package/admin/components/cited-card.njk +32 -0
- package/admin/components/cited-preview.njk +2 -0
- package/admin/components/dashboard-widget-fill.njk +2 -0
- package/admin/components/dashboard-widget.njk +28 -0
- package/admin/pages/dashboard/home.njk +17 -19
- package/admin/pages/documents/editor.njk +6 -20
- package/admin/pages/federation/followers.njk +8 -4
- package/admin/pages/federation/resend.njk +2 -2
- package/admin/static/admin.css +68 -37
- package/admin/static/dashboard.js +44 -0
- package/admin/static/editor.js +23 -23
- package/dist/admin/cited-preview.d.ts +22 -0
- package/dist/admin/cited-preview.d.ts.map +1 -0
- package/dist/admin/cited-preview.js +41 -0
- package/dist/admin/cited-preview.js.map +1 -0
- package/dist/admin/dashboard.d.ts +7 -0
- package/dist/admin/dashboard.d.ts.map +1 -1
- package/dist/admin/dashboard.js +77 -15
- package/dist/admin/dashboard.js.map +1 -1
- package/dist/admin/documents.d.ts.map +1 -1
- package/dist/admin/documents.js +8 -12
- package/dist/admin/documents.js.map +1 -1
- package/dist/admin/federation.d.ts +4 -4
- package/dist/admin/federation.d.ts.map +1 -1
- package/dist/admin/federation.js +31 -16
- package/dist/admin/federation.js.map +1 -1
- package/dist/admin/indieauth-consent.js +1 -1
- package/dist/admin/indieauth-consent.js.map +1 -1
- package/dist/admin/routes.d.ts.map +1 -1
- package/dist/admin/routes.js +6 -0
- package/dist/admin/routes.js.map +1 -1
- package/dist/admin/taxonomy.d.ts.map +1 -1
- package/dist/admin/taxonomy.js +28 -19
- package/dist/admin/taxonomy.js.map +1 -1
- package/dist/admin/templates.d.ts +2 -0
- package/dist/admin/templates.d.ts.map +1 -1
- package/dist/admin/templates.js +2 -0
- package/dist/admin/templates.js.map +1 -1
- package/dist/admin/users.d.ts.map +1 -1
- package/dist/admin/users.js +11 -1
- package/dist/admin/users.js.map +1 -1
- package/dist/admin/widgets.d.ts +5 -0
- package/dist/admin/widgets.d.ts.map +1 -1
- package/dist/admin/widgets.js +31 -18
- package/dist/admin/widgets.js.map +1 -1
- package/dist/cli/commands.js +1 -1
- package/dist/cli/commands.js.map +1 -1
- package/dist/cli/resend.d.ts.map +1 -1
- package/dist/cli/resend.js +26 -5
- package/dist/cli/resend.js.map +1 -1
- package/dist/cli/run-job.d.ts +1 -1
- package/dist/cli/run-job.d.ts.map +1 -1
- package/dist/cli/run-job.js +2 -2
- package/dist/cli/run-job.js.map +1 -1
- package/dist/cli/user.js +5 -1
- package/dist/cli/user.js.map +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +41 -15
- package/dist/cms/services.js.map +1 -1
- package/dist/config.d.ts +20 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +8 -0
- package/dist/config.js.map +1 -1
- package/dist/content/authors.d.ts +6 -0
- package/dist/content/authors.d.ts.map +1 -1
- package/dist/content/authors.js +9 -0
- package/dist/content/authors.js.map +1 -1
- package/dist/content/reconcile.d.ts.map +1 -1
- package/dist/content/reconcile.js +20 -14
- package/dist/content/reconcile.js.map +1 -1
- package/dist/content/save.d.ts +33 -0
- package/dist/content/save.d.ts.map +1 -1
- package/dist/content/save.js +84 -5
- package/dist/content/save.js.map +1 -1
- package/dist/content/schedule.d.ts.map +1 -1
- package/dist/content/schedule.js +30 -6
- package/dist/content/schedule.js.map +1 -1
- package/dist/content/sync.d.ts +7 -0
- package/dist/content/sync.d.ts.map +1 -1
- package/dist/content/sync.js +41 -9
- package/dist/content/sync.js.map +1 -1
- package/dist/content/trash.d.ts.map +1 -1
- package/dist/content/trash.js +24 -17
- package/dist/content/trash.js.map +1 -1
- package/dist/content/write.d.ts.map +1 -1
- package/dist/content/write.js +64 -41
- package/dist/content/write.js.map +1 -1
- package/dist/federation/article.d.ts +27 -13
- package/dist/federation/article.d.ts.map +1 -1
- package/dist/federation/article.js +44 -33
- package/dist/federation/article.js.map +1 -1
- package/dist/federation/backfill.d.ts.map +1 -1
- package/dist/federation/backfill.js +3 -3
- package/dist/federation/backfill.js.map +1 -1
- package/dist/federation/citations.d.ts +1 -1
- package/dist/federation/citations.d.ts.map +1 -1
- package/dist/federation/citations.js +74 -19
- package/dist/federation/citations.js.map +1 -1
- package/dist/federation/delivery-plan.d.ts +17 -2
- package/dist/federation/delivery-plan.d.ts.map +1 -1
- package/dist/federation/delivery-plan.js +66 -6
- package/dist/federation/delivery-plan.js.map +1 -1
- package/dist/federation/delivery.d.ts +24 -18
- package/dist/federation/delivery.d.ts.map +1 -1
- package/dist/federation/delivery.js +202 -121
- package/dist/federation/delivery.js.map +1 -1
- package/dist/federation/federation.d.ts.map +1 -1
- package/dist/federation/federation.js +1 -3
- package/dist/federation/federation.js.map +1 -1
- package/dist/federation/handles.d.ts.map +1 -1
- package/dist/federation/handles.js +22 -1
- package/dist/federation/handles.js.map +1 -1
- package/dist/federation/keys.d.ts +5 -0
- package/dist/federation/keys.d.ts.map +1 -1
- package/dist/federation/keys.js +26 -1
- package/dist/federation/keys.js.map +1 -1
- package/dist/federation/object-ids.d.ts.map +1 -1
- package/dist/federation/object-ids.js +32 -13
- package/dist/federation/object-ids.js.map +1 -1
- package/dist/federation/ordered-queue.d.ts +16 -0
- package/dist/federation/ordered-queue.d.ts.map +1 -0
- package/dist/federation/ordered-queue.js +77 -0
- package/dist/federation/ordered-queue.js.map +1 -0
- package/dist/federation/outbox-observer.d.ts +3 -1
- package/dist/federation/outbox-observer.d.ts.map +1 -1
- package/dist/federation/outbox-observer.js +18 -6
- package/dist/federation/outbox-observer.js.map +1 -1
- package/dist/federation/paths.d.ts +3 -4
- package/dist/federation/paths.d.ts.map +1 -1
- package/dist/federation/paths.js +3 -4
- package/dist/federation/paths.js.map +1 -1
- package/dist/federation/profiles.d.ts.map +1 -1
- package/dist/federation/profiles.js +5 -4
- package/dist/federation/profiles.js.map +1 -1
- package/dist/federation/queue.d.ts +9 -4
- package/dist/federation/queue.d.ts.map +1 -1
- package/dist/federation/queue.js +12 -6
- package/dist/federation/queue.js.map +1 -1
- package/dist/federation/records.d.ts.map +1 -1
- package/dist/federation/records.js +17 -1
- package/dist/federation/records.js.map +1 -1
- package/dist/federation/relays.d.ts +20 -11
- package/dist/federation/relays.d.ts.map +1 -1
- package/dist/federation/relays.js +108 -83
- package/dist/federation/relays.js.map +1 -1
- package/dist/federation/reply-targets.d.ts +5 -2
- package/dist/federation/reply-targets.d.ts.map +1 -1
- package/dist/federation/reply-targets.js +24 -14
- package/dist/federation/reply-targets.js.map +1 -1
- package/dist/federation/resend-job.d.ts +10 -4
- package/dist/federation/resend-job.d.ts.map +1 -1
- package/dist/federation/resend-job.js +27 -19
- package/dist/federation/resend-job.js.map +1 -1
- package/dist/federation/retry-job.d.ts +26 -8
- package/dist/federation/retry-job.d.ts.map +1 -1
- package/dist/federation/retry-job.js +114 -45
- package/dist/federation/retry-job.js.map +1 -1
- package/dist/federation/send-deadline.d.ts +13 -0
- package/dist/federation/send-deadline.d.ts.map +1 -0
- package/dist/federation/send-deadline.js +30 -0
- package/dist/federation/send-deadline.js.map +1 -0
- package/dist/jobs/queue.d.ts.map +1 -1
- package/dist/jobs/queue.js +5 -4
- package/dist/jobs/queue.js.map +1 -1
- package/dist/jobs/types.d.ts +8 -2
- package/dist/jobs/types.d.ts.map +1 -1
- package/dist/jobs/types.js.map +1 -1
- package/dist/mcp/authoring/shared.d.ts.map +1 -1
- package/dist/mcp/authoring/shared.js +2 -3
- package/dist/mcp/authoring/shared.js.map +1 -1
- package/dist/mcp/repair/resend.js +1 -1
- package/dist/mcp/repair/resend.js.map +1 -1
- package/dist/mcp/repair/retry.d.ts.map +1 -1
- package/dist/mcp/repair/retry.js +20 -8
- package/dist/mcp/repair/retry.js.map +1 -1
- package/dist/micropub/endpoint.d.ts.map +1 -1
- package/dist/micropub/endpoint.js +3 -6
- package/dist/micropub/endpoint.js.map +1 -1
- package/dist/privacy/retention.d.ts.map +1 -1
- package/dist/privacy/retention.js +9 -0
- package/dist/privacy/retention.js.map +1 -1
- package/dist/site/setting-values.d.ts +3 -2
- package/dist/site/setting-values.d.ts.map +1 -1
- package/dist/site/setting-values.js +7 -4
- package/dist/site/setting-values.js.map +1 -1
- package/dist/site/users.d.ts +19 -1
- package/dist/site/users.d.ts.map +1 -1
- package/dist/site/users.js +31 -3
- package/dist/site/users.js.map +1 -1
- package/dist/store/deliveries.d.ts +24 -5
- package/dist/store/deliveries.d.ts.map +1 -1
- package/dist/store/deliveries.js +86 -31
- package/dist/store/deliveries.js.map +1 -1
- package/dist/store/queue-database.d.ts +19 -2
- package/dist/store/queue-database.d.ts.map +1 -1
- package/dist/store/queue-database.js +69 -4
- package/dist/store/queue-database.js.map +1 -1
- package/dist/store/queue-order.d.ts +17 -0
- package/dist/store/queue-order.d.ts.map +1 -0
- package/dist/store/queue-order.js +33 -0
- package/dist/store/queue-order.js.map +1 -0
- package/dist/store/relays.d.ts +5 -3
- package/dist/store/relays.d.ts.map +1 -1
- package/dist/store/relays.js +1 -1
- package/dist/store/relays.js.map +1 -1
- package/dist/store/schema.d.ts.map +1 -1
- package/dist/store/schema.js +12 -0
- package/dist/store/schema.js.map +1 -1
- package/dist/util/errors.d.ts +6 -0
- package/dist/util/errors.d.ts.map +1 -1
- package/dist/util/errors.js +11 -0
- package/dist/util/errors.js.map +1 -1
- package/dist/webmention/reply-contexts.d.ts +21 -3
- package/dist/webmention/reply-contexts.d.ts.map +1 -1
- package/dist/webmention/reply-contexts.js +93 -8
- package/dist/webmention/reply-contexts.js.map +1 -1
- package/dist/webmention/service.d.ts +2 -2
- package/dist/webmention/service.d.ts.map +1 -1
- package/dist/webmention/service.js +3 -16
- package/dist/webmention/service.js.map +1 -1
- package/package.json +10 -10
- package/themes/default/static/style.css +8 -8
package/dist/content/save.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { readFile } from 'node:fs/promises';
|
|
1
2
|
import path from 'node:path';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
3
|
+
import { dump } from 'js-yaml';
|
|
4
|
+
import { withFileLock, writeFileAtomically } from '../files/atomic.js';
|
|
5
|
+
import { exists, isNotFound } from '../util/files.js';
|
|
6
|
+
import { KNOWN_FRONT_MATTER_KEYS } from './document.js';
|
|
4
7
|
import { handleDirectory } from './handles.js';
|
|
5
8
|
import { parseDocument, typeForPath } from './parser.js';
|
|
6
9
|
import { defaultPermalink } from './slug.js';
|
|
@@ -59,6 +62,14 @@ export async function freeSlug(options) {
|
|
|
59
62
|
return slug;
|
|
60
63
|
}
|
|
61
64
|
}
|
|
65
|
+
/**
|
|
66
|
+
* Run one read-then-write of the documents with no other between the read and
|
|
67
|
+
* the write. The editor's save, a move to or from the trash, a taxonomy rename
|
|
68
|
+
* and the federation's stamp write the same files from what they last read.
|
|
69
|
+
*/
|
|
70
|
+
export function withDocumentWrites(contentDir, task) {
|
|
71
|
+
return withFileLock(path.join(contentDir, '.document-writes'), task);
|
|
72
|
+
}
|
|
62
73
|
/**
|
|
63
74
|
* The admin's write path: serialize, write the file atomically, then
|
|
64
75
|
* update the index directly rather than waiting for the watcher.
|
|
@@ -81,13 +92,81 @@ export async function saveDocument(options) {
|
|
|
81
92
|
options.store.upsert(document);
|
|
82
93
|
return document;
|
|
83
94
|
}
|
|
95
|
+
/**
|
|
96
|
+
* Add `activitypub.published` to a post's file as one inserted line, then
|
|
97
|
+
* update the index from the bytes written.
|
|
98
|
+
*
|
|
99
|
+
* Unlike {@link saveDocument} it does not serialize the document again, so the
|
|
100
|
+
* comments, key order, quoting and keys the CMS does not model that a
|
|
101
|
+
* hand-written file carries stay as they were. So does a date written with no
|
|
102
|
+
* offset, which a rewrite would turn into an instant read in the site's zone
|
|
103
|
+
* while the index and the activity already sent read it in the server's.
|
|
104
|
+
*
|
|
105
|
+
* A file that is gone, or that no longer reads as the version with
|
|
106
|
+
* {@link AddPublishedStampOptions.hash}, is left alone and `undefined`
|
|
107
|
+
* answered: the stamp says the followers were told about what the file holds,
|
|
108
|
+
* and a newer version is the business of the change that wrote it.
|
|
109
|
+
*/
|
|
110
|
+
export async function addPublishedStamp(options) {
|
|
111
|
+
const relative = options.path.replace(/\\/g, '/');
|
|
112
|
+
const file = path.join(options.contentDir, ...relative.split('/'));
|
|
113
|
+
const written = await readFile(file, 'utf8').catch((error) => {
|
|
114
|
+
if (isNotFound(error))
|
|
115
|
+
return undefined;
|
|
116
|
+
throw error;
|
|
117
|
+
});
|
|
118
|
+
if (written === undefined || parseDocument(written, { path: relative }).hash !== options.hash) {
|
|
119
|
+
return undefined;
|
|
120
|
+
}
|
|
121
|
+
const source = withPublishedLine(written, options.published, relative);
|
|
122
|
+
const document = parseDocument(source, {
|
|
123
|
+
path: relative,
|
|
124
|
+
handles: handleDirectory(options.contentDir),
|
|
125
|
+
});
|
|
126
|
+
if (document.activitypub?.published !== options.published) {
|
|
127
|
+
throw new TypeError(`${relative} has an activitypub block the stamp cannot be added to.`);
|
|
128
|
+
}
|
|
129
|
+
await writeFileAtomically(file, source);
|
|
130
|
+
options.store.upsert(document);
|
|
131
|
+
return document;
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* The file's text with a `published:` line as the first key of its
|
|
135
|
+
* `activitypub` block, or with a new block where {@link serializeDocument}
|
|
136
|
+
* puts one: after the keys the CMS models, before the ones it does not. A file
|
|
137
|
+
* the CMS wrote then reads exactly as its next save would write it.
|
|
138
|
+
*/
|
|
139
|
+
function withPublishedLine(source, published, path) {
|
|
140
|
+
const eol = source.includes('\r\n') ? '\r\n' : '\n';
|
|
141
|
+
const lines = source.split(eol);
|
|
142
|
+
const end = lines.findIndex((line, index) => index > 0 && /^---\s*$/.test(line));
|
|
143
|
+
if (lines[0] !== '---' || end === -1) {
|
|
144
|
+
throw new TypeError(`${path} has no YAML front matter to stamp.`);
|
|
145
|
+
}
|
|
146
|
+
const stamp = `published: ${dump(published).trimEnd()}`;
|
|
147
|
+
const block = lines.findIndex((line, index) => index < end && /^activitypub:[ \t]*(#.*)?$/.test(line));
|
|
148
|
+
if (block === -1) {
|
|
149
|
+
const extra = lines.findIndex((line, index) => index < end && isUnmodelledKey(line));
|
|
150
|
+
lines.splice(extra === -1 ? end : extra, 0, 'activitypub:', ` ${stamp}`);
|
|
151
|
+
}
|
|
152
|
+
else {
|
|
153
|
+
const first = lines.slice(block + 1, end).find((line) => !/^\s*(#.*)?$/.test(line));
|
|
154
|
+
const indent = /^[ \t]+/.exec(first ?? '')?.[0] ?? ' ';
|
|
155
|
+
lines.splice(block + 1, 0, `${indent}${stamp}`);
|
|
156
|
+
}
|
|
157
|
+
return lines.join(eol);
|
|
158
|
+
}
|
|
159
|
+
function isUnmodelledKey(line) {
|
|
160
|
+
const key = /^([^\s#'"-][^:]*):(\s|$)/.exec(line)?.[1];
|
|
161
|
+
return key !== undefined && !KNOWN_FRONT_MATTER_KEYS.includes(key);
|
|
162
|
+
}
|
|
84
163
|
/**
|
|
85
164
|
* The document with every date it carries turned into a UTC instant.
|
|
86
165
|
*
|
|
87
166
|
* A date the CMS writes ends in `Z`, whatever the file it came
|
|
88
|
-
* from spelled. That is done here, once, rather than in each
|
|
89
|
-
*
|
|
90
|
-
*
|
|
167
|
+
* from spelled. That is done here, once, rather than in each
|
|
168
|
+
* caller — the editor and a taxonomy rewrite — so every save converts and
|
|
169
|
+
* neither has to remember to. It is done before
|
|
91
170
|
* the serialize rather than inside it because {@link saveDocument} parses its
|
|
92
171
|
* own output back and hashes it: normalising later would leave the index
|
|
93
172
|
* holding a hash of bytes that were never written.
|
package/dist/content/save.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save.js","sourceRoot":"","sources":["../../src/content/save.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"save.js","sourceRoot":"","sources":["../../src/content/save.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../src/content/schedule.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE9D;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAGhF;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAE5F;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,EAAE,YAAyB,CAAC;AAExD;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,aAAgB,CAAC;AAE9C,wDAAwD;AACxD,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,IAAI,IAAI,MAAM,GAAG,SAAS,CAAC;IAC3B,uBAAuB;IACvB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;;OAGG;IACH,YAAY,IAAI,MAAM,GAAG,SAAS,CAAC;IACnC,uBAAuB;IACvB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACpD,KAAK,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAED,oBAAoB;AACpB,eAAO,MAAM,YAAY,EAAE,cAS1B,CAAC;AAEF,yEAAyE;AACzE,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,0CAA0C;AAC1C,MAAM,WAAW,sBAAsB;IACrC,qEAAqE;IACrE,KAAK,EAAE,cAAc,GAAG,UAAU,CAAC;IACnC,wEAAwE;IACxE,QAAQ,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,iDAAiD;IACjD,SAAS,EAAE,iBAAiB,CAAC;IAC7B,8DAA8D;IAC9D,MAAM,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACpC,0DAA0D;IAC1D,MAAM,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;CACrC;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,SAAS;IACxB;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB;;;;;;;OAOG;IACH,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACvB,8DAA8D;IAC9D,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IACrC,yEAAyE;IACzE,UAAU,IAAI,MAAM,GAAG,SAAS,CAAC;IACjC,2DAA2D;IAC3D,IAAI,IAAI,IAAI,CAAC;IACb,qEAAqE;IACrE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../src/content/schedule.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE9D;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAGhF;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAE5F;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,EAAE,YAAyB,CAAC;AAExD;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,aAAgB,CAAC;AAE9C,wDAAwD;AACxD,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,IAAI,IAAI,MAAM,GAAG,SAAS,CAAC;IAC3B,uBAAuB;IACvB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;;OAGG;IACH,YAAY,IAAI,MAAM,GAAG,SAAS,CAAC;IACnC,uBAAuB;IACvB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACpD,KAAK,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAED,oBAAoB;AACpB,eAAO,MAAM,YAAY,EAAE,cAS1B,CAAC;AAEF,yEAAyE;AACzE,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,0CAA0C;AAC1C,MAAM,WAAW,sBAAsB;IACrC,qEAAqE;IACrE,KAAK,EAAE,cAAc,GAAG,UAAU,CAAC;IACnC,wEAAwE;IACxE,QAAQ,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,iDAAiD;IACjD,SAAS,EAAE,iBAAiB,CAAC;IAC7B,8DAA8D;IAC9D,MAAM,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACpC,0DAA0D;IAC1D,MAAM,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;CACrC;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,SAAS;IACxB;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB;;;;;;;OAOG;IACH,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACvB,8DAA8D;IAC9D,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IACrC,yEAAyE;IACzE,UAAU,IAAI,MAAM,GAAG,SAAS,CAAC;IACjC,2DAA2D;IAC3D,IAAI,IAAI,IAAI,CAAC;IACb,qEAAqE;IACrE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,SAAS,CA+K1E"}
|
package/dist/content/schedule.js
CHANGED
|
@@ -71,6 +71,7 @@ export function createScheduler(options) {
|
|
|
71
71
|
let handle;
|
|
72
72
|
let waiting;
|
|
73
73
|
let running = Promise.resolve();
|
|
74
|
+
const servedLive = new Set();
|
|
74
75
|
/**
|
|
75
76
|
* Announce one document that has come due.
|
|
76
77
|
*
|
|
@@ -111,11 +112,11 @@ export function createScheduler(options) {
|
|
|
111
112
|
/**
|
|
112
113
|
* How long to wait, or nothing to wait for.
|
|
113
114
|
*
|
|
114
|
-
*
|
|
115
|
-
*
|
|
116
|
-
*
|
|
117
|
-
*
|
|
118
|
-
*
|
|
115
|
+
* Anything dated since the watermark is released on the next tick. A post a
|
|
116
|
+
* scan found already due is not "next due", and with nothing else to wait
|
|
117
|
+
* for it would otherwise sit unannounced until the next restart; one a live
|
|
118
|
+
* save already announced is skipped, but the release still moves the
|
|
119
|
+
* watermark past it before a restart could announce it again.
|
|
119
120
|
*/
|
|
120
121
|
function delayUntil(due) {
|
|
121
122
|
const since = windowStart();
|
|
@@ -134,6 +135,26 @@ export function createScheduler(options) {
|
|
|
134
135
|
}
|
|
135
136
|
arm();
|
|
136
137
|
}
|
|
138
|
+
/**
|
|
139
|
+
* Remember a document a live change has already shown every subscriber as
|
|
140
|
+
* public with a date inside the window, so the next release leaves it out:
|
|
141
|
+
* the watermark only moves when the scheduler releases, and a post saved
|
|
142
|
+
* live dated after that would otherwise be announced a second time.
|
|
143
|
+
*
|
|
144
|
+
* A scan is not a live change because no subscriber acts on one, and a
|
|
145
|
+
* document the change holds again is the scheduler's to release.
|
|
146
|
+
*/
|
|
147
|
+
function noteServedLive(change) {
|
|
148
|
+
if (change.origin === 'scan' || change.origin === SCHEDULE_ORIGIN)
|
|
149
|
+
return;
|
|
150
|
+
const since = windowStart();
|
|
151
|
+
const at = change.next === undefined ? null : dateSortKey(change.next.date);
|
|
152
|
+
const shown = since !== undefined && at !== null && at > since && at <= store.now().toISOString();
|
|
153
|
+
if (shown)
|
|
154
|
+
servedLive.add(change.path);
|
|
155
|
+
else
|
|
156
|
+
servedLive.delete(change.path);
|
|
157
|
+
}
|
|
137
158
|
function windowStart() {
|
|
138
159
|
const since = watermark.read();
|
|
139
160
|
const firstRun = watermark.readFirstRun();
|
|
@@ -161,6 +182,8 @@ export function createScheduler(options) {
|
|
|
161
182
|
watermark.write(now);
|
|
162
183
|
let published = 0;
|
|
163
184
|
for (const document of due) {
|
|
185
|
+
if (servedLive.delete(document.path))
|
|
186
|
+
continue;
|
|
164
187
|
try {
|
|
165
188
|
await publish(document);
|
|
166
189
|
published += 1;
|
|
@@ -187,7 +210,8 @@ export function createScheduler(options) {
|
|
|
187
210
|
running = started;
|
|
188
211
|
return await started;
|
|
189
212
|
},
|
|
190
|
-
handle() {
|
|
213
|
+
handle(change) {
|
|
214
|
+
noteServedLive(change);
|
|
191
215
|
// Every change is a reason to look again: a date moved, a post became a
|
|
192
216
|
// draft, a file appeared. What is due next is one indexed lookup, so
|
|
193
217
|
// asking after each change is cheaper than working out which changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../src/content/schedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAIzC;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,WAAW,CAAC,QAAgC,EAAE,GAAS;IACrE,MAAM,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtC,OAAO,EAAE,KAAK,IAAI,IAAI,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;AAC/C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgC,EAAE,GAAS;IACtE,OAAO,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5F,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAiB,UAAU,CAAC;AAExD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC;AA8B9C,oBAAoB;AACpB,MAAM,CAAC,MAAM,YAAY,GAAmB;IAC1C,GAAG,CAAC,QAAQ,EAAE,OAAO;QACnB,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,KAAK,CAAC,MAAM;QACV,YAAY,CAAC,MAAwB,CAAC,CAAC;IACzC,CAAC;CACF,CAAC;AAwDF;;;;;;;;;GASG;AACH,MAAM,UAAU,eAAe,CAAC,OAA+B;IAC7D,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,YAAY,CAAC;IAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IAEzC,IAAI,MAAe,CAAC;IACpB,IAAI,OAA2B,CAAC;IAChC,IAAI,OAAO,GAAqB,OAAO,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../src/content/schedule.ts"],"names":[],"mappings":"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"}
|
package/dist/content/sync.d.ts
CHANGED
|
@@ -138,6 +138,13 @@ export interface ContentSync {
|
|
|
138
138
|
onSettled(listener: () => unknown): () => void;
|
|
139
139
|
/** Walk the content directory once, reconciling every file and dropping rows whose file is gone. */
|
|
140
140
|
sync(): Promise<SyncResult>;
|
|
141
|
+
/**
|
|
142
|
+
* Read one document's file again, as a scan would, when no watcher keeps the
|
|
143
|
+
* index up to date: a long command that synced once would otherwise act on
|
|
144
|
+
* what the file said when it began. With a watcher it does nothing, so an
|
|
145
|
+
* edit is still reported as one.
|
|
146
|
+
*/
|
|
147
|
+
reread(relativePath: string): Promise<void>;
|
|
141
148
|
/**
|
|
142
149
|
* Run the boot scan and, unless watching is off, start the watcher.
|
|
143
150
|
* Resolves with what the scan did.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/content/sync.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/content/sync.ts"],"names":[],"mappings":"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"}
|
package/dist/content/sync.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
1
2
|
import { messageOf } from '../util/errors.js';
|
|
3
|
+
import { exists } from '../util/files.js';
|
|
2
4
|
import { createSerialQueue } from '../util/queue.js';
|
|
3
|
-
import { isDocumentPath } from './content-tree.js';
|
|
5
|
+
import { isDocumentPath, walk } from './content-tree.js';
|
|
4
6
|
import { createContentWatcher } from './content-watcher.js';
|
|
5
7
|
import { changedIndex, createReconciler } from './reconcile.js';
|
|
6
8
|
import { documentsUnder, scanContent } from './scan.js';
|
|
@@ -49,22 +51,47 @@ export function createContentSync(options) {
|
|
|
49
51
|
const onlyThisRunQueued = queue.pending() === 1;
|
|
50
52
|
return noPathDebouncing && onlyThisRunQueued;
|
|
51
53
|
}
|
|
54
|
+
// A rename reaches the watcher as two paths, which can be reported far
|
|
55
|
+
// apart. Before the row of a gone file is dropped, every document on disk
|
|
56
|
+
// the index has not seen yet is read, so a moved file takes the row over by
|
|
57
|
+
// its permalink and the post is not deleted and created again.
|
|
58
|
+
const goneInBurst = new Set();
|
|
52
59
|
async function reconcileWatched(relativePath) {
|
|
53
60
|
const paths = isDocumentPath(relativePath)
|
|
54
61
|
? [relativePath]
|
|
55
62
|
: await documentsUnder(tree, relativePath);
|
|
56
63
|
for (const documentPath of paths) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
+
if (await indexedFileIsGone(documentPath))
|
|
65
|
+
goneInBurst.add(documentPath);
|
|
66
|
+
else
|
|
67
|
+
await reconcileOne(documentPath);
|
|
68
|
+
}
|
|
69
|
+
if (!burstIsOver())
|
|
70
|
+
return;
|
|
71
|
+
if (goneInBurst.size > 0) {
|
|
72
|
+
for (const documentPath of await walk(contentDir, logger)) {
|
|
73
|
+
if (store.getByPath(documentPath) === undefined)
|
|
74
|
+
await reconcileOne(documentPath);
|
|
64
75
|
}
|
|
76
|
+
for (const documentPath of goneInBurst)
|
|
77
|
+
await reconcileOne(documentPath);
|
|
78
|
+
goneInBurst.clear();
|
|
65
79
|
}
|
|
66
|
-
if (settled.isUnsettled()
|
|
80
|
+
if (settled.isUnsettled())
|
|
67
81
|
await settled.settle();
|
|
82
|
+
}
|
|
83
|
+
async function indexedFileIsGone(documentPath) {
|
|
84
|
+
return (store.getByPath(documentPath) !== undefined &&
|
|
85
|
+
!(await exists(path.join(contentDir, documentPath)).catch(() => true)));
|
|
86
|
+
}
|
|
87
|
+
async function reconcileOne(documentPath) {
|
|
88
|
+
try {
|
|
89
|
+
if (changedIndex(await reconciler.reconcile(documentPath, 'watch'))) {
|
|
90
|
+
settled.markUnsettled();
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
catch (error) {
|
|
94
|
+
logger.warn(`Could not sync ${documentPath}: ${messageOf(error)}`);
|
|
68
95
|
}
|
|
69
96
|
}
|
|
70
97
|
return {
|
|
@@ -76,6 +103,11 @@ export function createContentSync(options) {
|
|
|
76
103
|
sync() {
|
|
77
104
|
return queue.run(scanAndSettle);
|
|
78
105
|
},
|
|
106
|
+
async reread(relativePath) {
|
|
107
|
+
if (options.watch !== false)
|
|
108
|
+
return;
|
|
109
|
+
await queue.run(() => reconciler.reconcile(relativePath, 'scan'));
|
|
110
|
+
},
|
|
79
111
|
// The watch goes first and the scan after it hears changes, so a file
|
|
80
112
|
// written at any moment of the boot is either found by the scan or
|
|
81
113
|
// reported by the watch.
|
package/dist/content/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/content/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/content/sync.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAqK3D;;;;;;;;GAQG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAiC;IACjE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IACzC,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,CAAC,MAAsB,EAAiB,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAChG,MAAM,UAAU,GAAG,gBAAgB,CAAC;QAClC,KAAK;QACL,UAAU;QACV,MAAM;QACN,IAAI;QACJ,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAE3C,2EAA2E;IAC3E,0EAA0E;IAC1E,qEAAqE;IACrE,MAAM,KAAK,GAAG,iBAAiB,EAAE,CAAC;IAClC,MAAM,OAAO,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,oBAAoB,CAAC;QACnC,UAAU;QACV,MAAM;QACN,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,oBAAoB;QAClD,aAAa,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;KACtF,CAAC,CAAC;IAEH,KAAK,UAAU,aAAa;QAC1B,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;QAC1D,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,SAAS,WAAW;QAClB,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACjD,MAAM,iBAAiB,GAAG,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAChD,OAAO,gBAAgB,IAAI,iBAAiB,CAAC;IAC/C,CAAC;IAED,uEAAuE;IACvE,0EAA0E;IAC1E,4EAA4E;IAC5E,+DAA+D;IAC/D,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IAEtC,KAAK,UAAU,gBAAgB,CAAC,YAAoB;QAClD,MAAM,KAAK,GAAG,cAAc,CAAC,YAAY,CAAC;YACxC,CAAC,CAAC,CAAC,YAAY,CAAC;YAChB,CAAC,CAAC,MAAM,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC7C,KAAK,MAAM,YAAY,IAAI,KAAK,EAAE,CAAC;YACjC,IAAI,MAAM,iBAAiB,CAAC,YAAY,CAAC;gBAAE,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;;gBACpE,MAAM,YAAY,CAAC,YAAY,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,WAAW,EAAE;YAAE,OAAO;QAC3B,IAAI,WAAW,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACzB,KAAK,MAAM,YAAY,IAAI,MAAM,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC1D,IAAI,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,SAAS;oBAAE,MAAM,YAAY,CAAC,YAAY,CAAC,CAAC;YACpF,CAAC;YACD,KAAK,MAAM,YAAY,IAAI,WAAW;gBAAE,MAAM,YAAY,CAAC,YAAY,CAAC,CAAC;YACzE,WAAW,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,OAAO,CAAC,WAAW,EAAE;YAAE,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;IACpD,CAAC;IAED,KAAK,UAAU,iBAAiB,CAAC,YAAoB;QACnD,OAAO,CACL,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,SAAS;YAC3C,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CACvE,CAAC;IACJ,CAAC;IAED,KAAK,UAAU,YAAY,CAAC,YAAoB;QAC9C,IAAI,CAAC;YACH,IAAI,YAAY,CAAC,MAAM,UAAU,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;gBACpE,OAAO,CAAC,aAAa,EAAE,CAAC;YAC1B,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,kBAAkB,YAAY,KAAK,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM;QAEN,QAAQ,EAAE,IAAI;QAEd,SAAS,CAAC,QAAQ;YAChB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI;YACF,OAAO,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAClC,CAAC;QAED,KAAK,CAAC,MAAM,CAAC,YAAY;YACvB,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK;gBAAE,OAAO;YACpC,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,sEAAsE;QACtE,mEAAmE;QACnE,yBAAyB;QACzB,KAAK,CAAC,KAAK;YACT,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK;gBAAE,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YACnD,OAAO,MAAM,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACxC,CAAC;QAED,KAAK,CAAC,IAAI;YACR,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,uEAAuE;YACvE,4CAA4C;YAC5C,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;KACF,CAAC;AACJ,CAAC;AASD,SAAS,sBAAsB,CAAC,MAAkB;IAChD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAiB,CAAC;IAC3C,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,OAAO;QACL,GAAG,CAAC,QAAQ;YACV,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxB,OAAO,GAAG,EAAE;gBACV,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC7B,CAAC,CAAC;QACJ,CAAC;QAED,aAAa;YACX,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;QAED,WAAW;YACT,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,CAAC,MAAM;YACV,SAAS,GAAG,KAAK,CAAC;YAClB,KAAK,MAAM,QAAQ,IAAI,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC;gBACtC,IAAI,CAAC;oBACH,MAAM,QAAQ,EAAE,CAAC;gBACnB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,6BAA6B,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,UAAU,CAAC,MAAe,EAAE,GAAS,EAAE,MAAsB;IAC1E,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvC,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEpC,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/C,IAAI,WAAW,IAAI,CAAC,SAAS;QAAE,MAAM,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;SACjE,IAAI,SAAS,IAAI,CAAC,WAAW;QAAE,MAAM,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,QAAQ,CAAC,QAA8B,EAAE,GAAS;IACzD,OAAO,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AAC3D,CAAC;AAQD,SAAS,aAAa,CAAC,MAAkB;IACvC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAoD,CAAC;IAE9E,SAAS,MAAM,CAAC,KAA4B;QAC1C,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,QAAQ,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAwB,CAAC;QAChD,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC9B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO;QACL,EAAE,CAAC,KAAK,EAAE,QAAQ;YAChB,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5B,OAAO,GAAG,EAAE;gBACV,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YACzC,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,QAAQ;YAClB,MAAM,OAAO,GAAyB,CAAC,MAAM,EAAE,EAAE;gBAC/C,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;gBACtC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACnB,CAAC,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3B,OAAO,GAAG,EAAE;gBACV,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YACxC,CAAC,CAAC;QACJ,CAAC;QAED,GAAG,CAAC,KAAK,EAAE,QAAQ;YACjB,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM;YACtB,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACxC,IAAI,UAAU,KAAK,SAAS;gBAAE,OAAO;YACrC,KAAK,MAAM,QAAQ,IAAI,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC;gBACvC,IAAI,CAAC;oBACH,kEAAkE;oBAClE,qEAAqE;oBACrE,kEAAkE;oBAClE,qCAAqC;oBACrC,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACzB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,KAAK,KAAK,oBAAoB,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trash.d.ts","sourceRoot":"","sources":["../../src/content/trash.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"trash.d.ts","sourceRoot":"","sources":["../../src/content/trash.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAM9C,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEhD,yDAAyD;AACzD,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,WAAW,CAAC;IAC7C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9D;AAED,yCAAyC;AACzC,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,GAC1D;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7D;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,OAAO,GAAG,SAAS,GAC1B,OAAO,CAAC,WAAW,CAAC,CA2DtB"}
|
package/dist/content/trash.js
CHANGED
|
@@ -3,6 +3,7 @@ import path from 'node:path';
|
|
|
3
3
|
import { exists } from '../util/files.js';
|
|
4
4
|
import { handleDirectory } from './handles.js';
|
|
5
5
|
import { parseDocument } from './parser.js';
|
|
6
|
+
import { withDocumentWrites } from './save.js';
|
|
6
7
|
import { wikiBaseOf } from './slug.js';
|
|
7
8
|
import { isTrashedPath, TRASH_DIRECTORY } from './store.js';
|
|
8
9
|
/**
|
|
@@ -40,25 +41,31 @@ export async function moveDocumentFile(site, document, action) {
|
|
|
40
41
|
return refusedMove(`${target} already exists, so this cannot go back there.`);
|
|
41
42
|
}
|
|
42
43
|
}
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
44
|
+
const moved = await withDocumentWrites(contentDir, async () => {
|
|
45
|
+
const from = path.join(contentDir, ...document.path.split('/'));
|
|
46
|
+
const to = path.join(contentDir, ...target.split('/'));
|
|
47
|
+
let source;
|
|
48
|
+
try {
|
|
49
|
+
source = await readFile(from, 'utf8');
|
|
50
|
+
await mkdir(path.dirname(to), { recursive: true });
|
|
51
|
+
await rename(from, to);
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
56
|
+
const parsed = parseDocument(source, {
|
|
57
|
+
path: target,
|
|
58
|
+
type: document.type,
|
|
59
|
+
handles: handleDirectory(contentDir),
|
|
60
|
+
wikiBase: wikiBaseOf(document),
|
|
61
|
+
});
|
|
62
|
+
store.remove(document.path);
|
|
63
|
+
store.upsert(parsed);
|
|
64
|
+
return parsed;
|
|
65
|
+
});
|
|
66
|
+
if (moved === undefined) {
|
|
52
67
|
return refusedMove(`Could not move ${document.path}. Is the file still there?`);
|
|
53
68
|
}
|
|
54
|
-
const moved = parseDocument(source, {
|
|
55
|
-
path: target,
|
|
56
|
-
type: document.type,
|
|
57
|
-
handles: handleDirectory(contentDir),
|
|
58
|
-
wikiBase: wikiBaseOf(document),
|
|
59
|
-
});
|
|
60
|
-
store.remove(document.path);
|
|
61
|
-
store.upsert(moved);
|
|
62
69
|
// Trashing takes a post off the public site and restoring puts it back, so
|
|
63
70
|
// both are visibility changes a subscriber has to hear about.
|
|
64
71
|
await site.announce({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trash.js","sourceRoot":"","sources":["../../src/content/trash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgB5D;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAAc,EACd,QAAkB,EAClB,MAA2B;IAE3B,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IACnC,IAAI,MAAc,CAAC;IACnB,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QACvB,MAAM,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,QAAQ,CAAC,IAAI;aACnB,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,eAAe,CAAC;aAChD,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxD,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACxD,OAAO,WAAW,CAChB,GAAG,MAAM,CAAC,IAAI,cAAc,QAAQ,CAAC,SAAS,kCAAkC;gBAC9E,uCAAuC,CAC1C,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9D,OAAO,WAAW,CAAC,GAAG,MAAM,gDAAgD,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"trash.js","sourceRoot":"","sources":["../../src/content/trash.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../src/content/write.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,KAAK,EAAoB,SAAS,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,eAAe,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIvD,OAAO,KAAK,EAAe,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../src/content/write.ts"],"names":[],"mappings":"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"}
|