@olenbetong/appframe-core 2.0.4 → 2.1.1

package/src/index.ts

@@ -1,12 +1,13 @@
 import "./errorHandler.js";
 
-import UserSession from "./UserSession.js";
+import { UserSession } from "./UserSession.js";
 
 export { default as mitt } from "mitt";
 export { downloadBlob } from "./downloadBlob.js";
 export * from "./downloadRequest.js";
-export { default as expose } from "./expose.js";
+export { expose } from "./expose.js";
 export { getLocalizedString } from "./getLocalizedString.js";
+export { localize } from "./localize.js";
 export * from "./has.js";
 export { default as localStorage } from "./localStorage.js";
 export { default as SessionHandler } from "./SessionHandler.js";

package/src/localize.ts

@@ -0,0 +1,29 @@
+import { getLocalizedString } from "./getLocalizedString.js";
+
+/**
+ * Localization function for tagged templates. Replaces the arguments
+ * with $n, where n is the index, before asking Appframe to translate
+ * the string.
+ * 
+ * For example, if you call localize`Page ${2} or ${5}`, the string
+ * "Page $0 of $1" will be sent to Appframe, and for norwegian,
+ * "Side 2 av 5" will be returned.
+ * 
+ * @param stringParts 
+ * @param args 
+ * @returns Translated string
+ */
+export function localize(stringParts: TemplateStringsArray, ...args: any[]): string {
+  if (!Array.isArray(stringParts) || stringParts.length !== args.length + 1) {
+    throw TypeError("Method 'localize' must be used as a tag function");
+  }
+
+  let stringToLocalize = stringParts.map((s, i) => (i === stringParts.length - 1 ? s : `${s}\$${i}`)).join("");
+  let localized = getLocalizedString(stringToLocalize);
+
+  args.forEach((arg, index) => {
+    localized = localized.replace("$" + index, arg);
+  })
+
+  return localized;
+}

package/src/parseFunc.ts

@@ -1,6 +1,6 @@
 const funcRegex = /^function(?:\s+([a-zA-Z$_][a-zA-Z0-9$_]*))?\s*\(((?:(?:\s*[a-zA-Z$_][a-zA-Z0-9$_]*)(?:\s*,\s*[a-zA-Z$_][a-zA-Z0-9$_]*)*)?)\s*\)\s*\{((?:.|\n|\r)*)\}$/;
 
-export default function parseFunc(func: Function) {
+export function parseFunc(func: Function) {
   var match = func.toString().match(funcRegex);
   if (match === null) {
     throw new TypeError("Unable to parse function!");

package/src/requireNamespace.ts

@@ -1,6 +1,6 @@
 import Namespace from "./Namespace.js";
 
-export default function requireNamespace(
+export function requireNamespace(
   root: any,
   namespace: string | Array<string>
 ): any {
@@ -17,10 +17,6 @@ export default function requireNamespace(
       }
 
       return current;
-    } else {
-      throw new TypeError("Invalid type of parameter 'namespace'");
     }
-  } else {
-    throw new TypeError("Invalid type of parameter 'root'");
   }
 }

package/es/warn.d.ts

@@ -1 +0,0 @@
-export default function warn(message: string, fallbackToAlert?: boolean): void;

package/es/warn.js

@@ -1,4 +0,0 @@
-/* eslint-disable no-console */
-export default function warn(message, fallbackToAlert) {
-    console.warn(message);
-}

package/src/warn.ts

@@ -1,4 +0,0 @@
-/* eslint-disable no-console */
-export default function warn(message: string, fallbackToAlert?: boolean) {
-  console.warn(message);
-}