joist-codegen 1.27.1 → 1.28.2
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/build/config.js +1 -0
- package/build/config.js.map +1 -1
- package/build/generate.d.ts +3 -2
- package/build/generate.js +2 -1
- package/build/generate.js.map +1 -1
- package/build/index.d.ts +2 -2
- package/build/index.js +4 -4
- package/build/index.js.map +1 -1
- package/package.json +4 -3
package/build/config.js
CHANGED
|
@@ -86,6 +86,7 @@ exports.loadConfig = loadConfig;
|
|
|
86
86
|
* such that no changes to the config show up as noops to the scm.
|
|
87
87
|
*/
|
|
88
88
|
async function writeConfig(config) {
|
|
89
|
+
// Still using prettier due to https://github.com/devongovett/dprint-node/issues/132
|
|
89
90
|
const prettierConfig = await (0, prettier_1.resolveConfig)("./");
|
|
90
91
|
const sorted = (0, utils_1.sortKeys)(config);
|
|
91
92
|
delete sorted.__tableToEntityName;
|
package/build/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/build/generate.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import
|
|
1
|
+
import dprint from "dprint-node";
|
|
2
2
|
import { Code } from "ts-poet";
|
|
3
3
|
import { Config, DbMetadata } from "./index";
|
|
4
|
+
export declare type DPrintOptions = Exclude<Parameters<typeof dprint.format>[2], undefined>;
|
|
4
5
|
export interface CodeGenFile {
|
|
5
6
|
name: string;
|
|
6
7
|
contents: Code | string;
|
|
7
8
|
overwrite: boolean;
|
|
8
|
-
|
|
9
|
+
dprintOverrides?: DPrintOptions;
|
|
9
10
|
}
|
|
10
11
|
/** Generates our `${Entity}` and `${Entity}Codegen` files based on the `db` schema. */
|
|
11
12
|
export declare function generateFiles(config: Config, dbMeta: DbMetadata): Promise<CodeGenFile[]>;
|
package/build/generate.js
CHANGED
|
@@ -21,6 +21,7 @@ async function generateFiles(config, dbMeta) {
|
|
|
21
21
|
{
|
|
22
22
|
name: `${entityName}Codegen.ts`,
|
|
23
23
|
contents: (0, generateEntityCodegenFile_1.generateEntityCodegenFile)(config, meta),
|
|
24
|
+
dprintOverrides: { lineWidth: 200, preferSingleLine: true },
|
|
24
25
|
overwrite: true,
|
|
25
26
|
},
|
|
26
27
|
{ name: `${entityName}.ts`, contents: (0, generateInitialEntityFile_1.generateInitialEntityFile)(meta), overwrite: false },
|
|
@@ -67,7 +68,7 @@ async function generateFiles(config, dbMeta) {
|
|
|
67
68
|
${symbols_1.configureMetadata}(allMetadata);
|
|
68
69
|
`,
|
|
69
70
|
overwrite: true,
|
|
70
|
-
|
|
71
|
+
dprintOverrides: { lineWidth: 500 },
|
|
71
72
|
};
|
|
72
73
|
const enumsTables = Object.values(enums)
|
|
73
74
|
.map(({ table }) => table)
|
package/build/generate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":";;;AACA,qCAA+C;AAC/C,iEAA8D;AAC9D,2EAAwE;AACxE,yDAAsD;AACtD,qEAAkE;AAClE,2EAAwE;AACxE,iEAA8D;AAC9D,6DAA0D;AAE1D,uCAAkE;AAClE,mCAAmD;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":";;;AACA,qCAA+C;AAC/C,iEAA8D;AAC9D,2EAAwE;AACxE,yDAAsD;AACtD,qEAAkE;AAClE,2EAAwE;AACxE,iEAA8D;AAC9D,6DAA0D;AAE1D,uCAAkE;AAClE,mCAAmD;AAWnD,uFAAuF;AAChF,KAAK,UAAU,aAAa,CAAC,MAAc,EAAE,MAAkB;IACpE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAC5C,MAAM,WAAW,GAAG,QAAQ;SACzB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACpC,OAAO;YACL;gBACE,IAAI,EAAE,GAAG,UAAU,YAAY;gBAC/B,QAAQ,EAAE,IAAA,qDAAyB,EAAC,MAAM,EAAE,IAAI,CAAC;gBACjD,eAAe,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE;gBAC3D,SAAS,EAAE,IAAI;aAChB;YACD,EAAE,IAAI,EAAE,GAAG,UAAU,KAAK,EAAE,QAAQ,EAAE,IAAA,qDAAyB,EAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE;SAC1F,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,aAAK,EAAE,EAAE,CAAC,CAAC;IAErB,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;SACnC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3D,OAAO;YACL;gBACE,IAAI,EAAE,GAAG,QAAQ,KAAK;gBACtB,QAAQ,EAAE,IAAA,mCAAgB,EAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC;gBACtD,SAAS,EAAE,IAAI;aAChB;SACF,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,aAAK,EAAE,EAAE,CAAC,CAAC;IACrB,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;SACvC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChB,OAAO;YACL;gBACE,IAAI,EAAE,GAAG,QAAQ,CAAC,IAAI,KAAK;gBAC3B,QAAQ,EAAE,IAAA,uCAAkB,EAAC,MAAM,EAAE,QAAQ,CAAC;gBAC9C,SAAS,EAAE,IAAI;aAChB;SACF,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,aAAK,EAAE,EAAE,CAAC,CAAC;IAErB,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,aAAG,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACxE,MAAM,UAAU,GAAG,IAAA,aAAG,EAAC,sBAAsB,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAgB;QAChC,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,IAAA,cAAI,EAAA;qBACG,IAAA,aAAG,EAAC,eAAe,CAAC,YAAY,4BAAkB,IAAI,WAAW;;iCAErD,UAAU;;;;QAInC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,2CAAoB,EAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;;oCAEtC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QACnF,2BAAiB;KACpB;QACD,SAAS,EAAE,IAAI;QACf,eAAe,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE;KACpC,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;SACrC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC;SACzB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEhD,MAAM,YAAY,GAAgB;QAChC,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,IAAA,2CAAoB,EAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrF,SAAS,EAAE,IAAI;KAChB,CAAC;IAEF,MAAM,cAAc,GAAkB,IAAA,+CAAsB,EAAC,QAAQ,CAAC,CAAC;IAEvE,MAAM,SAAS,GAAgB;QAC7B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAA,cAAI,EAAA,4BAA4B;QAC1C,SAAS,EAAE,KAAK;KACjB,CAAC;IAEF,+FAA+F;IAE/F,MAAM,WAAW,GAAkB,CACjC,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC,CAAC,CACH,CACF,CAAC,IAAI,EAAE,CAAC;IAET,OAAO;QACL,GAAG,WAAW;QACd,GAAG,SAAS;QACZ,GAAG,WAAW;QACd,YAAY;QACZ,GAAG,cAAc;QACjB,YAAY;QACZ,SAAS;QACT,GAAG,WAAW;KACf,CAAC;AACJ,CAAC;AArGD,sCAqGC"}
|
package/build/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Options } from "prettier";
|
|
2
1
|
import { Code } from "ts-poet";
|
|
3
2
|
import { Config } from "./config";
|
|
4
3
|
import { DbMetadata, EntityDbMetadata } from "./EntityDbMetadata";
|
|
4
|
+
import { DPrintOptions } from "./generate";
|
|
5
5
|
import { mapSimpleDbTypeToTypescriptType } from "./utils";
|
|
6
6
|
export { DbMetadata, EnumField, makeEntity, ManyToManyField, ManyToOneField, OneToManyField, OneToOneField, PrimitiveField, } from "./EntityDbMetadata";
|
|
7
7
|
export { CodeGenFile } from "./generate";
|
|
@@ -9,4 +9,4 @@ export { EnumMetadata, EnumRow, EnumTableData, PgEnumData, PgEnumMetadata } from
|
|
|
9
9
|
export { Config, EntityDbMetadata, mapSimpleDbTypeToTypescriptType };
|
|
10
10
|
/** Uses entities and enums from the `db` schema and saves them into our entities directory. */
|
|
11
11
|
export declare function generateAndSaveFiles(config: Config, dbMeta: DbMetadata): Promise<void>;
|
|
12
|
-
export declare function contentToString(content: Code | string, fileName: string,
|
|
12
|
+
export declare function contentToString(content: Code | string, fileName: string, dprintOptions?: DPrintOptions): Promise<string>;
|
package/build/index.js
CHANGED
|
@@ -28,12 +28,12 @@ async function generateAndSaveFiles(config, dbMeta) {
|
|
|
28
28
|
// We might be writing to a non-entities directory i.e. for the graphql plugin, so check this for each file
|
|
29
29
|
await fs_1.promises.mkdir((0, path_1.dirname)(path), { recursive: true });
|
|
30
30
|
if (file.overwrite) {
|
|
31
|
-
await fs_1.promises.writeFile(path, await contentToString(file.contents, file.name, file.
|
|
31
|
+
await fs_1.promises.writeFile(path, await contentToString(file.contents, file.name, file.dprintOverrides));
|
|
32
32
|
}
|
|
33
33
|
else {
|
|
34
34
|
const exists = await (0, utils_1.trueIfResolved)(fs_1.promises.access(path));
|
|
35
35
|
if (!exists) {
|
|
36
|
-
await fs_1.promises.writeFile(path, await contentToString(file.contents, file.name, file.
|
|
36
|
+
await fs_1.promises.writeFile(path, await contentToString(file.contents, file.name, file.dprintOverrides));
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
}
|
|
@@ -71,11 +71,11 @@ if (require.main === module) {
|
|
|
71
71
|
process.exit(1);
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
|
-
async function contentToString(content, fileName,
|
|
74
|
+
async function contentToString(content, fileName, dprintOptions = {}) {
|
|
75
75
|
if (typeof content === "string") {
|
|
76
76
|
return content;
|
|
77
77
|
}
|
|
78
|
-
return await content.toStringWithImports({ path: fileName,
|
|
78
|
+
return await content.toStringWithImports({ path: fileName, dprintOptions });
|
|
79
79
|
}
|
|
80
80
|
exports.contentToString = contentToString;
|
|
81
81
|
function maybeSetDatabaseUrl(config) {
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAoC;AACpC,6CAAoD;AACpD,+BAA+B;AAC/B,2BAA4B;AAC5B,gEAAuC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "joist-codegen",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.28.2",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -19,12 +19,13 @@
|
|
|
19
19
|
"@types/pluralize": "0.0.29",
|
|
20
20
|
"change-case": "^4.1.2",
|
|
21
21
|
"is-plain-object": "^5.0.0",
|
|
22
|
-
"joist-utils": "1.
|
|
22
|
+
"joist-utils": "1.28.2",
|
|
23
23
|
"knex": "^2.1.0",
|
|
24
24
|
"pg": "^8.7.3",
|
|
25
25
|
"pg-structure": "^7.13.0",
|
|
26
26
|
"pluralize": "^8.0.0",
|
|
27
|
-
"
|
|
27
|
+
"prettier": "^2.7.1",
|
|
28
|
+
"ts-poet": "^5.0.1"
|
|
28
29
|
},
|
|
29
30
|
"devDependencies": {
|
|
30
31
|
"@swc/jest": "^0.2.22",
|