@swizzyweb/swerve-manager 0.1.8 → 0.2.0

package/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2025 SwizzyWeb
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package/dist/swerve.js

@@ -155,14 +155,22 @@ 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 {
                 gLogger.debug(`Getting webservice with path: ${servicePath}`);
             }
+            let firstTool;
+            try {
+                firstTool = await import(servicePath ?? packageName);
+                gLogger.info(`Imported from raw path ${servicePath}`);
+            }
+            catch (e) {
+                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 = await import(fullPath);
+            const tool = firstTool ?? (await import(fullPath));
             gLogger.debug(`Got service with require: ${JSON.stringify(tool)}`);
             gLogger.debug(`Getting web service from tool...`);
             const appDataPath = path.join(appDataRoot, "appdata", serviceKey);

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swizzyweb/swerve-manager",
-  "version": "0.1.8",
+  "version": "0.2.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",
@@ -22,8 +22,8 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@swizzyweb/swizzy-common": "^0.3.2",
-    "@swizzyweb/swizzy-web-service": "^0.5.4",
+    "@swizzyweb/swizzy-common": "^0.3.3",
+    "@swizzyweb/swizzy-web-service": "^0.5.5",
     "bun": "^1.2.22",
     "deno": "^2.5.2"
   },

package/src/swerve.ts

@@ -269,14 +269,22 @@ 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(servicePath ?? packageName);
+        gLogger.info(`Imported from raw path ${servicePath}`);
+      } catch (e: any) {
+        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 = await import(fullPath);
+      const tool = firstTool ?? (await import(fullPath));
 
       gLogger.debug(`Got service with require: ${JSON.stringify(tool)}`);
       gLogger.debug(`Getting web service from tool...`);

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/tsconfig.eslint.json

@@ -0,0 +1,13 @@
+// tsconfig.eslint.json
+{
+  "extends": "./tsconfig.json",
+  "include": [
+    "test/**/*", // Include your test files
+    "src/**/*" // Include your source files
+  ],
+  "exclude": [
+    // Ensure you exclude the dist folder, test files from build, etc.
+    "dist/**/*",
+    "**/*.spec.ts"
+  ]
+}