@ingenyus/swarm-wasp 1.0.3 → 1.2.0

package/dist/generators/index.js

@@ -396,22 +396,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
@@ -420,14 +500,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.
@@ -456,7 +536,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;
@@ -472,7 +552,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)) {
@@ -868,6 +948,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();
@@ -984,21 +1071,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}`);
@@ -1033,7 +1121,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;
       }
@@ -1105,7 +1193,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 };
   }
@@ -1471,6 +1559,7 @@ var ActionGenerator = class extends OperationGeneratorBase {
       this.componentType,
       operationName,
       async () => {
+        this.ensureWaspCompatible();
         const configPath = this.validateFeatureConfig(feature);
         const { targetDirectory: operationsDir, importDirectory } = this.ensureTargetDirectory(feature, operationType);
         const importPath = `${importDirectory}/${operationName}`;
@@ -1565,6 +1654,7 @@ var ApiGenerator = class extends ComponentGeneratorBase {
   async generate(args) {
     const apiName = toCamelCase(args.name);
     return this.handleGeneratorError(this.componentType, apiName, async () => {
+      this.ensureWaspCompatible();
       const configPath = this.validateFeatureConfig(args.feature);
       const {
         targetDirectory: apiTargetDirectory,
@@ -1611,7 +1701,7 @@ var ApiGenerator = class extends ComponentGeneratorBase {
       force = false,
       entities,
       method,
-      path: path8,
+      path: path9,
       auth,
       customMiddleware
     } = args;
@@ -1621,7 +1711,7 @@ var ApiGenerator = class extends ComponentGeneratorBase {
       feature,
       Array.isArray(entities) ? entities : entities ? [entities] : [],
       method,
-      path8,
+      path9,
       apiFile,
       auth,
       importPath,
@@ -1677,7 +1767,7 @@ var ApiGenerator = class extends ComponentGeneratorBase {
 
 // src/generators/api-namespace/api-namespace-generator.ts
 import { toCamelCase as toCamelCase2 } from "@ingenyus/swarm";
-import path7 from "path";
+import path8 from "path";
 
 // src/generators/api-namespace/schema.ts
 import { registerSchemaMetadata as registerSchemaMetadata4 } from "@ingenyus/swarm";
@@ -1714,12 +1804,13 @@ var ApiNamespaceGenerator = class extends ComponentGeneratorBase {
       this.componentType,
       namespaceName,
       async () => {
+        this.ensureWaspCompatible();
         const configPath = this.validateFeatureConfig(feature);
         const {
           targetDirectory: apiTargetDirectory,
           importDirectory: apiImportDirectory
         } = this.ensureTargetDirectory(feature, "api");
-        const middlewareTargetDirectory = path7.join(
+        const middlewareTargetDirectory = path8.join(
           apiTargetDirectory,
           "middleware"
         );
@@ -1871,6 +1962,7 @@ var CrudGenerator = class extends OperationGeneratorBase {
     const crudName = name || toCamelCase3(getPlural2(dataType));
     const crudType = toPascalCase4(crudName);
     return this.handleGeneratorError(this.componentType, crudName, async () => {
+      this.ensureWaspCompatible();
       const configPath = this.validateFeatureConfig(feature);
       const { targetDirectory } = this.ensureTargetDirectory(
         feature,
@@ -2119,6 +2211,7 @@ var JobGenerator = class extends ComponentGeneratorBase {
   async generate(args) {
     const jobName = toCamelCase4(args.name);
     return this.handleGeneratorError(this.componentType, jobName, async () => {
+      this.ensureWaspCompatible();
       const configPath = this.validateFeatureConfig(args.feature);
       const { targetDirectory } = this.ensureTargetDirectory(
         args.feature,
@@ -2260,6 +2353,7 @@ var QueryGenerator = class extends OperationGeneratorBase {
       this.componentType,
       operationName,
       async () => {
+        this.ensureWaspCompatible();
         const configPath = this.validateFeatureConfig(feature);
         const { targetDirectory: operationsDir, importDirectory } = this.ensureTargetDirectory(feature, operationType);
         const importPath = `${importDirectory}/${operationName}`;
@@ -2336,6 +2430,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/job/index.js

@@ -224,22 +224,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
@@ -248,14 +328,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.
@@ -284,7 +364,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;
@@ -300,7 +380,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)) {
@@ -696,6 +776,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();
@@ -812,21 +899,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}`);
@@ -861,7 +949,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;
       }
@@ -933,7 +1021,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 };
   }
@@ -1078,6 +1166,7 @@ var JobGenerator = class extends ComponentGeneratorBase {
   async generate(args) {
     const jobName = toCamelCase(args.name);
     return this.handleGeneratorError(this.componentType, jobName, async () => {
+      this.ensureWaspCompatible();
       const configPath = this.validateFeatureConfig(args.feature);
       const { targetDirectory } = this.ensureTargetDirectory(
         args.feature,

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

@@ -1 +1 @@
-{"version":3,"file":"job-generator.d.ts","sourceRoot":"","sources":["../../../src/generators/job/job-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EACjB,GAAG,EAEJ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,YAAa,SAAQ,sBAAsB,CACtD,OAAO,MAAM,EACb,OAAO,YAAY,CAAC,GAAG,CACxB;IACC,SAAS,KAAK,aAAa,UAE1B;IAED,WAAW,SAA0B;IACrC,MAAM;;;;;;;qCAAU;gBAEJ,QAAQ,EAAE,iBAAiB;IAIjC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAgBzC,eAAe;IA4B7B,OAAO,CAAC,gBAAgB;IA6BxB;;OAEG;IACH,aAAa,CACX,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAAE,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,MAAM;CAUV"}
+{"version":3,"file":"job-generator.d.ts","sourceRoot":"","sources":["../../../src/generators/job/job-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EACjB,GAAG,EAEJ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,YAAa,SAAQ,sBAAsB,CACtD,OAAO,MAAM,EACb,OAAO,YAAY,CAAC,GAAG,CACxB;IACC,SAAS,KAAK,aAAa,UAE1B;IAED,WAAW,SAA0B;IACrC,MAAM;;;;;;;qCAAU;gBAEJ,QAAQ,EAAE,iBAAiB;IAIjC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAkBzC,eAAe;IA4B7B,OAAO,CAAC,gBAAgB;IA6BxB;;OAEG;IACH,aAAa,CACX,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAAE,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,MAAM;CAUV"}