x4js 1.5.24 → 1.5.26

package/lib/esm/index.mjs

@@ -3480,6 +3480,126 @@ var Settings = class {
 };
 __name(Settings, "Settings");
 
+// src/router.ts
+function parseRoute(str, loose = false) {
+  if (str instanceof RegExp) {
+    return {
+      keys: null,
+      pattern: str
+    };
+  }
+  const arr = str.split("/");
+  let keys = [];
+  let pattern = "";
+  if (arr[0] == "") {
+    arr.shift();
+  }
+  for (const tmp of arr) {
+    const c = tmp[0];
+    if (c === "*") {
+      keys.push("wild");
+      pattern += "/(.*)";
+    } else if (c === ":") {
+      const o = tmp.indexOf("?", 1);
+      const ext = tmp.indexOf(".", 1);
+      keys.push(tmp.substring(1, o >= 0 ? o : ext >= 0 ? ext : tmp.length));
+      pattern += o >= 0 && ext < 0 ? "(?:/([^/]+?))?" : "/([^/]+?)";
+      if (ext >= 0) {
+        pattern += (o >= 0 ? "?" : "") + "\\" + tmp.substring(ext);
+      }
+    } else {
+      pattern += "/" + tmp;
+    }
+  }
+  return {
+    keys,
+    pattern: new RegExp(`^${pattern}${loose ? "(?=$|/)" : "/?$"}`, "i")
+  };
+}
+__name(parseRoute, "parseRoute");
+var Router = class extends EventSource {
+  m_routes;
+  m_useHash;
+  constructor(useHash = true) {
+    super();
+    this.m_routes = [];
+    this.m_useHash = useHash;
+    window.addEventListener("popstate", (event) => {
+      const url = this._getLocation();
+      const found = this._find(url);
+      found.handlers.forEach((h) => {
+        h(found.params, url);
+      });
+    });
+  }
+  get(uri, handler) {
+    let { keys, pattern } = parseRoute(uri);
+    this.m_routes.push({ keys, pattern, handler });
+  }
+  init() {
+    this.navigate(this._getLocation());
+  }
+  _getLocation() {
+    return this.m_useHash ? "/" + x4document.location.hash.substring(1) : x4document.location.pathname;
+  }
+  navigate(uri, notify = true) {
+    if (!uri.startsWith("/")) {
+      uri = "/" + uri;
+    }
+    const found = this._find(uri);
+    if (!found || found.handlers.length == 0) {
+      console.log("route not found: " + uri);
+      this.signal("error", EvError(404, "route not found"));
+      return;
+    }
+    if (this.m_useHash) {
+      while (uri.startsWith("/")) {
+        uri = uri.substring(1);
+      }
+      window.history.pushState({}, "", "#" + uri);
+    } else {
+      window.history.pushState({}, "", uri);
+    }
+    if (notify) {
+      found.handlers.forEach((h) => {
+        h(found.params, uri);
+      });
+    }
+  }
+  _find(url) {
+    let matches = [];
+    let params = {};
+    let handlers = [];
+    for (const tmp of this.m_routes) {
+      if (!tmp.keys) {
+        matches = tmp.pattern.exec(url);
+        if (!matches) {
+          continue;
+        }
+        if (matches["groups"]) {
+          for (const k in matches["groups"]) {
+            params[k] = matches["groups"][k];
+          }
+        }
+        handlers = [...handlers, tmp.handler];
+      } else if (tmp.keys.length > 0) {
+        matches = tmp.pattern.exec(url);
+        if (matches === null) {
+          continue;
+        }
+        for (let j = 0; j < tmp.keys.length; ) {
+          params[tmp.keys[j]] = matches[++j];
+        }
+        handlers = [...handlers, tmp.handler];
+      } else if (tmp.pattern.test(url)) {
+        handlers = [...handlers, tmp.handler];
+      }
+    }
+    return { params, handlers };
+  }
+};
+__name(Router, "Router");
+
 // src/application.ts
 var _x4_touch_time = Symbol();
 var _Application = class extends BaseComponent {
@@ -3497,6 +3617,7 @@ var _Application = class extends BaseComponent {
   m_user_data;
   m_touch_time;
   m_touch_count;
+  m_router;
   constructor(props) {
     console.assert(_Application.self === null, "application is a singleton");
     super(props);
@@ -3508,7 +3629,8 @@ var _Application = class extends BaseComponent {
     this.m_user_data = {};
     this.m_touch_time = 0;
     this.m_touch_count = 0;
-    _Application.self = this;
+    this.m_router = null;
+    x4app = _Application.self = this;
     if ("onload" in globalThis) {
       globalThis.addEventListener("load", () => {
         this.ApplicationCreated();
@@ -3520,6 +3642,12 @@ var _Application = class extends BaseComponent {
   ApplicationCreated() {
     this.setTitle("");
   }
+  get router() {
+    if (!this.m_router) {
+      this.m_router = new Router();
+    }
+    return this.m_router;
+  }
   get app_name() {
     return this.m_app_name;
   }
@@ -3605,6 +3733,7 @@ var _Application = class extends BaseComponent {
 var Application = _Application;
 __name(Application, "Application");
 __publicField(Application, "self", null);
+var x4app;
 
 // src/layout.ts
 var AbsLayout = class extends Container {
@@ -14126,123 +14255,6 @@ var Rating = class extends HLayout {
 };
 __name(Rating, "Rating");
 
-// src/router.ts
-function parseRoute(str, loose = false) {
-  if (str instanceof RegExp) {
-    return {
-      keys: null,
-      pattern: str
-    };
-  }
-  const arr = str.split("/");
-  let keys = [];
-  let pattern = "";
-  if (arr[0] == "") {
-    arr.shift();
-  }
-  for (const tmp of arr) {
-    const c = tmp[0];
-    if (c === "*") {
-      keys.push("wild");
-      pattern += "/(.*)";
-    } else if (c === ":") {
-      const o = tmp.indexOf("?", 1);
-      const ext = tmp.indexOf(".", 1);
-      keys.push(tmp.substring(1, o >= 0 ? o : ext >= 0 ? ext : tmp.length));
-      pattern += o >= 0 && ext < 0 ? "(?:/([^/]+?))?" : "/([^/]+?)";
-      if (ext >= 0) {
-        pattern += (o >= 0 ? "?" : "") + "\\" + tmp.substring(ext);
-      }
-    } else {
-      pattern += "/" + tmp;
-    }
-  }
-  return {
-    keys,
-    pattern: new RegExp(`^${pattern}${loose ? "(?=$|/)" : "/?$"}`, "i")
-  };
-}
-__name(parseRoute, "parseRoute");
-var Router = class extends EventSource {
-  m_routes;
-  m_useHash;
-  constructor(useHash = true) {
-    super();
-    this.m_routes = [];
-    this.m_useHash = useHash;
-    window.addEventListener("popstate", (event) => {
-      const url = this._getLocation();
-      const found = this._find(url);
-      found.handlers.forEach((h) => {
-        h(found.params, url);
-      });
-    });
-  }
-  get(uri, handler) {
-    let { keys, pattern } = parseRoute(uri);
-    this.m_routes.push({ keys, pattern, handler });
-  }
-  init() {
-    this.navigate(this._getLocation());
-  }
-  _getLocation() {
-    return this.m_useHash ? "/" + x4document.location.hash.substring(1) : x4document.location.pathname;
-  }
-  navigate(uri, notify = true) {
-    const found = this._find(uri);
-    if (!found || found.handlers.length == 0) {
-      console.log("route not found: " + uri);
-      this.signal("error", EvError(404, "route not found"));
-      return;
-    }
-    if (this.m_useHash) {
-      while (uri.startsWith("/")) {
-        uri = uri.substring(1);
-      }
-      window.history.pushState({}, "", "#" + uri);
-    } else {
-      window.history.pushState({}, "", uri);
-    }
-    if (notify) {
-      found.handlers.forEach((h) => {
-        h(found.params, uri);
-      });
-    }
-  }
-  _find(url) {
-    let matches = [];
-    let params = {};
-    let handlers = [];
-    for (const tmp of this.m_routes) {
-      if (!tmp.keys) {
-        matches = tmp.pattern.exec(url);
-        if (!matches) {
-          continue;
-        }
-        if (matches["groups"]) {
-          for (const k in matches["groups"]) {
-            params[k] = matches["groups"][k];
-          }
-        }
-        handlers = [...handlers, tmp.handler];
-      } else if (tmp.keys.length > 0) {
-        matches = tmp.pattern.exec(url);
-        if (matches === null) {
-          continue;
-        }
-        for (let j = 0; j < tmp.keys.length; ) {
-          params[tmp.keys[j]] = matches[++j];
-        }
-        handlers = [...handlers, tmp.handler];
-      } else if (tmp.pattern.test(url)) {
-        handlers = [...handlers, tmp.handler];
-      }
-    }
-    return { params, handlers };
-  }
-};
-__name(Router, "Router");
-
 // src/sidebarview.ts
 var SideBarView = class extends CardView {
   m_sidebar;
@@ -15556,7 +15568,7 @@ function setupWSMessaging(closeCB) {
 __name(setupWSMessaging, "setupWSMessaging");
 
 // src/version.ts
-var x4js_version = "1.5.24";
+var x4js_version = "1.5.26";
 export {
   AbsLayout,
   Application,
@@ -15727,6 +15739,7 @@ export {
   sprintf,
   sql_date_formatter,
   waitFontLoading,
+  x4app,
   x4js_version
 };
 /**