ci: fixed wrong imports + declarations

NiclasHaderer · Feb 2, 2025 · ef88d87 · ef88d87
1 parent d832cff
commit ef88d87
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 17 deletions.
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@luftschloss/client",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "engines": {
     "node": ">=18"
   }

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@luftschloss/common",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "engines": {
     "node": ">=18"
   }

diff --git a/packages/mocking/package.json b/packages/mocking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@luftschloss/mocking",
-  "version": "0.0.1",
+  "version": "0.2.1",
   "engines": {
     "node": ">=18"
   }

diff --git a/packages/openapi-schema/package.json b/packages/openapi-schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@luftschloss/openapi-schema",
-  "version": "0.0.1",
+  "version": "0.2.1",
   "engines": {
     "node": ">=18"
   }

diff --git a/packages/openapi/package.json b/packages/openapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@luftschloss/openapi",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "engines": {
     "node": ">=18"
   }

diff --git a/packages/openapi/src/lib/api.server.ts b/packages/openapi/src/lib/api.server.ts
@@ -19,8 +19,11 @@ import {
   withServerBase,
 } from "@luftschloss/server";
 import { ApiRouter } from "./api.router";
+import type { Constructor } from "@luftschloss/common";
 
-export class ApiServer extends withServerBase(ApiRouter) implements ServerBase {}
+// Workaround for messed up imports
+export const ApiServer: Constructor<ApiRouter & ServerBase, []> = withServerBase(ApiRouter);
+export type ApiServer = InstanceType<typeof ApiServer>;
 
 export const apiServer = ({ timeout = 5000, maxConnections = Number.MAX_SAFE_INTEGER } = {}) => {
   const server = new ApiServer();

diff --git a/packages/proxy/package.json b/packages/proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@luftschloss/proxy",
-  "version": "0.0.1",
+  "version": "0.2.1",
   "engines": {
     "node": ">=18"
   }

diff --git a/packages/router/package.json b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "router",
-  "version": "0.0.1",
+  "version": "0.2.1",
   "dependencies": {
     "tslib": "^2.3.0"
   },

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@luftschloss/server",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "engines": {
     "node": ">=18"
   }

diff --git a/packages/server/src/lib/core/server-base.ts b/packages/server/src/lib/core/server-base.ts
@@ -43,7 +43,7 @@ export interface ServerBase extends Pick<Subscribable<LuftServerEvents>, "onComp
 }
 
 // noinspection JSPotentiallyInvalidUsageOfThis
-export const withServerBase = <T extends Router, ARGS extends []>(
+export const withServerBase = <T extends Router, ARGS extends any[]>(
   clazz: Constructor<T, ARGS>
 ): Constructor<T & ServerBase, ARGS> =>
   class extends (clazz as Constructor<Router, ARGS>) implements ServerBase {

diff --git a/packages/server/src/lib/core/server.ts b/packages/server/src/lib/core/server.ts
@@ -14,9 +14,12 @@ import {
 } from "../path-validator";
 import { DefaultRouter } from "../router";
 import { DefaultErrorHandler } from "./error-handler";
-import { withServerBase } from "./server-base";
+import { ServerBase, withServerBase } from "./server-base";
+import type { Constructor } from "@luftschloss/common";
 
-export class ServerImpl extends withServerBase(DefaultRouter) {}
+// Workaround for messed up imports
+export const ServerImpl: Constructor<DefaultRouter & ServerBase, []> = withServerBase(DefaultRouter);
+export type ServerImpl = InstanceType<typeof ServerImpl>;
 
 export const luftServer = ({ timeout = 5000, maxConnections = Number.MAX_SAFE_INTEGER } = {}): ServerImpl => {
   const server = new ServerImpl();

diff --git a/packages/static/package.json b/packages/static/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@luftschloss/static",
-  "version": "0.0.1",
+  "version": "0.2.1",
   "engines": {
     "node": ">=18"
   }

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@luftschloss/testing",
-  "version": "0.0.1",
+  "version": "0.2.1",
   "engines": {
     "node": ">=18"
   }

diff --git a/packages/validation-interfaces/package.json b/packages/validation-interfaces/package.json
@@ -1,5 +1,5 @@
 {
   "name": "@luftschloss/validation-interfaces",
-  "version": "0.0.1",
+  "version": "0.2.1",
   "type": "commonjs"
 }
diff --git a/packages/validation/package.json b/packages/validation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@luftschloss/validation",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "engines": {
     "node": ">=18"
   }

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -2,7 +2,6 @@
   "compileOnSave": false,
   "compilerOptions": {
     "rootDir": ".",
-    "sourceMap": true,
     "declaration": false,
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
@@ -21,6 +20,7 @@
     "noImplicitOverride": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
+    "inlineSourceMap": true,
     "paths": {
       "@luftschloss/client": ["packages/client/src/index.ts"],
       "@luftschloss/common": ["packages/common/src/index.ts"],