feat: singularize embedded field names

Author: eEQK

package.json

@@ -12,12 +12,14 @@
 	"author": "",
 	"license": "ISC",
 	"devDependencies": {
+		"@types/inflected": "^2.1.3",
 		"esbuild": "^0.19.5",
 		"typescript": "^5.2.2"
 	},
 	"workspaces": ["test"],
 	"dependencies": {
 		"@bufbuild/protobuf": "^1.4.2",
+		"inflected": "^2.1.0",
 		"javy": "^0.1.2"
 	}
 }

src/app.ts

@@ -29,6 +29,7 @@ import {
 
 import { Driver as PostgresDriver } from "./drivers/postgres";
 import { argName, colName } from "./drivers/utlis";
+import { singularize } from "inflected";
 
 // Read input from stdin
 const input = readInput();
@@ -354,7 +355,7 @@ function rowDecl(
 
 			return factory.createPropertySignature(
 				undefined,
-				factory.createIdentifier(column.name),
+				factory.createIdentifier(singularize(column.name)),
 				undefined,
 				factory.createTypeLiteralNode(
 					embed.map((column, j) =>

src/drivers/postgres.ts

@@ -10,6 +10,7 @@ import {
 
 import type { Column, Parameter } from "../gen/plugin/codegen_pb";
 import { argName, colName } from "./utlis";
+import { singularize } from "inflected";
 
 const typeMapping = {
 	string: [
@@ -476,7 +477,7 @@ export class Driver {
 		return factory.createObjectLiteralExpression(
 			columns.map((col, i) =>
 				factory.createPropertyAssignment(
-					factory.createIdentifier(colName(i, col)),
+					factory.createIdentifier(singularize(colName(i, col))),
 					!embeds.has(col.name)
 						? this.buildColumnAccessExpression(col, "row", i)
 						: factory.createObjectLiteralExpression(

test/cases/embed.test.ts

@@ -14,7 +14,7 @@ describe("sqlc.embed", () => {
 		console.log(result);
 		expect(result.em1).toBe("[email protected]");
 		expect(result.em1).toBeTypeOf("string");
-		expect(result.authors).toMatchObject({
+		expect(result.author).toMatchObject({
 			id: expect.any(Number),
 			name: "John Doe",
 			bio: "A mysterious author",