@swizzyweb/swerve-manager 0.3.2 → 0.3.4

package/deno.lock

@@ -1212,7 +1212,7 @@
     "packageJson": {
       "dependencies": [
         "npm:@swizzyweb/swizzy-common@~0.3.3",
-        "npm:@swizzyweb/swizzy-web-service@~0.6.1",
+        "npm:@swizzyweb/swizzy-web-service@0.6.2",
         "npm:@types/express@^5.0.6",
         "npm:@types/node@^22.18.6",
         "npm:@typescript-eslint/eslint-plugin@^8.54.0",

package/dist/swerve.js

@@ -1,3 +1,4 @@
+// @deno-types="npm:@types/express@5"
 import express from "express";
 import { getLoggerForService } from "./utils/index.js";
 import { SwizzyWinstonLogger, } from "@swizzyweb/swizzy-web-service";

package/dist/utils/getArgs.js

@@ -1,8 +1,9 @@
 import path from "node:path";
-import process from "node:process";
+import process, { cwd } from "node:process";
 import { SwerveConfigParser } from "../config/config-parser.js";
 import { deepMerge } from "@swizzyweb/swizzy-common";
 import { getPackageJson } from "./getPackageJson.js";
+import { existsSync, readFileSync } from "node:fs";
 function getHelpText() {
     return `Help --
 npm run server <serviceName> <port (optional)>
@@ -168,9 +169,16 @@ export async function getArgs(args, logger) {
             //        serviceEntry[1].servicePath ?? serviceEntry[1].packageName;
             if (!servicePath) {
                 serviceEntry[1].servicePath = packageName;
-                //        throw new Error(
-                //        `servicePath or packageName must be set in service configurations`,
-                //      );
+                const localPackage = path.join(cwd(), "node_modules", packageName);
+                const packageJsonPath = path.join(localPackage, "package.json");
+                if (existsSync(path.join(packageJsonPath))) {
+                    const json = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+                    const main = json.main;
+                    serviceEntry[1].servicePath = path.join(localPackage, main);
+                }
+                else {
+                    serviceEntry[1].servicePath = getPackageJson(packageName).servicePath;
+                }
             }
             else {
                 const serviceData = getService(servicePath, logger);

package/dist/utils/index.d.ts

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

package/dist/utils/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swizzyweb/swerve-manager",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "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",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@swizzyweb/swizzy-common": "^0.3.3",
-    "@swizzyweb/swizzy-web-service": "^0.6.1",
+    "@swizzyweb/swizzy-web-service": "0.6.2",
     "express": "^5.2.1"
   },
   "repository": {

package/src/swerve.ts

@@ -1,3 +1,4 @@
+// @deno-types="npm:@types/express@5"
 import express, { Application } from "express";
 import { getLoggerForService, SwerveArgs } from "./utils/index.js";
 import {

package/src/utils/getArgs.ts

@@ -1,11 +1,12 @@
 // @ts-ignore
 import { ILogger } from "@swizzyweb/swizzy-common";
 import path from "node:path";
-import process from "node:process";
+import process, { cwd } from "node:process";
 import { IConfig, IService, KeyValue } from "../config/index.js";
 import { SwerveConfigParser } from "../config/config-parser.js";
 import { deepMerge } from "@swizzyweb/swizzy-common";
 import { getPackageJson } from "./getPackageJson.js";
+import { existsSync, readFileSync } from "node:fs";
 
 function getHelpText() {
   return `Help --
@@ -202,9 +203,17 @@ export async function getArgs(
       //        serviceEntry[1].servicePath ?? serviceEntry[1].packageName;
       if (!servicePath) {
         serviceEntry[1].servicePath = packageName!;
-        //        throw new Error(
-        //        `servicePath or packageName must be set in service configurations`,
-        //      );
+        const localPackage = path.join(cwd(), "node_modules", packageName);
+        const packageJsonPath = path.join(localPackage, "package.json");
+        if (existsSync(path.join(packageJsonPath))) {
+          const json = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+          const main = json.main;
+          serviceEntry[1].servicePath = path.join(localPackage, main);
+        } else {
+          serviceEntry[1].servicePath = getPackageJson(
+            packageName!,
+          ).servicePath;
+        }
       } else {
         const serviceData = getService(servicePath, logger);
         serviceEntry[1].packageName = serviceData.packageJson?.name;

package/src/utils/index.ts

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

package/test/config/serviceConfig.json

@@ -9,7 +9,7 @@
         "hello": "world",
         "none": false
       },
-      "packageName": "@swizzyweb/my-first-web-service",
+      "packageName": "@swizzyweb/swizzy-web-service",
       "serviceConfiguration": {
         "port": 3001,
         "tableName": "someString"