@decocms/blocks 8.1.2 → 8.2.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/dist/protocol/client.d.ts +17 -4
- package/dist/protocol/client.d.ts.map +1 -1
- package/dist/protocol/client.js +46 -10
- package/dist/protocol/client.js.map +1 -1
- package/dist/protocol/conformance/cases/changes.d.ts +3 -0
- package/dist/protocol/conformance/cases/changes.d.ts.map +1 -0
- package/dist/protocol/conformance/cases/changes.js +295 -0
- package/dist/protocol/conformance/cases/changes.js.map +1 -0
- package/dist/protocol/conformance/context.d.ts +14 -0
- package/dist/protocol/conformance/context.d.ts.map +1 -1
- package/dist/protocol/conformance/context.js.map +1 -1
- package/dist/protocol/conformance/index.d.ts.map +1 -1
- package/dist/protocol/conformance/index.js +4 -1
- package/dist/protocol/conformance/index.js.map +1 -1
- package/dist/protocol/errors.d.ts +26 -0
- package/dist/protocol/errors.d.ts.map +1 -1
- package/dist/protocol/errors.js.map +1 -1
- package/dist/protocol/index.d.ts +4 -2
- package/dist/protocol/index.d.ts.map +1 -1
- package/dist/protocol/index.js +4 -2
- package/dist/protocol/index.js.map +1 -1
- package/dist/protocol/params.d.ts +4 -2
- package/dist/protocol/params.d.ts.map +1 -1
- package/dist/protocol/params.js +11 -1
- package/dist/protocol/params.js.map +1 -1
- package/dist/protocol/server/assets.d.ts +1 -1
- package/dist/protocol/server/assets.js +1 -1
- package/dist/protocol/server/core.d.ts +12 -1
- package/dist/protocol/server/core.d.ts.map +1 -1
- package/dist/protocol/server/core.js +8 -0
- package/dist/protocol/server/core.js.map +1 -1
- package/dist/protocol/server/index.d.ts +1 -1
- package/dist/protocol/server/index.js +1 -1
- package/dist/protocol/server/methods/apply.d.ts +37 -0
- package/dist/protocol/server/methods/apply.d.ts.map +1 -1
- package/dist/protocol/server/methods/apply.js +4 -3
- package/dist/protocol/server/methods/apply.js.map +1 -1
- package/dist/protocol/server/methods/changes.d.ts +6 -0
- package/dist/protocol/server/methods/changes.d.ts.map +1 -0
- package/dist/protocol/server/methods/changes.js +381 -0
- package/dist/protocol/server/methods/changes.js.map +1 -0
- package/dist/protocol/server/rpc.d.ts.map +1 -1
- package/dist/protocol/server/rpc.js +7 -0
- package/dist/protocol/server/rpc.js.map +1 -1
- package/dist/protocol/storage/fs/git.d.ts +51 -0
- package/dist/protocol/storage/fs/git.d.ts.map +1 -0
- package/dist/protocol/storage/fs/git.js +274 -0
- package/dist/protocol/storage/fs/git.js.map +1 -0
- package/dist/protocol/storage/fs/index.d.ts +2 -0
- package/dist/protocol/storage/fs/index.d.ts.map +1 -1
- package/dist/protocol/storage/fs/index.js +34 -0
- package/dist/protocol/storage/fs/index.js.map +1 -1
- package/dist/protocol/storage/memory.d.ts +10 -0
- package/dist/protocol/storage/memory.d.ts.map +1 -1
- package/dist/protocol/storage/memory.js +45 -0
- package/dist/protocol/storage/memory.js.map +1 -1
- package/dist/protocol/storage.d.ts +49 -1
- package/dist/protocol/storage.d.ts.map +1 -1
- package/dist/protocol/storage.js.map +1 -1
- package/dist/protocol/types.d.ts +105 -4
- package/dist/protocol/types.d.ts.map +1 -1
- package/dist/protocol/types.js +16 -3
- package/dist/protocol/types.js.map +1 -1
- package/dist/v8/cli/run.d.ts.map +1 -1
- package/dist/v8/cli/run.js +2 -1
- package/dist/v8/cli/run.js.map +1 -1
- package/dist/v8/cli/serve/server.d.ts +2 -0
- package/dist/v8/cli/serve/server.d.ts.map +1 -1
- package/dist/v8/cli/serve/server.js +37 -2
- package/dist/v8/cli/serve/server.js.map +1 -1
- package/package.json +1 -1
- package/src/protocol/client.ts +81 -13
- package/src/protocol/conformance/cases/changes.ts +362 -0
- package/src/protocol/conformance/context.ts +12 -0
- package/src/protocol/conformance/index.ts +4 -1
- package/src/protocol/errors.ts +17 -0
- package/src/protocol/index.ts +4 -2
- package/src/protocol/params.ts +26 -3
- package/src/protocol/server/assets.ts +1 -1
- package/src/protocol/server/core.ts +9 -0
- package/src/protocol/server/index.ts +1 -1
- package/src/protocol/server/methods/apply.ts +8 -4
- package/src/protocol/server/methods/changes.ts +489 -0
- package/src/protocol/server/rpc.ts +7 -0
- package/src/protocol/storage/fs/git.ts +307 -0
- package/src/protocol/storage/fs/index.ts +40 -0
- package/src/protocol/storage/memory.ts +57 -0
- package/src/protocol/storage.ts +51 -1
- package/src/protocol/types.ts +106 -4
- package/src/v8/cli/run.ts +2 -1
- package/src/v8/cli/serve/server.ts +46 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/protocol/storage.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/protocol/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/protocol/storage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/protocol/storage.ts"],"names":[],"mappings":"AA2KA,0DAA0D;AAC1D,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IAC7C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;IACrC,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IAC3B,IAAI;IAAzB,YAAqB,IAAY;QAC/B,KAAK,CAAC,gCAAgC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAD3C,IAAI;QAEvB,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAED,6DAA6D;AAC7D,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IACvC,YAAY,CAAqB;IAE1C,YAAY,OAAe,EAAE,YAAqB;QAChD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;QACtC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;CACF"}
|
package/dist/protocol/types.d.ts
CHANGED
|
@@ -1,13 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The content protocol's method types: JSON-RPC 2.0 over one HTTP endpoint,
|
|
3
|
-
*
|
|
3
|
+
* seven methods (`describe`, `schema.get`, `blocks.list`, `blocks.apply`,
|
|
4
|
+
* `changes.list`, `changes.get`, `changes.discard`).
|
|
4
5
|
*/
|
|
5
6
|
export declare const PROTOCOL_NAME = "deco-content";
|
|
6
|
-
/**
|
|
7
|
+
/**
|
|
8
|
+
* Minors only add. A client refuses another major, and a server older than
|
|
9
|
+
* `REQUIRED_PROTOCOL_MINOR` (1.1 added `changes.*`; 1.0 is `@decocms/blocks`
|
|
10
|
+
* 8.1.x and older).
|
|
11
|
+
*/
|
|
7
12
|
export declare const PROTOCOL_VERSION: {
|
|
8
13
|
readonly major: 1;
|
|
9
|
-
readonly minor:
|
|
14
|
+
readonly minor: 1;
|
|
10
15
|
};
|
|
16
|
+
/**
|
|
17
|
+
* The oldest minor this package's client talks to. Bump it only when the
|
|
18
|
+
* client needs a newer method.
|
|
19
|
+
*/
|
|
20
|
+
export declare const REQUIRED_PROTOCOL_MINOR = 1;
|
|
11
21
|
export declare const SCHEMA_FORMAT = "deco-meta@1";
|
|
12
22
|
/**
|
|
13
23
|
* The Blocks major a generated schema declares, as its top-level
|
|
@@ -138,7 +148,86 @@ export interface BlocksApplyResult {
|
|
|
138
148
|
revision: string;
|
|
139
149
|
versions: Record<string, string | null>;
|
|
140
150
|
}
|
|
141
|
-
/**
|
|
151
|
+
/**
|
|
152
|
+
* What a source's content is compared against. A source's content is its
|
|
153
|
+
* base plus its changes: `deco serve`'s base is the local git `HEAD`, the
|
|
154
|
+
* site editor's hosted drafts compare with the published branch.
|
|
155
|
+
*/
|
|
156
|
+
export interface ChangesBase {
|
|
157
|
+
/** An opaque revision of the base, compared only for equality (`deco serve`: the `HEAD` commit). */
|
|
158
|
+
revision: string;
|
|
159
|
+
/** The branch the base was read from; `null` when there's none (a detached `HEAD`). */
|
|
160
|
+
resolvedRef: string | null;
|
|
161
|
+
}
|
|
162
|
+
/** One entry that differs from the base. */
|
|
163
|
+
export interface Change {
|
|
164
|
+
/** `set`: the entry exists and differs from the base, or is new. `delete`: it's in the base and gone now. */
|
|
165
|
+
kind: "set" | "delete";
|
|
166
|
+
/** The entry's current version, as `blocks.list` reports it (usable in `ifMatch`); `null` for a `delete`. */
|
|
167
|
+
version: string | null;
|
|
168
|
+
/**
|
|
169
|
+
* The entry's version in the base; `null` when the base doesn't have it (a
|
|
170
|
+
* new entry). Opaque: don't compare it with `version`; an entry is changed
|
|
171
|
+
* because it's listed.
|
|
172
|
+
*/
|
|
173
|
+
baseVersion: string | null;
|
|
174
|
+
}
|
|
175
|
+
export type ChangesListParams = ReadParams;
|
|
176
|
+
export type ChangesListResult = {
|
|
177
|
+
notModified: true;
|
|
178
|
+
revision: string;
|
|
179
|
+
base: ChangesBase;
|
|
180
|
+
} | {
|
|
181
|
+
notModified: false;
|
|
182
|
+
/**
|
|
183
|
+
* The changes' own revision, for `ifNoneMatch`: it moves when the
|
|
184
|
+
* content or the base moves. Not comparable with `blocks.list`'s.
|
|
185
|
+
*/
|
|
186
|
+
revision: string;
|
|
187
|
+
base: ChangesBase;
|
|
188
|
+
/** Every entry that differs from the base, by name; an unchanged entry is absent. */
|
|
189
|
+
changes: Record<string, Change>;
|
|
190
|
+
};
|
|
191
|
+
export interface ChangesGetParams {
|
|
192
|
+
/** The entries to read both sides of (at most 20). */
|
|
193
|
+
names: string[];
|
|
194
|
+
}
|
|
195
|
+
/** Both sides of one entry. */
|
|
196
|
+
export interface ChangeDetail {
|
|
197
|
+
/** `null`: the entry doesn't differ from the base, and `before` is `after`. */
|
|
198
|
+
kind: "set" | "delete" | null;
|
|
199
|
+
/** The entry in the base; `null` when the base doesn't have it, or it can't be read (see `diagnostics`). */
|
|
200
|
+
before: Record<string, unknown> | null;
|
|
201
|
+
/** The entry now; `null` when it's deleted, or it can't be read (see `diagnostics`). */
|
|
202
|
+
after: Record<string, unknown> | null;
|
|
203
|
+
version: string | null;
|
|
204
|
+
/** For an unchanged entry, equal to `version`. */
|
|
205
|
+
baseVersion: string | null;
|
|
206
|
+
}
|
|
207
|
+
/** A side `changes.get` couldn't read: as in `blocks.list`, plus which side. */
|
|
208
|
+
export type ChangeDiagnostic = Diagnostic & {
|
|
209
|
+
side: "before" | "after";
|
|
210
|
+
};
|
|
211
|
+
export interface ChangesGetResult {
|
|
212
|
+
base: ChangesBase;
|
|
213
|
+
/** Every requested name that exists in the base or now; any other name is absent. */
|
|
214
|
+
entries: Record<string, ChangeDetail>;
|
|
215
|
+
diagnostics: ChangeDiagnostic[];
|
|
216
|
+
}
|
|
217
|
+
export interface ChangesDiscardParams {
|
|
218
|
+
/** Entries to drop back to the base. A name without a change is a no-op. */
|
|
219
|
+
names: string[];
|
|
220
|
+
/** A version the entry must have now; `null` = must not exist. As in `blocks.apply`. */
|
|
221
|
+
ifMatch?: Record<string, string | null>;
|
|
222
|
+
}
|
|
223
|
+
/**
|
|
224
|
+
* As `blocks.apply`'s result: `revision` is the content's (`blocks.list`'s)
|
|
225
|
+
* revision after the discard, and `versions` every named entry's version
|
|
226
|
+
* after it (`null`: not in the base), plus `null` for any other spelling the
|
|
227
|
+
* discard deleted.
|
|
228
|
+
*/
|
|
229
|
+
export type ChangesDiscardResult = BlocksApplyResult;
|
|
230
|
+
/** The seven methods, by wire name. */
|
|
142
231
|
export interface Methods {
|
|
143
232
|
describe: {
|
|
144
233
|
params: Record<string, never> | undefined;
|
|
@@ -156,6 +245,18 @@ export interface Methods {
|
|
|
156
245
|
params: BlocksApplyParams;
|
|
157
246
|
result: BlocksApplyResult;
|
|
158
247
|
};
|
|
248
|
+
"changes.list": {
|
|
249
|
+
params: ChangesListParams | undefined;
|
|
250
|
+
result: ChangesListResult;
|
|
251
|
+
};
|
|
252
|
+
"changes.get": {
|
|
253
|
+
params: ChangesGetParams;
|
|
254
|
+
result: ChangesGetResult;
|
|
255
|
+
};
|
|
256
|
+
"changes.discard": {
|
|
257
|
+
params: ChangesDiscardParams;
|
|
258
|
+
result: ChangesDiscardResult;
|
|
259
|
+
};
|
|
159
260
|
}
|
|
160
261
|
export type MethodName = keyof Methods;
|
|
161
262
|
export declare const METHOD_NAMES: readonly MethodName[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/protocol/types.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/protocol/types.ts"],"names":[],"mappings":"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"}
|
package/dist/protocol/types.js
CHANGED
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The content protocol's method types: JSON-RPC 2.0 over one HTTP endpoint,
|
|
3
|
-
*
|
|
3
|
+
* seven methods (`describe`, `schema.get`, `blocks.list`, `blocks.apply`,
|
|
4
|
+
* `changes.list`, `changes.get`, `changes.discard`).
|
|
4
5
|
*/
|
|
5
6
|
export const PROTOCOL_NAME = "deco-content";
|
|
6
|
-
/**
|
|
7
|
-
|
|
7
|
+
/**
|
|
8
|
+
* Minors only add. A client refuses another major, and a server older than
|
|
9
|
+
* `REQUIRED_PROTOCOL_MINOR` (1.1 added `changes.*`; 1.0 is `@decocms/blocks`
|
|
10
|
+
* 8.1.x and older).
|
|
11
|
+
*/
|
|
12
|
+
export const PROTOCOL_VERSION = { major: 1, minor: 1 };
|
|
13
|
+
/**
|
|
14
|
+
* The oldest minor this package's client talks to. Bump it only when the
|
|
15
|
+
* client needs a newer method.
|
|
16
|
+
*/
|
|
17
|
+
export const REQUIRED_PROTOCOL_MINOR = 1;
|
|
8
18
|
export const SCHEMA_FORMAT = "deco-meta@1";
|
|
9
19
|
/**
|
|
10
20
|
* The Blocks major a generated schema declares, as its top-level
|
|
@@ -27,5 +37,8 @@ export const METHOD_NAMES = [
|
|
|
27
37
|
"schema.get",
|
|
28
38
|
"blocks.list",
|
|
29
39
|
"blocks.apply",
|
|
40
|
+
"changes.list",
|
|
41
|
+
"changes.get",
|
|
42
|
+
"changes.discard",
|
|
30
43
|
];
|
|
31
44
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/protocol/types.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/protocol/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,cAAc,CAAC;AAE5C;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAW,CAAC;AAEhE;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,CAAC;AAE3C;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC;AAE9B,uEAAuE;AACvE,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE/B,6CAA6C;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,EAAE,CAAC;AAElC,sEAAsE;AACtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,UAAU,CAAC;AAiM5C,MAAM,CAAC,MAAM,YAAY,GAA0B;IACjD,UAAU;IACV,YAAY;IACZ,aAAa;IACb,cAAc;IACd,cAAc;IACd,aAAa;IACb,iBAAiB;CAClB,CAAC"}
|
package/dist/v8/cli/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/v8/cli/run.ts"],"names":[],"mappings":"AAMA,OAAO,EAAmB,KAAK,QAAQ,EAAa,MAAM,UAAU,CAAC;AAgCrE,eAAO,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/v8/cli/run.ts"],"names":[],"mappings":"AAMA,OAAO,EAAmB,KAAK,QAAQ,EAAa,MAAM,UAAU,CAAC;AAgCrE,eAAO,MAAM,KAAK,QAcgF,CAAC;AAEnG,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC,CAAC;AAEtE,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,WAAW,CAiCvE;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mFAAmF;IACnF,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,gGAAgG;IAChG,KAAK,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAwCD,wDAAwD;AACxD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,UAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CA4GtF"}
|
package/dist/v8/cli/run.js
CHANGED
|
@@ -37,7 +37,8 @@ Commands:
|
|
|
37
37
|
schema turn the types in .deco/index.ts into .deco/schema.gen.json
|
|
38
38
|
content turn .deco/blocks into the content module, .deco/blocks.gen.ts
|
|
39
39
|
check check that every saved block fits the schema (writes nothing)
|
|
40
|
-
serve serve .deco to the site editor on this machine, at http://localhost:4545/rpc
|
|
40
|
+
serve serve .deco to the site editor on this machine, at http://localhost:4545/rpc;
|
|
41
|
+
run it inside the site's git repository (the change list compares with HEAD)
|
|
41
42
|
|
|
42
43
|
${Object.values(COMMANDS)
|
|
43
44
|
.map((c) => ` ${c.usage}`)
|
package/dist/v8/cli/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/v8/cli/run.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAiB,SAAS,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAInD,MAAM,QAAQ,GAAuE;IACnF,MAAM,EAAE;QACN,KAAK,EAAE,uCAAuC;QAC9C,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE;KAC5C;IACD,OAAO,EAAE;QACP,KAAK,EAAE,uCAAuC;QAC9C,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE;KAC5C;IACD,KAAK,EAAE,EAAE,KAAK,EAAE,6BAA6B,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;IAC1E,KAAK,EAAE;QACL,KAAK,EACH,qHAAqH;QACvH,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,QAAQ;YACjB,MAAM,EAAE,QAAQ;YAChB,WAAW,EAAE,SAAS;SACvB;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/v8/cli/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,8 @@ export interface ServeOptions {
|
|
|
10
10
|
assets?: string;
|
|
11
11
|
readOnly?: boolean;
|
|
12
12
|
reporter?: Reporter;
|
|
13
|
+
/** The git binary (default `git`, from `PATH`); tests point it elsewhere. */
|
|
14
|
+
git?: string;
|
|
13
15
|
}
|
|
14
16
|
export interface RunningServer {
|
|
15
17
|
/** The content protocol endpoint, `http://localhost:4545/rpc`. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/v8/cli/serve/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/v8/cli/serve/server.ts"],"names":[],"mappings":"AAoCA,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,WAAW,CAAC;AAY3D,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uFAAuF;IACvF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,6EAA6E;IAC7E,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,aAAa;IAC5B,kEAAkE;IAClE,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,6FAA6F;AAC7F,eAAO,MAAM,mBAAmB,0BAA0B,CAAC;AA2D3D,kDAAkD;AAClD,wBAAsB,WAAW,CAAC,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,CA6IpF;AAgED,uDAAuD;AACvD,wBAAsB,KAAK,CAAC,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CASvE"}
|
|
@@ -16,6 +16,10 @@
|
|
|
16
16
|
* - CORS is answered for any `Origin` (reflected, with `Vary: Origin`), and
|
|
17
17
|
* so are Chrome's Private/Local Network Access preflights.
|
|
18
18
|
* - Every save regenerates `.deco/blocks.gen.ts`.
|
|
19
|
+
* - It runs only inside the site's git repository: the content's base (what
|
|
20
|
+
* the site editor's change list compares with, and what a discard
|
|
21
|
+
* restores) is the local git `HEAD`. Outside a git work tree, or without
|
|
22
|
+
* git installed, it refuses to start and says what to run.
|
|
19
23
|
*/
|
|
20
24
|
import fs from "node:fs";
|
|
21
25
|
import http from "node:http";
|
|
@@ -25,6 +29,7 @@ import { ErrorCode } from "../../../protocol/errors.js";
|
|
|
25
29
|
import { blockNameFromFile } from "../../../protocol/keys.js";
|
|
26
30
|
import { createAssetHandler } from "../../../protocol/server/assets.js";
|
|
27
31
|
import { createContentHandler } from "../../../protocol/server/index.js";
|
|
32
|
+
import { checkGitWorkTree, UNBORN_REVISION } from "../../../protocol/storage/fs/git.js";
|
|
28
33
|
import { createFsStorage } from "../../../protocol/storage/fs/index.js";
|
|
29
34
|
import { readSavedBlocks, writeContent } from "../content.js";
|
|
30
35
|
import { consoleReporter } from "../log.js";
|
|
@@ -68,6 +73,24 @@ function previewUrl(input) {
|
|
|
68
73
|
}
|
|
69
74
|
return url.pathname === "/" && !url.search && !url.hash ? url.origin : url.href;
|
|
70
75
|
}
|
|
76
|
+
/**
|
|
77
|
+
* Refuses to serve a folder that isn't inside a git work tree: every source
|
|
78
|
+
* of the protocol has a base, and `deco serve`'s is the local `HEAD`.
|
|
79
|
+
*/
|
|
80
|
+
async function requireGitWorkTree(root, git) {
|
|
81
|
+
const check = await checkGitWorkTree(root, { git });
|
|
82
|
+
if (check.status === "ok")
|
|
83
|
+
return;
|
|
84
|
+
if (check.status === "missing") {
|
|
85
|
+
throw new CliError("deco serve needs git, and it isn't installed here. Install git (https://git-scm.com/downloads), " +
|
|
86
|
+
"then run deco serve again inside your site's git repository.");
|
|
87
|
+
}
|
|
88
|
+
if (check.status === "not-a-repository") {
|
|
89
|
+
throw new CliError(`deco serve runs inside your site's git repository, and ${root} isn't in one. ` +
|
|
90
|
+
"Run it in the folder where you cloned the site, or run git init there first, then start deco serve again.");
|
|
91
|
+
}
|
|
92
|
+
throw new CliError(`deco serve couldn't use the git repository at ${root}: ${check.message}`);
|
|
93
|
+
}
|
|
71
94
|
/** Start the server; resolves once it listens. */
|
|
72
95
|
export async function startServer(options = {}) {
|
|
73
96
|
const reporter = options.reporter ?? consoleReporter;
|
|
@@ -79,7 +102,13 @@ export async function startServer(options = {}) {
|
|
|
79
102
|
if (!Number.isInteger(requestedPort) || requestedPort < 0 || requestedPort > 65535) {
|
|
80
103
|
throw new CliError(`--port must be a port number, got ${requestedPort}`);
|
|
81
104
|
}
|
|
82
|
-
|
|
105
|
+
await requireGitWorkTree(paths.root, options.git);
|
|
106
|
+
const fsStorage = createFsStorage({
|
|
107
|
+
root: paths.root,
|
|
108
|
+
readOnly,
|
|
109
|
+
assetsDir: options.assets,
|
|
110
|
+
git: options.git,
|
|
111
|
+
});
|
|
83
112
|
const storage = {
|
|
84
113
|
...fsStorage,
|
|
85
114
|
async commit(attempt) {
|
|
@@ -87,7 +116,8 @@ export async function startServer(options = {}) {
|
|
|
87
116
|
if (result.status !== "committed")
|
|
88
117
|
return result;
|
|
89
118
|
const names = [...Object.keys(attempt.put), ...attempt.delete].map(blockNameFromFile);
|
|
90
|
-
|
|
119
|
+
const blocks = `${names.length} block${names.length === 1 ? "" : "s"}: ${names.join(", ")}`;
|
|
120
|
+
reporter.info(attempt.reason === "discard" ? `discarded changes to ${blocks}` : `saved ${blocks}`);
|
|
91
121
|
// Every save changes the content, so the content module's revision
|
|
92
122
|
// changes too (a revision is never reused for different content). An
|
|
93
123
|
// unchanged module isn't rewritten, so this costs nothing when it isn't.
|
|
@@ -169,6 +199,7 @@ export async function startServer(options = {}) {
|
|
|
169
199
|
: "no schema yet: run deco schema for typed forms";
|
|
170
200
|
const count = Object.keys(readSavedBlocks(paths.blocks).blocks).length;
|
|
171
201
|
const description = await storage.describe();
|
|
202
|
+
const base = await storage.base().catch(() => null);
|
|
172
203
|
const label = (name) => name.padEnd(21);
|
|
173
204
|
reporter.info(`${label("Deco server")}${endpoint}`);
|
|
174
205
|
reporter.info(`${label("Root")}${description.root} (${schemaFile}, ${count} blocks)`);
|
|
@@ -176,6 +207,10 @@ export async function startServer(options = {}) {
|
|
|
176
207
|
? `${label("Assets")}${description.assets.dir} (PUT /assets/<name>)`
|
|
177
208
|
: `${label("Assets")}read-only: uploads are off`);
|
|
178
209
|
reporter.info(`${label("Preview")}${preview}`);
|
|
210
|
+
if (base) {
|
|
211
|
+
const commit = base.revision === UNBORN_REVISION ? "no commits yet" : base.revision.slice(0, 7);
|
|
212
|
+
reporter.info(`${label("Changes")}compared with ${base.resolvedRef ?? "detached HEAD"} (${commit})`);
|
|
213
|
+
}
|
|
179
214
|
reporter.info(`${label("Site editor")}${siteEditorUrl}`);
|
|
180
215
|
return {
|
|
181
216
|
endpoint,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/v8/cli/serve/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/v8/cli/serve/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/protocol/client.ts
CHANGED
|
@@ -2,13 +2,19 @@
|
|
|
2
2
|
* A small content-protocol client: one method per protocol method, plus
|
|
3
3
|
* batches. Uses `fetch`, so it runs in browsers, on Workers and on Node.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
ContentProtocolError,
|
|
7
|
+
ErrorCode,
|
|
8
|
+
type RpcErrorObject,
|
|
9
|
+
type UnsupportedEndpointData,
|
|
10
|
+
} from "./errors.ts";
|
|
6
11
|
import {
|
|
7
12
|
type DescribeResult,
|
|
8
13
|
type MethodName,
|
|
9
14
|
type Methods,
|
|
10
15
|
PROTOCOL_NAME,
|
|
11
16
|
PROTOCOL_VERSION,
|
|
17
|
+
REQUIRED_PROTOCOL_MINOR,
|
|
12
18
|
type RpcId,
|
|
13
19
|
} from "./types.ts";
|
|
14
20
|
|
|
@@ -32,14 +38,29 @@ export type BatchOutcome =
|
|
|
32
38
|
| { ok: false; error: ContentProtocolError };
|
|
33
39
|
|
|
34
40
|
export interface ContentClient {
|
|
35
|
-
/**
|
|
41
|
+
/**
|
|
42
|
+
* Throws Unsupported when the endpoint speaks another protocol or major
|
|
43
|
+
* version, or an older minor than this client needs (`data.reason`, see
|
|
44
|
+
* `UnsupportedEndpointData`).
|
|
45
|
+
*/
|
|
36
46
|
describe(): Promise<Methods["describe"]["result"]>;
|
|
37
47
|
schemaGet(params?: Methods["schema.get"]["params"]): Promise<Methods["schema.get"]["result"]>;
|
|
38
48
|
blocksList(params?: Methods["blocks.list"]["params"]): Promise<Methods["blocks.list"]["result"]>;
|
|
39
49
|
blocksApply(
|
|
40
50
|
params: Methods["blocks.apply"]["params"],
|
|
41
51
|
): Promise<Methods["blocks.apply"]["result"]>;
|
|
42
|
-
|
|
52
|
+
changesList(
|
|
53
|
+
params?: Methods["changes.list"]["params"],
|
|
54
|
+
): Promise<Methods["changes.list"]["result"]>;
|
|
55
|
+
changesGet(params: Methods["changes.get"]["params"]): Promise<Methods["changes.get"]["result"]>;
|
|
56
|
+
changesDiscard(
|
|
57
|
+
params: Methods["changes.discard"]["params"],
|
|
58
|
+
): Promise<Methods["changes.discard"]["result"]>;
|
|
59
|
+
/**
|
|
60
|
+
* Calls one method by name. Throws `ContentProtocolError` on an error
|
|
61
|
+
* response; a server too old for a `changes.*` method (MethodNotFound)
|
|
62
|
+
* becomes the same Unsupported `describe` raises (`reason: "outdated"`).
|
|
63
|
+
*/
|
|
43
64
|
call<M extends MethodName>(
|
|
44
65
|
method: M,
|
|
45
66
|
params?: Methods[M]["params"],
|
|
@@ -67,27 +88,71 @@ export async function readResponseJson(response: Response): Promise<unknown> {
|
|
|
67
88
|
return JSON.parse(new TextDecoder().decode(bytes));
|
|
68
89
|
}
|
|
69
90
|
|
|
91
|
+
const REQUIRED_VERSION = { major: PROTOCOL_VERSION.major, minor: REQUIRED_PROTOCOL_MINOR };
|
|
92
|
+
|
|
93
|
+
/** The guidance for a server older than this client: update it. */
|
|
94
|
+
const OUTDATED_MESSAGE =
|
|
95
|
+
`the endpoint speaks an older ${PROTOCOL_NAME} than this client needs ` +
|
|
96
|
+
`(${REQUIRED_VERSION.major}.${REQUIRED_VERSION.minor} or newer): update @decocms/blocks in the site ` +
|
|
97
|
+
"(8.2.0 or newer) and start deco serve again";
|
|
98
|
+
|
|
99
|
+
function unsupportedEndpoint(
|
|
100
|
+
message: string,
|
|
101
|
+
reason: UnsupportedEndpointData["reason"],
|
|
102
|
+
description?: Partial<DescribeResult>,
|
|
103
|
+
): ContentProtocolError {
|
|
104
|
+
const data: UnsupportedEndpointData = { reason, required: { ...REQUIRED_VERSION } };
|
|
105
|
+
if (description) {
|
|
106
|
+
data.actual = {
|
|
107
|
+
protocol: description.protocol,
|
|
108
|
+
major: description.version?.major,
|
|
109
|
+
minor: description.version?.minor,
|
|
110
|
+
};
|
|
111
|
+
const server = description.server;
|
|
112
|
+
if (typeof server?.name === "string" && typeof server.version === "string") {
|
|
113
|
+
data.server = { name: server.name, version: server.version };
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return new ContentProtocolError(ErrorCode.Unsupported, message, data);
|
|
117
|
+
}
|
|
118
|
+
|
|
70
119
|
/**
|
|
71
|
-
* Refuses an endpoint this client can't speak to: another protocol,
|
|
72
|
-
*
|
|
120
|
+
* Refuses an endpoint this client can't speak to: another protocol, another
|
|
121
|
+
* major version, or a minor older than `REQUIRED_PROTOCOL_MINOR` (minors only
|
|
122
|
+
* add, so any newer minor is fine). The error's `data` is an
|
|
123
|
+
* `UnsupportedEndpointData`; `reason: "outdated"` means "update the server".
|
|
73
124
|
*/
|
|
74
125
|
export function assertSupportedEndpoint(description: DescribeResult): DescribeResult {
|
|
75
|
-
const
|
|
126
|
+
const reported = (description ?? {}) as Partial<DescribeResult>;
|
|
127
|
+
const { protocol, version } = reported;
|
|
76
128
|
if (protocol !== PROTOCOL_NAME) {
|
|
77
|
-
throw
|
|
78
|
-
ErrorCode.Unsupported,
|
|
129
|
+
throw unsupportedEndpoint(
|
|
79
130
|
`the endpoint speaks ${JSON.stringify(protocol)}, not ${PROTOCOL_NAME}`,
|
|
131
|
+
"protocol",
|
|
132
|
+
reported,
|
|
80
133
|
);
|
|
81
134
|
}
|
|
82
135
|
if (version?.major !== PROTOCOL_VERSION.major) {
|
|
83
|
-
throw
|
|
84
|
-
ErrorCode.Unsupported,
|
|
136
|
+
throw unsupportedEndpoint(
|
|
85
137
|
`the endpoint speaks ${PROTOCOL_NAME} ${String(version?.major)}.x; this client speaks ${PROTOCOL_VERSION.major}.x`,
|
|
138
|
+
"major",
|
|
139
|
+
reported,
|
|
86
140
|
);
|
|
87
141
|
}
|
|
142
|
+
if (typeof version.minor !== "number" || version.minor < REQUIRED_PROTOCOL_MINOR) {
|
|
143
|
+
throw unsupportedEndpoint(OUTDATED_MESSAGE, "outdated", reported);
|
|
144
|
+
}
|
|
88
145
|
return description;
|
|
89
146
|
}
|
|
90
147
|
|
|
148
|
+
/** A server that doesn't know a `changes.*` method is older than this client. */
|
|
149
|
+
function fromWireError(method: string, error: RpcErrorObject): ContentProtocolError {
|
|
150
|
+
if (error.code === ErrorCode.MethodNotFound && method.startsWith("changes.")) {
|
|
151
|
+
return unsupportedEndpoint(OUTDATED_MESSAGE, "outdated");
|
|
152
|
+
}
|
|
153
|
+
return ContentProtocolError.from(error);
|
|
154
|
+
}
|
|
155
|
+
|
|
91
156
|
export function createContentClient(options: ContentClientOptions): ContentClient {
|
|
92
157
|
const doFetch = options.fetch ?? ((request: Request) => fetch(request));
|
|
93
158
|
let nextId = 1;
|
|
@@ -129,7 +194,7 @@ export function createContentClient(options: ContentClientOptions): ContentClien
|
|
|
129
194
|
method,
|
|
130
195
|
params: params ?? {},
|
|
131
196
|
})) as WireResponse;
|
|
132
|
-
if (response.error) throw
|
|
197
|
+
if (response.error) throw fromWireError(method, response.error);
|
|
133
198
|
return response.result as Methods[M]["result"];
|
|
134
199
|
};
|
|
135
200
|
|
|
@@ -139,6 +204,9 @@ export function createContentClient(options: ContentClientOptions): ContentClien
|
|
|
139
204
|
schemaGet: (params) => call("schema.get", params),
|
|
140
205
|
blocksList: (params) => call("blocks.list", params),
|
|
141
206
|
blocksApply: (params) => call("blocks.apply", params),
|
|
207
|
+
changesList: (params) => call("changes.list", params),
|
|
208
|
+
changesGet: (params) => call("changes.get", params),
|
|
209
|
+
changesDiscard: (params) => call("changes.discard", params),
|
|
142
210
|
async batch(calls) {
|
|
143
211
|
const ids = calls.map(() => nextId++);
|
|
144
212
|
const responses = (await post(
|
|
@@ -150,7 +218,7 @@ export function createContentClient(options: ContentClientOptions): ContentClien
|
|
|
150
218
|
})),
|
|
151
219
|
)) as WireResponse[];
|
|
152
220
|
const byId = new Map(responses.map((r) => [r.id, r]));
|
|
153
|
-
return ids.map((id): BatchOutcome => {
|
|
221
|
+
return ids.map((id, i): BatchOutcome => {
|
|
154
222
|
const response = byId.get(id);
|
|
155
223
|
if (!response) {
|
|
156
224
|
return {
|
|
@@ -159,7 +227,7 @@ export function createContentClient(options: ContentClientOptions): ContentClien
|
|
|
159
227
|
};
|
|
160
228
|
}
|
|
161
229
|
return response.error
|
|
162
|
-
? { ok: false, error:
|
|
230
|
+
? { ok: false, error: fromWireError(calls[i]!.method, response.error) }
|
|
163
231
|
: { ok: true, result: response.result };
|
|
164
232
|
});
|
|
165
233
|
},
|