remult 2.7.25-next.2 → 2.7.26-next.0

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

@@ -203,9 +203,9 @@ export class RemultServerImplementation {
                     doWork: undefined,
                 }, r);
             if (this.options.admin !== undefined && this.options.admin !== false) {
-                const admin = (is_entities_metadata) => this.process(async (remult, req, res, orig, origResponse) => {
+                const admin = () => this.process(async (remult, req, res, orig, origResponse) => {
                     if (remult.isAllowed(this.options.admin)) {
-                        if (is_entities_metadata) {
+                        if (orig.params.id === '__entities-metadata') {
                             res.success(buildEntityInfo({
                                 remult,
                                 entities: this.options.entities ?? [],
@@ -222,10 +222,9 @@ export class RemultServerImplementation {
                     else
                         res.notFound();
                 });
-                r.route(this.options.rootPath + '/admin/__entities-metadata').get(admin(true));
-                r.route(this.options.rootPath + '/admin/:id').get(admin(false));
-                r.route(this.options.rootPath + '/admin/').get(admin(false));
-                r.route(this.options.rootPath + '/admin').get(admin(false));
+                r.route(this.options.rootPath + '/admin/:id').get(admin());
+                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) {

package/package.json

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

package/server/remult-api-server.js

@@ -362,12 +362,12 @@ var RemultServerImplementation = /** @class */ (function () {
                     doWork: undefined,
                 }, r);
             if (this.options.admin !== undefined && this.options.admin !== false) {
-                var admin = function (is_entities_metadata) {
+                var admin = function () {
                     return _this.process(function (remult, req, res, orig, origResponse) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                         var _a;
                         return tslib_1.__generator(this, function (_b) {
                             if (remult.isAllowed(this.options.admin)) {
-                                if (is_entities_metadata) {
+                                if (orig.params.id === '__entities-metadata') {
                                     res.success((0, remult_admin_js_1.buildEntityInfo)({
                                         remult: remult,
                                         entities: (_a = this.options.entities) !== null && _a !== void 0 ? _a : [],
@@ -387,10 +387,9 @@ var RemultServerImplementation = /** @class */ (function () {
                         });
                     }); });
                 };
-                r.route(this.options.rootPath + '/admin/__entities-metadata').get(admin(true));
-                r.route(this.options.rootPath + '/admin/:id').get(admin(false));
-                r.route(this.options.rootPath + '/admin/').get(admin(false));
-                r.route(this.options.rootPath + '/admin').get(admin(false));
+                r.route(this.options.rootPath + '/admin/:id').get(admin());
+                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)];

package/src/entity.d.ts

@@ -158,15 +158,15 @@ export interface EntityOptions<entityType = unknown> {
     dbName?: string;
     /** For entities that are based on SQL expressions instead of a physical table or view
      * @example
-     * .@Entity('people',{
-     * sqlExpression:`select id,name from employees
-     *      union all select id,name from contractors`,
+     * @Entity('people', {
+     *   sqlExpression:`select id,name from employees
+     *                  union all select id,name from contractors`,
      * })
-     * export class Person{
-     * .@Fields.string()
-     * id=''
-     * .@Fields.string()
-     * name=''
+     * export class Person {
+     *   @Fields.string()
+     *   id=''
+     *   @Fields.string()
+     *   name=''
      * }
      */
     sqlExpression?: string | ((entity: EntityMetadata<entityType>) => string | Promise<string>);