@inlang/sdk 0.18.0 → 0.19.0

package/dist/adapter/solidAdapter.test.js

@@ -72,10 +72,10 @@ const $import = async (name) => ({
 describe("config", () => {
     it("should react to changes in config", async () => {
         const fs = createNodeishMemoryFs();
-        await fs.mkdir("/user/project", { recursive: true });
-        await fs.writeFile("/user/project/project.inlang.json", JSON.stringify(config));
+        await fs.mkdir("/user/project.inlang", { recursive: true });
+        await fs.writeFile("/user/project.inlang/settings.json", JSON.stringify(config));
         const project = solidAdapter(await loadProject({
-            settingsFilePath: "/user/project/project.inlang.json",
+            projectPath: "/user/project.inlang",
             nodeishFs: fs,
             _import: $import,
         }), { from });
@@ -96,10 +96,10 @@ describe("config", () => {
 describe("installed", () => {
     it("react to changes that are unrelated to installed items", async () => {
         const fs = createNodeishMemoryFs();
-        await fs.mkdir("/user/project", { recursive: true });
-        await fs.writeFile("/user/project/project.inlang.json", JSON.stringify(config));
+        await fs.mkdir("/user/project.inlang", { recursive: true });
+        await fs.writeFile("/user/project.inlang/settings.json", JSON.stringify(config));
         const project = solidAdapter(await loadProject({
-            settingsFilePath: "/user/project/project.inlang.json",
+            projectPath: "/user/project.inlang",
             nodeishFs: fs,
             _import: $import,
         }), { from });
@@ -149,10 +149,10 @@ describe("messages", () => {
             saveMessages: () => undefined,
         };
         const mockImport = async () => ({ default: mockPlugin });
-        await fs.mkdir("/user/project", { recursive: true });
-        await fs.writeFile("/user/project/project.inlang.json", JSON.stringify(mockConfig));
+        await fs.mkdir("/user/project.inlang.inlang", { recursive: true });
+        await fs.writeFile("/user/project.inlang.inlang/settings.json", JSON.stringify(mockConfig));
         const project = solidAdapter(await loadProject({
-            settingsFilePath: "/user/project/project.inlang.json",
+            projectPath: "/user/project.inlang.inlang",
             nodeishFs: fs,
             _import: mockImport,
         }), { from });
@@ -170,10 +170,10 @@ describe("messages", () => {
     });
     it("should react to changes in messages", async () => {
         const fs = createNodeishMemoryFs();
-        await fs.mkdir("/user/project", { recursive: true });
-        await fs.writeFile("/user/project/project.inlang.json", JSON.stringify(config));
+        await fs.mkdir("/user/project.inlang.inlang", { recursive: true });
+        await fs.writeFile("/user/project.inlang.inlang/settings.json", JSON.stringify(config));
         const project = solidAdapter(await loadProject({
-            settingsFilePath: "/user/project/project.inlang.json",
+            projectPath: "/user/project.inlang.inlang",
             nodeishFs: fs,
             _import: $import,
         }), { from });
@@ -216,9 +216,10 @@ describe("lint", () => {
     it.todo("should react to changes in config", async () => {
         await createRoot(async () => {
             const fs = createNodeishMemoryFs();
-            await fs.writeFile("./project.config.json", JSON.stringify(config));
+            await fs.mkdir("./project.inlang", { recursive: true });
+            await fs.writeFile("./project.inlang/settings.json", JSON.stringify(config));
             const project = solidAdapter(await loadProject({
-                settingsFilePath: "./project.config.json",
+                projectPath: "./project.inlang",
                 nodeishFs: fs,
                 _import: $import,
             }), { from });
@@ -245,7 +246,7 @@ describe("lint", () => {
             const fs = createNodeishMemoryFs();
             await fs.writeFile("./project.config.json", JSON.stringify(config));
             const project = solidAdapter(await loadProject({
-                settingsFilePath: "./project.config.json",
+                projectPath: "./project.config.json",
                 nodeishFs: fs,
                 _import: $import,
             }), { from });

package/dist/createNodeishFsWithAbsolutePaths.d.ts

@@ -3,10 +3,10 @@ import type { NodeishFilesystemSubset } from "@inlang/plugin";
  * Wraps the nodeish filesystem subset with a function that intercepts paths
  * and prepends the base path.
  *
- * The paths are resolved from the `settingsFilePath` argument.
+ * The paths are resolved from the `projectPath` argument.
  */
 export declare const createNodeishFsWithAbsolutePaths: (args: {
-    settingsFilePath: string;
+    projectPath: string;
     nodeishFs: NodeishFilesystemSubset;
 }) => NodeishFilesystemSubset;
 //# sourceMappingURL=createNodeishFsWithAbsolutePaths.d.ts.map

package/dist/createNodeishFsWithAbsolutePaths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createNodeishFsWithAbsolutePaths.d.ts","sourceRoot":"","sources":["../src/createNodeishFsWithAbsolutePaths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAI7D;;;;;GAKG;AACH,eAAO,MAAM,gCAAgC,SAAU;IACtD,gBAAgB,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE,uBAAuB,CAAA;CAClC,KAAG,uBA6BH,CAAA"}
+{"version":3,"file":"createNodeishFsWithAbsolutePaths.d.ts","sourceRoot":"","sources":["../src/createNodeishFsWithAbsolutePaths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAI7D;;;;;GAKG;AACH,eAAO,MAAM,gCAAgC,SAAU;IACtD,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,uBAAuB,CAAA;CAClC,KAAG,uBA6BH,CAAA"}

package/dist/createNodeishFsWithAbsolutePaths.js

@@ -4,15 +4,15 @@ import { isAbsolutePath } from "./isAbsolutePath.js";
  * Wraps the nodeish filesystem subset with a function that intercepts paths
  * and prepends the base path.
  *
- * The paths are resolved from the `settingsFilePath` argument.
+ * The paths are resolved from the `projectPath` argument.
  */
 export const createNodeishFsWithAbsolutePaths = (args) => {
-    if (!isAbsolutePath(args.settingsFilePath)) {
-        throw new Error(`Expected an absolute path but received "${args.settingsFilePath}".`);
+    if (!isAbsolutePath(args.projectPath)) {
+        throw new Error(`Expected an absolute path but received "${args.projectPath}".`);
     }
     // get the base path of the settings file by
     // removing the file name from the path
-    const basePath = normalizePath(args.settingsFilePath).split("/").slice(0, -1).join("/");
+    const basePath = normalizePath(args.projectPath).split("/").slice(0, -1).join("/");
     const makeAbsolute = (path) => {
         if (isAbsolutePath(path)) {
             return normalizePath(path);

package/dist/createNodeishFsWithAbsolutePaths.test.js

@@ -1,11 +1,11 @@
 import { it, expect, vi } from "vitest";
 import { createNodeishFsWithAbsolutePaths } from "./createNodeishFsWithAbsolutePaths.js";
-it("throws an error if settingsFilePath is not an absolute path", () => {
+it("throws an error if projectPath is not an absolute path", () => {
     const relativePath = "relative/path";
-    expect(() => createNodeishFsWithAbsolutePaths({ settingsFilePath: relativePath, nodeishFs: {} })).toThrow();
+    expect(() => createNodeishFsWithAbsolutePaths({ projectPath: relativePath, nodeishFs: {} })).toThrow();
 });
 it("intercepts paths correctly for readFile", async () => {
-    const settingsFilePath = `/Users/samuel/Documents/paraglide/example/project.inlang.json`;
+    const projectPath = `/Users/samuel/Documents/paraglide/example/project.inlang`;
     const filePaths = [
         ["file.txt", `/Users/samuel/Documents/paraglide/example/file.txt`],
         ["./file.txt", `/Users/samuel/Documents/paraglide/example/file.txt`],
@@ -23,7 +23,7 @@ it("intercepts paths correctly for readFile", async () => {
         watch: vi.fn(),
     };
     const interceptedFs = createNodeishFsWithAbsolutePaths({
-        settingsFilePath,
+        projectPath,
         nodeishFs: mockNodeishFs,
     });
     for (const [path, expectedPath] of filePaths) {

package/dist/createNodeishFsWithWatcher.d.ts

@@ -3,7 +3,7 @@ import type { NodeishFilesystemSubset } from "@inlang/plugin";
  * Wraps the nodeish filesystem subset with a function that intercepts paths
  * and prepends the base path.
  *
- * The paths are resolved from the `settingsFilePath` argument.
+ * The paths are resolved from the `projectPath` argument.
  */
 export declare const createNodeishFsWithWatcher: (args: {
     nodeishFs: NodeishFilesystemSubset;

package/dist/createNodeishFsWithWatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createNodeishFsWithWatcher.d.ts","sourceRoot":"","sources":["../src/createNodeishFsWithWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAE7D;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,SAAU;IAChD,SAAS,EAAE,uBAAuB,CAAA;IAClC,cAAc,EAAE,MAAM,IAAI,CAAA;CAC1B,KAAG,uBA4CH,CAAA"}
+{"version":3,"file":"createNodeishFsWithWatcher.d.ts","sourceRoot":"","sources":["../src/createNodeishFsWithWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAE7D;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,SAAU;IAChD,SAAS,EAAE,uBAAuB,CAAA;IAClC,cAAc,EAAE,MAAM,IAAI,CAAA;CAC1B,KAAG,uBA8CH,CAAA"}

package/dist/createNodeishFsWithWatcher.js

@@ -2,7 +2,7 @@
  * Wraps the nodeish filesystem subset with a function that intercepts paths
  * and prepends the base path.
  *
- * The paths are resolved from the `settingsFilePath` argument.
+ * The paths are resolved from the `projectPath` argument.
  */
 export const createNodeishFsWithWatcher = (args) => {
     const pathList = [];
@@ -14,9 +14,11 @@ export const createNodeishFsWithWatcher = (args) => {
                     signal: abortController.signal,
                     persistent: false,
                 });
-                //eslint-disable-next-line @typescript-eslint/no-unused-vars
-                for await (const event of watcher) {
-                    args.updateMessages();
+                if (watcher) {
+                    //eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    for await (const event of watcher) {
+                        args.updateMessages();
+                    }
                 }
             }
             catch (err) {

package/dist/isAbsolutePath.test.js

@@ -8,7 +8,7 @@ describe("isAbsolutePath", () => {
     });
     it("should correctly identify Windows absolute paths", () => {
         assert.isTrue(isAbsolutePath("C:\\Users\\User\\Documents\\File.txt"));
-        assert.isTrue(isAbsolutePath("C:/Users/user/project/project.inlang.json"));
+        assert.isTrue(isAbsolutePath("C:/Users/user/project.inlang/settings.json"));
         assert.isFalse(isAbsolutePath("Projects\\Project1\\source\\file.txt"));
     });
     it("should handle edge cases", () => {

package/dist/loadProject.d.ts

@@ -1,10 +1,10 @@
 import type { InlangProject, Subscribable } from "./api.js";
 import { type ImportFunction } from "./resolve-modules/index.js";
-import { type NodeishFilesystemSubset } from "./versionedInterfaces.js";
+import { type NodeishFilesystem } from "@lix-js/fs";
 /**
  * Creates an inlang instance.
  *
- * @param settingsFilePath - Absolute path to the inlang settings file.
+ * @param projectPath - Absolute path to the inlang settings file.
  * @param nodeishFs - Filesystem that implements the NodeishFilesystemSubset interface.
  * @param _import - Use `_import` to pass a custom import function for testing,
  *   and supporting legacy resolvedModules such as CJS.
@@ -12,8 +12,8 @@ import { type NodeishFilesystemSubset } from "./versionedInterfaces.js";
  *
  */
 export declare const loadProject: (args: {
-    settingsFilePath: string;
-    nodeishFs: NodeishFilesystemSubset;
+    projectPath: string;
+    nodeishFs: NodeishFilesystem;
     _import?: ImportFunction | undefined;
     _capture?: ((id: string, props: Record<string, unknown>) => void) | undefined;
 }) => Promise<InlangProject>;

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;AAchF,OAAO,EAA4B,KAAK,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAUjG;;;;;;;;;GASG;AACH,eAAO,MAAM,WAAW;sBACL,MAAM;eACb,uBAAuB;;qBAElB,MAAM,SAAS,OAAO,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI;MAC5D,QAAQ,aAAa,CAsNxB,CAAA;AAuHD,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,EACZ,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,KAAK,cAAc,EAAkB,MAAM,4BAA4B,CAAA;AAkBhF,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAOlE;;;;;;;;;GASG;AACH,eAAO,MAAM,WAAW;iBACV,MAAM;eACR,iBAAiB;;qBAEZ,MAAM,SAAS,OAAO,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI;MAC5D,QAAQ,aAAa,CAkOxB,CAAA;AAwHD,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAQtE"}

package/dist/loadProject.js

@@ -12,11 +12,12 @@ import { createNodeishFsWithAbsolutePaths } from "./createNodeishFsWithAbsoluteP
 import { normalizePath } from "@lix-js/fs";
 import { isAbsolutePath } from "./isAbsolutePath.js";
 import { createNodeishFsWithWatcher } from "./createNodeishFsWithWatcher.js";
+import { maybeMigrateToDirectory } from "./migrations/migrateToDirectory.js";
 const settingsCompiler = TypeCompiler.Compile(ProjectSettings);
 /**
  * Creates an inlang instance.
  *
- * @param settingsFilePath - Absolute path to the inlang settings file.
+ * @param projectPath - Absolute path to the inlang settings file.
  * @param nodeishFs - Filesystem that implements the NodeishFilesystemSubset interface.
  * @param _import - Use `_import` to pass a custom import function for testing,
  *   and supporting legacy resolvedModules such as CJS.
@@ -24,25 +25,30 @@ const settingsCompiler = TypeCompiler.Compile(ProjectSettings);
  *
  */
 export const loadProject = async (args) => {
+    const projectPath = normalizePath(args.projectPath);
+    // -- migrate if outdated ------------------------------------------------
+    await maybeMigrateToDirectory({ nodeishFs: args.nodeishFs, projectPath });
     // -- validation --------------------------------------------------------
-    //! the only place where throwing is acceptable because the project
-    //! won't even be loaded. do not throw anywhere else. otherwise, apps
-    //! can't handle errors gracefully.
-    if (!isAbsolutePath(args.settingsFilePath)) {
-        throw new LoadProjectInvalidArgument(`Expected an absolute path but received "${args.settingsFilePath}".`, { argument: "settingsFilePath" });
+    // the only place where throwing is acceptable because the project
+    // won't even be loaded. do not throw anywhere else. otherwise, apps
+    // can't handle errors gracefully.
+    if (!isAbsolutePath(args.projectPath)) {
+        throw new LoadProjectInvalidArgument(`Expected an absolute path but received "${args.projectPath}".`, { argument: "projectPath" });
+    }
+    else if (/[^\\/]+\.inlang$/.test(projectPath) === false) {
+        throw new LoadProjectInvalidArgument(`Expected a path ending in "{name}.inlang" but received "${projectPath}".\n\nValid examples: \n- "/path/to/micky-mouse.inlang"\n- "/path/to/green-elephant.inlang\n`, { argument: "projectPath" });
     }
-    const settingsFilePath = normalizePath(args.settingsFilePath);
     // -- load project ------------------------------------------------------
     return await createRoot(async () => {
         const [initialized, markInitAsComplete, markInitAsFailed] = createAwaitable();
         const nodeishFs = createNodeishFsWithAbsolutePaths({
-            settingsFilePath,
+            projectPath,
             nodeishFs: args.nodeishFs,
         });
         // -- settings ------------------------------------------------------------
         const [settings, _setSettings] = createSignal();
         createEffect(() => {
-            loadSettings({ settingsFilePath, nodeishFs })
+            loadSettings({ settingsFilePath: projectPath + "/settings.json", nodeishFs })
                 .then((settings) => {
                 setSettings(settings);
                 // rename settings to get a convenient access to the data in Posthog
@@ -54,7 +60,7 @@ export const loadProject = async (args) => {
             });
         });
         // TODO: create FS watcher and update settings on change
-        const writeSettingsToDisk = skipFirst((settings) => _writeSettingsToDisk({ nodeishFs, settings }));
+        const writeSettingsToDisk = skipFirst((settings) => _writeSettingsToDisk({ nodeishFs, settings, projectPath }));
         const setSettings = (settings) => {
             try {
                 const validatedSettings = parseSettings(settings);
@@ -158,12 +164,12 @@ export const loadProject = async (args) => {
                     cause: err,
                 });
             }
-            // if (
-            // 	newMessages.length !== 0 &&
-            // 	JSON.stringify(newMessages) !== JSON.stringify(messages())
-            // ) {
-            // 	setMessages(newMessages)
-            // }
+            const abortController = new AbortController();
+            if (newMessages.length !== 0 &&
+                JSON.stringify(newMessages) !== JSON.stringify(messages()) &&
+                nodeishFs.watch("/", { signal: abortController.signal }) === undefined) {
+                setMessages(newMessages);
+            }
         }, { atBegin: false }));
         createEffect(() => {
             debouncedSave(messagesQuery.getAll());
@@ -240,7 +246,7 @@ const _writeSettingsToDisk = async (args) => {
     if (serializeSettingsError) {
         throw serializeSettingsError;
     }
-    const { error: writeSettingsError } = await tryCatch(async () => args.nodeishFs.writeFile("./project.inlang.json", serializedSettings));
+    const { error: writeSettingsError } = await tryCatch(async () => args.nodeishFs.writeFile(args.projectPath + "/settings.json", serializedSettings));
     if (writeSettingsError) {
         throw writeSettingsError;
     }