@swizzyweb/swerve-manager 0.1.9 → 0.3.0

package/dist/swerve.d.ts

@@ -1,4 +1,4 @@
-import { Application } from "@swizzyweb/express";
+import { Application } from "express";
 import { SwerveArgs } from "./utils/index.js";
 import { AnyServer, IWebService, WebService } from "@swizzyweb/swizzy-web-service";
 import { ILogger } from "@swizzyweb/swizzy-common";

package/dist/swerve.js

@@ -1,6 +1,5 @@
-// @ts-ignore
-import express from "@swizzyweb/express";
-import { getLoggerForService, } from "./utils/index.js";
+import express from "express";
+import { getLoggerForService } from "./utils/index.js";
 import { SwizzyWinstonLogger, } from "@swizzyweb/swizzy-web-service";
 import os from "node:os";
 import process from "node:process";
@@ -155,7 +154,7 @@ export class SwerveManager {
         const { app, appDataRoot, packageName, port, gLogger, serviceArgs, servicePath, serviceKey, } = props;
         try {
             gLogger.info(`Getting webservice package ${packageName} and will run on port ${port}`);
-            if (packageName) {
+            if (servicePath ?? packageName) {
                 gLogger.debug(`Getting web service with name ${packageName}`);
             }
             else {
@@ -163,10 +162,11 @@ export class SwerveManager {
             }
             let firstTool;
             try {
-                firstTool = await import(packageName ?? servicePath);
+                firstTool = await import(servicePath ?? packageName);
+                gLogger.info(`Imported from raw path ${servicePath}`);
             }
             catch (e) {
-                gLogger.warn(`Unable to import from raw tool path ${packageName ?? servicePath}, trying with import name. Err: ${e?.message}. Stack: ${e?.stack}`);
+                gLogger.warn(`Unable to import from raw tool path ${servicePath ?? packageName}, trying with import name. Err: ${e?.message}. Stack: ${e?.stack}`);
             }
             const fullPath = await this.getImportName(packageName, servicePath);
             const tool = firstTool ?? (await import(fullPath));

package/dist/utils/getPackageJson.js

@@ -41,6 +41,7 @@ export function getPackageJson(packageNameOrPath) {
                 //    console.log(entrypoint);
                 //   console.error(`Entrypoint is ${entrypoint}`);
                 //        throw `Entrypoint is ${entrypoint}`;
+                console.log(`dir name in ${entrypoint}`);
                 return { packageJson, servicePath: entrypoint };
             }
             dir = path.dirname(dir);

package/eslint.config.js

@@ -1,32 +1,23 @@
 // eslint.config.js
-import tsParser from "@typescript-eslint/parser";
-import tsPlugin from "@typescript-eslint/eslint-plugin";
+import { defineConfig } from "eslint/config";
+
+import tseslint from "@typescript-eslint/eslint-plugin";
+import parser from "@typescript-eslint/parser";
 
 export default [
   {
-    ignores: [
-      "dist/**", // Now ignores all of dist
-      "coverage/**", // Resolves unused eslint-disable warnings
-      "test/**",
-    ],
-  },
-  {
-    files: ["**/*.ts", "**/*.tsx"],
-    plugins: {
-      "@typescript-eslint": tsPlugin,
-    },
+    files: ["**/*.ts"],
     languageOptions: {
-      parser: tsParser,
+      parser,
       parserOptions: {
-        // Update the project to point to your new file
-        project: "./tsconfig.eslint.json",
-        ecmaVersion: "latest",
-        sourceType: "module",
+        project: "./tsconfig.json",
       },
     },
+    plugins: {
+      "@typescript-eslint": tseslint,
+    },
     rules: {
       "@typescript-eslint/no-floating-promises": "error",
-      // ... other TypeScript rules
     },
   },
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swizzyweb/swerve-manager",
-  "version": "0.1.9",
+  "version": "0.3.0",
   "description": "swizzy-swerve is a bootstrapper for swizzy web services. This package will bootstrap and run independent swizzy web services.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,20 +12,26 @@
     "test:node": "node --test ./test**/*.spec.ts",
     "test:deno": "deno test test/** --allow-env --allow-write --allow-read",
     "test:bun": "bun test",
-    "coverage": "jest --coverage"
+    "coverage": "jest --coverage",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   },
   "author": "Jason Gallagher",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@swizzyweb/express": "^4.19.2",
+    "@types/express": "^5.0.6",
     "@types/node": "^22.18.6",
+    "@typescript-eslint/eslint-plugin": "^8.54.0",
+    "@typescript-eslint/parser": "^8.54.0",
+    "bun": "^1.3.8",
+    "deno": "^2.6.8",
+    "eslint": "^9.39.2",
     "typescript": "^5.9.2"
   },
   "dependencies": {
     "@swizzyweb/swizzy-common": "^0.3.3",
-    "@swizzyweb/swizzy-web-service": "^0.5.5",
-    "bun": "^1.2.22",
-    "deno": "^2.5.2"
+    "@swizzyweb/swizzy-web-service": "^0.6.0",
+    "express": "^5.2.1"
   },
   "repository": {
     "type": "git",

package/src/swerve.ts

@@ -1,10 +1,5 @@
-// @ts-ignore
-import express, { Application } from "@swizzyweb/express";
-import {
-  getLoggerForService,
-  installWebService,
-  SwerveArgs,
-} from "./utils/index.js";
+import express, { Application } from "express";
+import { getLoggerForService, SwerveArgs } from "./utils/index.js";
 import {
   AnyServer,
   IWebService,
@@ -130,7 +125,7 @@ export class SwerveManager implements ISwerveManager {
 
     try {
       const webServices: WebService<any>[] = [];
-      const newApps: { [port: number]: Application } = {};
+      const newApps: Apps = {};
       for (const serviceEntry of Object.entries(args.services)) {
         const port = serviceEntry[1].port ?? args.port;
         if (!this.apps[`${port}`]) {
@@ -269,17 +264,18 @@ export class SwerveManager implements ISwerveManager {
         `Getting webservice package ${packageName} and will run on port ${port}`,
       );
 
-      if (packageName) {
+      if (servicePath ?? packageName) {
         gLogger.debug(`Getting web service with name ${packageName}`);
       } else {
         gLogger.debug(`Getting webservice with path: ${servicePath}`);
       }
       let firstTool;
       try {
-        firstTool = await import(packageName ?? servicePath);
+        firstTool = await import(servicePath ?? packageName);
+        gLogger.info(`Imported from raw path ${servicePath}`);
       } catch (e: any) {
         gLogger.warn(
-          `Unable to import from raw tool path ${packageName ?? servicePath}, trying with import name. Err: ${e?.message}. Stack: ${e?.stack}`,
+          `Unable to import from raw tool path ${servicePath ?? packageName}, trying with import name. Err: ${e?.message}. Stack: ${e?.stack}`,
         );
       }
       const fullPath = await this.getImportName(packageName, servicePath);

package/src/utils/getPackageJson.ts

@@ -45,6 +45,7 @@ export function getPackageJson(
         //    console.log(entrypoint);
         //   console.error(`Entrypoint is ${entrypoint}`);
         //        throw `Entrypoint is ${entrypoint}`;
+        console.log(`dir name in ${entrypoint}`);
         return { packageJson, servicePath: entrypoint };
       }
       dir = path.dirname(dir);

package/src/utils/installWebservice.ts

@@ -1,16 +1,7 @@
-// @ts-ignore
-import express, { Request, Response } from "@swizzyweb/express";
-import {
-  BrowserLogger,
-  getPackageJsonFromDirectory,
-  ILogger,
-} from "@swizzyweb/swizzy-common";
-import { SwizzyWinstonLogger } from "@swizzyweb/swizzy-web-service";
-import { readFileSync } from "fs";
+import { ILogger } from "@swizzyweb/swizzy-common";
 import path from "node:path";
 import os from "node:os";
 import process from "node:process";
-import { getServiceNameFromCurrentDirPackage } from "./getArgs.js";
 import { mkdirSync } from "node:fs";
 import { fileURLToPath } from "node:url";