rads-db 3.0.2 → 3.0.4

package/dist/index.cjs

@@ -1017,7 +1017,7 @@ function generateMethods(schema, validators, options) {
       typeName: key,
       handle: schema[key].handle
     };
-    const driverInstance = getDriverInstance(schema, key, opts.driver, drivers);
+    const driverInstance = getDriverInstance(schema, key, getDriverConstructor(opts, schema, key), drivers);
     db[handle] = getRadsDbMethods(key, computedContext, driverInstance);
   }
   for (const f of opts.features) {
@@ -1026,18 +1026,13 @@ function generateMethods(schema, validators, options) {
   }
   return db;
 }
-function getDriverInstance(schema, key, driver, driverInstances) {
+function getDriverInstance(schema, key, driverConstructor, driverInstances) {
   if (!driverInstances[key]) {
-    driverInstances[key] = getDriverInstanceInner(schema, key, driver);
+    driverInstances[key] = getDriverInstanceInner(schema, key, driverConstructor);
   }
   return driverInstances[key];
 }
-function getDriverInstanceInner(schema, key, drivers) {
-  const driverName = schema[key].decorators.entity.driver || "default";
-  const driverConstructor = drivers[driverName];
-  if (!driverConstructor) {
-    throw new Error(`Missing driver "${driverName}" for entity "${key}"`);
-  }
+function getDriverInstanceInner(schema, key, driverConstructor) {
   const driverInstance = driverConstructor(schema, key);
   addDryRunSupport(driverInstance, key);
   async function getAll(args, ctx) {
@@ -1142,6 +1137,17 @@ function normalizeOptions(options) {
     driver = { default: driver };
   return { computed: {}, features: [], ...options, driver };
 }
+function getDriverConstructor(options, schema, key) {
+  let driverName = "default";
+  if (!options.noCustomDrivers) {
+    driverName = schema[key].decorators.entity.driver || driverName;
+  }
+  const driverConstructor = options.driver[driverName];
+  if (!driverConstructor) {
+    throw new Error(`Missing driver "${driverName}" for entity "${key}"`);
+  }
+  return driverConstructor;
+}
 
 const restApi = (options) => (schema, entity) => {
   const opts = {

package/dist/index.d.ts

@@ -86,6 +86,7 @@ interface EntityMethods<E, EN extends keyof EntityMeta, W> {
 }
 
 type MaybePromise<T> = Promise<T> | T;
+type RequiredFields<T, K extends keyof T> = T & Required<Pick<T, K>>;
 type ValidateFieldDecoratorArgs<T> = T extends string ? ValidateStringDecoratorArgs : T extends number ? ValidateNumberDecoratorArgs : ValidateAnyDecoratorArgs;
 interface ValidateEntityDecoratorArgs {
 }
@@ -182,6 +183,9 @@ interface CreateRadsDbArgs {
     context?: Record<string, any> & Omit<RadsRequestContext, 'dryRun' | 'silent'>;
     features?: RadsFeature[];
 }
+type CreateRadsDbArgsNormalized = RequiredFields<CreateRadsDbArgs, 'computed' | 'features'> & {
+    driver: CreateRadsArgsDrivers;
+};
 type CreateRadsDbClientArgs = Omit<CreateRadsDbArgs, 'noComputed' | 'noCustomDrivers' | 'driver'> & {
     driver?: RestDriverOptions;
 };
@@ -359,7 +363,7 @@ declare function field(meta?: FieldDecoratorArgs): (a: any, b?: ClassFieldDecora
 declare function precomputed(meta?: ComputedDecoratorArgs): (a: any, b?: ClassFieldDecoratorContext | ClassDecoratorContext) => void;
 declare function computed(meta?: ComputedDecoratorArgs): (a: any, b?: ClassFieldDecoratorContext | ClassDecoratorContext) => void;
 
-declare function getDriverInstance(schema: Schema, key: string, driver: CreateRadsArgsDrivers, driverInstances: Record<string, Driver>): Driver;
+declare function getDriverInstance(schema: Schema, key: string, driverConstructor: DriverConstructor, driverInstances: Record<string, Driver>): Driver;
 
 /**
  * Creates instance of rads db - object that provides access to all entities.
@@ -373,4 +377,4 @@ declare function createRadsDb(args?: CreateRadsDbArgs): RadsDb;
  */
 declare function createRadsDbClient(args?: CreateRadsDbClientArgs): RadsDb;
 
-export { Change, ComputedContext, ComputedContextGlobal, ComputedDecoratorArgs, CreateRadsArgsDrivers, CreateRadsDbArgs, CreateRadsDbClientArgs, DeepPartial, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, FieldDecoratorArgs, FieldDefinition, FileSystemNode, FileUploadArgs, FileUploadDriver, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, PutArgs, PutEffect, RadsFeature, RadsRequestContext, RadsUiSlotDefinition, RadsUiSlotName, RadsVitePluginOptions, Relation, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, VerifyManyArgs, VerifyManyArgsAny, VerifyManyResponse, computed, createRadsDb, createRadsDbClient, entity, field, getDriverInstance, precomputed, ui, validate };
+export { Change, ComputedContext, ComputedContextGlobal, ComputedDecoratorArgs, CreateRadsArgsDrivers, CreateRadsDbArgs, CreateRadsDbArgsNormalized, CreateRadsDbClientArgs, DeepPartial, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, FieldDecoratorArgs, FieldDefinition, FileSystemNode, FileUploadArgs, FileUploadDriver, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, PutArgs, PutEffect, RadsFeature, RadsRequestContext, RadsUiSlotDefinition, RadsUiSlotName, RadsVitePluginOptions, Relation, RequiredFields, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, VerifyManyArgs, VerifyManyArgsAny, VerifyManyResponse, computed, createRadsDb, createRadsDbClient, entity, field, getDriverInstance, precomputed, ui, validate };

package/dist/index.mjs

@@ -1009,7 +1009,7 @@ function generateMethods(schema, validators, options) {
       typeName: key,
       handle: schema[key].handle
     };
-    const driverInstance = getDriverInstance(schema, key, opts.driver, drivers);
+    const driverInstance = getDriverInstance(schema, key, getDriverConstructor(opts, schema, key), drivers);
     db[handle] = getRadsDbMethods(key, computedContext, driverInstance);
   }
   for (const f of opts.features) {
@@ -1018,18 +1018,13 @@ function generateMethods(schema, validators, options) {
   }
   return db;
 }
-function getDriverInstance(schema, key, driver, driverInstances) {
+function getDriverInstance(schema, key, driverConstructor, driverInstances) {
   if (!driverInstances[key]) {
-    driverInstances[key] = getDriverInstanceInner(schema, key, driver);
+    driverInstances[key] = getDriverInstanceInner(schema, key, driverConstructor);
   }
   return driverInstances[key];
 }
-function getDriverInstanceInner(schema, key, drivers) {
-  const driverName = schema[key].decorators.entity.driver || "default";
-  const driverConstructor = drivers[driverName];
-  if (!driverConstructor) {
-    throw new Error(`Missing driver "${driverName}" for entity "${key}"`);
-  }
+function getDriverInstanceInner(schema, key, driverConstructor) {
   const driverInstance = driverConstructor(schema, key);
   addDryRunSupport(driverInstance, key);
   async function getAll(args, ctx) {
@@ -1134,6 +1129,17 @@ function normalizeOptions(options) {
     driver = { default: driver };
   return { computed: {}, features: [], ...options, driver };
 }
+function getDriverConstructor(options, schema, key) {
+  let driverName = "default";
+  if (!options.noCustomDrivers) {
+    driverName = schema[key].decorators.entity.driver || driverName;
+  }
+  const driverConstructor = options.driver[driverName];
+  if (!driverConstructor) {
+    throw new Error(`Missing driver "${driverName}" for entity "${key}"`);
+  }
+  return driverConstructor;
+}
 
 const restApi = (options) => (schema, entity) => {
   const opts = {

package/drivers/azureCosmos.cjs

@@ -501,7 +501,7 @@ async function createDatabaseIfNotExists(options, client) {
     await client.databases.createIfNotExists({
       id: options.databaseName
     });
-    await client.database(options.databaseName).containers.create({
+    await client.database(options.databaseName).containers.createIfNotExists({
       id: options.containerName,
       partitionKey: "/_partition"
     });

package/drivers/azureCosmos.mjs

@@ -322,7 +322,7 @@ function getWhereNameOperatorPair(whereKey) {
 async function createDatabaseIfNotExists(options, client) {
   try {
     await client.databases.createIfNotExists({ id: options.databaseName });
-    await client.database(options.databaseName).containers.create({ id: options.containerName, partitionKey: "/_partition" });
+    await client.database(options.databaseName).containers.createIfNotExists({ id: options.containerName, partitionKey: "/_partition" });
   } catch (e) {
     console.error("Error initializing CosmosDb: ", e);
   }

package/features/cache.cjs

@@ -56,9 +56,7 @@ var _default = options => {
           handle: cacheEntityName,
           handlePlural: `${cacheEntityName}s`
         };
-        cacheDrivers[handle] = (0, _radsDb.getDriverInstance)(schema, cacheEntityName, {
-          default: normalizedOptions[typeName].driver
-        }, drivers);
+        cacheDrivers[handle] = (0, _radsDb.getDriverInstance)(schema, cacheEntityName, normalizedOptions[typeName].driver, drivers);
         cacheStatus[handle] = {
           preloadStatus: normalizedOptions[typeName].preload ? "neverLoaded" : void 0
         };

package/features/cache.mjs

@@ -38,12 +38,7 @@ export default (options) => {
           handle: cacheEntityName,
           handlePlural: `${cacheEntityName}s`
         };
-        cacheDrivers[handle] = getDriverInstance(
-          schema,
-          cacheEntityName,
-          { default: normalizedOptions[typeName].driver },
-          drivers
-        );
+        cacheDrivers[handle] = getDriverInstance(schema, cacheEntityName, normalizedOptions[typeName].driver, drivers);
         cacheStatus[handle] = { preloadStatus: normalizedOptions[typeName].preload ? "neverLoaded" : void 0 };
       }
       db.cache = {

package/package.json

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