@ingenyus/swarm-wasp 1.0.3 → 1.2.0

package/dist/generators/route/index.js

@@ -230,22 +230,102 @@ var TemplateUtility = class {
   }
 };
 
+// src/common/wasp-compatibility.ts
+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 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", {
+      encoding: "utf8",
+      stdio: "pipe"
+    });
+    const firstLine = output.split("\n")[0]?.trim();
+    if (!firstLine) {
+      logger.error(
+        "Unable to parse Wasp version from command output. Expected version number on first line."
+      );
+      throw new Error("Unable to parse Wasp version from command output");
+    }
+    if (!semver.valid(firstLine)) {
+      logger.error(
+        `Invalid Wasp version format: "${firstLine}". Expected a valid semver version (e.g., "0.18.2").`
+      );
+      throw new Error("Invalid Wasp version format");
+    }
+    return firstLine;
+  } catch (error) {
+    if (error.code === "ENOENT" || error.message?.includes("wasp")) {
+      logger.error(
+        "Wasp CLI not found. Install using: curl -sSL https://get.wasp.sh/installer.sh | sh -s"
+      );
+      throw new Error("Wasp CLI not found");
+    }
+    throw new Error("Unable to determine installed Wasp version");
+  }
+}
+function isTestEnvironment() {
+  return process.env.NODE_ENV === "test" || process.env.VITEST === "true" || typeof process.env.VITEST !== "undefined";
+}
+function assertWaspCompatible(logger) {
+  if (isTestEnvironment()) {
+    return;
+  }
+  const version = getInstalledWaspVersion(logger);
+  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 ${supportedRange}.`
+    );
+    throw new Error("Incompatible Wasp version");
+  }
+}
+
 // src/generators/base/component-generator.base.ts
 import {
   hasHelperMethodCall,
   toKebabCase as toKebabCase2
 } from "@ingenyus/swarm";
-import path6 from "path";
+import path7 from "path";
 
 // src/generators/feature/feature-generator.ts
 import { handleFatalError as handleFatalError2 } from "@ingenyus/swarm";
-import path5 from "path";
+import path6 from "path";
 
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  getConfigManager,
-  TemplateResolver
+  TemplateResolver,
+  getConfigManager
 } from "@ingenyus/swarm";
 
 // src/generators/config/wasp-config-generator.ts
@@ -254,14 +334,14 @@ import {
   handleFatalError,
   parseHelperMethodDefinition
 } from "@ingenyus/swarm";
-import path4 from "path";
+import path5 from "path";
 var WaspConfigGenerator = class {
   constructor(logger = getCLILogger(), fileSystem = realFileSystem) {
     this.logger = logger;
     this.fileSystem = fileSystem;
     this.templateUtility = new TemplateUtility(fileSystem);
   }
-  path = path4;
+  path = path5;
   templateUtility;
   /**
    * Gets the template path for feature config templates.
@@ -290,7 +370,7 @@ var WaspConfigGenerator = class {
       this.logger.error(`Template not found: ${templatePath}`);
       return;
     }
-    const configFilePath = path4.join(featureDir, `feature.wasp.ts`);
+    const configFilePath = path5.join(featureDir, `feature.wasp.ts`);
     if (this.fileSystem.existsSync(configFilePath)) {
       this.logger.warn(`Feature config already exists: ${configFilePath}`);
       return;
@@ -306,7 +386,7 @@ var WaspConfigGenerator = class {
    */
   update(featurePath, declaration) {
     const configDir = getFeatureDir(this.fileSystem, featurePath);
-    const configFilePath = path4.join(configDir, `feature.wasp.ts`);
+    const configFilePath = path5.join(configDir, `feature.wasp.ts`);
     if (!this.fileSystem.existsSync(configFilePath)) {
       const templatePath = this.getTemplatePath("feature.wasp.eta");
       if (!this.fileSystem.existsSync(templatePath)) {
@@ -702,6 +782,13 @@ var WaspGeneratorBase = class extends GeneratorBase {
     this.templateUtility = new TemplateUtility(this.fileSystem);
     this.templateResolver = new TemplateResolver(this.fileSystem);
   }
+  /**
+   * Ensures that the installed Wasp version is compatible with this package.
+   * Should be called at the start of generator execution.
+   */
+  ensureWaspCompatible() {
+    assertWaspCompatible(this.logger);
+  }
   async loadConfig() {
     if (this.configLoaded) return;
     const configManager = getConfigManager();
@@ -818,21 +905,22 @@ var FeatureGenerator = class extends WaspGeneratorBase {
    * @param target - The target path of the generated directory
    */
   async generate(args) {
+    this.ensureWaspCompatible();
     const { target } = args;
     const segments = validateFeaturePath(target);
     const normalisedPath = normaliseFeaturePath(target);
-    const sourceRoot = path5.join(findWaspRoot(this.fileSystem), "src");
+    const sourceRoot = path6.join(findWaspRoot(this.fileSystem), "src");
     if (segments.length > 1) {
       const parentPath = segments.slice(0, -1).join("/");
       const parentNormalisedPath = normaliseFeaturePath(parentPath);
-      const parentFeatureDir = path5.join(sourceRoot, parentNormalisedPath);
+      const parentFeatureDir = path6.join(sourceRoot, parentNormalisedPath);
       if (!this.fileSystem.existsSync(parentFeatureDir)) {
         handleFatalError2(
           `Parent feature '${parentPath}' does not exist. Please create it first.`
         );
       }
     }
-    const featureDir = path5.join(sourceRoot, normalisedPath);
+    const featureDir = path6.join(sourceRoot, normalisedPath);
     this.fileSystem.mkdirSync(featureDir, { recursive: true });
     this.configGenerator.generate(normalisedPath);
     this.logger.success(`Generated feature: ${normalisedPath}`);
@@ -867,7 +955,7 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
       const currentPath = pathSegments.join("/");
       const featureName = pathSegments[pathSegments.length - 1];
       const featureDir = getFeatureDir(this.fileSystem, currentPath);
-      const configPath = path6.join(featureDir, `feature.wasp.ts`);
+      const configPath = path7.join(featureDir, `feature.wasp.ts`);
       if (this.fileSystem.existsSync(configPath)) {
         return configPath;
       }
@@ -939,7 +1027,7 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
     const featureDir = getFeatureDir(this.fileSystem, normalisedPath);
     const typeKey = type.toLowerCase();
     const typeDirectory = TYPE_DIRECTORIES[typeKey];
-    const targetDirectory = path6.join(featureDir, typeDirectory);
+    const targetDirectory = path7.join(featureDir, typeDirectory);
     const importDirectory = `@src/${normalisedPath}/${typeDirectory}`;
     return { targetDirectory, importDirectory };
   }
@@ -1022,6 +1110,7 @@ var RouteGenerator = class extends ComponentGeneratorBase {
       this.componentType,
       routeName,
       async () => {
+        this.ensureWaspCompatible();
         const configPath = this.validateFeatureConfig(feature);
         const { targetDirectory } = this.ensureTargetDirectory(feature, "page");
         const targetFile = `${targetDirectory}/${fileName}`;

package/dist/generators/route/route-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-generator.d.ts","sourceRoot":"","sources":["../../../src/generators/route/route-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,GAAG,EAGJ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAwB,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,cAAe,SAAQ,sBAAsB,CACxD,OAAO,MAAM,EACb,OAAO,YAAY,CAAC,KAAK,CAC1B;IACC,SAAS,KAAK,aAAa,YAE1B;IAED,WAAW,SAAqC;IAChD,MAAM;;;;;;qCAAU;gBAEJ,QAAQ,EAAE,iBAAiB;IAIjC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAoBzC,gBAAgB;IAoB9B,OAAO,CAAC,gBAAgB;IAwBxB;;OAEG;IACH,aAAa,CACX,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,IAAI,UAAQ,GACX,MAAM;CAUV"}
+{"version":3,"file":"route-generator.d.ts","sourceRoot":"","sources":["../../../src/generators/route/route-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EACjB,GAAG,EAGJ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAwB,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,cAAe,SAAQ,sBAAsB,CACxD,OAAO,MAAM,EACb,OAAO,YAAY,CAAC,KAAK,CAC1B;IACC,SAAS,KAAK,aAAa,YAE1B;IAED,WAAW,SAAqC;IAChD,MAAM;;;;;;qCAAU;gBAEJ,QAAQ,EAAE,iBAAiB;IAIjC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAsBzC,gBAAgB;IAoB9B,OAAO,CAAC,gBAAgB;IAwBxB;;OAEG;IACH,aAAa,CACX,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,IAAI,UAAQ,GACX,MAAM;CAUV"}

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

@@ -230,22 +230,102 @@ var TemplateUtility = class {
   }
 };
 
+// src/common/wasp-compatibility.ts
+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 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", {
+      encoding: "utf8",
+      stdio: "pipe"
+    });
+    const firstLine = output.split("\n")[0]?.trim();
+    if (!firstLine) {
+      logger.error(
+        "Unable to parse Wasp version from command output. Expected version number on first line."
+      );
+      throw new Error("Unable to parse Wasp version from command output");
+    }
+    if (!semver.valid(firstLine)) {
+      logger.error(
+        `Invalid Wasp version format: "${firstLine}". Expected a valid semver version (e.g., "0.18.2").`
+      );
+      throw new Error("Invalid Wasp version format");
+    }
+    return firstLine;
+  } catch (error) {
+    if (error.code === "ENOENT" || error.message?.includes("wasp")) {
+      logger.error(
+        "Wasp CLI not found. Install using: curl -sSL https://get.wasp.sh/installer.sh | sh -s"
+      );
+      throw new Error("Wasp CLI not found");
+    }
+    throw new Error("Unable to determine installed Wasp version");
+  }
+}
+function isTestEnvironment() {
+  return process.env.NODE_ENV === "test" || process.env.VITEST === "true" || typeof process.env.VITEST !== "undefined";
+}
+function assertWaspCompatible(logger) {
+  if (isTestEnvironment()) {
+    return;
+  }
+  const version = getInstalledWaspVersion(logger);
+  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 ${supportedRange}.`
+    );
+    throw new Error("Incompatible Wasp version");
+  }
+}
+
 // src/generators/base/component-generator.base.ts
 import {
   hasHelperMethodCall,
   toKebabCase as toKebabCase2
 } from "@ingenyus/swarm";
-import path6 from "path";
+import path7 from "path";
 
 // src/generators/feature/feature-generator.ts
 import { handleFatalError as handleFatalError2 } from "@ingenyus/swarm";
-import path5 from "path";
+import path6 from "path";
 
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  getConfigManager,
-  TemplateResolver
+  TemplateResolver,
+  getConfigManager
 } from "@ingenyus/swarm";
 
 // src/generators/config/wasp-config-generator.ts
@@ -254,14 +334,14 @@ import {
   handleFatalError,
   parseHelperMethodDefinition
 } from "@ingenyus/swarm";
-import path4 from "path";
+import path5 from "path";
 var WaspConfigGenerator = class {
   constructor(logger = getCLILogger(), fileSystem = realFileSystem) {
     this.logger = logger;
     this.fileSystem = fileSystem;
     this.templateUtility = new TemplateUtility(fileSystem);
   }
-  path = path4;
+  path = path5;
   templateUtility;
   /**
    * Gets the template path for feature config templates.
@@ -290,7 +370,7 @@ var WaspConfigGenerator = class {
       this.logger.error(`Template not found: ${templatePath}`);
       return;
     }
-    const configFilePath = path4.join(featureDir, `feature.wasp.ts`);
+    const configFilePath = path5.join(featureDir, `feature.wasp.ts`);
     if (this.fileSystem.existsSync(configFilePath)) {
       this.logger.warn(`Feature config already exists: ${configFilePath}`);
       return;
@@ -306,7 +386,7 @@ var WaspConfigGenerator = class {
    */
   update(featurePath, declaration) {
     const configDir = getFeatureDir(this.fileSystem, featurePath);
-    const configFilePath = path4.join(configDir, `feature.wasp.ts`);
+    const configFilePath = path5.join(configDir, `feature.wasp.ts`);
     if (!this.fileSystem.existsSync(configFilePath)) {
       const templatePath = this.getTemplatePath("feature.wasp.eta");
       if (!this.fileSystem.existsSync(templatePath)) {
@@ -702,6 +782,13 @@ var WaspGeneratorBase = class extends GeneratorBase {
     this.templateUtility = new TemplateUtility(this.fileSystem);
     this.templateResolver = new TemplateResolver(this.fileSystem);
   }
+  /**
+   * Ensures that the installed Wasp version is compatible with this package.
+   * Should be called at the start of generator execution.
+   */
+  ensureWaspCompatible() {
+    assertWaspCompatible(this.logger);
+  }
   async loadConfig() {
     if (this.configLoaded) return;
     const configManager = getConfigManager();
@@ -818,21 +905,22 @@ var FeatureGenerator = class extends WaspGeneratorBase {
    * @param target - The target path of the generated directory
    */
   async generate(args) {
+    this.ensureWaspCompatible();
     const { target } = args;
     const segments = validateFeaturePath(target);
     const normalisedPath = normaliseFeaturePath(target);
-    const sourceRoot = path5.join(findWaspRoot(this.fileSystem), "src");
+    const sourceRoot = path6.join(findWaspRoot(this.fileSystem), "src");
     if (segments.length > 1) {
       const parentPath = segments.slice(0, -1).join("/");
       const parentNormalisedPath = normaliseFeaturePath(parentPath);
-      const parentFeatureDir = path5.join(sourceRoot, parentNormalisedPath);
+      const parentFeatureDir = path6.join(sourceRoot, parentNormalisedPath);
       if (!this.fileSystem.existsSync(parentFeatureDir)) {
         handleFatalError2(
           `Parent feature '${parentPath}' does not exist. Please create it first.`
         );
       }
     }
-    const featureDir = path5.join(sourceRoot, normalisedPath);
+    const featureDir = path6.join(sourceRoot, normalisedPath);
     this.fileSystem.mkdirSync(featureDir, { recursive: true });
     this.configGenerator.generate(normalisedPath);
     this.logger.success(`Generated feature: ${normalisedPath}`);
@@ -867,7 +955,7 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
       const currentPath = pathSegments.join("/");
       const featureName = pathSegments[pathSegments.length - 1];
       const featureDir = getFeatureDir(this.fileSystem, currentPath);
-      const configPath = path6.join(featureDir, `feature.wasp.ts`);
+      const configPath = path7.join(featureDir, `feature.wasp.ts`);
       if (this.fileSystem.existsSync(configPath)) {
         return configPath;
       }
@@ -939,7 +1027,7 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
     const featureDir = getFeatureDir(this.fileSystem, normalisedPath);
     const typeKey = type.toLowerCase();
     const typeDirectory = TYPE_DIRECTORIES[typeKey];
-    const targetDirectory = path6.join(featureDir, typeDirectory);
+    const targetDirectory = path7.join(featureDir, typeDirectory);
     const importDirectory = `@src/${normalisedPath}/${typeDirectory}`;
     return { targetDirectory, importDirectory };
   }
@@ -1022,6 +1110,7 @@ var RouteGenerator = class extends ComponentGeneratorBase {
       this.componentType,
       routeName,
       async () => {
+        this.ensureWaspCompatible();
         const configPath = this.validateFeatureConfig(feature);
         const { targetDirectory } = this.ensureTargetDirectory(feature, "page");
         const targetFile = `${targetDirectory}/${fileName}`;

package/dist/generators/route/schema.js

@@ -104,6 +104,13 @@ var commonFieldMetadata = {
 import { toKebabCase } from "@ingenyus/swarm";
 import { Eta } from "eta";
 
+// src/common/wasp-compatibility.ts
+import { findPackageJson, getVersion } from "@ingenyus/swarm";
+import { execSync } from "child_process";
+import path2 from "path";
+import { fileURLToPath } from "url";
+import * as semver from "semver";
+
 // src/generators/route/schema.ts
 var baseSchema = z2.object({
   feature: commonSchemas.feature,