af-db-ts 3.0.16 → 3.0.17

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.
@@ -57,24 +57,27 @@ const utils_pg_1 = require("./utils-pg");
57
57
  // };
58
58
  const getFieldDefinition = (d) => `${d.name}${d.isNullable || d.hasDefault ? '?' : ''}: ${(0, utils_pg_1.getJsTypeByTypePg)(d.dataType)}${d.isNullable ? ' | null' : ''}`;
59
59
  const TABLE_INTERFACES_DIR = __dirname.replace(/\\/g, '/').replace(/\/dist\//, '/');
60
- const genTableInterfacePg = async (connectionId, commonSchemaAndTable, tableInterfacesDir = TABLE_INTERFACES_DIR) => {
60
+ const genTableInterfacePg = async (connectionId, commonSchemaAndTable, tableInterfacesDir = TABLE_INTERFACES_DIR, isSortFields = false) => {
61
61
  const tableSchema = await (0, table_schema_pg_1.getTableSchemaPg)(connectionId, commonSchemaAndTable);
62
62
  const interfaceName = `I${commonSchemaAndTable
63
63
  .replace('.', '_')
64
64
  .split(/_+/)
65
65
  .map((word) => (word ? word[0].toUpperCase() + word.substring(1) : ''))
66
66
  .join('')}Record`;
67
- const linesArr = Object.values(tableSchema.columnsSchema).map(getFieldDefinition);
67
+ let linesArr = Object.values(tableSchema.columnsSchema).map(getFieldDefinition);
68
+ if (isSortFields) {
69
+ linesArr = linesArr.sort();
70
+ }
68
71
  const content = `export interface ${interfaceName} {\n${linesArr.map((v) => ` ${v}`).join(',\n')},\n}\n`;
69
72
  const fileName = `${commonSchemaAndTable.replace('.', '-').toLowerCase()}.ts`;
70
73
  const filePath = path.resolve(path.join(tableInterfacesDir, fileName));
71
74
  fs.writeFileSync(filePath, content);
72
75
  };
73
76
  exports.genTableInterfacePg = genTableInterfacePg;
74
- const genTableInterfacesPg = async (connectionId, tables, tableInterfacesDir = TABLE_INTERFACES_DIR) => {
77
+ const genTableInterfacesPg = async (connectionId, tables, tableInterfacesDir = TABLE_INTERFACES_DIR, isSortFields = false) => {
75
78
  for (let i = 0; i < tables.length; i++) {
76
79
  const commonSchemaAndTable = tables[i];
77
- await (0, exports.genTableInterfacePg)(connectionId, commonSchemaAndTable, tableInterfacesDir);
80
+ await (0, exports.genTableInterfacePg)(connectionId, commonSchemaAndTable, tableInterfacesDir, isSortFields);
78
81
  }
79
82
  af_echo_ts_1.echo.g(`Generated ${tables.length} table interfaces in folder '.${tableInterfacesDir.replace(process.cwd().replace(/\\/g, '/'), '')}/'`);
80
83
  await (0, pool_pg_1.closeAllPgConnectionsPg)();
@@ -1 +1 @@
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
+ {"version":3,"file":"gen-table-interfaces-pg.js","sourceRoot":"","sources":["../../../../src/pg/gen-table-interfaces-pg.ts"],"names":[],"mappings":"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"}
@@ -31,23 +31,26 @@ import { getJsTypeByTypePg } from './utils-pg';
31
31
  // };
32
32
  const getFieldDefinition = (d) => `${d.name}${d.isNullable || d.hasDefault ? '?' : ''}: ${getJsTypeByTypePg(d.dataType)}${d.isNullable ? ' | null' : ''}`;
33
33
  const TABLE_INTERFACES_DIR = __dirname.replace(/\\/g, '/').replace(/\/dist\//, '/');
34
- export const genTableInterfacePg = async (connectionId, commonSchemaAndTable, tableInterfacesDir = TABLE_INTERFACES_DIR) => {
34
+ export const genTableInterfacePg = async (connectionId, commonSchemaAndTable, tableInterfacesDir = TABLE_INTERFACES_DIR, isSortFields = false) => {
35
35
  const tableSchema = await getTableSchemaPg(connectionId, commonSchemaAndTable);
36
36
  const interfaceName = `I${commonSchemaAndTable
37
37
  .replace('.', '_')
38
38
  .split(/_+/)
39
39
  .map((word) => (word ? word[0].toUpperCase() + word.substring(1) : ''))
40
40
  .join('')}Record`;
41
- const linesArr = Object.values(tableSchema.columnsSchema).map(getFieldDefinition);
41
+ let linesArr = Object.values(tableSchema.columnsSchema).map(getFieldDefinition);
42
+ if (isSortFields) {
43
+ linesArr = linesArr.sort();
44
+ }
42
45
  const content = `export interface ${interfaceName} {\n${linesArr.map((v) => ` ${v}`).join(',\n')},\n}\n`;
43
46
  const fileName = `${commonSchemaAndTable.replace('.', '-').toLowerCase()}.ts`;
44
47
  const filePath = path.resolve(path.join(tableInterfacesDir, fileName));
45
48
  fs.writeFileSync(filePath, content);
46
49
  };
47
- export const genTableInterfacesPg = async (connectionId, tables, tableInterfacesDir = TABLE_INTERFACES_DIR) => {
50
+ export const genTableInterfacesPg = async (connectionId, tables, tableInterfacesDir = TABLE_INTERFACES_DIR, isSortFields = false) => {
48
51
  for (let i = 0; i < tables.length; i++) {
49
52
  const commonSchemaAndTable = tables[i];
50
- await genTableInterfacePg(connectionId, commonSchemaAndTable, tableInterfacesDir);
53
+ await genTableInterfacePg(connectionId, commonSchemaAndTable, tableInterfacesDir, isSortFields);
51
54
  }
52
55
  echo.g(`Generated ${tables.length} table interfaces in folder '.${tableInterfacesDir.replace(process.cwd().replace(/\\/g, '/'), '')}/'`);
53
56
  await closeAllPgConnectionsPg();
@@ -1 +1 @@
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
+ {"version":3,"file":"gen-table-interfaces-pg.js","sourceRoot":"","sources":["../../../../src/pg/gen-table-interfaces-pg.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
- export declare const genTableInterfacePg: (connectionId: string, commonSchemaAndTable: string, tableInterfacesDir?: string) => Promise<void>;
2
- export declare const genTableInterfacesPg: (connectionId: string, tables: string[], tableInterfacesDir?: string) => Promise<void>;
1
+ export declare const genTableInterfacePg: (connectionId: string, commonSchemaAndTable: string, tableInterfacesDir?: string, isSortFields?: boolean) => Promise<void>;
2
+ export declare const genTableInterfacesPg: (connectionId: string, tables: string[], tableInterfacesDir?: string, isSortFields?: boolean) => Promise<void>;
3
3
  //# sourceMappingURL=gen-table-interfaces-pg.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"gen-table-interfaces-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/gen-table-interfaces-pg.ts"],"names":[],"mappings":"AAwCA,eAAO,MAAM,mBAAmB,iBAChB,MAAM,wBACE,MAAM,uBACR,MAAM,KACzB,OAAO,CAAC,IAAI,CAed,CAAC;AAEF,eAAO,MAAM,oBAAoB,iBACjB,MAAM,UACZ,MAAM,EAAE,uBACI,MAAM,KACzB,OAAO,CAAC,IAAI,CASd,CAAC"}
1
+ {"version":3,"file":"gen-table-interfaces-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/gen-table-interfaces-pg.ts"],"names":[],"mappings":"AAwCA,eAAO,MAAM,mBAAmB,iBAChB,MAAM,wBACE,MAAM,uBACR,MAAM,iBACZ,OAAO,KACpB,OAAO,CAAC,IAAI,CAkBd,CAAC;AAEF,eAAO,MAAM,oBAAoB,iBACjB,MAAM,UACZ,MAAM,EAAE,uBACI,MAAM,iBACZ,OAAO,KACpB,OAAO,CAAC,IAAI,CASd,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "af-db-ts",
3
- "version": "3.0.16",
3
+ "version": "3.0.17",
4
4
  "description": "A highly specialized function library",
5
5
  "main": "./dist/cjs/src/index.js",
6
6
  "module": "./dist/esm/src/index.js",
@@ -42,6 +42,7 @@ export const genTableInterfacePg = async (
42
42
  connectionId: string,
43
43
  commonSchemaAndTable: string,
44
44
  tableInterfacesDir: string = TABLE_INTERFACES_DIR,
45
+ isSortFields: boolean = false,
45
46
  ): Promise<void> => {
46
47
  const tableSchema = await getTableSchemaPg(connectionId, commonSchemaAndTable);
47
48
  const interfaceName = `I${commonSchemaAndTable
@@ -50,7 +51,10 @@ export const genTableInterfacePg = async (
50
51
  .map((word) => (word ? word[0].toUpperCase() + word.substring(1) : ''))
51
52
  .join('')}Record`;
52
53
 
53
- const linesArr = Object.values(tableSchema.columnsSchema).map(getFieldDefinition);
54
+ let linesArr: string[] = Object.values(tableSchema.columnsSchema).map(getFieldDefinition);
55
+ if (isSortFields) {
56
+ linesArr = linesArr.sort();
57
+ }
54
58
  const content = `export interface ${interfaceName} {\n${linesArr.map((v) => ` ${v}`).join(',\n')},\n}\n`;
55
59
 
56
60
  const fileName = `${commonSchemaAndTable.replace('.', '-').toLowerCase()}.ts`;
@@ -63,10 +67,11 @@ export const genTableInterfacesPg = async (
63
67
  connectionId: string,
64
68
  tables: string[],
65
69
  tableInterfacesDir: string = TABLE_INTERFACES_DIR,
70
+ isSortFields: boolean = false,
66
71
  ): Promise<void> => {
67
72
  for (let i = 0; i < tables.length; i++) {
68
73
  const commonSchemaAndTable = tables[i];
69
- await genTableInterfacePg(connectionId, commonSchemaAndTable, tableInterfacesDir);
74
+ await genTableInterfacePg(connectionId, commonSchemaAndTable, tableInterfacesDir, isSortFields);
70
75
  }
71
76
  echo.g(`Generated ${tables.length} table interfaces in folder '.${
72
77
  tableInterfacesDir.replace(process.cwd().replace(/\\/g, '/'), '')}/'`);