remult 0.27.15 → 0.27.17

package/esm/server/remult-api-server.js

@@ -216,6 +216,7 @@ export class RemultServerImplementation {
                 r.route(this.options.rootPath + '/admin/').get(admin);
                 r.route(this.options.rootPath + '/admin').get(admin);
             }
+            r.route(this.options.rootPath + '/me').get(this.process(async (remult, req, res) => res.success(remult.user ?? null)));
             if (this.options.subscriptionServer instanceof SseSubscriptionServer) {
                 const streamPath = this.options.rootPath + '/' + streamUrl;
                 r.route(streamPath).get(this.process(async (remult, req, res, origReq, origRes) => {
@@ -332,7 +333,7 @@ export class RemultServerImplementation {
                                 await what(remult, myReq, myRes, genReq, origRes, req);
                             }
                             finally {
-                                remultStatic.asyncContext.setInInitRequest(false);
+                                //      remultStatic.asyncContext.setInInitRequest(false)
                             }
                         }
                     });

package/esm/src/buildRestDataProvider.js

@@ -78,7 +78,7 @@ export function toPromise(p) {
             (x.status == 200 || x.status == 201) &&
             x.headers &&
             x.request &&
-            x.data)
+            x.data !== undefined)
             //for axios
             return x.data;
         return x;

package/esm/src/context.js

@@ -1,4 +1,4 @@
-import { RestDataProvider } from './data-providers/rest-data-provider.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';
 import { remult } from './remult-proxy.js';
@@ -16,7 +16,7 @@ export class RemultAsyncLocalStorage {
             if (r)
                 return r.remult;
             else
-                throw new Error('remult object was requested outside of a valid context, try running it within initApi or a remult request cycle');
+                throw new Error('remult object was requested outside of a valid request cycle.valid context, try running `withRemult` or run  within initApi or a remult request cycle');
         };
     }
     static disable() {
@@ -76,6 +76,18 @@ export class Remult {
     };
     /** Returns the current user's info */
     user;
+    /**
+     * Fetches user information from the backend and updates the `remult.user` object.
+     * Typically used during application initialization and user authentication.
+     *
+     * @returns {Promise<UserInfo | undefined>} A promise that resolves to the user's information or `undefined` if unavailable.
+     */
+    async initUser() {
+        const dp = buildRestDataProvider(this.apiClient.httpClient);
+        const data = await dp.get(buildFullUrl(this.apiClient.url, 'me'));
+        this.user = data ?? undefined;
+        return this.user;
+    }
     /** Checks if a user was authenticated */
     authenticated() {
         return this.user?.id !== undefined;

package/esm/src/data-providers/rest-data-provider.js

@@ -10,10 +10,7 @@ export class RestDataProvider {
     }
     getEntityDataProvider(entity) {
         return new RestEntityDataProvider(() => {
-            let url = this.apiProvider()?.url;
-            if (url === undefined || url === null)
-                url = '/api';
-            return url + '/' + entity.key;
+            return buildFullUrl(this.apiProvider()?.url, entity.key);
         }, () => {
             return buildRestDataProvider(this.apiProvider().httpClient);
         }, entity);
@@ -23,6 +20,11 @@ export class RestDataProvider {
     }
     isProxy = true;
 }
+export function buildFullUrl(httpClientUrl, entityKey) {
+    if (httpClientUrl === undefined || httpClientUrl === null)
+        httpClientUrl = '/api';
+    return httpClientUrl + '/' + entityKey;
+}
 //@internal
 export function findOptionsToJson(options, meta) {
     if (options.include) {

package/esm/src/remult-proxy.js

@@ -28,6 +28,9 @@ export class RemultProxy {
     set liveQueryPublisher(val) {
         remultStatic.remultFactory().liveQueryPublisher = val;
     }
+    initUser() {
+        return remultStatic.remultFactory().initUser();
+    }
     call(backendMethod, self, ...args) {
         return remultStatic.remultFactory().call(backendMethod, self, ...args);
     }

package/esm/src/remult3/entity.js

@@ -27,14 +27,18 @@ import { remultStatic } from '../remult-static.js';
  */
 export function Entity(key, ...options) {
     return (target, info) => {
-        for (const rawFilterMember in target) {
-            if (Object.prototype.hasOwnProperty.call(target, rawFilterMember)) {
-                const element = target[rawFilterMember];
-                if (element?.rawFilterInfo) {
-                    if (!element.rawFilterInfo.key)
-                        element.rawFilterInfo.key = rawFilterMember;
+        let theClass = target;
+        while (theClass != null) {
+            for (const rawFilterMember in theClass) {
+                if (Object.prototype.hasOwnProperty.call(theClass, rawFilterMember)) {
+                    const element = target[rawFilterMember];
+                    if (element?.rawFilterInfo) {
+                        if (!element.rawFilterInfo.key)
+                            element.rawFilterInfo.key = rawFilterMember;
+                    }
                 }
             }
+            theClass = Object.getPrototypeOf(theClass);
         }
         let factory = (remult) => {
             let r = {};

package/esm/src/remult3/remult3.js

@@ -17,6 +17,45 @@ const wnn = [
 export const flags = {
     error500RetryCount: 4,
 };
+/*p1 - create-remult discussion
+
+  p1 - should we add to remult some init code that populates remult based on a built in server route for current user.
+     - yes, `remult.initUser` - the url will be /api/me
+     - ask to add a todo example
+     - admin question
+     - ask to add a user table + password hash
+     
+     - changeOrigin false to vite config
+     - test angular with auth
+     - check nextauth if the env variable should be called NEXTAUTH_SECRET or just AUTH_SECRET
+     /** @type {import('next').NextConfig}
+const nextConfig = {
+  experimental: {
+    serverComponentsExternalPackages: ["knex"],
+  },
+};
+
+export default nextConfig;
+
+  p1 - Landing page:
+     - p2 include the selections (react,vite, postgres,auth)
+     - include server is alive test (remind to run dev-node)
+     - include the authenticated user with links to sign in & sign out
+     - include link to admin
+     - include todo
+
+  p1 - README:
+     - the selections
+     - how to run dev
+     - which environment variables to set
+  
+
+  - should we add admin? ensureSchema:false etc...
+  - should we read existing database?
+  - knex issue with next
+
+
+*/
 //p1 - add aggregate to query
 //p1 - add parameter all to deleteMany, and updateMany
 //p1  filter.apply ApiPreFilter

package/package.json

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

package/server/remult-api-server.js

@@ -378,6 +378,9 @@ var RemultServerImplementation = /** @class */ (function () {
                 r.route(this.options.rootPath + '/admin/').get(admin);
                 r.route(this.options.rootPath + '/admin').get(admin);
             }
+            r.route(this.options.rootPath + '/me').get(this.process(function (remult, req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () { var _a; return tslib_1.__generator(this, function (_b) {
+                return [2 /*return*/, res.success((_a = remult.user) !== null && _a !== void 0 ? _a : null)];
+            }); }); }));
             if (this.options.subscriptionServer instanceof SseSubscriptionServer_js_1.SseSubscriptionServer) {
                 var streamPath = this.options.rootPath + '/' + SubscriptionChannel_js_1.streamUrl;
                 r.route(streamPath).get(this.process(function (remult, req, res, origReq, origRes) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -629,9 +632,7 @@ var RemultServerImplementation = /** @class */ (function () {
                                     case 7:
                                         _a.sent();
                                         return [3 /*break*/, 9];
-                                    case 8:
-                                        remult_static_js_1.remultStatic.asyncContext.setInInitRequest(false);
-                                        return [7 /*endfinally*/];
+                                    case 8: return [7 /*endfinally*/];
                                     case 9: return [2 /*return*/];
                                 }
                             });

package/src/buildRestDataProvider.js

@@ -120,7 +120,7 @@ function toPromise(p) {
             (x.status == 200 || x.status == 201) &&
             x.headers &&
             x.request &&
-            x.data)
+            x.data !== undefined)
             //for axios
             return x.data;
         return x;

package/src/context.d.ts

@@ -37,6 +37,13 @@ export declare class Remult {
     repo: <T>(entity: ClassType<T>, dataProvider?: DataProvider) => Repository<T>;
     /** Returns the current user's info */
     user?: UserInfo;
+    /**
+     * Fetches user information from the backend and updates the `remult.user` object.
+     * Typically used during application initialization and user authentication.
+     *
+     * @returns {Promise<UserInfo | undefined>} A promise that resolves to the user's information or `undefined` if unavailable.
+     */
+    initUser(): Promise<UserInfo | undefined>;
     /** Checks if a user was authenticated */
     authenticated(): boolean;
     /** checks if the user has any of the roles specified in the parameters

package/src/context.js

@@ -26,7 +26,7 @@ var RemultAsyncLocalStorage = /** @class */ (function () {
             if (r)
                 return r.remult;
             else
-                throw new Error('remult object was requested outside of a valid context, try running it within initApi or a remult request cycle');
+                throw new Error('remult object was requested outside of a valid request cycle.valid context, try running `withRemult` or run  within initApi or a remult request cycle');
         };
     };
     RemultAsyncLocalStorage.disable = function () {
@@ -132,6 +132,28 @@ var Remult = /** @class */ (function () {
                 this.apiClient.wrapMessageHandling = apiClient.wrapMessageHandling;
         }
     }
+    /**
+     * Fetches user information from the backend and updates the `remult.user` object.
+     * Typically used during application initialization and user authentication.
+     *
+     * @returns {Promise<UserInfo | undefined>} A promise that resolves to the user's information or `undefined` if unavailable.
+     */
+    Remult.prototype.initUser = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var dp, data;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        dp = (0, buildRestDataProvider_js_1.buildRestDataProvider)(this.apiClient.httpClient);
+                        return [4 /*yield*/, dp.get((0, rest_data_provider_js_1.buildFullUrl)(this.apiClient.url, 'me'))];
+                    case 1:
+                        data = _a.sent();
+                        this.user = data !== null && data !== void 0 ? data : undefined;
+                        return [2 /*return*/, this.user];
+                }
+            });
+        });
+    };
     /** Checks if a user was authenticated */
     Remult.prototype.authenticated = function () {
         var _a;

package/src/data-providers/rest-data-provider.d.ts

@@ -10,6 +10,7 @@ export declare class RestDataProvider implements DataProvider {
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
     isProxy: boolean;
 }
+export declare function buildFullUrl(httpClientUrl: string | undefined, entityKey: string): string;
 export declare class RestEntityDataProvider implements EntityDataProvider, ProxyEntityDataProvider {
     private url;
     private http;

package/src/data-providers/rest-data-provider.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.liveQueryAction = exports.RestDataProviderHttpProviderUsingFetch = exports.RestEntityDataProvider = exports.RestDataProvider = void 0;
+exports.buildFullUrl = buildFullUrl;
 exports.findOptionsToJson = findOptionsToJson;
 exports.findOptionsFromJson = findOptionsFromJson;
 exports.addFilterToUrlAndReturnTrueIfSuccessful = addFilterToUrlAndReturnTrueIfSuccessful;
@@ -19,10 +20,7 @@ var RestDataProvider = /** @class */ (function () {
         var _this = this;
         return new RestEntityDataProvider(function () {
             var _a;
-            var url = (_a = _this.apiProvider()) === null || _a === void 0 ? void 0 : _a.url;
-            if (url === undefined || url === null)
-                url = '/api';
-            return url + '/' + entity.key;
+            return buildFullUrl((_a = _this.apiProvider()) === null || _a === void 0 ? void 0 : _a.url, entity.key);
         }, function () {
             return (0, buildRestDataProvider_js_1.buildRestDataProvider)(_this.apiProvider().httpClient);
         }, entity);
@@ -37,6 +35,11 @@ var RestDataProvider = /** @class */ (function () {
     return RestDataProvider;
 }());
 exports.RestDataProvider = RestDataProvider;
+function buildFullUrl(httpClientUrl, entityKey) {
+    if (httpClientUrl === undefined || httpClientUrl === null)
+        httpClientUrl = '/api';
+    return httpClientUrl + '/' + entityKey;
+}
 //@internal
 function findOptionsToJson(options, meta) {
     if (options.include) {

package/src/remult-proxy.js

@@ -284,6 +284,9 @@ var RemultProxy = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    RemultProxy.prototype.initUser = function () {
+        return remult_static_js_1.remultStatic.remultFactory().initUser();
+    };
     RemultProxy.prototype.call = function (backendMethod, self) {
         var _a;
         var args = [];

package/src/remult3/entity.js

@@ -35,14 +35,18 @@ function Entity(key) {
         options[_i - 1] = arguments[_i];
     }
     return function (target, info) {
-        for (var rawFilterMember in target) {
-            if (Object.prototype.hasOwnProperty.call(target, rawFilterMember)) {
-                var element = target[rawFilterMember];
-                if (element === null || element === void 0 ? void 0 : element.rawFilterInfo) {
-                    if (!element.rawFilterInfo.key)
-                        element.rawFilterInfo.key = rawFilterMember;
+        var theClass = target;
+        while (theClass != null) {
+            for (var rawFilterMember in theClass) {
+                if (Object.prototype.hasOwnProperty.call(theClass, rawFilterMember)) {
+                    var element = target[rawFilterMember];
+                    if (element === null || element === void 0 ? void 0 : element.rawFilterInfo) {
+                        if (!element.rawFilterInfo.key)
+                            element.rawFilterInfo.key = rawFilterMember;
+                    }
                 }
             }
+            theClass = Object.getPrototypeOf(theClass);
         }
         var factory = function (remult) {
             var e_1, _a;

package/src/remult3/remult3.js

@@ -20,6 +20,45 @@ var wnn = [
 exports.flags = {
     error500RetryCount: 4,
 };
+/*p1 - create-remult discussion
+
+  p1 - should we add to remult some init code that populates remult based on a built in server route for current user.
+     - yes, `remult.initUser` - the url will be /api/me
+     - ask to add a todo example
+     - admin question
+     - ask to add a user table + password hash
+     
+     - changeOrigin false to vite config
+     - test angular with auth
+     - check nextauth if the env variable should be called NEXTAUTH_SECRET or just AUTH_SECRET
+     /** @type {import('next').NextConfig}
+const nextConfig = {
+  experimental: {
+    serverComponentsExternalPackages: ["knex"],
+  },
+};
+
+export default nextConfig;
+
+  p1 - Landing page:
+     - p2 include the selections (react,vite, postgres,auth)
+     - include server is alive test (remind to run dev-node)
+     - include the authenticated user with links to sign in & sign out
+     - include link to admin
+     - include todo
+
+  p1 - README:
+     - the selections
+     - how to run dev
+     - which environment variables to set
+  
+
+  - should we add admin? ensureSchema:false etc...
+  - should we read existing database?
+  - knex issue with next
+
+
+*/
 //p1 - add aggregate to query
 //p1 - add parameter all to deleteMany, and updateMany
 //p1  filter.apply ApiPreFilter