@ingenyus/swarm-wasp 1.1.0 → 1.2.0

package/dist/generators/route/route-generator.js

@@ -231,14 +231,36 @@ var TemplateUtility = class {
 };
 
 // src/common/wasp-compatibility.ts
-import { getVersion } from "@ingenyus/swarm";
+import { findPackageJson, getVersion } from "@ingenyus/swarm";
 import { execSync } from "child_process";
 import path4 from "path";
 import { fileURLToPath } from "url";
 import * as semver from "semver";
-var waspCompatibility = {
-  supportedRange: ">=0.18.0 <0.20.0"
-};
+var cachedSupportedRange = null;
+function getWaspSupportedRange() {
+  if (cachedSupportedRange) {
+    return cachedSupportedRange;
+  }
+  const currentFile = fileURLToPath(import.meta.url);
+  const currentDir = path4.dirname(currentFile);
+  const result = findPackageJson(currentDir, {
+    packageName: "@ingenyus/swarm-wasp"
+  });
+  if (!result) {
+    throw new Error(
+      "Unable to find package.json for @ingenyus/swarm-wasp. Wasp supported version range must be specified in swarm.wasp field."
+    );
+  }
+  const swarm = result.packageJson.swarm;
+  const waspRange = swarm?.wasp;
+  if (!waspRange) {
+    throw new Error(
+      `Wasp supported version range not found in package.json. Please specify swarm.wasp field in @ingenyus/swarm-wasp package.json (e.g., "swarm": { "wasp": ">=0.18.0 <0.20.0" }).`
+    );
+  }
+  cachedSupportedRange = waspRange;
+  return cachedSupportedRange;
+}
 function getInstalledWaspVersion(logger) {
   try {
     const output = execSync("wasp version", {
@@ -277,11 +299,12 @@ function assertWaspCompatible(logger) {
     return;
   }
   const version = getInstalledWaspVersion(logger);
-  if (!semver.satisfies(version, waspCompatibility.supportedRange)) {
+  const supportedRange = getWaspSupportedRange();
+  if (!semver.satisfies(version, supportedRange)) {
     const startDir = path4.dirname(fileURLToPath(import.meta.url));
     const packageVersion = getVersion("@ingenyus/swarm-wasp", startDir);
     logger.error(
-      `Incompatible Wasp version detected: ${version}. @ingenyus/swarm-wasp@${packageVersion} supports Wasp ${waspCompatibility.supportedRange}.`
+      `Incompatible Wasp version detected: ${version}. @ingenyus/swarm-wasp@${packageVersion} supports Wasp ${supportedRange}.`
     );
     throw new Error("Incompatible Wasp version");
   }

package/dist/generators/route/schema.js

@@ -105,7 +105,7 @@ import { toKebabCase } from "@ingenyus/swarm";
 import { Eta } from "eta";
 
 // src/common/wasp-compatibility.ts
-import { getVersion } from "@ingenyus/swarm";
+import { findPackageJson, getVersion } from "@ingenyus/swarm";
 import { execSync } from "child_process";
 import path2 from "path";
 import { fileURLToPath } from "url";

package/dist/index.js

@@ -397,14 +397,36 @@ var TemplateUtility = class {
 };
 
 // src/common/wasp-compatibility.ts
-import { getVersion } from "@ingenyus/swarm";
+import { findPackageJson, getVersion } from "@ingenyus/swarm";
 import { execSync } from "child_process";
 import path4 from "path";
 import { fileURLToPath } from "url";
 import * as semver from "semver";
-var waspCompatibility = {
-  supportedRange: ">=0.18.0 <0.20.0"
-};
+var cachedSupportedRange = null;
+function getWaspSupportedRange() {
+  if (cachedSupportedRange) {
+    return cachedSupportedRange;
+  }
+  const currentFile = fileURLToPath(import.meta.url);
+  const currentDir = path4.dirname(currentFile);
+  const result = findPackageJson(currentDir, {
+    packageName: "@ingenyus/swarm-wasp"
+  });
+  if (!result) {
+    throw new Error(
+      "Unable to find package.json for @ingenyus/swarm-wasp. Wasp supported version range must be specified in swarm.wasp field."
+    );
+  }
+  const swarm = result.packageJson.swarm;
+  const waspRange = swarm?.wasp;
+  if (!waspRange) {
+    throw new Error(
+      `Wasp supported version range not found in package.json. Please specify swarm.wasp field in @ingenyus/swarm-wasp package.json (e.g., "swarm": { "wasp": ">=0.18.0 <0.20.0" }).`
+    );
+  }
+  cachedSupportedRange = waspRange;
+  return cachedSupportedRange;
+}
 function getInstalledWaspVersion(logger) {
   try {
     const output = execSync("wasp version", {
@@ -443,11 +465,12 @@ function assertWaspCompatible(logger) {
     return;
   }
   const version = getInstalledWaspVersion(logger);
-  if (!semver.satisfies(version, waspCompatibility.supportedRange)) {
+  const supportedRange = getWaspSupportedRange();
+  if (!semver.satisfies(version, supportedRange)) {
     const startDir = path4.dirname(fileURLToPath(import.meta.url));
     const packageVersion = getVersion("@ingenyus/swarm-wasp", startDir);
     logger.error(
-      `Incompatible Wasp version detected: ${version}. @ingenyus/swarm-wasp@${packageVersion} supports Wasp ${waspCompatibility.supportedRange}.`
+      `Incompatible Wasp version detected: ${version}. @ingenyus/swarm-wasp@${packageVersion} supports Wasp ${supportedRange}.`
     );
     throw new Error("Incompatible Wasp version");
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ingenyus/swarm-wasp",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Wasp-specific plugins for Swarm - Feature generators, commands, MCP tools, and enhanced Wasp configuration for Wasp development",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,13 +37,16 @@
     "url": "https://github.com/Genyus/swarm/issues"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.12.0"
+  },
+  "swarm": {
+    "wasp": ">=0.18.0 <0.21.0"
   },
   "dependencies": {
     "@mrleebo/prisma-ast": "^0.13.1",
     "eta": "^4.4.1",
     "semver": "^7.6.3",
-    "@ingenyus/swarm": "1.0.3"
+    "@ingenyus/swarm": "1.0.4"
   },
   "peerDependencies": {
     "wasp-config": "*",