remult 3.0.0-next.2 → 3.0.0-next.4

package/server/remult-admin.d.ts

@@ -45,6 +45,8 @@ export interface AdminEntitiesOptions {
 export interface AdminDisplayOptions {
     rootPath: string;
     head: string;
+    requireAuthToken: boolean;
+    withLiveQuery: boolean;
 }
 export default function remultAdminHtml(options: AdminDisplayOptions): string;
 export declare function buildEntityInfo(options: AdminEntitiesOptions): EntityUIInfo[];

package/server/remult-admin.js

@@ -9,10 +9,10 @@ var get_remult_admin_html_js_1 = require("./get-remult-admin-html.js");
 var RepositoryImplementation_js_1 = require("../src/remult3/RepositoryImplementation.js");
 var inputTypes_js_1 = require("../inputTypes.js");
 function remultAdminHtml(options) {
-    var rootPath = options.rootPath, head = options.head;
+    var rootPath = options.rootPath, head = options.head, requireAuthToken = options.requireAuthToken, withLiveQuery = options.withLiveQuery;
     return (0, get_remult_admin_html_js_1.getHtml)()
         .replace('<!--PLACE_HERE_HEAD-->', head)
-        .replace('<!--PLACE_HERE_BODY-->', "<script>\n  window.optionsFromServer = ".concat(JSON.stringify({ rootPath: rootPath }), "\n</script>"));
+        .replace('<!--PLACE_HERE_BODY-->', "<script>\n  window.optionsFromServer = ".concat(JSON.stringify({ rootPath: rootPath, requireAuthToken: requireAuthToken, withLiveQuery: withLiveQuery }), "\n</script>"));
 }
 function buildEntityInfo(options) {
     var e_1, _a;

package/server/remult-api-server.d.ts

@@ -58,6 +58,8 @@ export interface RemultServerOptions<RequestType> {
     admin?: Allowed | {
         allow: Allowed;
         customHtmlHead?: (remult: Remult) => string;
+        requireAuthToken?: boolean;
+        withLiveQuery?: boolean;
     };
     /** Storage to use for backend methods that use queue */
     queueStorage?: QueueStorage;

package/server/remult-api-server.js

@@ -364,9 +364,9 @@ var RemultServerImplementation = /** @class */ (function () {
             if (this.options.admin !== undefined && this.options.admin !== false) {
                 var admin = function () {
                     return _this.process(function (remult, req, res, orig, origResponse) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var allowed, head;
-                        var _a, _b, _c;
-                        return tslib_1.__generator(this, function (_d) {
+                        var allowed, head, requireAuthToken, withLiveQuery;
+                        var _a, _b, _c, _d;
+                        return tslib_1.__generator(this, function (_e) {
                             allowed = (0, isOfType_js_1.isOfType)(this.options.admin, 'allow')
                                 ? this.options.admin.allow
                                 : this.options.admin;
@@ -379,13 +379,22 @@ var RemultServerImplementation = /** @class */ (function () {
                                 }
                                 else {
                                     head = '<title>Admin</title>';
+                                    requireAuthToken = false;
+                                    withLiveQuery = true;
                                     if ((0, isOfType_js_1.isOfType)(this.options.admin, 'allow') &&
                                         this.options.admin.customHtmlHead) {
                                         head = this.options.admin.customHtmlHead(remult);
+                                        requireAuthToken =
+                                            (_c = this.options.admin.requireAuthToken) !== null && _c !== void 0 ? _c : false;
+                                        if (this.options.admin.withLiveQuery === false) {
+                                            withLiveQuery = false;
+                                        }
                                     }
                                     origResponse.send((0, remult_admin_js_1.default)({
-                                        rootPath: (_c = this.options.rootPath) !== null && _c !== void 0 ? _c : '/api',
+                                        rootPath: (_d = this.options.rootPath) !== null && _d !== void 0 ? _d : '/api',
                                         head: head,
+                                        requireAuthToken: requireAuthToken,
+                                        withLiveQuery: withLiveQuery,
                                     }));
                                 }
                             }

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.