tsondb 0.12.2 → 0.12.3

package/dist/src/node/server/api/git.js

@@ -41,6 +41,7 @@ gitApi.get("/status", async (req, res) => {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             req.entitiesByName[entityName], instance, req.getInstanceById, getChildInstancesForInstanceId, req.locales)),
         ])),
+        latestCommit: await req.git.revparse(["HEAD"]),
     };
     res.json(body);
 });

package/dist/src/node/server/api/instances.js

@@ -15,7 +15,8 @@ instancesApi.get("/", (req, res) => {
             .filter(([entityName]) => Object.hasOwn(req.entitiesByName, entityName))
             .map(([entityName, instances]) => [
             entityName,
-            instances.map(instance => {
+            instances
+                .map(instance => {
                 const { name, localeId } = getDisplayNameFromEntityInstance(
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 req.entitiesByName[entityName], instance, req.getInstanceById, getChildInstancesForInstanceId, req.locales);
@@ -24,7 +25,8 @@ instancesApi.get("/", (req, res) => {
                     name,
                     displayNameLocaleId: localeId,
                 };
-            }),
+            })
+                .toSorted((a, b) => a.name.localeCompare(b.name, a.displayNameLocaleId)),
         ])),
     };
     res.json(body);

package/dist/src/node/server/index.d.ts

@@ -24,6 +24,7 @@ export interface TSONDBRequestLocals {
     locales: string[];
     homeLayoutSections?: HomeLayoutSection[];
     getInstanceById: GetInstanceById;
+    setLocal: <K extends keyof Omit<TSONDBRequestLocals, "setLocal">>(key: K, value: TSONDBRequestLocals[K]) => void;
 }
 export type GetInstanceById = (id: string) => {
     entity: EntityDecl;

package/dist/src/node/server/index.js

@@ -30,6 +30,9 @@ export const createServer = async (schema, dataRootPath, instancesByEntityName,
     const requestLocals = await init(schema, dataRootPath, Object.assign({}, instancesByEntityName), defaultLocales, homeLayoutSections);
     app.use((req, _res, next) => {
         debug("%s %s", req.method, req.originalUrl);
+        requestLocals.setLocal = (key, value) => {
+            requestLocals[key] = req[key] = value;
+        };
         Object.assign(req, requestLocals);
         req.locales = getLocalesFromRequest(req) ?? defaultLocales;
         next();

package/dist/src/node/server/init.d.ts

@@ -2,5 +2,5 @@ import type { InstancesByEntityName } from "../../shared/utils/instances.ts";
 import type { HomeLayoutSection } from "../config.ts";
 import type { Schema } from "../schema/Schema.ts";
 import type { TSONDBRequestLocals } from "./index.ts";
-export declare const init: (schema: Schema, dataRootPath: string, instancesByEntityName: InstancesByEntityName, defaultLocales: string[], homeLayoutSections?: HomeLayoutSection[]) => Promise<TSONDBRequestLocals>;
+export declare const init: (schema: Schema, dataRootPath: string, instancesByEntityName: InstancesByEntityName, defaultLocales: string[], homeLayoutSections?: HomeLayoutSection[]) => Promise<Omit<TSONDBRequestLocals, "setLocal">>;
 export declare const reinit: (locals: TSONDBRequestLocals) => Promise<void>;

package/dist/src/node/server/init.js

@@ -29,7 +29,6 @@ export const init = async (schema, dataRootPath, instancesByEntityName, defaultL
     debug("found %d entities in declarations", entities.length);
     const entitiesByName = Object.fromEntries(entities.map(entity => [entity.name, entity]));
     const serializedDeclarationsByName = Object.fromEntries(declarations.map(decl => [decl.name, serializeNode(decl)]));
-    const instancesByEntityNameInMemory = Object.assign({}, instancesByEntityName);
     const referencesToInstances = await getReferencesToInstances(instancesByEntityName, serializedDeclarationsByName);
     debug("created references cache");
     if (gitStatus) {
@@ -37,10 +36,10 @@ export const init = async (schema, dataRootPath, instancesByEntityName, defaultL
         debug("retrieved git status to instances");
     }
     const getInstanceById = id => {
-        for (const entityName in instancesByEntityNameInMemory) {
-            const instance = instancesByEntityNameInMemory[entityName]?.find(i => i.id === id);
-            if (instance && entitiesByName[entityName]) {
-                return { entity: entitiesByName[entityName], instance };
+        for (const entityName in requestLocals.instancesByEntityName) {
+            const instance = requestLocals.instancesByEntityName[entityName]?.find(i => i.id === id);
+            if (instance && requestLocals.entitiesByName[entityName]) {
+                return { entity: requestLocals.entitiesByName[entityName], instance };
             }
         }
         return undefined;
@@ -51,7 +50,7 @@ export const init = async (schema, dataRootPath, instancesByEntityName, defaultL
         dataRoot: dataRootPath,
         declarations: declarations,
         entities: entities,
-        instancesByEntityName: instancesByEntityNameInMemory,
+        instancesByEntityName: Object.assign({}, instancesByEntityName),
         entitiesByName: entitiesByName,
         serializedDeclarationsByName,
         localeEntity: schema.localeEntity,
@@ -64,8 +63,8 @@ export const init = async (schema, dataRootPath, instancesByEntityName, defaultL
     return requestLocals;
 };
 export const reinit = async (locals) => {
-    locals.instancesByEntityName = await getInstancesByEntityName(locals.dataRoot, locals.entities);
-    locals.referencesToInstances = await getReferencesToInstances(locals.instancesByEntityName, locals.serializedDeclarationsByName);
+    locals.setLocal("instancesByEntityName", await getInstancesByEntityName(locals.dataRoot, locals.entities));
+    locals.setLocal("referencesToInstances", await getReferencesToInstances(locals.instancesByEntityName, locals.serializedDeclarationsByName));
     const gitStatus = (await locals.git.checkIsRepo()) ? await locals.git.status() : undefined;
     if (locals.gitRoot && gitStatus) {
         attachGitStatusToInstancesByEntityName(locals.instancesByEntityName, locals.dataRoot, locals.gitRoot, gitStatus);

package/dist/src/node/server/utils/instanceOperations.js

@@ -42,11 +42,11 @@ export const createInstance = async (locals, instance, idQueryParam) => {
     if (isError(res)) {
         return res;
     }
-    const treeRes = await unsafeApplyInstanceTree(locals.dataRoot, locals.entitiesByName, locals.instancesByEntityName, instance.id, instance.entityName, [], instance.childInstances);
+    const newInstanceId = res.value;
+    const treeRes = await unsafeApplyInstanceTree(locals.dataRoot, locals.entitiesByName, locals.instancesByEntityName, newInstanceId, instance.entityName, [], instance.childInstances);
     if (isError(treeRes)) {
         return treeRes;
     }
-    const newInstanceId = res.value;
     const instanceContainer = await updateLocalsAfterInstanceChangeToReflectDiskState(locals, entity.name, newInstanceId, instance.content);
     await updateLocalsAfterInstanceTreeChangeToReflectDiskState(locals, newInstanceId, entity.name, [], instance.childInstances);
     return ok(instanceContainer);

package/dist/src/shared/api.d.ts

@@ -64,6 +64,7 @@ export interface GitStatusResponseBody {
     instances: {
         [entity: string]: InstanceContainerOverview[];
     };
+    latestCommit: string;
 }
 export interface GetAllGitBranchesResponseBodyBranchSummary {
     current: boolean;

package/dist/src/web/components/InstanceRouteSkeleton.js

@@ -36,11 +36,13 @@ export const InstanceRouteSkeleton = ({ mode, buttons, init, titleBuilder, onSub
     const [instanceNamesByEntity] = useInstanceNamesByEntity();
     const [instanceContent, setInstanceContent] = useState();
     const [savedInstanceContent, setSavedInstanceContent] = useState();
+    const [savedChildInstances, setSavedChildInstances] = useState([]);
     const [childInstances, setChildInstances] = useState([]);
     const [customId, setCustomId] = useState("");
     const client = useContext(GitClientContext);
     const { route } = useLocation();
-    const hasUnsavedChanges = useMemo(() => !deepEqual(instanceContent, savedInstanceContent), [instanceContent, savedInstanceContent]);
+    const hasUnsavedChanges = useMemo(() => !deepEqual(instanceContent, savedInstanceContent) ||
+        !deepEqual(childInstances, savedChildInstances), [childInstances, instanceContent, savedChildInstances, savedInstanceContent]);
     const saveHandler = useCallback((event) => {
         if (checkCmdOrCtrl(event) && event.key === "s" && entity && instanceContent !== undefined) {
             event.preventDefault();
@@ -119,6 +121,7 @@ export const InstanceRouteSkeleton = ({ mode, buttons, init, titleBuilder, onSub
                 .then(() => id
                 ? getChildInstancesForInstanceByEntityName(locales, entity.name, id).then(result => {
                     setChildInstances(result.instances);
+                    setSavedChildInstances(result.instances);
                 })
                 : Promise.resolve())
                 .catch((error) => {
@@ -145,6 +148,7 @@ export const InstanceRouteSkeleton = ({ mode, buttons, init, titleBuilder, onSub
                 setInstanceContent: value => {
                     setInstanceContent(value);
                     setSavedInstanceContent(value);
+                    setSavedChildInstances(childInstances);
                 },
                 childInstances,
                 updateLocalGitState: client?.updateLocalState,

package/dist/src/web/components/typeInputs/ReferenceIdentifierTypeInput.js

@@ -6,9 +6,7 @@ export const ReferenceIdentifierTypeInput = ({ type, value, instanceNamesByEntit
     if (typeof value !== "string") {
         return _jsx(MismatchingTypeError, { expected: "string identifier", actual: value });
     }
-    const instances = (instanceNamesByEntity[type.entity] ?? [])
-        .slice()
-        .sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true }));
+    const instances = instanceNamesByEntity[type.entity] ?? [];
     return (_jsxs("div", { class: "field", children: [_jsxs(Select, { value: value, onInput: event => {
                     onChange(event.currentTarget.value);
                 }, disabled: disabled || instances.length === 0, "aria-invalid": !value, children: [instances.length === 0 ? (_jsx("option", { value: "", disabled: true, children: "No instances available" })) : (_jsx("option", { value: "", disabled: true, children: "No selected instance" })), instances.map(instance => (_jsx("option", { value: instance.id, children: instance.name }, instance.id)))] }), _jsx(ValidationErrors, { disabled: disabled, errors: !value ? [ReferenceError("no reference provided")] : [] })] }));

package/dist/src/web/hooks/useGitClient.d.ts

@@ -19,6 +19,7 @@ export type GitClient = {
     currentBranch: string;
     branches: Record<string, GitBranchSummary>;
     isDetached: boolean;
+    latestCommit: string;
     updateLocalState: () => Promise<void>;
     getGitStatusOfInstance: (entityName: string, instanceId: string) => GitFileStatus | undefined;
     fetch: () => Promise<void>;

package/dist/src/web/hooks/useGitClient.js

@@ -28,6 +28,7 @@ export const useGitClient = () => {
     const [workingTreeFiles, setWorkingTreeFiles] = useState([]);
     const [allBranches, setAllBranches] = useState([]);
     const [currentBranch, setCurrentBranch] = useState("");
+    const [latestCommit, setLatestCommit] = useState("");
     const [branches, setBranches] = useState({});
     const [isDetached, setIsDetached] = useState(false);
     const updateGitStatus = useCallback(async () => {
@@ -57,6 +58,8 @@ export const useGitClient = () => {
                     ];
                 })));
                 setIsDetached(branchesData.isDetached);
+                setLatestCommit(statusData.latestCommit);
+                console.log(statusData.latestCommit);
             }
             catch (error) {
                 logAndAlertError(error, "Error updating git status: ");
@@ -271,6 +274,7 @@ export const useGitClient = () => {
         currentBranch,
         branches,
         isDetached,
+        latestCommit,
         getGitStatusOfInstance,
         updateLocalState: updateGitStatus,
         fetch,
@@ -299,6 +303,7 @@ export const useGitClient = () => {
         indexFiles,
         isDetached,
         isRepo,
+        latestCommit,
         pull,
         push,
         reset,

package/dist/src/web/routes/Entity.js

@@ -12,6 +12,7 @@ import { GitClientContext } from "../context/gitClient.js";
 import { useEntityFromRoute } from "../hooks/useEntityFromRoute.js";
 import { useMappedAPIResource } from "../hooks/useMappedAPIResource.js";
 import { useSetting } from "../hooks/useSettings.js";
+import { logAndAlertError } from "../utils/debug.js";
 import { Markdown } from "../utils/Markdown.js";
 import { homeTitle } from "./Home.js";
 import { NotFound } from "./NotFound.js";
@@ -26,8 +27,14 @@ export const Entity = () => {
     const gitClient = useContext(GitClientContext);
     const { reloadEntities } = useContext(EntitiesContext);
     const { declaration: entity, isLocaleEntity } = entityFromRoute ?? {};
-    const [instances, reloadInstances] = useMappedAPIResource(getInstancesByEntityName, mapInstances, locales, entity?.name ?? "");
-    const [localeInstances] = useMappedAPIResource(getLocaleInstances, localeMapper, locales, config.localeEntityName);
+    const [instances, reloadInstances] = useMappedAPIResource(getInstancesByEntityName, mapInstances, locales, entity?.name ?? name ?? "");
+    const [localeInstances, reloadLocaleInstances] = useMappedAPIResource(getLocaleInstances, localeMapper, locales, config.localeEntityName);
+    const { latestCommit } = useContext(GitClientContext) ?? {};
+    useEffect(() => {
+        reloadInstances()
+            .then(() => reloadLocaleInstances())
+            .catch(logAndAlertError);
+    }, [latestCommit, reloadInstances, reloadLocaleInstances]);
     useEffect(() => {
         document.title = toTitleCase(entity?.namePlural ?? name ?? "") + " — TSONDB";
     }, [entity?.namePlural, name]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsondb",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "description": "",
   "license": "ISC",
   "author": "Lukas Obermann",