@ingenyus/swarm-wasp 0.2.1 → 0.2.2

package/dist/generators/api-namespace/index.js

@@ -30,8 +30,8 @@ var CONFIG_TYPES = {
 
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -200,17 +200,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";
@@ -653,14 +648,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;
@@ -668,6 +655,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();
@@ -718,7 +714,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) {
@@ -758,16 +754,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,
@@ -803,13 +797,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,
@@ -817,6 +804,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);
   }
@@ -893,15 +891,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);
@@ -913,7 +910,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );

package/dist/generators/base/component-generator.base.d.ts

@@ -1,4 +1,4 @@
-import { FileSystem, Logger, SwarmGenerator } from '@ingenyus/swarm';
+import { SwarmGenerator } from '@ingenyus/swarm';
 import { ZodType } from 'zod';
 import { ConfigType } from '../../types';
 import { schema as featureSchema } from '../feature/schema';
@@ -7,12 +7,10 @@ import { WaspGeneratorBase } from './wasp-generator.base';
  * Abstract base class for all Wasp component generators
  */
 export declare abstract class ComponentGeneratorBase<S extends ZodType, TConfig extends ConfigType> extends WaspGeneratorBase<S> {
-    logger: Logger;
-    fileSystem: FileSystem;
-    protected featureDirectoryGenerator: SwarmGenerator<typeof featureSchema>;
     protected abstract componentType: TConfig;
     protected getDefaultTemplatePath(templateName: string): string;
-    constructor(logger?: Logger, fileSystem?: FileSystem, featureDirectoryGenerator?: SwarmGenerator<typeof featureSchema>);
+    protected featureDirectoryGenerator: SwarmGenerator<typeof featureSchema>;
+    constructor();
     get name(): string;
     /**
      * Validates that the feature config file exists in the target or ancestor directories
@@ -33,12 +31,11 @@ export declare abstract class ComponentGeneratorBase<S extends ZodType, TConfig
     protected updateConfigWithCheck(configPath: string, methodName: string, entityName: string, definition: string, featurePath: string, force: boolean): void;
     /**
      * 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
      */
-    protected getFeatureTargetDir(fileSystem: FileSystem, featurePath: string, type: string): {
+    protected getFeatureTargetDir(featurePath: string, type: string): {
         targetDirectory: string;
         importDirectory: string;
     };

package/dist/generators/base/component-generator.base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-generator.base.d.ts","sourceRoot":"","sources":["../../../src/generators/base/component-generator.base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,MAAM,EAEN,cAAc,EAIf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAO9B,OAAO,EAAE,UAAU,EAAoB,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;GAEG;AACH,8BAAsB,sBAAsB,CAC1C,CAAC,SAAS,OAAO,EACjB,OAAO,SAAS,UAAU,CAC1B,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IAYnB,MAAM,EAAE,MAAM;IACd,UAAU,EAAE,UAAU;IAC7B,SAAS,CAAC,yBAAyB,EAAE,cAAc,CACjD,OAAO,aAAa,CACrB;IAfH,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAE1C,SAAS,CAAC,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;gBASrD,MAAM,GAAE,MAAwB,EAChC,UAAU,GAAE,UAA2B,EACpC,yBAAyB,GAAE,cAAc,CACjD,OAAO,aAAa,CACsB;IAO9C,IAAW,IAAI,IAAI,MAAM,CAExB;IAED;;OAEG;IACH,SAAS,CAAC,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IA4B5D;;OAEG;IACH,SAAS,CAAC,iBAAiB,CACzB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,GACb,OAAO;IAgBV;;OAEG;IACH,SAAS,CAAC,mBAAmB,CAC3B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,OAAO,EACrB,UAAU,EAAE,MAAM,GACjB,IAAI;IAOP;;;OAGG;IACH,SAAS,CAAC,qBAAqB,CAC7B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,OAAO,GACb,IAAI;IAmBP;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAC3B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,GACX;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE;IAavD;;OAEG;IACH,SAAS,CAAC,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;;IAYjE;;OAEG;cACa,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;CAcjB"}
+{"version":3,"file":"component-generator.base.d.ts","sourceRoot":"","sources":["../../../src/generators/base/component-generator.base.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,cAAc,EAIf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAM9B,OAAO,EAAE,UAAU,EAAoB,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;GAEG;AACH,8BAAsB,sBAAsB,CAC1C,CAAC,SAAS,OAAO,EACjB,OAAO,SAAS,UAAU,CAC1B,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IAC5B,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAE1C,SAAS,CAAC,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAQ9D,SAAS,CAAC,yBAAyB,EAAE,cAAc,CAAC,OAAO,aAAa,CAAC,CAAC;;IAmB1E,IAAW,IAAI,IAAI,MAAM,CAExB;IAED;;OAEG;IACH,SAAS,CAAC,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IA4B5D;;OAEG;IACH,SAAS,CAAC,iBAAiB,CACzB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,GACb,OAAO;IAgBV;;OAEG;IACH,SAAS,CAAC,mBAAmB,CAC3B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,OAAO,EACrB,UAAU,EAAE,MAAM,GACjB,IAAI;IAOP;;;OAGG;IACH,SAAS,CAAC,qBAAqB,CAC7B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,OAAO,GACb,IAAI;IAmBP;;;;;OAKG;IACH,SAAS,CAAC,mBAAmB,CAC3B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,GACX;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE;IAavD;;OAEG;IACH,SAAS,CAAC,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;;IAWjE;;OAEG;cACa,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;CAcjB"}

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

@@ -1,7 +1,7 @@
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -189,17 +189,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";
@@ -642,14 +637,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;
@@ -657,6 +644,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();
@@ -707,7 +703,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) {
@@ -747,16 +743,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,
@@ -792,13 +786,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,
@@ -806,6 +793,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);
   }
@@ -882,15 +880,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);
@@ -902,7 +899,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );

package/dist/generators/base/index.js

@@ -1,7 +1,7 @@
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -338,17 +338,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";
@@ -791,14 +786,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;
@@ -806,6 +793,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();
@@ -856,7 +852,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) {
@@ -896,16 +892,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,
@@ -941,13 +935,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,
@@ -955,6 +942,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);
   }
@@ -1031,15 +1029,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);
@@ -1051,7 +1048,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );

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

@@ -337,8 +337,8 @@ var TemplateUtility = class {
 
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
@@ -346,17 +346,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";
@@ -799,14 +794,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;
@@ -814,6 +801,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();
@@ -864,7 +860,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) {
@@ -904,16 +900,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,
@@ -949,13 +943,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,
@@ -963,6 +950,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);
   }
@@ -1039,15 +1037,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);
@@ -1059,7 +1056,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );

package/dist/generators/base/wasp-generator.base.d.ts

@@ -1,4 +1,4 @@
-import { FileSystem, GeneratorBase, Logger, TemplateResolver } from '@ingenyus/swarm';
+import { GeneratorBase, TemplateResolver } from '@ingenyus/swarm';
 import { ZodType } from 'zod';
 import { TemplateUtility } from '../../common';
 import { WaspConfigGenerator } from '../config';
@@ -6,15 +6,13 @@ import { WaspConfigGenerator } from '../config';
  * Abstract base class for all Wasp generators
  */
 export declare abstract class WaspGeneratorBase<S extends ZodType> extends GeneratorBase<S> {
-    fileSystem: FileSystem;
-    logger: Logger;
     protected configGenerator: WaspConfigGenerator;
     protected templateUtility: TemplateUtility;
     protected templateResolver: TemplateResolver;
     private swarmConfig;
     private configLoaded;
     protected readonly pluginName: "wasp";
-    constructor(fileSystem?: FileSystem, logger?: Logger);
+    constructor();
     private loadSwarmConfig;
     protected getCustomTemplateDir(): Promise<string | undefined>;
     /**
@@ -33,7 +31,7 @@ export declare abstract class WaspGeneratorBase<S extends ZodType> extends Gener
     protected renderTemplateToFile(templateName: string, replacements: Record<string, any>, outputPath: string, readableFileType: string, force: boolean): Promise<boolean>;
     /**
      * 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
      */
     protected checkExistence(exists: boolean, itemDescription: string, force: boolean, errorMessage?: string): boolean;
     /**

package/dist/generators/base/wasp-generator.base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wasp-generator.base.d.ts","sourceRoot":"","sources":["../../../src/generators/base/wasp-generator.base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EACb,MAAM,EAKN,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAC9B,OAAO,EAAkB,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD;;GAEG;AACH,8BAAsB,iBAAiB,CACrC,CAAC,SAAS,OAAO,CACjB,SAAQ,aAAa,CAAC,CAAC,CAAC;IAWf,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,MAAM;IAXvB,SAAS,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAC/C,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAC3C,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC7C,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAG7B,SAAS,CAAC,QAAQ,CAAC,UAAU,SAAe;gBAGnC,UAAU,GAAE,UAA2B,EACvC,MAAM,GAAE,MAAwB;YAQ3B,eAAe;cASb,oBAAoB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAMnE;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAEvE;;OAEG;cACa,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBtE;;OAEG;cACa,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,MAAM,EACxB,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,CAAC;IAiBnB;;;OAGG;IACH,SAAS,CAAC,cAAc,CACtB,MAAM,EAAE,OAAO,EACf,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,OAAO,EACd,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO;IAQV;;OAEG;IACH,SAAS,CAAC,eAAe,CACvB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,GACf,OAAO;IAUV;;OAEG;IACH,SAAS,CAAC,SAAS,CACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,OAAO,GAClB,IAAI;CAMR"}
+{"version":3,"file":"wasp-generator.base.d.ts","sourceRoot":"","sources":["../../../src/generators/base/wasp-generator.base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGb,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD;;GAEG;AACH,8BAAsB,iBAAiB,CACrC,CAAC,SAAS,OAAO,CACjB,SAAQ,aAAa,CAAC,CAAC,CAAC;IACxB,SAAS,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAC/C,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAC3C,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC7C,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAG7B,SAAS,CAAC,QAAQ,CAAC,UAAU,SAAe;;YAY9B,eAAe;cASb,oBAAoB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAMnE;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAEvE;;OAEG;cACa,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBtE;;OAEG;cACa,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,MAAM,EACxB,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,CAAC;IAiBnB;;;OAGG;IACH,SAAS,CAAC,cAAc,CACtB,MAAM,EAAE,OAAO,EACf,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,OAAO,EACd,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO;IAQV;;OAEG;IACH,SAAS,CAAC,eAAe,CACvB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,GACf,OAAO;IAUV;;OAEG;IACH,SAAS,CAAC,SAAS,CACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,OAAO,GAClB,IAAI;CAMR"}