prostgles-server 4.2.265 → 4.2.267

package/lib/TableConfig/applyTableConfig.ts

@@ -1,6 +1,6 @@
 import type { ProstglesError } from "prostgles-types";
 import { type Prostgles } from "../Prostgles";
-import { PubSubManager } from "../PubSubManager/PubSubManager";
+import { EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID } from "../PubSubManager/PubSubManagerUtils";
 import { getSchemaDiffQueries } from "./getSchemaDiffQueries";
 import { getSchemaForTableConfig } from "./getSchemaForTableConfig";
 import { getTableConfigSchemaQueries } from "./getTableConfigSchemaQueries";
@@ -30,7 +30,7 @@ import { getSchemaUtils } from "./tableConfigSchemaUtils";
  */
 
 export const applyTableConfig = async (prostgles: Prostgles, commit = false) => {
-  const NO_RELOAD = `/* ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */ \n\n`;
+  const NO_RELOAD = `/* ${EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */ \n\n`;
   const utils = await getSchemaUtils(prostgles);
   const { db } = utils;
   const { fileTable, tableConfig, tableConfigMigrations, onLog, sqlFilePath } = prostgles.opts;

package/lib/TableConfig/getColumnDefinitionQuery.ts

@@ -1,6 +1,6 @@
 import { asName, pickKeys } from "prostgles-types";
 import { DB } from "../Prostgles";
-import { asValue } from "../PubSubManager/PubSubManager";
+import { asValue } from "../PubSubManager/PubSubManagerUtils";
 import { VALIDATE_SCHEMA_FUNCNAME } from "../JSONBValidation/validate_jsonb_schema_sql";
 import { BaseColumnTypes, ColumnConfig } from "./TableConfig";
 import pgPromise from "pg-promise";

package/lib/TableConfig/getConstraintDefinitionQueries.ts

@@ -1,7 +1,7 @@
 import pgPromise from "pg-promise";
 import { asName } from "prostgles-types";
 import { DB } from "../Prostgles";
-import { asValue } from "../PubSubManager/PubSubManager";
+import { asValue } from "../PubSubManager/PubSubManagerUtils";
 import { TableConfig } from "./TableConfig";
 
 type Args = {

package/lib/TableConfig/getSchemaDiffQueries.ts

@@ -1,5 +1,5 @@
 import { isDefined, isEqual } from "prostgles-types";
-import { asValue } from "../PubSubManager/PubSubManager";
+import { asValue } from "../PubSubManager/PubSubManagerUtils";
 import { type SchemaInfo } from "./getSchemaForTableConfig";
 
 /**

package/lib/TableConfig/initTableConfig.ts

@@ -1,5 +1,9 @@
-import { asName as _asName, tryCatchV2, type AnyObject } from "prostgles-types";
-import { PubSubManager, asValue, log } from "../PubSubManager/PubSubManager";
+import { asName as _asName, type AnyObject } from "prostgles-types";
+import {
+  asValue,
+  EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID,
+  log,
+} from "../PubSubManager/PubSubManagerUtils";
 import type { OnReadyCallbackBasic } from "../initProstgles";
 import TableConfigurator from "./TableConfig";
 import {
@@ -10,7 +14,6 @@ import { getFutureTableSchema } from "./getFutureTableSchema";
 import { getPGIndexes } from "./getPGIndexes";
 import { getTableColumnQueries } from "./getTableColumnQueries";
 import { runMigrations } from "./runMigrations";
-import { applyTableConfig } from "./applyTableConfig";
 
 export const initTableConfig = async function (this: TableConfigurator) {
   this.initialising = true;
@@ -49,7 +52,7 @@ export const initTableConfig = async function (this: TableConfigurator) {
     if (!_queries.some((q) => q.trim().length)) {
       return 0;
     }
-    q = `/* ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */ \n\n` + q;
+    q = `/* ${EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */ \n\n` + q;
     queryHistory.push(q);
     await this.prostgles.opts.onLog?.({
       type: "debug",

package/lib/TableConfig/runMigrations.ts

@@ -1,6 +1,6 @@
 import type pgPromise from "pg-promise";
 import type { ProstglesInitOptions } from "../ProstglesTypes";
-import { PubSubManager } from "../PubSubManager/PubSubManager";
+import { EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID } from "../PubSubManager/PubSubManagerUtils";
 import { getColConstraints } from "./getConstraintDefinitionQueries";
 
 export async function runMigrations(
@@ -15,7 +15,7 @@ export async function runMigrations(
 
   const { onMigrate, version, versionTableName = "schema_version" } = tableConfigMigrations;
   await t.any(`
-      /* ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */
+      /* ${EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */
       CREATE TABLE IF NOT EXISTS ${asName(versionTableName)}(id NUMERIC PRIMARY KEY, table_config JSONB NOT NULL)
     `);
   const migrations = { version, table: versionTableName };

package/lib/TableConfig/tableConfigSchemaUtils.ts

@@ -1,6 +1,6 @@
 import { asName as _asName } from "prostgles-types";
 import type { Prostgles } from "../Prostgles";
-import { PubSubManager, log } from "../PubSubManager/PubSubManager";
+import { EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID, log } from "../PubSubManager/PubSubManagerUtils";
 
 const makeQuery = (q: string[]) =>
   q
@@ -21,7 +21,7 @@ export const getSchemaUtils = async (prostgles: Pick<Prostgles, "db" | "opts">)
     if (!_queries.some((q) => q.trim().length)) {
       return 0;
     }
-    q = `/* ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */ \n\n` + q;
+    q = `/* ${EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */ \n\n` + q;
     queryHistory.push(q);
     await opts.onLog?.({
       type: "debug",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.265",
+  "version": "4.2.267",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "pg": "^8.11.5",
     "pg-cursor": "^2.11.0",
     "pg-promise": "^11.9.1",
-    "prostgles-types": "^4.0.161"
+    "prostgles-types": "^4.0.164"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",