prisma-kysely 1.3.0 → 1.4.1
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 +1 -0
- package/dist/__test__/e2e.test.js +17 -4
- package/dist/__test__/e2e.test.js.map +1 -1
- package/dist/helpers/generateDatabaseType.test.js +3 -0
- package/dist/helpers/generateDatabaseType.test.js.map +1 -1
- package/dist/helpers/generateEnumType.js +6 -6
- package/dist/helpers/generateEnumType.js.map +1 -1
- package/dist/helpers/generateEnumType.test.js +42 -0
- package/dist/helpers/generateEnumType.test.js.map +1 -0
- package/dist/helpers/generateField.js +9 -3
- package/dist/helpers/generateField.js.map +1 -1
- package/dist/helpers/generateField.test.js +39 -0
- package/dist/helpers/generateField.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 +3 -3
- package/dist/helpers/generateImplicitManyToManyModels.js +10 -7
- package/dist/helpers/generateImplicitManyToManyModels.js.map +1 -1
- package/dist/helpers/generateImplicitManyToManyModels.test.js +3 -3
- package/dist/helpers/generateImplicitManyToManyModels.test.js.map +1 -1
- package/dist/helpers/generateModel.js +4 -0
- package/dist/helpers/generateModel.js.map +1 -1
- package/dist/helpers/generateModel.test.js +2 -0
- package/dist/helpers/generateModel.test.js.map +1 -1
- package/dist/helpers/generateTypedReferenceNode.js +12 -0
- package/dist/helpers/generateTypedReferenceNode.js.map +1 -0
- package/dist/helpers/generateTypedReferenceNode.test.js +11 -0
- package/dist/helpers/generateTypedReferenceNode.test.js.map +1 -0
- package/dist/helpers/generatedEnumType.test.js +55 -0
- package/dist/helpers/generatedEnumType.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 +9 -8
- package/dist/utils/validateConfig.js.map +1 -1
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -80,6 +80,7 @@ hope it's just as useful for you! 😎
|
|
|
80
80
|
| `fileName` | The filename for the generated file |
|
|
81
81
|
| `enumFileName` | The filename for the generated enums. Omitting this will generate enums and files in the same file. |
|
|
82
82
|
| `camelCase` | Enable support for Kysely's camelCase plugin |
|
|
83
|
+
| `readOnlyIds` | Use Kysely's `GeneratedAlways` for `@id` fields with default values, preventing insert and update. |
|
|
83
84
|
| `[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. |
|
|
84
85
|
|
|
85
86
|
### Gotchas
|
|
@@ -37,9 +37,22 @@ const exec = (0, util_1.promisify)(child_process_1.exec);
|
|
|
37
37
|
age Int
|
|
38
38
|
rating Float
|
|
39
39
|
updatedAt DateTime
|
|
40
|
+
sprockets Sprocket[]
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
model Sprocket {
|
|
44
|
+
id Int @id
|
|
45
|
+
users TestUser[]
|
|
40
46
|
}`);
|
|
41
|
-
await exec("yarn prisma db push");
|
|
42
47
|
await exec("yarn prisma generate");
|
|
48
|
+
const generatedSource = await promises_1.default.readFile("./prisma/generated/types.ts", {
|
|
49
|
+
encoding: "utf-8",
|
|
50
|
+
});
|
|
51
|
+
(0, vitest_1.expect)(generatedSource.includes(`export type SprocketToTestUser = {
|
|
52
|
+
A: number;
|
|
53
|
+
B: string;
|
|
54
|
+
};`)).toBeTruthy();
|
|
55
|
+
(0, vitest_1.expect)(generatedSource.includes("_SprocketToTestUser: SprocketToTestUser")).toBeTruthy();
|
|
43
56
|
}, { timeout: 20000 });
|
|
44
57
|
(0, vitest_1.test)("End to end test - separate entrypoints", async () => {
|
|
45
58
|
await exec("yarn prisma init --datasource-provider mysql");
|
|
@@ -76,12 +89,12 @@ const exec = (0, util_1.promisify)(child_process_1.exec);
|
|
|
76
89
|
const enumFile = await promises_1.default.readFile("./prisma/generated/enums.ts", {
|
|
77
90
|
encoding: "utf-8",
|
|
78
91
|
});
|
|
79
|
-
(0, vitest_1.expect)(enumFile).toEqual(`export
|
|
80
|
-
export const TestEnum = {
|
|
92
|
+
(0, vitest_1.expect)(enumFile).toEqual(`export const TestEnum = {
|
|
81
93
|
A: "A",
|
|
82
94
|
B: "B",
|
|
83
95
|
C: "C",
|
|
84
|
-
};
|
|
96
|
+
} as const;
|
|
97
|
+
export type TestEnum = (typeof TestEnum)[keyof typeof TestEnum];
|
|
85
98
|
`);
|
|
86
99
|
}, { timeout: 20000 });
|
|
87
100
|
(0, vitest_1.test)("End to end test - separate entrypoints but no enums", async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.test.js","sourceRoot":"","sources":["../../src/__test__/e2e.test.ts"],"names":[],"mappings":";;;;;AAAA,iDAA+C;AAC/C,2DAA6B;AAC7B,+BAAiC;AACjC,mCAA6D;AAE7D,MAAM,IAAI,GAAG,IAAA,gBAAS,EAAC,oBAAM,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,EACF,iBAAiB,EACjB,KAAK,IAAI,EAAE;IAET,MAAM,IAAI,CAAC,+CAA+C,CAAC,CAAC;IAG5D,MAAM,kBAAE,CAAC,SAAS,CAChB,wBAAwB,EACxB
|
|
1
|
+
{"version":3,"file":"e2e.test.js","sourceRoot":"","sources":["../../src/__test__/e2e.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
13
13
|
fileName: "",
|
|
14
14
|
enumFileName: "",
|
|
15
15
|
camelCase: false,
|
|
16
|
+
readOnlyIds: false,
|
|
16
17
|
});
|
|
17
18
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
18
19
|
(0, vitest_1.expect)(result).toEqual(`export type DB = {
|
|
@@ -31,6 +32,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
31
32
|
fileName: "",
|
|
32
33
|
enumFileName: "",
|
|
33
34
|
camelCase: true,
|
|
35
|
+
readOnlyIds: false,
|
|
34
36
|
});
|
|
35
37
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
36
38
|
(0, vitest_1.expect)(result).toEqual(`export type DB = {
|
|
@@ -49,6 +51,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
49
51
|
fileName: "",
|
|
50
52
|
enumFileName: "",
|
|
51
53
|
camelCase: false,
|
|
54
|
+
readOnlyIds: false,
|
|
52
55
|
});
|
|
53
56
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
54
57
|
(0, vitest_1.expect)(result).toEqual(`export type DB = {
|
|
@@ -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;
|
|
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;KACnB,CACF,CAAC;IACF,MAAM,MAAM,GAAG,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC;IAErC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC;;;;GAItB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,oCAAoC,EAAE,GAAG,EAAE;IAC9C,MAAM,IAAI,GAAG,IAAA,2CAAoB,EAC/B;QACE,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE;QAChD,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE;QAC7C,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE;KAC9C,EACD;QACE,gBAAgB,EAAE,YAAY;QAC9B,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,KAAK;KACnB,CACF,CAAC;IACF,MAAM,MAAM,GAAG,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC;IAErC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC;;;;GAItB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,wDAAwD,EAAE,GAAG,EAAE;IAClE,MAAM,IAAI,GAAG,IAAA,2CAAoB,EAC/B;QACE,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE;QAC/C,EAAE,SAAS,EAAE,wBAAwB,EAAE,QAAQ,EAAE,SAAS,EAAE;QAC5D,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;KACnB,CACF,CAAC;IACF,MAAM,MAAM,GAAG,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC;IAErC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC;;;;GAItB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -7,21 +7,21 @@ exports.generateEnumType = void 0;
|
|
|
7
7
|
const typescript_1 = __importDefault(require("typescript"));
|
|
8
8
|
const isValidTSIdentifier_1 = __importDefault(require("../utils/isValidTSIdentifier"));
|
|
9
9
|
const generateStringLiteralUnion_1 = require("./generateStringLiteralUnion");
|
|
10
|
-
const
|
|
10
|
+
const generateTypedReferenceNode_1 = require("./generateTypedReferenceNode");
|
|
11
11
|
const generateEnumType = (name, values) => {
|
|
12
12
|
const type = (0, generateStringLiteralUnion_1.generateStringLiteralUnion)(values.map((v) => v.name));
|
|
13
13
|
if (!type)
|
|
14
14
|
return [];
|
|
15
15
|
const objectDeclaration = typescript_1.default.factory.createVariableStatement([typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], typescript_1.default.factory.createVariableDeclarationList([
|
|
16
|
-
typescript_1.default.factory.createVariableDeclaration(name, undefined, undefined, typescript_1.default.factory.createObjectLiteralExpression(values.map((v) => {
|
|
16
|
+
typescript_1.default.factory.createVariableDeclaration(name, undefined, undefined, typescript_1.default.factory.createAsExpression(typescript_1.default.factory.createObjectLiteralExpression(values.map((v) => {
|
|
17
17
|
const identifier = (0, isValidTSIdentifier_1.default)(v.name)
|
|
18
18
|
? typescript_1.default.factory.createIdentifier(v.name)
|
|
19
19
|
: typescript_1.default.factory.createStringLiteral(v.name);
|
|
20
|
-
return typescript_1.default.factory.createPropertyAssignment(identifier, typescript_1.default.factory.createStringLiteral(v.name));
|
|
21
|
-
}), true)),
|
|
20
|
+
return typescript_1.default.factory.createPropertyAssignment(identifier, typescript_1.default.factory.createStringLiteral(v.dbName || v.name));
|
|
21
|
+
}), true), typescript_1.default.factory.createTypeReferenceNode(typescript_1.default.factory.createIdentifier("const"), undefined))),
|
|
22
22
|
], typescript_1.default.NodeFlags.Const));
|
|
23
|
-
const typeDeclaration = (0,
|
|
24
|
-
return [
|
|
23
|
+
const typeDeclaration = (0, generateTypedReferenceNode_1.generateTypedReferenceNode)(name);
|
|
24
|
+
return [objectDeclaration, typeDeclaration];
|
|
25
25
|
};
|
|
26
26
|
exports.generateEnumType = generateEnumType;
|
|
27
27
|
//# sourceMappingURL=generateEnumType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateEnumType.js","sourceRoot":"","sources":["../../src/helpers/generateEnumType.ts"],"names":[],"mappings":";;;;;;AACA,4DAA4B;AAE5B,uFAA8D;AAE9D,6EAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"generateEnumType.js","sourceRoot":"","sources":["../../src/helpers/generateEnumType.ts"],"names":[],"mappings":";;;;;;AACA,4DAA4B;AAE5B,uFAA8D;AAE9D,6EAA0E;AAC1E,6EAA0E;AAEnE,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,MAAwB,EAAE,EAAE;IACzE,MAAM,IAAI,GAAG,IAAA,uDAA0B,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnE,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IAErB,MAAM,iBAAiB,GAAG,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAC1D,CAAC,oBAAE,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EACxD,oBAAE,CAAC,OAAO,CAAC,6BAA6B,CACtC;QACE,oBAAE,CAAC,OAAO,CAAC,yBAAyB,CAClC,IAAI,EACJ,SAAS,EACT,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,kBAAkB,CAC3B,oBAAE,CAAC,OAAO,CAAC,6BAA6B,CACtC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACf,MAAM,UAAU,GAAG,IAAA,6BAAmB,EAAC,CAAC,CAAC,IAAI,CAAC;gBAC5C,CAAC,CAAC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC;gBACrC,CAAC,CAAC,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAE3C,OAAO,oBAAE,CAAC,OAAO,CAAC,wBAAwB,CACxC,UAAU,EAEV,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,CACnD,CAAC;QACJ,CAAC,CAAC,EACF,IAAI,CACL,EACD,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAChC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EACpC,SAAS,CACV,CACF,CACF;KACF,EACD,oBAAE,CAAC,SAAS,CAAC,KAAK,CACnB,CACF,CAAC;IAEF,MAAM,eAAe,GAAG,IAAA,uDAA0B,EAAC,IAAI,CAAC,CAAC;IAEzD,OAAO,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;AAC9C,CAAC,CAAC;AA1CW,QAAA,gBAAgB,oBA0C3B"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
const typescript_1 = __importStar(require("typescript"));
|
|
27
|
+
const vitest_1 = require("vitest");
|
|
28
|
+
const generateEnumType_1 = require("./generateEnumType");
|
|
29
|
+
(0, vitest_1.test)("it generates the enum type", () => {
|
|
30
|
+
const [objectDeclaration, typeDeclaration] = (0, generateEnumType_1.generateEnumType)("Name", [
|
|
31
|
+
{ name: "FOO", dbName: "FOO" },
|
|
32
|
+
{ name: "BAR", dbName: "BAR" },
|
|
33
|
+
]);
|
|
34
|
+
const printer = (0, typescript_1.createPrinter)();
|
|
35
|
+
const result = printer.printList(typescript_1.default.ListFormat.MultiLine, typescript_1.default.factory.createNodeArray([objectDeclaration, typeDeclaration]), typescript_1.default.createSourceFile("", "", typescript_1.default.ScriptTarget.Latest));
|
|
36
|
+
(0, vitest_1.expect)(result).toEqual(`export const Name = {
|
|
37
|
+
FOO: "FOO",
|
|
38
|
+
BAR: "BAR"
|
|
39
|
+
} as const;
|
|
40
|
+
export type Name = (typeof Name)[keyof typeof Name];\n`);
|
|
41
|
+
});
|
|
42
|
+
//# sourceMappingURL=generateEnumType.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generateEnumType.test.js","sourceRoot":"","sources":["../../src/helpers/generateEnumType.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA+C;AAC/C,mCAAsC;AAEtC,yDAAsD;AAEtD,IAAA,aAAI,EAAC,4BAA4B,EAAE,GAAG,EAAE;IACtC,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC,GAAG,IAAA,mCAAgB,EAAC,MAAM,EAAE;QACpE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;QAC9B,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;KAC/B,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,0BAAa,GAAE,CAAC;IAEhC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAC9B,oBAAE,CAAC,UAAU,CAAC,SAAS,EACvB,oBAAE,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC,EAChE,oBAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,EAAE,oBAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CACpD,CAAC;IAEF,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC;;;;uDAI8B,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC"}
|
|
@@ -8,15 +8,21 @@ const typescript_1 = __importDefault(require("typescript"));
|
|
|
8
8
|
const applyJSDocWorkaround_1 = require("../utils/applyJSDocWorkaround");
|
|
9
9
|
const isValidTSIdentifier_1 = __importDefault(require("../utils/isValidTSIdentifier"));
|
|
10
10
|
const generateField = (args) => {
|
|
11
|
-
const { name, type, nullable, generated, list, documentation } = args;
|
|
11
|
+
const { name, type, nullable, generated, list, documentation, isId, config } = args;
|
|
12
12
|
let fieldType = type;
|
|
13
13
|
if (nullable)
|
|
14
14
|
fieldType = typescript_1.default.factory.createUnionTypeNode([
|
|
15
15
|
fieldType,
|
|
16
16
|
typescript_1.default.factory.createLiteralTypeNode(typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.NullKeyword)),
|
|
17
17
|
]);
|
|
18
|
-
if (generated)
|
|
19
|
-
|
|
18
|
+
if (generated) {
|
|
19
|
+
if (isId && config.readOnlyIds) {
|
|
20
|
+
fieldType = typescript_1.default.factory.createTypeReferenceNode(typescript_1.default.factory.createIdentifier("GeneratedAlways"), [fieldType]);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
fieldType = typescript_1.default.factory.createTypeReferenceNode(typescript_1.default.factory.createIdentifier("Generated"), [fieldType]);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
20
26
|
if (list)
|
|
21
27
|
fieldType = typescript_1.default.factory.createArrayTypeNode(fieldType);
|
|
22
28
|
const nameIdentifier = (0, isValidTSIdentifier_1.default)(name)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateField.js","sourceRoot":"","sources":["../../src/helpers/generateField.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4B;AAE5B,wEAAoE;AACpE,uFAA8D;
|
|
1
|
+
{"version":3,"file":"generateField.js","sourceRoot":"","sources":["../../src/helpers/generateField.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4B;AAE5B,wEAAoE;AACpE,uFAA8D;AAevD,MAAM,aAAa,GAAG,CAAC,IAAuB,EAAE,EAAE;IACvD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,GAC1E,IAAI,CAAC;IASP,IAAI,SAAS,GAAG,IAAI,CAAC;IAErB,IAAI,QAAQ;QACV,SAAS,GAAG,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC;YACzC,SAAS;YACT,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAC9B,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAClD;SACF,CAAC,CAAC;IAEL,IAAI,SAAS,EAAE;QACb,IAAI,IAAI,IAAI,MAAM,CAAC,WAAW,EAAE;YAC9B,SAAS,GAAG,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAC5C,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAC9C,CAAC,SAAS,CAAC,CACZ,CAAC;SACH;aAAM;YACL,SAAS,GAAG,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAC5C,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,EACxC,CAAC,SAAS,CAAC,CACZ,CAAC;SACH;KACF;IAED,IAAI,IAAI;QAAE,SAAS,GAAG,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAEhE,MAAM,cAAc,GAAG,IAAA,6BAAmB,EAAC,IAAI,CAAC;QAC9C,CAAC,CAAC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACnC,CAAC,CAAC,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAEzC,MAAM,iBAAiB,GAAG,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAC1D,SAAS,EACT,cAAc,EACd,SAAS,EACT,SAAS,CACV,CAAC;IAEF,IAAI,aAAa,EAAE;QACjB,OAAO,oBAAE,CAAC,0BAA0B,CAClC,iBAAiB,EACjB,oBAAE,CAAC,UAAU,CAAC,sBAAsB,EACpC,IAAA,2CAAoB,EAAC,aAAa,CAAC,EACnC,IAAI,CACL,CAAC;KACH;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AA1DW,QAAA,aAAa,iBA0DxB"}
|
|
@@ -15,6 +15,10 @@ const stringTypeNode = typescript_1.default.factory.createTypeReferenceNode(type
|
|
|
15
15
|
nullable: false,
|
|
16
16
|
generated: false,
|
|
17
17
|
list: false,
|
|
18
|
+
isId: false,
|
|
19
|
+
config: {
|
|
20
|
+
readOnlyIds: false,
|
|
21
|
+
},
|
|
18
22
|
});
|
|
19
23
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
20
24
|
(0, vitest_1.expect)(result).toEqual("name: string;");
|
|
@@ -26,6 +30,10 @@ const stringTypeNode = typescript_1.default.factory.createTypeReferenceNode(type
|
|
|
26
30
|
nullable: true,
|
|
27
31
|
generated: false,
|
|
28
32
|
list: false,
|
|
33
|
+
isId: false,
|
|
34
|
+
config: {
|
|
35
|
+
readOnlyIds: false,
|
|
36
|
+
},
|
|
29
37
|
});
|
|
30
38
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
31
39
|
(0, vitest_1.expect)(result).toEqual("name: string | null;");
|
|
@@ -37,6 +45,10 @@ const stringTypeNode = typescript_1.default.factory.createTypeReferenceNode(type
|
|
|
37
45
|
nullable: false,
|
|
38
46
|
generated: true,
|
|
39
47
|
list: false,
|
|
48
|
+
isId: false,
|
|
49
|
+
config: {
|
|
50
|
+
readOnlyIds: false,
|
|
51
|
+
},
|
|
40
52
|
});
|
|
41
53
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
42
54
|
(0, vitest_1.expect)(result).toEqual("name: Generated<string>;");
|
|
@@ -48,6 +60,10 @@ const stringTypeNode = typescript_1.default.factory.createTypeReferenceNode(type
|
|
|
48
60
|
nullable: false,
|
|
49
61
|
generated: false,
|
|
50
62
|
list: true,
|
|
63
|
+
isId: false,
|
|
64
|
+
config: {
|
|
65
|
+
readOnlyIds: false,
|
|
66
|
+
},
|
|
51
67
|
});
|
|
52
68
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
53
69
|
(0, vitest_1.expect)(result).toEqual("name: string[];");
|
|
@@ -59,6 +75,10 @@ const stringTypeNode = typescript_1.default.factory.createTypeReferenceNode(type
|
|
|
59
75
|
nullable: true,
|
|
60
76
|
generated: true,
|
|
61
77
|
list: true,
|
|
78
|
+
isId: false,
|
|
79
|
+
config: {
|
|
80
|
+
readOnlyIds: false,
|
|
81
|
+
},
|
|
62
82
|
});
|
|
63
83
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
64
84
|
(0, vitest_1.expect)(result).toEqual("name: Generated<string | null>[];");
|
|
@@ -70,9 +90,28 @@ const stringTypeNode = typescript_1.default.factory.createTypeReferenceNode(type
|
|
|
70
90
|
nullable: false,
|
|
71
91
|
generated: false,
|
|
72
92
|
list: false,
|
|
93
|
+
isId: false,
|
|
73
94
|
documentation: "This is a comment",
|
|
95
|
+
config: {
|
|
96
|
+
readOnlyIds: false,
|
|
97
|
+
},
|
|
74
98
|
});
|
|
75
99
|
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
76
100
|
(0, vitest_1.expect)(result).toEqual("/**\n * This is a comment\n */\nname: string;");
|
|
77
101
|
});
|
|
102
|
+
(0, vitest_1.test)("it uses generated always for ids if config item is specified", () => {
|
|
103
|
+
const node = (0, generateField_1.generateField)({
|
|
104
|
+
name: "id",
|
|
105
|
+
type: stringTypeNode,
|
|
106
|
+
nullable: false,
|
|
107
|
+
generated: true,
|
|
108
|
+
list: false,
|
|
109
|
+
isId: true,
|
|
110
|
+
config: {
|
|
111
|
+
readOnlyIds: true,
|
|
112
|
+
},
|
|
113
|
+
});
|
|
114
|
+
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
115
|
+
(0, vitest_1.expect)(result).toEqual("id: GeneratedAlways<string>;");
|
|
116
|
+
});
|
|
78
117
|
//# sourceMappingURL=generateField.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateField.test.js","sourceRoot":"","sources":["../../src/helpers/generateField.test.ts"],"names":[],"mappings":";;;;;AAAA,4DAA4B;AAC5B,mCAAsC;AAEtC,mDAAwD;AACxD,kDAAoD;AAEpD,MAAM,cAAc,GAAG,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CACvD,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EACrC,SAAS,CACV,CAAC;AAEF,IAAA,aAAI,EAAC,sDAAsD,EAAE,GAAG,EAAE;IAChE,MAAM,IAAI,GAAG,IAAA,6BAAa,EAAC;QACzB,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,KAAK;QACf,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"generateField.test.js","sourceRoot":"","sources":["../../src/helpers/generateField.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ const generateFieldType_1 = require("./generateFieldType");
|
|
|
21
21
|
fileName: "types.ts",
|
|
22
22
|
enumFileName: "types.ts",
|
|
23
23
|
camelCase: false,
|
|
24
|
+
readOnlyIds: false,
|
|
24
25
|
};
|
|
25
26
|
const sourceTypes = [
|
|
26
27
|
"String",
|
|
@@ -43,6 +44,7 @@ const generateFieldType_1 = require("./generateFieldType");
|
|
|
43
44
|
enumFileName: "types.ts",
|
|
44
45
|
stringTypeOverride: "cheese",
|
|
45
46
|
camelCase: false,
|
|
47
|
+
readOnlyIds: false,
|
|
46
48
|
});
|
|
47
49
|
(0, vitest_1.expect)(node).toEqual("cheese");
|
|
48
50
|
});
|
|
@@ -52,18 +54,21 @@ const generateFieldType_1 = require("./generateFieldType");
|
|
|
52
54
|
fileName: "types.ts",
|
|
53
55
|
enumFileName: "types.ts",
|
|
54
56
|
camelCase: false,
|
|
57
|
+
readOnlyIds: false,
|
|
55
58
|
});
|
|
56
59
|
const mysqlBooleanType = (0, generateFieldType_1.generateFieldType)("Boolean", {
|
|
57
60
|
databaseProvider: "mysql",
|
|
58
61
|
fileName: "types.ts",
|
|
59
62
|
enumFileName: "types.ts",
|
|
60
63
|
camelCase: false,
|
|
64
|
+
readOnlyIds: false,
|
|
61
65
|
});
|
|
62
66
|
const sqliteBooleanType = (0, generateFieldType_1.generateFieldType)("Boolean", {
|
|
63
67
|
databaseProvider: "sqlite",
|
|
64
68
|
fileName: "types.ts",
|
|
65
69
|
enumFileName: "types.ts",
|
|
66
70
|
camelCase: false,
|
|
71
|
+
readOnlyIds: false,
|
|
67
72
|
});
|
|
68
73
|
(0, vitest_1.expect)(postgresBooleanType).toEqual("boolean");
|
|
69
74
|
(0, vitest_1.expect)(mysqlBooleanType).toEqual("number");
|
|
@@ -75,6 +80,7 @@ const generateFieldType_1 = require("./generateFieldType");
|
|
|
75
80
|
fileName: "types.ts",
|
|
76
81
|
enumFileName: "types.ts",
|
|
77
82
|
camelCase: false,
|
|
83
|
+
readOnlyIds: false,
|
|
78
84
|
})).toThrowError(new Error("Unsupported type Json for database sqlite"));
|
|
79
85
|
});
|
|
80
86
|
//# sourceMappingURL=generateFieldType.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateFieldType.test.js","sourceRoot":"","sources":["../../src/helpers/generateFieldType.test.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AAEtC,2DAAgE;AAEhE,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;
|
|
1
|
+
{"version":3,"file":"generateFieldType.test.js","sourceRoot":"","sources":["../../src/helpers/generateFieldType.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,10 +9,10 @@ const printer = typescript_1.default.createPrinter({ newLine: typescript_1.defau
|
|
|
9
9
|
const generateFile = (statements, { withEnumImport, withLeader }) => {
|
|
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 } from "kysely";
|
|
12
|
+
const leader = `import type { ColumnType, GeneratedAlways } from "kysely";
|
|
13
13
|
export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
? ColumnType<S, I | undefined, U>
|
|
15
|
+
: ColumnType<T, T | undefined, T>;
|
|
16
16
|
export type Timestamp = ColumnType<Date, Date | string, Date | string>;`;
|
|
17
17
|
if (withEnumImport) {
|
|
18
18
|
const enumImportStatement = `import type { ${withEnumImport.names.join(", ")} } from "${withEnumImport.importPath}";`;
|
|
@@ -24,8 +24,8 @@ function generateModels(manyToManyFields, models, manyToManyTables = []) {
|
|
|
24
24
|
return manyToManyTables;
|
|
25
25
|
}
|
|
26
26
|
manyToManyTables.push({
|
|
27
|
-
dbName:
|
|
28
|
-
name:
|
|
27
|
+
dbName: `_${manyFirst.relationName}`,
|
|
28
|
+
name: manyFirst.relationName || "",
|
|
29
29
|
primaryKey: null,
|
|
30
30
|
uniqueFields: [],
|
|
31
31
|
uniqueIndexes: [],
|
|
@@ -65,10 +65,13 @@ function generateJoinFields(fields, models) {
|
|
|
65
65
|
];
|
|
66
66
|
}
|
|
67
67
|
function getJoinIdType(joinField, models) {
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
68
|
+
const joinedModel = models.find((m) => m.name === joinField.type);
|
|
69
|
+
if (!joinedModel)
|
|
70
|
+
throw new Error("Could not find referenced model");
|
|
71
|
+
const idField = joinedModel.fields.find((f) => f.isId);
|
|
72
|
+
if (!idField)
|
|
73
|
+
throw new Error("No ID field on referenced model");
|
|
74
|
+
return idField.type;
|
|
72
75
|
}
|
|
73
76
|
function filterManyToManyRelationFields(models) {
|
|
74
77
|
return models
|
|
@@ -78,7 +81,7 @@ function filterManyToManyRelationFields(models) {
|
|
|
78
81
|
return field.relationName &&
|
|
79
82
|
field.isList &&
|
|
80
83
|
((_a = field.relationFromFields) === null || _a === void 0 ? void 0 : _a.length) === 0 &&
|
|
81
|
-
((_b = field.relationToFields) === null || _b === void 0 ? void 0 : _b.length);
|
|
84
|
+
((_b = field.relationToFields) === null || _b === void 0 ? void 0 : _b.length) === 0;
|
|
82
85
|
})
|
|
83
86
|
.map((field) => field))
|
|
84
87
|
.flat();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateImplicitManyToManyModels.js","sourceRoot":"","sources":["../../src/helpers/generateImplicitManyToManyModels.ts"],"names":[],"mappings":";;;AAEA,4CAAwC;AAWjC,MAAM,cAAc,GAAG,CAC5B,MAAoB,EACpB,IAAY,EACY,EAAE;IAC1B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AACrD,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB;AAEF,SAAgB,gCAAgC,CAC9C,MAAoB;IAEpB,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generateImplicitManyToManyModels.js","sourceRoot":"","sources":["../../src/helpers/generateImplicitManyToManyModels.ts"],"names":[],"mappings":";;;AAEA,4CAAwC;AAWjC,MAAM,cAAc,GAAG,CAC5B,MAAoB,EACpB,IAAY,EACY,EAAE;IAC1B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AACrD,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB;AAEF,SAAgB,gCAAgC,CAC9C,MAAoB;IAEpB,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,MAAM,CAAC,CAAC;IAEhE,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,OAAO,EAAE,CAAC;KACX;IACD,OAAO,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;AACtD,CAAC;AATD,4EASC;AAED,SAAS,cAAc,CACrB,gBAA8B,EAC9B,MAAoB,EACpB,mBAAiC,EAAE;IAEnC,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,EAAE,CAAC;IAC3C,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,gBAAgB,CAAC;KACzB;IAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CACtC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,YAAY,CACzD,CAAC;IAEF,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,gBAAgB,CAAC;KACzB;IAED,gBAAgB,CAAC,IAAI,CAAC;QACpB,MAAM,EAAE,IAAI,SAAS,CAAC,YAAY,EAAE;QACpC,IAAI,EAAE,SAAS,CAAC,YAAY,IAAI,EAAE;QAClC,UAAU,EAAE,IAAI;QAChB,YAAY,EAAE,EAAE;QAChB,aAAa,EAAE,EAAE;QACjB,MAAM,EAAE,kBAAkB,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC;KAC5D,CAAC,CAAC;IAEH,OAAO,cAAc,CACnB,gBAAgB,CAAC,MAAM,CACrB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,YAAY,CACzD,EACD,MAAM,EACN,gBAAgB,CACjB,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,MAAgC,EAChC,MAAoB;IAEpB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAEjD,MAAM,YAAY,GAAG,IAAA,eAAM,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5E,MAAM,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAC1B,MAAM,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAE1B,OAAO;QACL;YACE,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,aAAa,CAAC,CAAC,EAAE,MAAM,CAAC;YAC9B,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,KAAK;YACb,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,KAAK;YACX,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,KAAK;SACvB;QACD;YACE,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,aAAa,CAAC,CAAC,EAAE,MAAM,CAAC;YAC9B,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,KAAK;YACb,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,KAAK;YACX,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,KAAK;SACvB;KACF,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,SAAqB,EAAE,MAAoB;IAChE,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC;IAClE,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAErE,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAEjE,OAAO,OAAO,CAAC,IAAI,CAAC;AACtB,CAAC;AAED,SAAS,8BAA8B,CAAC,MAAoB;IAC1D,OAAO,MAAM;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACb,KAAK,CAAC,MAAM;SACT,MAAM,CACL,CAAC,KAAK,EAAE,EAAE;;QACR,OAAA,KAAK,CAAC,YAAY;YAClB,KAAK,CAAC,MAAM;YACZ,CAAA,MAAA,KAAK,CAAC,kBAAkB,0CAAE,MAAM,MAAK,CAAC;YACtC,CAAA,MAAA,KAAK,CAAC,gBAAgB,0CAAE,MAAM,MAAK,CAAC,CAAA;KAAA,CACvC;SACA,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CACzB;SACA,IAAI,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -30,7 +30,7 @@ const generateImplicitManyToManyModels_1 = require("./generateImplicitManyToMany
|
|
|
30
30
|
hasDefaultValue: false,
|
|
31
31
|
relationName: "CategoryToPost",
|
|
32
32
|
relationFromFields: [],
|
|
33
|
-
relationToFields: [
|
|
33
|
+
relationToFields: [],
|
|
34
34
|
isGenerated: false,
|
|
35
35
|
isUpdatedAt: false,
|
|
36
36
|
},
|
|
@@ -66,7 +66,7 @@ const generateImplicitManyToManyModels_1 = require("./generateImplicitManyToMany
|
|
|
66
66
|
hasDefaultValue: false,
|
|
67
67
|
relationName: "CategoryToPost",
|
|
68
68
|
relationFromFields: [],
|
|
69
|
-
relationToFields: [
|
|
69
|
+
relationToFields: [],
|
|
70
70
|
isGenerated: false,
|
|
71
71
|
isUpdatedAt: false,
|
|
72
72
|
},
|
|
@@ -80,7 +80,7 @@ const generateImplicitManyToManyModels_1 = require("./generateImplicitManyToMany
|
|
|
80
80
|
(0, vitest_1.expect)(newModels).toEqual([
|
|
81
81
|
{
|
|
82
82
|
name: "CategoryToPost",
|
|
83
|
-
dbName:
|
|
83
|
+
dbName: "_CategoryToPost",
|
|
84
84
|
fields: [
|
|
85
85
|
{
|
|
86
86
|
hasDefaultValue: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateImplicitManyToManyModels.test.js","sourceRoot":"","sources":["../../src/helpers/generateImplicitManyToManyModels.test.ts"],"names":[],"mappings":";;AACA,mCAAsC;AAEtC,yFAA8F;AAE9F,IAAA,aAAI,EAAC,mDAAmD,EAAE,GAAG,EAAE;IAC7D,MAAM,SAAS,GAAG,IAAA,mEAAgC,EAAC;QACjD;YACE,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,IAAI;oBACV,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,IAAI;oBACV,eAAe,EAAE,IAAI;oBACrB,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,KAAK;oBACjB,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,QAAQ;iBACf;gBACD;oBACE,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,QAAQ;oBACd,MAAM,EAAE,IAAI;oBACZ,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,KAAK;oBACX,UAAU,EAAE,KAAK;oBACjB,IAAI,EAAE,MAAM;oBACZ,eAAe,EAAE,KAAK;oBACtB,YAAY,EAAE,gBAAgB;oBAC9B,kBAAkB,EAAE,EAAE;oBACtB,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"generateImplicitManyToManyModels.test.js","sourceRoot":"","sources":["../../src/helpers/generateImplicitManyToManyModels.test.ts"],"names":[],"mappings":";;AACA,mCAAsC;AAEtC,yFAA8F;AAE9F,IAAA,aAAI,EAAC,mDAAmD,EAAE,GAAG,EAAE;IAC7D,MAAM,SAAS,GAAG,IAAA,mEAAgC,EAAC;QACjD;YACE,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,IAAI;oBACV,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,IAAI;oBACV,eAAe,EAAE,IAAI;oBACrB,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,KAAK;oBACjB,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,QAAQ;iBACf;gBACD;oBACE,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,QAAQ;oBACd,MAAM,EAAE,IAAI;oBACZ,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,KAAK;oBACX,UAAU,EAAE,KAAK;oBACjB,IAAI,EAAE,MAAM;oBACZ,eAAe,EAAE,KAAK;oBACtB,YAAY,EAAE,gBAAgB;oBAC9B,kBAAkB,EAAE,EAAE;oBACtB,gBAAgB,EAAE,EAAE;oBACpB,WAAW,EAAE,KAAK;oBAClB,WAAW,EAAE,KAAK;iBACnB;aACF;YACD,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;YACZ,YAAY,EAAE,EAAE;YAChB,aAAa,EAAE,EAAE;SAClB;QACD;YACE,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,IAAI;oBACV,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,IAAI;oBACV,eAAe,EAAE,IAAI;oBACrB,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,KAAK;oBACjB,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,QAAQ;iBACf;gBACD;oBACE,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,QAAQ;oBACd,MAAM,EAAE,IAAI;oBACZ,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,KAAK;oBACX,UAAU,EAAE,KAAK;oBACjB,IAAI,EAAE,UAAU;oBAChB,eAAe,EAAE,KAAK;oBACtB,YAAY,EAAE,gBAAgB;oBAC9B,kBAAkB,EAAE,EAAE;oBACtB,gBAAgB,EAAE,EAAE;oBACpB,WAAW,EAAE,KAAK;oBAClB,WAAW,EAAE,KAAK;iBACnB;aACF;YACD,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;YACZ,YAAY,EAAE,EAAE;YAChB,aAAa,EAAE,EAAE;SAClB;KACF,CAAC,CAAC;IAEH,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,OAAO,CAAe;QACtC;YACE,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE,iBAAiB;YACzB,MAAM,EAAE;gBACN;oBACE,eAAe,EAAE,KAAK;oBACtB,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,GAAG;oBACT,IAAI,EAAE,QAAQ;iBACf;gBACD;oBACE,eAAe,EAAE,KAAK;oBACtB,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,GAAG;oBACT,IAAI,EAAE,QAAQ;iBACf;aACF;YACD,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,EAAE;YAChB,aAAa,EAAE,EAAE;SAClB;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -19,12 +19,14 @@ const generateModel = (model, config) => {
|
|
|
19
19
|
return [];
|
|
20
20
|
if (field.kind === "enum") {
|
|
21
21
|
return (0, generateField_1.generateField)({
|
|
22
|
+
isId: field.isId,
|
|
22
23
|
name: field.name,
|
|
23
24
|
type: typescript_1.default.factory.createTypeReferenceNode(typescript_1.default.factory.createIdentifier(field.type), undefined),
|
|
24
25
|
nullable: !field.isRequired,
|
|
25
26
|
generated: isGenerated,
|
|
26
27
|
list: field.isList,
|
|
27
28
|
documentation: field.documentation,
|
|
29
|
+
config,
|
|
28
30
|
});
|
|
29
31
|
}
|
|
30
32
|
const dbName = typeof field.dbName === "string" ? field.dbName : null;
|
|
@@ -35,6 +37,8 @@ const generateModel = (model, config) => {
|
|
|
35
37
|
generated: isGenerated,
|
|
36
38
|
list: field.isList,
|
|
37
39
|
documentation: field.documentation,
|
|
40
|
+
isId: field.isId,
|
|
41
|
+
config,
|
|
38
42
|
});
|
|
39
43
|
});
|
|
40
44
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateModel.js","sourceRoot":"","sources":["../../src/helpers/generateModel.ts"],"names":[],"mappings":";;;;;;AACA,4DAA4B;AAE5B,mDAAwD;AACxD,2DAAgE;AAChE,0DAAsD;AAQtD,MAAM,2BAA2B,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE9C,MAAM,aAAa,GAAG,CAAC,KAAiB,EAAE,MAAc,EAAE,EAAE;IACjE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAChD,MAAM,WAAW,GACf,KAAK,CAAC,eAAe;YACrB,CAAC,CACC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;gBACjC,MAAM,IAAI,KAAK,CAAC,OAAO;gBACvB,2BAA2B,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CACzD,CAAC;QAEJ,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa;YAAE,OAAO,EAAE,CAAC;QACvE,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;YACzB,OAAO,IAAA,6BAAa,EAAC;gBACnB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CACtC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,EACvC,SAAS,CACV;gBACD,QAAQ,EAAE,CAAC,KAAK,CAAC,UAAU;gBAC3B,SAAS,EAAE,WAAW;gBACtB,IAAI,EAAE,KAAK,CAAC,MAAM;gBAClB,aAAa,EAAE,KAAK,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"generateModel.js","sourceRoot":"","sources":["../../src/helpers/generateModel.ts"],"names":[],"mappings":";;;;;;AACA,4DAA4B;AAE5B,mDAAwD;AACxD,2DAAgE;AAChE,0DAAsD;AAQtD,MAAM,2BAA2B,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE9C,MAAM,aAAa,GAAG,CAAC,KAAiB,EAAE,MAAc,EAAE,EAAE;IACjE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAChD,MAAM,WAAW,GACf,KAAK,CAAC,eAAe;YACrB,CAAC,CACC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;gBACjC,MAAM,IAAI,KAAK,CAAC,OAAO;gBACvB,2BAA2B,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CACzD,CAAC;QAEJ,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa;YAAE,OAAO,EAAE,CAAC;QACvE,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;YACzB,OAAO,IAAA,6BAAa,EAAC;gBACnB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CACtC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,EACvC,SAAS,CACV;gBACD,QAAQ,EAAE,CAAC,KAAK,CAAC,UAAU;gBAC3B,SAAS,EAAE,WAAW;gBACtB,IAAI,EAAE,KAAK,CAAC,MAAM;gBAClB,aAAa,EAAE,KAAK,CAAC,aAAa;gBAClC,MAAM;aACP,CAAC,CAAC;SACJ;QACD,MAAM,MAAM,GAAG,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;QAEtE,OAAO,IAAA,6BAAa,EAAC;YACnB,IAAI,EAAE,IAAA,6BAAa,EAAC,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC;YACjD,IAAI,EAAE,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CACtC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAA,qCAAiB,EAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAClE,SAAS,CACV;YACD,QAAQ,EAAE,CAAC,KAAK,CAAC,UAAU;YAC3B,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,KAAK,CAAC,MAAM;YAClB,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ,EAAE,KAAK,CAAC,IAAI;QACpB,SAAS,EAAE,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI;QACrC,UAAU,EAAE,oBAAE,CAAC,OAAO,CAAC,0BAA0B,CAC/C,SAAS,EACT,CAAC,oBAAE,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EACxD,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,EACvC,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAC7C;KACF,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,aAAa,iBAsDxB"}
|
|
@@ -91,6 +91,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
91
91
|
fileName: "",
|
|
92
92
|
enumFileName: "",
|
|
93
93
|
camelCase: false,
|
|
94
|
+
readOnlyIds: false,
|
|
94
95
|
});
|
|
95
96
|
(0, vitest_1.expect)(model.tableName).toEqual("User");
|
|
96
97
|
(0, vitest_1.expect)(model.typeName).toEqual("User");
|
|
@@ -141,6 +142,7 @@ const testUtils_1 = require("../utils/testUtils");
|
|
|
141
142
|
fileName: "",
|
|
142
143
|
enumFileName: "",
|
|
143
144
|
camelCase: true,
|
|
145
|
+
readOnlyIds: false,
|
|
144
146
|
});
|
|
145
147
|
(0, vitest_1.expect)(model.tableName).toEqual("User");
|
|
146
148
|
(0, vitest_1.expect)(model.typeName).toEqual("User");
|
|
@@ -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,UAAU,EAAE,IAAI;QAChB,YAAY,EAAE,EAAE;QAChB,aAAa,EAAE,EAAE;QACjB,MAAM,EAAE,IAAI;KACb,EACD;QACE,gBAAgB,EAAE,QAAQ;QAC1B,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"generateModel.test.js","sourceRoot":"","sources":["../../src/helpers/generateModel.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
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.generateTypedReferenceNode = void 0;
|
|
7
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
8
|
+
const generateTypedReferenceNode = (name) => {
|
|
9
|
+
return typescript_1.default.factory.createTypeAliasDeclaration(undefined, [typescript_1.default.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword)], name, undefined, typescript_1.default.factory.createTypeReferenceNode(`(typeof ${name})[keyof typeof ${name}]`, undefined));
|
|
10
|
+
};
|
|
11
|
+
exports.generateTypedReferenceNode = generateTypedReferenceNode;
|
|
12
|
+
//# sourceMappingURL=generateTypedReferenceNode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generateTypedReferenceNode.js","sourceRoot":"","sources":["../../src/helpers/generateTypedReferenceNode.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4B;AAErB,MAAM,0BAA0B,GAAG,CAAC,IAAY,EAAE,EAAE;IACzD,OAAO,oBAAE,CAAC,OAAO,CAAC,0BAA0B,CAC1C,SAAS,EACT,CAAC,oBAAE,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EACxD,IAAI,EACJ,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAChC,WAAW,IAAI,kBAAkB,IAAI,GAAG,EACxC,SAAS,CACV,CACF,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,0BAA0B,8BAWrC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const vitest_1 = require("vitest");
|
|
4
|
+
const testUtils_1 = require("../utils/testUtils");
|
|
5
|
+
const generateTypedReferenceNode_1 = require("./generateTypedReferenceNode");
|
|
6
|
+
(0, vitest_1.test)("it generated the typed reference node", () => {
|
|
7
|
+
const node = (0, generateTypedReferenceNode_1.generateTypedReferenceNode)("Name");
|
|
8
|
+
const result = (0, testUtils_1.stringifyTsNode)(node);
|
|
9
|
+
(0, vitest_1.expect)(result).toEqual("export type Name = (typeof Name)[keyof typeof Name];");
|
|
10
|
+
});
|
|
11
|
+
//# sourceMappingURL=generateTypedReferenceNode.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generateTypedReferenceNode.test.js","sourceRoot":"","sources":["../../src/helpers/generateTypedReferenceNode.test.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AAEtC,kDAAoD;AAEpD,6EAA0E;AAE1E,IAAA,aAAI,EAAC,uCAAuC,EAAE,GAAG,EAAE;IACjD,MAAM,IAAI,GAAG,IAAA,uDAA0B,EAAC,MAAM,CAAC,CAAC;IAEhD,MAAM,MAAM,GAAG,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC;IAErC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CACpB,sDAAsD,CACvD,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
const typescript_1 = __importStar(require("typescript"));
|
|
27
|
+
const vitest_1 = require("vitest");
|
|
28
|
+
const generateEnumType_1 = require("./generateEnumType");
|
|
29
|
+
(0, vitest_1.test)("it generates the enum type", () => {
|
|
30
|
+
const [objectDeclaration, typeDeclaration] = (0, generateEnumType_1.generateEnumType)("Name", [
|
|
31
|
+
{ name: "FOO", dbName: "FOO" },
|
|
32
|
+
{ name: "BAR", dbName: "BAR" },
|
|
33
|
+
]);
|
|
34
|
+
const printer = (0, typescript_1.createPrinter)();
|
|
35
|
+
const result = printer.printList(typescript_1.default.ListFormat.MultiLine, typescript_1.default.factory.createNodeArray([objectDeclaration, typeDeclaration]), typescript_1.default.createSourceFile("", "", typescript_1.default.ScriptTarget.Latest));
|
|
36
|
+
(0, vitest_1.expect)(result).toEqual(`export const Name = {
|
|
37
|
+
FOO: "FOO",
|
|
38
|
+
BAR: "BAR"
|
|
39
|
+
} as const;
|
|
40
|
+
export type Name = (typeof Name)[keyof typeof Name];\n`);
|
|
41
|
+
});
|
|
42
|
+
(0, vitest_1.test)("it generates the enum type when using Prisma's @map()", () => {
|
|
43
|
+
const [objectDeclaration, typeDeclaration] = (0, generateEnumType_1.generateEnumType)("Name", [
|
|
44
|
+
{ name: "FOO", dbName: "foo" },
|
|
45
|
+
{ name: "BAR", dbName: "bar" },
|
|
46
|
+
]);
|
|
47
|
+
const printer = (0, typescript_1.createPrinter)();
|
|
48
|
+
const result = printer.printList(typescript_1.default.ListFormat.MultiLine, typescript_1.default.factory.createNodeArray([objectDeclaration, typeDeclaration]), typescript_1.default.createSourceFile("", "", typescript_1.default.ScriptTarget.Latest));
|
|
49
|
+
(0, vitest_1.expect)(result).toEqual(`export const Name = {
|
|
50
|
+
FOO: "foo",
|
|
51
|
+
BAR: "bar"
|
|
52
|
+
} as const;
|
|
53
|
+
export type Name = (typeof Name)[keyof typeof Name];\n`);
|
|
54
|
+
});
|
|
55
|
+
//# sourceMappingURL=generatedEnumType.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generatedEnumType.test.js","sourceRoot":"","sources":["../../src/helpers/generatedEnumType.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA+C;AAC/C,mCAAsC;AAEtC,yDAAsD;AAEtD,IAAA,aAAI,EAAC,4BAA4B,EAAE,GAAG,EAAE;IACtC,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC,GAAG,IAAA,mCAAgB,EAAC,MAAM,EAAE;QACpE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;QAC9B,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;KAC/B,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,0BAAa,GAAE,CAAC;IAEhC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAC9B,oBAAE,CAAC,UAAU,CAAC,SAAS,EACvB,oBAAE,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC,EAChE,oBAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,EAAE,oBAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CACpD,CAAC;IAEF,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC;;;;uDAI8B,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,uDAAuD,EAAE,GAAG,EAAE;IACjE,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC,GAAG,IAAA,mCAAgB,EAAC,MAAM,EAAE;QACpE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;QAC9B,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;KAC/B,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,0BAAa,GAAE,CAAC;IAEhC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAC9B,oBAAE,CAAC,UAAU,CAAC,SAAS,EACvB,oBAAE,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC,EAChE,oBAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,EAAE,oBAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CACpD,CAAC;IAEF,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC;;;;uDAI8B,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC"}
|
|
@@ -9,6 +9,7 @@ const normalizeCase_1 = require("./normalizeCase");
|
|
|
9
9
|
databaseProvider: "postgresql",
|
|
10
10
|
fileName: "",
|
|
11
11
|
enumFileName: "",
|
|
12
|
+
readOnlyIds: false,
|
|
12
13
|
});
|
|
13
14
|
(0, vitest_1.expect)(newName).toEqual("userId");
|
|
14
15
|
});
|
|
@@ -19,6 +20,7 @@ const normalizeCase_1 = require("./normalizeCase");
|
|
|
19
20
|
databaseProvider: "postgresql",
|
|
20
21
|
fileName: "",
|
|
21
22
|
enumFileName: "",
|
|
23
|
+
readOnlyIds: false,
|
|
22
24
|
});
|
|
23
25
|
(0, vitest_1.expect)(newName).toEqual("user_id");
|
|
24
26
|
});
|
|
@@ -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;
|
|
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;KACnB,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;KACnB,CAAC,CAAC;IAEH,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC"}
|
|
@@ -6,6 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.validateConfig = exports.configValidator = void 0;
|
|
7
7
|
const internals_1 = require("@prisma/internals");
|
|
8
8
|
const zod_1 = __importDefault(require("zod"));
|
|
9
|
+
const booleanStringLiteral = zod_1.default
|
|
10
|
+
.union([zod_1.default.boolean(), zod_1.default.literal("true"), zod_1.default.literal("false")])
|
|
11
|
+
.transform((arg) => {
|
|
12
|
+
if (typeof arg === "boolean")
|
|
13
|
+
return arg;
|
|
14
|
+
return arg === "true";
|
|
15
|
+
});
|
|
9
16
|
exports.configValidator = zod_1.default
|
|
10
17
|
.object({
|
|
11
18
|
databaseProvider: zod_1.default.union([
|
|
@@ -26,14 +33,8 @@ exports.configValidator = zod_1.default
|
|
|
26
33
|
jsonTypeOverride: zod_1.default.string().optional(),
|
|
27
34
|
bytesTypeOverride: zod_1.default.string().optional(),
|
|
28
35
|
unsupportedTypeOverride: zod_1.default.string().optional(),
|
|
29
|
-
camelCase:
|
|
30
|
-
|
|
31
|
-
.transform((arg) => {
|
|
32
|
-
if (typeof arg === "boolean")
|
|
33
|
-
return arg;
|
|
34
|
-
return arg === "true";
|
|
35
|
-
})
|
|
36
|
-
.default(false),
|
|
36
|
+
camelCase: booleanStringLiteral.default(false),
|
|
37
|
+
readOnlyIds: booleanStringLiteral.default(false),
|
|
37
38
|
})
|
|
38
39
|
.strict();
|
|
39
40
|
const validateConfig = (config) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateConfig.js","sourceRoot":"","sources":["../../src/utils/validateConfig.ts"],"names":[],"mappings":";;;;;;AAAA,iDAA2C;AAC3C,8CAAoB;
|
|
1
|
+
{"version":3,"file":"validateConfig.js","sourceRoot":"","sources":["../../src/utils/validateConfig.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"repository": {
|
|
5
5
|
"url": "https://github.com/valtyr/prisma-kysely"
|
|
6
6
|
},
|
|
7
|
-
"version": "1.
|
|
7
|
+
"version": "1.4.1",
|
|
8
8
|
"main": "dist/generator.js",
|
|
9
9
|
"files": [
|
|
10
10
|
"dist"
|
|
@@ -22,7 +22,8 @@
|
|
|
22
22
|
"fix": "prettier --write \"**/*.{ts,tsx,md}\"",
|
|
23
23
|
"lint": "eslint ./src",
|
|
24
24
|
"test": "yarn build && vitest --passWithNoTests --coverage",
|
|
25
|
-
"release": "yarn build && yarn changeset publish"
|
|
25
|
+
"release": "yarn build && yarn changeset publish",
|
|
26
|
+
"edit": "code ."
|
|
26
27
|
},
|
|
27
28
|
"dependencies": {
|
|
28
29
|
"@prisma/generator-helper": "4.13.0",
|