@swizzyweb/swerve 0.5.7 → 0.5.8

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

@@ -147,18 +147,25 @@ export class SwerveManager {
         try {
             gLogger.info(`Getting webservice package ${packageName} and will run on port ${port}`);
             gLogger.debug(`Getting tool with path: ${importPathOrName}`);
-            const fullPath = await getFullImportPath(importPathOrName);
-            const tool = await import(fullPath); //require(fullPath); //require(packageName as string);
-            gLogger.debug(`Got service with require: ${JSON.stringify(tool)}`);
-            gLogger.debug(`Getting web service from tool...`);
+            let tool;
+            try {
+                gLogger.debug(`Got service with require: ${JSON.stringify(tool)}`);
+                gLogger.debug(`Getting web service from tool...`);
+                tool = await import(importPathOrName);
+            }
+            catch (e) {
+                gLogger.warn(`Error importing raw import path ${importPathOrName}, attempting again with fullImportPath. Err: ${e?.message}, stack: ${e?.stack}`);
+                const fullPath = await getFullImportPath(importPathOrName);
+                tool = await import(fullPath); //require(fullPath); //require(packageName as string);
+            }
             const appDataPath = path.join(appDataRoot, "appdata", serviceKey);
             mkdirSync(appDataPath, { recursive: true });
             const logger = getLoggerForService(serviceArgs, serviceKey, port, gLogger);
             gLogger.debug(`serviceArgs for ${packageName}: ${serviceArgs}`);
             const service = await tool.getWebservice({
                 appDataPath,
-                ...serviceArgs,
                 port,
+                ...serviceArgs,
                 app,
                 packageName,
                 serviceArgs: { ...serviceArgs },

package/dist/utils/getPackageJson.js

@@ -24,7 +24,6 @@ export function getPackageJson(packageNameOrPath) {
             : import.meta.resolve(packageNameOrPath);
         // Step 2: Traverse upward to find the nearest package.json
         let dir = fileURLToPath(resolvedEntry); //path.dirname(resolvedEntry);
-        console.log(dir);
         while (dir !== path.parse(dir).root) {
             const pkgPath = path.join(dir, "package.json");
             if (fs.existsSync(pkgPath)) {
@@ -36,10 +35,7 @@ export function getPackageJson(packageNameOrPath) {
                 else if (dir.startsWith(".")) {
                     dir = path.join(process.cwd(), dir);
                 }
-                console.log(dir);
                 const entrypoint = path.join(dir, packageJson.main);
-                console.log(entrypoint);
-                console.error(`Entrypoint is ${entrypoint}`);
                 //        throw `Entrypoint is ${entrypoint}`;
                 return { packageJson, servicePath: entrypoint };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swizzyweb/swerve",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "swizzy-swerve is a bootstrapper for swizzy web services. This package will bootstrap and run independent swizzy web services.",
   "main": "dist/index.js",
   "type": "module",
@@ -37,9 +37,9 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@swizzyweb/swerve-manager": "^0.1.8",
-    "@swizzyweb/swizzy-common": "^0.3.2",
-    "@swizzyweb/swizzy-web-service": "^0.5.4",
+    "@swizzyweb/swerve-manager": "^0.1.9",
+    "@swizzyweb/swizzy-common": "^0.3.3",
+    "@swizzyweb/swizzy-web-service": "^0.5.5",
     "bun": "^1.2.22",
     "deno": "^2.5.2"
   },