velocious 1.0.577 → 1.0.578

package/build/src/velocious-error.d.ts

@@ -6,11 +6,15 @@ export default class VelociousError extends Error {
      * @param {object} [args] - Options.
      * @param {?} [args.cause] - Error cause.
      * @param {string} [args.code] - Optional error code.
+     * @param {import("./configuration-types.js").ClientErrorPayloadReporterPayload} [args.details] - Structured client-safe error details.
+     * @param {"application_error" | "authorization_error" | "record_not_found" | "validation_error"} [args.errorType] - Stable client-facing error category.
      * @returns {VelociousError} - Client-safe error instance.
      */
     static safe(message: string, args?: {
         cause?: unknown;
         code?: string | undefined;
+        details?: import("./configuration-types.js").ClientErrorPayloadReporterPayload | undefined;
+        errorType?: "application_error" | "authorization_error" | "record_not_found" | "validation_error" | undefined;
     }): VelociousError;
     /**
      * Runs constructor.
@@ -18,14 +22,20 @@ export default class VelociousError extends Error {
      * @param {object} [args] - Options.
      * @param {?} [args.cause] - Error cause.
      * @param {string} [args.code] - Optional error code.
+     * @param {import("./configuration-types.js").ClientErrorPayloadReporterPayload} [args.details] - Structured client-safe error details.
+     * @param {"application_error" | "authorization_error" | "record_not_found" | "validation_error"} [args.errorType] - Stable client-facing error category.
      * @param {boolean} [args.safeToExpose] - Whether the message is safe to return to clients.
      */
     constructor(message: string, args?: {
         cause?: unknown;
         code?: string | undefined;
+        details?: import("./configuration-types.js").ClientErrorPayloadReporterPayload | undefined;
+        errorType?: "application_error" | "authorization_error" | "record_not_found" | "validation_error" | undefined;
         safeToExpose?: boolean | undefined;
     });
     code: string | undefined;
+    details: import("./configuration-types.js").ClientErrorPayloadReporterPayload | undefined;
+    errorType: "application_error" | "authorization_error" | "record_not_found" | "validation_error" | undefined;
     safeToExpose: boolean;
 }
 //# sourceMappingURL=velocious-error.d.ts.map

package/build/src/velocious-error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"velocious-error.d.ts","sourceRoot":"","sources":["../../src/velocious-error.js"],"names":[],"mappings":"AAEA,uEAAuE;AACvE;IAmBE;;;;;;;OAOG;IACH,qBANW,MAAM,SAEd;QAAiB,KAAK,GAAd,OAAC;QACa,IAAI;KAC1B,GAAU,cAAc,CAI1B;IA5BD;;;;;;;OAOG;IACH,qBANW,MAAM,SAEd;QAAiB,KAAK,GAAd,OAAC;QACa,IAAI;QACH,YAAY;KACrC,EASA;IAFC,yBAAgB;IAChB,sBAAgC;CAcnC"}
+{"version":3,"file":"velocious-error.d.ts","sourceRoot":"","sources":["../../src/velocious-error.js"],"names":[],"mappings":"AAEA,uEAAuE;AACvE;IAuBE;;;;;;;;;OASG;IACH,qBARW,MAAM,SAEd;QAAiB,KAAK,GAAd,OAAC;QACa,IAAI;QAC0D,OAAO;QACU,SAAS;KAC9G,GAAU,cAAc,CAI1B;IAlCD;;;;;;;;;OASG;IACH,qBARW,MAAM,SAEd;QAAiB,KAAK,GAAd,OAAC;QACa,IAAI;QAC0D,OAAO;QACU,SAAS;QACvF,YAAY;KACrC,EAWA;IAJC,yBAAgB;IAChB,0FAAsB;IACtB,6GAA0B;IAC1B,sBAAgC;CAgBnC"}

package/build/src/velocious-error.js

@@ -7,13 +7,17 @@ export default class VelociousError extends Error {
      * @param {object} [args] - Options.
      * @param {?} [args.cause] - Error cause.
      * @param {string} [args.code] - Optional error code.
+     * @param {import("./configuration-types.js").ClientErrorPayloadReporterPayload} [args.details] - Structured client-safe error details.
+     * @param {"application_error" | "authorization_error" | "record_not_found" | "validation_error"} [args.errorType] - Stable client-facing error category.
      * @param {boolean} [args.safeToExpose] - Whether the message is safe to return to clients.
      */
     constructor(message, args = {}) {
-        const { cause, code, safeToExpose = false } = args;
+        const { cause, code, details, errorType, safeToExpose = false } = args;
         super(message, { cause });
         this.name = "VelociousError";
         this.code = code;
+        this.details = details;
+        this.errorType = errorType;
         this.safeToExpose = safeToExpose;
     }
     /**
@@ -22,10 +26,12 @@ export default class VelociousError extends Error {
      * @param {object} [args] - Options.
      * @param {?} [args.cause] - Error cause.
      * @param {string} [args.code] - Optional error code.
+     * @param {import("./configuration-types.js").ClientErrorPayloadReporterPayload} [args.details] - Structured client-safe error details.
+     * @param {"application_error" | "authorization_error" | "record_not_found" | "validation_error"} [args.errorType] - Stable client-facing error category.
      * @returns {VelociousError} - Client-safe error instance.
      */
     static safe(message, args = {}) {
         return new VelociousError(message, { ...args, safeToExpose: true });
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVsb2Npb3VzLWVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ZlbG9jaW91cy1lcnJvci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxZQUFZO0FBRVosdUVBQXVFO0FBQ3ZFLE1BQU0sQ0FBQyxPQUFPLE9BQU8sY0FBZSxTQUFRLEtBQUs7SUFDL0M7Ozs7Ozs7T0FPRztJQUNILFlBQVksT0FBTyxFQUFFLElBQUksR0FBRyxFQUFFO1FBQzVCLE1BQU0sRUFBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLFlBQVksR0FBRyxLQUFLLEVBQUMsR0FBRyxJQUFJLENBQUE7UUFFaEQsS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFDLEtBQUssRUFBQyxDQUFDLENBQUE7UUFFdkIsSUFBSSxDQUFDLElBQUksR0FBRyxnQkFBZ0IsQ0FBQTtRQUM1QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQTtRQUNoQixJQUFJLENBQUMsWUFBWSxHQUFHLFlBQVksQ0FBQTtJQUNsQyxDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLElBQUksR0FBRyxFQUFFO1FBQzVCLE9BQU8sSUFBSSxjQUFjLENBQUMsT0FBTyxFQUFFLEVBQUMsR0FBRyxJQUFJLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBQyxDQUFDLENBQUE7SUFDbkUsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQHRzLWNoZWNrXG5cbi8qKiBGcmFtZXdvcmsgZXJyb3Igd2l0aCBvcHRpb25hbCBjbGllbnQtc2FmZSBtZXNzYWdlIGV4cG9zdXJlIGZsYWcuICovXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBWZWxvY2lvdXNFcnJvciBleHRlbmRzIEVycm9yIHtcbiAgLyoqXG4gICAqIFJ1bnMgY29uc3RydWN0b3IuXG4gICAqIEBwYXJhbSB7c3RyaW5nfSBtZXNzYWdlIC0gRXJyb3IgbWVzc2FnZS5cbiAgICogQHBhcmFtIHtvYmplY3R9IFthcmdzXSAtIE9wdGlvbnMuXG4gICAqIEBwYXJhbSB7P30gW2FyZ3MuY2F1c2VdIC0gRXJyb3IgY2F1c2UuXG4gICAqIEBwYXJhbSB7c3RyaW5nfSBbYXJncy5jb2RlXSAtIE9wdGlvbmFsIGVycm9yIGNvZGUuXG4gICAqIEBwYXJhbSB7Ym9vbGVhbn0gW2FyZ3Muc2FmZVRvRXhwb3NlXSAtIFdoZXRoZXIgdGhlIG1lc3NhZ2UgaXMgc2FmZSB0byByZXR1cm4gdG8gY2xpZW50cy5cbiAgICovXG4gIGNvbnN0cnVjdG9yKG1lc3NhZ2UsIGFyZ3MgPSB7fSkge1xuICAgIGNvbnN0IHtjYXVzZSwgY29kZSwgc2FmZVRvRXhwb3NlID0gZmFsc2V9ID0gYXJnc1xuXG4gICAgc3VwZXIobWVzc2FnZSwge2NhdXNlfSlcblxuICAgIHRoaXMubmFtZSA9IFwiVmVsb2Npb3VzRXJyb3JcIlxuICAgIHRoaXMuY29kZSA9IGNvZGVcbiAgICB0aGlzLnNhZmVUb0V4cG9zZSA9IHNhZmVUb0V4cG9zZVxuICB9XG5cbiAgLyoqXG4gICAqIFJ1bnMgc2FmZS5cbiAgICogQHBhcmFtIHtzdHJpbmd9IG1lc3NhZ2UgLSBFcnJvciBtZXNzYWdlLlxuICAgKiBAcGFyYW0ge29iamVjdH0gW2FyZ3NdIC0gT3B0aW9ucy5cbiAgICogQHBhcmFtIHs/fSBbYXJncy5jYXVzZV0gLSBFcnJvciBjYXVzZS5cbiAgICogQHBhcmFtIHtzdHJpbmd9IFthcmdzLmNvZGVdIC0gT3B0aW9uYWwgZXJyb3IgY29kZS5cbiAgICogQHJldHVybnMge1ZlbG9jaW91c0Vycm9yfSAtIENsaWVudC1zYWZlIGVycm9yIGluc3RhbmNlLlxuICAgKi9cbiAgc3RhdGljIHNhZmUobWVzc2FnZSwgYXJncyA9IHt9KSB7XG4gICAgcmV0dXJuIG5ldyBWZWxvY2lvdXNFcnJvcihtZXNzYWdlLCB7Li4uYXJncywgc2FmZVRvRXhwb3NlOiB0cnVlfSlcbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVsb2Npb3VzLWVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ZlbG9jaW91cy1lcnJvci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxZQUFZO0FBRVosdUVBQXVFO0FBQ3ZFLE1BQU0sQ0FBQyxPQUFPLE9BQU8sY0FBZSxTQUFRLEtBQUs7SUFDL0M7Ozs7Ozs7OztPQVNHO0lBQ0gsWUFBWSxPQUFPLEVBQUUsSUFBSSxHQUFHLEVBQUU7UUFDNUIsTUFBTSxFQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxZQUFZLEdBQUcsS0FBSyxFQUFDLEdBQUcsSUFBSSxDQUFBO1FBRXBFLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBQyxLQUFLLEVBQUMsQ0FBQyxDQUFBO1FBRXZCLElBQUksQ0FBQyxJQUFJLEdBQUcsZ0JBQWdCLENBQUE7UUFDNUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUE7UUFDaEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUE7UUFDdEIsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUE7UUFDMUIsSUFBSSxDQUFDLFlBQVksR0FBRyxZQUFZLENBQUE7SUFDbEMsQ0FBQztJQUVEOzs7Ozs7Ozs7T0FTRztJQUNILE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLElBQUksR0FBRyxFQUFFO1FBQzVCLE9BQU8sSUFBSSxjQUFjLENBQUMsT0FBTyxFQUFFLEVBQUMsR0FBRyxJQUFJLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBQyxDQUFDLENBQUE7SUFDbkUsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQHRzLWNoZWNrXG5cbi8qKiBGcmFtZXdvcmsgZXJyb3Igd2l0aCBvcHRpb25hbCBjbGllbnQtc2FmZSBtZXNzYWdlIGV4cG9zdXJlIGZsYWcuICovXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBWZWxvY2lvdXNFcnJvciBleHRlbmRzIEVycm9yIHtcbiAgLyoqXG4gICAqIFJ1bnMgY29uc3RydWN0b3IuXG4gICAqIEBwYXJhbSB7c3RyaW5nfSBtZXNzYWdlIC0gRXJyb3IgbWVzc2FnZS5cbiAgICogQHBhcmFtIHtvYmplY3R9IFthcmdzXSAtIE9wdGlvbnMuXG4gICAqIEBwYXJhbSB7P30gW2FyZ3MuY2F1c2VdIC0gRXJyb3IgY2F1c2UuXG4gICAqIEBwYXJhbSB7c3RyaW5nfSBbYXJncy5jb2RlXSAtIE9wdGlvbmFsIGVycm9yIGNvZGUuXG4gICAqIEBwYXJhbSB7aW1wb3J0KFwiLi9jb25maWd1cmF0aW9uLXR5cGVzLmpzXCIpLkNsaWVudEVycm9yUGF5bG9hZFJlcG9ydGVyUGF5bG9hZH0gW2FyZ3MuZGV0YWlsc10gLSBTdHJ1Y3R1cmVkIGNsaWVudC1zYWZlIGVycm9yIGRldGFpbHMuXG4gICAqIEBwYXJhbSB7XCJhcHBsaWNhdGlvbl9lcnJvclwiIHwgXCJhdXRob3JpemF0aW9uX2Vycm9yXCIgfCBcInJlY29yZF9ub3RfZm91bmRcIiB8IFwidmFsaWRhdGlvbl9lcnJvclwifSBbYXJncy5lcnJvclR5cGVdIC0gU3RhYmxlIGNsaWVudC1mYWNpbmcgZXJyb3IgY2F0ZWdvcnkuXG4gICAqIEBwYXJhbSB7Ym9vbGVhbn0gW2FyZ3Muc2FmZVRvRXhwb3NlXSAtIFdoZXRoZXIgdGhlIG1lc3NhZ2UgaXMgc2FmZSB0byByZXR1cm4gdG8gY2xpZW50cy5cbiAgICovXG4gIGNvbnN0cnVjdG9yKG1lc3NhZ2UsIGFyZ3MgPSB7fSkge1xuICAgIGNvbnN0IHtjYXVzZSwgY29kZSwgZGV0YWlscywgZXJyb3JUeXBlLCBzYWZlVG9FeHBvc2UgPSBmYWxzZX0gPSBhcmdzXG5cbiAgICBzdXBlcihtZXNzYWdlLCB7Y2F1c2V9KVxuXG4gICAgdGhpcy5uYW1lID0gXCJWZWxvY2lvdXNFcnJvclwiXG4gICAgdGhpcy5jb2RlID0gY29kZVxuICAgIHRoaXMuZGV0YWlscyA9IGRldGFpbHNcbiAgICB0aGlzLmVycm9yVHlwZSA9IGVycm9yVHlwZVxuICAgIHRoaXMuc2FmZVRvRXhwb3NlID0gc2FmZVRvRXhwb3NlXG4gIH1cblxuICAvKipcbiAgICogUnVucyBzYWZlLlxuICAgKiBAcGFyYW0ge3N0cmluZ30gbWVzc2FnZSAtIEVycm9yIG1lc3NhZ2UuXG4gICAqIEBwYXJhbSB7b2JqZWN0fSBbYXJnc10gLSBPcHRpb25zLlxuICAgKiBAcGFyYW0gez99IFthcmdzLmNhdXNlXSAtIEVycm9yIGNhdXNlLlxuICAgKiBAcGFyYW0ge3N0cmluZ30gW2FyZ3MuY29kZV0gLSBPcHRpb25hbCBlcnJvciBjb2RlLlxuICAgKiBAcGFyYW0ge2ltcG9ydChcIi4vY29uZmlndXJhdGlvbi10eXBlcy5qc1wiKS5DbGllbnRFcnJvclBheWxvYWRSZXBvcnRlclBheWxvYWR9IFthcmdzLmRldGFpbHNdIC0gU3RydWN0dXJlZCBjbGllbnQtc2FmZSBlcnJvciBkZXRhaWxzLlxuICAgKiBAcGFyYW0ge1wiYXBwbGljYXRpb25fZXJyb3JcIiB8IFwiYXV0aG9yaXphdGlvbl9lcnJvclwiIHwgXCJyZWNvcmRfbm90X2ZvdW5kXCIgfCBcInZhbGlkYXRpb25fZXJyb3JcIn0gW2FyZ3MuZXJyb3JUeXBlXSAtIFN0YWJsZSBjbGllbnQtZmFjaW5nIGVycm9yIGNhdGVnb3J5LlxuICAgKiBAcmV0dXJucyB7VmVsb2Npb3VzRXJyb3J9IC0gQ2xpZW50LXNhZmUgZXJyb3IgaW5zdGFuY2UuXG4gICAqL1xuICBzdGF0aWMgc2FmZShtZXNzYWdlLCBhcmdzID0ge30pIHtcbiAgICByZXR1cm4gbmV3IFZlbG9jaW91c0Vycm9yKG1lc3NhZ2UsIHsuLi5hcmdzLCBzYWZlVG9FeHBvc2U6IHRydWV9KVxuICB9XG59XG4iXX0=

package/build/velocious-error.js

@@ -8,15 +8,19 @@ export default class VelociousError extends Error {
    * @param {object} [args] - Options.
    * @param {?} [args.cause] - Error cause.
    * @param {string} [args.code] - Optional error code.
+   * @param {import("./configuration-types.js").ClientErrorPayloadReporterPayload} [args.details] - Structured client-safe error details.
+   * @param {"application_error" | "authorization_error" | "record_not_found" | "validation_error"} [args.errorType] - Stable client-facing error category.
    * @param {boolean} [args.safeToExpose] - Whether the message is safe to return to clients.
    */
   constructor(message, args = {}) {
-    const {cause, code, safeToExpose = false} = args
+    const {cause, code, details, errorType, safeToExpose = false} = args
 
     super(message, {cause})
 
     this.name = "VelociousError"
     this.code = code
+    this.details = details
+    this.errorType = errorType
     this.safeToExpose = safeToExpose
   }
 
@@ -26,6 +30,8 @@ export default class VelociousError extends Error {
    * @param {object} [args] - Options.
    * @param {?} [args.cause] - Error cause.
    * @param {string} [args.code] - Optional error code.
+   * @param {import("./configuration-types.js").ClientErrorPayloadReporterPayload} [args.details] - Structured client-safe error details.
+   * @param {"application_error" | "authorization_error" | "record_not_found" | "validation_error"} [args.errorType] - Stable client-facing error category.
    * @returns {VelociousError} - Client-safe error instance.
    */
   static safe(message, args = {}) {

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "build/bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.577",
+  "version": "1.0.578",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
@@ -111,7 +111,7 @@
     "eslint-plugin-jsdoc": "^63.0.0",
     "eslint-plugin-jsdoc-inline-type-casts": "https://github.com/kaspernj/eslint-plugin-jsdoc-inline-type-casts/archive/refs/heads/master.tar.gz",
     "eslint-plugin-jsdoc-tag-lines": "^1.0.1",
-    "fallow": "3.10.0",
+    "fallow": "3.11.0",
     "globals": "^17.0.0",
     "mssql": "^12.0.0",
     "mysql": "^2.18.1",

package/src/background-jobs/main.js

@@ -786,9 +786,9 @@ export default class BackgroundJobsMain {
         options: message.options || {}
       })
 
-      jsonSocket.send({type: "schedule-replaced", ...result})
       this._notifyEnqueued()
       await this._drain()
+      jsonSocket.send({type: "schedule-replaced", ...result})
     } catch (error) {
       this._handleClientMutationError({
         context: {jobName: message.jobName, scheduleKey: message.scheduleKey, stage: "background-job-replace-scheduled"},
@@ -812,9 +812,9 @@ export default class BackgroundJobsMain {
     try {
       const result = await this.store.cancelScheduled(message.scheduleKey)
 
-      jsonSocket.send({type: "schedule-cancelled", ...result})
       this._notifyEnqueued()
       await this._drain()
+      jsonSocket.send({type: "schedule-cancelled", ...result})
     } catch (error) {
       this._handleClientMutationError({
         context: {scheduleKey: message.scheduleKey, stage: "background-job-cancel-scheduled"},

package/src/configuration-types.js

@@ -312,6 +312,7 @@
  * @property {string} controller - Controller class name.
  * @property {string} [action] - Controller action or endpoint label.
  * @property {"index" | "find" | "create" | "update" | "destroy" | "attach" | "attachmentList" | "download" | "url" | "custom-command"} [commandType] - Frontend-model command type.
+ * @property {string} [correlationId] - Server-generated identifier shared by an unexpected client error and framework reports.
  * @property {boolean} [expectedError] - Whether the error is an expected user-flow failure.
  * @property {boolean} [frontendModelEndpoint] - Whether the error came from the frontend-model endpoint.
  * @property {string} [model] - Frontend-model name from the failed request.

package/src/configuration.js

@@ -286,6 +286,19 @@ export default class VelociousConfiguration {
     }
 
     this._isInitialized = false
+    this._modelsInitialized = false
+    /**
+     * Invalidates model phases that started before database connections closed.
+     * @type {number}
+     */
+    this._modelInitializationGeneration = 0
+    /**
+     * In-progress `initializeModels()` promise. Model initialization is an
+     * atomic bootstrap phase: concurrent callers share it, and a rejection
+     * leaves the phase eligible for a later complete attempt.
+     * @type {Promise<void> | undefined}
+     */
+    this._initializeModelsPromise = undefined
     /**
      * In-progress `initialize()` promise, memoized so concurrent callers await
      * the same bootstrap. Reset to undefined if initialization fails.
@@ -2020,25 +2033,39 @@ export default class VelociousConfiguration {
    * @returns {Promise<void>} - Resolves when complete.
    */
   async initializeModels(args = {type: "server"}) {
-    if (!this._modelsInitialized) {
-      this._modelsInitialized = true
+    if (this._modelsInitialized) return
+    if (this._initializeModelsPromise) return await this._initializeModelsPromise
 
+    const modelInitializationGeneration = this._modelInitializationGeneration
+    const initializeModelsPromise = (async () => {
       const shouldSkipDummyModelInitialization = process.env.VELOCIOUS_SKIP_DUMMY_MODEL_INITIALIZATION === "1"
         && process.env.VELOCIOUS_BROWSER_TESTS === "true"
         && this.getEnvironment() === "test"
 
-      if (shouldSkipDummyModelInitialization) {
-        return
+      if (!shouldSkipDummyModelInitialization) {
+        if (this._initializeModels) {
+          await this._initializeModels({configuration: this, type: args.type})
+        }
+
+        await this.getEnvironmentHandler().initializePackageModels(this)
+        await initializeAuditedModelRelationships(this)
+
+        await this.getEnvironmentHandler().initializeFrontendModelWebsocketPublishers(this)
       }
 
-      if (this._initializeModels) {
-        await this._initializeModels({configuration: this, type: args.type})
+      if (this._modelInitializationGeneration === modelInitializationGeneration) {
+        this._modelsInitialized = true
       }
+    })()
 
-      await this.getEnvironmentHandler().initializePackageModels(this)
-      await initializeAuditedModelRelationships(this)
+    this._initializeModelsPromise = initializeModelsPromise
 
-      await this.getEnvironmentHandler().initializeFrontendModelWebsocketPublishers(this)
+    try {
+      await initializeModelsPromise
+    } finally {
+      if (this._initializeModelsPromise === initializeModelsPromise) {
+        this._initializeModelsPromise = undefined
+      }
     }
   }
 
@@ -2073,6 +2100,12 @@ export default class VelociousConfiguration {
 
     this._initializePromise = (async () => {
       await this.initializeModels({type})
+
+      // Model initialization can be invalidated by a concurrent connection close.
+      // If models are not ready, stop without marking the configuration initialized
+      // so the next caller retries a full bootstrap.
+      if (!this._modelsInitialized) return
+
       await this.getEnvironmentHandler().autoDiscoverResources(this)
       this._mergeDiscoveredAbilityResources()
       this._validateResourceRelationshipsOnModels()
@@ -2104,6 +2137,13 @@ export default class VelociousConfiguration {
       this._initializePromise = undefined
       throw error
     }
+
+    // If the inner IIFE returned without marking the configuration initialized
+    // (e.g. because models were invalidated mid-bootstrap), clear the promise so
+    // a later call retries a full bootstrap.
+    if (!this._isInitialized) {
+      this._initializePromise = undefined
+    }
   }
 
   /**
@@ -3244,8 +3284,10 @@ export default class VelociousConfiguration {
           PoolClass.clearGlobalConnections(this)
         }
 
-        // Allow models to be re-initialized after connections are closed.
+        // Allow full re-initialization after connections are closed.
+        this._modelInitializationGeneration += 1
         this._modelsInitialized = false
+        this._isInitialized = false
       }
     })()
 

package/src/database/drivers/mysql/structure-sql.js

@@ -20,6 +20,9 @@ export default class VelociousDatabaseDriversMysqlStructureSql {
     const {driver} = this
     const isMariaDb = await this._isMariaDb()
     const rows = await driver.query("SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = DATABASE() ORDER BY table_type, table_name")
+    const foreignKeyRows = await driver.query("SELECT table_name, referenced_table_name FROM information_schema.key_column_usage WHERE table_schema = DATABASE() AND referenced_table_schema = DATABASE() AND referenced_table_name IS NOT NULL")
+    const baseTableNames = []
+    const views = []
     const statements = []
 
     for (const row of rows) {
@@ -31,24 +34,82 @@ export default class VelociousDatabaseDriversMysqlStructureSql {
       if (!tableName || !tableType) continue
 
       if (tableType == "BASE TABLE") {
-        const createRows = await driver.query(`SHOW CREATE TABLE ${driver.quoteTable(tableName)}`)
-        const rawCreateStatement = this._mysqlCreateStatement(createRows?.[0])
-        const createStatement = rawCreateStatement ? this._stripAutoIncrement(rawCreateStatement) : null
-
-        if (createStatement) statements.push(normalizeSqlStatement(createStatement))
+        baseTableNames.push(tableName)
       } else if (tableType == "VIEW" || (isMariaDb && tableType == "SYSTEM VIEW")) {
-        const createRows = await driver.query(`SHOW CREATE VIEW ${driver.quoteTable(tableName)}`)
-        const createStatement = this._mysqlCreateStatement(createRows?.[0])
-
-        if (createStatement) statements.push(normalizeSqlStatement(createStatement))
+        views.push(tableName)
       }
     }
 
+    for (const tableName of this._orderBaseTables({foreignKeyRows, tableNames: baseTableNames})) {
+      const createRows = await driver.query(`SHOW CREATE TABLE ${driver.quoteTable(tableName)}`)
+      const rawCreateStatement = this._mysqlCreateStatement(createRows?.[0])
+      const createStatement = rawCreateStatement ? this._stripAutoIncrement(rawCreateStatement) : null
+
+      if (createStatement) statements.push(normalizeSqlStatement(createStatement))
+    }
+
+    for (const tableName of views) {
+      const createRows = await driver.query(`SHOW CREATE VIEW ${driver.quoteTable(tableName)}`)
+      const createStatement = this._mysqlCreateStatement(createRows?.[0])
+
+      if (createStatement) statements.push(normalizeSqlStatement(createStatement))
+    }
+
     if (statements.length == 0) return null
 
     return `${statements.join("\n\n")}\n`
   }
 
+  /**
+   * Orders tables so referenced tables are created before their dependents.
+   * @param {object} args - Options object.
+   * @param {Array<Record<string, ?>>} args.foreignKeyRows - Foreign key metadata rows.
+   * @param {string[]} args.tableNames - Base table names in their existing order.
+   * @returns {string[]} - Ordered table names.
+   */
+  _orderBaseTables({foreignKeyRows, tableNames}) {
+    const pendingTableNames = new Set(tableNames)
+    /** @type {Record<string, Set<string>>} */
+    const dependenciesByTableName = {}
+    const orderedTableNames = []
+
+    for (const tableName of tableNames) {
+      dependenciesByTableName[tableName] = new Set()
+    }
+
+    for (const row of foreignKeyRows) {
+      const tableNameValue = row.table_name || row.TABLE_NAME
+      const referencedTableNameValue = row.referenced_table_name || row.REFERENCED_TABLE_NAME
+      const tableName = tableNameValue ? String(tableNameValue) : ""
+      const referencedTableName = referencedTableNameValue ? String(referencedTableNameValue) : ""
+
+      if (tableName == referencedTableName || !pendingTableNames.has(tableName) || !pendingTableNames.has(referencedTableName)) continue
+
+      dependenciesByTableName[tableName].add(referencedTableName)
+    }
+
+    while (pendingTableNames.size > 0) {
+      const nextTableName = tableNames.find((tableName) => {
+        if (!pendingTableNames.has(tableName)) return false
+
+        return Array.from(dependenciesByTableName[tableName]).every((dependencyTableName) => !pendingTableNames.has(dependencyTableName))
+      })
+
+      if (!nextTableName) {
+        for (const tableName of tableNames) {
+          if (pendingTableNames.has(tableName)) orderedTableNames.push(tableName)
+        }
+
+        break
+      }
+
+      orderedTableNames.push(nextTableName)
+      pendingTableNames.delete(nextTableName)
+    }
+
+    return orderedTableNames
+  }
+
   /**
    * Runs is maria db.
    * @returns {Promise<boolean>} - Resolves with Whether maria db.

package/src/database/query/with-count.js

@@ -161,22 +161,22 @@ function queryForEntry({entry, modelClass, parentIds, sourceModel}) {
 
   const foreignKey = relationship.getForeignKey()
   /**
-   * Where conditions.
+   * Mandatory cohort conditions.
    * @type {Record<string, ?>} */
-  const whereConditions = {[foreignKey]: parentIds}
+  const mandatoryWhereConditions = {[foreignKey]: parentIds}
 
   if (relationship.getPolymorphic && relationship.getPolymorphic()) {
     const typeColumn = relationship.getPolymorphicTypeColumn()
-    whereConditions[typeColumn] = modelClass.getModelName()
-  }
-
-  if (entry.where) {
-    Object.assign(whereConditions, entry.where)
+    mandatoryWhereConditions[typeColumn] = modelClass.getModelName()
   }
 
   const baseQuery = sourceModel.queryForModel(targetModelClass)
   baseQuery._forceQualifyBaseTable = true
-  baseQuery.where(whereConditions)
+  baseQuery.where(mandatoryWhereConditions)
+
+  if (entry.where) {
+    baseQuery.where(entry.where)
+  }
 
   const countQuery = relationship.applyScope(baseQuery)
 

package/src/database/record/record-not-found-error.js

@@ -1,3 +1,4 @@
 // @ts-check
 
+/** Backend missing-record error whose diagnostic message stays server-side. */
 export default class RecordNotFoundError extends Error {}