@inlang/sdk 0.35.6 → 0.35.8

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;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"}
+{"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,CA0NpE"}

package/dist/createMessagesQuery.js

@@ -60,7 +60,7 @@ export function createMessagesQuery({ projectPath, nodeishFs, settings, resolved
             // - the plugin loads messages -> reads the file messages.json -> start watching on messages.json -> updateMessages
             updateMessages: () => {
                 // reload
-                loadMessagesViaPlugin(fsWithWatcher, messageLockDirPath, messageStates, index, delegate, _settings, // NOTE we bang here - we don't expect the settings to become null during the livetime of a project
+                loadMessagesViaPlugin(fsWithWatcher, messageLockDirPath, messageStates, index, defaultAliasIndex, delegate, _settings, // NOTE we bang here - we don't expect the settings to become null during the livetime of a project
                 resolvedPluginApi)
                     .catch((e) => {
                     onLoadMessageResult(e);
@@ -80,7 +80,7 @@ export function createMessagesQuery({ projectPath, nodeishFs, settings, resolved
             onInitialMessageLoadResult(new Error("no loadMessages in resolved Modules found"));
             return;
         }
-        loadMessagesViaPlugin(fsWithWatcher, messageLockDirPath, messageStates, index, undefined /* delegate - we don't pass it here since we will call onLoaded instead */, _settings, // NOTE we bang here - we don't expect the settings to become null during the livetime of a project
+        loadMessagesViaPlugin(fsWithWatcher, messageLockDirPath, messageStates, index, defaultAliasIndex, undefined /* delegate - we don't pass it here since we will call onLoaded instead */, _settings, // NOTE we bang here - we don't expect the settings to become null during the livetime of a project
         resolvedPluginApi)
             .catch((e) => {
             // propagate initial load error to calling laodProject function
@@ -103,7 +103,7 @@ export function createMessagesQuery({ projectPath, nodeishFs, settings, resolved
         const resolvedPluginApi = resolvedModules()?.resolvedPluginApi;
         if (!resolvedPluginApi)
             return;
-        saveMessagesViaPlugin(nodeishFs, messageLockDirPath, messageStates, index, delegate, _settings, // NOTE we bang here - we don't expect the settings to become null during the livetime of a project
+        saveMessagesViaPlugin(nodeishFs, messageLockDirPath, messageStates, index, defaultAliasIndex, delegate, _settings, // NOTE we bang here - we don't expect the settings to become null during the livetime of a project
         resolvedPluginApi)
             .catch((e) => {
             debug.log("error during saveMessagesViaPlugin");
@@ -147,6 +147,9 @@ export function createMessagesQuery({ projectPath, nodeishFs, settings, resolved
             if (message === undefined)
                 return false;
             index.set(where.id, { ...message, ...data });
+            if (data.alias && "default" in data.alias) {
+                defaultAliasIndex.set(data.alias.default, data);
+            }
             messageStates.messageDirtyFlags[where.id] = true;
             delegate?.onMessageUpdate(where.id, index.get(data.id), [...index.values()]);
             scheduleSave();
@@ -164,6 +167,7 @@ export function createMessagesQuery({ projectPath, nodeishFs, settings, resolved
             }
             else {
                 index.set(where.id, { ...message, ...data });
+                defaultAliasIndex.set(data.alias.default, { ...message, ...data });
                 messageStates.messageDirtyFlags[where.id] = true;
                 delegate?.onMessageUpdate(data.id, index.get(data.id), [...index.values()]);
             }
@@ -204,7 +208,7 @@ export function createMessagesQuery({ projectPath, nodeishFs, settings, resolved
  * @param loadPlugin
  * @returns void - updates the files and messages in of the project in place
  */
-async function loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, delegate, settingsValue, resolvedPluginApi) {
+async function loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, aliaseToMessageMap, delegate, settingsValue, resolvedPluginApi) {
     const experimentalAliases = !!settingsValue.experimental?.aliases;
     // loading is an asynchronous process - check if another load is in progress - queue this call if so
     if (messageState.isLoading) {
@@ -258,6 +262,9 @@ async function loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, de
                     // 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);
+                    if (loadedMessageClone.alias["default"]) {
+                        aliaseToMessageMap.set(loadedMessageClone.alias["default"], loadedMessageClone);
+                    }
                     // NOTE could use hash instead of the whole object JSON to save memory...
                     messageState.messageLoadHash[loadedMessageClone.id] = importedEnecoded;
                     delegate?.onMessageUpdate(loadedMessageClone.id, loadedMessageClone, [
@@ -281,6 +288,7 @@ async function loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, de
                         } while (messsageId === undefined);
                         // create a humanId based on a hash of the alias
                         loadedMessageClone.id = messsageId;
+                        aliaseToMessageMap.set(loadedMessageClone.alias["default"], loadedMessageClone);
                     }
                     const importedEnecoded = stringifyMessage(loadedMessageClone);
                     // we don't have to check - done before hand if (messages.has(loadedMessageClone.id)) return false
@@ -313,7 +321,7 @@ async function loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, de
         // reset sheduling to except scheduling again
         messageState.sheduledLoadMessagesViaPlugin = undefined;
         // recall load unawaited to allow stack to pop
-        loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, delegate, settingsValue, resolvedPluginApi)
+        loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, aliaseToMessageMap, delegate, settingsValue, resolvedPluginApi)
             .then(() => {
             // resolve the scheduled load message promise
             executingScheduledMessages.resolve();
@@ -324,7 +332,7 @@ async function loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, de
         });
     }
 }
-async function saveMessagesViaPlugin(fs, lockDirPath, messageState, messages, delegate, settingsValue, resolvedPluginApi) {
+async function saveMessagesViaPlugin(fs, lockDirPath, messageState, messages, aliaseToMessageMap, delegate, settingsValue, resolvedPluginApi) {
     // queue next save if we have a save ongoing
     if (messageState.isSaving) {
         if (!messageState.sheduledSaveMessages) {
@@ -388,7 +396,7 @@ async function saveMessagesViaPlugin(fs, lockDirPath, messageState, messages, de
             // if there is a queued load, allow it to take the lock before we run additional saves.
             if (messageState.sheduledLoadMessagesViaPlugin) {
                 debug("saveMessagesViaPlugin calling queued loadMessagesViaPlugin to share lock");
-                await loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, delegate, settingsValue, resolvedPluginApi);
+                await loadMessagesViaPlugin(fs, lockDirPath, messageState, messages, aliaseToMessageMap, delegate, settingsValue, resolvedPluginApi);
             }
             messageState.isSaving = false;
         }
@@ -421,7 +429,7 @@ async function saveMessagesViaPlugin(fs, lockDirPath, messageState, messages, de
     if (messageState.sheduledSaveMessages) {
         const executingSheduledSaveMessages = messageState.sheduledSaveMessages;
         messageState.sheduledSaveMessages = undefined;
-        saveMessagesViaPlugin(fs, lockDirPath, messageState, messages, delegate, settingsValue, resolvedPluginApi)
+        saveMessagesViaPlugin(fs, lockDirPath, messageState, messages, aliaseToMessageMap, delegate, settingsValue, resolvedPluginApi)
             .then(() => {
             executingSheduledSaveMessages.resolve();
         })

package/dist/v2/stubQueryApi.js

@@ -33,6 +33,6 @@ function subscribable(fn) {
 // eslint-disable-next-line @typescript-eslint/ban-types
 function settleable(fn) {
     return Object.assign(fn, {
-        settled: async () => { },
+        settled: async () => [],
     });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@inlang/sdk",
   "type": "module",
-  "version": "0.35.6",
+  "version": "0.35.8",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -34,17 +34,17 @@
     "murmurhash3js": "^3.0.1",
     "solid-js": "1.6.12",
     "throttle-debounce": "^5.0.0",
-    "@inlang/json-types": "1.1.0",
     "@inlang/language-tag": "1.5.1",
-    "@inlang/module": "1.2.13",
     "@inlang/message": "2.1.0",
+    "@inlang/module": "1.2.13",
+    "@inlang/message-lint-rule": "1.4.7",
+    "@inlang/json-types": "1.1.0",
     "@inlang/plugin": "2.4.13",
     "@inlang/project-settings": "2.4.2",
-    "@inlang/message-lint-rule": "1.4.7",
     "@inlang/result": "1.1.0",
+    "@lix-js/client": "2.2.0",
     "@lix-js/fs": "2.1.0",
-    "@inlang/translatable": "1.3.1",
-    "@lix-js/client": "2.2.0"
+    "@inlang/translatable": "1.3.1"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",

package/src/createMessagesQuery.ts

@@ -114,6 +114,7 @@ export function createMessagesQuery({
 					messageLockDirPath,
 					messageStates,
 					index,
+					defaultAliasIndex,
 					delegate,
 					_settings, // NOTE we bang here - we don't expect the settings to become null during the livetime of a project
 					resolvedPluginApi
@@ -143,6 +144,7 @@ export function createMessagesQuery({
 			messageLockDirPath,
 			messageStates,
 			index,
+			defaultAliasIndex,
 			undefined /* delegate - we don't pass it here since we will call onLoaded instead */,
 			_settings, // NOTE we bang here - we don't expect the settings to become null during the livetime of a project
 			resolvedPluginApi
@@ -178,6 +180,7 @@ export function createMessagesQuery({
 			messageLockDirPath,
 			messageStates,
 			index,
+			defaultAliasIndex,
 			delegate,
 			_settings, // NOTE we bang here - we don't expect the settings to become null during the livetime of a project
 			resolvedPluginApi
@@ -230,6 +233,9 @@ export function createMessagesQuery({
 			const message = index.get(where.id)
 			if (message === undefined) return false
 			index.set(where.id, { ...message, ...data })
+			if (data.alias && "default" in data.alias) {
+				defaultAliasIndex.set(data.alias.default, data)
+			}
 			messageStates.messageDirtyFlags[where.id] = true
 			delegate?.onMessageUpdate(where.id, index.get(data.id), [...index.values()])
 			scheduleSave()
@@ -246,6 +252,7 @@ export function createMessagesQuery({
 				delegate?.onMessageCreate(data.id, index.get(data.id), [...index.values()])
 			} else {
 				index.set(where.id, { ...message, ...data })
+				defaultAliasIndex.set(data.alias.default, { ...message, ...data })
 				messageStates.messageDirtyFlags[where.id] = true
 				delegate?.onMessageUpdate(data.id, index.get(data.id), [...index.values()])
 			}
@@ -292,6 +299,7 @@ async function loadMessagesViaPlugin(
 	lockDirPath: string,
 	messageState: MessageState,
 	messages: Map<string, Message>,
+	aliaseToMessageMap: Map<string, Message>,
 	delegate: MessageQueryDelegate | undefined,
 	settingsValue: ProjectSettings,
 	resolvedPluginApi: ResolvedPluginApi
@@ -363,6 +371,9 @@ async function loadMessagesViaPlugin(
 					// 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)
+					if (loadedMessageClone.alias["default"]) {
+						aliaseToMessageMap.set(loadedMessageClone.alias["default"], loadedMessageClone)
+					}
 					// NOTE could use hash instead of the whole object JSON to save memory...
 					messageState.messageLoadHash[loadedMessageClone.id] = importedEnecoded
 					delegate?.onMessageUpdate(loadedMessageClone.id, loadedMessageClone, [
@@ -387,12 +398,14 @@ async function loadMessagesViaPlugin(
 
 						// create a humanId based on a hash of the alias
 						loadedMessageClone.id = messsageId
+						aliaseToMessageMap.set(loadedMessageClone.alias["default"], loadedMessageClone)
 					}
 
 					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(),
@@ -431,6 +444,7 @@ async function loadMessagesViaPlugin(
 			lockDirPath,
 			messageState,
 			messages,
+			aliaseToMessageMap,
 			delegate,
 			settingsValue,
 			resolvedPluginApi
@@ -451,6 +465,7 @@ async function saveMessagesViaPlugin(
 	lockDirPath: string,
 	messageState: MessageState,
 	messages: Map<string, Message>,
+	aliaseToMessageMap: Map<string, Message>,
 	delegate: MessageQueryDelegate | undefined,
 	settingsValue: ProjectSettings,
 	resolvedPluginApi: ResolvedPluginApi
@@ -538,6 +553,7 @@ async function saveMessagesViaPlugin(
 					lockDirPath,
 					messageState,
 					messages,
+					aliaseToMessageMap,
 					delegate,
 					settingsValue,
 					resolvedPluginApi
@@ -583,6 +599,7 @@ async function saveMessagesViaPlugin(
 			lockDirPath,
 			messageState,
 			messages,
+			aliaseToMessageMap,
 			delegate,
 			settingsValue,
 			resolvedPluginApi

package/src/v2/stubQueryApi.ts

@@ -38,6 +38,6 @@ function subscribable(fn: Function) {
 // eslint-disable-next-line @typescript-eslint/ban-types
 function settleable(fn: Function) {
 	return Object.assign(fn, {
-		settled: async () => {},
+		settled: async () => [],
 	})
 }