prostgles-server 4.2.579 → 4.2.580

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.
@@ -38,7 +38,7 @@ async function getColumns(lang, params, _param3, tableRules, localParams) {
38
38
  })
39
39
  .map((_c) => {
40
40
  const c = { ..._c };
41
- const label = c.comment || capitalizeFirstLetter(c.name, " ");
41
+ const label = capitalizeFirstLetter(c.name, " ");
42
42
  const select = !!c.privileges.SELECT;
43
43
  const insert = !!c.privileges.INSERT;
44
44
  const _delete = !!this.tableOrViewInfo.privileges.delete;
@@ -112,13 +112,10 @@ async function getColumns(lang, params, _param3, tableRules, localParams) {
112
112
  });
113
113
  }
114
114
  }
115
- function replaceNonAlphaNumeric(string, replacement = "_") {
116
- return string.replace(/[\W_]+/g, replacement);
117
- }
118
- function capitalizeFirstLetter(string, nonalpha_replacement) {
119
- const str = replaceNonAlphaNumeric(string, nonalpha_replacement);
115
+ const capitalizeFirstLetter = (string, nonAlphaNumericReplacement = " ") => {
116
+ const str = string.replace(/[\W_]+/g, nonAlphaNumericReplacement);
120
117
  return str.charAt(0).toUpperCase() + str.slice(1);
121
- }
118
+ };
122
119
  const getFileColumnInfo = (args) => {
123
120
  const fileTableConfig = args.tableHandler.dboBuilder.prostgles.opts.fileTable;
124
121
  if (!fileTableConfig)
@@ -1 +1 @@
1
- {"version":3,"file":"getColumns.js","sourceRoot":"","sources":["../../lib/DboBuilder/getColumns.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getColumns.js","sourceRoot":"","sources":["../../lib/DboBuilder/getColumns.ts"],"names":[],"mappings":"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"}
package/dist/Prostgles.js CHANGED
@@ -167,7 +167,7 @@ class Prostgles {
167
167
  }
168
168
  }
169
169
  getTSFileName() {
170
- const fileName = "DBGeneratedSchema.d.ts";
170
+ const fileName = "DBGeneratedSchema.ts";
171
171
  const _dir = this.opts.tsGeneratedTypesDir || "";
172
172
  const dir = _dir.endsWith("/") ? _dir : `${_dir}/`;
173
173
  const fullPath = dir + fileName;
@@ -1 +1 @@
1
- {"version":3,"file":"Prostgles.js","sourceRoot":"","sources":["../lib/Prostgles.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Prostgles.js","sourceRoot":"","sources":["../lib/Prostgles.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"TableConfigurator.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableConfigurator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMnE,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAExF;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,UAAU,SAA8B;IAExC,IAAI,MAAM;;;;;qBAQD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MANT;IACD,IAAI,GAAG,IAAI,eAAe,CAGzB;IACD,IAAI,EAAE,IAAI,EAAE,CAGX;IACD,SAAS,EAAE,SAAS,CAAC;gBAET,SAAS,EAAE,SAAS;IAIhC,OAAO,sBAQL;IAEF,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC,CAAM;IAC9E,gBAAgB,sBAad;IAEF,eAAe,GAAI,WAAW,MAAM,EAAE,SAAS,MAAM,KAAG,YAAY,GAAG,SAAS,CAM9E;IAEF,kBAAkB,GAAI,WAAW,MAAM;;;;;kBASrC;IAEF,aAAa,GAAI,QAAQ;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,wBAS3D;IAEF,UAAU,GAAI,QAAQ;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,KAAG,CAAC,YAAY,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,GAAG,SAAS,CAoCnF;IAEF,WAAW,GAAI,QAAQ;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,KAAG,IAAI,CAUnF;IAEF,WAAW,GAAI,aAAa,MAAM,EAAE,aAAa,MAAM,KAAG,QAAQ,GAAG,SAAS,CAuB5E;IAEF,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,YAAY,UAAS;IACrB,IAAI,2BAA8B;CACnC;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,iBAAiB,EAAE,QAAQ;IAClE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,KAAG,SAAS,GAAG,MAWf,CAAC"}
1
+ {"version":3,"file":"TableConfigurator.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableConfigurator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMnE,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAExF;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,UAAU,SAA8B;IAExC,IAAI,MAAM;;;;;qBAQD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MANT;IACD,IAAI,GAAG,IAAI,eAAe,CAGzB;IACD,IAAI,EAAE,IAAI,EAAE,CAGX;IACD,SAAS,EAAE,SAAS,CAAC;gBAET,SAAS,EAAE,SAAS;IAIhC,OAAO,sBAQL;IAEF,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC,CAAM;IAC9E,gBAAgB,sBAad;IAEF,eAAe,GAAI,WAAW,MAAM,EAAE,SAAS,MAAM,KAAG,YAAY,GAAG,SAAS,CAM9E;IAEF,kBAAkB,GAAI,WAAW,MAAM;;;;;kBASrC;IAEF,aAAa,GAAI,QAAQ;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,wBAS3D;IAEF,UAAU,GAAI,QAAQ;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,KAAG,CAAC,YAAY,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,GAAG,SAAS,CAwBnF;IAEF,WAAW,GAAI,QAAQ;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,KAAG,IAAI,CAUnF;IAEF,WAAW,GAAI,aAAa,MAAM,EAAE,aAAa,MAAM,KAAG,QAAQ,GAAG,SAAS,CAuB5E;IAEF,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,YAAY,UAAS;IACrB,IAAI,2BAA8B;CACnC;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,iBAAiB,EAAE,QAAQ;IAClE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,KAAG,SAAS,GAAG,MAWf,CAAC"}
@@ -76,38 +76,24 @@ class TableConfigurator {
76
76
  });
77
77
  };
78
78
  getColInfo = (params) => {
79
- const colConf = this.getColumnConfig(params.table, params.col);
79
+ const columnConfig = this.getColumnConfig(params.table, params.col);
80
80
  let result = undefined;
81
- if (colConf) {
82
- if ((0, prostgles_types_1.isObject)(colConf)) {
83
- const { jsonbSchema, jsonbSchemaType, info } = colConf;
84
- result = {
85
- ...info,
86
- ...((jsonbSchema || jsonbSchemaType) && {
87
- jsonbSchema: {
88
- nullable: colConf.nullable,
89
- ...(jsonbSchema || { type: jsonbSchemaType }),
90
- },
91
- }),
92
- };
93
- /**
94
- * Get labels from TableConfig if specified
95
- */
96
- if (colConf.label) {
97
- const { lang } = params;
98
- const lbl = colConf.label;
99
- if (["string", "object"].includes(typeof lbl)) {
100
- if (typeof lbl === "string") {
101
- result ??= {};
102
- result.label = lbl;
103
- }
104
- else if (lang && (lbl[lang] || lbl.en)) {
105
- result ??= {};
106
- result.label = lbl[lang] || lbl.en;
107
- }
108
- }
109
- }
110
- }
81
+ if ((0, prostgles_types_1.isObject)(columnConfig)) {
82
+ const { lang = "en" } = params;
83
+ const { jsonbSchema, jsonbSchemaType, info, label } = columnConfig;
84
+ const labelFromConfig = (0, prostgles_types_1.isObject)(label) ? (label[lang] ?? label.en) : label;
85
+ result = {
86
+ ...info,
87
+ ...((jsonbSchema || jsonbSchemaType) && {
88
+ jsonbSchema: {
89
+ nullable: columnConfig.nullable,
90
+ ...(jsonbSchema || { type: jsonbSchemaType }),
91
+ },
92
+ }),
93
+ ...(!labelFromConfig ? undefined : ({
94
+ label: labelFromConfig,
95
+ })),
96
+ };
111
97
  }
112
98
  return result;
113
99
  };
@@ -1 +1 @@
1
- {"version":3,"file":"TableConfigurator.js","sourceRoot":"","sources":["../../lib/TableConfig/TableConfigurator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TableConfigurator.js","sourceRoot":"","sources":["../../lib/TableConfig/TableConfigurator.ts"],"names":[],"mappings":"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"}
@@ -56,7 +56,7 @@ export async function getColumns(
56
56
  .map((_c) => {
57
57
  const c = { ..._c };
58
58
 
59
- const label = c.comment || capitalizeFirstLetter(c.name, " ");
59
+ const label = capitalizeFirstLetter(c.name, " ");
60
60
 
61
61
  const select = !!c.privileges.SELECT;
62
62
  const insert = !!c.privileges.INSERT;
@@ -145,13 +145,10 @@ export async function getColumns(
145
145
  }
146
146
  }
147
147
 
148
- function replaceNonAlphaNumeric(string: string, replacement = "_"): string {
149
- return string.replace(/[\W_]+/g, replacement);
150
- }
151
- function capitalizeFirstLetter(string: string, nonalpha_replacement?: string): string {
152
- const str = replaceNonAlphaNumeric(string, nonalpha_replacement);
148
+ const capitalizeFirstLetter = (string: string, nonAlphaNumericReplacement = " ") => {
149
+ const str = string.replace(/[\W_]+/g, nonAlphaNumericReplacement);
153
150
  return str.charAt(0).toUpperCase() + str.slice(1);
154
- }
151
+ };
155
152
 
156
153
  const getFileColumnInfo = (args: {
157
154
  tableHandler: ViewHandler;
package/lib/Prostgles.ts CHANGED
@@ -181,7 +181,7 @@ export class Prostgles {
181
181
  }
182
182
 
183
183
  getTSFileName() {
184
- const fileName = "DBGeneratedSchema.d.ts";
184
+ const fileName = "DBGeneratedSchema.ts";
185
185
  const _dir = this.opts.tsGeneratedTypesDir || "";
186
186
  const dir = _dir.endsWith("/") ? _dir : `${_dir}/`;
187
187
  const fullPath = dir + fileName;
@@ -93,38 +93,26 @@ export class TableConfigurator {
93
93
  table: string;
94
94
  lang?: string;
95
95
  }): (ColExtraInfo & { label?: string } & Pick<ColumnInfo, "jsonbSchema">) | undefined => {
96
- const colConf = this.getColumnConfig(params.table, params.col);
96
+ const columnConfig = this.getColumnConfig(params.table, params.col);
97
97
  let result: Partial<ReturnType<typeof this.getColInfo>> = undefined;
98
- if (colConf) {
99
- if (isObject(colConf)) {
100
- const { jsonbSchema, jsonbSchemaType, info } = colConf;
101
- result = {
102
- ...info,
103
- ...((jsonbSchema || jsonbSchemaType) && {
104
- jsonbSchema: {
105
- nullable: colConf.nullable,
106
- ...(jsonbSchema || { type: jsonbSchemaType }),
107
- },
108
- }),
109
- };
110
-
111
- /**
112
- * Get labels from TableConfig if specified
113
- */
114
- if (colConf.label) {
115
- const { lang } = params;
116
- const lbl = colConf.label;
117
- if (["string", "object"].includes(typeof lbl)) {
118
- if (typeof lbl === "string") {
119
- result ??= {};
120
- result.label = lbl;
121
- } else if (lang && (lbl[lang as "en"] || lbl.en)) {
122
- result ??= {};
123
- result.label = lbl[lang as "en"] || lbl.en;
124
- }
98
+ if (isObject(columnConfig)) {
99
+ const { lang = "en" } = params;
100
+ const { jsonbSchema, jsonbSchemaType, info, label } = columnConfig;
101
+ const labelFromConfig = isObject(label) ? (label[lang as "en"] ?? label.en) : label;
102
+ result = {
103
+ ...info,
104
+ ...((jsonbSchema || jsonbSchemaType) && {
105
+ jsonbSchema: {
106
+ nullable: columnConfig.nullable,
107
+ ...(jsonbSchema || { type: jsonbSchemaType }),
108
+ },
109
+ }),
110
+ ...(!labelFromConfig ? undefined : (
111
+ {
112
+ label: labelFromConfig,
125
113
  }
126
- }
127
- }
114
+ )),
115
+ };
128
116
  }
129
117
 
130
118
  return result;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-server",
3
- "version": "4.2.579",
3
+ "version": "4.2.580",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",