@ingenyus/swarm-wasp 0.2.0 → 0.2.2

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

@@ -1,10 +1,6 @@
 // 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/common/filesystem.ts
 import { toPascalCase, validateFeaturePath } from "@ingenyus/swarm";
@@ -58,16 +54,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";
@@ -124,7 +116,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;
@@ -132,14 +124,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 {
@@ -157,11 +149,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,
@@ -174,7 +166,6 @@ var TemplateUtility = class {
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  logger as singletonLogger2,
   SwarmConfigManager,
   TemplateResolver
 } from "@ingenyus/swarm";
@@ -185,14 +176,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.
@@ -221,7 +212,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;
@@ -237,7 +228,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)) {
@@ -617,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;
@@ -632,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();
@@ -682,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) {
@@ -722,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,
@@ -747,18 +737,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}`);

package/dist/generators/feature/index.js

@@ -1,10 +1,6 @@
 // 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/common/filesystem.ts
 import { toPascalCase, validateFeaturePath } from "@ingenyus/swarm";
@@ -58,16 +54,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";
@@ -124,7 +116,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;
@@ -132,14 +124,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 {
@@ -157,11 +149,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,
@@ -174,7 +166,6 @@ var TemplateUtility = class {
 // src/generators/base/wasp-generator.base.ts
 import {
   GeneratorBase,
-  logger as singletonLogger2,
   SwarmConfigManager,
   TemplateResolver
 } from "@ingenyus/swarm";
@@ -185,14 +176,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.
@@ -221,7 +212,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;
@@ -237,7 +228,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)) {
@@ -617,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;
@@ -632,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();
@@ -682,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) {
@@ -722,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,
@@ -747,18 +737,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}`);

package/dist/generators/feature/schema.js

@@ -14,16 +14,12 @@ var realFileSystem = {
   statSync: fs.statSync
 };
 
-// src/common/plugin.ts
-import path from "path";
-import { fileURLToPath } from "url";
-
 // src/common/prisma.ts
 import {
   getSchema
 } from "@mrleebo/prisma-ast";
 import fs2 from "fs";
-import path2 from "path";
+import path from "path";
 
 // src/common/schemas.ts
 import { commandRegistry } from "@ingenyus/swarm";