prostgles-server 4.2.44 → 4.2.45
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/SchemaWatch/SchemaWatch.d.ts.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.js +2 -2
- package/dist/SchemaWatch/SchemaWatch.js.map +1 -1
- package/dist/SchemaWatch/getValidatedWatchSchemaType.js +3 -3
- package/dist/SchemaWatch/getValidatedWatchSchemaType.js.map +1 -1
- package/lib/SchemaWatch/SchemaWatch.ts +3 -2
- package/lib/SchemaWatch/getValidatedWatchSchemaType.ts +3 -3
- package/package.json +1 -1
- package/tests/client/renderReactHook.ts +1 -1
- package/tests/client/useProstgles.spec.ts +5 -1
- package/tests/server/DBoGenerated.d.ts +0 -10
- package/tests/server/package-lock.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaWatch.d.ts","sourceRoot":"","sources":["../../lib/SchemaWatch/SchemaWatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAA+B,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"SchemaWatch.d.ts","sourceRoot":"","sources":["../../lib/SchemaWatch/SchemaWatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAA+B,MAAM,+BAA+B,CAAC;AAOtG,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC;AAEtC,qBAAa,WAAW;IAEtB,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO;IAYP,MAAM,CAAC,MAAM,eAAsB,UAAU,0BAM5C;IAED;;OAEG;IACH,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CASzD;IAED,cAAc,EAAE,sBAAsB,GAAG,SAAS,CA8BhD;CACH"}
|
|
@@ -5,8 +5,8 @@ const Event_Trigger_Tags_1 = require("../Event_Trigger_Tags");
|
|
|
5
5
|
const PubSubManager_1 = require("../PubSubManager/PubSubManager");
|
|
6
6
|
const getValidatedWatchSchemaType_1 = require("./getValidatedWatchSchemaType");
|
|
7
7
|
const COMMAND_FIRST_KEYWORDS = Event_Trigger_Tags_1.EVENT_TRIGGER_TAGS
|
|
8
|
-
.map(tag => tag.split(" ")[0])
|
|
9
|
-
.
|
|
8
|
+
.map(tag => tag.split(" ")[0])
|
|
9
|
+
.filter(tag => tag !== "SELECT"); /** SELECT INTO is not easily detectable with pg-node (command = "SELECT") */
|
|
10
10
|
const DB_FALLBACK_COMMANDS = Array.from(new Set(COMMAND_FIRST_KEYWORDS));
|
|
11
11
|
class SchemaWatch {
|
|
12
12
|
dboBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaWatch.js","sourceRoot":"","sources":["../../lib/SchemaWatch/SchemaWatch.ts"],"names":[],"mappings":";;;AACA,8DAA2D;AAE3D,kEAAoE;AACpE,+EAAsG;AACtG,MAAM,sBAAsB,GAAG,uCAAkB;KAC9C,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"SchemaWatch.js","sourceRoot":"","sources":["../../lib/SchemaWatch/SchemaWatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getValidatedWatchSchemaType = void 0;
|
|
4
4
|
const getValidatedWatchSchemaType = (dboBuilder) => {
|
|
5
|
-
const { watchSchema, watchSchemaType, tsGeneratedTypesDir } = dboBuilder.prostgles.opts;
|
|
5
|
+
const { watchSchema, watchSchemaType, tsGeneratedTypesDir, disableRealtime } = dboBuilder.prostgles.opts;
|
|
6
6
|
if (!watchSchema)
|
|
7
7
|
return { watchType: "NONE" };
|
|
8
8
|
if (watchSchema === "hotReloadMode" && !tsGeneratedTypesDir) {
|
|
@@ -10,12 +10,12 @@ const getValidatedWatchSchemaType = (dboBuilder) => {
|
|
|
10
10
|
}
|
|
11
11
|
const onChange = typeof watchSchema === "function" ? watchSchema : undefined;
|
|
12
12
|
if (watchSchemaType === "DDL_trigger" || !watchSchemaType) {
|
|
13
|
-
if (!dboBuilder.prostgles.isSuperUser) {
|
|
13
|
+
if (!dboBuilder.prostgles.isSuperUser || disableRealtime) {
|
|
14
14
|
if (watchSchemaType === "DDL_trigger") {
|
|
15
15
|
console.error(`watchSchemaType "DDL_trigger" cannot be used because db user is not a superuser. Will fallback to watchSchemaType "prostgles_queries" `);
|
|
16
16
|
}
|
|
17
17
|
else {
|
|
18
|
-
console.warn(`watchSchema fallback to watchSchemaType "prostgles_queries" due to non-superuser`);
|
|
18
|
+
console.warn(`watchSchema fallback to watchSchemaType "prostgles_queries" due to ${disableRealtime ? "disableRealtime setting" : "non-superuser"}`);
|
|
19
19
|
}
|
|
20
20
|
return {
|
|
21
21
|
watchType: "prostgles_queries",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getValidatedWatchSchemaType.js","sourceRoot":"","sources":["../../lib/SchemaWatch/getValidatedWatchSchemaType.ts"],"names":[],"mappings":";;;AAQO,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAA4B,EAAE;IAC9F,MAAM,EAAC,WAAW,EAAE,eAAe,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"getValidatedWatchSchemaType.js","sourceRoot":"","sources":["../../lib/SchemaWatch/getValidatedWatchSchemaType.ts"],"names":[],"mappings":";;;AAQO,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAA4B,EAAE;IAC9F,MAAM,EAAC,WAAW,EAAE,eAAe,EAAE,mBAAmB,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC;IACxG,IAAG,CAAC,WAAW;QAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IAE9C,IAAI,WAAW,KAAK,eAAe,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC5D,MAAM,8EAA8E,CAAC;IACvF,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,WAAW,KAAK,UAAU,CAAA,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,IAAG,eAAe,KAAK,aAAa,IAAI,CAAC,eAAe,EAAC,CAAC;QACxD,IAAG,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,IAAI,eAAe,EAAC,CAAC;YAEvD,IAAG,eAAe,KAAK,aAAa,EAAC,CAAC;gBACpC,OAAO,CAAC,KAAK,CAAC,wIAAwI,CAAC,CAAA;YACzJ,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,sEAAsE,eAAe,CAAA,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAA;YACpJ,CAAC;YACD,OAAO;gBACL,SAAS,EAAE,mBAAmB;gBAC9B,QAAQ;gBACR,iBAAiB,EAAE,IAAI;aACxB,CAAA;QACH,CAAC;QAED,OAAO;YACL,SAAS,EAAE,aAAa;YACxB,QAAQ;SACT,CAAC;IACJ,CAAC;IAED,OAAO;QACL,SAAS,EAAE,eAAe;QAC1B,iBAAiB,EAAE,KAAK;QACxB,QAAQ;KACT,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,2BAA2B,+BAoCvC"}
|
|
@@ -4,8 +4,9 @@ import { OnSchemaChangeCallback } from "../Prostgles";
|
|
|
4
4
|
import { PubSubManager, log } from "../PubSubManager/PubSubManager";
|
|
5
5
|
import { ValidatedWatchSchemaType, getValidatedWatchSchemaType } from "./getValidatedWatchSchemaType";
|
|
6
6
|
const COMMAND_FIRST_KEYWORDS = EVENT_TRIGGER_TAGS
|
|
7
|
-
.map(tag => tag.split(" ")[0]!)
|
|
8
|
-
.
|
|
7
|
+
.map(tag => tag.split(" ")[0]!)
|
|
8
|
+
.filter(tag => tag !== "SELECT"); /** SELECT INTO is not easily detectable with pg-node (command = "SELECT") */
|
|
9
|
+
|
|
9
10
|
const DB_FALLBACK_COMMANDS = Array.from(new Set(COMMAND_FIRST_KEYWORDS));
|
|
10
11
|
|
|
11
12
|
export type VoidFunction = () => void;
|
|
@@ -7,7 +7,7 @@ export type ValidatedWatchSchemaType =
|
|
|
7
7
|
| { watchType: "prostgles_queries"; onChange?: OnSchemaChangeCallback; isFallbackFromDDL: boolean; }
|
|
8
8
|
|
|
9
9
|
export const getValidatedWatchSchemaType = (dboBuilder: DboBuilder): ValidatedWatchSchemaType => {
|
|
10
|
-
const {watchSchema, watchSchemaType, tsGeneratedTypesDir} = dboBuilder.prostgles.opts;
|
|
10
|
+
const {watchSchema, watchSchemaType, tsGeneratedTypesDir, disableRealtime } = dboBuilder.prostgles.opts;
|
|
11
11
|
if(!watchSchema) return { watchType: "NONE" };
|
|
12
12
|
|
|
13
13
|
if (watchSchema === "hotReloadMode" && !tsGeneratedTypesDir) {
|
|
@@ -17,12 +17,12 @@ export const getValidatedWatchSchemaType = (dboBuilder: DboBuilder): ValidatedWa
|
|
|
17
17
|
const onChange = typeof watchSchema === "function"? watchSchema : undefined;
|
|
18
18
|
|
|
19
19
|
if(watchSchemaType === "DDL_trigger" || !watchSchemaType){
|
|
20
|
-
if(!dboBuilder.prostgles.isSuperUser){
|
|
20
|
+
if(!dboBuilder.prostgles.isSuperUser || disableRealtime){
|
|
21
21
|
|
|
22
22
|
if(watchSchemaType === "DDL_trigger"){
|
|
23
23
|
console.error(`watchSchemaType "DDL_trigger" cannot be used because db user is not a superuser. Will fallback to watchSchemaType "prostgles_queries" `)
|
|
24
24
|
} else {
|
|
25
|
-
console.warn(`watchSchema fallback to watchSchemaType "prostgles_queries" due to non-superuser`)
|
|
25
|
+
console.warn(`watchSchema fallback to watchSchemaType "prostgles_queries" due to ${disableRealtime? "disableRealtime setting" : "non-superuser"}`)
|
|
26
26
|
}
|
|
27
27
|
return {
|
|
28
28
|
watchType: "prostgles_queries",
|
package/package.json
CHANGED
|
@@ -166,7 +166,7 @@ export const renderReactHook = (rootArgs: RenderHookArgs): Promise<RenderResult>
|
|
|
166
166
|
});
|
|
167
167
|
setTimeout(() => {
|
|
168
168
|
if(!resolved){
|
|
169
|
-
reject(new Error(`Expected ${expectedRerenders} rerenders, got ${results.length}`));
|
|
169
|
+
reject(new Error(`Expected ${expectedRerenders} rerenders, got ${results.length}:\n${JSON.stringify(results)}`));
|
|
170
170
|
}
|
|
171
171
|
}, timeout);
|
|
172
172
|
});
|
|
@@ -7,6 +7,7 @@ import { renderReactHook, renderReactHookManual } from "./renderReactHook";
|
|
|
7
7
|
|
|
8
8
|
export const newly_created_table = "newly_created_table";
|
|
9
9
|
export const useProstglesTest = async (db: DBHandlerClient, getSocketOptions: (watchSchema?: boolean) => AnyObject) => {
|
|
10
|
+
await db.sql(`DROP TABLE IF EXISTS ${newly_created_table};`);
|
|
10
11
|
await describe("useProstgles hook", async (t) => {
|
|
11
12
|
const socketOptions = getSocketOptions();
|
|
12
13
|
await test("useProstglesClient", async (t) => {
|
|
@@ -23,10 +24,13 @@ export const useProstglesTest = async (db: DBHandlerClient, getSocketOptions: (w
|
|
|
23
24
|
typeof (res2 as any)?.dbo.items4.useFind,
|
|
24
25
|
"function"
|
|
25
26
|
);
|
|
27
|
+
assert.equal(
|
|
28
|
+
typeof (res2 as any)?.dbo[newly_created_table],
|
|
29
|
+
"undefined"
|
|
30
|
+
);
|
|
26
31
|
});
|
|
27
32
|
|
|
28
33
|
await test("useProstglesClient with schema reload", async (t) => {
|
|
29
|
-
await db.sql(`DROP TABLE IF EXISTS ${newly_created_table}; DROP TABLE IF EXISTS will_delete;`);
|
|
30
34
|
await db.sql(`select pg_sleep(1)`);
|
|
31
35
|
let rerenders = 0
|
|
32
36
|
const { results: [res1, res2, res3], rerender } = await renderReactHook({
|
|
@@ -257,16 +257,6 @@ export type DBSchemaGenerated = {
|
|
|
257
257
|
id: string;
|
|
258
258
|
};
|
|
259
259
|
};
|
|
260
|
-
newly_created_table: {
|
|
261
|
-
is_view: false;
|
|
262
|
-
select: true;
|
|
263
|
-
insert: true;
|
|
264
|
-
update: true;
|
|
265
|
-
delete: true;
|
|
266
|
-
columns: {
|
|
267
|
-
id?: null | number;
|
|
268
|
-
};
|
|
269
|
-
};
|
|
270
260
|
obj_table: {
|
|
271
261
|
is_view: false;
|
|
272
262
|
select: true;
|