rads-db 0.1.101 → 0.1.103

package/features/cache.cjs

@@ -14,7 +14,7 @@ var _default = options => {
   return {
     name: "cache",
     init(db, context) {
-      const entitiesToCache = Object.keys(normalizedOptions.entities);
+      const entitiesToCache = Object.keys(normalizedOptions);
       const {
         schema,
         drivers
@@ -25,7 +25,8 @@ var _default = options => {
             where,
             revalidateInterval
           } = entitiesToPreload[typeName];
-          const handle = schema[typeName].handle;
+          const handle = schema[typeName]?.handle;
+          if (!handle) throw new Error(`Entity ${typeName} was not found`);
           cacheStatus[handle].preloadStatus = "loading";
           try {
             const allData = await db[handle].getAll({
@@ -47,6 +48,7 @@ var _default = options => {
       }
       for (const typeName of entitiesToCache) {
         const handle = schema[typeName].handle;
+        if (!handle) throw new Error(`Entity ${typeName} was not found`);
         const cacheEntityName = `Cache_${typeName}`;
         schema[cacheEntityName] = {
           ...schema[typeName],
@@ -54,9 +56,9 @@ var _default = options => {
           handle: cacheEntityName,
           handlePlural: `${cacheEntityName}s`
         };
-        cacheDrivers[handle] = (0, _radsDb.getDriverInstance)(schema, cacheEntityName, normalizedOptions.driver, drivers);
+        cacheDrivers[handle] = (0, _radsDb.getDriverInstance)(schema, cacheEntityName, normalizedOptions[typeName].driver, drivers);
         cacheStatus[handle] = {
-          preloadStatus: normalizedOptions.preload ? "neverLoaded" : void 0
+          preloadStatus: normalizedOptions[typeName].preload ? "neverLoaded" : void 0
         };
       }
       db.cache = {
@@ -84,7 +86,8 @@ var _default = options => {
     async beforeGet(args, ctx, context) {
       if (ctx.noCache) return;
       const {
-        handle
+        handle,
+        typeName
       } = context;
       const d = cacheDrivers[handle];
       if (!d) return;
@@ -92,8 +95,8 @@ var _default = options => {
         const result2 = await d[ctx.method](args, ctx);
         if (!result2) return;
         const ageMs = Date.now() - result2._cacheUpdatedAt;
-        const maxAge = ctx.maxAge ?? normalizedOptions.maxAge;
-        const staleWhileRevalidate = ctx.staleWhileRevalidate ?? normalizedOptions.staleWhileRevalidate;
+        const maxAge = ctx.maxAge ?? normalizedOptions[typeName].maxAge;
+        const staleWhileRevalidate = ctx.staleWhileRevalidate ?? normalizedOptions[typeName].staleWhileRevalidate;
         if (maxAge !== -1 && (maxAge === 0 || ageMs > maxAge * 1e3)) {
           if (staleWhileRevalidate !== 0 && (staleWhileRevalidate === -1 || ageMs <= staleWhileRevalidate * 1e3)) {
             const db = context.db;
@@ -140,11 +143,23 @@ var _default = options => {
 };
 module.exports = _default;
 function normalizeOptions(options) {
-  return {
+  const {
+    entities,
+    ...optionsDefaults
+  } = options;
+  const defaults = {
     driver: (0, _memory.default)(),
     maxAge: 300,
     staleWhileRevalidate: 0,
-    entities: {},
-    ...options
+    ...optionsDefaults
   };
+  const result = {};
+  for (const entity in entities) {
+    const v = entities[entity];
+    if (!v) continue;else if (v === true) result[entity] = defaults;else result[entity] = {
+      ...defaults,
+      ...v
+    };
+  }
+  return result;
 }

package/features/cache.d.ts

@@ -1,8 +1,7 @@
 import type { DriverConstructor } from '@/types';
-declare const _default: (options?: CacheOptions) => RadsFeature;
+declare const _default: (options: CacheOptions) => RadsFeature;
 export default _default;
-export interface CacheOptions {
-    entities: Record<string, boolean>;
+export interface EntityCacheOptions {
     driver?: DriverConstructor;
     /**
      * Number in seconds. If document was stored in cache more than maxAge seconds ago, cache is ignored.
@@ -28,6 +27,9 @@ export interface CacheOptions {
      */
     preload?: boolean;
 }
+export interface CacheOptions extends EntityCacheOptions {
+    entities: Record<string, boolean | EntityCacheOptions>;
+}
 export interface CacheStatus {
     preloadStatus?: 'upToDate' | 'updating' | 'loading' | 'error' | 'neverLoaded';
     updatedAt?: string;

package/features/cache.mjs

@@ -7,12 +7,14 @@ export default (options) => {
   return {
     name: "cache",
     init(db, context) {
-      const entitiesToCache = Object.keys(normalizedOptions.entities);
+      const entitiesToCache = Object.keys(normalizedOptions);
       const { schema, drivers } = context;
       async function preloadEntities(entitiesToPreload) {
         for (const typeName in entitiesToPreload) {
           const { where, revalidateInterval } = entitiesToPreload[typeName];
-          const handle = schema[typeName].handle;
+          const handle = schema[typeName]?.handle;
+          if (!handle)
+            throw new Error(`Entity ${typeName} was not found`);
           cacheStatus[handle].preloadStatus = "loading";
           try {
             const allData = await db[handle].getAll({ where }, { noCache: true });
@@ -27,6 +29,8 @@ export default (options) => {
       }
       for (const typeName of entitiesToCache) {
         const handle = schema[typeName].handle;
+        if (!handle)
+          throw new Error(`Entity ${typeName} was not found`);
         const cacheEntityName = `Cache_${typeName}`;
         schema[cacheEntityName] = {
           ...schema[typeName],
@@ -34,8 +38,8 @@ export default (options) => {
           handle: cacheEntityName,
           handlePlural: `${cacheEntityName}s`
         };
-        cacheDrivers[handle] = getDriverInstance(schema, cacheEntityName, normalizedOptions.driver, drivers);
-        cacheStatus[handle] = { preloadStatus: normalizedOptions.preload ? "neverLoaded" : void 0 };
+        cacheDrivers[handle] = getDriverInstance(schema, cacheEntityName, normalizedOptions[typeName].driver, drivers);
+        cacheStatus[handle] = { preloadStatus: normalizedOptions[typeName].preload ? "neverLoaded" : void 0 };
       }
       db.cache = {
         drivers: cacheDrivers,
@@ -66,7 +70,7 @@ export default (options) => {
     async beforeGet(args, ctx, context) {
       if (ctx.noCache)
         return;
-      const { handle } = context;
+      const { handle, typeName } = context;
       const d = cacheDrivers[handle];
       if (!d)
         return;
@@ -75,8 +79,8 @@ export default (options) => {
         if (!result2)
           return;
         const ageMs = Date.now() - result2._cacheUpdatedAt;
-        const maxAge = ctx.maxAge ?? normalizedOptions.maxAge;
-        const staleWhileRevalidate = ctx.staleWhileRevalidate ?? normalizedOptions.staleWhileRevalidate;
+        const maxAge = ctx.maxAge ?? normalizedOptions[typeName].maxAge;
+        const staleWhileRevalidate = ctx.staleWhileRevalidate ?? normalizedOptions[typeName].staleWhileRevalidate;
         if (maxAge !== -1 && (maxAge === 0 || ageMs > maxAge * 1e3)) {
           if (staleWhileRevalidate !== 0 && (staleWhileRevalidate === -1 || ageMs <= staleWhileRevalidate * 1e3)) {
             const db = context.db;
@@ -116,11 +120,22 @@ export default (options) => {
   };
 };
 function normalizeOptions(options) {
-  return {
+  const { entities, ...optionsDefaults } = options;
+  const defaults = {
     driver: memory(),
     maxAge: 300,
     staleWhileRevalidate: 0,
-    entities: {},
-    ...options
+    ...optionsDefaults
   };
+  const result = {};
+  for (const entity in entities) {
+    const v = entities[entity];
+    if (!v)
+      continue;
+    else if (v === true)
+      result[entity] = defaults;
+    else
+      result[entity] = { ...defaults, ...v };
+  }
+  return result;
 }

package/integrations/restEndpointsDev.cjs

@@ -43,6 +43,13 @@ var _default = {
       });
       if (result?.text) data = result.text;
     }
+    const dirname = _nodePath.default.dirname(filepath);
+    const isExistingDir = await dirExists(dirname);
+    if (!isExistingDir) {
+      await _promises.default.mkdir(dirname, {
+        recursive: true
+      });
+    }
     await _promises.default.writeFile(filepath, data, options);
     return result;
   },
@@ -71,6 +78,14 @@ var _default = {
   }
 };
 module.exports = _default;
+async function dirExists(path2) {
+  try {
+    await _promises.default.access(path2);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function sanitizeFilepath(filepath) {
   const result = _nodePath.default.resolve(filepath);
   if (!result.startsWith(root)) throw new Error("Invalid path");

package/integrations/restEndpointsDev.mjs

@@ -35,6 +35,11 @@ export default {
       if (result?.text)
         data = result.text;
     }
+    const dirname = path.dirname(filepath);
+    const isExistingDir = await dirExists(dirname);
+    if (!isExistingDir) {
+      await fs.mkdir(dirname, { recursive: true });
+    }
     await fs.writeFile(filepath, data, options);
     return result;
   },
@@ -64,6 +69,14 @@ export default {
     return await fs.unlink(filepath);
   }
 };
+async function dirExists(path2) {
+  try {
+    await fs.access(path2);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function sanitizeFilepath(filepath) {
   const result = path.resolve(filepath);
   if (!result.startsWith(root))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "0.1.101",
+  "version": "0.1.103",
   "files": [
     "dist",
     "drivers",