remult 0.26.12-next.2 → 0.26.12

package/esm/live-query/data-provider-live-query-storage.js

@@ -4,7 +4,7 @@ import { EntityBase } from '../src/remult3/RepositoryImplementation.js';
 import { Fields } from '../src/remult3/Fields.js';
 import { Entity } from '../src/remult3/entity.js';
 import { remultStatic } from '../src/remult-static.js';
-import { initDataProviderOrJson } from '../server/initDataProviderOrJson';
+import { initDataProviderOrJson } from '../server/initDataProviderOrJson.js';
 export class DataProviderLiveQueryStorage {
     repo;
     dataProvider;

package/esm/migrations/generate-migrations.js

@@ -4,7 +4,7 @@ import { compareMigrationSnapshot, emptySnapshot, } from './compare-migration-sn
 import { updateMigrationsFile } from './update-migrations-ts-file.js';
 import { DefaultMigrationBuilder, } from './migration-types.js';
 import { isOfType } from '../src/isOfType.js';
-import { initDataProviderOrJson } from '../server/initDataProviderOrJson';
+import { initDataProviderOrJson } from '../server/initDataProviderOrJson.js';
 /**
  * Generates migration scripts based on changes in entities.
  *

package/esm/migrations/migrate.js

@@ -1,6 +1,6 @@
 import { __decorate, __metadata } from "tslib";
 import { Entity, IdEntity, Fields, remult, Remult, } from '../index.js';
-import { initDataProviderOrJson } from '../server/initDataProviderOrJson';
+import { initDataProviderOrJson } from '../server/initDataProviderOrJson.js';
 import { doTransaction } from '../src/context.js';
 import { cast, isOfType } from '../src/isOfType.js';
 /**

package/esm/postgres/postgres-data-provider.js

@@ -156,8 +156,6 @@ export async function createPostgresDataProvider(options) {
         schema: options.schema,
         orderByNullsFirst: options.orderByNullsFirst,
     }));
-    let remult = new Remult();
-    remult.dataProvider = db;
     return db;
 }
 export async function preparePostgresQueueStorage(sql) {

package/esm/remult-next.js

@@ -118,6 +118,6 @@ export function remultNextApp(options) {
         POST: handler,
         PUT: handler,
         DELETE: handler,
-        withRemult: (what, disableInitUserAndRequest) => result.withRemultAsync(disableInitUserAndRequest ? undefined : {}, what),
+        withRemult: (what) => result.withRemultAsync({}, what),
     };
 }

package/esm/remult-solid-start.js

@@ -86,8 +86,8 @@ export function remultSolidStart(options) {
     return Object.assign(handler, {
         getRemult: (req) => result.getRemult(req),
         openApiDoc: (options) => result.openApiDoc(options),
-        async withRemult(what, disableInitUserAndRequest) {
-            return result.withRemultAsync(disableInitUserAndRequest ? undefined : await getRequestEvent(), what);
+        async withRemult(what) {
+            return result.withRemultAsync(await getRequestEvent(), what);
         },
         GET: serverHandler,
         PUT: serverHandler,

package/esm/server/initDataProvider.js

@@ -1,4 +1,4 @@
-import { remultStatic } from '../src/remult-static';
+import { remultStatic } from '../src/remult-static.js';
 export function initDataProvider(optionsDataProvider, useStaticDefault, defaultDataProvider) {
     let dataProvider;
     if (typeof optionsDataProvider === 'function') {

package/esm/server/initDataProviderOrJson.js

@@ -1,4 +1,4 @@
-import { initDataProvider } from './initDataProvider';
+import { initDataProvider } from './initDataProvider.js';
 export function initDataProviderOrJson(dataProvider) {
     return initDataProvider(dataProvider, false, async () => {
         return new (await import('./JsonEntityFileStorage.js')).JsonFileDataProvider('./db');

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

@@ -13,7 +13,7 @@ import { serverActionField } from '../src/server-action-info.js';
 import { remultStatic } from '../src/remult-static.js';
 import remultAdminHtml from './remult-admin.js';
 import { isOfType } from '../src/isOfType.js';
-import { initDataProviderOrJson } from './initDataProviderOrJson';
+import { initDataProviderOrJson } from './initDataProviderOrJson.js';
 export function createRemultServerCore(options, serverCoreOptions) {
     if (!options) {
         options = {};

package/esm/src/context.js

@@ -7,7 +7,7 @@ import { serverActionField } from './server-action-info.js';
 import { buildRestDataProvider, isExternalHttpProvider, } from './buildRestDataProvider.js';
 import { verifyFieldRelationInfo } from './remult3/relationInfoMember.js';
 import { remultStatic, resetFactory } from './remult-static.js';
-import { initDataProvider } from '../server/initDataProvider';
+import { initDataProvider } from '../server/initDataProvider.js';
 export class RemultAsyncLocalStorage {
     remultObjectStorage;
     static enable() {

package/live-query/data-provider-live-query-storage.js

@@ -7,10 +7,10 @@ var RepositoryImplementation_js_1 = require("../src/remult3/RepositoryImplementa
 var Fields_js_1 = require("../src/remult3/Fields.js");
 var entity_js_1 = require("../src/remult3/entity.js");
 var remult_static_js_1 = require("../src/remult-static.js");
-var initDataProviderOrJson_1 = require("../server/initDataProviderOrJson");
+var initDataProviderOrJson_js_1 = require("../server/initDataProviderOrJson.js");
 var DataProviderLiveQueryStorage = /** @class */ (function () {
     function DataProviderLiveQueryStorage(dataProvider) {
-        this.dataProvider = (0, initDataProviderOrJson_1.initDataProviderOrJson)(dataProvider);
+        this.dataProvider = (0, initDataProviderOrJson_js_1.initDataProviderOrJson)(dataProvider);
         this.repo = this.dataProvider.then(function (dp) {
             return new context_js_1.Remult(dp).repo(LiveQueryStorageEntity);
         });

package/migrations/generate-migrations.js

@@ -8,7 +8,7 @@ var compare_migration_snapshots_js_1 = require("./compare-migration-snapshots.js
 var update_migrations_ts_file_js_1 = require("./update-migrations-ts-file.js");
 var migration_types_js_1 = require("./migration-types.js");
 var isOfType_js_1 = require("../src/isOfType.js");
-var initDataProviderOrJson_1 = require("../server/initDataProviderOrJson");
+var initDataProviderOrJson_js_1 = require("../server/initDataProviderOrJson.js");
 /**
  * Generates migration scripts based on changes in entities.
  *
@@ -31,7 +31,7 @@ function generateMigrations(options) {
                     migrationDir = options.migrationsFolder || path_1.default.join(process.cwd(), 'src/migrations');
                     snapshotFileName = options.snapshotFile || path_1.default.join(migrationDir, 'migrations-snapshot.json');
                     migrationsTSFilename = options.migrationsTSFile || path_1.default.join(migrationDir, 'migrations.ts');
-                    return [4 /*yield*/, (0, initDataProviderOrJson_1.initDataProviderOrJson)(options.dataProvider)];
+                    return [4 /*yield*/, (0, initDataProviderOrJson_js_1.initDataProviderOrJson)(options.dataProvider)];
                 case 1:
                     dataProvider = _d.sent();
                     try {

package/migrations/migrate.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrate = void 0;
 var tslib_1 = require("tslib");
 var index_js_1 = require("../index.js");
-var initDataProviderOrJson_1 = require("../server/initDataProviderOrJson");
+var initDataProviderOrJson_js_1 = require("../server/initDataProviderOrJson.js");
 var context_js_1 = require("../src/context.js");
 var isOfType_js_1 = require("../src/isOfType.js");
 /**
@@ -26,7 +26,7 @@ function migrate(options) {
             switch (_a.label) {
                 case 0:
                     migrationTableName = options.migrationsTable || '__remult_migrations_version';
-                    return [4 /*yield*/, (0, initDataProviderOrJson_1.initDataProviderOrJson)(options.dataProvider)];
+                    return [4 /*yield*/, (0, initDataProviderOrJson_js_1.initDataProviderOrJson)(options.dataProvider)];
                 case 1:
                     dataProvider = _a.sent();
                     prev = index_js_1.remult.dataProvider;

package/package.json

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

package/postgres/postgres-data-provider.js

@@ -202,7 +202,7 @@ function createPostgresConnection(options) {
 exports.createPostgresConnection = createPostgresConnection;
 function createPostgresDataProvider(options) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var config, db, remult;
+        var config, db;
         return tslib_1.__generator(this, function (_a) {
             if (!options)
                 options = {};
@@ -233,8 +233,6 @@ function createPostgresDataProvider(options) {
                 schema: options.schema,
                 orderByNullsFirst: options.orderByNullsFirst,
             }));
-            remult = new context_js_1.Remult();
-            remult.dataProvider = db;
             return [2 /*return*/, db];
         });
     });

package/remult-next.d.ts

@@ -22,5 +22,5 @@ export type RemultNextAppServer = RemultServerCore<Request> & {
     PUT: (req: Request) => Promise<Response>;
     POST: (req: Request) => Promise<Response>;
     DELETE: (req: Request) => Promise<Response>;
-    withRemult<T>(what: () => Promise<T>, disableInitUserAndRequest?: boolean): Promise<T>;
+    withRemult<T>(what: () => Promise<T>): Promise<T>;
 };

package/remult-next.js

@@ -174,9 +174,7 @@ function remultNextApp(options) {
         POST: handler,
         PUT: handler,
         DELETE: handler,
-        withRemult: function (what, disableInitUserAndRequest) {
-            return result.withRemultAsync(disableInitUserAndRequest ? undefined : {}, what);
-        },
+        withRemult: function (what) { return result.withRemultAsync({}, what); },
     };
 }
 exports.remultNextApp = remultNextApp;

package/remult-solid-start.d.ts

@@ -3,7 +3,7 @@ import type { RemultServerCore, RemultServerOptions } from './server/index.js';
 export declare function remultSolidStart(options: RemultServerOptions<RequestEvent>): RemultSolidStartServer;
 type RequestHandler = (event: RequestEvent) => Promise<Response>;
 export type RemultSolidStartServer = RemultServerCore<RequestEvent> & {
-    withRemult<T>(what: () => Promise<T>, disableInitUserAndRequest?: boolean): Promise<T>;
+    withRemult<T>(what: () => Promise<T>): Promise<T>;
     GET: RequestHandler;
     PUT: RequestHandler;
     POST: RequestHandler;

package/remult-solid-start.js

@@ -112,21 +112,15 @@ function remultSolidStart(options) {
     return Object.assign(handler, {
         getRemult: function (req) { return result.getRemult(req); },
         openApiDoc: function (options) { return result.openApiDoc(options); },
-        withRemult: function (what, disableInitUserAndRequest) {
+        withRemult: function (what) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
-                var _a, _b, _c;
-                return tslib_1.__generator(this, function (_d) {
-                    switch (_d.label) {
+                var _a, _b;
+                return tslib_1.__generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             _b = (_a = result).withRemultAsync;
-                            if (!disableInitUserAndRequest) return [3 /*break*/, 1];
-                            _c = undefined;
-                            return [3 /*break*/, 3];
-                        case 1: return [4 /*yield*/, (0, web_1.getRequestEvent)()];
-                        case 2:
-                            _c = _d.sent();
-                            _d.label = 3;
-                        case 3: return [2 /*return*/, _b.apply(_a, [_c, what])];
+                            return [4 /*yield*/, (0, web_1.getRequestEvent)()];
+                        case 1: return [2 /*return*/, _b.apply(_a, [_c.sent(), what])];
                     }
                 });
             });

package/server/initDataProvider.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initDataProvider = void 0;
 var tslib_1 = require("tslib");
-var remult_static_1 = require("../src/remult-static");
+var remult_static_js_1 = require("../src/remult-static.js");
 function initDataProvider(optionsDataProvider, useStaticDefault, defaultDataProvider) {
     var _this = this;
     var dataProvider;
@@ -18,7 +18,7 @@ function initDataProvider(optionsDataProvider, useStaticDefault, defaultDataProv
                     if (dp)
                         return [2 /*return*/, dp];
                     if (!useStaticDefault) return [3 /*break*/, 2];
-                    return [4 /*yield*/, remult_static_1.remultStatic.defaultDataProvider()];
+                    return [4 /*yield*/, remult_static_js_1.remultStatic.defaultDataProvider()];
                 case 1:
                     dp = _a.sent();
                     _a.label = 2;

package/server/initDataProviderOrJson.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initDataProviderOrJson = void 0;
 var tslib_1 = require("tslib");
-var initDataProvider_1 = require("./initDataProvider");
+var initDataProvider_js_1 = require("./initDataProvider.js");
 function initDataProviderOrJson(dataProvider) {
     var _this = this;
-    return (0, initDataProvider_1.initDataProvider)(dataProvider, false, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+    return (0, initDataProvider_js_1.initDataProvider)(dataProvider, false, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('./JsonEntityFileStorage.js')); })];

package/server/remult-api-server.js

@@ -16,7 +16,7 @@ var server_action_info_js_1 = require("../src/server-action-info.js");
 var remult_static_js_1 = require("../src/remult-static.js");
 var remult_admin_js_1 = tslib_1.__importDefault(require("./remult-admin.js"));
 var isOfType_js_1 = require("../src/isOfType.js");
-var initDataProviderOrJson_1 = require("./initDataProviderOrJson");
+var initDataProviderOrJson_js_1 = require("./initDataProviderOrJson.js");
 function createRemultServerCore(options, serverCoreOptions) {
     if (!options) {
         options = {};
@@ -33,7 +33,7 @@ function createRemultServerCore(options, serverCoreOptions) {
     if (!options.queueStorage) {
         options.queueStorage = new InMemoryQueueStorage();
     }
-    var dataProvider = (0, initDataProviderOrJson_1.initDataProviderOrJson)(options.dataProvider);
+    var dataProvider = (0, initDataProviderOrJson_js_1.initDataProviderOrJson)(options.dataProvider);
     remult_static_js_1.remultStatic.defaultDataProvider = function () { return dataProvider; };
     if (options.ensureSchema === undefined)
         options.ensureSchema = true;

package/src/context.js

@@ -11,7 +11,7 @@ var server_action_info_js_1 = require("./server-action-info.js");
 var buildRestDataProvider_js_1 = require("./buildRestDataProvider.js");
 var relationInfoMember_js_1 = require("./remult3/relationInfoMember.js");
 var remult_static_js_1 = require("./remult-static.js");
-var initDataProvider_1 = require("../server/initDataProvider");
+var initDataProvider_js_1 = require("../server/initDataProvider.js");
 var RemultAsyncLocalStorage = /** @class */ (function () {
     function RemultAsyncLocalStorage(remultObjectStorage) {
         this.remultObjectStorage = remultObjectStorage;
@@ -475,7 +475,7 @@ function withRemult(callback, options) {
                 case 0:
                     remult = new Remult();
                     _a = remult;
-                    return [4 /*yield*/, (0, initDataProvider_1.initDataProvider)(options === null || options === void 0 ? void 0 : options.dataProvider, true, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                    return [4 /*yield*/, (0, initDataProvider_js_1.initDataProvider)(options === null || options === void 0 ? void 0 : options.dataProvider, true, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
                             return [2 /*return*/, remult.dataProvider];
                         }); }); })];
                 case 1: