joist-codegen 1.0.683 → 1.0.687

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 CHANGED
@@ -49,7 +49,7 @@ exports.superstructConfig = superstructConfig;
49
49
  function isFieldIgnored(config, entity, fieldName, notNull = false, hasDefault = false) {
50
50
  const ignore = config.entities[entity.name]?.fields?.[fieldName]?.ignore === true;
51
51
  if (ignore && notNull && !hasDefault) {
52
- (0, utils_1.fail)("notNull fields cannot be ignored. Alter the column to be optional or have a default value prior to ignoring it.");
52
+ (0, utils_1.fail)(`notNull field ${entity.name}.${fieldName} cannot be ignored. Alter the column to be optional or have a default value prior to ignoring it.`);
53
53
  }
54
54
  return ignore;
55
55
  }
@@ -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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"}
@@ -6,7 +6,7 @@ const symbols_1 = require("./symbols");
6
6
  function generateMetadataFile(config, dbMetadata) {
7
7
  const { entity } = dbMetadata;
8
8
  const { primaryKey, primitives, enums, m2o, polymorphics } = generateColumns(dbMetadata);
9
- const { primaryKeyField, primitiveFields, enumFields, m2oFields, o2mFields, m2mFields, o2oFields, polymorphicFields, } = generateFields(config, dbMetadata);
9
+ const fields = generateFields(config, dbMetadata);
10
10
  return (0, ts_poet_1.code) `
11
11
  export const ${entity.metaName}: ${symbols_1.EntityMetadata}<${entity.type}> = {
12
12
  cstr: ${entity.type},
@@ -14,7 +14,7 @@ function generateMetadataFile(config, dbMetadata) {
14
14
  tagName: "${config.entities[entity.name].tag}",
15
15
  tableName: "${dbMetadata.tableName}",
16
16
  columns: [ ${primaryKey} ${enums} ${primitives} ${m2o} ${polymorphics}],
17
- fields: [ ${primaryKeyField} ${enumFields} ${primitiveFields} ${m2oFields} ${o2mFields} ${m2mFields} ${o2oFields} ${polymorphicFields}],
17
+ fields: ${fields},
18
18
  config: ${entity.configConst},
19
19
  factory: ${(0, ts_poet_1.imp)(`new${entity.name}@./entities`)},
20
20
  };
@@ -87,12 +87,13 @@ function generateColumns(dbMetadata) {
87
87
  return { primaryKey, primitives, enums, m2o, polymorphics };
88
88
  }
89
89
  function generateFields(config, dbMetadata) {
90
- const primaryKeyField = (0, ts_poet_1.code) `
91
- { kind: "primaryKey", fieldName: "id", fieldIdName: undefined, required: true },
90
+ const fields = {};
91
+ fields["id"] = (0, ts_poet_1.code) `
92
+ { kind: "primaryKey", fieldName: "id", fieldIdName: undefined, required: true }
92
93
  `;
93
- const primitiveFields = dbMetadata.primitives.map((p) => {
94
+ dbMetadata.primitives.forEach((p) => {
94
95
  const { fieldName, derived } = p;
95
- return (0, ts_poet_1.code) `
96
+ fields[fieldName] = (0, ts_poet_1.code) `
96
97
  {
97
98
  kind: "primitive",
98
99
  fieldName: "${fieldName}",
@@ -101,22 +102,22 @@ function generateFields(config, dbMetadata) {
101
102
  required: ${!derived && p.notNull},
102
103
  protected: ${p.protected},
103
104
  type: ${typeof p.rawFieldType === "string" ? `"${p.rawFieldType}"` : p.rawFieldType},
104
- },`;
105
+ }`;
105
106
  });
106
- const enumFields = dbMetadata.enums.map(({ fieldName, enumDetailType, notNull }) => {
107
- return (0, ts_poet_1.code) `
107
+ dbMetadata.enums.forEach(({ fieldName, enumDetailType, notNull }) => {
108
+ fields[fieldName] = (0, ts_poet_1.code) `
108
109
  {
109
110
  kind: "enum",
110
111
  fieldName: "${fieldName}",
111
112
  fieldIdName: undefined,
112
113
  required: ${notNull},
113
114
  enumDetailType: ${enumDetailType},
114
- },
115
+ }
115
116
  `;
116
117
  });
117
- const m2oFields = dbMetadata.manyToOnes.map((m2o) => {
118
+ dbMetadata.manyToOnes.forEach((m2o) => {
118
119
  const { fieldName, notNull, otherEntity, otherFieldName } = m2o;
119
- return (0, ts_poet_1.code) `
120
+ fields[fieldName] = (0, ts_poet_1.code) `
120
121
  {
121
122
  kind: "m2o",
122
123
  fieldName: "${fieldName}",
@@ -124,12 +125,12 @@ function generateFields(config, dbMetadata) {
124
125
  required: ${notNull},
125
126
  otherMetadata: () => ${otherEntity.metaName},
126
127
  otherFieldName: "${otherFieldName}",
127
- },
128
+ }
128
129
  `;
129
130
  });
130
- const o2mFields = dbMetadata.oneToManys.map((m2o) => {
131
+ dbMetadata.oneToManys.forEach((m2o) => {
131
132
  const { fieldName, singularName, otherEntity, otherFieldName } = m2o;
132
- return (0, ts_poet_1.code) `
133
+ fields[fieldName] = (0, ts_poet_1.code) `
133
134
  {
134
135
  kind: "o2m",
135
136
  fieldName: "${fieldName}",
@@ -137,12 +138,12 @@ function generateFields(config, dbMetadata) {
137
138
  required: false,
138
139
  otherMetadata: () => ${otherEntity.metaName},
139
140
  otherFieldName: "${otherFieldName}",
140
- },
141
+ }
141
142
  `;
142
143
  });
143
- const m2mFields = dbMetadata.manyToManys.map((m2o) => {
144
+ dbMetadata.manyToManys.forEach((m2o) => {
144
145
  const { fieldName, singularName, otherEntity, otherFieldName } = m2o;
145
- return (0, ts_poet_1.code) `
146
+ fields[fieldName] = (0, ts_poet_1.code) `
146
147
  {
147
148
  kind: "m2m",
148
149
  fieldName: "${fieldName}",
@@ -150,12 +151,12 @@ function generateFields(config, dbMetadata) {
150
151
  required: false,
151
152
  otherMetadata: () => ${otherEntity.metaName},
152
153
  otherFieldName: "${otherFieldName}",
153
- },
154
+ }
154
155
  `;
155
156
  });
156
- const o2oFields = dbMetadata.oneToOnes.map((o2o) => {
157
+ dbMetadata.oneToOnes.forEach((o2o) => {
157
158
  const { fieldName, otherEntity, otherFieldName } = o2o;
158
- return (0, ts_poet_1.code) `
159
+ fields[fieldName] = (0, ts_poet_1.code) `
159
160
  {
160
161
  kind: "o2o",
161
162
  fieldName: "${fieldName}",
@@ -163,12 +164,12 @@ function generateFields(config, dbMetadata) {
163
164
  required: false,
164
165
  otherMetadata: () => ${otherEntity.metaName},
165
166
  otherFieldName: "${otherFieldName}",
166
- },
167
+ }
167
168
  `;
168
169
  });
169
- const polymorphicFields = dbMetadata.polymorphics.map((p) => {
170
+ dbMetadata.polymorphics.forEach((p) => {
170
171
  const { fieldName, notNull, components } = p;
171
- return (0, ts_poet_1.code) `
172
+ fields[fieldName] = (0, ts_poet_1.code) `
172
173
  {
173
174
  kind: "poly",
174
175
  fieldName: "${fieldName}",
@@ -180,18 +181,9 @@ function generateFields(config, dbMetadata) {
180
181
  otherFieldName: "${otherFieldName}",
181
182
  columnName: "${columnName}",
182
183
  },`)} ],
183
- },
184
+ }
184
185
  `;
185
186
  });
186
- return {
187
- primaryKeyField,
188
- primitiveFields,
189
- enumFields,
190
- m2oFields,
191
- o2mFields,
192
- m2mFields,
193
- o2oFields,
194
- polymorphicFields,
195
- };
187
+ return fields;
196
188
  }
197
189
  //# sourceMappingURL=generateMetadataFile.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"generateMetadataFile.js","sourceRoot":"","sources":["../src/generateMetadataFile.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAG1C,uCAUmB;AAEnB,SAAgB,oBAAoB,CAAC,MAAc,EAAE,UAA4B;IAC/E,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IAE9B,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IACzF,MAAM,EACJ,eAAe,EACf,eAAe,EACf,UAAU,EACV,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,iBAAiB,GAClB,GAAG,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAEvC,OAAO,IAAA,cAAI,EAAA;mBACM,MAAM,CAAC,QAAQ,KAAK,wBAAc,IAAI,MAAM,CAAC,IAAI;cACtD,MAAM,CAAC,IAAI;eACV,MAAM,CAAC,IAAI;kBACR,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG;oBAC9B,UAAU,CAAC,SAAS;mBACrB,UAAU,IAAI,KAAK,IAAI,UAAU,IAAI,GAAG,IAAI,YAAY;kBACzD,eAAe,IAAI,UAAU,IAAI,eAAe,IAAI,SAAS,IAAI,SAAS,IAAI,SAAS,IAAI,SAAS,IAAI,iBAAiB;gBAC3H,MAAM,CAAC,WAAW;iBACjB,IAAA,aAAG,EAAC,MAAM,MAAM,CAAC,IAAI,aAAa,CAAC;;;OAG7C,MAAM,CAAC,IAAI,uBAAuB,MAAM,CAAC,QAAQ;GACrD,CAAC;AACJ,CAAC;AA7BD,oDA6BC;AAED,SAAS,eAAe,CAAC,UAA4B;IAOnD,MAAM,UAAU,GAAG,IAAA,cAAI,EAAA;qEAC4C,yBAAe,UAAU,UAAU,CAAC,MAAM,CAAC,QAAQ;GACrH,CAAC;IAEF,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACjD,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;QAC7D,MAAM,SAAS,GAAG,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,8BAAoB,CAAC,CAAC,CAAC,qBAAW,CAAC;QAChF,IAAI,WAAW,EAAE;YACf,OAAO,IAAA,cAAI,EAAA;;wBAEO,SAAS;yBACR,UAAU;qBACd,UAAU;uBACR,0BAAgB,KAAK,SAAS,OAAO,UAAU,MAAM,WAAW;;OAEhF,CAAC;SACH;aAAM;YACL,OAAO,IAAA,cAAI,EAAA;;wBAEO,SAAS;yBACR,UAAU;qBACd,UAAU;uBACR,SAAS,KAAK,SAAS,OAAO,UAAU;;OAExD,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACvC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QAC7D,OAAO,IAAA,cAAI,EAAA;;sBAEO,SAAS;uBACR,UAAU;;qBAGvB,OAAO,CAAC,CAAC,CAAC,6BAAmB,CAAC,CAAC,CAAC,wBAClC,KAAK,SAAS,OAAO,UAAU,MAAM,cAAc;;KAEtD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC;QACnD,OAAO,IAAA,cAAI,EAAA;;sBAEO,SAAS;uBACR,UAAU;;qBAEZ,yBAAe,KAAK,SAAS,OAAO,UAAU,YAAY,WAAW,CAAC,QAAQ;;KAE9F,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC3D,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;QACtC,OAAO,UAAU,CAAC,GAAG,CACnB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,IAAA,cAAI,EAAA;;wBAEnB,SAAS;yBACR,UAAU;;uBAEZ,6BAAmB,KAAK,SAAS,OAAO,UAAU,YAAY,WAAW,CAAC,QAAQ;;OAElG,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC;AAC9D,CAAC;AAED,SAAS,cAAc,CACrB,MAAc,EACd,UAA4B;IAW5B,MAAM,eAAe,GAAG,IAAA,cAAI,EAAA;;GAE3B,CAAC;IAEF,MAAM,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACtD,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACjC,OAAO,IAAA,cAAI,EAAA;;;sBAGO,SAAS;;mBAEZ,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,OAAO,GAAG;oBAChC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO;qBACpB,CAAC,CAAC,SAAS;gBAChB,OAAO,CAAC,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY;SAClF,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE;QACjF,OAAO,IAAA,cAAI,EAAA;;;sBAGO,SAAS;;oBAEX,OAAO;0BACD,cAAc;;KAEnC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAClD,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;QAChE,OAAO,IAAA,cAAI,EAAA;;;sBAGO,SAAS;wBACP,SAAS;oBACb,OAAO;+BACI,WAAW,CAAC,QAAQ;2BACxB,cAAc;;KAEpC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAClD,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;QACrE,OAAO,IAAA,cAAI,EAAA;;;sBAGO,SAAS;wBACP,YAAY;;+BAEL,WAAW,CAAC,QAAQ;2BACxB,cAAc;;KAEpC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACnD,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;QACrE,OAAO,IAAA,cAAI,EAAA;;;sBAGO,SAAS;wBACP,YAAY;;+BAEL,WAAW,CAAC,QAAQ;2BACxB,cAAc;;KAEpC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACjD,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;QACvD,OAAO,IAAA,cAAI,EAAA;;;sBAGO,SAAS;wBACP,SAAS;;+BAEF,WAAW,CAAC,QAAQ;2BACxB,cAAc;;KAEpC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC1D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;QAC7C,OAAO,IAAA,cAAI,EAAA;;;sBAGO,SAAS;wBACP,SAAS;oBACb,OAAO;wBACH,UAAU,CAAC,GAAG,CAC5B,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,IAAA,cAAI,EAAA;;mCAE5B,WAAW,CAAC,QAAQ;+BACxB,cAAc;2BAClB,UAAU;aACxB,CACJ;;KAEJ,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,eAAe;QACf,eAAe;QACf,UAAU;QACV,SAAS;QACT,SAAS;QACT,SAAS;QACT,SAAS;QACT,iBAAiB;KAClB,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"generateMetadataFile.js","sourceRoot":"","sources":["../src/generateMetadataFile.ts"],"names":[],"mappings":"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"}
package/build/index.js CHANGED
@@ -79,7 +79,7 @@ async function generateFiles(config, dbMeta) {
79
79
  name: "./metadata.ts",
80
80
  contents: (0, ts_poet_1.code) `
81
81
  export class ${(0, ts_poet_1.def)("EntityManager")} extends ${symbols_1.EntityManager}<${contextType}> {}
82
-
82
+
83
83
  export function getEm(e: ${BaseEntity}): EntityManager {
84
84
  return e.__orm.em as EntityManager;
85
85
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "joist-codegen",
3
- "version": "1.0.683",
3
+ "version": "1.0.687",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -19,19 +19,19 @@
19
19
  "@types/pluralize": "0.0.29",
20
20
  "change-case": "^4.1.1",
21
21
  "is-plain-object": "^3.0.1",
22
- "joist-utils": "1.0.683",
22
+ "joist-utils": "1.0.687",
23
23
  "knex": "^0.95.9",
24
24
  "pg": "^8.7.1",
25
25
  "pg-structure": "^7.13.0",
26
26
  "pluralize": "^8.0.0",
27
- "ts-poet": "^4.5.0"
27
+ "ts-poet": "^4.7.0"
28
28
  },
29
29
  "devDependencies": {
30
30
  "@types/jest": "^26.0.24",
31
31
  "@types/node": "^16.4.10",
32
32
  "jest": "^27.0.6",
33
- "prettier": "^2.3.2",
34
- "prettier-plugin-organize-imports": "^2.3.3",
33
+ "prettier": "^2.5.1",
34
+ "prettier-plugin-organize-imports": "^2.3.4",
35
35
  "ts-jest": "^27.0.4",
36
36
  "ts-node-dev": "^1.1.8",
37
37
  "tsconfig-paths": "^3.10.1",