@inlang/sdk 0.35.4 → 0.35.6

package/dist/adapter/solidAdapter.test.js

@@ -174,7 +174,7 @@ describe("messages", () => {
         project.setSettings({ ...project.settings(), languageTags: ["en"] });
         // TODO: how can we await `setConfig` correctly
         await new Promise((resolve) => setTimeout(resolve, 510));
-        expect(effectOnMessagesCounter).toBe(3); // 3 = setSetting, loadMessage (2x - one per message)
+        expect(effectOnMessagesCounter).toBe(2); // 2 = setSetting (clearing the message index), subsequencial loadMessage call
         expect(Object.values(project.query.messages.getAll()).length).toBe(2);
     });
     it("should react to message udpate", async () => {

package/dist/api.d.ts

@@ -3,7 +3,7 @@ import type * as RuntimeError from "./errors.js";
 import type * as ModuleResolutionError from "./resolve-modules/errors.js";
 import type { MessageLintLevel, MessageLintRule, Message, Plugin, ProjectSettings, MessageLintReport } from "./versionedInterfaces.js";
 import type { ResolvedPluginApi } from "./resolve-modules/plugins/types.js";
-import type * as V2 from "./v2/types.js";
+import type { StoreApi } from "./persistence/storeApi.js";
 export type InstalledPlugin = {
     id: Plugin["id"];
     displayName: Plugin["displayName"];
@@ -42,18 +42,8 @@ export type InlangProject = {
         messages: MessageQueryApi;
         messageLintReports: MessageLintReportsQueryApi;
     };
-    messageBundles?: Query<V2.MessageBundle>;
-    messages?: Query<V2.Message>;
-    variants?: Query<V2.Variant>;
+    store?: StoreApi;
 };
-/**
- * WIP template for async V2 crud interfaces
- * E.g. `await project.messageBundles.get({ id: "..." })`
- **/
-interface Query<T> {
-    get: (args: unknown) => Promise<T>;
-    getAll: () => Promise<T[]>;
-}
 export type Subscribable<Value> = {
     (): Value;
     subscribe: (callback: (value: Value) => void) => void;
@@ -120,5 +110,4 @@ export type MessageLintReportsQueryApi = {
         }, callback: (MessageLintRules: Readonly<MessageLintReport[]>) => void) => void;
     };
 };
-export {};
 //# sourceMappingURL=api.d.ts.map

package/dist/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}

package/dist/createMessagesQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createMessagesQuery.d.ts","sourceRoot":"","sources":["../src/createMessagesQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAyC,MAAM,UAAU,CAAA;AAEpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AAEzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAInD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AA4B/D,KAAK,6BAA6B,GAAG;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,QAAQ,EAAE,MAAM,eAAe,GAAG,SAAS,CAAA;IAC3C,eAAe,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,GAAG,SAAS,CAAA;IAC7E,0BAA0B,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IAC/C,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IACxC,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;CACxC,CAAA;AACD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,EACnC,WAAW,EACX,SAAS,EACT,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,mBAAmB,EACnB,mBAAmB,GACnB,EAAE,6BAA6B,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAmNpE"}
+{"version":3,"file":"createMessagesQuery.d.ts","sourceRoot":"","sources":["../src/createMessagesQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAyC,MAAM,UAAU,CAAA;AAEpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AAEzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAInD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAwB/D,KAAK,6BAA6B,GAAG;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,QAAQ,EAAE,MAAM,eAAe,GAAG,SAAS,CAAA;IAC3C,eAAe,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,GAAG,SAAS,CAAA;IAC7E,0BAA0B,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IAC/C,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IACxC,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;CACxC,CAAA;AACD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,EACnC,WAAW,EACX,SAAS,EACT,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,mBAAmB,EACnB,mBAAmB,GACnB,EAAE,6BAA6B,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAmNpE"}

package/dist/createMessagesQuery.js

@@ -1,5 +1,5 @@
 import { ReactiveMap } from "./reactivity/map.js";
-import { createEffect, onCleanup } from "./reactivity/solid.js";
+import { createEffect, onCleanup, batch } from "./reactivity/solid.js";
 import { createSubscribable } from "./loadProject.js";
 import { createNodeishFsWithWatcher } from "./createNodeishFsWithWatcher.js";
 import { stringifyMessage } from "./storage/helper.js";
@@ -9,9 +9,6 @@ import { releaseLock } from "./persistence/filelock/releaseLock.js";
 import { PluginLoadMessagesError, PluginSaveMessagesError } from "./errors.js";
 import { humanIdHash } from "./storage/human-id/human-readable-id.js";
 const debug = _debug("sdk:messages");
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
 /**
  * Creates a reactive query API for messages.
  */
@@ -194,7 +191,6 @@ export function createMessagesQuery({ projectPath, nodeishFs, settings, resolved
 // - json plugin exports into separate file per language.
 // - saving a message in two different languages would lead to a write in de.json first
 // - This will leads to a load of the messages and since en.json has not been saved yet the english variant in the message would get overritten with the old state again
-const maxMessagesPerTick = 500;
 /**
  * Messsage that loads messages from a plugin - this method synchronizes with the saveMessage funciton.
  * If a save is in progress loading will wait until saving is done. If another load kicks in during this load it will queue the
@@ -227,89 +223,79 @@ async function loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, de
             settings: settingsValue,
             nodeishFs: fs,
         }));
-        let loadedMessageCount = 0;
         const deletedMessages = new Set(messages.keys());
-        for (const loadedMessage of loadedMessages) {
-            const loadedMessageClone = structuredClone(loadedMessage);
-            const currentMessages = [...messages.values()]
-                // TODO #1585 here we match using the id to support legacy load message plugins - after we introduced import / export methods we will use importedMessage.alias
-                .filter((message) => (experimentalAliases ? message.alias["default"] : message.id) === loadedMessage.id);
-            if (currentMessages.length > 1) {
-                // NOTE: if we happen to find two messages witht the sam alias we throw for now
-                // - this could be the case if one edits the aliase manualy
-                throw new Error("more than one message with the same id or alias found ");
-            }
-            else if (currentMessages.length === 1) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- length has checked beforhand
-                deletedMessages.delete(currentMessages[0].id);
-                // update message in place - leave message id and alias untouched
-                loadedMessageClone.alias = {};
-                // TODO #1585 we have to map the id of the importedMessage to the alias and fill the id property with the id of the existing message - change when import mesage provides importedMessage.alias
-                if (experimentalAliases) {
-                    loadedMessageClone.alias["default"] = loadedMessageClone.id;
+        batch(() => {
+            for (const loadedMessage of loadedMessages) {
+                const loadedMessageClone = structuredClone(loadedMessage);
+                const currentMessages = [...messages.values()]
+                    // TODO #1585 here we match using the id to support legacy load message plugins - after we introduced import / export methods we will use importedMessage.alias
+                    .filter((message) => (experimentalAliases ? message.alias["default"] : message.id) === loadedMessage.id);
+                if (currentMessages.length > 1) {
+                    // NOTE: if we happen to find two messages witht the sam alias we throw for now
+                    // - this could be the case if one edits the aliase manualy
+                    throw new Error("more than one message with the same id or alias found ");
+                }
+                else if (currentMessages.length === 1) {
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- length has checked beforhand
-                    loadedMessageClone.id = currentMessages[0].id;
+                    deletedMessages.delete(currentMessages[0].id);
+                    // update message in place - leave message id and alias untouched
+                    loadedMessageClone.alias = {};
+                    // TODO #1585 we have to map the id of the importedMessage to the alias and fill the id property with the id of the existing message - change when import mesage provides importedMessage.alias
+                    if (experimentalAliases) {
+                        loadedMessageClone.alias["default"] = loadedMessageClone.id;
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- length has checked beforhand
+                        loadedMessageClone.id = currentMessages[0].id;
+                    }
+                    // NOTE stringifyMessage encodes messages independent from key order!
+                    const importedEnecoded = stringifyMessage(loadedMessageClone);
+                    // NOTE could use hash instead of the whole object JSON to save memory...
+                    if (messageState.messageLoadHash[loadedMessageClone.id] === importedEnecoded) {
+                        // debug("skipping upsert!")
+                        continue;
+                    }
+                    // This logic is preventing cycles - could also be handled if update api had a parameter for who triggered update
+                    // e.g. when FS was updated, we don't need to write back to FS
+                    // update is synchronous, so update effect will be triggered immediately
+                    // NOTE: this might trigger a save before we have the chance to delete - but since save is async and waits for the lock acquired by this method - its save to set the flags afterwards
+                    messages.set(loadedMessageClone.id, loadedMessageClone);
+                    // NOTE could use hash instead of the whole object JSON to save memory...
+                    messageState.messageLoadHash[loadedMessageClone.id] = importedEnecoded;
+                    delegate?.onMessageUpdate(loadedMessageClone.id, loadedMessageClone, [
+                        ...messages.values(),
+                    ]);
                 }
-                // NOTE stringifyMessage encodes messages independent from key order!
-                const importedEnecoded = stringifyMessage(loadedMessageClone);
-                // NOTE could use hash instead of the whole object JSON to save memory...
-                if (messageState.messageLoadHash[loadedMessageClone.id] === importedEnecoded) {
-                    // debug("skipping upsert!")
-                    continue;
+                else {
+                    // message with the given alias does not exist so far
+                    loadedMessageClone.alias = {};
+                    // TODO #1585 we have to map the id of the importedMessage to the alias - change when import mesage provides importedMessage.alias
+                    if (experimentalAliases) {
+                        loadedMessageClone.alias["default"] = loadedMessageClone.id;
+                        let currentOffset = 0;
+                        let messsageId;
+                        do {
+                            messsageId = humanIdHash(loadedMessageClone.id, currentOffset);
+                            if (messages.get(messsageId)) {
+                                currentOffset += 1;
+                                messsageId = undefined;
+                            }
+                        } while (messsageId === undefined);
+                        // create a humanId based on a hash of the alias
+                        loadedMessageClone.id = messsageId;
+                    }
+                    const importedEnecoded = stringifyMessage(loadedMessageClone);
+                    // we don't have to check - done before hand if (messages.has(loadedMessageClone.id)) return false
+                    messages.set(loadedMessageClone.id, loadedMessageClone);
+                    messageState.messageLoadHash[loadedMessageClone.id] = importedEnecoded;
+                    delegate?.onMessageUpdate(loadedMessageClone.id, loadedMessageClone, [
+                        ...messages.values(),
+                    ]);
                 }
-                // This logic is preventing cycles - could also be handled if update api had a parameter for who triggered update
-                // e.g. when FS was updated, we don't need to write back to FS
-                // update is synchronous, so update effect will be triggered immediately
-                // NOTE: this might trigger a save before we have the chance to delete - but since save is async and waits for the lock acquired by this method - its save to set the flags afterwards
-                messages.set(loadedMessageClone.id, loadedMessageClone);
-                // NOTE could use hash instead of the whole object JSON to save memory...
-                messageState.messageLoadHash[loadedMessageClone.id] = importedEnecoded;
-                delegate?.onMessageUpdate(loadedMessageClone.id, loadedMessageClone, [...messages.values()]);
-                loadedMessageCount++;
             }
-            else {
-                // message with the given alias does not exist so far
-                loadedMessageClone.alias = {};
-                // TODO #1585 we have to map the id of the importedMessage to the alias - change when import mesage provides importedMessage.alias
-                if (experimentalAliases) {
-                    loadedMessageClone.alias["default"] = loadedMessageClone.id;
-                    let currentOffset = 0;
-                    let messsageId;
-                    do {
-                        messsageId = humanIdHash(loadedMessageClone.id, currentOffset);
-                        if (messages.get(messsageId)) {
-                            currentOffset += 1;
-                            messsageId = undefined;
-                        }
-                    } while (messsageId === undefined);
-                    // create a humanId based on a hash of the alias
-                    loadedMessageClone.id = messsageId;
-                }
-                const importedEnecoded = stringifyMessage(loadedMessageClone);
-                // we don't have to check - done before hand if (messages.has(loadedMessageClone.id)) return false
-                messages.set(loadedMessageClone.id, loadedMessageClone);
-                messageState.messageLoadHash[loadedMessageClone.id] = importedEnecoded;
-                delegate?.onMessageUpdate(loadedMessageClone.id, loadedMessageClone, [...messages.values()]);
-                loadedMessageCount++;
+            for (const deletedMessageId of deletedMessages) {
+                messages.delete(deletedMessageId);
+                delegate?.onMessageDelete(deletedMessageId, [...messages.values()]);
             }
-            if (loadedMessageCount > maxMessagesPerTick) {
-                // move loading of the next messages to the next ticks to allow solid to cleanup resources
-                // solid needs some time to settle and clean up
-                // https://github.com/solidjs-community/solid-primitives/blob/9ca76a47ffa2172770e075a90695cf933da0ff48/packages/trigger/src/index.ts#L64
-                await sleep(0);
-                loadedMessageCount = 0;
-            }
-        }
-        loadedMessageCount = 0;
-        for (const deletedMessageId of deletedMessages) {
-            messages.delete(deletedMessageId);
-            delegate?.onMessageDelete(deletedMessageId, [...messages.values()]);
-            loadedMessageCount++;
-            if (loadedMessageCount > maxMessagesPerTick) {
-                await sleep(0);
-                loadedMessageCount = 0;
-            }
-        }
+        });
         await releaseLock(fs, lockDirPath, "loadMessage", lockTime);
         lockTime = undefined;
         debug("loadMessagesViaPlugin: " + loadedMessages.length + " Messages processed ");

package/dist/createNewProject.test.js

@@ -4,9 +4,7 @@ import { mockRepo } from "@lix-js/client";
 import { defaultProjectSettings } from "./defaultProjectSettings.js";
 import { loadProject } from "./loadProject.js";
 import { createMessage } from "./test-utilities/createMessage.js";
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
+import { sleep } from "./test-utilities/sleep.js";
 describe("createNewProject", () => {
     it("should throw if a path does not end with .inlang", async () => {
         const repo = await mockRepo();

package/dist/loadProject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadProject.d.ts","sourceRoot":"","sources":["../src/loadProject.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,aAAa,EAGb,YAAY,EACZ,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,KAAK,cAAc,EAAkB,MAAM,4BAA4B,CAAA;AAkBhF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAYhD;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACvC,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,cAAc,CAAA;CACxB,GAAG,OAAO,CAAC,aAAa,CAAC,CAsOzB;AA+GD,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAQtE"}
+{"version":3,"file":"loadProject.d.ts","sourceRoot":"","sources":["../src/loadProject.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,aAAa,EAGb,YAAY,EAGZ,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,KAAK,cAAc,EAAkB,MAAM,4BAA4B,CAAA;AAkBhF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAgBhD;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACvC,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,cAAc,CAAA;CACxB,GAAG,OAAO,CAAC,aAAa,CAAC,CAyQzB;AA+GD,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAQtE"}

package/dist/loadProject.js

@@ -14,6 +14,8 @@ import { maybeMigrateToDirectory } from "./migrations/migrateToDirectory.js";
 import { maybeCreateFirstProjectId } from "./migrations/maybeCreateFirstProjectId.js";
 import { capture } from "./telemetry/capture.js";
 import { identifyProject } from "./telemetry/groupIdentify.js";
+import { stubMessagesQuery, stubMessageLintReportsQuery } from "./v2/stubQueryApi.js";
+import { openStore } from "./persistence/store.js";
 import _debug from "debug";
 const debug = _debug("sdk:loadProject");
 const settingsCompiler = TypeCompiler.Compile(ProjectSettings);
@@ -47,8 +49,14 @@ export async function loadProject(args) {
         // - if a repo is present, the project id will always be present
         const { data: projectId } = await tryCatch(() => nodeishFs.readFile(args.projectPath + "/project_id", { encoding: "utf-8" }));
         const [initialized, markInitAsComplete, markInitAsFailed] = createAwaitable();
+        const [loadedSettings, markSettingsAsLoaded, markSettingsAsFailed] = createAwaitable();
         // -- settings ------------------------------------------------------------
         const [settings, _setSettings] = createSignal();
+        let v2Persistence = false;
+        let locales = [];
+        // This effect currently has no signals
+        // TODO: replace createEffect with await loadSettings
+        // https://github.com/opral/inlang-message-sdk/issues/77
         createEffect(() => {
             // TODO:
             // if (projectId) {
@@ -57,21 +65,23 @@ export async function loadProject(args) {
             // 	})
             // }
             loadSettings({ settingsFilePath: projectPath + "/settings.json", nodeishFs })
-                .then((settings) => setSettings(settings))
+                .then((settings) => {
+                setSettings(settings);
+                markSettingsAsLoaded();
+            })
                 .catch((err) => {
                 markInitAsFailed(err);
+                markSettingsAsFailed(err);
             });
         });
         // TODO: create FS watcher and update settings on change
+        // https://github.com/opral/inlang-message-sdk/issues/35
         const writeSettingsToDisk = skipFirst((settings) => _writeSettingsToDisk({ nodeishFs, settings, projectPath }));
         const setSettings = (settings) => {
             try {
                 const validatedSettings = parseSettings(settings);
-                if (validatedSettings.experimental?.persistence) {
-                    settings["plugin.sdk.persistence"] = {
-                        pathPattern: projectPath + "/messages.json",
-                    };
-                }
+                v2Persistence = !!validatedSettings.experimental?.persistence;
+                locales = validatedSettings.languageTags;
                 batch(() => {
                     // reset the resolved modules first - since they are no longer valid at that point
                     setResolvedModules(undefined);
@@ -99,32 +109,10 @@ export async function loadProject(args) {
             })
                 .catch((err) => markInitAsFailed(err));
         });
-        // -- messages ----------------------------------------------------------
-        let settingsValue;
-        createEffect(() => (settingsValue = settings())); // workaround to not run effects twice (e.g. settings change + modules change) (I'm sure there exists a solid way of doing this, but I haven't found it yet)
-        const [loadMessagesViaPluginError, setLoadMessagesViaPluginError] = createSignal();
-        const [saveMessagesViaPluginError, setSaveMessagesViaPluginError] = createSignal();
-        const messagesQuery = createMessagesQuery({
-            projectPath,
-            nodeishFs,
-            settings,
-            resolvedModules,
-            onInitialMessageLoadResult: (e) => {
-                if (e) {
-                    markInitAsFailed(e);
-                }
-                else {
-                    markInitAsComplete();
-                }
-            },
-            onLoadMessageResult: (e) => {
-                setLoadMessagesViaPluginError(e);
-            },
-            onSaveMessageResult: (e) => {
-                setSaveMessagesViaPluginError(e);
-            },
-        });
         // -- installed items ----------------------------------------------------
+        let settingsValue;
+        // workaround to not run effects twice (e.g. settings change + modules change) (I'm sure there exists a solid way of doing this, but I haven't found it yet)
+        createEffect(() => (settingsValue = settings()));
         const installedMessageLintRules = () => {
             if (!resolvedModules())
                 return [];
@@ -151,9 +139,53 @@ export async function loadProject(args) {
                 settingsSchema: plugin.settingsSchema,
             }));
         };
+        // -- messages ----------------------------------------------------------
+        const [loadMessagesViaPluginError, setLoadMessagesViaPluginError] = createSignal();
+        const [saveMessagesViaPluginError, setSaveMessagesViaPluginError] = createSignal();
+        let messagesQuery;
+        let lintReportsQuery;
+        let store;
+        // wait for seetings to load v2Persistence flag
+        // .catch avoids throwing here if the awaitable is rejected
+        // error is recorded via markInitAsFailed so no need to capture it again
+        await loadedSettings.catch(() => { });
+        if (v2Persistence) {
+            messagesQuery = stubMessagesQuery;
+            lintReportsQuery = stubMessageLintReportsQuery;
+            try {
+                store = await openStore({ projectPath, nodeishFs, locales });
+                markInitAsComplete();
+            }
+            catch (e) {
+                markInitAsFailed(e);
+            }
+        }
+        else {
+            messagesQuery = createMessagesQuery({
+                projectPath,
+                nodeishFs,
+                settings,
+                resolvedModules,
+                onInitialMessageLoadResult: (e) => {
+                    if (e) {
+                        markInitAsFailed(e);
+                    }
+                    else {
+                        markInitAsComplete();
+                    }
+                },
+                onLoadMessageResult: (e) => {
+                    setLoadMessagesViaPluginError(e);
+                },
+                onSaveMessageResult: (e) => {
+                    setSaveMessagesViaPluginError(e);
+                },
+            });
+            lintReportsQuery = createMessageLintReportsQuery(messagesQuery, settings, installedMessageLintRules, resolvedModules);
+            store = undefined;
+        }
         // -- app ---------------------------------------------------------------
         const initializeError = await initialized.catch((error) => error);
-        const lintReportsQuery = createMessageLintReportsQuery(messagesQuery, settings, installedMessageLintRules, resolvedModules);
         /**
          * Utility to escape reactive tracking and avoid multiple calls to
          * the capture event.
@@ -179,6 +211,8 @@ export async function loadProject(args) {
                     settings: settings(),
                     installedPluginIds: installedPlugins().map((p) => p.id),
                     installedMessageLintRuleIds: installedMessageLintRules().map((r) => r.id),
+                    // TODO: fix for v2Persistence
+                    // https://github.com/opral/inlang-message-sdk/issues/78
                     numberOfMessages: messagesQuery.includedMessageIds().length,
                 },
             });
@@ -204,6 +238,7 @@ export async function loadProject(args) {
                 messages: messagesQuery,
                 messageLintReports: lintReportsQuery,
             },
+            store,
         };
     });
 }

package/dist/loadProject.test.js

@@ -219,11 +219,15 @@ describe("initialization", () => {
         expect(result.error).toBeUndefined();
         expect(result.data).toBeDefined();
     });
+    // TODO: fix this test
+    // https://github.com/opral/inlang-message-sdk/issues/76
+    // it doesn't work because failure to open the settings file doesn't throw
+    // errors are returned in project.errors()
     it("should resolve from a windows path", async () => {
         const repo = await mockRepo();
         const fs = repo.nodeishFs;
-        fs.mkdir("C:\\Users\\user\\project.inlang", { recursive: true });
-        fs.writeFile("C:\\Users\\user\\project.inlang\\settings.json", JSON.stringify(settings));
+        await fs.mkdir("C:\\Users\\user\\project.inlang", { recursive: true });
+        await fs.writeFile("C:\\Users\\user\\project.inlang\\settings.json", JSON.stringify(settings));
         const result = await tryCatch(() => loadProject({
             projectPath: "C:\\Users\\user\\project.inlang",
             repo,

package/dist/persistence/batchedIO.d.ts

@@ -0,0 +1,11 @@
+/**
+ * State machine to convert async save() into batched async save()
+ * states = idle -> acquiring -> saving -> idle
+ * idle = nothing queued, ready to acquire lock.
+ * aquiring = waiting to acquire a lock: requests go into the queue.
+ * saving = lock is acquired, save has begun: new requests go into the next batch.
+ * The next batch should not acquire the lock while current save is in progress.
+ * Queued requests are only resolved when the save completes.
+ */
+export declare function batchedIO(acquireLock: () => Promise<number>, releaseLock: (lock: number) => Promise<void>, save: () => Promise<void>): (id: string) => Promise<string>;
+//# sourceMappingURL=batchedIO.d.ts.map

package/dist/persistence/batchedIO.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"batchedIO.d.ts","sourceRoot":"","sources":["../../src/persistence/batchedIO.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CACxB,WAAW,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAClC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAC5C,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACvB,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CA+CjC"}

package/dist/persistence/batchedIO.js

@@ -0,0 +1,49 @@
+import _debug from "debug";
+const debug = _debug("sdk:batchedIO");
+/**
+ * State machine to convert async save() into batched async save()
+ * states = idle -> acquiring -> saving -> idle
+ * idle = nothing queued, ready to acquire lock.
+ * aquiring = waiting to acquire a lock: requests go into the queue.
+ * saving = lock is acquired, save has begun: new requests go into the next batch.
+ * The next batch should not acquire the lock while current save is in progress.
+ * Queued requests are only resolved when the save completes.
+ */
+export function batchedIO(acquireLock, releaseLock, save) {
+    // 3-state machine
+    let state = "idle";
+    const queue = [];
+    // initialize nextBatch lazily, reset after saving
+    let nextBatch = undefined;
+    // batched save function
+    return async (id) => {
+        if (state === "idle") {
+            state = "acquiring";
+            const lock = await acquireLock();
+            state = "saving";
+            await save();
+            await releaseLock(lock);
+            resolveQueued();
+            nextBatch = undefined;
+            state = "idle";
+            return id;
+        }
+        else if (state === "acquiring") {
+            return new Promise((resolve, reject) => {
+                queue.push({ id, resolve, reject });
+            });
+        }
+        else {
+            // state === "saving"
+            nextBatch = nextBatch ?? batchedIO(acquireLock, releaseLock, save);
+            return await nextBatch(id);
+        }
+    };
+    function resolveQueued() {
+        debug("batched", queue.length + 1);
+        for (const { id, resolve } of queue) {
+            resolve(id);
+        }
+        queue.length = 0;
+    }
+}

package/dist/persistence/batchedIO.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=batchedIO.test.d.ts.map

package/dist/persistence/batchedIO.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"batchedIO.test.d.ts","sourceRoot":"","sources":["../../src/persistence/batchedIO.test.ts"],"names":[],"mappings":""}

package/dist/persistence/batchedIO.test.js

@@ -0,0 +1,56 @@
+import { describe, it, expect, vi } from "vitest";
+import { sleep } from "../test-utilities/sleep.js";
+import { batchedIO } from "./batchedIO.js";
+let locked = false;
+const instrumentAquireLockStart = vi.fn();
+async function mockAquireLock() {
+    instrumentAquireLockStart();
+    let pollCount = 0;
+    while (locked && pollCount++ < 100) {
+        await sleep(10);
+    }
+    if (locked) {
+        throw new Error("Timeout acquiring lock");
+    }
+    await sleep(10);
+    locked = true;
+    return 69;
+}
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+async function mockReleaseLock(_) {
+    sleep(10);
+    locked = false;
+}
+const instrumentSaveStart = vi.fn();
+const instrumentSaveEnd = vi.fn();
+async function mockSave() {
+    instrumentSaveStart();
+    await sleep(50);
+    instrumentSaveEnd();
+}
+describe("batchedIO", () => {
+    it("queues 2 requests while waiting for lock and pushes 2 more to the next batch", async () => {
+        const save = batchedIO(mockAquireLock, mockReleaseLock, mockSave);
+        const p1 = save("1");
+        const p2 = save("2");
+        await sleep(5);
+        expect(instrumentAquireLockStart).toHaveBeenCalledTimes(1);
+        expect(instrumentSaveStart).not.toHaveBeenCalled();
+        await sleep(10);
+        expect(instrumentSaveStart).toHaveBeenCalled();
+        expect(instrumentSaveEnd).not.toHaveBeenCalled();
+        const p3 = save("3");
+        const p4 = save("4");
+        expect(instrumentAquireLockStart).toHaveBeenCalledTimes(2);
+        expect(locked).toBe(true);
+        await sleep(50);
+        expect(instrumentSaveEnd).toHaveBeenCalled();
+        expect(await p1).toBe("1");
+        expect(await p2).toBe("2");
+        expect(instrumentSaveStart).toHaveBeenCalledTimes(1);
+        expect(await p3).toBe("3");
+        expect(await p4).toBe("4");
+        expect(instrumentAquireLockStart).toHaveBeenCalledTimes(2);
+        expect(instrumentSaveStart).toHaveBeenCalledTimes(2);
+    });
+});

package/dist/persistence/filelock/acquireFileLock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acquireFileLock.d.ts","sourceRoot":"","sources":["../../../src/persistence/filelock/acquireFileLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAQnD,wBAAsB,eAAe,CACpC,EAAE,EAAE,iBAAiB,EACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,GAAE,MAAU,GAClB,OAAO,CAAC,MAAM,CAAC,CAgHjB"}
+{"version":3,"file":"acquireFileLock.d.ts","sourceRoot":"","sources":["../../../src/persistence/filelock/acquireFileLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAQnD,wBAAsB,eAAe,CACpC,EAAE,EAAE,iBAAiB,EACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,GAAE,MAAU,GAClB,OAAO,CAAC,MAAM,CAAC,CAmHjB"}

package/dist/persistence/filelock/acquireFileLock.js

@@ -11,16 +11,18 @@ export async function acquireFileLock(fs, lockDirPath, lockOrigin, tryCount = 0)
     try {
         debug(lockOrigin + " tries to acquire a lockfile Retry Nr.: " + tryCount);
         await fs.mkdir(lockDirPath);
+        // NOTE: fs.stat does not need to be atomic since mkdir would crash atomically - if we are here its save to consider the lock held by this process
         const stats = await fs.stat(lockDirPath);
         debug(lockOrigin + " acquired a lockfile Retry Nr.: " + tryCount);
         return stats.mtimeMs;
     }
     catch (error) {
         if (error.code !== "EEXIST") {
-            // we only expect the error that the file exists already (locked by other process)
+            // NOTE in case we have an EEXIST - this is an expected error: the folder existed - another process already acquired the lock. Rethrow all other errors
             throw error;
         }
     }
+    // land here if the lockDirPath already exists => lock is held by other process
     let currentLockTime;
     try {
         const stats = await fs.stat(lockDirPath);

package/dist/persistence/filelock/releaseLock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"releaseLock.d.ts","sourceRoot":"","sources":["../../../src/persistence/filelock/releaseLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAInD,wBAAsB,WAAW,CAChC,EAAE,EAAE,iBAAiB,EACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,iBAmBhB"}
+{"version":3,"file":"releaseLock.d.ts","sourceRoot":"","sources":["../../../src/persistence/filelock/releaseLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAInD,wBAAsB,WAAW,CAChC,EAAE,EAAE,iBAAiB,EACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,iBAoBhB"}

package/dist/persistence/filelock/releaseLock.js

@@ -5,8 +5,9 @@ export async function releaseLock(fs, lockDirPath, lockOrigin, lockTime) {
     debug(lockOrigin + " releasing the lock ");
     try {
         const stats = await fs.stat(lockDirPath);
+        // I believe this check associates the lock with the aquirer
         if (stats.mtimeMs === lockTime) {
-            // this can be corrupt as welll since the last getStat and the current a modification could have occured :-/
+            // NOTE: since we have to use a timeout for stale detection (uTimes is not exposed via mermoryfs) the check for the locktime is not sufficient and can fail in rare cases when another process accuires a lock that was identifiert as tale between call to fs.state and rmDir
             await fs.rmdir(lockDirPath);
         }
     }