@jungvonmatt/contentful-ssg 1.8.0 → 1.9.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/cli.js +28 -12
- package/dist/cli.js.map +1 -1
- package/dist/index.js +8 -3
- package/dist/index.js.map +1 -1
- package/dist/lib/cf-cache.d.ts +18 -0
- package/dist/lib/cf-cache.js +123 -0
- package/dist/lib/cf-cache.js.map +1 -0
- package/dist/lib/contentful.d.ts +2 -5
- package/dist/lib/contentful.js +10 -18
- package/dist/lib/contentful.js.map +1 -1
- package/dist/lib/observable.d.ts +3 -0
- package/dist/lib/observable.js +23 -0
- package/dist/lib/observable.js.map +1 -0
- package/dist/lib/stats.d.ts +2 -2
- package/dist/lib/stats.js +17 -5
- package/dist/lib/stats.js.map +1 -1
- package/dist/lib/utils.js +1 -3
- package/dist/lib/utils.js.map +1 -1
- package/dist/types.d.ts +2 -2
- package/package.json +9 -3
- package/src/cli.ts +31 -13
- package/src/index.ts +8 -3
- package/src/lib/cf-cache.test.ts +79 -0
- package/src/lib/cf-cache.ts +167 -0
- package/src/lib/contentful.test.ts +20 -13
- package/src/lib/contentful.ts +24 -36
- package/src/lib/observable.test.ts +72 -0
- package/src/lib/observable.ts +33 -0
- package/src/lib/stats.ts +30 -6
- package/src/lib/utils.test.ts +85 -62
- package/src/lib/utils.ts +8 -10
- package/src/types.ts +2 -2
package/dist/cli.js
CHANGED
|
@@ -12,8 +12,9 @@ import ngrok from 'ngrok';
|
|
|
12
12
|
import path from 'path';
|
|
13
13
|
import prettier from 'prettier';
|
|
14
14
|
import { run } from './index.js';
|
|
15
|
+
import { initializeCache } from './lib/cf-cache.js';
|
|
15
16
|
import { getConfig, getEnvironmentConfig } from './lib/config.js';
|
|
16
|
-
import { addWatchWebhook
|
|
17
|
+
import { addWatchWebhook } from './lib/contentful.js';
|
|
17
18
|
import { omitKeys } from './lib/object.js';
|
|
18
19
|
import { askAll, askMissing, confirm, logError } from './lib/ui.js';
|
|
19
20
|
import { getApp } from './server/index.js';
|
|
@@ -95,9 +96,10 @@ program
|
|
|
95
96
|
.option('-v, --verbose', 'Verbose output')
|
|
96
97
|
.option('--ignore-errors', 'No error return code when transform has errors')
|
|
97
98
|
.action(actionRunner(async (cmd) => {
|
|
98
|
-
await resetSync();
|
|
99
99
|
const config = await getConfig(parseFetchArgs(cmd || {}));
|
|
100
100
|
const verified = await askMissing(config);
|
|
101
|
+
const cache = initializeCache(config);
|
|
102
|
+
await cache.reset();
|
|
101
103
|
return run(verified);
|
|
102
104
|
}));
|
|
103
105
|
program
|
|
@@ -106,13 +108,25 @@ program
|
|
|
106
108
|
.option('-p, --preview', 'Fetch with preview mode')
|
|
107
109
|
.option('-v, --verbose', 'Verbose output')
|
|
108
110
|
.option('--url <url>', 'Webhook url.\nCan also be set via environment variable CSSG_WEBHOOK_URL')
|
|
111
|
+
.option('--no-cache', "Don't cache sync data")
|
|
109
112
|
.option('--port <port>', 'Overwrite internal listener port. Useful for running the watcher in an environment with a single public port and a proxy configuration.\nCan also be set via environment variable CSSG_WEBHOOK_PORT')
|
|
110
113
|
.option('--ignore-errors', 'No error return code when transform has errors')
|
|
111
114
|
.action(actionRunner(async (cmd) => {
|
|
112
|
-
await resetSync();
|
|
113
115
|
const config = await getConfig(parseFetchArgs(cmd || {}));
|
|
114
116
|
const verified = await askMissing(config);
|
|
115
|
-
|
|
117
|
+
const useCache = Boolean(cmd?.cache ?? true);
|
|
118
|
+
const cache = initializeCache(verified);
|
|
119
|
+
let prev;
|
|
120
|
+
if (useCache && cache.hasSyncState()) {
|
|
121
|
+
prev = await cache.getSyncState();
|
|
122
|
+
}
|
|
123
|
+
else if (!useCache) {
|
|
124
|
+
await cache.reset();
|
|
125
|
+
}
|
|
126
|
+
prev = await run({ ...verified, sync: true }, prev);
|
|
127
|
+
if (useCache) {
|
|
128
|
+
await cache.setSyncState(prev);
|
|
129
|
+
}
|
|
116
130
|
let port = await getPort({ port: 1314 });
|
|
117
131
|
if (process.env.CSSG_WEBHOOK_URL || cmd.url) {
|
|
118
132
|
const url = new URL(process.env.CSSG_WEBHOOK_URL || cmd.url);
|
|
@@ -128,6 +142,7 @@ program
|
|
|
128
142
|
}
|
|
129
143
|
const app = getApp(async () => {
|
|
130
144
|
prev = await run({ ...verified, sync: true }, prev);
|
|
145
|
+
await cache.setSyncState(prev);
|
|
131
146
|
});
|
|
132
147
|
console.log();
|
|
133
148
|
const server = app.listen(port, () => {
|
|
@@ -146,14 +161,15 @@ program
|
|
|
146
161
|
const url = process.env.CSSG_WEBHOOK_URL || cmd.url || (await ngrok.connect(port));
|
|
147
162
|
console.log(` Listening for hooks on ${chalk.cyan(url)}`);
|
|
148
163
|
const webhook = await addWatchWebhook(verified, url);
|
|
149
|
-
exitHook(
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
164
|
+
exitHook((cb) => {
|
|
165
|
+
Promise.allSettled([webhook.delete(), stopServer(), !useCache && cache.reset()])
|
|
166
|
+
.then(() => {
|
|
167
|
+
cb();
|
|
168
|
+
})
|
|
169
|
+
.catch((err) => {
|
|
170
|
+
console.log('error:', err.message);
|
|
171
|
+
cb();
|
|
172
|
+
});
|
|
157
173
|
});
|
|
158
174
|
}));
|
|
159
175
|
program.parse(process.argv);
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAIA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import Listr from 'listr';
|
|
3
3
|
import { ReplaySubject } from 'rxjs';
|
|
4
|
-
import {
|
|
4
|
+
import { initializeCache } from './lib/cf-cache.js';
|
|
5
|
+
import { getContentId, getContentTypeId } from './lib/contentful.js';
|
|
5
6
|
import { ValidationError } from './lib/error.js';
|
|
6
7
|
import { collectParentValues, collectValues, waitFor } from './lib/utils.js';
|
|
7
8
|
import { fetch } from './tasks/fetch.js';
|
|
@@ -72,6 +73,7 @@ export const run = async (config, prev = {
|
|
|
72
73
|
observables: {},
|
|
73
74
|
localized: {},
|
|
74
75
|
}) => {
|
|
76
|
+
const hasPrev = Object.values(prev.localized).length > 0;
|
|
75
77
|
const tasks = new Listr([
|
|
76
78
|
{
|
|
77
79
|
title: 'Setup',
|
|
@@ -208,12 +210,15 @@ export const run = async (config, prev = {
|
|
|
208
210
|
},
|
|
209
211
|
{
|
|
210
212
|
title: 'Cleanup',
|
|
211
|
-
skip: () =>
|
|
213
|
+
skip: (ctx) => {
|
|
214
|
+
const cache = initializeCache(ctx.config);
|
|
215
|
+
return cache.hasSyncToken();
|
|
216
|
+
},
|
|
212
217
|
task: async (ctx) => ctx.fileManager.cleanup(),
|
|
213
218
|
},
|
|
214
219
|
], { renderer: CustomListrRenderer });
|
|
215
220
|
const ctx = await tasks.run();
|
|
216
|
-
await ctx.stats.print();
|
|
221
|
+
await ctx.stats.print(hasPrev && prev);
|
|
217
222
|
console.log('\n -------------------------------------------');
|
|
218
223
|
if (!ctx.config.sync && ctx.stats.errors?.length && !config.ignoreErrors) {
|
|
219
224
|
process.exit(1);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { ContentfulConfig, RunResult } from '../types.js';
|
|
2
|
+
export declare const getCacheDir: (config: Partial<ContentfulConfig>) => string;
|
|
3
|
+
export declare const setSyncToken: (token: string, config: Partial<ContentfulConfig>) => Promise<void>;
|
|
4
|
+
export declare const hasSyncToken: (config: Partial<ContentfulConfig>) => boolean;
|
|
5
|
+
export declare const getSyncToken: (config: Partial<ContentfulConfig>) => Promise<string>;
|
|
6
|
+
export declare const setSyncState: (state: RunResult, config: Partial<ContentfulConfig>) => Promise<void>;
|
|
7
|
+
export declare const hasSyncState: (config: Partial<ContentfulConfig>) => boolean;
|
|
8
|
+
export declare const getSyncState: (config: Partial<ContentfulConfig>) => Promise<RunResult>;
|
|
9
|
+
export declare const reset: (config: Partial<ContentfulConfig>) => Promise<[void, void]>;
|
|
10
|
+
export declare const initializeCache: (config: Partial<ContentfulConfig>) => {
|
|
11
|
+
setSyncToken(token: any): Promise<void>;
|
|
12
|
+
getSyncToken(): Promise<string>;
|
|
13
|
+
hasSyncToken(): boolean;
|
|
14
|
+
setSyncState(state: RunResult): Promise<void>;
|
|
15
|
+
getSyncState(): Promise<RunResult>;
|
|
16
|
+
hasSyncState(): boolean;
|
|
17
|
+
reset(): Promise<[void, void]>;
|
|
18
|
+
};
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
import findCacheDir from 'find-cache-dir';
|
|
2
|
+
import { existsSync } from 'fs';
|
|
3
|
+
import { outputFile, remove } from 'fs-extra';
|
|
4
|
+
import { readFile } from 'fs/promises';
|
|
5
|
+
import path from 'path';
|
|
6
|
+
import { serializeError, deserializeError } from 'serialize-error';
|
|
7
|
+
import { ReplaySubject } from 'rxjs';
|
|
8
|
+
import { deserialize as v8Deserialize, serialize as v8Serialize } from 'v8';
|
|
9
|
+
import { getObservableValues } from './observable.js';
|
|
10
|
+
export const getCacheDir = (config) => {
|
|
11
|
+
const environmentId = config?.environmentId ?? 'master';
|
|
12
|
+
const spaceId = config?.spaceId ?? 'global';
|
|
13
|
+
const name = `contentful-ssg/sync-${spaceId}-${environmentId}`;
|
|
14
|
+
const dir = findCacheDir({ name }) || path.join(process.cwd(), '.cache', name);
|
|
15
|
+
return dir;
|
|
16
|
+
};
|
|
17
|
+
const getTokenFile = (config) => path.join(getCacheDir(config), 'sync-token');
|
|
18
|
+
export const setSyncToken = async (token, config) => {
|
|
19
|
+
const file = getTokenFile(config);
|
|
20
|
+
return outputFile(file, token);
|
|
21
|
+
};
|
|
22
|
+
export const hasSyncToken = (config) => {
|
|
23
|
+
const file = getTokenFile(config);
|
|
24
|
+
return existsSync(file);
|
|
25
|
+
};
|
|
26
|
+
export const getSyncToken = async (config) => {
|
|
27
|
+
const file = getTokenFile(config);
|
|
28
|
+
if (existsSync(file)) {
|
|
29
|
+
return readFile(file, 'utf8');
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
const serialize = async (data) => {
|
|
33
|
+
const { localized, observables } = data;
|
|
34
|
+
const observableEntries = await Promise.all(Object.entries(observables).map(async ([locale, observable]) => {
|
|
35
|
+
const values = await getObservableValues(observable, (ctx) => {
|
|
36
|
+
return {
|
|
37
|
+
id: ctx.id,
|
|
38
|
+
contentTypeId: ctx.contentTypeId,
|
|
39
|
+
content: ctx.content,
|
|
40
|
+
locale: ctx.locale,
|
|
41
|
+
error: ctx.error ? serializeError(ctx.error) : undefined,
|
|
42
|
+
};
|
|
43
|
+
});
|
|
44
|
+
return [locale, values];
|
|
45
|
+
}));
|
|
46
|
+
return v8Serialize({ localized, observableEntries });
|
|
47
|
+
};
|
|
48
|
+
const deserialize = async (buffer) => {
|
|
49
|
+
try {
|
|
50
|
+
const { localized, observableEntries } = v8Deserialize(buffer);
|
|
51
|
+
const observables = Object.fromEntries(observableEntries.map(([locale, data]) => {
|
|
52
|
+
const subject$ = new ReplaySubject();
|
|
53
|
+
data.forEach((value) => {
|
|
54
|
+
if (value.error) {
|
|
55
|
+
subject$.next({ ...value, error: deserializeError(value.error) });
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
subject$.next(value);
|
|
59
|
+
}
|
|
60
|
+
});
|
|
61
|
+
return [locale, subject$];
|
|
62
|
+
}));
|
|
63
|
+
return {
|
|
64
|
+
localized,
|
|
65
|
+
observables: observables,
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
console.log(error);
|
|
70
|
+
throw error;
|
|
71
|
+
}
|
|
72
|
+
};
|
|
73
|
+
const getStateFile = (config) => path.join(getCacheDir(config), 'sync-data');
|
|
74
|
+
export const setSyncState = async (state, config) => {
|
|
75
|
+
const data = await serialize(state);
|
|
76
|
+
const file = getStateFile(config);
|
|
77
|
+
return outputFile(file, data);
|
|
78
|
+
};
|
|
79
|
+
export const hasSyncState = (config) => {
|
|
80
|
+
const file = getStateFile(config);
|
|
81
|
+
return existsSync(file);
|
|
82
|
+
};
|
|
83
|
+
export const getSyncState = async (config) => {
|
|
84
|
+
const file = getStateFile(config);
|
|
85
|
+
if (existsSync(file)) {
|
|
86
|
+
const data = await readFile(file);
|
|
87
|
+
return deserialize(data);
|
|
88
|
+
}
|
|
89
|
+
};
|
|
90
|
+
export const reset = async (config) => {
|
|
91
|
+
const stateFile = getStateFile(config);
|
|
92
|
+
const tokenFile = getTokenFile(config);
|
|
93
|
+
return Promise.all([
|
|
94
|
+
existsSync(stateFile) && remove(stateFile),
|
|
95
|
+
existsSync(tokenFile) && remove(tokenFile),
|
|
96
|
+
]);
|
|
97
|
+
};
|
|
98
|
+
export const initializeCache = (config) => {
|
|
99
|
+
return {
|
|
100
|
+
async setSyncToken(token) {
|
|
101
|
+
return setSyncToken(token, config);
|
|
102
|
+
},
|
|
103
|
+
async getSyncToken() {
|
|
104
|
+
return getSyncToken(config);
|
|
105
|
+
},
|
|
106
|
+
hasSyncToken() {
|
|
107
|
+
return hasSyncToken(config);
|
|
108
|
+
},
|
|
109
|
+
async setSyncState(state) {
|
|
110
|
+
return setSyncState(state, config);
|
|
111
|
+
},
|
|
112
|
+
async getSyncState() {
|
|
113
|
+
return getSyncState(config);
|
|
114
|
+
},
|
|
115
|
+
hasSyncState() {
|
|
116
|
+
return hasSyncState(config);
|
|
117
|
+
},
|
|
118
|
+
async reset() {
|
|
119
|
+
return reset(config);
|
|
120
|
+
},
|
|
121
|
+
};
|
|
122
|
+
};
|
|
123
|
+
//# sourceMappingURL=cf-cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cf-cache.js","sourceRoot":"","sources":["../../src/lib/cf-cache.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/contentful.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { Space, CreateWebhooksProps } from 'contentful-management/types';
|
|
2
|
-
import type { ContentfulConfig, FieldSettings, Node, Entry, ContentType } from '../types.js';
|
|
3
1
|
import contentful from 'contentful';
|
|
2
|
+
import type { CreateWebhooksProps, Space } from 'contentful-management/types';
|
|
3
|
+
import type { ContentfulConfig, ContentType, Entry, FieldSettings, Node } from '../types.js';
|
|
4
4
|
export declare const FIELD_TYPE_SYMBOL = "Symbol";
|
|
5
5
|
export declare const FIELD_TYPE_TEXT = "Text";
|
|
6
6
|
export declare const FIELD_TYPE_RICHTEXT = "RichText";
|
|
@@ -15,7 +15,6 @@ export declare const FIELD_TYPE_OBJECT = "Object";
|
|
|
15
15
|
export declare const LINK_TYPE_ASSET = "Asset";
|
|
16
16
|
export declare const LINK_TYPE_ENTRY = "Entry";
|
|
17
17
|
export declare const MAX_ALLOWED_LIMIT = 1000;
|
|
18
|
-
export declare const SYNC_TOKEN_FILENAME = ".contentful_sync.lock";
|
|
19
18
|
export declare const getContentTypeId: <T extends contentful.Asset | Entry | contentful.Entry<unknown>>(node: T) => string;
|
|
20
19
|
export declare const getEnvironmentId: <T extends Node>(node: T) => string;
|
|
21
20
|
export declare const getContentId: <T extends contentful.ContentType | contentful.Asset | Entry | contentful.Entry<unknown>>(node: T) => string;
|
|
@@ -29,8 +28,6 @@ export declare const getWebhooks: (options: ContentfulConfig) => Promise<import(
|
|
|
29
28
|
export declare const addWebhook: (options: ContentfulConfig, id: string, data: CreateWebhooksProps) => Promise<import("contentful-management/types").WebHooks>;
|
|
30
29
|
export declare const deleteWebhook: (options: ContentfulConfig, id: string) => Promise<void>;
|
|
31
30
|
export declare const addWatchWebhook: (options: ContentfulConfig, url: string) => Promise<import("contentful-management/types").WebHooks>;
|
|
32
|
-
export declare const isSyncRequest: () => boolean;
|
|
33
|
-
export declare const resetSync: () => Promise<true | void>;
|
|
34
31
|
export declare const getContent: (options: ContentfulConfig) => Promise<{
|
|
35
32
|
entries: contentful.Entry<any>[];
|
|
36
33
|
assets: contentful.Asset[];
|
package/dist/lib/contentful.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { existsSync } from 'fs';
|
|
2
|
-
import { hostname } from 'os';
|
|
3
|
-
import { createHash } from 'crypto';
|
|
4
|
-
import { v4 as uuidv4 } from 'uuid';
|
|
5
|
-
import { readFile, unlink, writeFile } from 'fs/promises';
|
|
6
1
|
import contentful from 'contentful';
|
|
7
2
|
import contentfulManagement from 'contentful-management';
|
|
3
|
+
import { createHash } from 'crypto';
|
|
4
|
+
import { hostname } from 'os';
|
|
5
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
6
|
+
import { initializeCache } from './cf-cache.js';
|
|
8
7
|
let client;
|
|
9
8
|
let managementClient;
|
|
10
9
|
export const FIELD_TYPE_SYMBOL = 'Symbol';
|
|
@@ -21,7 +20,6 @@ export const FIELD_TYPE_OBJECT = 'Object';
|
|
|
21
20
|
export const LINK_TYPE_ASSET = 'Asset';
|
|
22
21
|
export const LINK_TYPE_ENTRY = 'Entry';
|
|
23
22
|
export const MAX_ALLOWED_LIMIT = 1000;
|
|
24
|
-
export const SYNC_TOKEN_FILENAME = '.contentful_sync.lock';
|
|
25
23
|
export const getContentTypeId = (node) => node?.sys?.contentType?.sys?.id ?? 'unknown';
|
|
26
24
|
export const getEnvironmentId = (node) => node?.sys?.environment?.sys?.id ?? 'unknown';
|
|
27
25
|
export const getContentId = (node) => node?.sys?.id ?? 'unknown';
|
|
@@ -189,25 +187,19 @@ const pagedGet = async (apiClient, { method, skip = 0, aggregatedResponse = null
|
|
|
189
187
|
}
|
|
190
188
|
return aggregatedResponse;
|
|
191
189
|
};
|
|
192
|
-
const sync = async (apiClient) => {
|
|
190
|
+
const sync = async (apiClient, config) => {
|
|
191
|
+
const cache = initializeCache(config);
|
|
193
192
|
const options = { initial: true };
|
|
194
|
-
if (
|
|
195
|
-
options.nextSyncToken = await
|
|
193
|
+
if (cache.hasSyncToken()) {
|
|
194
|
+
options.nextSyncToken = await cache.getSyncToken();
|
|
196
195
|
delete options.initial;
|
|
197
196
|
}
|
|
198
197
|
const response = (await apiClient.sync(options));
|
|
199
198
|
if (response.nextSyncToken) {
|
|
200
|
-
await
|
|
199
|
+
await cache.setSyncToken(response.nextSyncToken);
|
|
201
200
|
}
|
|
202
201
|
return response;
|
|
203
202
|
};
|
|
204
|
-
export const isSyncRequest = () => existsSync(SYNC_TOKEN_FILENAME);
|
|
205
|
-
export const resetSync = async () => {
|
|
206
|
-
if (isSyncRequest()) {
|
|
207
|
-
return unlink(SYNC_TOKEN_FILENAME);
|
|
208
|
-
}
|
|
209
|
-
return true;
|
|
210
|
-
};
|
|
211
203
|
export const getContent = async (options) => {
|
|
212
204
|
const apiClient = getClient(options);
|
|
213
205
|
const { items: locales } = await pagedGet(apiClient, {
|
|
@@ -217,7 +209,7 @@ export const getContent = async (options) => {
|
|
|
217
209
|
method: 'getContentTypes',
|
|
218
210
|
});
|
|
219
211
|
if (options.sync) {
|
|
220
|
-
const { entries, assets, deletedEntries, deletedAssets } = await sync(apiClient);
|
|
212
|
+
const { entries, assets, deletedEntries, deletedAssets } = await sync(apiClient, options);
|
|
221
213
|
return { entries, assets, deletedEntries, deletedAssets, contentTypes, locales };
|
|
222
214
|
}
|
|
223
215
|
const { items: entries } = await pagedGet(apiClient, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contentful.js","sourceRoot":"","sources":["../../src/lib/contentful.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"contentful.js","sourceRoot":"","sources":["../../src/lib/contentful.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { Observable } from 'rxjs';
|
|
2
|
+
export declare const getObservableValues: <T, U = Partial<T>>(observable$: Observable<T>, cb?: (value: T) => U) => Promise<U[]>;
|
|
3
|
+
export declare const getObservableCount: <T>(observable$: Observable<T>, filterFn?: (value: T) => boolean) => Promise<number>;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { filter, count, takeUntil, timer } from 'rxjs';
|
|
2
|
+
export const getObservableValues = async (observable$, cb = (value) => value) => {
|
|
3
|
+
const terminator$ = timer(1);
|
|
4
|
+
const data = [];
|
|
5
|
+
await observable$.pipe(takeUntil(terminator$)).forEach((value) => {
|
|
6
|
+
const entry = cb(value);
|
|
7
|
+
data.push(entry);
|
|
8
|
+
});
|
|
9
|
+
return data;
|
|
10
|
+
};
|
|
11
|
+
export const getObservableCount = async (observable$, filterFn = () => true) => {
|
|
12
|
+
let result = 0;
|
|
13
|
+
const terminator$ = timer(1);
|
|
14
|
+
await observable$
|
|
15
|
+
.pipe(takeUntil(terminator$))
|
|
16
|
+
.pipe(filter(filterFn))
|
|
17
|
+
.pipe(count())
|
|
18
|
+
.forEach((val) => {
|
|
19
|
+
result = val;
|
|
20
|
+
});
|
|
21
|
+
return result;
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=observable.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"observable.js","sourceRoot":"","sources":["../../src/lib/observable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAc,SAAS,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAEnE,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,WAA0B,EAC1B,KAAsB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAqB,EACxC,EAAE;IAChB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAQ,EAAE,CAAC;IAErB,MAAM,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC/D,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,WAA0B,EAC1B,WAAkC,GAAG,EAAE,CAAC,IAAI,EAC3B,EAAE;IACnB,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,WAAW;SACd,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;SAC5B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACtB,IAAI,CAAC,KAAK,EAAE,CAAC;SACb,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACf,MAAM,GAAG,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;IAEL,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
package/dist/lib/stats.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Config, StatsEntry, TransformContext } from '../types.js';
|
|
1
|
+
import type { Config, RunResult, StatsEntry, TransformContext } from '../types.js';
|
|
2
2
|
import { ValidationError } from './error.js';
|
|
3
3
|
export declare class Stats {
|
|
4
4
|
config: Config;
|
|
@@ -14,5 +14,5 @@ export declare class Stats {
|
|
|
14
14
|
addSuccess(context: TransformContext, message?: string): void;
|
|
15
15
|
addError(context: TransformContext, error: unknown): void;
|
|
16
16
|
addSkipped(context: TransformContext, error: ValidationError): void;
|
|
17
|
-
print(): Promise<void>;
|
|
17
|
+
print(prev?: RunResult): Promise<void>;
|
|
18
18
|
}
|
package/dist/lib/stats.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { getEntries, groupBy } from './object.js';
|
|
2
|
-
import { writeFile } from 'fs/promises';
|
|
3
1
|
import chalk from 'chalk';
|
|
2
|
+
import { writeFile } from 'fs/promises';
|
|
4
3
|
import { join } from 'path';
|
|
4
|
+
import { getEntries, groupBy } from './object.js';
|
|
5
|
+
import { getObservableCount } from './observable.js';
|
|
5
6
|
export class Stats {
|
|
6
7
|
config;
|
|
7
8
|
success = [];
|
|
@@ -31,7 +32,7 @@ export class Stats {
|
|
|
31
32
|
addSkipped(context, error) {
|
|
32
33
|
this.skipped.push({ error, ...this.toEntry(context) });
|
|
33
34
|
}
|
|
34
|
-
async print() {
|
|
35
|
+
async print(prev) {
|
|
35
36
|
console.log('\n -----------\n');
|
|
36
37
|
const stats = groupBy(this.success, 'contentTypeId');
|
|
37
38
|
Object.entries(stats)
|
|
@@ -47,13 +48,24 @@ export class Stats {
|
|
|
47
48
|
const timestamp = Date.now();
|
|
48
49
|
const filenameSkipped = `validation-errors-${timestamp}.log`;
|
|
49
50
|
const filenameErrors = `errors-${timestamp}.log`;
|
|
50
|
-
|
|
51
|
+
if (prev) {
|
|
52
|
+
const successCounts = await Promise.all(Object.entries(prev.observables).map(async ([, observable]) => {
|
|
53
|
+
return getObservableCount(observable, (ctx) => !ctx.error);
|
|
54
|
+
}));
|
|
55
|
+
const errorCounts = await Promise.all(Object.entries(prev.observables).map(async ([, observable]) => {
|
|
56
|
+
return getObservableCount(observable, (ctx) => Boolean(ctx.error));
|
|
57
|
+
}));
|
|
58
|
+
const successCount = successCounts.reduce((result, count) => result + count, 0);
|
|
59
|
+
const errorCount = errorCounts.reduce((result, count) => result + count, 0);
|
|
60
|
+
console.log(` Sync cache contains ${chalk.green(successCount)} entries and ${chalk.red(errorCount)} errors`);
|
|
61
|
+
}
|
|
62
|
+
console.log(`\n Saved ${chalk.green(this.success.length)}${prev ? ' new' : ''} entries`);
|
|
51
63
|
console.log(` ${chalk.cyan(this.skipped.length)} entries skipped due to validation issues.`, this.config.verbose && this.skipped.length
|
|
52
64
|
? `See ${filenameSkipped} for details.`
|
|
53
65
|
: this.skipped.length
|
|
54
66
|
? 'Use --verbose to see actual errors.'
|
|
55
67
|
: '');
|
|
56
|
-
console.log(` ${chalk.red(this.errors.length)} errors.`, this.config.verbose && this.errors.length
|
|
68
|
+
console.log(` ${chalk.red(this.errors.length)}${prev ? ' new' : ''} errors.`, this.config.verbose && this.errors.length
|
|
57
69
|
? `See ${filenameErrors} for details.`
|
|
58
70
|
: this.errors.length
|
|
59
71
|
? 'Use --verbose to see actual errors.'
|
package/dist/lib/stats.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../src/lib/stats.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../src/lib/stats.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/utils.js
CHANGED
|
@@ -76,9 +76,7 @@ Entry ${source} waiting for ${source}.`);
|
|
|
76
76
|
Entry ${source} waiting for ${dest}.`));
|
|
77
77
|
}, waitTimeout);
|
|
78
78
|
if (transformContext.entryMap.has(id)) {
|
|
79
|
-
transformContext.observable
|
|
80
|
-
.pipe(filter((ctx) => ctx?.entry?.sys?.id === id))
|
|
81
|
-
.subscribe((value) => {
|
|
79
|
+
transformContext.observable.pipe(filter((ctx) => ctx?.id === id)).subscribe((value) => {
|
|
82
80
|
clearTimeout(timeout);
|
|
83
81
|
if (value.error) {
|
|
84
82
|
reject(new WrappedError(`Awaited entry ${dest} errored`, value.error));
|