remult 3.0.0-next.2 → 3.0.0-next.3

package/esm/src/context.js

@@ -1,3 +1,4 @@
+import { DataProviderPromiseWrapper, } from './data-interfaces.js';
 import { buildFullUrl, RestDataProvider, } from './data-providers/rest-data-provider.js';
 import { LiveQueryClient } from './live-query/LiveQueryClient.js';
 import { SseSubscriptionClient } from './live-query/SseSubscriptionClient.js';
@@ -65,9 +66,20 @@ export class Remult {
      */
     repo = (entity, dataProvider) => {
         const info = createOldEntity(entity, this);
-        if (dataProvider === undefined)
-            dataProvider =
-                info?.options?.dataProvider?.(this.dataProvider) ?? this.dataProvider;
+        if (dataProvider === undefined) {
+            if (info?.options?.dataProvider) {
+                const d = info.options.dataProvider(this.dataProvider);
+                if (d instanceof Promise) {
+                    dataProvider = new DataProviderPromiseWrapper(d);
+                }
+                else {
+                    dataProvider = d ?? undefined;
+                }
+            }
+        }
+        if (!dataProvider) {
+            dataProvider = this.dataProvider;
+        }
         let dpCache = this.repCache.get(dataProvider);
         if (!dpCache)
             this.repCache.set(dataProvider, (dpCache = new Map()));

package/esm/src/data-interfaces.js

@@ -19,3 +19,43 @@ export class EntityError extends Error {
     exception;
     httpStatusCode;
 }
+export class DataProviderPromiseWrapper {
+    dataProvider;
+    constructor(dataProvider) {
+        this.dataProvider = dataProvider;
+    }
+    getEntityDataProvider(entity) {
+        return new EntityDataProviderPromiseWrapper(this.dataProvider.then((dp) => dp.getEntityDataProvider(entity)));
+    }
+    transaction(action) {
+        return this.dataProvider.then((dp) => dp.transaction(action));
+    }
+    ensureSchema(entities) {
+        return this.dataProvider.then((dp) => dp.ensureSchema?.(entities));
+    }
+    isProxy;
+}
+class EntityDataProviderPromiseWrapper {
+    dataProvider;
+    constructor(dataProvider) {
+        this.dataProvider = dataProvider;
+    }
+    delete(id) {
+        return this.dataProvider.then((dp) => dp.delete(id));
+    }
+    insert(data) {
+        return this.dataProvider.then((dp) => dp.insert(data));
+    }
+    count(where) {
+        return this.dataProvider.then((dp) => dp.count(where));
+    }
+    find(options) {
+        return this.dataProvider.then((dp) => dp.find(options));
+    }
+    groupBy(options) {
+        return this.dataProvider.then((dp) => dp.groupBy(options));
+    }
+    update(id, data) {
+        return this.dataProvider.then((dp) => dp.update(id, data));
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "3.0.0-next.2",
+    "version": "3.0.0-next.3",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/src/context.d.ts

@@ -1,5 +1,5 @@
 import type { ClassType } from '../classType.js';
-import type { DataProvider } from './data-interfaces.js';
+import { type DataProvider } from './data-interfaces.js';
 import type { EntityMetadata, EntityRef, FindOptions, RefSubscriber, Repository } from './remult3/remult3.js';
 import type { ExternalHttpProvider } from './buildRestDataProvider.js';
 import type { SubscriptionClient, Unsubscribe } from './live-query/SubscriptionChannel.js';

package/src/context.js

@@ -6,6 +6,7 @@ exports.setControllerSettings = setControllerSettings;
 exports.doTransaction = doTransaction;
 exports.withRemult = withRemult;
 var tslib_1 = require("tslib");
+var data_interfaces_js_1 = require("./data-interfaces.js");
 var rest_data_provider_js_1 = require("./data-providers/rest-data-provider.js");
 var LiveQueryClient_js_1 = require("./live-query/LiveQueryClient.js");
 var SseSubscriptionClient_js_1 = require("./live-query/SseSubscriptionClient.js");
@@ -82,11 +83,22 @@ var Remult = /** @class */ (function () {
          * @param dataProvider - an optional alternative data provider to use. Useful for writing to offline storage or an alternative data provider
          */
         this.repo = function (entity, dataProvider) {
-            var _a, _b, _c;
+            var _a;
             var info = (0, RepositoryImplementation_js_1.createOldEntity)(entity, _this);
-            if (dataProvider === undefined)
-                dataProvider =
-                    (_c = (_b = (_a = info === null || info === void 0 ? void 0 : info.options) === null || _a === void 0 ? void 0 : _a.dataProvider) === null || _b === void 0 ? void 0 : _b.call(_a, _this.dataProvider)) !== null && _c !== void 0 ? _c : _this.dataProvider;
+            if (dataProvider === undefined) {
+                if ((_a = info === null || info === void 0 ? void 0 : info.options) === null || _a === void 0 ? void 0 : _a.dataProvider) {
+                    var d = info.options.dataProvider(_this.dataProvider);
+                    if (d instanceof Promise) {
+                        dataProvider = new data_interfaces_js_1.DataProviderPromiseWrapper(d);
+                    }
+                    else {
+                        dataProvider = d !== null && d !== void 0 ? d : undefined;
+                    }
+                }
+            }
+            if (!dataProvider) {
+                dataProvider = _this.dataProvider;
+            }
             var dpCache = _this.repCache.get(dataProvider);
             if (!dpCache)
                 _this.repCache.set(dataProvider, (dpCache = new Map()));

package/src/data-interfaces.d.ts

@@ -76,3 +76,11 @@ export declare class EntityError<entityType = unknown> extends Error implements
     exception?: any;
     httpStatusCode?: number;
 }
+export declare class DataProviderPromiseWrapper implements DataProvider {
+    private dataProvider;
+    constructor(dataProvider: Promise<DataProvider>);
+    getEntityDataProvider(entity: EntityMetadata): EntityDataProvider;
+    transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
+    ensureSchema?(entities: EntityMetadata[]): Promise<void>;
+    isProxy?: boolean | undefined;
+}

package/src/data-interfaces.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityError = void 0;
+exports.DataProviderPromiseWrapper = exports.EntityError = void 0;
 exports.extractSort = extractSort;
 var tslib_1 = require("tslib");
 var sort_js_1 = require("./sort.js");
@@ -24,3 +24,43 @@ var EntityError = /** @class */ (function (_super) {
     return EntityError;
 }(Error));
 exports.EntityError = EntityError;
+var DataProviderPromiseWrapper = /** @class */ (function () {
+    function DataProviderPromiseWrapper(dataProvider) {
+        this.dataProvider = dataProvider;
+    }
+    DataProviderPromiseWrapper.prototype.getEntityDataProvider = function (entity) {
+        return new EntityDataProviderPromiseWrapper(this.dataProvider.then(function (dp) { return dp.getEntityDataProvider(entity); }));
+    };
+    DataProviderPromiseWrapper.prototype.transaction = function (action) {
+        return this.dataProvider.then(function (dp) { return dp.transaction(action); });
+    };
+    DataProviderPromiseWrapper.prototype.ensureSchema = function (entities) {
+        return this.dataProvider.then(function (dp) { var _a; return (_a = dp.ensureSchema) === null || _a === void 0 ? void 0 : _a.call(dp, entities); });
+    };
+    return DataProviderPromiseWrapper;
+}());
+exports.DataProviderPromiseWrapper = DataProviderPromiseWrapper;
+var EntityDataProviderPromiseWrapper = /** @class */ (function () {
+    function EntityDataProviderPromiseWrapper(dataProvider) {
+        this.dataProvider = dataProvider;
+    }
+    EntityDataProviderPromiseWrapper.prototype.delete = function (id) {
+        return this.dataProvider.then(function (dp) { return dp.delete(id); });
+    };
+    EntityDataProviderPromiseWrapper.prototype.insert = function (data) {
+        return this.dataProvider.then(function (dp) { return dp.insert(data); });
+    };
+    EntityDataProviderPromiseWrapper.prototype.count = function (where) {
+        return this.dataProvider.then(function (dp) { return dp.count(where); });
+    };
+    EntityDataProviderPromiseWrapper.prototype.find = function (options) {
+        return this.dataProvider.then(function (dp) { return dp.find(options); });
+    };
+    EntityDataProviderPromiseWrapper.prototype.groupBy = function (options) {
+        return this.dataProvider.then(function (dp) { return dp.groupBy(options); });
+    };
+    EntityDataProviderPromiseWrapper.prototype.update = function (id, data) {
+        return this.dataProvider.then(function (dp) { return dp.update(id, data); });
+    };
+    return EntityDataProviderPromiseWrapper;
+}());

package/src/entity.d.ts

@@ -193,7 +193,7 @@ export interface EntityOptions<entityType = unknown> {
      * }
      * @returns A custom data provider for the entity.
      */
-    dataProvider?: (defaultDataProvider: DataProvider) => DataProvider | undefined | null;
+    dataProvider?: (defaultDataProvider: DataProvider) => DataProvider | Promise<DataProvider> | undefined | null;
 }
 /**
  * Provides additional information and utilities for preprocessing filters in API and backend operations.