renamed express bridge and fixed test errors

remult · May 12, 2024 · e139f1c · e139f1c
1 parent fb5937b
commit e139f1c
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/projects/core/postgres/postgres-data-provider.ts b/projects/core/postgres/postgres-data-provider.ts
@@ -209,13 +209,13 @@ export async function createPostgresDataProvider(options?: {
 export async function preparePostgresQueueStorage(sql: SqlDatabase) {
  let c = new Remult()
  c.dataProvider = sql
- let JobsInQueueEntity = (await import('../server/expressBridge.js'))
+ let JobsInQueueEntity = (await import('../server/remult-api-server.js'))
  .JobsInQueueEntity
  let e = c.repo(JobsInQueueEntity)
  await sql.ensureSchema([e.metadata])
- return new (await import('../server/expressBridge.js')).EntityQueueStorage(
- c.repo(JobsInQueueEntity),
- )
+ return new (
+ await import('../server/remult-api-server.js')
+ ).EntityQueueStorage(c.repo(JobsInQueueEntity))
 }
 export class PostgresSchemaWrapper implements PostgresPool {
  constructor(

diff --git a/projects/core/remult-express.ts b/projects/core/remult-express.ts
@@ -5,7 +5,7 @@ import type {
  RemultServerCore,
  RemultServerImplementation,
  RemultServerOptions,
-} from './server/expressBridge.js'
+} from './server/remult-api-server.js'
 import { createRemultServer } from './server/index.js'
 
 export function remultExpress(

diff --git a/projects/core/remult-fastify.ts b/projects/core/remult-fastify.ts
@@ -13,7 +13,7 @@ import type {
  RemultServerOptions,
  SpecificRoute,
  RemultServer,
-} from './server/expressBridge.js'
+} from './server/remult-api-server.js'
 import { createRemultServer } from './server/index.js'
 
 export function remultFastify(

diff --git a/projects/core/remult-fresh.ts b/projects/core/remult-fresh.ts
@@ -2,8 +2,8 @@ import {} from './server/core.js'
 import type {
  RemultServerCore,
  RemultServerOptions,
-} from './server/expressBridge.js'
-import { createRemultServerCore } from './server/expressBridge.js'
+} from './server/remult-api-server.js'
+import { createRemultServerCore } from './server/remult-api-server.js'
 
 export function remultFresh(
  options: RemultServerOptions<FreshRequest>,

diff --git a/projects/core/server/core.ts b/projects/core/server/core.ts
@@ -9,7 +9,7 @@ export {
  RemultServerOptions,
  SpecificRoute,
  RemultServer,
-} from './expressBridge.js'
+} from './remult-api-server.js'
 export {
  JsonEntityFileStorage,
  JsonFileDataProvider,

diff --git a/projects/core/server/index.ts b/projects/core/server/index.ts
@@ -2,8 +2,8 @@ import type {
  RemultServer,
  RemultServerOptions,
  ServerCoreOptions,
-} from './expressBridge.js'
-import { createRemultServerCore } from './expressBridge.js'
+} from './remult-api-server.js'
+import { createRemultServerCore } from './remult-api-server.js'
 import { initAsyncHooks } from './initAsyncHooks.js'
 export { SseSubscriptionServer } from '../SseSubscriptionServer.js'
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage.js'
@@ -23,7 +23,7 @@ export {
  RemultServerOptions,
  SpecificRoute,
  queuedJobInfo,
-} from './expressBridge.js'
+} from './remult-api-server.js'
 export function createRemultServer<RequestType>(
  options: RemultServerOptions<RequestType>,
  serverCoreOptions?: ServerCoreOptions<RequestType>,

diff --git a/projects/core/server/expressBridge.ts → projects/core/server/remult-api-server.ts b/projects/core/server/expressBridge.ts → projects/core/server/remult-api-server.ts
diff --git a/projects/core/src/data-providers/array-entity-data-provider.ts b/projects/core/src/data-providers/array-entity-data-provider.ts
@@ -144,7 +144,7 @@ export class ArrayEntityDataProvider implements EntityDataProvider {
  }
  }
  throw new Error(
- `ArrayEntityDataProvider: Couldn't find row with id ${id} in entity ${this.entity.key} to update`,
+ `ArrayEntityDataProvider: Couldn't find row with id "${id}" in entity "${this.entity.key}" to update`,
  )
  }
  async delete(id: any): Promise<void> {
@@ -157,7 +157,7 @@ export class ArrayEntityDataProvider implements EntityDataProvider {
  }
  }
  throw new Error(
- `ArrayEntityDataProvider: Couldn't find row with id ${id} in entity ${this.entity.key} to delete`,
+ `ArrayEntityDataProvider: Couldn't find row with id "${id}" in entity "${this.entity.key}" to delete`,
  )
  }
  async insert(data: any): Promise<any> {

diff --git a/projects/tests/tests/test-data-api/predefined-filter.spec.ts b/projects/tests/tests/test-data-api/predefined-filter.spec.ts
@@ -365,7 +365,7 @@ describe('test backend filter and update', () => {
  await r.delete(2)
  item.name = 'z'
  await expect(() => r.save(item)).rejects.toThrowErrorMatchingInlineSnapshot(
- '"couldn\'t find id to update: 2"',
+ '"ArrayEntityDataProvider: Couldn\'t find row with id \\"2\\" in entity \\"t\\" to update"',
  )
  })
  it('save fails', async () => {

diff --git a/projects/tests/tests/test-router-impl.spec.ts b/projects/tests/tests/test-router-impl.spec.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'
 import {
  type GenericRequestInfo,
  RouteImplementation,
-} from '../../core/server/expressBridge'
+} from '../../core/server/remult-api-server'
 describe('test router impl', async () => {
  it('test a', async () => {
  const r = new RouteImplementation<GenericRequestInfo>({