@smartive/datocms-utils 3.0.0-next.2 → 3.0.0-next.4
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/provider/neon.d.ts +5 -0
- package/dist/cache/provider/{postgres.js → neon.js} +10 -4
- package/dist/cache/provider/neon.js.map +1 -0
- package/package.json +7 -7
- package/src/cache/provider/{postgres.ts → neon.ts} +18 -4
- package/dist/cache/provider/postgres.d.ts +0 -4
- package/dist/cache/provider/postgres.js.map +0 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export const createCacheTagsStore = ({ table }) => {
|
|
1
|
+
import { neon } from '@neondatabase/serverless';
|
|
2
|
+
export const createCacheTagsStore = ({ connectionString, table, }) => {
|
|
3
|
+
const sql = neon(connectionString, { fullResults: true });
|
|
3
4
|
const storeQueryCacheTags = async (queryId, cacheTags) => {
|
|
4
5
|
if (!cacheTags?.length) {
|
|
5
6
|
return;
|
|
@@ -14,7 +15,12 @@ export const createCacheTagsStore = ({ table }) => {
|
|
|
14
15
|
}
|
|
15
16
|
const placeholders = cacheTags.map((_, i) => `$${i + 1}`).join(',');
|
|
16
17
|
const { rows } = await sql.query(`SELECT DISTINCT query_id FROM ${table} WHERE cache_tag IN (${placeholders})`, cacheTags);
|
|
17
|
-
return rows.
|
|
18
|
+
return rows.reduce((queryIds, row) => {
|
|
19
|
+
if (typeof row.query_id === 'string') {
|
|
20
|
+
queryIds.push(row.query_id);
|
|
21
|
+
}
|
|
22
|
+
return queryIds;
|
|
23
|
+
}, []);
|
|
18
24
|
};
|
|
19
25
|
const deleteCacheTags = async (cacheTags) => {
|
|
20
26
|
if (cacheTags.length === 0) {
|
|
@@ -31,4 +37,4 @@ export const createCacheTagsStore = ({ table }) => {
|
|
|
31
37
|
truncateCacheTags,
|
|
32
38
|
};
|
|
33
39
|
};
|
|
34
|
-
//# sourceMappingURL=
|
|
40
|
+
//# sourceMappingURL=neon.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"neon.js","sourceRoot":"","sources":["../../../src/cache/provider/neon.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAGhD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,gBAAgB,EAChB,KAAK,GAIN,EAAkB,EAAE;IACnB,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1D,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,GAAG,MAAM,GAAG,CAAC,KAAK,CAC9B,iCAAiC,KAAK,wBAAwB,YAAY,GAAG,EAC7E,SAAS,CACV,CAAC;QAEF,OAAO,IAAI,CAAC,MAAM,CAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE;YAC7C,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACrC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9B,CAAC;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,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"}
|
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.4",
|
|
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",
|
|
@@ -17,9 +17,9 @@
|
|
|
17
17
|
"types": "./dist/cache/provider/redis.d.ts",
|
|
18
18
|
"import": "./dist/cache/provider/redis.js"
|
|
19
19
|
},
|
|
20
|
-
"./cache/
|
|
21
|
-
"types": "./dist/cache/provider/
|
|
22
|
-
"import": "./dist/cache/provider/
|
|
20
|
+
"./cache/neon": {
|
|
21
|
+
"types": "./dist/cache/provider/neon.d.ts",
|
|
22
|
+
"import": "./dist/cache/provider/neon.js"
|
|
23
23
|
}
|
|
24
24
|
},
|
|
25
25
|
"files": [
|
|
@@ -46,10 +46,10 @@
|
|
|
46
46
|
"type": "git"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
|
+
"@neondatabase/serverless": "1.0.2",
|
|
49
50
|
"@smartive/eslint-config": "7.0.1",
|
|
50
51
|
"@smartive/prettier-config": "3.1.2",
|
|
51
52
|
"@types/node": "24.10.12",
|
|
52
|
-
"@vercel/postgres": "0.10.0",
|
|
53
53
|
"eslint": "9.39.2",
|
|
54
54
|
"eslint-import-resolver-typescript": "4.4.4",
|
|
55
55
|
"graphql": "16.12.0",
|
|
@@ -59,12 +59,12 @@
|
|
|
59
59
|
"typescript": "5.9.3"
|
|
60
60
|
},
|
|
61
61
|
"peerDependencies": {
|
|
62
|
-
"@
|
|
62
|
+
"@neondatabase/serverless": "^1.0.0",
|
|
63
63
|
"graphql": "^15.0.0 || ^16.0.0",
|
|
64
64
|
"ioredis": "^5.4.0"
|
|
65
65
|
},
|
|
66
66
|
"peerDependenciesMeta": {
|
|
67
|
-
"@
|
|
67
|
+
"@neondatabase/serverless": {
|
|
68
68
|
"optional": true
|
|
69
69
|
},
|
|
70
70
|
"graphql": {
|
|
@@ -1,7 +1,15 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { neon } from '@neondatabase/serverless';
|
|
2
2
|
import { type CacheTag, type CacheTagsStore } from '../types.js';
|
|
3
3
|
|
|
4
|
-
export const createCacheTagsStore = ({
|
|
4
|
+
export const createCacheTagsStore = ({
|
|
5
|
+
connectionString,
|
|
6
|
+
table,
|
|
7
|
+
}: {
|
|
8
|
+
connectionString: string;
|
|
9
|
+
table: string;
|
|
10
|
+
}): CacheTagsStore => {
|
|
11
|
+
const sql = neon(connectionString, { fullResults: true });
|
|
12
|
+
|
|
5
13
|
const storeQueryCacheTags = async (queryId: string, cacheTags: CacheTag[]) => {
|
|
6
14
|
if (!cacheTags?.length) {
|
|
7
15
|
return;
|
|
@@ -20,12 +28,18 @@ export const createCacheTagsStore = ({ table }: { table: string }): CacheTagsSto
|
|
|
20
28
|
|
|
21
29
|
const placeholders = cacheTags.map((_, i) => `$${i + 1}`).join(',');
|
|
22
30
|
|
|
23
|
-
const { rows }
|
|
31
|
+
const { rows } = await sql.query(
|
|
24
32
|
`SELECT DISTINCT query_id FROM ${table} WHERE cache_tag IN (${placeholders})`,
|
|
25
33
|
cacheTags,
|
|
26
34
|
);
|
|
27
35
|
|
|
28
|
-
return rows.
|
|
36
|
+
return rows.reduce<string[]>((queryIds, row) => {
|
|
37
|
+
if (typeof row.query_id === 'string') {
|
|
38
|
+
queryIds.push(row.query_id);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
return queryIds;
|
|
42
|
+
}, []);
|
|
29
43
|
};
|
|
30
44
|
|
|
31
45
|
const deleteCacheTags = async (cacheTags: CacheTag[]) => {
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/cache/provider/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAGvC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EAAE,KAAK,EAAqB,EAAkB,EAAE;IACnF,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"}
|