@swizzyweb/swerve-manager 0.1.9 → 0.2.0

package/dist/swerve.js

@@ -155,7 +155,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 +163,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swizzyweb/swerve-manager",
-  "version": "0.1.9",
+  "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",

package/src/swerve.ts

@@ -269,17 +269,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);