@discord/intl-loader-core 0.19.1-canary.f6592a8 → 0.19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discord/intl-loader-core",
-  "version": "0.19.1-canary.f6592a8",
+  "version": "0.19.1",
   "license": "MIT",
   "description": "Core utilities for writing loaders and transformers using @discord/intl",
   "author": "Jon Egeland",
@@ -28,7 +28,7 @@
   "dependencies": {
     "chokidar": "^3.6.0",
     "debug": "^4.3.6",
-    "@discord/intl-message-database": "0.19.1-canary.f6592a8"
+    "@discord/intl-message-database": "0.19.1"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",

package/src/transformer.js

@@ -124,13 +124,36 @@ class MessageDefinitionsTransformer {
    * more of a debugging utility than anything else, but can be useful for diagnosing when messages
    * are used in critical paths or otherwise.
    *
-   * @returns {string[]}
+   * @param {string} bindFunc Code expression that creates a getter bind
+   * @returns {string}
    */
-  createBindsProxy() {
-    return [
-      `const {makeMessagesProxy} = require('@discord/intl');`,
-      `const binds = makeMessagesProxy(${this.loaderName});`,
-    ];
+  createBindsProxy(bindFunc) {
+    return `new Proxy({},
+      {
+        ownKeys(self) {
+          return Reflect.ownKeys(self);
+        },
+        getOwnPropertyDescriptor(self, prop) {
+          return {
+            value: self[prop] ||= ${bindFunc},
+            configurable: true,
+            enumerable: true,
+            writable: false,
+          };
+        },
+        get(self, prop) {
+          if (prop === '$$typeof') {
+            return 'object';
+          }
+          if (prop === Symbol.toStringTag) {
+            return 'IntlMessagesProxy';
+          }
+          
+          self[prop] ||= ${bindFunc};
+          return self[prop];
+        },
+      },
+    )`;
   }
 
   /**
@@ -145,7 +168,7 @@ class MessageDefinitionsTransformer {
       case 'proxy':
         return [
           `const ${this.loaderName} = createLoader(_localeMap, _defaultLocale);`,
-          ...this.createBindsProxy(),
+          `const binds = ${this.createBindsProxy(`(locale) => ${this.loaderName}.get(prop, locale)`)};`,
         ];
       case 'literal': {
         const bindLines = Object.keys(this.options.messageKeys).map(

package/types/src/transformer.d.ts

@@ -105,9 +105,10 @@ export class MessageDefinitionsTransformer {
      * more of a debugging utility than anything else, but can be useful for diagnosing when messages
      * are used in critical paths or otherwise.
      *
-     * @returns {string[]}
+     * @param {string} bindFunc Code expression that creates a getter bind
+     * @returns {string}
      */
-    createBindsProxy(): string[];
+    createBindsProxy(bindFunc: string): string;
     /**
      * Return a map of key names to bound message getter functions. If `proxyBinds` is
      * configured to be `true`, the binds will be created as a constant object in the output.