@anu8151/adonisjs-blueprint 0.4.9 → 0.5.1

package/build/src/generators/controller_generator.js

@@ -190,9 +190,9 @@ statementsRegistry.register("service", async (value, { generators }) => {
 var ControllerGenerator = class extends BaseGenerator {
 	async generate(name, definition, useInertia = false, isApi = false, models) {
 		const nameParts = name.split(/[\/.]/);
-		const baseName = nameParts.pop();
+		const baseName = nameParts.pop() || "";
 		const entity = this.app.generators.createEntity(baseName);
-		if (nameParts.length > 0) entity.path = nameParts.map((p) => string.snakeCase(p)).join("/");
+		if (nameParts.length > 0) entity.path = nameParts.map((p) => string.snakeCase(p || "")).join("/");
 		const eventGenerator = new EventGenerator(this.app, this.logger, this.manifest);
 		const mailGenerator = new MailGenerator(this.app, this.logger, this.manifest);
 		const jobGenerator = new JobGenerator(this.app, this.logger, this.manifest);
@@ -210,8 +210,8 @@ var ControllerGenerator = class extends BaseGenerator {
 			services: /* @__PURE__ */ new Map()
 		};
 		const middleware = definition.middleware || [];
-		const pluralName = string.plural(string.camelCase(entity.name));
-		const singularName = string.camelCase(entity.name);
+		const pluralName = string.plural(string.camelCase(entity.name || ""));
+		const singularName = string.camelCase(entity.name || "");
 		let normalizedDefinition = definition;
 		if (definition.resource) normalizedDefinition = isApi ? {
 			index: {
@@ -309,19 +309,21 @@ var ControllerGenerator = class extends BaseGenerator {
 						});
 						logicLines.push(...result.logicLines);
 						if (result.imports) {
-							if (result.imports.models) result.imports.models.forEach((i) => imports.models.add(i));
-							if (result.imports.validators) result.imports.validators.forEach((i) => imports.validators.add(i));
-							if (result.imports.events) result.imports.events.forEach((i) => imports.events.add(i));
-							if (result.imports.policies) result.imports.policies.forEach((i) => imports.policies.add(i));
-							if (result.imports.mails) result.imports.mails.forEach((i) => imports.mails.add(i));
-							if (result.imports.jobs) result.imports.jobs.forEach((i) => imports.jobs.add(i));
-							if (result.imports.notifications) result.imports.notifications.forEach((i) => imports.notifications.add(i));
+							if (result.imports.models) result.imports.models.forEach((i) => i && imports.models.add(i));
+							if (result.imports.validators) result.imports.validators.forEach((i) => i && imports.validators.add(i));
+							if (result.imports.events) result.imports.events.forEach((i) => i && imports.events.add(i));
+							if (result.imports.policies) result.imports.policies.forEach((i) => i && imports.policies.add(i));
+							if (result.imports.mails) result.imports.mails.forEach((i) => i && imports.mails.add(i));
+							if (result.imports.jobs) result.imports.jobs.forEach((i) => i && imports.jobs.add(i));
+							if (result.imports.notifications) result.imports.notifications.forEach((i) => i && imports.notifications.add(i));
 							if (result.imports.services) result.imports.services.forEach((serviceName) => {
-								const servicePath = string.snakeCase(serviceName.replace("Service", "")) + "_service";
-								imports.services.set(serviceName, servicePath);
+								if (serviceName) {
+									const servicePath = string.snakeCase(serviceName.replace("Service", "")) + "_service";
+									imports.services.set(serviceName, servicePath);
+								}
 							});
 						}
-						if (result.context) result.context.forEach((c) => contextItems.add(c));
+						if (result.context) result.context.forEach((c) => c && contextItems.add(c));
 					}
 				}
 			}
@@ -331,11 +333,31 @@ var ControllerGenerator = class extends BaseGenerator {
 				logic: logicLines.join("\n    ") || "// Action logic here"
 			});
 		}
+		const importsLines = [];
+		imports.models.forEach((model) => {
+			if (model) importsLines.push(`import ${model} from '#models/${string.snakeCase(model)}'`);
+		});
+		imports.validators.forEach((v) => {
+			if (v) importsLines.push(`import { ${v} } from '#validators/${(entity.name || "").toLowerCase()}'`);
+		});
+		imports.events.forEach((e) => {
+			if (e) importsLines.push(`import ${e} from '#events/${e.toLowerCase()}'`);
+		});
+		imports.policies.forEach((p) => {
+			if (p) importsLines.push(`import ${p} from '#policies/${(entity.name || "").toLowerCase()}_policy'`);
+		});
+		imports.services.forEach((path, serviceName) => {
+			if (serviceName && path) importsLines.push(`import ${serviceName} from '#services/${path}'`);
+		});
+		const middlewareLines = middleware.length > 0 ? `static middleware = [\n    ${middleware.map((m) => `middleware.${m}()`).join(",\n    ")}\n  ]` : "";
+		const actionLines = actions.map((action) => {
+			return `async ${action.name}({ ${action.context} }: HttpContext) {\n    ${action.logic}\n  }`;
+		}).join("\n\n  ");
 		await this.generateStub("make/controller/main.stub", {
 			entity,
 			actions,
 			middleware,
-			imports: {
+			importsData: {
 				models: Array.from(imports.models),
 				validators: Array.from(imports.validators),
 				events: Array.from(imports.events),
@@ -347,7 +369,10 @@ var ControllerGenerator = class extends BaseGenerator {
 					name: serviceName,
 					path
 				}))
-			}
+			},
+			importsLines: importsLines.join("\n"),
+			middlewareLines,
+			actionLines
 		}, definition.stub);
 	}
 };

package/build/stubs/make/controller/main.stub

@@ -4,44 +4,10 @@
   })
 }}}
 import type { HttpContext } from '@adonisjs/core/http'
-@if(imports.models)
-@each(model in imports.models)
-import {{ model }} from '#models/{{ model.toLowerCase() }}'
-@end
-@end
-@if(imports.validators)
-@each(validator in imports.validators)
-import { {{ validator }} } from '#validators/{{ entity.name.toLowerCase() }}'
-@end
-@end
-@if(imports.events)
-@each(event in imports.events)
-import {{ event }} from '#events/{{ event.toLowerCase() }}'
-@end
-@end
-@if(imports.policies)
-@each(policy in imports.policies)
-import {{ policy }} from '#policies/{{ entity.name.toLowerCase() }}_policy'
-@end
-@end
-@if(imports.services)
-@each(service in imports.services)
-import {{ service.name }} from '#services/{{ service.path }}'
-@end
-@end
+{{{ importsLines }}}
 
 export default class {{ entity.className }}Controller {
-  @if(middleware.length)
-  static middleware = [
-    @each(item in middleware)
-    middleware.{{ item }}(),
-    @end
-  ]
-  @end
+  {{{ middlewareLines }}}
 
-  @each(action in actions)
-  async {{ action.name }}({ {{ action.context }} }: HttpContext) {
-    {{ action.logic }}
-  }
-  @end
+  {{{ actionLines }}}
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@anu8151/adonisjs-blueprint",
   "description": "Blueprint for AdonisJS 7",
-  "version": "0.4.9",
+  "version": "0.5.1",
   "engines": {
     "node": ">=24.0.0"
   },

package/stubs/make/controller/main.stub

@@ -4,44 +4,10 @@
   })
 }}}
 import type { HttpContext } from '@adonisjs/core/http'
-@if(imports.models)
-@each(model in imports.models)
-import {{ model }} from '#models/{{ model.toLowerCase() }}'
-@end
-@end
-@if(imports.validators)
-@each(validator in imports.validators)
-import { {{ validator }} } from '#validators/{{ entity.name.toLowerCase() }}'
-@end
-@end
-@if(imports.events)
-@each(event in imports.events)
-import {{ event }} from '#events/{{ event.toLowerCase() }}'
-@end
-@end
-@if(imports.policies)
-@each(policy in imports.policies)
-import {{ policy }} from '#policies/{{ entity.name.toLowerCase() }}_policy'
-@end
-@end
-@if(imports.services)
-@each(service in imports.services)
-import {{ service.name }} from '#services/{{ service.path }}'
-@end
-@end
+{{{ importsLines }}}
 
 export default class {{ entity.className }}Controller {
-  @if(middleware.length)
-  static middleware = [
-    @each(item in middleware)
-    middleware.{{ item }}(),
-    @end
-  ]
-  @end
+  {{{ middlewareLines }}}
 
-  @each(action in actions)
-  async {{ action.name }}({ {{ action.context }} }: HttpContext) {
-    {{ action.logic }}
-  }
-  @end
+  {{{ actionLines }}}
 }