@smartive/datocms-utils 3.0.0-next.1 → 3.0.0-next.3
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/cache/index.d.ts +0 -2
- package/dist/cache/index.js +0 -2
- package/dist/cache/index.js.map +1 -1
- package/dist/cache/{store → provider}/redis.d.ts +1 -1
- package/dist/cache/{store → provider}/redis.js +1 -1
- package/dist/cache/provider/redis.js.map +1 -0
- package/package.json +12 -4
- package/src/cache/index.ts +0 -2
- package/src/cache/{store → provider}/redis.ts +1 -1
- package/dist/cache/store/postgres.d.ts +0 -4
- package/dist/cache/store/postgres.js +0 -34
- package/dist/cache/store/postgres.js.map +0 -1
- package/dist/cache/store/redis.js.map +0 -1
- package/src/cache/store/postgres.ts +0 -48
package/dist/cache/index.d.ts
CHANGED
package/dist/cache/index.js
CHANGED
package/dist/cache/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cache/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cache/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/cache/provider/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,GAAG,EAAE,EAAuC,EAAkB,EAAE;IACnH,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE;QAC3B,oBAAoB,EAAE,CAAC;QACvB,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAAe,EAAE,SAAqB,EAAE,EAAE;QAC3E,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAElC,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;YAC5B,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC,CAAC;IAEF,MAAM,2BAA2B,GAAG,KAAK,EAAE,SAAqB,EAAE,EAAE;QAClE,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC;QAE1D,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,KAAK,EAAE,SAAqB,EAAE,EAAE;QACtD,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YACvB,OAAO,CAAC,CAAC;QACX,CAAC;QAED,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC;QAE1D,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;QACnC,MAAM,OAAO,GAAG,GAAG,SAAS,GAAG,CAAC;QAChC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,CAAC;QACX,CAAC;QAED,OAAO,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC;IAEF,OAAO;QACL,mBAAmB;QACnB,2BAA2B;QAC3B,eAAe;QACf,iBAAiB;KAClB,CAAC;AACJ,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smartive/datocms-utils",
|
|
3
|
-
"version": "3.0.0-next.
|
|
3
|
+
"version": "3.0.0-next.3",
|
|
4
4
|
"description": "A set of utilities and helpers to work with DatoCMS in a Next.js project.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"source": "./src/index.ts",
|
|
@@ -12,6 +12,14 @@
|
|
|
12
12
|
"./cache": {
|
|
13
13
|
"types": "./dist/cache/index.d.ts",
|
|
14
14
|
"import": "./dist/cache/index.js"
|
|
15
|
+
},
|
|
16
|
+
"./cache/redis": {
|
|
17
|
+
"types": "./dist/cache/provider/redis.d.ts",
|
|
18
|
+
"import": "./dist/cache/provider/redis.js"
|
|
19
|
+
},
|
|
20
|
+
"./cache/neon": {
|
|
21
|
+
"types": "./dist/cache/provider/neon.d.ts",
|
|
22
|
+
"import": "./dist/cache/provider/neon.js"
|
|
15
23
|
}
|
|
16
24
|
},
|
|
17
25
|
"files": [
|
|
@@ -38,10 +46,10 @@
|
|
|
38
46
|
"type": "git"
|
|
39
47
|
},
|
|
40
48
|
"devDependencies": {
|
|
49
|
+
"@neondatabase/serverless": "1.0.2",
|
|
41
50
|
"@smartive/eslint-config": "7.0.1",
|
|
42
51
|
"@smartive/prettier-config": "3.1.2",
|
|
43
52
|
"@types/node": "24.10.12",
|
|
44
|
-
"@vercel/postgres": "0.10.0",
|
|
45
53
|
"eslint": "9.39.2",
|
|
46
54
|
"eslint-import-resolver-typescript": "4.4.4",
|
|
47
55
|
"graphql": "16.12.0",
|
|
@@ -51,12 +59,12 @@
|
|
|
51
59
|
"typescript": "5.9.3"
|
|
52
60
|
},
|
|
53
61
|
"peerDependencies": {
|
|
54
|
-
"@
|
|
62
|
+
"@neondatabase/serverless": "^1.0.0",
|
|
55
63
|
"graphql": "^15.0.0 || ^16.0.0",
|
|
56
64
|
"ioredis": "^5.4.0"
|
|
57
65
|
},
|
|
58
66
|
"peerDependenciesMeta": {
|
|
59
|
-
"@
|
|
67
|
+
"@neondatabase/serverless": {
|
|
60
68
|
"optional": true
|
|
61
69
|
},
|
|
62
70
|
"graphql": {
|
package/src/cache/index.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Redis } from 'ioredis';
|
|
2
2
|
import { type CacheTag, type CacheTagsStore } from '../types.js';
|
|
3
3
|
|
|
4
|
-
export const
|
|
4
|
+
export const createCacheTagsStore = ({ url, keyPrefix = '' }: { url: string; keyPrefix?: string }): CacheTagsStore => {
|
|
5
5
|
const redis = new Redis(url, {
|
|
6
6
|
maxRetriesPerRequest: 3,
|
|
7
7
|
lazyConnect: true,
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
import { sql } from '@vercel/postgres';
|
|
2
|
-
export const createPostgresCacheTagsStore = ({ table }) => {
|
|
3
|
-
const storeQueryCacheTags = async (queryId, cacheTags) => {
|
|
4
|
-
if (!cacheTags?.length) {
|
|
5
|
-
return;
|
|
6
|
-
}
|
|
7
|
-
const tags = cacheTags.flatMap((_, i) => [queryId, cacheTags[i]]);
|
|
8
|
-
const placeholders = cacheTags.map((_, i) => `($${2 * i + 1}, $${2 * i + 2})`).join(',');
|
|
9
|
-
await sql.query(`INSERT INTO ${table} VALUES ${placeholders} ON CONFLICT DO NOTHING`, tags);
|
|
10
|
-
};
|
|
11
|
-
const queriesReferencingCacheTags = async (cacheTags) => {
|
|
12
|
-
if (!cacheTags?.length) {
|
|
13
|
-
return [];
|
|
14
|
-
}
|
|
15
|
-
const placeholders = cacheTags.map((_, i) => `$${i + 1}`).join(',');
|
|
16
|
-
const { rows } = await sql.query(`SELECT DISTINCT query_id FROM ${table} WHERE cache_tag IN (${placeholders})`, cacheTags);
|
|
17
|
-
return rows.map((row) => row.query_id);
|
|
18
|
-
};
|
|
19
|
-
const deleteCacheTags = async (cacheTags) => {
|
|
20
|
-
if (cacheTags.length === 0) {
|
|
21
|
-
return 0;
|
|
22
|
-
}
|
|
23
|
-
const placeholders = cacheTags.map((_, i) => `$${i + 1}`).join(',');
|
|
24
|
-
return (await sql.query(`DELETE FROM ${table} WHERE cache_tag IN (${placeholders})`, cacheTags)).rowCount ?? 0;
|
|
25
|
-
};
|
|
26
|
-
const truncateCacheTags = async () => (await sql.query(`DELETE FROM ${table}`)).rowCount ?? 0;
|
|
27
|
-
return {
|
|
28
|
-
storeQueryCacheTags,
|
|
29
|
-
queriesReferencingCacheTags,
|
|
30
|
-
deleteCacheTags,
|
|
31
|
-
truncateCacheTags,
|
|
32
|
-
};
|
|
33
|
-
};
|
|
34
|
-
//# sourceMappingURL=postgres.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/cache/store/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAGvC,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,EAAE,KAAK,EAAqB,EAAkB,EAAE;IAC3F,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAAe,EAAE,SAAqB,EAAE,EAAE;QAC3E,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEzF,MAAM,GAAG,CAAC,KAAK,CAAC,eAAe,KAAK,WAAW,YAAY,yBAAyB,EAAE,IAAI,CAAC,CAAC;IAC9F,CAAC,CAAC;IAEF,MAAM,2BAA2B,GAAG,KAAK,EAAE,SAAqB,EAAqB,EAAE;QACrF,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEpE,MAAM,EAAE,IAAI,EAAE,GAAqC,MAAM,GAAG,CAAC,KAAK,CAChE,iCAAiC,KAAK,wBAAwB,YAAY,GAAG,EAC7E,SAAS,CACV,CAAC;QAEF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,KAAK,EAAE,SAAqB,EAAE,EAAE;QACtD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEpE,OAAO,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,eAAe,KAAK,wBAAwB,YAAY,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC;IACjH,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC;IAE9F,OAAO;QACL,mBAAmB;QACnB,2BAA2B;QAC3B,eAAe;QACf,iBAAiB;KAClB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/cache/store/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,GAAG,EAAE,EAAuC,EAAkB,EAAE;IACxH,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE;QAC3B,oBAAoB,EAAE,CAAC;QACvB,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAAe,EAAE,SAAqB,EAAE,EAAE;QAC3E,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAElC,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;YAC5B,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC,CAAC;IAEF,MAAM,2BAA2B,GAAG,KAAK,EAAE,SAAqB,EAAE,EAAE;QAClE,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC;QAE1D,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,KAAK,EAAE,SAAqB,EAAE,EAAE;QACtD,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YACvB,OAAO,CAAC,CAAC;QACX,CAAC;QAED,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC;QAE1D,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;QACnC,MAAM,OAAO,GAAG,GAAG,SAAS,GAAG,CAAC;QAChC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,CAAC;QACX,CAAC;QAED,OAAO,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC;IAEF,OAAO;QACL,mBAAmB;QACnB,2BAA2B;QAC3B,eAAe;QACf,iBAAiB;KAClB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
import { sql } from '@vercel/postgres';
|
|
2
|
-
import { type CacheTag, type CacheTagsStore } from '../types.js';
|
|
3
|
-
|
|
4
|
-
export const createPostgresCacheTagsStore = ({ table }: { table: string }): CacheTagsStore => {
|
|
5
|
-
const storeQueryCacheTags = async (queryId: string, cacheTags: CacheTag[]) => {
|
|
6
|
-
if (!cacheTags?.length) {
|
|
7
|
-
return;
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
const tags = cacheTags.flatMap((_, i) => [queryId, cacheTags[i]]);
|
|
11
|
-
const placeholders = cacheTags.map((_, i) => `($${2 * i + 1}, $${2 * i + 2})`).join(',');
|
|
12
|
-
|
|
13
|
-
await sql.query(`INSERT INTO ${table} VALUES ${placeholders} ON CONFLICT DO NOTHING`, tags);
|
|
14
|
-
};
|
|
15
|
-
|
|
16
|
-
const queriesReferencingCacheTags = async (cacheTags: CacheTag[]): Promise<string[]> => {
|
|
17
|
-
if (!cacheTags?.length) {
|
|
18
|
-
return [];
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
const placeholders = cacheTags.map((_, i) => `$${i + 1}`).join(',');
|
|
22
|
-
|
|
23
|
-
const { rows }: { rows: { query_id: string }[] } = await sql.query(
|
|
24
|
-
`SELECT DISTINCT query_id FROM ${table} WHERE cache_tag IN (${placeholders})`,
|
|
25
|
-
cacheTags,
|
|
26
|
-
);
|
|
27
|
-
|
|
28
|
-
return rows.map((row) => row.query_id);
|
|
29
|
-
};
|
|
30
|
-
|
|
31
|
-
const deleteCacheTags = async (cacheTags: CacheTag[]) => {
|
|
32
|
-
if (cacheTags.length === 0) {
|
|
33
|
-
return 0;
|
|
34
|
-
}
|
|
35
|
-
const placeholders = cacheTags.map((_, i) => `$${i + 1}`).join(',');
|
|
36
|
-
|
|
37
|
-
return (await sql.query(`DELETE FROM ${table} WHERE cache_tag IN (${placeholders})`, cacheTags)).rowCount ?? 0;
|
|
38
|
-
};
|
|
39
|
-
|
|
40
|
-
const truncateCacheTags = async () => (await sql.query(`DELETE FROM ${table}`)).rowCount ?? 0;
|
|
41
|
-
|
|
42
|
-
return {
|
|
43
|
-
storeQueryCacheTags,
|
|
44
|
-
queriesReferencingCacheTags,
|
|
45
|
-
deleteCacheTags,
|
|
46
|
-
truncateCacheTags,
|
|
47
|
-
};
|
|
48
|
-
};
|