prostgles-server 4.1.110 → 4.1.111

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.
Files changed (8) hide show
  1. package/dist/DboBuilder/ViewHandler/getInfo.d.ts.map +1 -1
  2. package/dist/DboBuilder/ViewHandler/getInfo.js +3 -31
  3. package/dist/DboBuilder/ViewHandler/getInfo.js.map +1 -1
  4. package/lib/DboBuilder/ViewHandler/getInfo.ts +3 -30
  5. package/package.json +2 -2
  6. package/tests/client/package-lock.json +15 -15
  7. package/tests/client/package.json +1 -1
  8. package/tests/server/package-lock.json +3 -3
package/dist/DboBuilder/ViewHandler/getInfo.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getInfo.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,IAAI,KAAK,EAClB,MAAM,sBAAsB,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,wBAAsB,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,CAgD7J"}
1
+ {"version":3,"file":"getInfo.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,IAAI,KAAK,EAClB,MAAM,sBAAsB,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,wBAAsB,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,CAqB7J"}
package/dist/DboBuilder/ViewHandler/getInfo.js CHANGED
@@ -6,36 +6,7 @@ async function getInfo(lang, param2, param3, tableRules, localParams) {
6
6
  const p = this.getValidatedRules(tableRules, localParams);
7
7
  if (!p.getInfo)
8
8
  throw "Not allowed";
9
- let has_media = undefined;
10
- const mediaTable = this.dboBuilder.prostgles?.opts?.fileTable?.tableName;
11
- if (!this.is_media && mediaTable) {
12
- const joinConf = this.dboBuilder.prostgles?.opts?.fileTable?.referencedTables?.[this.name];
13
- if (joinConf) {
14
- has_media = typeof joinConf === "string" ? joinConf : "one";
15
- }
16
- else {
17
- const jp = this.dboBuilder.getShortestJoinPath(this, mediaTable);
18
- if (jp && jp.path.length <= 3) {
19
- if (jp.path.length <= 2) {
20
- has_media = "one";
21
- }
22
- else {
23
- await Promise.all(jp.path.map(async (tableName) => {
24
- const pkeyFcols = this?.dboBuilder?.dbo?.[tableName]?.columns?.filter(c => c.is_pkey).map(c => c.name);
25
- const cols = this?.dboBuilder?.dbo?.[tableName]?.columns?.filter(c => c?.references?.some(({ ftable }) => jp.path.includes(ftable)));
26
- if (cols && cols.length && has_media !== "many") {
27
- if (cols.some(c => !pkeyFcols?.includes(c.name))) {
28
- has_media = "many";
29
- }
30
- else {
31
- has_media = "one";
32
- }
33
- }
34
- }));
35
- }
36
- }
37
- }
38
- }
9
+ const fileTableName = this.dboBuilder.prostgles?.opts?.fileTable?.tableName;
39
10
  return {
40
11
  oid: this.tableOrViewInfo.oid,
41
12
  comment: this.tableOrViewInfo.comment,
@@ -44,7 +15,8 @@ async function getInfo(lang, param2, param3, tableRules, localParams) {
44
15
  allowedNestedInserts: tableRules?.insert?.allowedNestedInserts
45
16
  },
46
17
  isView: this.is_view,
47
- fileTableName: mediaTable,
18
+ hasFiles: Boolean(!this.is_media && fileTableName && this.columns.some(c => c.references?.some(r => r.ftable === fileTableName))),
19
+ fileTableName,
48
20
  dynamicRules: {
49
21
  update: Boolean(tableRules?.update?.dynamicFields?.length)
50
22
  }
package/dist/DboBuilder/ViewHandler/getInfo.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getInfo.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getInfo.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":";;;AAOO,KAAK,UAAU,OAAO,CAAoB,IAAa,EAAE,MAAY,EAAE,MAAY,EAAE,UAAsB,EAAE,WAAyB;IAC3I,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACrE,MAAM,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC1D,IAAI,CAAC,CAAC,CAAC,OAAO;QAAE,MAAM,aAAa,CAAC;IAEpC,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC;IAE5E,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG;QAC7B,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO;QACrC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,iBAAiB,EAAE,YAAY,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QAChG,WAAW,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAA,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACvC,oBAAoB,EAAE,UAAU,EAAE,MAAM,EAAE,oBAAoB;SAC/D;QACD,MAAM,EAAE,IAAI,CAAC,OAAO;QACpB,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,aAAa,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAAC;QACjI,aAAa;QACb,YAAY,EAAE;YACZ,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC;SAC3D;KACF,CAAA;AACH,CAAC;AArBD,0BAqBC"}
package/lib/DboBuilder/ViewHandler/getInfo.ts CHANGED
@@ -10,35 +10,7 @@ export async function getInfo(this: ViewHandler, lang?: string, param2?: any, pa
10
10
  const p = this.getValidatedRules(tableRules, localParams);
11
11
  if (!p.getInfo) throw "Not allowed";
12
12
 
13
- let has_media: "one" | "many" | undefined = undefined;
14
-
15
- const mediaTable = this.dboBuilder.prostgles?.opts?.fileTable?.tableName;
16
-
17
- if (!this.is_media && mediaTable) {
18
- const joinConf = this.dboBuilder.prostgles?.opts?.fileTable?.referencedTables?.[this.name]
19
- if (joinConf) {
20
- has_media = typeof joinConf === "string" ? joinConf : "one";
21
- } else {
22
- const jp = this.dboBuilder.getShortestJoinPath(this, mediaTable);
23
- if (jp && jp.path.length <= 3) {
24
- if (jp.path.length <= 2) {
25
- has_media = "one"
26
- } else {
27
- await Promise.all(jp.path.map(async tableName => {
28
- const pkeyFcols = this?.dboBuilder?.dbo?.[tableName]?.columns?.filter(c => c.is_pkey).map(c => c.name);
29
- const cols = this?.dboBuilder?.dbo?.[tableName]?.columns?.filter(c => c?.references?.some(({ ftable }) => jp.path.includes(ftable)));
30
- if (cols && cols.length && has_media !== "many") {
31
- if (cols.some(c => !pkeyFcols?.includes(c.name))) {
32
- has_media = "many"
33
- } else {
34
- has_media = "one"
35
- }
36
- }
37
- }));
38
- }
39
- }
40
- }
41
- }
13
+ const fileTableName = this.dboBuilder.prostgles?.opts?.fileTable?.tableName;
42
14
 
43
15
  return {
44
16
  oid: this.tableOrViewInfo.oid,
@@ -48,7 +20,8 @@ export async function getInfo(this: ViewHandler, lang?: string, param2?: any, pa
48
20
  allowedNestedInserts: tableRules?.insert?.allowedNestedInserts
49
21
  },
50
22
  isView: this.is_view,
51
- fileTableName: mediaTable,
23
+ hasFiles: Boolean(!this.is_media && fileTableName && this.columns.some(c => c.references?.some(r => r.ftable === fileTableName))),
24
+ fileTableName,
52
25
  dynamicRules: {
53
26
  update: Boolean(tableRules?.update?.dynamicFields?.length)
54
27
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-server",
3
- "version": "4.1.110",
3
+ "version": "4.1.111",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -41,7 +41,7 @@
41
41
  "check-disk-space": "^3.3.1",
42
42
  "file-type": "^18.5.0",
43
43
  "pg-promise": "^11.3.0",
44
- "prostgles-types": "^4.0.47"
44
+ "prostgles-types": "^4.0.49"
45
45
  },
46
46
  "devDependencies": {
47
47
  "@types/bluebird": "^3.5.36",
package/tests/client/package-lock.json CHANGED
@@ -10,7 +10,7 @@
10
10
  "license": "ISC",
11
11
  "dependencies": {
12
12
  "@types/node": "^14.14.16",
13
- "prostgles-client": "^4.0.32",
13
+ "prostgles-client": "^4.0.34",
14
14
  "socket.io-client": "^4.7.1"
15
15
  },
16
16
  "devDependencies": {
@@ -74,11 +74,11 @@
74
74
  "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
75
75
  },
76
76
  "node_modules/prostgles-client": {
77
- "version": "4.0.32",
78
- "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.32.tgz",
79
- "integrity": "sha512-n6RbZXf5ZjxvQncKtpd35Eqz7hq6InsX6DmxBIZp3JLqC7AFthF/tP0TsVjrnAwl444y3hWyopznDCwOSAdezw==",
77
+ "version": "4.0.34",
78
+ "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.34.tgz",
79
+ "integrity": "sha512-aTEMeOnWl2Onbvt9V9Qntmmrvg9HBYRdbR3+7ooc+o4OxrZpoz77Yh/S/47UfUrEyuO4tZ7j83a/MZ0fSDQ0gw==",
80
80
  "dependencies": {
81
- "prostgles-types": "^4.0.47"
81
+ "prostgles-types": "^4.0.49"
82
82
  },
83
83
  "peerDependencies": {
84
84
  "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
@@ -90,9 +90,9 @@
90
90
  }
91
91
  },
92
92
  "node_modules/prostgles-types": {
93
- "version": "4.0.47",
94
- "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.47.tgz",
95
- "integrity": "sha512-C6sF0k/SFprhxB9MOVwNAZ60hwqZ0D6f0WGxa++CawOebKeXDzjbD1MOSEqpcPyBN7569M6Vq2wrvrjLagtn1g==",
93
+ "version": "4.0.49",
94
+ "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.49.tgz",
95
+ "integrity": "sha512-UQuYqwy9SgWWCuPFrxVg8+uznhu2RioEKFMmzVdrdBsv4b/SzI9iOAztsVdTfWF2+kviSMofr40mB8bksNGhrw==",
96
96
  "dependencies": {
97
97
  "json-schema": "^0.4.0"
98
98
  }
@@ -212,17 +212,17 @@
212
212
  "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
213
213
  },
214
214
  "prostgles-client": {
215
- "version": "4.0.32",
216
- "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.32.tgz",
217
- "integrity": "sha512-n6RbZXf5ZjxvQncKtpd35Eqz7hq6InsX6DmxBIZp3JLqC7AFthF/tP0TsVjrnAwl444y3hWyopznDCwOSAdezw==",
215
+ "version": "4.0.34",
216
+ "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.34.tgz",
217
+ "integrity": "sha512-aTEMeOnWl2Onbvt9V9Qntmmrvg9HBYRdbR3+7ooc+o4OxrZpoz77Yh/S/47UfUrEyuO4tZ7j83a/MZ0fSDQ0gw==",
218
218
  "requires": {
219
- "prostgles-types": "^4.0.47"
219
+ "prostgles-types": "^4.0.49"
220
220
  }
221
221
  },
222
222
  "prostgles-types": {
223
- "version": "4.0.47",
224
- "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.47.tgz",
225
- "integrity": "sha512-C6sF0k/SFprhxB9MOVwNAZ60hwqZ0D6f0WGxa++CawOebKeXDzjbD1MOSEqpcPyBN7569M6Vq2wrvrjLagtn1g==",
223
+ "version": "4.0.49",
224
+ "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.49.tgz",
225
+ "integrity": "sha512-UQuYqwy9SgWWCuPFrxVg8+uznhu2RioEKFMmzVdrdBsv4b/SzI9iOAztsVdTfWF2+kviSMofr40mB8bksNGhrw==",
226
226
  "requires": {
227
227
  "json-schema": "^0.4.0"
228
228
  }
package/tests/client/package.json CHANGED
@@ -13,7 +13,7 @@
13
13
  "license": "ISC",
14
14
  "dependencies": {
15
15
  "@types/node": "^14.14.16",
16
- "prostgles-client": "^4.0.32",
16
+ "prostgles-client": "^4.0.34",
17
17
  "socket.io-client": "^4.7.1"
18
18
  },
19
19
  "devDependencies": {
package/tests/server/package-lock.json CHANGED
@@ -21,7 +21,7 @@
21
21
  },
22
22
  "../..": {
23
23
  "name": "prostgles-server",
24
- "version": "4.1.109",
24
+ "version": "4.1.110",
25
25
  "license": "MIT",
26
26
  "dependencies": {
27
27
  "@types/express": "^4.17.13",
@@ -30,7 +30,7 @@
30
30
  "check-disk-space": "^3.3.1",
31
31
  "file-type": "^18.5.0",
32
32
  "pg-promise": "^11.3.0",
33
- "prostgles-types": "^4.0.47"
33
+ "prostgles-types": "^4.0.49"
34
34
  },
35
35
  "devDependencies": {
36
36
  "@types/bluebird": "^3.5.36",
@@ -1523,7 +1523,7 @@
1523
1523
  "eslint": "^8.51.0",
1524
1524
  "file-type": "^18.5.0",
1525
1525
  "pg-promise": "^11.3.0",
1526
- "prostgles-types": "^4.0.47",
1526
+ "prostgles-types": "^4.0.49",
1527
1527
  "typescript": "^5.2.2"
1528
1528
  }
1529
1529
  },