@ingenyus/swarm-wasp 0.2.1 → 0.2.2

package/dist/generators/base/wasp-generator.base.js

@@ -1,7 +1,6 @@
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  logger as singletonLogger2,
   SwarmConfigManager,
   TemplateResolver
 } from "@ingenyus/swarm";
@@ -605,14 +604,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;
@@ -620,6 +611,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();
@@ -670,7 +670,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) {

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

@@ -348,8 +348,8 @@ var TemplateUtility = class {
 
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -357,17 +357,12 @@ import {
 import path6 from "path";
 
 // 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";
@@ -810,14 +805,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;
@@ -825,6 +812,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();
@@ -875,7 +871,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) {
@@ -915,16 +911,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,
@@ -960,13 +954,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,
@@ -974,6 +961,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);
   }
@@ -1050,15 +1048,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);
@@ -1070,7 +1067,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );

package/dist/generators/crud/index.js

@@ -348,8 +348,8 @@ var TemplateUtility = class {
 
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -357,17 +357,12 @@ import {
 import path6 from "path";
 
 // 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";
@@ -810,14 +805,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;
@@ -825,6 +812,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();
@@ -875,7 +871,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) {
@@ -915,16 +911,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,
@@ -960,13 +954,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,
@@ -974,6 +961,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);
   }
@@ -1050,15 +1048,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);
@@ -1070,7 +1067,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );

package/dist/generators/feature/feature-generator.d.ts

@@ -1,15 +1,13 @@
-import { FileSystem, Logger, Out } from '@ingenyus/swarm';
+import { Out } from '@ingenyus/swarm';
 import { WaspGeneratorBase } from '../base/wasp-generator.base';
 import { schema } from './schema';
 export declare class FeatureGenerator extends WaspGeneratorBase<typeof schema> {
-    logger: Logger;
-    fileSystem: FileSystem;
     name: string;
     description: string;
     schema: import("zod").ZodObject<{
         target: import("zod").ZodString;
     }, import("zod/v4/core").$strip>;
-    constructor(logger?: Logger, fileSystem?: FileSystem);
+    constructor();
     protected getDefaultTemplatePath(templateName: string): string;
     /**
      * Generates a feature directory containing a Wasp configuration file

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

@@ -1 +1 @@
-{"version":3,"file":"feature-generator.d.ts","sourceRoot":"","sources":["../../../src/generators/feature/feature-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,MAAM,EACN,GAAG,EAGJ,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,gBAAiB,SAAQ,iBAAiB,CAAC,OAAO,MAAM,CAAC;IAM3D,MAAM,EAAE,MAAM;IACd,UAAU,EAAE,UAAU;IAN/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM;;qCAAU;gBAGP,MAAM,GAAE,MAAwB,EAChC,UAAU,GAAE,UAA2B;IAQhD,SAAS,CAAC,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAQ9D;;;OAGG;IACG,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBxD"}
+{"version":3,"file":"feature-generator.d.ts","sourceRoot":"","sources":["../../../src/generators/feature/feature-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,GAAG,EAAuB,MAAM,iBAAiB,CAAC;AAG7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,gBAAiB,SAAQ,iBAAiB,CAAC,OAAO,MAAM,CAAC;IACpE,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM;;qCAAU;;IAShB,SAAS,CAAC,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAQ9D;;;OAGG;IACG,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBxD"}

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

@@ -1,9 +1,5 @@
 // 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/common/filesystem.ts
@@ -170,7 +166,6 @@ var TemplateUtility = class {
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  logger as singletonLogger2,
   SwarmConfigManager,
   TemplateResolver
 } from "@ingenyus/swarm";
@@ -613,14 +608,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;
@@ -628,6 +615,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();
@@ -678,7 +674,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) {
@@ -718,16 +714,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,

package/dist/generators/feature/index.js

@@ -1,9 +1,5 @@
 // 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/common/filesystem.ts
@@ -170,7 +166,6 @@ var TemplateUtility = class {
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  logger as singletonLogger2,
   SwarmConfigManager,
   TemplateResolver
 } from "@ingenyus/swarm";
@@ -613,14 +608,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;
@@ -628,6 +615,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();
@@ -678,7 +674,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) {
@@ -718,16 +714,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,

package/dist/generators/index.js

@@ -59,8 +59,8 @@ var CONFIG_TYPES = {
 
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -374,17 +374,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";
@@ -827,14 +822,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;
@@ -842,6 +829,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();
@@ -892,7 +888,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) {
@@ -932,16 +928,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,
@@ -977,13 +971,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,
@@ -991,6 +978,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);
   }
@@ -1067,15 +1065,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);
@@ -1087,7 +1084,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );