@smartive/datocms-utils 1.6.0 → 2.1.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
-# [1.6.0](https://github.com/smartive/datocms-utils/compare/v1.5.0...v1.6.0) (2025-02-07)
+# [2.1.0](https://github.com/smartive/datocms-utils/compare/v2.0.0...v2.1.0) (2025-04-09)
 
 
 ### Features
 
-* add getTelLink utility ([#61](https://github.com/smartive/datocms-utils/issues/61)) ([31044d9](https://github.com/smartive/datocms-utils/commit/31044d91f9d47736a2ca254501eb5d11dc6998a8))
+* add parameterization to all queries ([#89](https://github.com/smartive/datocms-utils/issues/89)) ([66299d1](https://github.com/smartive/datocms-utils/commit/66299d1a633c8b256abc927be37981de54edc464))

package/dist/cache-tags.d.ts

@@ -21,22 +21,27 @@ export declare const generateQueryId: <TVariables = unknown>(document: DocumentN
  *
  * @param {string} queryId Unique query ID
  * @param {CacheTag[]} cacheTags Array of cache tags
+ * @param {string} tableId Database table ID
  */
-export declare const storeQueryCacheTags: (queryId: string, cacheTags: CacheTag[]) => Promise<void>;
+export declare const storeQueryCacheTags: (queryId: string, cacheTags: CacheTag[], tableId: string) => Promise<void>;
 /**
  * Retrieves the queries that reference cache tags.
  *
  * @param {CacheTag[]} cacheTags Array of cache tags
+ * @param {string} tableId Database table ID
  * @returns Array of query IDs
  */
-export declare const queriesReferencingCacheTags: (cacheTags: CacheTag[]) => Promise<string[]>;
+export declare const queriesReferencingCacheTags: (cacheTags: CacheTag[], tableId: string) => Promise<string[]>;
 /**
  * Deletes the cache tags of a query from the database.
  *
  * @param {string} queryId Unique query ID
+ * @param {string} tableId Database table ID
  */
-export declare const deleteQueries: (queryIds: string[]) => Promise<void>;
+export declare const deleteQueries: (queryIds: string[], tableId: string) => Promise<void>;
 /**
  * Wipes out all cache tags from the database.
+ *
+ * @param {string} tableId Database table ID
  */
-export declare function truncateCacheTags(): Promise<void>;
+export declare function truncateCacheTags(tableId: string): Promise<void>;

package/dist/cache-tags.js

@@ -32,41 +32,50 @@ export const generateQueryId = (document, variables) => {
  *
  * @param {string} queryId Unique query ID
  * @param {CacheTag[]} cacheTags Array of cache tags
+ * @param {string} tableId Database table ID
  */
-export const storeQueryCacheTags = async (queryId, cacheTags) => {
+export const storeQueryCacheTags = async (queryId, cacheTags, tableId) => {
     if (!cacheTags?.length) {
         return;
     }
-    await sql.query(`INSERT INTO query_cache_tags VALUES ${cacheTags.map((cacheTag) => `('${queryId}', '${cacheTag}')`).join()} ON CONFLICT DO NOTHING`);
+    const tags = cacheTags.flatMap((_, i) => [queryId, cacheTags[i]]);
+    const placeholders = cacheTags.map((_, i) => `($${2 * i + 1}, $${2 * i + 2})`).join(',');
+    await sql.query(`INSERT INTO ${tableId} VALUES ${placeholders} ON CONFLICT DO NOTHING`, tags);
 };
 /**
  * Retrieves the queries that reference cache tags.
  *
  * @param {CacheTag[]} cacheTags Array of cache tags
+ * @param {string} tableId Database table ID
  * @returns Array of query IDs
  */
-export const queriesReferencingCacheTags = async (cacheTags) => {
+export const queriesReferencingCacheTags = async (cacheTags, tableId) => {
     if (!cacheTags?.length) {
         return [];
     }
-    const { rows } = await sql.query(`SELECT DISTINCT query_id FROM query_cache_tags WHERE cache_tag IN (${cacheTags.map((cacheTag) => `'${cacheTag}'`).join(', ')})`);
+    const placeholders = cacheTags.map((_, i) => `$${i + 1}`).join(',');
+    const { rows } = await sql.query(`SELECT DISTINCT query_id FROM ${tableId} WHERE cache_tag IN (${placeholders})`, cacheTags);
     return rows.map((row) => row.query_id);
 };
 /**
  * Deletes the cache tags of a query from the database.
  *
  * @param {string} queryId Unique query ID
+ * @param {string} tableId Database table ID
  */
-export const deleteQueries = async (queryIds) => {
+export const deleteQueries = async (queryIds, tableId) => {
     if (!queryIds?.length) {
         return;
     }
-    await sql.query(`DELETE FROM query_cache_tags WHERE query_id IN (${queryIds.map((id) => `'${id}'`).join(', ')})`);
+    const placeholders = queryIds.map((_, i) => `$${i + 1}`).join(',');
+    await sql.query(`DELETE FROM ${tableId} WHERE query_id IN (${placeholders})`, queryIds);
 };
 /**
  * Wipes out all cache tags from the database.
+ *
+ * @param {string} tableId Database table ID
  */
-export async function truncateCacheTags() {
-    await sql.query('DELETE FROM query_cache_tags');
+export async function truncateCacheTags(tableId) {
+    await sql.query(`DELETE FROM ${tableId}`);
 }
 //# sourceMappingURL=cache-tags.js.map

package/dist/cache-tags.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache-tags.js","sourceRoot":"","sources":["../src/cache-tags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAgB,KAAK,EAAE,MAAM,SAAS,CAAC;AAG9C;;;;;;GAMG;AAEH,MAAM,UAAU,6BAA6B,CAAC,MAAsB;IAClE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAe,CAAC,CAAC;AACjE,CAAC;AAED;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAuB,QAAsB,EAAE,SAAsB,EAAU,EAAE;IAC9G,OAAO,UAAU,CAAC,MAAM,CAAC;SACtB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACvB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;SACvC,MAAM,CAAC,KAAK,CAAC,CAAC;AACnB,CAAC,CAAC;AAEF;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAAe,EAAE,SAAqB,EAAE,EAAE;IAClF,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IAED,MAAM,GAAG,CAAC,KAAK,CACb,uCAAuC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,OAAO,OAAO,QAAQ,IAAI,CAAC,CAAC,IAAI,EAAE,yBAAyB,CACpI,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAAE,SAAqB,EAAqB,EAAE;IAC5F,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,GAAqC,MAAM,GAAG,CAAC,KAAK,CAChE,sEAAsE,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACjI,CAAC;IAEF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF;;;;GAIG;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IACxD,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IACD,MAAM,GAAG,CAAC,KAAK,CAAC,mDAAmD,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACpH,CAAC,CAAC;AAEF;;GAEG;AAEH,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,MAAM,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;AAClD,CAAC"}
+{"version":3,"file":"cache-tags.js","sourceRoot":"","sources":["../src/cache-tags.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartive/datocms-utils",
-  "version": "1.6.0",
+  "version": "2.1.0",
   "description": "A set of utilities and helpers to work with DatoCMS in a Next.js project.",
   "source": "src/index.ts",
   "main": "dist/index.js",

package/src/cache-tags.ts

@@ -39,31 +39,38 @@ export const generateQueryId = <TVariables = unknown>(document: DocumentNode, va
  *
  * @param {string} queryId Unique query ID
  * @param {CacheTag[]} cacheTags Array of cache tags
+ * @param {string} tableId Database table ID
  */
 
-export const storeQueryCacheTags = async (queryId: string, cacheTags: CacheTag[]) => {
+export const storeQueryCacheTags = async (queryId: string, cacheTags: CacheTag[], tableId: string) => {
   if (!cacheTags?.length) {
     return;
   }
 
-  await sql.query(
-    `INSERT INTO query_cache_tags VALUES ${cacheTags.map((cacheTag) => `('${queryId}', '${cacheTag}')`).join()} ON CONFLICT DO NOTHING`,
-  );
+  const tags = cacheTags.flatMap((_, i) => [queryId, cacheTags[i]]);
+  const placeholders = cacheTags.map((_, i) => `($${2 * i + 1}, $${2 * i + 2})`).join(',');
+
+  await sql.query(`INSERT INTO ${tableId} VALUES ${placeholders} ON CONFLICT DO NOTHING`, tags);
 };
 
 /**
  * Retrieves the queries that reference cache tags.
  *
  * @param {CacheTag[]} cacheTags Array of cache tags
+ * @param {string} tableId Database table ID
  * @returns Array of query IDs
  */
 
-export const queriesReferencingCacheTags = async (cacheTags: CacheTag[]): Promise<string[]> => {
+export const queriesReferencingCacheTags = async (cacheTags: CacheTag[], tableId: string): Promise<string[]> => {
   if (!cacheTags?.length) {
     return [];
   }
+
+  const placeholders = cacheTags.map((_, i) => `$${i + 1}`).join(',');
+
   const { rows }: { rows: { query_id: string }[] } = await sql.query(
-    `SELECT DISTINCT query_id FROM query_cache_tags WHERE cache_tag IN (${cacheTags.map((cacheTag) => `'${cacheTag}'`).join(', ')})`,
+    `SELECT DISTINCT query_id FROM ${tableId} WHERE cache_tag IN (${placeholders})`,
+    cacheTags,
   );
 
   return rows.map((row) => row.query_id);
@@ -73,19 +80,24 @@ export const queriesReferencingCacheTags = async (cacheTags: CacheTag[]): Promis
  * Deletes the cache tags of a query from the database.
  *
  * @param {string} queryId Unique query ID
+ * @param {string} tableId Database table ID
  */
 
-export const deleteQueries = async (queryIds: string[]) => {
+export const deleteQueries = async (queryIds: string[], tableId: string) => {
   if (!queryIds?.length) {
     return;
   }
-  await sql.query(`DELETE FROM query_cache_tags WHERE query_id IN (${queryIds.map((id) => `'${id}'`).join(', ')})`);
+  const placeholders = queryIds.map((_, i) => `$${i + 1}`).join(',');
+
+  await sql.query(`DELETE FROM ${tableId} WHERE query_id IN (${placeholders})`, queryIds);
 };
 
 /**
  * Wipes out all cache tags from the database.
+ *
+ * @param {string} tableId Database table ID
  */
 
-export async function truncateCacheTags() {
-  await sql.query('DELETE FROM query_cache_tags');
+export async function truncateCacheTags(tableId: string) {
+  await sql.query(`DELETE FROM ${tableId}`);
 }