feat: add a more modern proxy package to resolve module resolution pr…

…oblems

.changeset/soft-flies-itch.md

@@ -0,0 +1,10 @@
+---
+"@diacritic/runtime": patch
+"@diacritic/core": patch
+"@diacritic/detector": patch
+"@diacritic/parser": patch
+"@diacritic/react": patch
+"@diacritic/utilities": patch
+---
+
+Add a more standard package to deal with the proxy to avoid conflicts in legacy modern resolutions

packages/runtime/package.json

@@ -36,7 +36,7 @@
 	},
 	"dependencies": {
 		"@diacritic/utilities": "workspace:*",
-		"proxy-deep": "^4.0.1",
+		"@qiwi/deep-proxy": "^3.0.0",
 		"tiny-invariant": "^1.3.3"
 	}
 }

packages/runtime/src/index.ts

@@ -1,22 +1,31 @@
 import type { Proxy } from "~translations/proxy";
 
-import { capitalizeFirst } from "@diacritic/utilities";
-import { DeepProxy } from "proxy-deep";
+import { toCamelCase } from "@diacritic/utilities";
+import { DeepProxy } from "@qiwi/deep-proxy";
 
 type Registry = typeof import("~translations/registry");
 
 export type Language = Registry["languages"][number];
 export type Namespace = Registry["namespaces"][number];
 
-function createProxy(language: Language,	modules: Record<Language, Record<Namespace, any>>) {
-	const proxy: Proxy = new DeepProxy({}, {
-		get(_, property) {
-			if (typeof property !== "string") return;
+function emptyFn() {}
 
-			return this.nest(() => {});
-		},
-		apply(_, __, args) {
-			const [namespace, ...path] = this.path;
+function createProxy(language: Language, modules: Record<Language, Record<Namespace, any>>) {
+	const proxy: Proxy = new DeepProxy({}, ({ trapName, path, args, DEFAULT, PROXY }) => {
+		if (trapName === "set") throw new TypeError("Cannot set properties on a Diacritic proxy object");
+
+		if (trapName === "get") {
+			if (path.length === 0 && !modules[language]) console.warn(`[Diacritic] language ${language} is not loaded`);
+
+			const [namespace] = path;
+			if (namespace && !modules[language]?.[namespace as Namespace])
+				console.warn(`[Diacritic] namespace ${namespace} is not loaded in language ${language}`);
+
+			return PROXY(emptyFn);
+		}
+
+		if (trapName === "apply") {
+			const [namespace, ...rest] = path;
 
 			if (!namespace) throw new Error("Namespace is not specified");
 
@@ -26,18 +35,16 @@ function createProxy(language: Language,	modules: Record<Language, Record<Namesp
 			if (!modules[language]![namespace as Language])
 				throw new Error(`Namespace ${namespace} is not loaded`);
 
-			const name = path.reduce((acc, item, index) => {
-				if (index === 0) return item;
-				return acc + capitalizeFirst(item);
-			}, "");
-
+			const name = toCamelCase(rest.join("-"));
 			const fn: any = modules[language]![namespace as Namespace][name];
 
 			if (typeof fn !== "function")
 				throw new Error(`Function ${name} is not defined in namespace ${namespace}`);
 
 			return fn(proxy, ...args);
-		},
+		}
+
+		return DEFAULT;
 	});
 
 	return proxy;

packages/runtime/test/index.test.ts

@@ -69,6 +69,7 @@ it("should load new modules correctly", async () => {
 it("should call translation functions correctly", async () => {
 	importTranslationModule.mockResolvedValue({
 		hello: () => "world",
+		someReallyDeepFunction: () => "deep",
 	});
 
 	const runtime = new Diacritic(registry, "en");
@@ -84,4 +85,5 @@ it("should call translation functions correctly", async () => {
 	runtime.setLanguage("en");
 
 	expect((runtime.t as any).common.hello()).toBe("world");
+	expect((runtime.t as any).common.some.really.deep.function()).toBe("deep");
 });