@olenbetong/appframe-core 2.0.2 → 2.0.4

package/es/getLocalizedString.js

@@ -1,7 +1,8 @@
-async function getLocalizedStringAsync(string) {
+import { has } from "./has";
+async function fetchLocalizedString(text) {
     try {
-        let response = await fetch(`/api/user/localize`, {
-            body: JSON.stringify({ string, ArticleID: af.article.id }),
+        let response = await fetch(`/api/user/localize/new/${af.article.id}`, {
+            body: JSON.stringify({ text }),
             headers: {
                 Accept: "application/json; */*",
                 "Content-Type": "application/json",
@@ -14,13 +15,24 @@ async function getLocalizedStringAsync(string) {
         }
     }
     catch (error) { }
-    return string;
+    return text;
 }
-function afGetLocalizedString(string, wait) {
+export function getLocalizedStringAsync(string) {
+    if (!string)
+        return string;
+    return getLocalizedString(string, true);
+}
+export function getLocalizedString(string, wait) {
+    if (typeof string === "string" && string.trim().length === 0) {
+        return string;
+    }
+    if (string === undefined || string === "" || string === null) {
+        return;
+    }
     if (af?.article?.i18n !== undefined) {
-        if (!Object.prototype.hasOwnProperty.call(af.article.i18n, string)) {
+        if (!has(af.article.i18n, string)) {
             af.article.i18n[string] = string;
-            let promise = getLocalizedStringAsync(string).then((text) => {
+            let promise = fetchLocalizedString(string).then((text) => {
                 af.article.i18n[string] = text;
                 return text;
             });
@@ -34,81 +46,3 @@ function afGetLocalizedString(string, wait) {
         return string;
     }
 }
-const key = "__UNLOCALIZED_STRINGS__";
-const localizeSet = window[key] || new Set();
-if (!window[key]) {
-    window[key] = localizeSet;
-}
-function handleReadyStateChange() {
-    if (document.readyState !== "loading") {
-        addDeveloperUtils();
-        document.removeEventListener("readystatechange", handleReadyStateChange);
-    }
-}
-if (document.readyState !== "loading") {
-    addDeveloperUtils();
-}
-else {
-    document.addEventListener("readystatechange", handleReadyStateChange);
-}
-function isDeveloper() {
-    const { af } = window;
-    return af && af.userSession && af.userSession.isDeveloper;
-}
-function addDeveloperUtils() {
-    if (isDeveloper()) {
-        if (typeof window.__doNothingWithStrings === "function") {
-            const addedStrings = window.__doNothingWithStrings();
-            for (let string of Object.keys(addedStrings)) {
-                localizeSet.add(string);
-            }
-        }
-        if (!window[key]) {
-            window[key] = localizeSet;
-        }
-        if (!window.__getUnlocalizedStrings) {
-            window.__getUnlocalizedStrings = function (forCustomRoute) {
-                const strings = [];
-                for (let string of localizeSet) {
-                    if (string) {
-                        const escaped = string.replace(/'/g, "\\'");
-                        if (forCustomRoute) {
-                            const localized = afGetLocalizedString(string).replaceAll(/'/g, "\\'");
-                            strings.push(`'${escaped}': '${localized}',`);
-                        }
-                        else {
-                            strings.push(`s['${escaped}'] = @Html(@context.AddLocalizableString("${string.replaceAll('"', '\\"')}"));`);
-                        }
-                    }
-                }
-                if (forCustomRoute) {
-                    return `// Localization hack, since it AddLocalizableString doesn't work properly when custom routes is used
-if (af.userSession.uiculture === 'nb-NO') {
-	const strings = {
-		${strings.join("\n\t\t")}
-	};
-	af.article.i18n = af.article.i18n || {};
-	Object.assign(af.article.i18n, strings);
-}`;
-                }
-                return `<script type="text/javascript">
-function __doNothingWithStrings() {
-@{
-	var context = @Appframe.Web.Context.RequestContext.Current;
-}
-let s = {};
-${strings.join("\n")}
-return s;
-}
-</script>`;
-            };
-        }
-    }
-}
-export function getLocalizedString(string) {
-    const localized = afGetLocalizedString(string);
-    if (localized === string && !localizeSet.has(string)) {
-        localizeSet.add(string);
-    }
-    return localized;
-}

package/es/index.js

@@ -10,4 +10,4 @@ export { default as localStorage } from "./localStorage.js";
 export { default as SessionHandler } from "./SessionHandler.js";
 export { UserSession };
 export * from "./settings.js";
-export const version = "2.0.2";
+export const version = "2.0.4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-core",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Javascript libraries to utilize the Appframe framework",
   "type": "module",
   "sideEffects": [
@@ -48,5 +48,5 @@
   "devDependencies": {
     "chalk": "^5.0.1"
   },
-  "gitHead": "c192b2ce5f422635d0e38eaf984f286fd8120bc8"
+  "gitHead": "ad1c3f7787d9a631f76fd811d9383d9ac3dfa07b"
 }

package/src/getLocalizedString.ts

@@ -1,7 +1,9 @@
-async function getLocalizedStringAsync(string: string) {
+import { has } from "./has";
+
+async function fetchLocalizedString(text: string) {
   try {
-    let response = await fetch(`/api/user/localize`, {
-      body: JSON.stringify({ string, ArticleID: af.article.id }),
+    let response = await fetch(`/api/user/localize/new/${af.article.id}`, {
+      body: JSON.stringify({ text }),
       headers: {
         Accept: "application/json; */*",
         "Content-Type": "application/json",
@@ -15,18 +17,38 @@ async function getLocalizedStringAsync(string: string) {
     }
   } catch (error) {}
 
-  return string;
+  return text;
+}
+export function getLocalizedStringAsync(string: undefined | null): undefined | null;
+export function getLocalizedStringAsync(string: string): Promise<string>;
+export function getLocalizedStringAsync(string: string | undefined | null) {
+  if (!string) return string;
+
+  return getLocalizedString(string, true);
 }
 
-function afGetLocalizedString(string: string): string;
-function afGetLocalizedString(string: string, wait: false): string;
-function afGetLocalizedString(string: string, wait: true): Promise<string>;
-function afGetLocalizedString(string: string, wait?: boolean): string | Promise<string> {
+export function getLocalizedString(string: undefined | null): undefined | null;
+export function getLocalizedString(string: string): string;
+export function getLocalizedString(string: string, wait: false): string;
+export function getLocalizedString(string: string, wait: true): Promise<string>;
+export function getLocalizedString(string: undefined | null, wait: true): undefined | null;
+export function getLocalizedString(
+  string: string | undefined | null,
+  wait?: boolean
+): string | undefined | null | Promise<string> {
+  if (typeof string === "string" && string.trim().length === 0) {
+    return string;
+  }
+
+  if (string === undefined || string === "" || string === null) {
+    return;
+  }
+
   if (af?.article?.i18n !== undefined) {
-    if (!Object.prototype.hasOwnProperty.call(af.article.i18n, string)) {
+    if (!has(af.article.i18n, string)) {
       af.article.i18n[string] = string;
 
-      let promise = getLocalizedStringAsync(string).then((text) => {
+      let promise = fetchLocalizedString(string).then((text) => {
         af.article.i18n[string] = text;
         return text;
       });
@@ -41,104 +63,3 @@ function afGetLocalizedString(string: string, wait?: boolean): string | Promise<
     return string;
   }
 }
-
-declare global {
-  interface Window {
-    __UNLOCALIZED_STRINGS__: Set<string>;
-    __doNothingWithStrings?: () => Record<string, string>;
-    __getUnlocalizedStrings?: (forCustomRoute?: boolean) => string;
-  }
-}
-
-const key = "__UNLOCALIZED_STRINGS__";
-const localizeSet = window[key] || new Set();
-
-if (!window[key]) {
-  window[key] = localizeSet;
-}
-
-function handleReadyStateChange() {
-  if (document.readyState !== "loading") {
-    addDeveloperUtils();
-    document.removeEventListener("readystatechange", handleReadyStateChange);
-  }
-}
-
-if (document.readyState !== "loading") {
-  addDeveloperUtils();
-} else {
-  document.addEventListener("readystatechange", handleReadyStateChange);
-}
-
-function isDeveloper() {
-  const { af } = window;
-
-  return af && af.userSession && af.userSession.isDeveloper;
-}
-
-function addDeveloperUtils() {
-  if (isDeveloper()) {
-    if (typeof window.__doNothingWithStrings === "function") {
-      const addedStrings = window.__doNothingWithStrings();
-
-      for (let string of Object.keys(addedStrings)) {
-        localizeSet.add(string);
-      }
-    }
-
-    if (!window[key]) {
-      window[key] = localizeSet;
-    }
-
-    if (!window.__getUnlocalizedStrings) {
-      window.__getUnlocalizedStrings = function (forCustomRoute) {
-        const strings = [];
-
-        for (let string of localizeSet) {
-          if (string) {
-            const escaped = string.replace(/'/g, "\\'");
-            if (forCustomRoute) {
-              const localized = afGetLocalizedString(string).replaceAll(/'/g, "\\'");
-              strings.push(`'${escaped}': '${localized}',`);
-            } else {
-              strings.push(
-                `s['${escaped}'] = @Html(@context.AddLocalizableString("${string.replaceAll('"', '\\"')}"));`
-              );
-            }
-          }
-        }
-
-        if (forCustomRoute) {
-          return `// Localization hack, since it AddLocalizableString doesn't work properly when custom routes is used
-if (af.userSession.uiculture === 'nb-NO') {
-	const strings = {
-		${strings.join("\n\t\t")}
-	};
-	af.article.i18n = af.article.i18n || {};
-	Object.assign(af.article.i18n, strings);
-}`;
-        }
-
-        return `<script type="text/javascript">
-function __doNothingWithStrings() {
-@{
-	var context = @Appframe.Web.Context.RequestContext.Current;
-}
-let s = {};
-${strings.join("\n")}
-return s;
-}
-</script>`;
-      };
-    }
-  }
-}
-
-export function getLocalizedString(string: string) {
-  const localized = afGetLocalizedString(string);
-  if (localized === string && !localizeSet.has(string)) {
-    localizeSet.add(string);
-  }
-
-  return localized;
-}