remult 3.3.13 → 3.3.15

package/esm/remult-node-sqlite.js

@@ -0,0 +1,55 @@
+import { SqliteCoreDataProvider } from './remult-sqlite-core.js';
+/**
+ * A Remult data provider for Node's built-in `node:sqlite` module.
+ *
+ * `node:sqlite` is available in Node.js 22.5.0 and newer. The database is
+ * accepted structurally so importing this adapter does not load a Node-only
+ * module until the application creates its `DatabaseSync` instance.
+ */
+export class NodeSqliteDataProvider extends SqliteCoreDataProvider {
+    constructor(db) {
+        super(() => new NodeSqliteCommand(db), async () => {
+            db.close();
+        });
+    }
+}
+class NodeSqliteCommand {
+    db;
+    values = {};
+    i = 0;
+    constructor(db) {
+        this.db = db;
+    }
+    async execute(sql) {
+        const statement = this.db.prepare(sql);
+        statement.setAllowBareNamedParameters(true);
+        const rows = Object.keys(this.values).length
+            ? statement.all(this.values)
+            : statement.all();
+        return new NodeSqliteResult(rows);
+    }
+    addParameterAndReturnSqlToken(value) {
+        return this.param(value);
+    }
+    param(value) {
+        if (value instanceof Date)
+            value = value.valueOf();
+        if (typeof value === 'boolean')
+            value = value ? 1 : 0;
+        if (value === undefined)
+            value = null;
+        const key = String(this.i++);
+        this.values[key] = value;
+        return `:${key}`;
+    }
+}
+class NodeSqliteResult {
+    rows;
+    constructor(rows) {
+        this.rows = rows;
+    }
+    getColumnKeyInResultForIndexInSelect(index) {
+        const first = this.rows[0];
+        return first ? (Object.keys(first)[index] ?? '') : '';
+    }
+}

package/esm/src/context.js

@@ -170,7 +170,15 @@ export class Remult {
             return this.isAllowed(allowed);
         return undefined;
     }
+    /**
+     * @deprecated In SvelteKit, loads run in parallel, so reassigning the shared
+     * `remult` data provider here leaks across loads. Scope the fetch to the read
+     * with `withRemult` instead, e.g.
+     * `withRemult((r) => r.repo(X).find(), { dataProvider: new RestDataProvider(() => ({ httpClient: event.fetch })) })`.
+     * See the SvelteKit "Universal load & SSR" doc.
+     */
     useFetch(fetch) {
+        console.warn('[remult] `useFetch` is deprecated, see https://remult.dev/docs/installation/framework/sveltekit#extra-universal-load-ssr');
         this.dataProvider = new RestDataProvider(() => ({
             httpClient: fetch,
         }));

package/esm/src/data-api.js

@@ -195,6 +195,9 @@ export class DataApi {
         if (body?.orderBy) {
             for (const element of body?.orderBy) {
                 const direction = element.isDescending ? 'desc' : 'asc';
+                if (element.operation !== 'count' &&
+                    !this.repository.fields.find(element.field)?.includedInApi())
+                    continue;
                 switch (element.operation) {
                     case undefined:
                         orderBy[element.field] = direction;

package/esm/src/remult-proxy.js

@@ -62,6 +62,11 @@ export class RemultProxy {
     clearAllCache() {
         return remultStatic.remultFactory().clearAllCache();
     }
+    /**
+     * @deprecated Mutating the shared request `remult` is unsafe (it can affect a
+     * concurrent `+page.server.ts` on the server). Scope the rest fetch to the read
+     * with `withRemult` instead - see the SvelteKit "Universal load & SSR" doc.
+     */
     useFetch(args) {
         return remultStatic.remultFactory().useFetch(args);
     }
@@ -71,9 +76,11 @@ export class RemultProxy {
         let self = remultStatic;
         let entityCache = this.repoCache.get(args[0]);
         if (!entityCache) {
-            this.repoCache.set(args[0], (entityCache = new Map()));
+            this.repoCache.set(args[0], (entityCache = { byDataProvider: new WeakMap() }));
         }
-        let result = entityCache.get(args[1]);
+        let result = args[1]
+            ? entityCache.byDataProvider.get(args[1])
+            : entityCache.default;
         if (result)
             return result;
         result = {
@@ -184,7 +191,10 @@ export class RemultProxy {
                 .repo(...args)
                 .update(a, b, c),
         };
-        entityCache.set(args[1], result);
+        if (args[1])
+            entityCache.byDataProvider.set(args[1], result);
+        else
+            entityCache.default = result;
         return result;
     };
     get user() {

package/esm/src/remult3/RepositoryImplementation.js

@@ -3,7 +3,7 @@ import { CompoundIdField } from '../CompoundIdField.js';
 import { Remult } from '../context.js';
 import { Filter } from '../filter/filter-interfaces.js';
 import { Sort } from '../sort.js';
-import { GroupByForApiKey, } from './remult3.js';
+import { GroupByCountMember, GroupByForApiKey, } from './remult3.js';
 import { assign } from '../../assign.js';
 import { EntityError, } from '../data-interfaces.js';
 import { ValueConverters } from '../valueConverters.js';
@@ -185,10 +185,14 @@ export class RepositoryImplementation {
                     const element = options.orderBy[key];
                     if (element)
                         if (typeof element === 'string') {
+                            // ordering by a raw column is only valid for grouped fields -
+                            // skip others so behavior is consistent across data providers
+                            if (key !== GroupByCountMember && !options?.group?.includes(key))
+                                continue;
                             dpOptions.orderBy.push({
-                                field: key === '$count' ? undefined : getField(key),
+                                field: key === GroupByCountMember ? undefined : getField(key),
                                 isDescending: element === 'desc',
-                                operation: key === '$count' ? 'count' : undefined,
+                                operation: key === GroupByCountMember ? 'count' : undefined,
                             });
                         }
                         else {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "3.3.13",
+    "version": "3.3.15",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {
@@ -112,6 +112,11 @@
             "import": "./esm/remult-sqlite-core.js",
             "types": "./remult-sqlite-core.d.ts"
         },
+        "./remult-node-sqlite": {
+            "require": "./remult-node-sqlite.js",
+            "import": "./esm/remult-node-sqlite.js",
+            "types": "./remult-node-sqlite.d.ts"
+        },
         "./remult-better-sqlite3": {
             "require": "./remult-better-sqlite3.js",
             "import": "./esm/remult-better-sqlite3.js",

package/remult-node-sqlite.d.ts

@@ -0,0 +1,19 @@
+import { SqliteCoreDataProvider } from './remult-sqlite-core.js';
+export type NodeSqliteStatement = {
+    setAllowBareNamedParameters(enabled: boolean): void;
+    all(...anonymousParameters: any[]): Record<string, unknown>[];
+};
+export type NodeSqliteDatabase = {
+    prepare(sql: string): NodeSqliteStatement;
+    close(): void;
+};
+/**
+ * A Remult data provider for Node's built-in `node:sqlite` module.
+ *
+ * `node:sqlite` is available in Node.js 22.5.0 and newer. The database is
+ * accepted structurally so importing this adapter does not load a Node-only
+ * module until the application creates its `DatabaseSync` instance.
+ */
+export declare class NodeSqliteDataProvider extends SqliteCoreDataProvider {
+    constructor(db: NodeSqliteDatabase);
+}

package/remult-node-sqlite.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeSqliteDataProvider = void 0;
+var tslib_1 = require("tslib");
+var remult_sqlite_core_js_1 = require("./remult-sqlite-core.js");
+/**
+ * A Remult data provider for Node's built-in `node:sqlite` module.
+ *
+ * `node:sqlite` is available in Node.js 22.5.0 and newer. The database is
+ * accepted structurally so importing this adapter does not load a Node-only
+ * module until the application creates its `DatabaseSync` instance.
+ */
+var NodeSqliteDataProvider = /** @class */ (function (_super) {
+    tslib_1.__extends(NodeSqliteDataProvider, _super);
+    function NodeSqliteDataProvider(db) {
+        var _this = _super.call(this, function () { return new NodeSqliteCommand(db); }, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                db.close();
+                return [2 /*return*/];
+            });
+        }); }) || this;
+        return _this;
+    }
+    return NodeSqliteDataProvider;
+}(remult_sqlite_core_js_1.SqliteCoreDataProvider));
+exports.NodeSqliteDataProvider = NodeSqliteDataProvider;
+var NodeSqliteCommand = /** @class */ (function () {
+    function NodeSqliteCommand(db) {
+        this.db = db;
+        this.values = {};
+        this.i = 0;
+    }
+    NodeSqliteCommand.prototype.execute = function (sql) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var statement, rows;
+            return tslib_1.__generator(this, function (_a) {
+                statement = this.db.prepare(sql);
+                statement.setAllowBareNamedParameters(true);
+                rows = Object.keys(this.values).length
+                    ? statement.all(this.values)
+                    : statement.all();
+                return [2 /*return*/, new NodeSqliteResult(rows)];
+            });
+        });
+    };
+    NodeSqliteCommand.prototype.addParameterAndReturnSqlToken = function (value) {
+        return this.param(value);
+    };
+    NodeSqliteCommand.prototype.param = function (value) {
+        if (value instanceof Date)
+            value = value.valueOf();
+        if (typeof value === 'boolean')
+            value = value ? 1 : 0;
+        if (value === undefined)
+            value = null;
+        var key = String(this.i++);
+        this.values[key] = value;
+        return ":".concat(key);
+    };
+    return NodeSqliteCommand;
+}());
+var NodeSqliteResult = /** @class */ (function () {
+    function NodeSqliteResult(rows) {
+        this.rows = rows;
+    }
+    NodeSqliteResult.prototype.getColumnKeyInResultForIndexInSelect = function (index) {
+        var _a;
+        var first = this.rows[0];
+        return first ? ((_a = Object.keys(first)[index]) !== null && _a !== void 0 ? _a : '') : '';
+    };
+    return NodeSqliteResult;
+}());

package/src/context.d.ts

@@ -63,6 +63,13 @@ export declare class Remult {
      * [Allowed](https://remult.dev/docs/allowed.html)
      */
     isAllowedForInstance(instance: any, allowed?: AllowedForInstance<any>): boolean;
+    /**
+     * @deprecated In SvelteKit, loads run in parallel, so reassigning the shared
+     * `remult` data provider here leaks across loads. Scope the fetch to the read
+     * with `withRemult` instead, e.g.
+     * `withRemult((r) => r.repo(X).find(), { dataProvider: new RestDataProvider(() => ({ httpClient: event.fetch })) })`.
+     * See the SvelteKit "Universal load & SSR" doc.
+     */
     useFetch(fetch: ApiClient['httpClient']): void;
     /** The current data provider */
     dataProvider: DataProvider;

package/src/context.js

@@ -274,7 +274,15 @@ var Remult = /** @class */ (function () {
             return this.isAllowed(allowed);
         return undefined;
     };
+    /**
+     * @deprecated In SvelteKit, loads run in parallel, so reassigning the shared
+     * `remult` data provider here leaks across loads. Scope the fetch to the read
+     * with `withRemult` instead, e.g.
+     * `withRemult((r) => r.repo(X).find(), { dataProvider: new RestDataProvider(() => ({ httpClient: event.fetch })) })`.
+     * See the SvelteKit "Universal load & SSR" doc.
+     */
     Remult.prototype.useFetch = function (fetch) {
+        console.warn('[remult] `useFetch` is deprecated, see https://remult.dev/docs/installation/framework/sveltekit#extra-universal-load-ssr');
         this.dataProvider = new rest_data_provider_js_1.RestDataProvider(function () { return ({
             httpClient: fetch,
         }); });

package/src/data-api.js

@@ -378,22 +378,25 @@ var DataApi = /** @class */ (function () {
             var findOptions, orderBy, _a, _b, element, direction, group, min, max, result, minMax, _loop_1, _c, _d, element;
             var e_3, _e, _f, _g, e_4, _h;
             var _this = this;
-            var _j, _k, _l, _m, _o, _p;
-            return tslib_1.__generator(this, function (_q) {
-                switch (_q.label) {
+            var _j, _k, _l, _m, _o, _p, _q;
+            return tslib_1.__generator(this, function (_r) {
+                switch (_r.label) {
                     case 0:
                         if (!this.repository.metadata.apiReadAllowed) {
                             throw new server_action_js_1.ForbiddenError();
                         }
                         return [4 /*yield*/, this.findOptionsFromRequest(request, body)];
                     case 1:
-                        findOptions = _q.sent();
+                        findOptions = _r.sent();
                         orderBy = {};
                         if (body === null || body === void 0 ? void 0 : body.orderBy) {
                             try {
                                 for (_a = tslib_1.__values(body === null || body === void 0 ? void 0 : body.orderBy), _b = _a.next(); !_b.done; _b = _a.next()) {
                                     element = _b.value;
                                     direction = element.isDescending ? 'desc' : 'asc';
+                                    if (element.operation !== 'count' &&
+                                        !((_j = this.repository.fields.find(element.field)) === null || _j === void 0 ? void 0 : _j.includedInApi()))
+                                        continue;
                                     switch (element.operation) {
                                         case undefined:
                                             orderBy[element.field] = direction;
@@ -415,13 +418,13 @@ var DataApi = /** @class */ (function () {
                                 finally { if (e_3) throw e_3.error; }
                             }
                         }
-                        group = (_j = body === null || body === void 0 ? void 0 : body.groupBy) === null || _j === void 0 ? void 0 : _j.filter(function (x) {
+                        group = (_k = body === null || body === void 0 ? void 0 : body.groupBy) === null || _k === void 0 ? void 0 : _k.filter(function (x) {
                             return _this.repository.fields.find(x).includedInApi();
                         });
-                        min = (_k = body === null || body === void 0 ? void 0 : body.min) === null || _k === void 0 ? void 0 : _k.filter(function (x) {
+                        min = (_l = body === null || body === void 0 ? void 0 : body.min) === null || _l === void 0 ? void 0 : _l.filter(function (x) {
                             return _this.repository.fields.find(x).includedInApi();
                         });
-                        max = (_l = body === null || body === void 0 ? void 0 : body.max) === null || _l === void 0 ? void 0 : _l.filter(function (x) {
+                        max = (_m = body === null || body === void 0 ? void 0 : body.max) === null || _m === void 0 ? void 0 : _m.filter(function (x) {
                             return _this.repository.fields.find(x).includedInApi();
                         });
                         return [4 /*yield*/, this.repository.groupBy((_g = {
@@ -432,21 +435,21 @@ var DataApi = /** @class */ (function () {
                                 //@ts-expect-error internal key
                                 _g[remult3_js_1.GroupByForApiKey] = true,
                                 _g.group = group,
-                                _g.sum = (_m = body === null || body === void 0 ? void 0 : body.sum) === null || _m === void 0 ? void 0 : _m.filter(function (x) {
+                                _g.sum = (_o = body === null || body === void 0 ? void 0 : body.sum) === null || _o === void 0 ? void 0 : _o.filter(function (x) {
                                     return _this.repository.fields.find(x).includedInApi();
                                 }),
-                                _g.avg = (_o = body === null || body === void 0 ? void 0 : body.avg) === null || _o === void 0 ? void 0 : _o.filter(function (x) {
+                                _g.avg = (_p = body === null || body === void 0 ? void 0 : body.avg) === null || _p === void 0 ? void 0 : _p.filter(function (x) {
                                     return _this.repository.fields.find(x).includedInApi();
                                 }),
                                 _g.min = min,
                                 _g.max = max,
-                                _g.distinctCount = (_p = body === null || body === void 0 ? void 0 : body.distinctCount) === null || _p === void 0 ? void 0 : _p.filter(function (x) {
+                                _g.distinctCount = (_q = body === null || body === void 0 ? void 0 : body.distinctCount) === null || _q === void 0 ? void 0 : _q.filter(function (x) {
                                     return _this.repository.fields.find(x).includedInApi();
                                 }),
                                 _g.orderBy = orderBy,
                                 _g))];
                     case 2:
-                        result = _q.sent();
+                        result = _r.sent();
                         if (group)
                             result.forEach(function (x) {
                                 var e_5, _a;

package/src/remult-proxy.js

@@ -21,9 +21,11 @@ var RemultProxy = /** @class */ (function () {
             var self = remult_static_js_1.remultStatic;
             var entityCache = _this.repoCache.get(args[0]);
             if (!entityCache) {
-                _this.repoCache.set(args[0], (entityCache = new Map()));
+                _this.repoCache.set(args[0], (entityCache = { byDataProvider: new WeakMap() }));
             }
-            var result = entityCache.get(args[1]);
+            var result = args[1]
+                ? entityCache.byDataProvider.get(args[1])
+                : entityCache.default;
             if (result)
                 return result;
             result = (_a = {
@@ -245,7 +247,10 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).update(a, b, c);
                 },
                 _a);
-            entityCache.set(args[1], result);
+            if (args[1])
+                entityCache.byDataProvider.set(args[1], result);
+            else
+                entityCache.default = result;
             return result;
         };
     }
@@ -336,6 +341,11 @@ var RemultProxy = /** @class */ (function () {
     RemultProxy.prototype.clearAllCache = function () {
         return remult_static_js_1.remultStatic.remultFactory().clearAllCache();
     };
+    /**
+     * @deprecated Mutating the shared request `remult` is unsafe (it can affect a
+     * concurrent `+page.server.ts` on the server). Scope the rest fetch to the read
+     * with `withRemult` instead - see the SvelteKit "Universal load & SSR" doc.
+     */
     RemultProxy.prototype.useFetch = function (args) {
         return remult_static_js_1.remultStatic.remultFactory().useFetch(args);
     };

package/src/remult3/RepositoryImplementation.js

@@ -243,12 +243,12 @@ var RepositoryImplementation = /** @class */ (function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var findOptions, getField, getFieldNotInGroupBy, dpOptions, key, element, operation, direction;
             var _this = this;
-            var _a, _b, _c, _d, _e, _f;
-            return tslib_1.__generator(this, function (_g) {
-                switch (_g.label) {
+            var _a, _b, _c, _d, _e, _f, _g;
+            return tslib_1.__generator(this, function (_h) {
+                switch (_h.label) {
                     case 0: return [4 /*yield*/, this._buildEntityDataProviderFindOptions(tslib_1.__assign({}, options))];
                     case 1:
-                        findOptions = _g.sent();
+                        findOptions = _h.sent();
                         getField = function (key) {
                             var r = _this.metadata.fields.find(key);
                             if (r === undefined)
@@ -279,10 +279,14 @@ var RepositoryImplementation = /** @class */ (function () {
                                     element = options.orderBy[key];
                                     if (element)
                                         if (typeof element === 'string') {
+                                            // ordering by a raw column is only valid for grouped fields -
+                                            // skip others so behavior is consistent across data providers
+                                            if (key !== remult3_js_1.GroupByCountMember && !((_g = options === null || options === void 0 ? void 0 : options.group) === null || _g === void 0 ? void 0 : _g.includes(key)))
+                                                continue;
                                             dpOptions.orderBy.push({
-                                                field: key === '$count' ? undefined : getField(key),
+                                                field: key === remult3_js_1.GroupByCountMember ? undefined : getField(key),
                                                 isDescending: element === 'desc',
-                                                operation: key === '$count' ? 'count' : undefined,
+                                                operation: key === remult3_js_1.GroupByCountMember ? 'count' : undefined,
                                             });
                                         }
                                         else {