@devbro/pashmak 0.1.33 → 0.1.35

package/dist/bin/cache.cjs

@@ -756,19 +756,15 @@ var cache = (0, import_neko_helper2.createSingleton)((label) => {
 });
 
 // src/cache.mts
-var crypto = __toESM(require("crypto"), 1);
 async function cacheQuery(q, options = {}) {
   options.ttl = options.ttl ?? 3600;
   options.cache_label = options.cache_label ?? "default";
   const sql = q.toSql();
-  const key = "sql_cache:" + crypto.createHash("md5").update(`${sql.sql}:${sql.bindings.join(",")}`).digest("hex");
-  const cachedResult = await cache(options.cache_label).get(key);
-  if (cachedResult) {
-    return JSON.parse(cachedResult);
-  }
-  const rc = await q.get();
-  await cache(options.cache_label).put(key, JSON.stringify(rc), options.ttl);
-  return rc;
+  return await cache(options.cache_label).remember(
+    sql,
+    async () => await q.get(),
+    options
+  );
 }
 __name(cacheQuery, "cacheQuery");
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cache.mjs

@@ -2,19 +2,15 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 export * from "@devbro/neko-cache";
 import { cache } from "./facades.mjs";
-import * as crypto from "crypto";
 async function cacheQuery(q, options = {}) {
   options.ttl = options.ttl ?? 3600;
   options.cache_label = options.cache_label ?? "default";
   const sql = q.toSql();
-  const key = "sql_cache:" + crypto.createHash("md5").update(`${sql.sql}:${sql.bindings.join(",")}`).digest("hex");
-  const cachedResult = await cache(options.cache_label).get(key);
-  if (cachedResult) {
-    return JSON.parse(cachedResult);
-  }
-  const rc = await q.get();
-  await cache(options.cache_label).put(key, JSON.stringify(rc), options.ttl);
-  return rc;
+  return await cache(options.cache_label).remember(
+    sql,
+    async () => await q.get(),
+    options
+  );
 }
 __name(cacheQuery, "cacheQuery");
 export {

package/dist/cache.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/cache.mts"],"sourcesContent":["export * from \"@devbro/neko-cache\";\n\nimport { Query } from \"@devbro/neko-sql\";\nimport { cache } from \"./facades.mjs\";\nimport * as crypto from \"crypto\";\n\nexport type CacheQueryOptions = {\n  ttl?: number;\n  tags?: string[];\n  cache_label?: string;\n};\n\nexport async function cacheQuery(\n  q: Query,\n  options: CacheQueryOptions = {},\n): ReturnType<Query[\"get\"]> {\n  options.ttl = options.ttl ?? 3600; // default TTL 1 hour\n  options.cache_label = options.cache_label ?? \"default\";\n  const sql = q.toSql();\n\n  const key =\n    \"sql_cache:\" +\n    crypto\n      .createHash(\"md5\")\n      .update(`${sql.sql}:${sql.bindings.join(\",\")}`)\n      .digest(\"hex\");\n  const cachedResult = (await cache(options.cache_label).get(key)) as\n    | string\n    | undefined;\n  if (cachedResult) {\n    return JSON.parse(cachedResult);\n  }\n\n  const rc = await q.get();\n  await cache(options.cache_label).put(key, JSON.stringify(rc), options.ttl);\n  return rc;\n}\n"],"mappings":";;AAAA,cAAc;AAGd,SAAS,aAAa;AACtB,YAAY,YAAY;AAQxB,eAAsB,WACpB,GACA,UAA6B,CAAC,GACJ;AAC1B,UAAQ,MAAM,QAAQ,OAAO;AAC7B,UAAQ,cAAc,QAAQ,eAAe;AAC7C,QAAM,MAAM,EAAE,MAAM;AAEpB,QAAM,MACJ,eACA,OACG,WAAW,KAAK,EAChB,OAAO,GAAG,IAAI,GAAG,IAAI,IAAI,SAAS,KAAK,GAAG,CAAC,EAAE,EAC7C,OAAO,KAAK;AACjB,QAAM,eAAgB,MAAM,MAAM,QAAQ,WAAW,EAAE,IAAI,GAAG;AAG9D,MAAI,cAAc;AAChB,WAAO,KAAK,MAAM,YAAY;AAAA,EAChC;AAEA,QAAM,KAAK,MAAM,EAAE,IAAI;AACvB,QAAM,MAAM,QAAQ,WAAW,EAAE,IAAI,KAAK,KAAK,UAAU,EAAE,GAAG,QAAQ,GAAG;AACzE,SAAO;AACT;AAxBsB;","names":[]}
+{"version":3,"sources":["../src/cache.mts"],"sourcesContent":["export * from \"@devbro/neko-cache\";\n\nimport { Query } from \"@devbro/neko-sql\";\nimport { cache } from \"./facades.mjs\";\nimport * as crypto from \"crypto\";\nimport { JSONValue } from \"@devbro/neko-helper\";\n\nexport type CacheQueryOptions = {\n  ttl?: number;\n  tags?: string[];\n  cache_label?: string;\n};\n\nexport async function cacheQuery(\n  q: Query,\n  options: CacheQueryOptions = {},\n): ReturnType<Query[\"get\"]> {\n  options.ttl = options.ttl ?? 3600; // default TTL 1 hour\n  options.cache_label = options.cache_label ?? \"default\";\n  const sql = q.toSql();\n\n  return await cache(options.cache_label).remember(\n    sql as JSONValue,\n    async () => await q.get(),\n    options,\n  );\n}\n"],"mappings":";;AAAA,cAAc;AAGd,SAAS,aAAa;AAUtB,eAAsB,WACpB,GACA,UAA6B,CAAC,GACJ;AAC1B,UAAQ,MAAM,QAAQ,OAAO;AAC7B,UAAQ,cAAc,QAAQ,eAAe;AAC7C,QAAM,MAAM,EAAE,MAAM;AAEpB,SAAO,MAAM,MAAM,QAAQ,WAAW,EAAE;AAAA,IACtC;AAAA,IACA,YAAY,MAAM,EAAE,IAAI;AAAA,IACxB;AAAA,EACF;AACF;AAbsB;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devbro/pashmak",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "testing application for the entire repo",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -42,6 +42,11 @@
       "import": "./dist/config.mjs",
       "require": "./dist/config.js"
     },
+    "./cache": {
+      "types": "./dist/cache.d.ts",
+      "import": "./dist/cache.mjs",
+      "require": "./dist/cache.js"
+    },
     "./sql": {
       "types": "./dist/sql.d.ts",
       "import": "./dist/sql.mjs",