smartloc 2.0.1 → 2.0.2

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "smartloc",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A i18n toolset for nodejs apis leveraging tagged strings",
   "main": "src/index.ts",
   "scripts": {
     "build": "tsc && cp package.json bin/package.json && cp README.md build",
-    "release": "npm publish && cd ..",
+    "release": "npm publish",
     "t": "tsc --project tsconfig.json --noEmit"
   },
   "bin": {

package/src/core/locale-list.ts

@@ -34,6 +34,8 @@ export function subscribeToLocaleChange(callback: () => void) {
     subs.add(callback);
     return () => { subs.delete(callback); };
 }
+subscribeToLocaleChange.count = () => subs.size;
+
 export function getCurrentLocale(noDefault?: false): ILocaleDef;
 export function getCurrentLocale(noDefault: true): ILocaleDef | null;
 export function getCurrentLocale(noDefault = false) {

package/src/core/smartloc.tsx

@@ -204,10 +204,21 @@ function createKind<props extends object>(opts: {
     // trick to create a function that is named like the given name
     const creator = {
         [opts.name](props: props): LocStr {
+            // This is a dirty hack to create some item that will both be recognized by React as a valid element,
+            // but that also behaves as a LocStr with the appropriate methods.
+            // 1) create a react element
             const e = React.createElement(Renderer, props);
-            const eProps = Object.getOwnPropertyDescriptors(e);
+
+            // 2) create a new instance of our LocStr kind
             const ret = Object.create(Proto.prototype);
+
+            // 3) raw-copy what the react element has as  properties
+            //   ... this work because React.createElement() actually only creates a raw frozen object with some properties.
+            //    see createElement() source code
+            const eProps = Object.getOwnPropertyDescriptors(e);
             Object.defineProperties(ret, eProps);
+
+            // 4) set the isLoc flag to true so isLocStr() will recognize this instance
             setIsLoc(ret); // this will freeze the object
             return ret;
         }

package/src/core/tag.ts

@@ -8,7 +8,12 @@ type Templater = (literals: TemplateStringsArray, ...placeholders: LocLiteral[])
 declare function _tagSig(id: string): Templater
 declare function _tagSig(literals: TemplateStringsArray, ...placeholders: LocLiteral[]): LocStr;
 type TagSignature = typeof _tagSig;
-type LocTag = TagSignature & { plural(count: number): TagSignature };
+type LocTag = TagSignature & {
+    /** Creates a pluralizable string (will have two versions to be translated based on the given count: singlular & plural) */
+    plural(count: number): TagSignature;
+    /** Does nothing, except that the translation will not be collected (use for formatting purposes) */
+    nocollect: LocTag
+};
 
 
 
@@ -36,5 +41,8 @@ _loc.plural = (count: number) => {
     }
     return templater;
 };
+_loc.nocollect = () => {
+    return _loc;
+};
 
 export const loc: LocTag = _loc as any;