@ingenyus/swarm-wasp 0.2.0 → 0.2.2

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

@@ -1,12 +1,12 @@
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
 } from "@ingenyus/swarm";
-import path7 from "path";
+import path6 from "path";
 
 // src/common/filesystem.ts
 import { toPascalCase, validateFeaturePath } from "@ingenyus/swarm";
@@ -79,16 +79,12 @@ function getFeatureDir(fileSystem, featureName) {
   return path.join(waspRoot, "src", normalisedPath);
 }
 
-// src/common/plugin.ts
-import path2 from "path";
-import { fileURLToPath } from "url";
-
 // src/common/prisma.ts
 import {
   getSchema
 } from "@mrleebo/prisma-ast";
 import fs2 from "fs";
-import path3 from "path";
+import path2 from "path";
 
 // src/common/schemas.ts
 import { commandRegistry } from "@ingenyus/swarm";
@@ -145,7 +141,7 @@ var commonSchemas = {
 // src/common/templates.ts
 import { toKebabCase } from "@ingenyus/swarm";
 import { Eta } from "eta";
-import path4 from "path";
+import path3 from "path";
 var TemplateUtility = class {
   constructor(fileSystem) {
     this.fileSystem = fileSystem;
@@ -153,14 +149,14 @@ var TemplateUtility = class {
   processTemplate(templatePath, replacements) {
     const declarations = Object.keys(replacements).map((key) => `${key}=it.${key}`).join(", ");
     const functionHeader = declarations ? `const ${declarations};` : void 0;
-    const templateDir = path4.dirname(templatePath);
+    const templateDir = path3.dirname(templatePath);
     const eta = new Eta({
       autoTrim: false,
       autoEscape: false,
       views: templateDir,
       functionHeader
     });
-    const templateName = path4.basename(templatePath).replace(/\.eta$/, "");
+    const templateName = path3.basename(templatePath).replace(/\.eta$/, "");
     if (this.fileSystem.existsSync(templatePath)) {
       return eta.render(templateName, replacements);
     } else {
@@ -178,11 +174,11 @@ var TemplateUtility = class {
   resolveTemplatePath(relativePath, generatorName, currentFileUrl) {
     const generatorDirName = toKebabCase(generatorName);
     const currentFilePath = new URL(currentFileUrl).pathname;
-    const currentFileDir = path4.dirname(currentFilePath);
-    const currentFileName = path4.basename(currentFilePath);
+    const currentFileDir = path3.dirname(currentFilePath);
+    const currentFileName = path3.basename(currentFilePath);
     const isInstalledPackage = currentFileDir.includes("node_modules") && currentFileDir.endsWith("/dist") && currentFileName === "index.js";
-    const startDir = isInstalledPackage ? currentFileDir : path4.dirname(path4.dirname(currentFileDir));
-    return path4.join(
+    const startDir = isInstalledPackage ? currentFileDir : path3.dirname(path3.dirname(currentFileDir));
+    return path3.join(
       startDir,
       "generators",
       generatorDirName,
@@ -193,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 path6 from "path";
+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";
@@ -214,14 +205,14 @@ import {
   parseHelperMethodDefinition,
   logger as singletonLogger
 } from "@ingenyus/swarm";
-import path5 from "path";
+import path4 from "path";
 var WaspConfigGenerator = class {
   constructor(logger = singletonLogger, fileSystem = realFileSystem) {
     this.logger = logger;
     this.fileSystem = fileSystem;
     this.templateUtility = new TemplateUtility(fileSystem);
   }
-  path = path5;
+  path = path4;
   templateUtility;
   /**
    * Gets the template path for feature config templates.
@@ -250,7 +241,7 @@ var WaspConfigGenerator = class {
       this.logger.error(`Template not found: ${templatePath}`);
       return;
     }
-    const configFilePath = path5.join(featureDir, `feature.wasp.ts`);
+    const configFilePath = path4.join(featureDir, `feature.wasp.ts`);
     if (this.fileSystem.existsSync(configFilePath)) {
       this.logger.warn(`Feature config already exists: ${configFilePath}`);
       return;
@@ -266,7 +257,7 @@ var WaspConfigGenerator = class {
    */
   update(featurePath, declaration) {
     const configDir = getFeatureDir(this.fileSystem, featurePath);
-    const configFilePath = path5.join(configDir, `feature.wasp.ts`);
+    const configFilePath = path4.join(configDir, `feature.wasp.ts`);
     if (!this.fileSystem.existsSync(configFilePath)) {
       const templatePath = this.getTemplatePath("feature.wasp.eta");
       if (!this.fileSystem.existsSync(templatePath)) {
@@ -646,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;
@@ -661,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();
@@ -711,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) {
@@ -751,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,
@@ -776,18 +766,18 @@ var FeatureGenerator = class extends WaspGeneratorBase {
     const { target } = args;
     const segments = validateFeaturePath2(target);
     const normalisedPath = normaliseFeaturePath(target);
-    const sourceRoot = path6.join(findWaspRoot(this.fileSystem), "src");
+    const sourceRoot = path5.join(findWaspRoot(this.fileSystem), "src");
     if (segments.length > 1) {
       const parentPath = segments.slice(0, -1).join("/");
       const parentNormalisedPath = normaliseFeaturePath(parentPath);
-      const parentFeatureDir = path6.join(sourceRoot, parentNormalisedPath);
+      const parentFeatureDir = path5.join(sourceRoot, parentNormalisedPath);
       if (!this.fileSystem.existsSync(parentFeatureDir)) {
         handleFatalError2(
           `Parent feature '${parentPath}' does not exist. Please create it first.`
         );
       }
     }
-    const featureDir = path6.join(sourceRoot, normalisedPath);
+    const featureDir = path5.join(sourceRoot, normalisedPath);
     this.fileSystem.mkdirSync(featureDir, { recursive: true });
     this.configGenerator.generate(normalisedPath);
     this.logger.success(`Generated feature: ${normalisedPath}`);
@@ -796,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,
@@ -810,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);
   }
@@ -824,7 +818,7 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
       const currentPath = pathSegments.join("/");
       const featureName = pathSegments[pathSegments.length - 1];
       const featureDir = getFeatureDir(this.fileSystem, currentPath);
-      const configPath = path7.join(featureDir, `feature.wasp.ts`);
+      const configPath = path6.join(featureDir, `feature.wasp.ts`);
       if (this.fileSystem.existsSync(configPath)) {
         return configPath;
       }
@@ -886,18 +880,17 @@ 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 = path7.join(featureDir, typeDirectory);
+    const targetDirectory = path6.join(featureDir, typeDirectory);
     const importDirectory = `@src/${normalisedPath}/${typeDirectory}`;
     return { targetDirectory, importDirectory };
   }
@@ -906,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,12 +1,12 @@
 // src/generators/base/component-generator.base.ts
 import {
+  GeneratorRuntime,
   hasHelperMethodCall,
-  logger as singletonLogger4,
   toCamelCase,
   toKebabCase as toKebabCase2,
   validateFeaturePath as validateFeaturePath3
 } from "@ingenyus/swarm";
-import path7 from "path";
+import path6 from "path";
 
 // src/common/filesystem.ts
 import { toPascalCase, validateFeaturePath } from "@ingenyus/swarm";
@@ -107,19 +107,15 @@ function getFeatureImportPath(featurePath) {
   return segments.join("/");
 }
 
-// src/common/plugin.ts
-import path2 from "path";
-import { fileURLToPath } from "url";
-
 // src/common/prisma.ts
 import {
   getSchema
 } from "@mrleebo/prisma-ast";
 import fs2 from "fs";
-import path3 from "path";
+import path2 from "path";
 async function getEntityMetadata(modelName) {
   try {
-    const schemaPath = path3.join(process.cwd(), "schema.prisma");
+    const schemaPath = path2.join(process.cwd(), "schema.prisma");
     const schemaContent = fs2.readFileSync(schemaPath, "utf8");
     const schema2 = getSchema(schemaContent);
     const model = schema2.list?.find(
@@ -294,7 +290,7 @@ var commonSchemas = {
 // src/common/templates.ts
 import { toKebabCase } from "@ingenyus/swarm";
 import { Eta } from "eta";
-import path4 from "path";
+import path3 from "path";
 var TemplateUtility = class {
   constructor(fileSystem) {
     this.fileSystem = fileSystem;
@@ -302,14 +298,14 @@ var TemplateUtility = class {
   processTemplate(templatePath, replacements) {
     const declarations = Object.keys(replacements).map((key) => `${key}=it.${key}`).join(", ");
     const functionHeader = declarations ? `const ${declarations};` : void 0;
-    const templateDir = path4.dirname(templatePath);
+    const templateDir = path3.dirname(templatePath);
     const eta = new Eta({
       autoTrim: false,
       autoEscape: false,
       views: templateDir,
       functionHeader
     });
-    const templateName = path4.basename(templatePath).replace(/\.eta$/, "");
+    const templateName = path3.basename(templatePath).replace(/\.eta$/, "");
     if (this.fileSystem.existsSync(templatePath)) {
       return eta.render(templateName, replacements);
     } else {
@@ -327,11 +323,11 @@ var TemplateUtility = class {
   resolveTemplatePath(relativePath, generatorName, currentFileUrl) {
     const generatorDirName = toKebabCase(generatorName);
     const currentFilePath = new URL(currentFileUrl).pathname;
-    const currentFileDir = path4.dirname(currentFilePath);
-    const currentFileName = path4.basename(currentFilePath);
+    const currentFileDir = path3.dirname(currentFilePath);
+    const currentFileName = path3.basename(currentFilePath);
     const isInstalledPackage = currentFileDir.includes("node_modules") && currentFileDir.endsWith("/dist") && currentFileName === "index.js";
-    const startDir = isInstalledPackage ? currentFileDir : path4.dirname(path4.dirname(currentFileDir));
-    return path4.join(
+    const startDir = isInstalledPackage ? currentFileDir : path3.dirname(path3.dirname(currentFileDir));
+    return path3.join(
       startDir,
       "generators",
       generatorDirName,
@@ -342,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 path6 from "path";
+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";
@@ -363,14 +354,14 @@ import {
   parseHelperMethodDefinition,
   logger as singletonLogger
 } from "@ingenyus/swarm";
-import path5 from "path";
+import path4 from "path";
 var WaspConfigGenerator = class {
   constructor(logger = singletonLogger, fileSystem = realFileSystem) {
     this.logger = logger;
     this.fileSystem = fileSystem;
     this.templateUtility = new TemplateUtility(fileSystem);
   }
-  path = path5;
+  path = path4;
   templateUtility;
   /**
    * Gets the template path for feature config templates.
@@ -399,7 +390,7 @@ var WaspConfigGenerator = class {
       this.logger.error(`Template not found: ${templatePath}`);
       return;
     }
-    const configFilePath = path5.join(featureDir, `feature.wasp.ts`);
+    const configFilePath = path4.join(featureDir, `feature.wasp.ts`);
     if (this.fileSystem.existsSync(configFilePath)) {
       this.logger.warn(`Feature config already exists: ${configFilePath}`);
       return;
@@ -415,7 +406,7 @@ var WaspConfigGenerator = class {
    */
   update(featurePath, declaration) {
     const configDir = getFeatureDir(this.fileSystem, featurePath);
-    const configFilePath = path5.join(configDir, `feature.wasp.ts`);
+    const configFilePath = path4.join(configDir, `feature.wasp.ts`);
     if (!this.fileSystem.existsSync(configFilePath)) {
       const templatePath = this.getTemplatePath("feature.wasp.eta");
       if (!this.fileSystem.existsSync(templatePath)) {
@@ -795,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;
@@ -810,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();
@@ -860,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) {
@@ -900,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,
@@ -925,18 +915,18 @@ var FeatureGenerator = class extends WaspGeneratorBase {
     const { target } = args;
     const segments = validateFeaturePath2(target);
     const normalisedPath = normaliseFeaturePath(target);
-    const sourceRoot = path6.join(findWaspRoot(this.fileSystem), "src");
+    const sourceRoot = path5.join(findWaspRoot(this.fileSystem), "src");
     if (segments.length > 1) {
       const parentPath = segments.slice(0, -1).join("/");
       const parentNormalisedPath = normaliseFeaturePath(parentPath);
-      const parentFeatureDir = path6.join(sourceRoot, parentNormalisedPath);
+      const parentFeatureDir = path5.join(sourceRoot, parentNormalisedPath);
       if (!this.fileSystem.existsSync(parentFeatureDir)) {
         handleFatalError2(
           `Parent feature '${parentPath}' does not exist. Please create it first.`
         );
       }
     }
-    const featureDir = path6.join(sourceRoot, normalisedPath);
+    const featureDir = path5.join(sourceRoot, normalisedPath);
     this.fileSystem.mkdirSync(featureDir, { recursive: true });
     this.configGenerator.generate(normalisedPath);
     this.logger.success(`Generated feature: ${normalisedPath}`);
@@ -945,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,
@@ -959,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);
   }
@@ -973,7 +967,7 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
       const currentPath = pathSegments.join("/");
       const featureName = pathSegments[pathSegments.length - 1];
       const featureDir = getFeatureDir(this.fileSystem, currentPath);
-      const configPath = path7.join(featureDir, `feature.wasp.ts`);
+      const configPath = path6.join(featureDir, `feature.wasp.ts`);
       if (this.fileSystem.existsSync(configPath)) {
         return configPath;
       }
@@ -1035,18 +1029,17 @@ 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 = path7.join(featureDir, typeDirectory);
+    const targetDirectory = path6.join(featureDir, typeDirectory);
     const importDirectory = `@src/${normalisedPath}/${typeDirectory}`;
     return { targetDirectory, importDirectory };
   }
@@ -1055,7 +1048,6 @@ var ComponentGeneratorBase = class extends WaspGeneratorBase {
    */
   ensureTargetDirectory(featurePath, type) {
     const { targetDirectory, importDirectory } = this.getFeatureTargetDir(
-      this.fileSystem,
       featurePath,
       type
     );