af-db-ts 2.0.78 → 2.0.80
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/dist/cjs/src/pg/gen-table-interfaces-pg.js +4 -1
- package/dist/cjs/src/pg/gen-table-interfaces-pg.js.map +1 -1
- package/dist/esm/src/pg/gen-table-interfaces-pg.js +4 -1
- package/dist/esm/src/pg/gen-table-interfaces-pg.js.map +1 -1
- package/dist/types/src/pg/gen-table-interfaces-pg.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/pg/gen-table-interfaces-pg.ts +5 -2
|
@@ -55,7 +55,10 @@ const utils_pg_1 = require("./utils-pg");
|
|
|
55
55
|
// return 'any';
|
|
56
56
|
// }
|
|
57
57
|
// };
|
|
58
|
-
const getFieldDefinition = (d) =>
|
|
58
|
+
const getFieldDefinition = (d) => {
|
|
59
|
+
const isOptional = d.isNullable || (d.hasDefault && !String(d.columnDefault).toLowerCase().includes('nextval'));
|
|
60
|
+
return `${d.name}${isOptional ? '?' : ''}: ${(0, utils_pg_1.getJsTypeByTypePg)(d.dataType)}${d.isNullable ? ' | null' : ''}`;
|
|
61
|
+
};
|
|
59
62
|
const TABLE_INTERFACES_DIR = __dirname.replace(/\\/g, '/').replace(/\/dist\//, '/');
|
|
60
63
|
const genTableInterfacePg = async (connectionId, commonSchemaAndTable, tableInterfacesDir = TABLE_INTERFACES_DIR) => {
|
|
61
64
|
const tableSchema = await (0, table_schema_pg_1.getTableSchemaPg)(connectionId, commonSchemaAndTable);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gen-table-interfaces-pg.js","sourceRoot":"","sources":["../../../../src/pg/gen-table-interfaces-pg.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,2CAA6B;AAC7B,uCAAyB;AACzB,2CAAkC;AAElC,uDAAqD;AACrD,uCAAoD;AACpD,yCAA+C;
|
|
1
|
+
{"version":3,"file":"gen-table-interfaces-pg.js","sourceRoot":"","sources":["../../../../src/pg/gen-table-interfaces-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,10 @@ import { getJsTypeByTypePg } from './utils-pg';
|
|
|
29
29
|
// return 'any';
|
|
30
30
|
// }
|
|
31
31
|
// };
|
|
32
|
-
const getFieldDefinition = (d) =>
|
|
32
|
+
const getFieldDefinition = (d) => {
|
|
33
|
+
const isOptional = d.isNullable || (d.hasDefault && !String(d.columnDefault).toLowerCase().includes('nextval'));
|
|
34
|
+
return `${d.name}${isOptional ? '?' : ''}: ${getJsTypeByTypePg(d.dataType)}${d.isNullable ? ' | null' : ''}`;
|
|
35
|
+
};
|
|
33
36
|
const TABLE_INTERFACES_DIR = __dirname.replace(/\\/g, '/').replace(/\/dist\//, '/');
|
|
34
37
|
export const genTableInterfacePg = async (connectionId, commonSchemaAndTable, tableInterfacesDir = TABLE_INTERFACES_DIR) => {
|
|
35
38
|
const tableSchema = await getTableSchemaPg(connectionId, commonSchemaAndTable);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gen-table-interfaces-pg.js","sourceRoot":"","sources":["../../../../src/pg/gen-table-interfaces-pg.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"gen-table-interfaces-pg.js","sourceRoot":"","sources":["../../../../src/pg/gen-table-interfaces-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gen-table-interfaces-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/gen-table-interfaces-pg.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gen-table-interfaces-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/gen-table-interfaces-pg.ts"],"names":[],"mappings":"AA2CA,eAAO,MAAM,mBAAmB,iBAChB,MAAM,wBACE,MAAM,uBACR,MAAM,KACzB,QAAQ,IAAI,CAcd,CAAC;AAEF,eAAO,MAAM,oBAAoB,iBACjB,MAAM,UACZ,MAAM,EAAE,uBACI,MAAM,KACzB,QAAQ,IAAI,CASd,CAAC"}
|
package/package.json
CHANGED
|
@@ -6,6 +6,7 @@ import { IFieldDefPg } from '../@types/i-pg';
|
|
|
6
6
|
import { getTableSchemaPg } from './table-schema-pg';
|
|
7
7
|
import { closeAllPgConnectionsPg } from './pool-pg';
|
|
8
8
|
import { getJsTypeByTypePg } from './utils-pg';
|
|
9
|
+
import { toLower } from "lodash";
|
|
9
10
|
|
|
10
11
|
// export const getJsTypeByUdtNamePg = (udtName?: TArrayTypesPg): string => { // VVR
|
|
11
12
|
// switch (udtName) {
|
|
@@ -34,8 +35,10 @@ import { getJsTypeByTypePg } from './utils-pg';
|
|
|
34
35
|
|
|
35
36
|
const getFieldDefinition = (
|
|
36
37
|
d: IFieldDefPg,
|
|
37
|
-
): string =>
|
|
38
|
-
|
|
38
|
+
): string => {
|
|
39
|
+
const isOptional = d.isNullable || (d.hasDefault && !String(d.columnDefault).toLowerCase().includes('nextval'));
|
|
40
|
+
return `${d.name}${isOptional ? '?' : ''}: ${getJsTypeByTypePg(d.dataType)}${d.isNullable ? ' | null' : ''}`;
|
|
41
|
+
};
|
|
39
42
|
const TABLE_INTERFACES_DIR = __dirname.replace(/\\/g, '/').replace(/\/dist\//, '/');
|
|
40
43
|
|
|
41
44
|
export const genTableInterfacePg = async (
|