@swizzyweb/swerve-manager 0.1.3 → 0.1.5

package/dist/swerve.js

@@ -1,11 +1,12 @@
 // @ts-ignore
 import express from "@swizzyweb/express";
-import { getFullImportPath, getLoggerForService, } from "./utils/index.js";
+import { getLoggerForService, } from "./utils/index.js";
 import { SwizzyWinstonLogger, } from "@swizzyweb/swizzy-web-service";
 import os from "node:os";
 import process from "node:process";
 import path from "node:path";
 import { mkdirSync } from "node:fs";
+import { getFullImportPath } from "./utils/getFullImportPath.js";
 export var InstanceType;
 (function (InstanceType) {
     InstanceType["webservice"] = "webservice";
@@ -50,7 +51,8 @@ export class SwerveManager {
                 }
                 const app = this.apps[`${port}`].app;
                 const service = serviceEntry[1];
-                const packageName = serviceEntry[0];
+                const serviceName = serviceEntry[0];
+                const packageName = service.packageName;
                 const importPathOrName = service.servicePath ?? service.packageName;
                 gLogger.debug(`importPathOrName ${importPathOrName}`);
                 const serviceArgs = {
@@ -146,8 +148,13 @@ export class SwerveManager {
         const { app, appDataRoot, packageName, port, gLogger, serviceArgs, importPathOrName, serviceKey, } = props;
         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);
+            if (packageName) {
+                gLogger.debug(`Getting web service with name ${packageName}`);
+            }
+            else {
+                gLogger.debug(`Getting webservice with path: ${importPathOrName}`);
+            }
+            const fullPath = packageName ?? (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...`);

package/dist/utils/getFullImportPath.d.ts

@@ -0,0 +1 @@
+export declare function getFullImportPath(importPathOrName: string): Promise<string>;

package/dist/utils/getFullImportPath.js

@@ -0,0 +1,53 @@
+// cross-runtime getFullImportPath.ts
+// Runtime detection
+// @ts-ignore
+const isDeno = typeof Deno !== "undefined" && "cwd" in Deno;
+// @ts-ignore
+const isBun = typeof Bun !== "undefined";
+// @ts-ignore
+const isNode = !isDeno && !isBun;
+let join;
+let cwd;
+let fromFileUrl;
+// --- Runtime-specific shims ---
+if (isDeno) {
+    // @ts-ignore
+    // const path = await import("https://deno.land/std@0.203.0/path/mod.ts");
+    const path = await import("node:path");
+    join = path.join;
+    const url = await import("node:url");
+    // @ts-ignore
+    cwd = Deno.cwd;
+    fromFileUrl = url.fileURLToPath;
+    //  fromFileUrl = path.fromFileUrl;
+}
+else if (isNode) {
+    const path = await import("node:path");
+    const processMod = await import("node:process");
+    const url = await import("node:url");
+    join = path.join;
+    cwd = processMod.cwd;
+    fromFileUrl = url.fileURLToPath;
+}
+else if (isBun) {
+    const path = await import("path");
+    join = path.join;
+    cwd = () => process.cwd();
+    fromFileUrl = (u) => new URL(u).pathname; // Bun auto normalizes
+}
+// --- Universal function ---
+export async function getFullImportPath(importPathOrName) {
+    let importPath;
+    if (importPathOrName.startsWith(".")) {
+        importPath = join(cwd(), importPathOrName);
+    }
+    else {
+        importPath = importPathOrName;
+    }
+    if (importPathOrName === importPath) {
+        // Turn into a full absolute path
+        const fullUrl = new URL(importPath, import.meta.url).href;
+        return fromFileUrl(fullUrl);
+    }
+    return importPath;
+}

package/dist/utils/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./getArgs.js";
 export * from "./installWebservice.js";
+export * from "./getFullImportPath.js";

package/dist/utils/index.js

@@ -1,2 +1,3 @@
 export * from "./getArgs.js";
 export * from "./installWebservice.js";
+export * from "./getFullImportPath.js";

package/dist/utils/installWebservice.d.ts

@@ -1,4 +1,3 @@
 import { ILogger } from "@swizzyweb/swizzy-common";
 export declare function installWebService(appName: string, importPathOrName: string, port: number, expressApp: any, serviceArgs: any, gLogger: ILogger<any>): Promise<any>;
-export declare function getFullImportPath(importPathOrName: string): Promise<string>;
 export declare function getLoggerForService(serviceArgs: any, appName: string, port: number, gLogger: ILogger<any>): ILogger<any>;

package/dist/utils/installWebservice.js

@@ -45,7 +45,7 @@ Failed to install web service, is it installed with NPM? Check package exists in
         throw Error(exceptionMessage); //new Error(exceptionMessage);
     }
 }
-export async function getFullImportPath(importPathOrName) {
+async function getFullImportPath(importPathOrName) {
     const importPath = importPathOrName.startsWith(".")
         ? path.join(process.cwd(), importPathOrName)
         : importPathOrName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swizzyweb/swerve-manager",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "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",
@@ -9,26 +9,24 @@
     "build": "tsc",
     "server:ts": "ts-node ./src/bootstrap.ts",
     "server": "node dist/bootstrap.js",
-    "test": "node --test ./test**/*.spec.ts",
+    "test": "npm run test:node && npm run test:bun && npm run test:deno",
+    "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"
   },
   "author": "Jason Gallagher",
   "license": "Apache-2.0",
   "devDependencies": {
     "@swizzyweb/express": "^4.19.2",
-    "@types/jest": "^29.5.14",
     "@types/node": "^22.7.7",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.3.2",
     "typescript": "^5.6.3"
   },
   "dependencies": {
-    "@swizzyweb/swerve-manager": "^0.1.2",
     "@swizzyweb/swizzy-common": "^0.3.2",
     "@swizzyweb/swizzy-web-service": "^0.5.3",
     "bun": "^1.2.15",
-    "deno": "^2.3.6",
-    "ts-node": "^10.9.2"
+    "deno": "^2.3.6"
   },
   "repository": {
     "type": "git",

package/src/swerve.ts

@@ -1,7 +1,6 @@
 // @ts-ignore
 import express, { Application } from "@swizzyweb/express";
 import {
-  getFullImportPath,
   getLoggerForService,
   installWebService,
   SwerveArgs,
@@ -17,6 +16,7 @@ import process from "node:process";
 import { ILogger } from "@swizzyweb/swizzy-common";
 import path from "node:path";
 import { mkdirSync } from "node:fs";
+import { getFullImportPath } from "./utils/getFullImportPath.js";
 
 export interface ISwerveManager {
   run(request: RunRequest): Promise<RunResponse>;
@@ -126,7 +126,8 @@ export class SwerveManager implements ISwerveManager {
         const app = this.apps[`${port}`].app;
 
         const service = serviceEntry[1];
-        const packageName = serviceEntry[0];
+        const serviceName = serviceEntry[0];
+        const packageName = service.packageName;
         const importPathOrName = service.servicePath ?? service.packageName;
         gLogger.debug(`importPathOrName ${importPathOrName}`);
         const serviceArgs: SwerveArgs = {
@@ -257,9 +258,13 @@ export class SwerveManager implements ISwerveManager {
         `Getting webservice package ${packageName} and will run on port ${port}`,
       );
 
-      gLogger.debug(`Getting tool with path: ${importPathOrName}`);
-
-      const fullPath = await getFullImportPath(importPathOrName);
+      if (packageName) {
+        gLogger.debug(`Getting web service with name ${packageName}`);
+      } else {
+        gLogger.debug(`Getting webservice with path: ${importPathOrName}`);
+      }
+      const fullPath =
+        packageName ?? (await getFullImportPath(importPathOrName));
       const tool = await import(fullPath); //require(fullPath); //require(packageName as string);
 
       gLogger.debug(`Got service with require: ${JSON.stringify(tool)}`);

package/src/utils/getFullImportPath.ts

@@ -0,0 +1,60 @@
+// cross-runtime getFullImportPath.ts
+
+// Runtime detection
+// @ts-ignore
+const isDeno = typeof Deno !== "undefined" && "cwd" in Deno;
+// @ts-ignore
+const isBun = typeof Bun !== "undefined";
+// @ts-ignore
+const isNode = !isDeno && !isBun;
+
+let join: (a: string, b: string) => string;
+let cwd: () => string;
+let fromFileUrl: (url: string) => string;
+
+// --- Runtime-specific shims ---
+if (isDeno) {
+  // @ts-ignore
+  // const path = await import("https://deno.land/std@0.203.0/path/mod.ts");
+
+  const path = await import("node:path");
+  join = path.join;
+  const url = await import("node:url");
+  // @ts-ignore
+  cwd = Deno.cwd;
+  fromFileUrl = url.fileURLToPath;
+  //  fromFileUrl = path.fromFileUrl;
+} else if (isNode) {
+  const path = await import("node:path");
+  const processMod = await import("node:process");
+  const url = await import("node:url");
+  join = path.join;
+  cwd = processMod.cwd;
+  fromFileUrl = url.fileURLToPath;
+} else if (isBun) {
+  const path = await import("path");
+  join = path.join;
+  cwd = () => process.cwd();
+  fromFileUrl = (u: string) => new URL(u).pathname; // Bun auto normalizes
+}
+
+// --- Universal function ---
+export async function getFullImportPath(
+  importPathOrName: string,
+): Promise<string> {
+  let importPath: string;
+
+  if (importPathOrName.startsWith(".")) {
+    importPath = join(cwd(), importPathOrName);
+  } else {
+    importPath = importPathOrName;
+  }
+
+  if (importPathOrName === importPath) {
+    // Turn into a full absolute path
+    const fullUrl = new URL(importPath, import.meta.url).href;
+    return fromFileUrl(fullUrl);
+  }
+
+  return importPath;
+}

package/src/utils/index.ts

@@ -1,2 +1,3 @@
 export * from "./getArgs.js";
 export * from "./installWebservice.js";
+export * from "./getFullImportPath.js";

package/src/utils/installWebservice.ts

@@ -79,9 +79,7 @@ Failed to install web service, is it installed with NPM? Check package exists in
   }
 }
 
-export async function getFullImportPath(
-  importPathOrName: string,
-): Promise<string> {
+async function getFullImportPath(importPathOrName: string): Promise<string> {
   const importPath = importPathOrName.startsWith(".")
     ? path.join(process.cwd(), importPathOrName)
     : importPathOrName;

package/test/getFullImportPath.spec.ts

@@ -0,0 +1,16 @@
+import test from "node:test";
+import { getFullImportPath } from "../dist/utils/getFullImportPath.js";
+import assert from "node:assert";
+import path from "node:path";
+
+test("Should get full path with relative path", async () => {
+  const fullPath = await getFullImportPath("../");
+  assert(path.isAbsolute(fullPath));
+});
+
+test("Should get full path from packageName", async () => {
+  const fullPath = await getFullImportPath(
+    "@swizzyweb/swap-cache-db-web-service",
+  );
+  assert(path.isAbsolute(fullPath));
+});

package/jest.config.js

@@ -1,4 +0,0 @@
-module.exports = {
-  preset: "ts-jest",
-  testEnvironment: "node",
-};