Fix entity referencing issue during post-seeded relational fetch

.gitignore

@@ -18,6 +18,7 @@ packages/media/.env
 **/*/vite.config.ts.timestamp*
 .history
 **/*/.db/*
+**/*/.configs/*
 **/*/*.db
 **/*/*.db-shm
 **/*/*.db-wal

app/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "sideEffects": false,
   "bin": "./dist/cli/index.js",
-  "version": "0.5.0-rc5",
+  "version": "0.5.0-rc6",
   "scripts": {
     "build:all": "NODE_ENV=production bun run build.ts --minify --types --clean && bun run build:cli",
     "dev": "vite",

app/src/core/errors.ts

@@ -1,6 +1,7 @@
 export class Exception extends Error {
    code = 400;
    override name = "Exception";
+   protected _context = undefined;
 
    constructor(message: string, code?: number) {
       super(message);
@@ -9,11 +10,16 @@ export class Exception extends Error {
       }
    }
 
+   context(context: any) {
+      this._context = context;
+      return this;
+   }
+
    toJSON() {
       return {
          error: this.message,
-         type: this.name
+         type: this.name,
-         //message: this.message
+         context: this._context
       };
    }
 }

app/src/data/entities/EntityManager.ts

@@ -107,15 +107,15 @@ export class EntityManager<TBD extends object = DefaultDB> {
       }
 
       this._entities[entityIndex] = entity;
+
+      // caused issues because this.entity() was using a reference (for when initial config was given)
    }
 
    entity(e: Entity | keyof TBD | string): Entity {
-      let entity: Entity | undefined;
+      // make sure to always retrieve by name
-      if (typeof e === "string") {
+      const entity = this.entities.find((entity) =>
-         entity = this.entities.find((entity) => entity.name === e);
+         e instanceof Entity ? entity.name === e.name : entity.name === e
-      } else if (e instanceof Entity) {
+      );
-         entity = e;
-      }
 
       if (!entity) {
          // @ts-ignore

app/src/data/entities/query/Repository.ts

@@ -58,7 +58,7 @@ export class Repository<TBD extends object = DefaultDB, TB extends keyof TBD = a
    }
 
    private cloneFor(entity: Entity) {
-      return new Repository(this.em, entity, this.emgr);
+      return new Repository(this.em, this.em.entity(entity), this.emgr);
    }
 
    private get conn() {
@@ -94,7 +94,10 @@ export class Repository<TBD extends object = DefaultDB, TB extends keyof TBD = a
          if (invalid.length > 0) {
             throw new InvalidSearchParamsException(
                `Invalid select field(s): ${invalid.join(", ")}`
-            );
+            ).context({
+               entity: entity.name,
+               valid: validated.select
+            });
          }
 
          validated.select = options.select;

app/src/data/helper.ts

@@ -1,4 +1,4 @@
-import type { EntityData, Field } from "data";
+import type { EntityData, EntityManager, Field } from "data";
 import { transform } from "lodash-es";
 
 export function getDefaultValues(fields: Field[], data: EntityData): EntityData {
@@ -48,3 +48,23 @@ export function getChangeSet(
       {} as typeof formData
    );
 }
+
+export function readableEmJson(_em: EntityManager) {
+   return {
+      entities: _em.entities.map((e) => ({
+         name: e.name,
+         fields: e.fields.map((f) => f.name),
+         type: e.type
+      })),
+      indices: _em.indices.map((i) => ({
+         name: i.name,
+         entity: i.entity.name,
+         fields: i.fields.map((f) => f.name),
+         unique: i.unique
+      })),
+      relations: _em.relations.all.map((r) => ({
+         name: r.getName(),
+         ...r.toJSON()
+      }))
+   };
+}

app/src/media/AppMedia.ts

@@ -26,7 +26,6 @@ export class AppMedia extends Module<typeof mediaConfigSchema> {
    private _storage?: Storage;
 
    override async build() {
-      console.log("building");
       if (!this.config.enabled) {
          this.setBuilt();
          return;

app/src/modules/Module.ts

@@ -46,10 +46,12 @@ export abstract class Module<Schema extends TSchema = TSchema, ConfigSchema = St
    }
 
    static ctx_flags = {
-      sync_required: false
+      sync_required: false,
+      ctx_reload_required: false
    } as {
       // signal that a sync is required at the end of build
       sync_required: boolean;
+      ctx_reload_required: boolean;
    };
 
    onBeforeUpdate(from: ConfigSchema, to: ConfigSchema): ConfigSchema | Promise<ConfigSchema> {

app/src/modules/ModuleManager.ts

@@ -400,8 +400,8 @@ export class ModuleManager {
       });
    }
 
-   private async buildModules(options?: { graceful?: boolean }) {
+   private async buildModules(options?: { graceful?: boolean; ignoreFlags?: boolean }) {
-      this.logger.log("buildModules() triggered", options?.graceful, this._built);
+      this.logger.log("buildModules() triggered", options, this._built);
       if (options?.graceful && this._built) {
          this.logger.log("skipping build (graceful)");
          return;
@@ -417,12 +417,25 @@ export class ModuleManager {
       this._built = true;
       this.logger.log("modules built", ctx.flags);
 
+      if (options?.ignoreFlags !== true) {
          if (ctx.flags.sync_required) {
+            ctx.flags.sync_required = false;
             this.logger.log("db sync requested");
+
+            // sync db
             await ctx.em.schema().sync({ force: true });
             await this.save();
-         ctx.flags.sync_required = false; // reset
          }
+
+         if (ctx.flags.ctx_reload_required) {
+            ctx.flags.ctx_reload_required = false;
+            this.logger.log("ctx reload requested");
+            this.ctx(true);
+         }
+      }
+
+      // reset all falgs
+      ctx.flags = Module.ctx_flags;
    }
 
    async build() {

app/src/ui/components/table/DataTable.tsx

@@ -125,12 +125,18 @@ export function DataTable<Data extends Record<string, any> = Record<string, any>
                   </thead>
                ) : null}
                <tbody>
-                  {!data || data.length === 0 ? (
+                  {!data || !Array.isArray(data) || data.length === 0 ? (
                      <tr>
                         <td colSpan={select.length + (checkable ? 1 : 0)}>
                            <div className="flex flex-col gap-2 p-8 justify-center items-center border-t border-muted">
                               <i className="opacity-50">
-                                 {Array.isArray(data) ? "No data to show" : "Loading..."}
+                                 {Array.isArray(data) ? (
+                                    "No data to show"
+                                 ) : !data ? (
+                                    "Loading..."
+                                 ) : (
+                                    <pre>{JSON.stringify(data, null, 2)}</pre>
+                                 )}
                               </i>
                            </div>
                         </td>

app/vite.dev.ts

@@ -1,3 +1,4 @@
+import { readFile } from "node:fs/promises";
 import { serveStatic } from "@hono/node-server/serve-static";
 import { createClient } from "@libsql/client/node";
 import { App, registries } from "./src";
@@ -6,7 +7,15 @@ import { StorageLocalAdapter } from "./src/media/storage/adapters/StorageLocalAd
 
 registries.media.register("local", StorageLocalAdapter);
 
-const credentials = {
+const run_example: string | boolean = false;
+//run_example = "ex-admin-rich";
+
+const credentials = run_example
+   ? {
+        url: `file:.configs/${run_example}.db`
+        //url: ":memory:"
+     }
+   : {
         url: import.meta.env.VITE_DB_URL!,
         authToken: import.meta.env.VITE_DB_TOKEN!
      };
@@ -16,10 +25,17 @@ if (!credentials.url) {
 
 const connection = new LibsqlConnection(createClient(credentials));
 
+let initialConfig: any = undefined;
+if (run_example) {
+   const { version, ...config } = JSON.parse(
+      await readFile(`.configs/${run_example}.json`, "utf-8")
+   );
+   initialConfig = config;
+}
+
 export default {
    async fetch(request: Request) {
-      const app = App.create({ connection });
+      const app = App.create({ connection, initialConfig });
-
       app.emgr.onEvent(
          App.Events.AppBuiltEvent,
          async () => {