@anu8151/adonisjs-blueprint 0.4.6 → 0.4.8

package/build/src/generators/migration_generator.js

@@ -8,33 +8,33 @@ var MigrationGenerator = class extends BaseGenerator {
 		const processedAttributes = /* @__PURE__ */ new Set();
 		if (definition.attributes) for (const [attrName, attrType] of Object.entries(definition.attributes)) {
 			let migrationLine = "";
-			if (typeof attrType === "string") if (attrType === "foreign") migrationLine = `table.integer('${attrName}').unsigned().references('id').inTable('${string.plural(attrName.replace("_id", ""))}')`;
-			else if (attrType.startsWith("enum:")) migrationLine = `table.enum('${attrName}', [${attrType.split(":")[1].split(",").map((v) => `'${v.trim()}'`).join(", ")}])`;
+			if (typeof attrType === "string") if (attrType === "foreign") migrationLine = `table.integer('${attrName}').unsigned().references('id').inTable('${string.plural(attrName.replace("_id", "") || "")}')`;
+			else if (attrType.startsWith("enum:")) migrationLine = `table.enum('${attrName}', [${attrType.split(":")[1]?.split(",").map((v) => `'${v.trim()}'`).join(", ") || ""}])`;
 			else migrationLine = `table.${attrType}('${attrName}')`;
 			attributes.push({ migrationLine });
 			processedAttributes.add(attrName);
 		}
 		if (definition.relationships) {
-			for (const [relName, relType] of Object.entries(definition.relationships)) if (relType === "belongsTo" && !processedAttributes.has(`${relName}_id`)) attributes.push({ migrationLine: `table.integer('${relName}_id').unsigned().references('id').inTable('${string.plural(relName)}').onDelete('CASCADE')` });
+			for (const [relName, relValue] of Object.entries(definition.relationships)) if ((typeof relValue === "string" ? relValue : relValue.type) === "belongsTo" && !processedAttributes.has(`${relName}_id`)) attributes.push({ migrationLine: `table.integer('${relName}_id').unsigned().references('id').inTable('${string.plural(relName || "")}').onDelete('CASCADE')` });
 		}
 		if (definition.softDeletes) attributes.push({ migrationLine: `table.timestamp('deleted_at')` });
 		await this.generateStub("make/migration/main.stub", {
 			entity: {
 				...entity,
-				tableName: string.plural(string.snakeCase(entity.name))
+				tableName: string.plural(string.snakeCase(entity.name || ""))
 			},
 			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);
+			for (const [relName, relValue] of Object.entries(definition.relationships)) if ((typeof relValue === "string" ? relValue : relValue.type) === "belongsToMany") await this.generatePivotMigration(entity.name, relName);
 		}
 	}
 	async generatePivotMigration(modelA, modelB) {
-		const models = [string.snakeCase(modelA), string.snakeCase(modelB)].sort();
+		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')`];
+		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,

package/build/src/generators/model_generator.js

@@ -26,10 +26,13 @@ var ModelGenerator = class extends BaseGenerator {
 			attributes.push({ line: `${columnDecorator}\ndeclare ${attrName}: ${tsType}` });
 			processedAttributes.add(attrName);
 		}
-		if (definition.relationships) for (const [relName, relType] of Object.entries(definition.relationships)) {
+		if (definition.relationships) for (const [relName, relValue] of Object.entries(definition.relationships)) {
+			const relType = typeof relValue === "string" ? relValue : relValue.type;
+			if (!relType) continue;
 			const relatedModelName = string.pascalCase(string.singular(relName));
-			let relationshipLine = `@${relType}(() => ${relatedModelName})\ndeclare ${relName}: ${relType.charAt(0).toUpperCase() + relType.slice(1)}<typeof ${relatedModelName}>`;
-			if (relType === "belongsToMany") relationshipLine = `@${relType}(() => ${relatedModelName}, { pivotTable: '${[entity.className, relatedModelName].sort().map((m) => string.snakeCase(m)).join("_")}' })\ndeclare ${relName}: ${relType.charAt(0).toUpperCase() + relType.slice(1)}<typeof ${relatedModelName}>`;
+			const relTypeClass = relType.charAt(0).toUpperCase() + relType.slice(1);
+			let relationshipLine = `@${relType}(() => ${relatedModelName})\ndeclare ${relName}: ${relTypeClass}<typeof ${relatedModelName}>`;
+			if (relType === "belongsToMany") relationshipLine = `@${relType}(() => ${relatedModelName}, { pivotTable: '${[entity.className, relatedModelName].sort().map((m) => string.snakeCase(m || "")).join("_")}' })\ndeclare ${relName}: ${relTypeClass}<typeof ${relatedModelName}>`;
 			if (relType === "belongsTo") {
 				const foreignKey = `${string.camelCase(relName)}Id`;
 				if (!processedAttributes.has(foreignKey)) {
@@ -38,7 +41,7 @@ var ModelGenerator = class extends BaseGenerator {
 				}
 			}
 			relationships.push({
-				importLine: `import { ${relType} } from '@adonisjs/lucid/orm'\nimport type { ${relType.charAt(0).toUpperCase() + relType.slice(1)} } from '@adonisjs/lucid/types'\nimport ${relatedModelName} from '#models/${string.snakeCase(relatedModelName)}'`,
+				importLine: `import { ${relType} } from '@adonisjs/lucid/orm'\nimport type { ${relTypeClass} } from '@adonisjs/lucid/types'\nimport ${relatedModelName} from '#models/${string.snakeCase(relatedModelName || "")}'`,
 				line: relationshipLine
 			});
 		}

package/build/src/generators/seeder_generator.js

@@ -8,7 +8,8 @@ var SeederGenerator = class extends BaseGenerator {
 		await this.generateStub("make/seeder/main.stub", {
 			entity,
 			count,
-			data
+			data,
+			dataString: data ? JSON.stringify(data, null, 2) : null
 		});
 	}
 };

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

@@ -13,7 +13,7 @@ import { {{ entity.className }}Factory } from '#database/factories/{{ entity.nam
 export default class extends BaseSeeder {
   async run() {
     @if(data)
-    await {{ entity.className }}.createMany({{ inspect(data) }})
+    await {{ entity.className }}.createMany({{{ dataString }}})
     @else
     await {{ entity.className }}Factory.createMany({{ count }})
     @end

package/package.json

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

package/stubs/make/seeder/main.stub

@@ -13,7 +13,7 @@ import { {{ entity.className }}Factory } from '#database/factories/{{ entity.nam
 export default class extends BaseSeeder {
   async run() {
     @if(data)
-    await {{ entity.className }}.createMany({{ inspect(data) }})
+    await {{ entity.className }}.createMany({{{ dataString }}})
     @else
     await {{ entity.className }}Factory.createMany({{ count }})
     @end