@anu8151/adonisjs-blueprint 0.4.4 → 0.4.6

package/build/src/generators/factory_generator.js

@@ -42,7 +42,10 @@ var FactoryGenerator = class extends BaseGenerator {
 			entity,
 			attributes,
 			relationships,
-			factoryImports: Array.from(factoryImports)
+			factoryImports: Array.from(factoryImports),
+			imports: Array.from(factoryImports).map((f) => `import { ${f} } from './${f.replace("Factory", "").toLowerCase()}_factory'`).join("\n"),
+			attributesLines: attributes.map((a) => `${a.name}: faker.${a.fakerMethod}()`).join(",\n      "),
+			relationsLines: relationships.filter((r) => r.type === "hasMany" || r.type === "belongsToMany").map((r) => `.relation('${r.name}', () => ${r.model}Factory)`).join("\n  ")
 		});
 	}
 };

package/build/src/generators/migration_generator.js

@@ -23,7 +23,8 @@ var MigrationGenerator = class extends BaseGenerator {
 				...entity,
 				tableName: string.plural(string.snakeCase(entity.name))
 			},
-			attributes
+			attributes,
+			attributesLines: attributes.map((a) => a.migrationLine).join("\n      ")
 		});
 		if (definition.relationships) {
 			for (const [relName, relType] of Object.entries(definition.relationships)) if (relType === "belongsToMany") await this.generatePivotMigration(entity.name, relName);
@@ -33,12 +34,14 @@ var MigrationGenerator = class extends BaseGenerator {
 		const models = [string.snakeCase(modelA), string.snakeCase(modelB)].sort();
 		const tableName = `${models[0]}_${models[1]}`;
 		const entity = this.app.generators.createEntity(tableName);
+		const pivotAttributes = [`table.integer('${models[0]}_id').unsigned().references('id').inTable('${string.plural(models[0])}').onDelete('CASCADE')`, `table.integer('${models[1]}_id').unsigned().references('id').inTable('${string.plural(models[1])}').onDelete('CASCADE')`];
 		await this.generateStub("make/migration/main.stub", {
 			entity: {
 				...entity,
 				tableName
 			},
-			attributes: [{ migrationLine: `table.integer('${models[0]}_id').unsigned().references('id').inTable('${string.plural(models[0])}').onDelete('CASCADE')` }, { migrationLine: `table.integer('${models[1]}_id').unsigned().references('id').inTable('${string.plural(models[1])}').onDelete('CASCADE')` }]
+			attributes: pivotAttributes.map((a) => ({ migrationLine: a })),
+			attributesLines: pivotAttributes.join("\n      ")
 		});
 	}
 };

package/build/src/generators/model_generator.js

@@ -46,7 +46,9 @@ var ModelGenerator = class extends BaseGenerator {
 		if (!processedAttributes.has("updatedAt")) attributes.push({ line: "@column.dateTime({ autoCreate: true, autoUpdate: true })\ndeclare updatedAt: DateTime" });
 		await this.generateStub("make/model/main.stub", {
 			entity,
-			attributes: attributes.map((a) => a.line).join("\n\n  "),
+			attributes,
+			attributesLines: attributes.map((a) => a.line).join("\n\n  "),
+			relationships,
 			relationshipsImports: relationships.map((r) => r.importLine).join("\n"),
 			relationshipsLines: relationships.map((r) => r.line).join("\n\n  "),
 			modelImports,

package/build/src/generators/validator_generator.js

@@ -62,7 +62,9 @@ var ValidatorGenerator = class extends BaseGenerator {
 		}
 		await this.generateStub("make/validator/main.stub", {
 			entity,
-			attributes
+			attributes,
+			createSchema: attributes.map((a) => `${a.name}: vine.${a.vineType}`).join(",\n    "),
+			updateSchema: attributes.map((a) => `${a.name}: vine.${a.vineType}${a.vineType.includes(".optional()") ? "" : ".optional()"}`).join(",\n    ")
 		}, definition.stub);
 	}
 };

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

@@ -5,21 +5,13 @@
 }}}
 import {{ entity.className }} from '#models/{{ entity.name.toLowerCase() }}'
 import Factory from '@adonisjs/lucid/factories'
-@each(factory in factoryImports)
-import { {{ factory }} } from './{{ factory.replace('Factory', '').toLowerCase() }}_factory'
-@end
+{{{ imports }}}
 
 export const {{ entity.className }}Factory = Factory
   .define({{ entity.className }}, ({ faker }) => {
     return {
-      @each(attribute in attributes)
-      {{ attribute.name }}: faker.{{ attribute.fakerMethod }}(),
-      @end
+      {{{ attributesLines }}}
     }
   })
-  @each(rel in relationships)
-  @if(rel.type === 'hasMany' || rel.type === 'belongsToMany')
-  .relation('{{ rel.name }}', () => {{ rel.model }}Factory)
-  @end
-  @end
+  {{{ relationsLines }}}
   .build()

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

@@ -11,9 +11,7 @@ export default class extends BaseSchema {
   async up() {
     this.schema.createTable(this.tableName, (table) => {
       table.increments('id').primary()
-      @each(attribute in attributes)
-      {{ attribute.migrationLine }}
-      @end
+      {{{ attributesLines }}}
       table.timestamp('created_at')
       table.timestamp('updated_at')
     })

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

@@ -7,7 +7,7 @@
 {{{ relationshipsImports }}}
 
 {{{ modelSignature }}}
-  {{{ attributes }}}
+  {{{ attributesLines }}}
 
   {{{ relationshipsLines }}}
 }

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

@@ -7,16 +7,12 @@ import vine from '@vinejs/vine'
 
 export const create{{ entity.className }}Validator = vine.compile(
   vine.object({
-    @each(attribute in attributes)
-    {{ attribute.name }}: vine.{{ attribute.vineType }}(),
-    @end
+    {{{ createSchema }}}
   })
 )
 
 export const update{{ entity.className }}Validator = vine.compile(
   vine.object({
-    @each(attribute in attributes)
-    {{ attribute.name }}: vine.{{ attribute.vineType }}().optional(),
-    @end
+    {{{ updateSchema }}}
   })
 )

package/package.json

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

package/stubs/make/factory/main.stub

@@ -5,21 +5,13 @@
 }}}
 import {{ entity.className }} from '#models/{{ entity.name.toLowerCase() }}'
 import Factory from '@adonisjs/lucid/factories'
-@each(factory in factoryImports)
-import { {{ factory }} } from './{{ factory.replace('Factory', '').toLowerCase() }}_factory'
-@end
+{{{ imports }}}
 
 export const {{ entity.className }}Factory = Factory
   .define({{ entity.className }}, ({ faker }) => {
     return {
-      @each(attribute in attributes)
-      {{ attribute.name }}: faker.{{ attribute.fakerMethod }}(),
-      @end
+      {{{ attributesLines }}}
     }
   })
-  @each(rel in relationships)
-  @if(rel.type === 'hasMany' || rel.type === 'belongsToMany')
-  .relation('{{ rel.name }}', () => {{ rel.model }}Factory)
-  @end
-  @end
+  {{{ relationsLines }}}
   .build()

package/stubs/make/migration/main.stub

@@ -11,9 +11,7 @@ export default class extends BaseSchema {
   async up() {
     this.schema.createTable(this.tableName, (table) => {
       table.increments('id').primary()
-      @each(attribute in attributes)
-      {{ attribute.migrationLine }}
-      @end
+      {{{ attributesLines }}}
       table.timestamp('created_at')
       table.timestamp('updated_at')
     })

package/stubs/make/model/main.stub

@@ -7,7 +7,7 @@
 {{{ relationshipsImports }}}
 
 {{{ modelSignature }}}
-  {{{ attributes }}}
+  {{{ attributesLines }}}
 
   {{{ relationshipsLines }}}
 }

package/stubs/make/validator/main.stub

@@ -7,16 +7,12 @@ import vine from '@vinejs/vine'
 
 export const create{{ entity.className }}Validator = vine.compile(
   vine.object({
-    @each(attribute in attributes)
-    {{ attribute.name }}: vine.{{ attribute.vineType }}(),
-    @end
+    {{{ createSchema }}}
   })
 )
 
 export const update{{ entity.className }}Validator = vine.compile(
   vine.object({
-    @each(attribute in attributes)
-    {{ attribute.name }}: vine.{{ attribute.vineType }}().optional(),
-    @end
+    {{{ updateSchema }}}
   })
 )