prisma-kysely 2.1.0 → 2.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -3
- package/dist/__test__/e2e.test.js +90 -0
- package/dist/__test__/e2e.test.js.map +1 -1
- package/dist/generator.js +1 -0
- package/dist/generator.js.map +1 -1
- package/dist/helpers/generateDatabaseType.js +5 -1
- package/dist/helpers/generateDatabaseType.js.map +1 -1
- package/dist/helpers/generateDatabaseType.test.js +28 -0
- package/dist/helpers/generateDatabaseType.test.js.map +1 -1
- package/dist/helpers/generateFieldType.test.js +6 -0
- package/dist/helpers/generateFieldType.test.js.map +1 -1
- package/dist/helpers/generateFile.js +2 -2
- package/dist/helpers/generateFile.js.map +1 -1
- package/dist/helpers/generateFile.test.js +11 -0
- package/dist/helpers/generateFile.test.js.map +1 -1
- package/dist/helpers/generateFiles.js +16 -6
- package/dist/helpers/generateFiles.js.map +1 -1
- package/dist/helpers/generateModel.test.js +2 -0
- package/dist/helpers/generateModel.test.js.map +1 -1
- package/dist/helpers/wrappedTypeHelpers.js +27 -0
- package/dist/helpers/wrappedTypeHelpers.js.map +1 -0
- package/dist/helpers/wrappedTypeHelpers.test.js +27 -0
- package/dist/helpers/wrappedTypeHelpers.test.js.map +1 -0
- package/dist/utils/normalizeCase.test.js +2 -0
- package/dist/utils/normalizeCase.test.js.map +1 -1
- package/dist/utils/validateConfig.js +1 -0
- package/dist/utils/validateConfig.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -82,12 +82,13 @@ hope it's just as useful for you! 😎
|
|
|
82
82
|
| `importExtension` | The extension to append to imports. E.g: `".js"` or `".ts"`. Use `""` to append nothing. | `""` |
|
|
83
83
|
| `enumFileName` | The filename for the generated enums. Omitting this will generate enums and files in the same file. | |
|
|
84
84
|
| `camelCase` | Enable support for Kysely's camelCase plugin | `false` |
|
|
85
|
+
| `exportWrappedTypes` | Kysely wrapped types such as `Selectable<Model>` are also exported as described in the [Kysely documentation](https://kysely.dev/docs/getting-started#types). The exported types follow the naming conventions of the document. | `false` |
|
|
85
86
|
| `readOnlyIds` | Use Kysely's `GeneratedAlways` for `@id` fields with default values, preventing insert and update. | `false` |
|
|
86
87
|
| `[typename]TypeOverride` | Allows you to override the resulting TypeScript type for any Prisma type. Useful when targeting a different environment than Node (e.g. WinterCG compatible runtimes that use UInt8Arrays instead of Buffers for binary types etc.) Check out the [config validator](https://github.com/valtyr/prisma-kysely/blob/main/src/utils/validateConfig.ts) for a complete list of options. | |
|
|
87
88
|
| `dbTypeName` | Allows you to override the exported type with all tables | `DB` |
|
|
88
|
-
| `groupBySchema` | When using
|
|
89
|
-
| `filterBySchema` | When using
|
|
90
|
-
| `defaultSchema` | When using
|
|
89
|
+
| `groupBySchema` | When using multiple schemas, group all models and enums for a schema into their own namespace. (Ex: `model Dog { @@schema("animals") }` will be available under `Animals.Dog`) | `false` |
|
|
90
|
+
| `filterBySchema` | When using multiple schemas, only include models and enums for the specified schema. | `false` |
|
|
91
|
+
| `defaultSchema` | When using multiple schemas, declare `which schema should not be wrapped by a namespace. | `'public'` |
|
|
91
92
|
|
|
92
93
|
### Per-field type overrides
|
|
93
94
|
|
|
@@ -53,6 +53,7 @@ const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
|
|
|
53
53
|
B: string;
|
|
54
54
|
};`);
|
|
55
55
|
(0, vitest_1.expect)(generatedSource).toContain("_SprocketToTestUser: SprocketToTestUser");
|
|
56
|
+
(0, vitest_1.expect)(generatedSource).not.toContain("Insertable");
|
|
56
57
|
});
|
|
57
58
|
(0, vitest_1.test)("End to end test - with custom type override", { timeout: 20000 }, async () => {
|
|
58
59
|
await exec("yarn prisma init --datasource-provider sqlite");
|
|
@@ -557,4 +558,93 @@ enum Color {
|
|
|
557
558
|
author: string;
|
|
558
559
|
};`);
|
|
559
560
|
});
|
|
561
|
+
(0, vitest_1.test)("End to end test - exportWrappedTypes", { timeout: 20000 }, async () => {
|
|
562
|
+
await exec("yarn prisma init --datasource-provider sqlite");
|
|
563
|
+
await promises_1.default.writeFile("./prisma/schema.prisma", `datasource db {
|
|
564
|
+
provider = "sqlite"
|
|
565
|
+
url = "file:./dev.db"
|
|
566
|
+
}
|
|
567
|
+
|
|
568
|
+
generator kysely {
|
|
569
|
+
provider = "node ./dist/bin.js"
|
|
570
|
+
exportWrappedTypes = true
|
|
571
|
+
}
|
|
572
|
+
|
|
573
|
+
model User {
|
|
574
|
+
id String @id
|
|
575
|
+
name String
|
|
576
|
+
}`);
|
|
577
|
+
await exec("yarn prisma generate");
|
|
578
|
+
const generatedSource = await promises_1.default.readFile("./prisma/generated/types.ts", {
|
|
579
|
+
encoding: "utf-8",
|
|
580
|
+
});
|
|
581
|
+
(0, vitest_1.expect)(generatedSource).toContain("export type UserTable = {");
|
|
582
|
+
(0, vitest_1.expect)(generatedSource).toContain("export type User = Selectable<UserTable>;");
|
|
583
|
+
(0, vitest_1.expect)(generatedSource).toContain("export type NewUser = Insertable<UserTable>;");
|
|
584
|
+
(0, vitest_1.expect)(generatedSource).toContain("export type UserUpdate = Updateable<UserTable>;");
|
|
585
|
+
(0, vitest_1.expect)(generatedSource).toContain("export type DB = {\n User: UserTable;\n};");
|
|
586
|
+
});
|
|
587
|
+
(0, vitest_1.test)("End to end test - groupBySchema and exportWrappedTypes support", { timeout: 20000 }, async () => {
|
|
588
|
+
await exec("yarn prisma init --datasource-provider postgresql");
|
|
589
|
+
await promises_1.default.writeFile("./prisma/schema.prisma", `
|
|
590
|
+
generator kysely {
|
|
591
|
+
provider = "node ./dist/bin.js"
|
|
592
|
+
previewFeatures = ["multiSchema"]
|
|
593
|
+
groupBySchema = true
|
|
594
|
+
exportWrappedTypes = true
|
|
595
|
+
}
|
|
596
|
+
|
|
597
|
+
datasource db {
|
|
598
|
+
provider = "postgresql"
|
|
599
|
+
schemas = ["mammals", "birds", "world"]
|
|
600
|
+
url = env("TEST_DATABASE_URL")
|
|
601
|
+
}
|
|
602
|
+
|
|
603
|
+
model Elephant {
|
|
604
|
+
id Int @id
|
|
605
|
+
name String
|
|
606
|
+
ability Ability @default(WALK)
|
|
607
|
+
color Color
|
|
608
|
+
|
|
609
|
+
@@map("elephants")
|
|
610
|
+
@@schema("mammals")
|
|
611
|
+
}
|
|
612
|
+
|
|
613
|
+
model Eagle {
|
|
614
|
+
id Int @id
|
|
615
|
+
name String
|
|
616
|
+
ability Ability @default(FLY)
|
|
617
|
+
|
|
618
|
+
@@map("eagles")
|
|
619
|
+
@@schema("birds")
|
|
620
|
+
}
|
|
621
|
+
|
|
622
|
+
enum Ability {
|
|
623
|
+
FLY
|
|
624
|
+
WALK
|
|
625
|
+
|
|
626
|
+
@@schema("world")
|
|
627
|
+
}
|
|
628
|
+
|
|
629
|
+
enum Color {
|
|
630
|
+
GRAY
|
|
631
|
+
PINK
|
|
632
|
+
|
|
633
|
+
@@schema("mammals")
|
|
634
|
+
}
|
|
635
|
+
`);
|
|
636
|
+
await exec("yarn prisma generate");
|
|
637
|
+
const typeFile = await promises_1.default.readFile("./prisma/generated/types.ts", {
|
|
638
|
+
encoding: "utf-8",
|
|
639
|
+
});
|
|
640
|
+
(0, vitest_1.expect)(typeFile).toContain(`export namespace Birds {
|
|
641
|
+
export type EagleTable = {`);
|
|
642
|
+
(0, vitest_1.expect)(typeFile).toContain(`export namespace Mammals {
|
|
643
|
+
export const Color = {`);
|
|
644
|
+
(0, vitest_1.expect)(typeFile).toContain("color: Mammals.Color;");
|
|
645
|
+
(0, vitest_1.expect)(typeFile).toContain(`export type DB = {
|
|
646
|
+
"birds.eagles": Birds.EagleTable;
|
|
647
|
+
"mammals.elephants": Mammals.ElephantTable;
|
|
648
|
+
};`);
|
|
649
|
+
});
|
|
560
650
|
//# sourceMappingURL=e2e.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.test.js","sourceRoot":"","sources":["../../src/__test__/e2e.test.ts"],"names":[],"mappings":";;;;;AAAA,2DAAoD;AACpD,gEAAkC;AAClC,yCAAsC;AACtC,mCAA6D;AAE7D,MAAM,IAAI,GAAG,IAAA,qBAAS,EAAC,yBAAM,CAAC,CAAC;AAE/B,IAAA,mBAAU,EAAC,KAAK,IAAI,EAAE;IACpB,MAAM,kBAAE,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAC9D,CAAC,CAAC,CAAC;AAEH,IAAA,kBAAS,EAAC,KAAK,IAAI,EAAE;IACnB,MAAM,kBAAE;SACL,EAAE,CAAC,UAAU,EAAE;QACd,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,IAAI;KAChB,CAAC;SACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACnB,MAAM,kBAAE,CAAC,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAC9D,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,IAAI,EAAE;IAErD,MAAM,IAAI,CAAC,+CAA+C,CAAC,CAAC;IAG5D,MAAM,kBAAE,CAAC,SAAS,CAChB,wBAAwB,EACxB;;;;;;;;;;;;;;;;;;;;;MAqBE,CACH,CAAC;IAGF,MAAM,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAEnC,MAAM,eAAe,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,6BAA6B,EAAE;QACvE,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IAEH,IAAA,eAAM,EAAC,eAAe,CAAC,CAAC,SAAS,CAAC;;;GAGjC,CAAC,CAAC;IAEH,IAAA,eAAM,EAAC,eAAe,CAAC,CAAC,SAAS,CAAC,yCAAyC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"e2e.test.js","sourceRoot":"","sources":["../../src/__test__/e2e.test.ts"],"names":[],"mappings":"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"}
|
package/dist/generator.js
CHANGED
|
@@ -72,6 +72,7 @@ const { version } = require("../package.json");
|
|
|
72
72
|
groupBySchema: config.groupBySchema,
|
|
73
73
|
defaultSchema: config.defaultSchema,
|
|
74
74
|
importExtension: config.importExtension,
|
|
75
|
+
exportWrappedTypes: config.exportWrappedTypes,
|
|
75
76
|
});
|
|
76
77
|
await Promise.allSettled(files.map(({ filepath, content }) => {
|
|
77
78
|
var _a;
|
package/dist/generator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const typescript_1 = __importDefault(require("typescript"));
|
|
|
8
8
|
const isValidTSIdentifier_1 = __importDefault(require("../utils/isValidTSIdentifier"));
|
|
9
9
|
const normalizeCase_1 = require("../utils/normalizeCase");
|
|
10
10
|
const sorted_1 = require("../utils/sorted");
|
|
11
|
+
const wrappedTypeHelpers_1 = require("./wrappedTypeHelpers");
|
|
11
12
|
const generateDatabaseType = (models, config) => {
|
|
12
13
|
const sortedModels = (0, sorted_1.sorted)(models, (a, b) => a.tableName.localeCompare(b.tableName));
|
|
13
14
|
const properties = sortedModels.map((field) => {
|
|
@@ -15,7 +16,10 @@ const generateDatabaseType = (models, config) => {
|
|
|
15
16
|
const nameIdentifier = (0, isValidTSIdentifier_1.default)(caseNormalizedTableName)
|
|
16
17
|
? typescript_1.default.factory.createIdentifier(caseNormalizedTableName)
|
|
17
18
|
: typescript_1.default.factory.createStringLiteral(caseNormalizedTableName);
|
|
18
|
-
|
|
19
|
+
const typeName = config.exportWrappedTypes
|
|
20
|
+
? (0, wrappedTypeHelpers_1.toTableTypeName)(field.typeName)
|
|
21
|
+
: field.typeName;
|
|
22
|
+
return typescript_1.default.factory.createPropertySignature(undefined, nameIdentifier, undefined, typescript_1.default.factory.createTypeReferenceNode(typescript_1.default.factory.createIdentifier(typeName), undefined));
|
|
19
23
|
});
|
|
20
24
|
return typescript_1.default.factory.createTypeAliasDeclaration([typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], typescript_1.default.factory.createIdentifier(config.dbTypeName), undefined, typescript_1.default.factory.createTypeLiteralNode(properties));
|
|
21
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateDatabaseType.js","sourceRoot":"","sources":["../../src/helpers/generateDatabaseType.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4B;AAE5B,uFAA8D;AAC9D,0DAAsD;AACtD,4CAAwC;
|
|
1
|
+
{"version":3,"file":"generateDatabaseType.js","sourceRoot":"","sources":["../../src/helpers/generateDatabaseType.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4B;AAE5B,uFAA8D;AAC9D,0DAAsD;AACtD,4CAAwC;AAGxC,6DAAuD;AAEhD,MAAM,oBAAoB,GAAG,CAClC,MAAiD,EACjD,MAAc,EACd,EAAE;IACF,MAAM,YAAY,GAAG,IAAA,eAAM,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC3C,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CACvC,CAAC;IAEF,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,MAAM,uBAAuB,GAAG,IAAA,6BAAa,EAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAMvE,MAAM,cAAc,GAAG,IAAA,6BAAmB,EAAC,uBAAuB,CAAC;YACjE,CAAC,CAAC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,uBAAuB,CAAC;YACtD,CAAC,CAAC,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;QAE5D,MAAM,QAAQ,GAAG,MAAM,CAAC,kBAAkB;YACxC,CAAC,CAAC,IAAA,oCAAe,EAAC,KAAK,CAAC,QAAQ,CAAC;YACjC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QAEnB,OAAO,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CACvC,SAAS,EACT,cAAc,EACd,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAChC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EACrC,SAAS,CACV,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,oBAAE,CAAC,OAAO,CAAC,0BAA0B,CAC1C,CAAC,oBAAE,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EACxD,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,EAC9C,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAC7C,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,oBAAoB,wBAwC/B"}
|
|
@@ -18,6 +18,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
18
18
|
defaultSchema: "public",
|
|
19
19
|
dbTypeName: "DB",
|
|
20
20
|
importExtension: "",
|
|
21
|
+
exportWrappedTypes: false,
|
|
21
22
|
});
|
|
22
23
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
23
24
|
(0, vitest_1.expect)(result).toEqual(`export type DB = {
|
|
@@ -41,6 +42,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
41
42
|
defaultSchema: "public",
|
|
42
43
|
dbTypeName: "DB",
|
|
43
44
|
importExtension: "",
|
|
45
|
+
exportWrappedTypes: false,
|
|
44
46
|
});
|
|
45
47
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
46
48
|
(0, vitest_1.expect)(result).toEqual(`export type DB = {
|
|
@@ -49,6 +51,30 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
49
51
|
userTable: User;
|
|
50
52
|
};`);
|
|
51
53
|
});
|
|
54
|
+
(0, vitest_1.test)("it respects exportWrappedTypes option", () => {
|
|
55
|
+
const node = (0, generateDatabaseType_1.generateDatabaseType)([
|
|
56
|
+
{ tableName: "book_mark", typeName: "Bookmark" },
|
|
57
|
+
{ tableName: "session", typeName: "Session" },
|
|
58
|
+
{ tableName: "user_table", typeName: "User" },
|
|
59
|
+
], {
|
|
60
|
+
databaseProvider: "postgresql",
|
|
61
|
+
fileName: "",
|
|
62
|
+
enumFileName: "",
|
|
63
|
+
camelCase: false,
|
|
64
|
+
readOnlyIds: false,
|
|
65
|
+
groupBySchema: false,
|
|
66
|
+
defaultSchema: "public",
|
|
67
|
+
dbTypeName: "DB",
|
|
68
|
+
importExtension: "",
|
|
69
|
+
exportWrappedTypes: true,
|
|
70
|
+
});
|
|
71
|
+
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
72
|
+
(0, vitest_1.expect)(result).toEqual(`export type DB = {
|
|
73
|
+
book_mark: BookmarkTable;
|
|
74
|
+
session: SessionTable;
|
|
75
|
+
user_table: UserTable;
|
|
76
|
+
};`);
|
|
77
|
+
});
|
|
52
78
|
(0, vitest_1.test)("it works for table names with spaces and weird symbols", () => {
|
|
53
79
|
const node = (0, generateDatabaseType_1.generateDatabaseType)([
|
|
54
80
|
{ tableName: "Bookmark", typeName: "Bookmark" },
|
|
@@ -64,6 +90,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
64
90
|
defaultSchema: "public",
|
|
65
91
|
dbTypeName: "DB",
|
|
66
92
|
importExtension: "",
|
|
93
|
+
exportWrappedTypes: false,
|
|
67
94
|
});
|
|
68
95
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
69
96
|
(0, vitest_1.expect)(result).toEqual(`export type DB = {
|
|
@@ -88,6 +115,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
88
115
|
defaultSchema: "public",
|
|
89
116
|
dbTypeName: random,
|
|
90
117
|
importExtension: "",
|
|
118
|
+
exportWrappedTypes: false,
|
|
91
119
|
});
|
|
92
120
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
93
121
|
(0, vitest_1.expect)(result).toEqual(`export type ${random} = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateDatabaseType.test.js","sourceRoot":"","sources":["../../src/helpers/generateDatabaseType.test.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AAEtC,iEAAsE;AACtE,kDAAoD;AAEpD,IAAA,aAAI,EAAC,uCAAuC,EAAE,GAAG,EAAE;IACjD,MAAM,IAAI,GAAG,IAAA,2CAAoB,EAC/B;QACE,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE;QAC/C,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE;QAC7C,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;KACxC,EACD;QACE,gBAAgB,EAAE,YAAY;QAC9B,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,KAAK;QAChB,WAAW,EAAE,KAAK;QAClB,aAAa,EAAE,KAAK;QACpB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"generateDatabaseType.test.js","sourceRoot":"","sources":["../../src/helpers/generateDatabaseType.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ const generateFieldType_1 = require("./generateFieldType");
|
|
|
26
26
|
defaultSchema: "public",
|
|
27
27
|
dbTypeName: "DB",
|
|
28
28
|
importExtension: "",
|
|
29
|
+
exportWrappedTypes: false,
|
|
29
30
|
};
|
|
30
31
|
const sourceTypes = [
|
|
31
32
|
"String",
|
|
@@ -53,6 +54,7 @@ const generateFieldType_1 = require("./generateFieldType");
|
|
|
53
54
|
defaultSchema: "public",
|
|
54
55
|
dbTypeName: "DB",
|
|
55
56
|
importExtension: "",
|
|
57
|
+
exportWrappedTypes: false,
|
|
56
58
|
});
|
|
57
59
|
(0, vitest_1.expect)(node).toEqual("cheese");
|
|
58
60
|
});
|
|
@@ -67,6 +69,7 @@ const generateFieldType_1 = require("./generateFieldType");
|
|
|
67
69
|
defaultSchema: "public",
|
|
68
70
|
dbTypeName: "DB",
|
|
69
71
|
importExtension: "",
|
|
72
|
+
exportWrappedTypes: false,
|
|
70
73
|
});
|
|
71
74
|
const mysqlBooleanType = (0, generateFieldType_1.generateFieldType)("Boolean", {
|
|
72
75
|
databaseProvider: "mysql",
|
|
@@ -78,6 +81,7 @@ const generateFieldType_1 = require("./generateFieldType");
|
|
|
78
81
|
defaultSchema: "public",
|
|
79
82
|
dbTypeName: "DB",
|
|
80
83
|
importExtension: "",
|
|
84
|
+
exportWrappedTypes: false,
|
|
81
85
|
});
|
|
82
86
|
const sqliteBooleanType = (0, generateFieldType_1.generateFieldType)("Boolean", {
|
|
83
87
|
databaseProvider: "sqlite",
|
|
@@ -89,6 +93,7 @@ const generateFieldType_1 = require("./generateFieldType");
|
|
|
89
93
|
defaultSchema: "public",
|
|
90
94
|
dbTypeName: "DB",
|
|
91
95
|
importExtension: "",
|
|
96
|
+
exportWrappedTypes: false,
|
|
92
97
|
});
|
|
93
98
|
(0, vitest_1.expect)(postgresBooleanType).toEqual("boolean");
|
|
94
99
|
(0, vitest_1.expect)(mysqlBooleanType).toEqual("number");
|
|
@@ -105,6 +110,7 @@ const generateFieldType_1 = require("./generateFieldType");
|
|
|
105
110
|
defaultSchema: "public",
|
|
106
111
|
dbTypeName: "DB",
|
|
107
112
|
importExtension: "",
|
|
113
|
+
exportWrappedTypes: false,
|
|
108
114
|
};
|
|
109
115
|
(0, vitest_1.expect)((0, generateFieldType_1.generateFieldType)("Json", config)).toEqual("unknown");
|
|
110
116
|
(0, vitest_1.expect)((0, generateFieldType_1.generateFieldType)("Json", { ...config, jsonTypeOverride: "custom" })).toEqual("custom");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateFieldType.test.js","sourceRoot":"","sources":["../../src/helpers/generateFieldType.test.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AAEtC,2DAAgE;AAGhE,IAAA,aAAI,EAAC,mDAAmD,EAAE,GAAG,EAAE;IAC7D,MAAM,SAAS,GAAG;QAChB,kBAAkB,EAAE,gBAAgB;QACpC,kBAAkB,EAAE,UAAU;QAC9B,mBAAmB,EAAE,SAAS;QAC9B,iBAAiB,EAAE,MAAM;QACzB,oBAAoB,EAAE,WAAW;QACjC,mBAAmB,EAAE,OAAO;QAC5B,iBAAiB,EAAE,MAAM;QACzB,eAAe,EAAE,KAAK;QACtB,gBAAgB,EAAE,QAAQ;QAC1B,uBAAuB,EAAE,OAAO;KACjC,CAAC;IAEF,MAAM,MAAM,GAAG;QACb,GAAG,SAAS;QACZ,gBAAgB,EAAE,YAAqB;QACvC,QAAQ,EAAE,UAAU;QACpB,YAAY,EAAE,UAAU;QACxB,SAAS,EAAE,KAAK;QAChB,WAAW,EAAE,KAAK;QAClB,aAAa,EAAE,KAAK;QACpB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"generateFieldType.test.js","sourceRoot":"","sources":["../../src/helpers/generateFieldType.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.generateFile = void 0;
|
|
7
7
|
const typescript_1 = __importDefault(require("typescript"));
|
|
8
8
|
const printer = typescript_1.default.createPrinter({ newLine: typescript_1.default.NewLineKind.LineFeed });
|
|
9
|
-
const generateFile = (statements, { withEnumImport, withLeader }) => {
|
|
9
|
+
const generateFile = (statements, { withEnumImport, withLeader, exportWrappedTypes }) => {
|
|
10
10
|
const file = typescript_1.default.factory.createSourceFile(statements, typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EndOfFileToken), typescript_1.default.NodeFlags.None);
|
|
11
11
|
const result = printer.printFile(file);
|
|
12
|
-
const leader = `import type { ColumnType${result.includes("GeneratedAlways") ? ", GeneratedAlways" : ""} } from "kysely";
|
|
12
|
+
const leader = `import type { ColumnType${result.includes("GeneratedAlways") ? ", GeneratedAlways" : ""}${exportWrappedTypes ? ", Insertable, Selectable, Updateable" : ""} } from "kysely";
|
|
13
13
|
export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
|
|
14
14
|
? ColumnType<S, I | undefined, U>
|
|
15
15
|
: ColumnType<T, T | undefined, T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateFile.js","sourceRoot":"","sources":["../../src/helpers/generateFile.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4B;AAE5B,MAAM,OAAO,GAAG,oBAAE,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,oBAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generateFile.js","sourceRoot":"","sources":["../../src/helpers/generateFile.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4B;AAE5B,MAAM,OAAO,GAAG,oBAAE,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,oBAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;AAQhE,MAAM,YAAY,GAAG,CAC1B,UAAmC,EACnC,EAAE,cAAc,EAAE,UAAU,EAAE,kBAAkB,EAAW,EAC3D,EAAE;IACF,MAAM,IAAI,GAAG,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CACtC,UAAU,EACV,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EACpD,oBAAE,CAAC,SAAS,CAAC,IAAI,CAClB,CAAC;IAEF,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEvC,MAAM,MAAM,GAAG,2BACb,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAC7D,GACE,kBAAkB,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC,CAAC,EAChE;;;;wEAIsE,CAAC;IAEvE,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,mBAAmB,GAAG,iBAAiB,cAAc,CAAC,KAAK,CAAC,IAAI,CACpE,IAAI,CACL,YAAY,cAAc,CAAC,UAAU,IAAI,CAAC;QAE3C,OAAO,UAAU;YACf,CAAC,CAAC,GAAG,MAAM,OAAO,mBAAmB,OAAO,MAAM,EAAE;YACpD,CAAC,CAAC,GAAG,mBAAmB,OAAO,MAAM,EAAE,CAAC;IAC5C,CAAC;IAED,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;AACxD,CAAC,CAAC;AAjCW,QAAA,YAAY,gBAiCvB"}
|
|
@@ -6,13 +6,24 @@ const generateFile_1 = require("./generateFile");
|
|
|
6
6
|
const resultwithLeader = (0, generateFile_1.generateFile)([], {
|
|
7
7
|
withEnumImport: false,
|
|
8
8
|
withLeader: true,
|
|
9
|
+
exportWrappedTypes: false,
|
|
9
10
|
});
|
|
10
11
|
(0, vitest_1.expect)(resultwithLeader).toContain('from "kysely";');
|
|
12
|
+
(0, vitest_1.expect)(resultwithLeader).not.toContain(', Insertable, Selectable, Updateable } from "kysely";');
|
|
11
13
|
const resultwithEnumImport = (0, generateFile_1.generateFile)([], {
|
|
12
14
|
withEnumImport: { importPath: "./enums", names: ["Foo", "Bar"] },
|
|
13
15
|
withLeader: false,
|
|
16
|
+
exportWrappedTypes: false,
|
|
14
17
|
});
|
|
15
18
|
(0, vitest_1.expect)(resultwithEnumImport).toContain('import type { Foo, Bar } from "./enums";');
|
|
16
19
|
(0, vitest_1.expect)(resultwithEnumImport).not.toContain('from "kysely";');
|
|
17
20
|
});
|
|
21
|
+
(0, vitest_1.test)("generates a file which imports Kysely wrapper types.", () => {
|
|
22
|
+
const resultwithLeader = (0, generateFile_1.generateFile)([], {
|
|
23
|
+
withEnumImport: false,
|
|
24
|
+
withLeader: true,
|
|
25
|
+
exportWrappedTypes: true,
|
|
26
|
+
});
|
|
27
|
+
(0, vitest_1.expect)(resultwithLeader).toContain(', Insertable, Selectable, Updateable } from "kysely";');
|
|
28
|
+
});
|
|
18
29
|
//# sourceMappingURL=generateFile.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateFile.test.js","sourceRoot":"","sources":["../../src/helpers/generateFile.test.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AAEtC,iDAAsD;AAEtD,IAAA,aAAI,EAAC,mBAAmB,EAAE,GAAG,EAAE;IAC7B,MAAM,gBAAgB,GAAG,IAAA,2BAAY,EAAC,EAAE,EAAE;QACxC,cAAc,EAAE,KAAK;QACrB,UAAU,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"generateFile.test.js","sourceRoot":"","sources":["../../src/helpers/generateFile.test.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AAEtC,iDAAsD;AAEtD,IAAA,aAAI,EAAC,mBAAmB,EAAE,GAAG,EAAE;IAC7B,MAAM,gBAAgB,GAAG,IAAA,2BAAY,EAAC,EAAE,EAAE;QACxC,cAAc,EAAE,KAAK;QACrB,UAAU,EAAE,IAAI;QAChB,kBAAkB,EAAE,KAAK;KAC1B,CAAC,CAAC;IACH,IAAA,eAAM,EAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAErD,IAAA,eAAM,EAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,SAAS,CACpC,uDAAuD,CACxD,CAAC;IAEF,MAAM,oBAAoB,GAAG,IAAA,2BAAY,EAAC,EAAE,EAAE;QAC5C,cAAc,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;QAChE,UAAU,EAAE,KAAK;QACjB,kBAAkB,EAAE,KAAK;KAC1B,CAAC,CAAC;IAEH,IAAA,eAAM,EAAC,oBAAoB,CAAC,CAAC,SAAS,CACpC,0CAA0C,CAC3C,CAAC;IACF,IAAA,eAAM,EAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,sDAAsD,EAAE,GAAG,EAAE;IAChE,MAAM,gBAAgB,GAAG,IAAA,2BAAY,EAAC,EAAE,EAAE;QACxC,cAAc,EAAE,KAAK;QACrB,UAAU,EAAE,IAAI;QAChB,kBAAkB,EAAE,IAAI;KACzB,CAAC,CAAC;IACH,IAAA,eAAM,EAAC,gBAAgB,CAAC,CAAC,SAAS,CAChC,uDAAuD,CACxD,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -9,35 +9,44 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
9
9
|
const typescript_1 = __importDefault(require("typescript"));
|
|
10
10
|
const generateFile_1 = require("./generateFile");
|
|
11
11
|
const words_1 = require("../utils/words");
|
|
12
|
+
const wrappedTypeHelpers_1 = require("./wrappedTypeHelpers");
|
|
12
13
|
function generateFiles(opts) {
|
|
14
|
+
const models = opts.models.map(({ definition, ...rest }) => ({
|
|
15
|
+
...rest,
|
|
16
|
+
definitions: opts.exportWrappedTypes
|
|
17
|
+
? (0, wrappedTypeHelpers_1.convertToWrappedTypes)(definition)
|
|
18
|
+
: [definition],
|
|
19
|
+
}));
|
|
13
20
|
if (opts.enumsOutfile === opts.typesOutfile || opts.enums.length === 0) {
|
|
14
21
|
let statements;
|
|
15
22
|
if (!opts.groupBySchema) {
|
|
16
23
|
statements = [
|
|
17
24
|
...opts.enums.flatMap((e) => [e.objectDeclaration, e.typeDeclaration]),
|
|
18
|
-
...
|
|
25
|
+
...models.flatMap((m) => m.definitions),
|
|
19
26
|
];
|
|
20
27
|
}
|
|
21
28
|
else {
|
|
22
|
-
statements = groupModelsAndEnum(opts.enums,
|
|
29
|
+
statements = groupModelsAndEnum(opts.enums, models, opts.defaultSchema);
|
|
23
30
|
}
|
|
24
31
|
const typesFileWithEnums = {
|
|
25
32
|
filepath: opts.typesOutfile,
|
|
26
33
|
content: (0, generateFile_1.generateFile)([...statements, opts.databaseType], {
|
|
27
34
|
withEnumImport: false,
|
|
28
35
|
withLeader: true,
|
|
36
|
+
exportWrappedTypes: opts.exportWrappedTypes,
|
|
29
37
|
}),
|
|
30
38
|
};
|
|
31
39
|
return [typesFileWithEnums];
|
|
32
40
|
}
|
|
33
41
|
const typesFileWithoutEnums = {
|
|
34
42
|
filepath: opts.typesOutfile,
|
|
35
|
-
content: (0, generateFile_1.generateFile)([...
|
|
43
|
+
content: (0, generateFile_1.generateFile)([...models.flatMap((m) => m.definitions), opts.databaseType], {
|
|
36
44
|
withEnumImport: {
|
|
37
45
|
importPath: `./${node_path_1.default.parse(opts.enumsOutfile).name}${opts.importExtension}`,
|
|
38
46
|
names: opts.enumNames,
|
|
39
47
|
},
|
|
40
48
|
withLeader: true,
|
|
49
|
+
exportWrappedTypes: opts.exportWrappedTypes,
|
|
41
50
|
}),
|
|
42
51
|
};
|
|
43
52
|
if (opts.enums.length === 0)
|
|
@@ -47,6 +56,7 @@ function generateFiles(opts) {
|
|
|
47
56
|
content: (0, generateFile_1.generateFile)(opts.enums.flatMap((e) => [e.objectDeclaration, e.typeDeclaration]), {
|
|
48
57
|
withEnumImport: false,
|
|
49
58
|
withLeader: false,
|
|
59
|
+
exportWrappedTypes: opts.exportWrappedTypes,
|
|
50
60
|
}),
|
|
51
61
|
};
|
|
52
62
|
return [typesFileWithoutEnums, enumFile];
|
|
@@ -72,15 +82,15 @@ function* groupModelsAndEnum(enums, models, defaultSchema) {
|
|
|
72
82
|
}
|
|
73
83
|
for (const model of models) {
|
|
74
84
|
if (!model.schema || model.schema === defaultSchema) {
|
|
75
|
-
yield model.
|
|
85
|
+
yield* model.definitions;
|
|
76
86
|
continue;
|
|
77
87
|
}
|
|
78
88
|
const group = groupsMap.get(model.schema);
|
|
79
89
|
if (!group) {
|
|
80
|
-
groupsMap.set(model.schema,
|
|
90
|
+
groupsMap.set(model.schema, model.definitions);
|
|
81
91
|
}
|
|
82
92
|
else {
|
|
83
|
-
group.push(model.
|
|
93
|
+
group.push(...model.definitions);
|
|
84
94
|
}
|
|
85
95
|
}
|
|
86
96
|
for (const [schema, group] of groupsMap) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateFiles.js","sourceRoot":"","sources":["../../src/helpers/generateFiles.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"generateFiles.js","sourceRoot":"","sources":["../../src/helpers/generateFiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,6 +97,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
97
97
|
defaultSchema: "public",
|
|
98
98
|
dbTypeName: "DB",
|
|
99
99
|
importExtension: "",
|
|
100
|
+
exportWrappedTypes: false,
|
|
100
101
|
}, {
|
|
101
102
|
groupBySchema: false,
|
|
102
103
|
defaultSchema: "public",
|
|
@@ -156,6 +157,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
156
157
|
defaultSchema: "public",
|
|
157
158
|
dbTypeName: "DB",
|
|
158
159
|
importExtension: "",
|
|
160
|
+
exportWrappedTypes: false,
|
|
159
161
|
}, {
|
|
160
162
|
groupBySchema: false,
|
|
161
163
|
defaultSchema: "public",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateModel.test.js","sourceRoot":"","sources":["../../src/helpers/generateModel.test.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AAEtC,mDAAwD;AACxD,kDAAoD;AAEpD,IAAA,aAAI,EAAC,uBAAuB,EAAE,GAAG,EAAE;IACjC,MAAM,KAAK,GAAG,IAAA,6BAAa,EACzB;QACE,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAI;gBACV,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;gBACnC,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;gBACd,eAAe,EAAE,IAAI;gBACrB,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,KAAK;aAChB;YACD;gBACE,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,KAAK;gBACX,WAAW,EAAE,KAAK;gBAClB,OAAO,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE;gBAClD,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;gBACd,eAAe,EAAE,IAAI;gBACrB,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,KAAK;aAChB;YACD;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,KAAK;gBACX,WAAW,EAAE,KAAK;gBAClB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;gBACd,eAAe,EAAE,KAAK;gBACtB,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;aAChB;YACD;gBACE,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,KAAK;gBACX,WAAW,EAAE,KAAK;gBAClB,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,QAAQ;gBACd,eAAe,EAAE,KAAK;gBACtB,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;aAChB;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,KAAK;gBACX,WAAW,EAAE,KAAK;gBAClB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,iBAAiB;gBACvB,eAAe,EAAE,KAAK;gBACtB,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;aAChB;YACD;gBACE,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,KAAK;gBACX,WAAW,EAAE,KAAK;gBAClB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,UAAU;gBAChB,eAAe,EAAE,KAAK;gBACtB,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,KAAK;aAChB;SACF;QACD,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE,EAAE;QAChB,aAAa,EAAE,EAAE;KAClB,EACD;QACE,gBAAgB,EAAE,QAAQ;QAC1B,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,KAAK;QAChB,WAAW,EAAE,KAAK;QAClB,aAAa,EAAE,KAAK;QACpB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"generateModel.test.js","sourceRoot":"","sources":["../../src/helpers/generateModel.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.convertToWrappedTypes = exports.toTableTypeName = void 0;
|
|
7
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
8
|
+
const toTableTypeName = (modelName) => `${modelName}Table`;
|
|
9
|
+
exports.toTableTypeName = toTableTypeName;
|
|
10
|
+
const convertToWrappedTypes = (modelDefinition) => {
|
|
11
|
+
const modelName = modelDefinition.name.text;
|
|
12
|
+
const tableTypeName = (0, exports.toTableTypeName)(modelName);
|
|
13
|
+
return [
|
|
14
|
+
{ ...modelDefinition, name: typescript_1.default.factory.createIdentifier(tableTypeName) },
|
|
15
|
+
typescript_1.default.factory.createTypeAliasDeclaration([typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], typescript_1.default.factory.createIdentifier(modelName), undefined, typescript_1.default.factory.createTypeReferenceNode("Selectable", [
|
|
16
|
+
typescript_1.default.factory.createTypeReferenceNode(tableTypeName, undefined),
|
|
17
|
+
])),
|
|
18
|
+
typescript_1.default.factory.createTypeAliasDeclaration([typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], typescript_1.default.factory.createIdentifier(`New${modelName}`), undefined, typescript_1.default.factory.createTypeReferenceNode("Insertable", [
|
|
19
|
+
typescript_1.default.factory.createTypeReferenceNode(tableTypeName, undefined),
|
|
20
|
+
])),
|
|
21
|
+
typescript_1.default.factory.createTypeAliasDeclaration([typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], typescript_1.default.factory.createIdentifier(`${modelName}Update`), undefined, typescript_1.default.factory.createTypeReferenceNode("Updateable", [
|
|
22
|
+
typescript_1.default.factory.createTypeReferenceNode(tableTypeName, undefined),
|
|
23
|
+
])),
|
|
24
|
+
];
|
|
25
|
+
};
|
|
26
|
+
exports.convertToWrappedTypes = convertToWrappedTypes;
|
|
27
|
+
//# sourceMappingURL=wrappedTypeHelpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wrappedTypeHelpers.js","sourceRoot":"","sources":["../../src/helpers/wrappedTypeHelpers.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4B;AAErB,MAAM,eAAe,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC,GAAG,SAAS,OAAO,CAAC;AAA7D,QAAA,eAAe,mBAA8C;AAMnE,MAAM,qBAAqB,GAAG,CACnC,eAAwC,EACb,EAAE;IAC7B,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;IAC5C,MAAM,aAAa,GAAG,IAAA,uBAAe,EAAC,SAAS,CAAC,CAAC;IACjD,OAAO;QACL,EAAE,GAAG,eAAe,EAAE,IAAI,EAAE,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE;QACxE,oBAAE,CAAC,OAAO,CAAC,0BAA0B,CACnC,CAAC,oBAAE,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EACxD,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACtC,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,YAAY,EAAE;YAC/C,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,aAAa,EAAE,SAAS,CAAC;SAC7D,CAAC,CACH;QACD,oBAAE,CAAC,OAAO,CAAC,0BAA0B,CACnC,CAAC,oBAAE,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EACxD,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,SAAS,EAAE,CAAC,EAC9C,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,YAAY,EAAE;YAC/C,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,aAAa,EAAE,SAAS,CAAC;SAC7D,CAAC,CACH;QACD,oBAAE,CAAC,OAAO,CAAC,0BAA0B,CACnC,CAAC,oBAAE,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EACxD,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,SAAS,QAAQ,CAAC,EACjD,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,YAAY,EAAE;YAC/C,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,aAAa,EAAE,SAAS,CAAC;SAC7D,CAAC,CACH;KACF,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,qBAAqB,yBAgChC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
7
|
+
const vitest_1 = require("vitest");
|
|
8
|
+
const testUtils_1 = require("../utils/testUtils");
|
|
9
|
+
const wrappedTypeHelpers_1 = require("./wrappedTypeHelpers");
|
|
10
|
+
(0, vitest_1.test)("it returns Kysely wrapped types", () => {
|
|
11
|
+
const modelDefinition = typescript_1.default.factory.createTypeAliasDeclaration([typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], "User", undefined, typescript_1.default.factory.createTypeLiteralNode([
|
|
12
|
+
typescript_1.default.factory.createPropertySignature(undefined, "id", undefined, typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.StringKeyword)),
|
|
13
|
+
typescript_1.default.factory.createPropertySignature(undefined, "name", undefined, typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.StringKeyword)),
|
|
14
|
+
]));
|
|
15
|
+
const results = (0, wrappedTypeHelpers_1.convertToWrappedTypes)(modelDefinition);
|
|
16
|
+
const resultsAsCode = results.map(testUtils_1.stringifyTsNode);
|
|
17
|
+
(0, vitest_1.expect)(resultsAsCode).toEqual([
|
|
18
|
+
`export type UserTable = {
|
|
19
|
+
id: string;
|
|
20
|
+
name: string;
|
|
21
|
+
};`,
|
|
22
|
+
"export type User = Selectable<UserTable>;",
|
|
23
|
+
"export type NewUser = Insertable<UserTable>;",
|
|
24
|
+
"export type UserUpdate = Updateable<UserTable>;",
|
|
25
|
+
]);
|
|
26
|
+
});
|
|
27
|
+
//# sourceMappingURL=wrappedTypeHelpers.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wrappedTypeHelpers.test.js","sourceRoot":"","sources":["../../src/helpers/wrappedTypeHelpers.test.ts"],"names":[],"mappings":";;;;;AAAA,4DAA4B;AAC5B,mCAAsC;AAEtC,kDAAoD;AAEpD,6DAA6D;AAE7D,IAAA,aAAI,EAAC,iCAAiC,EAAE,GAAG,EAAE;IAC3C,MAAM,eAAe,GAAG,oBAAE,CAAC,OAAO,CAAC,0BAA0B,CAC3D,CAAC,oBAAE,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EACxD,MAAM,EACN,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC;QAC/B,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAChC,SAAS,EACT,IAAI,EACJ,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAC9D;QACD,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAChC,SAAS,EACT,MAAM,EACN,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAC9D;KACF,CAAC,CACH,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,0CAAqB,EAAC,eAAe,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,2BAAe,CAAC,CAAC;IAEnD,IAAA,eAAM,EAAC,aAAa,CAAC,CAAC,OAAO,CAAC;QAC5B;;;GAGD;QACC,2CAA2C;QAC3C,8CAA8C;QAC9C,iDAAiD;KAClD,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -14,6 +14,7 @@ const normalizeCase_1 = require("./normalizeCase");
|
|
|
14
14
|
defaultSchema: "public",
|
|
15
15
|
dbTypeName: "DB",
|
|
16
16
|
importExtension: "",
|
|
17
|
+
exportWrappedTypes: false,
|
|
17
18
|
});
|
|
18
19
|
(0, vitest_1.expect)(newName).toEqual("userId");
|
|
19
20
|
});
|
|
@@ -29,6 +30,7 @@ const normalizeCase_1 = require("./normalizeCase");
|
|
|
29
30
|
defaultSchema: "public",
|
|
30
31
|
dbTypeName: "DB",
|
|
31
32
|
importExtension: "",
|
|
33
|
+
exportWrappedTypes: false,
|
|
32
34
|
});
|
|
33
35
|
(0, vitest_1.expect)(newName).toEqual("user_id");
|
|
34
36
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeCase.test.js","sourceRoot":"","sources":["../../src/utils/normalizeCase.test.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AAEtC,mDAAsD;AAEtD,IAAA,aAAI,EAAC,uDAAuD,EAAE,GAAG,EAAE;IACjE,MAAM,YAAY,GAAG,SAAS,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAA,6BAAa,EAAC,YAAY,EAAE;QAC1C,SAAS,EAAE,IAAI;QACf,gBAAgB,EAAE,YAAY;QAC9B,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,KAAK;QAClB,aAAa,EAAE,KAAK;QACpB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"normalizeCase.test.js","sourceRoot":"","sources":["../../src/utils/normalizeCase.test.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AAEtC,mDAAsD;AAEtD,IAAA,aAAI,EAAC,uDAAuD,EAAE,GAAG,EAAE;IACjE,MAAM,YAAY,GAAG,SAAS,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAA,6BAAa,EAAC,YAAY,EAAE;QAC1C,SAAS,EAAE,IAAI;QACf,gBAAgB,EAAE,YAAY;QAC9B,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,KAAK;QAClB,aAAa,EAAE,KAAK;QACpB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,EAAE;QACnB,kBAAkB,EAAE,KAAK;KAC1B,CAAC,CAAC;IAEH,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,iEAAiE,EAAE,GAAG,EAAE;IAC3E,MAAM,YAAY,GAAG,SAAS,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAA,6BAAa,EAAC,YAAY,EAAE;QAC1C,SAAS,EAAE,KAAK;QAChB,gBAAgB,EAAE,YAAY;QAC9B,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,KAAK;QAClB,aAAa,EAAE,KAAK;QACpB,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,EAAE;QACnB,kBAAkB,EAAE,KAAK;KAC1B,CAAC,CAAC;IAEH,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC"}
|
|
@@ -41,6 +41,7 @@ exports.configValidator = zod_1.default
|
|
|
41
41
|
groupBySchema: booleanStringLiteral.default(false),
|
|
42
42
|
defaultSchema: zod_1.default.string().default("public"),
|
|
43
43
|
filterBySchema: zod_1.default.array(zod_1.default.string()).optional(),
|
|
44
|
+
exportWrappedTypes: booleanStringLiteral.default(false),
|
|
44
45
|
})
|
|
45
46
|
.strict()
|
|
46
47
|
.transform((config) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateConfig.js","sourceRoot":"","sources":["../../src/utils/validateConfig.ts"],"names":[],"mappings":";;;;;;AAAA,iDAA2C;AAC3C,8CAAoB;AAEpB,MAAM,oBAAoB,GAAG,aAAC;KAC3B,KAAK,CAAC,CAAC,aAAC,CAAC,OAAO,EAAE,EAAE,aAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,aAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;KAC3D,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE;IACjB,IAAI,OAAO,GAAG,KAAK,SAAS;QAAE,OAAO,GAAG,CAAC;IACzC,OAAO,GAAG,KAAK,MAAM,CAAC;AACxB,CAAC,CAAC,CAAC;AAEQ,QAAA,eAAe,GAAG,aAAC;KAC7B,MAAM,CAAC;IAEN,gBAAgB,EAAE,aAAC,CAAC,KAAK,CAAC;QACxB,aAAC,CAAC,OAAO,CAAC,YAAY,CAAC;QACvB,aAAC,CAAC,OAAO,CAAC,aAAa,CAAC;QACxB,aAAC,CAAC,OAAO,CAAC,OAAO,CAAC;QAClB,aAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;QACnB,aAAC,CAAC,OAAO,CAAC,WAAW,CAAC;KACvB,CAAC;IAGF,QAAQ,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;IACnD,eAAe,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IACvC,YAAY,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAGnC,kBAAkB,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACzC,mBAAmB,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1C,eAAe,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACtC,kBAAkB,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACzC,iBAAiB,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxC,mBAAmB,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1C,oBAAoB,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3C,gBAAgB,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACvC,iBAAiB,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxC,uBAAuB,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAG9C,UAAU,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAGpC,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC;IAG9C,WAAW,EAAE,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC;IAGhD,aAAa,EAAE,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC;IAGlD,aAAa,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;IAG3C,cAAc,EAAE,aAAC,CAAC,KAAK,CAAC,aAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"validateConfig.js","sourceRoot":"","sources":["../../src/utils/validateConfig.ts"],"names":[],"mappings":"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"}
|