@ingenyus/swarm-wasp 0.2.1 → 0.2.3

package/dist/generators/job/index.js

@@ -29,8 +29,8 @@ var CONFIG_TYPES = {
 
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -199,17 +199,12 @@ var TemplateUtility = class {
 };
 
 // src/generators/feature/feature-generator.ts
-import {
-  handleFatalError as handleFatalError2,
-  logger as singletonLogger3,
-  validateFeaturePath as validateFeaturePath2
-} from "@ingenyus/swarm";
+import { handleFatalError as handleFatalError2, validateFeaturePath as validateFeaturePath2 } from "@ingenyus/swarm";
 import path5 from "path";
 
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  logger as singletonLogger2,
   SwarmConfigManager,
   TemplateResolver
 } from "@ingenyus/swarm";
@@ -652,14 +647,6 @@ var WaspConfigGenerator = class {
 
 // src/generators/base/wasp-generator.base.ts
 var WaspGeneratorBase = class extends GeneratorBase {
-  constructor(fileSystem = realFileSystem, logger = singletonLogger2) {
-    super(fileSystem, logger);
-    this.fileSystem = fileSystem;
-    this.logger = logger;
-    this.configGenerator = new WaspConfigGenerator(logger, fileSystem);
-    this.templateUtility = new TemplateUtility(fileSystem);
-    this.templateResolver = new TemplateResolver(fileSystem);
-  }
   configGenerator;
   templateUtility;
   templateResolver;
@@ -667,6 +654,15 @@ var WaspGeneratorBase = class extends GeneratorBase {
   configLoaded = false;
   // Plugin name from swarm.config.json
   pluginName = PLUGIN_NAME;
+  constructor() {
+    super();
+    this.configGenerator = new WaspConfigGenerator(
+      this.logger,
+      this.fileSystem
+    );
+    this.templateUtility = new TemplateUtility(this.fileSystem);
+    this.templateResolver = new TemplateResolver(this.fileSystem);
+  }
   async loadSwarmConfig() {
     if (this.configLoaded) return;
     const configManager = new SwarmConfigManager();
@@ -717,7 +713,7 @@ var WaspGeneratorBase = class extends GeneratorBase {
   }
   /**
    * Generic existence check with force flag handling
-   * Consolidates the pattern used in both file and config checks
+   * Consolidates the pattern used in both file and config existence checks
    */
   checkExistence(exists, itemDescription, force, errorMessage) {
     if (exists && !force) {
@@ -757,16 +753,14 @@ var schema = z2.object({
 
 // src/generators/feature/feature-generator.ts
 var FeatureGenerator = class extends WaspGeneratorBase {
-  constructor(logger = singletonLogger3, fileSystem = realFileSystem) {
-    super(fileSystem, logger);
-    this.logger = logger;
-    this.fileSystem = fileSystem;
-    this.name = "feature";
-    this.description = "Generates a feature directory containing a Wasp configuration file";
-  }
   name;
   description;
   schema = schema;
+  constructor() {
+    super();
+    this.name = "feature";
+    this.description = "Generates a feature directory containing a Wasp configuration file";
+  }
   getDefaultTemplatePath(templateName) {
     return this.templateUtility.resolveTemplatePath(
       templateName,
@@ -802,13 +796,6 @@ var FeatureGenerator = class extends WaspGeneratorBase {
 
 // src/generators/base/component-generator.base.ts
 var ComponentGeneratorBase = class extends WaspGeneratorBase {
-  constructor(logger = singletonLogger4, fileSystem = realFileSystem, featureDirectoryGenerator = new FeatureGenerator(logger, fileSystem)) {
-    super(fileSystem, logger);
-    this.logger = logger;
-    this.fileSystem = fileSystem;
-    this.featureDirectoryGenerator = featureDirectoryGenerator;
-    this.featureDirectoryGenerator = featureDirectoryGenerator;
-  }
   getDefaultTemplatePath(templateName) {
     return this.templateUtility.resolveTemplatePath(
       templateName,
@@ -816,6 +803,17 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
       import.meta.url
     );
   }
+  featureDirectoryGenerator;
+  constructor() {
+    super();
+    const runtime = GeneratorRuntime.current();
+    if (runtime.featureGeneratorFactory) {
+      const factoryResult = runtime.featureGeneratorFactory(runtime);
+      this.featureDirectoryGenerator = factoryResult;
+    } else {
+      this.featureDirectoryGenerator = new FeatureGenerator();
+    }
+  }
   get name() {
     return toKebabCase2(this.componentType);
   }
@@ -892,15 +890,14 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
   }
   /**
    * Gets the appropriate directory for a feature based on its path.
-   * @param fileSystem - The filesystem abstraction
    * @param featurePath - The full feature path
    * @param type - The type of file being generated
    * @returns The target directory and import path
    */
-  getFeatureTargetDir(fileSystem, featurePath, type) {
+  getFeatureTargetDir(featurePath, type) {
     validateFeaturePath3(featurePath);
     const normalisedPath = normaliseFeaturePath(featurePath);
-    const featureDir = getFeatureDir(fileSystem, normalisedPath);
+    const featureDir = getFeatureDir(this.fileSystem, normalisedPath);
     const typeKey = type.toLowerCase();
     const typeDirectory = TYPE_DIRECTORIES[typeKey];
     const targetDirectory = path6.join(featureDir, typeDirectory);
@@ -912,7 +909,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );

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

@@ -29,8 +29,8 @@ var CONFIG_TYPES = {
 
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -199,17 +199,12 @@ var TemplateUtility = class {
 };
 
 // src/generators/feature/feature-generator.ts
-import {
-  handleFatalError as handleFatalError2,
-  logger as singletonLogger3,
-  validateFeaturePath as validateFeaturePath2
-} from "@ingenyus/swarm";
+import { handleFatalError as handleFatalError2, validateFeaturePath as validateFeaturePath2 } from "@ingenyus/swarm";
 import path5 from "path";
 
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  logger as singletonLogger2,
   SwarmConfigManager,
   TemplateResolver
 } from "@ingenyus/swarm";
@@ -652,14 +647,6 @@ var WaspConfigGenerator = class {
 
 // src/generators/base/wasp-generator.base.ts
 var WaspGeneratorBase = class extends GeneratorBase {
-  constructor(fileSystem = realFileSystem, logger = singletonLogger2) {
-    super(fileSystem, logger);
-    this.fileSystem = fileSystem;
-    this.logger = logger;
-    this.configGenerator = new WaspConfigGenerator(logger, fileSystem);
-    this.templateUtility = new TemplateUtility(fileSystem);
-    this.templateResolver = new TemplateResolver(fileSystem);
-  }
   configGenerator;
   templateUtility;
   templateResolver;
@@ -667,6 +654,15 @@ var WaspGeneratorBase = class extends GeneratorBase {
   configLoaded = false;
   // Plugin name from swarm.config.json
   pluginName = PLUGIN_NAME;
+  constructor() {
+    super();
+    this.configGenerator = new WaspConfigGenerator(
+      this.logger,
+      this.fileSystem
+    );
+    this.templateUtility = new TemplateUtility(this.fileSystem);
+    this.templateResolver = new TemplateResolver(this.fileSystem);
+  }
   async loadSwarmConfig() {
     if (this.configLoaded) return;
     const configManager = new SwarmConfigManager();
@@ -717,7 +713,7 @@ var WaspGeneratorBase = class extends GeneratorBase {
   }
   /**
    * Generic existence check with force flag handling
-   * Consolidates the pattern used in both file and config checks
+   * Consolidates the pattern used in both file and config existence checks
    */
   checkExistence(exists, itemDescription, force, errorMessage) {
     if (exists && !force) {
@@ -757,16 +753,14 @@ var schema = z2.object({
 
 // src/generators/feature/feature-generator.ts
 var FeatureGenerator = class extends WaspGeneratorBase {
-  constructor(logger = singletonLogger3, fileSystem = realFileSystem) {
-    super(fileSystem, logger);
-    this.logger = logger;
-    this.fileSystem = fileSystem;
-    this.name = "feature";
-    this.description = "Generates a feature directory containing a Wasp configuration file";
-  }
   name;
   description;
   schema = schema;
+  constructor() {
+    super();
+    this.name = "feature";
+    this.description = "Generates a feature directory containing a Wasp configuration file";
+  }
   getDefaultTemplatePath(templateName) {
     return this.templateUtility.resolveTemplatePath(
       templateName,
@@ -802,13 +796,6 @@ var FeatureGenerator = class extends WaspGeneratorBase {
 
 // src/generators/base/component-generator.base.ts
 var ComponentGeneratorBase = class extends WaspGeneratorBase {
-  constructor(logger = singletonLogger4, fileSystem = realFileSystem, featureDirectoryGenerator = new FeatureGenerator(logger, fileSystem)) {
-    super(fileSystem, logger);
-    this.logger = logger;
-    this.fileSystem = fileSystem;
-    this.featureDirectoryGenerator = featureDirectoryGenerator;
-    this.featureDirectoryGenerator = featureDirectoryGenerator;
-  }
   getDefaultTemplatePath(templateName) {
     return this.templateUtility.resolveTemplatePath(
       templateName,
@@ -816,6 +803,17 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
       import.meta.url
     );
   }
+  featureDirectoryGenerator;
+  constructor() {
+    super();
+    const runtime = GeneratorRuntime.current();
+    if (runtime.featureGeneratorFactory) {
+      const factoryResult = runtime.featureGeneratorFactory(runtime);
+      this.featureDirectoryGenerator = factoryResult;
+    } else {
+      this.featureDirectoryGenerator = new FeatureGenerator();
+    }
+  }
   get name() {
     return toKebabCase2(this.componentType);
   }
@@ -892,15 +890,14 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
   }
   /**
    * Gets the appropriate directory for a feature based on its path.
-   * @param fileSystem - The filesystem abstraction
    * @param featurePath - The full feature path
    * @param type - The type of file being generated
    * @returns The target directory and import path
    */
-  getFeatureTargetDir(fileSystem, featurePath, type) {
+  getFeatureTargetDir(featurePath, type) {
     validateFeaturePath3(featurePath);
     const normalisedPath = normaliseFeaturePath(featurePath);
-    const featureDir = getFeatureDir(fileSystem, normalisedPath);
+    const featureDir = getFeatureDir(this.fileSystem, normalisedPath);
     const typeKey = type.toLowerCase();
     const typeDirectory = TYPE_DIRECTORIES[typeKey];
     const targetDirectory = path6.join(featureDir, typeDirectory);
@@ -912,7 +909,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );

package/dist/generators/query/index.js

@@ -40,8 +40,8 @@ var CONFIG_TYPES = {
 
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -350,17 +350,12 @@ var TemplateUtility = class {
 };
 
 // src/generators/feature/feature-generator.ts
-import {
-  handleFatalError as handleFatalError2,
-  logger as singletonLogger3,
-  validateFeaturePath as validateFeaturePath2
-} from "@ingenyus/swarm";
+import { handleFatalError as handleFatalError2, validateFeaturePath as validateFeaturePath2 } from "@ingenyus/swarm";
 import path5 from "path";
 
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  logger as singletonLogger2,
   SwarmConfigManager,
   TemplateResolver
 } from "@ingenyus/swarm";
@@ -803,14 +798,6 @@ var WaspConfigGenerator = class {
 
 // src/generators/base/wasp-generator.base.ts
 var WaspGeneratorBase = class extends GeneratorBase {
-  constructor(fileSystem = realFileSystem, logger = singletonLogger2) {
-    super(fileSystem, logger);
-    this.fileSystem = fileSystem;
-    this.logger = logger;
-    this.configGenerator = new WaspConfigGenerator(logger, fileSystem);
-    this.templateUtility = new TemplateUtility(fileSystem);
-    this.templateResolver = new TemplateResolver(fileSystem);
-  }
   configGenerator;
   templateUtility;
   templateResolver;
@@ -818,6 +805,15 @@ var WaspGeneratorBase = class extends GeneratorBase {
   configLoaded = false;
   // Plugin name from swarm.config.json
   pluginName = PLUGIN_NAME;
+  constructor() {
+    super();
+    this.configGenerator = new WaspConfigGenerator(
+      this.logger,
+      this.fileSystem
+    );
+    this.templateUtility = new TemplateUtility(this.fileSystem);
+    this.templateResolver = new TemplateResolver(this.fileSystem);
+  }
   async loadSwarmConfig() {
     if (this.configLoaded) return;
     const configManager = new SwarmConfigManager();
@@ -868,7 +864,7 @@ var WaspGeneratorBase = class extends GeneratorBase {
   }
   /**
    * Generic existence check with force flag handling
-   * Consolidates the pattern used in both file and config checks
+   * Consolidates the pattern used in both file and config existence checks
    */
   checkExistence(exists, itemDescription, force, errorMessage) {
     if (exists && !force) {
@@ -908,16 +904,14 @@ var schema = z2.object({
 
 // src/generators/feature/feature-generator.ts
 var FeatureGenerator = class extends WaspGeneratorBase {
-  constructor(logger = singletonLogger3, fileSystem = realFileSystem) {
-    super(fileSystem, logger);
-    this.logger = logger;
-    this.fileSystem = fileSystem;
-    this.name = "feature";
-    this.description = "Generates a feature directory containing a Wasp configuration file";
-  }
   name;
   description;
   schema = schema;
+  constructor() {
+    super();
+    this.name = "feature";
+    this.description = "Generates a feature directory containing a Wasp configuration file";
+  }
   getDefaultTemplatePath(templateName) {
     return this.templateUtility.resolveTemplatePath(
       templateName,
@@ -953,13 +947,6 @@ var FeatureGenerator = class extends WaspGeneratorBase {
 
 // src/generators/base/component-generator.base.ts
 var ComponentGeneratorBase = class extends WaspGeneratorBase {
-  constructor(logger = singletonLogger4, fileSystem = realFileSystem, featureDirectoryGenerator = new FeatureGenerator(logger, fileSystem)) {
-    super(fileSystem, logger);
-    this.logger = logger;
-    this.fileSystem = fileSystem;
-    this.featureDirectoryGenerator = featureDirectoryGenerator;
-    this.featureDirectoryGenerator = featureDirectoryGenerator;
-  }
   getDefaultTemplatePath(templateName) {
     return this.templateUtility.resolveTemplatePath(
       templateName,
@@ -967,6 +954,17 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
       import.meta.url
     );
   }
+  featureDirectoryGenerator;
+  constructor() {
+    super();
+    const runtime = GeneratorRuntime.current();
+    if (runtime.featureGeneratorFactory) {
+      const factoryResult = runtime.featureGeneratorFactory(runtime);
+      this.featureDirectoryGenerator = factoryResult;
+    } else {
+      this.featureDirectoryGenerator = new FeatureGenerator();
+    }
+  }
   get name() {
     return toKebabCase2(this.componentType);
   }
@@ -1043,15 +1041,14 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
   }
   /**
    * Gets the appropriate directory for a feature based on its path.
-   * @param fileSystem - The filesystem abstraction
    * @param featurePath - The full feature path
    * @param type - The type of file being generated
    * @returns The target directory and import path
    */
-  getFeatureTargetDir(fileSystem, featurePath, type) {
+  getFeatureTargetDir(featurePath, type) {
     validateFeaturePath3(featurePath);
     const normalisedPath = normaliseFeaturePath(featurePath);
-    const featureDir = getFeatureDir(fileSystem, normalisedPath);
+    const featureDir = getFeatureDir(this.fileSystem, normalisedPath);
     const typeKey = type.toLowerCase();
     const typeDirectory = TYPE_DIRECTORIES[typeKey];
     const targetDirectory = path6.join(featureDir, typeDirectory);
@@ -1063,7 +1060,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );

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

@@ -40,8 +40,8 @@ var CONFIG_TYPES = {
 
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -350,17 +350,12 @@ var TemplateUtility = class {
 };
 
 // src/generators/feature/feature-generator.ts
-import {
-  handleFatalError as handleFatalError2,
-  logger as singletonLogger3,
-  validateFeaturePath as validateFeaturePath2
-} from "@ingenyus/swarm";
+import { handleFatalError as handleFatalError2, validateFeaturePath as validateFeaturePath2 } from "@ingenyus/swarm";
 import path5 from "path";
 
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  logger as singletonLogger2,
   SwarmConfigManager,
   TemplateResolver
 } from "@ingenyus/swarm";
@@ -803,14 +798,6 @@ var WaspConfigGenerator = class {
 
 // src/generators/base/wasp-generator.base.ts
 var WaspGeneratorBase = class extends GeneratorBase {
-  constructor(fileSystem = realFileSystem, logger = singletonLogger2) {
-    super(fileSystem, logger);
-    this.fileSystem = fileSystem;
-    this.logger = logger;
-    this.configGenerator = new WaspConfigGenerator(logger, fileSystem);
-    this.templateUtility = new TemplateUtility(fileSystem);
-    this.templateResolver = new TemplateResolver(fileSystem);
-  }
   configGenerator;
   templateUtility;
   templateResolver;
@@ -818,6 +805,15 @@ var WaspGeneratorBase = class extends GeneratorBase {
   configLoaded = false;
   // Plugin name from swarm.config.json
   pluginName = PLUGIN_NAME;
+  constructor() {
+    super();
+    this.configGenerator = new WaspConfigGenerator(
+      this.logger,
+      this.fileSystem
+    );
+    this.templateUtility = new TemplateUtility(this.fileSystem);
+    this.templateResolver = new TemplateResolver(this.fileSystem);
+  }
   async loadSwarmConfig() {
     if (this.configLoaded) return;
     const configManager = new SwarmConfigManager();
@@ -868,7 +864,7 @@ var WaspGeneratorBase = class extends GeneratorBase {
   }
   /**
    * Generic existence check with force flag handling
-   * Consolidates the pattern used in both file and config checks
+   * Consolidates the pattern used in both file and config existence checks
    */
   checkExistence(exists, itemDescription, force, errorMessage) {
     if (exists && !force) {
@@ -908,16 +904,14 @@ var schema = z2.object({
 
 // src/generators/feature/feature-generator.ts
 var FeatureGenerator = class extends WaspGeneratorBase {
-  constructor(logger = singletonLogger3, fileSystem = realFileSystem) {
-    super(fileSystem, logger);
-    this.logger = logger;
-    this.fileSystem = fileSystem;
-    this.name = "feature";
-    this.description = "Generates a feature directory containing a Wasp configuration file";
-  }
   name;
   description;
   schema = schema;
+  constructor() {
+    super();
+    this.name = "feature";
+    this.description = "Generates a feature directory containing a Wasp configuration file";
+  }
   getDefaultTemplatePath(templateName) {
     return this.templateUtility.resolveTemplatePath(
       templateName,
@@ -953,13 +947,6 @@ var FeatureGenerator = class extends WaspGeneratorBase {
 
 // src/generators/base/component-generator.base.ts
 var ComponentGeneratorBase = class extends WaspGeneratorBase {
-  constructor(logger = singletonLogger4, fileSystem = realFileSystem, featureDirectoryGenerator = new FeatureGenerator(logger, fileSystem)) {
-    super(fileSystem, logger);
-    this.logger = logger;
-    this.fileSystem = fileSystem;
-    this.featureDirectoryGenerator = featureDirectoryGenerator;
-    this.featureDirectoryGenerator = featureDirectoryGenerator;
-  }
   getDefaultTemplatePath(templateName) {
     return this.templateUtility.resolveTemplatePath(
       templateName,
@@ -967,6 +954,17 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
       import.meta.url
     );
   }
+  featureDirectoryGenerator;
+  constructor() {
+    super();
+    const runtime = GeneratorRuntime.current();
+    if (runtime.featureGeneratorFactory) {
+      const factoryResult = runtime.featureGeneratorFactory(runtime);
+      this.featureDirectoryGenerator = factoryResult;
+    } else {
+      this.featureDirectoryGenerator = new FeatureGenerator();
+    }
+  }
   get name() {
     return toKebabCase2(this.componentType);
   }
@@ -1043,15 +1041,14 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
   }
   /**
    * Gets the appropriate directory for a feature based on its path.
-   * @param fileSystem - The filesystem abstraction
    * @param featurePath - The full feature path
    * @param type - The type of file being generated
    * @returns The target directory and import path
    */
-  getFeatureTargetDir(fileSystem, featurePath, type) {
+  getFeatureTargetDir(featurePath, type) {
     validateFeaturePath3(featurePath);
     const normalisedPath = normaliseFeaturePath(featurePath);
-    const featureDir = getFeatureDir(fileSystem, normalisedPath);
+    const featureDir = getFeatureDir(this.fileSystem, normalisedPath);
     const typeKey = type.toLowerCase();
     const typeDirectory = TYPE_DIRECTORIES[typeKey];
     const targetDirectory = path6.join(featureDir, typeDirectory);
@@ -1063,7 +1060,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );