@geexcode/geex-angular 0.0.34 → 0.0.36

package/dist/index.d.mts

@@ -105,7 +105,7 @@ interface UiModule extends GeexModule {
 declare const ExtensionModule: Record<string, any> & {};
 type ExtensionModule = typeof ExtensionModule;
 type GeexModules<TExtensionModules extends ExtensionModule = ExtensionModule> = {
-    init(): Promise<{
+    init(force?: boolean): Promise<{
         [K in keyof GeexModules<TExtensionModules>]: any;
     }>;
     tenant: TenantModule;
@@ -120,8 +120,9 @@ type GeexModule<TExtension = ExtensionModule> = {
      * A module combines both reactive state (signals) and business logic methods.
      * Concrete modules can extend this interface to expose their own signals & methods.
      * This empty base exists mainly for typing convenience and future extension.
+     * @param force - If true, forces re-initialization even if already initialized. Defaults to false.
      */
-    init: () => Promise<any>;
+    init: (force?: boolean) => Promise<any>;
 } & TExtension;
 declare function createTenantModule(injector: Injector): TenantModule;
 declare function createAuthModule(injector: Injector): AuthModule;

package/dist/index.d.ts

@@ -105,7 +105,7 @@ interface UiModule extends GeexModule {
 declare const ExtensionModule: Record<string, any> & {};
 type ExtensionModule = typeof ExtensionModule;
 type GeexModules<TExtensionModules extends ExtensionModule = ExtensionModule> = {
-    init(): Promise<{
+    init(force?: boolean): Promise<{
         [K in keyof GeexModules<TExtensionModules>]: any;
     }>;
     tenant: TenantModule;
@@ -120,8 +120,9 @@ type GeexModule<TExtension = ExtensionModule> = {
      * A module combines both reactive state (signals) and business logic methods.
      * Concrete modules can extend this interface to expose their own signals & methods.
      * This empty base exists mainly for typing convenience and future extension.
+     * @param force - If true, forces re-initialization even if already initialized. Defaults to false.
      */
-    init: () => Promise<any>;
+    init: (force?: boolean) => Promise<any>;
 } & TExtension;
 declare function createTenantModule(injector: Injector): TenantModule;
 declare function createAuthModule(injector: Injector): AuthModule;

package/dist/index.js

@@ -126,21 +126,45 @@ var GQL_FEDERATE_AUTH = import_graphql_tag.default`mutation federateAuthenticate
 var GQL_ON_PUBLIC_NOTIFY = import_graphql_tag.default`subscription onPublicNotify { onPublicNotify { __typename ... on DataChangeClientNotify { dataChangeType } } }`;
 var GQL_ORGS_CACHE = import_graphql_tag.default`query orgsCache { orgs(take: 999) { items { id orgType code name parentOrgCode } } }`;
 var GQL_INIT_SETTINGS = import_graphql_tag.default`query initSettings { initSettings { id name value } }`;
+function guardedSignal(innerSignal, isInitialized) {
+  const guard = (() => {
+    if (!isInitialized()) {
+      throw new Error(`GuardedSignal not initialized. 
+        isInitialized: ${isInitialized.toString()}
+        innerSignal: ${innerSignal.toString()}
+        `);
+    }
+    return innerSignal();
+  });
+  if ("set" in innerSignal) {
+    guard.set = innerSignal.set.bind(innerSignal);
+    guard.update = innerSignal.update.bind(innerSignal);
+  }
+  if ("asReadonly" in innerSignal) {
+    guard.asReadonly = innerSignal.asReadonly.bind(innerSignal);
+  }
+  return guard;
+}
 function createTenantModule(injector) {
-  const current = (0, import_core.signal)(null);
+  const _current = (0, import_core.signal)(null);
+  let _initialized = false;
   const module2 = {
-    init: async () => {
+    init: async (force = false) => {
+      if (_initialized && !force) {
+        return;
+      }
       try {
         const tenantCode = injector.get(import_util.CookieService).get("__tenant");
         if (tenantCode) {
           const tenantData = await module2.loadTenantData(tenantCode);
-          current.set(tenantData ?? null);
+          _current.set(tenantData ?? null);
         }
+        _initialized = true;
       } catch (err) {
         console.error(err);
       }
     },
-    current,
+    current: guardedSignal(_current, () => _initialized),
     async loadTenantData(code) {
       const res = await (0, import_rxjs.firstValueFrom)(
         injector.get(import_apollo_angular.Apollo).mutate({ mutation: GQL_CHECK_TENANT, variables: { code } })
@@ -164,17 +188,22 @@ function createTenantModule(injector) {
   return module2;
 }
 function createAuthModule(injector) {
-  const user = (0, import_core.signal)(null);
+  const _user = (0, import_core.signal)(null);
+  let _initialized = false;
   const module2 = {
-    init: async () => {
+    init: async (force = false) => {
+      if (_initialized && !force) {
+        return;
+      }
       try {
         const userData = await module2.loadUserData();
-        user.set(userData ?? null);
+        _user.set(userData ?? null);
+        _initialized = true;
       } catch (err) {
         console.error(err);
       }
     },
-    user,
+    user: guardedSignal(_user, () => _initialized),
     async loadUserData() {
       const oAuthService = injector.get(import_angular_oauth2_oidc.OAuthService);
       try {
@@ -203,30 +232,48 @@ function createAuthModule(injector) {
   return module2;
 }
 function createIdentityModule(injector) {
-  const orgsSignal = (0, import_core.signal)([]);
-  const userOwnedOrgsSignal = (0, import_core.signal)([]);
+  const _orgsSignal = (0, import_core.signal)([]);
+  const _userOwnedOrgsSignal = (0, import_core.signal)([]);
+  let _initialized = false;
   const module2 = {
-    orgs: orgsSignal,
-    userOwnedOrgs: userOwnedOrgsSignal,
-    async init() {
+    orgs: guardedSignal(_orgsSignal, () => _initialized),
+    userOwnedOrgs: guardedSignal(_userOwnedOrgsSignal, () => _initialized),
+    async init(force = false) {
+      if (_initialized && !force) {
+        return;
+      }
       try {
-        const orgs$ = injector.get(import_apollo_angular.Apollo).watchQuery({ query: GQL_ORGS_CACHE }).valueChanges.pipe((0, import_rxjs.map)((res) => (0, import_util.deepCopy)(res.data.orgs.items)));
-        orgs$.subscribe((orgs) => {
-          (0, import_core.runInInjectionContext)(injector, () => {
-            orgsSignal.set(orgs);
-            const userData = geex.auth.user();
-            let allOwned = [];
-            if (orgs?.length && userData) {
-              if (userData.id === "000000000000000000000001") {
-                allOwned = (0, import_util.deepCopy)(orgs);
-              } else {
-                const ownedCodes = userData.orgs.map((x) => x.code);
-                allOwned = orgs.filter((o) => ownedCodes.some((code) => o.code.startsWith(code)));
-              }
+        await new Promise((resolve, reject) => {
+          const orgs$ = injector.get(import_apollo_angular.Apollo).watchQuery({ query: GQL_ORGS_CACHE }).valueChanges.pipe((0, import_rxjs.map)((res) => (0, import_util.deepCopy)(res.data.orgs.items)));
+          let isFirstEmit = true;
+          orgs$.subscribe({
+            next: (orgs) => {
+              (0, import_core.runInInjectionContext)(injector, () => {
+                _orgsSignal.set(orgs);
+                const userData = geex.auth.user();
+                let allOwned = [];
+                if (orgs?.length && userData) {
+                  if (userData.id === "000000000000000000000001") {
+                    allOwned = (0, import_util.deepCopy)(orgs);
+                  } else {
+                    const ownedCodes = userData.orgs.map((x) => x.code);
+                    allOwned = orgs.filter((o) => ownedCodes.some((code) => o.code.startsWith(code)));
+                  }
+                }
+                _userOwnedOrgsSignal.set(allOwned);
+                if (isFirstEmit) {
+                  isFirstEmit = false;
+                  resolve();
+                }
+              });
+            },
+            error: (err) => {
+              console.error(err);
+              reject(err);
             }
-            userOwnedOrgsSignal.set(allOwned);
           });
         });
+        _initialized = true;
       } catch (error) {
         console.error(error);
       }
@@ -235,8 +282,12 @@ function createIdentityModule(injector) {
   return module2;
 }
 function createMessagingModule(injector) {
+  let _initialized = false;
   const module2 = {
-    async init() {
+    async init(force = false) {
+      if (_initialized && !force) {
+        return;
+      }
       try {
         await geex.auth.init();
         if (injector.get(import_angular_oauth2_oidc.OAuthService).hasValidAccessToken()) {
@@ -245,6 +296,7 @@ function createMessagingModule(injector) {
             module2.onPublicNotify(notify);
           });
         }
+        _initialized = true;
       } catch (err) {
         console.error(err);
       }
@@ -256,30 +308,40 @@ function createMessagingModule(injector) {
   return module2;
 }
 function createSettingsModule(injector) {
-  const settingsSignal = (0, import_core.signal)([]);
+  const _settingsSignal = (0, import_core.signal)([]);
+  let _initialized = false;
   const module2 = {
-    settings: settingsSignal,
-    async init() {
+    settings: guardedSignal(_settingsSignal, () => _initialized),
+    async init(force = false) {
+      if (_initialized && !force) {
+        return;
+      }
       const res = await (0, import_rxjs.firstValueFrom)(
         injector.get(import_apollo_angular.Apollo).query({ query: GQL_INIT_SETTINGS })
       );
       const settings = res.data.initSettings;
-      settingsSignal.set(settings);
+      _settingsSignal.set(settings);
+      _initialized = true;
     }
   };
   return module2;
 }
 function createUiModule(injector) {
-  const fullScreenSignal = (0, import_core.signal)(false);
-  const isMobile = (0, import_rxjs_interop.toSignal)((0, import_rxjs.fromEvent)(window, "resize").pipe(
+  const _fullScreenSignal = (0, import_core.signal)(false);
+  const _isMobile = (0, import_rxjs_interop.toSignal)((0, import_rxjs.fromEvent)(window, "resize").pipe(
     (0, import_operators.debounceTime)(200),
     (0, import_operators.switchMap)(async () => window.innerHeight / window.innerWidth >= 1.5)
   ));
+  let _initialized = false;
   const module2 = {
-    fullScreen: fullScreenSignal,
-    isMobile,
+    fullScreen: guardedSignal(_fullScreenSignal, () => _initialized),
+    isMobile: guardedSignal(_isMobile, () => _initialized),
     activeRoutedComponent: void 0,
-    async init() {
+    async init(force = false) {
+      if (_initialized && !force) {
+        return;
+      }
+      _initialized = true;
       return;
     }
   };
@@ -294,13 +356,13 @@ function configGeex(injector, overrides = {}) {
     ...overrides
   };
   (0, import_core2.runInInjectionContext)(injector, () => {
-    modules.init ?? (modules.init = async () => {
+    modules.init ?? (modules.init = async (force = false) => {
       const entries = Object.entries(modules).filter(([key]) => key !== "init");
       return Object.fromEntries(await Promise.all(
         entries.map(async ([key, mod]) => {
           const maybeInit = mod.init;
           try {
-            return [key, await maybeInit()];
+            return [key, await maybeInit(force)];
           } catch (err) {
             console.error(err);
             return [key, null];

package/dist/index.mjs

@@ -80,21 +80,45 @@ var GQL_FEDERATE_AUTH = gql`mutation federateAuthenticate(
 var GQL_ON_PUBLIC_NOTIFY = gql`subscription onPublicNotify { onPublicNotify { __typename ... on DataChangeClientNotify { dataChangeType } } }`;
 var GQL_ORGS_CACHE = gql`query orgsCache { orgs(take: 999) { items { id orgType code name parentOrgCode } } }`;
 var GQL_INIT_SETTINGS = gql`query initSettings { initSettings { id name value } }`;
+function guardedSignal(innerSignal, isInitialized) {
+  const guard = (() => {
+    if (!isInitialized()) {
+      throw new Error(`GuardedSignal not initialized. 
+        isInitialized: ${isInitialized.toString()}
+        innerSignal: ${innerSignal.toString()}
+        `);
+    }
+    return innerSignal();
+  });
+  if ("set" in innerSignal) {
+    guard.set = innerSignal.set.bind(innerSignal);
+    guard.update = innerSignal.update.bind(innerSignal);
+  }
+  if ("asReadonly" in innerSignal) {
+    guard.asReadonly = innerSignal.asReadonly.bind(innerSignal);
+  }
+  return guard;
+}
 function createTenantModule(injector) {
-  const current = signal(null);
+  const _current = signal(null);
+  let _initialized = false;
   const module = {
-    init: async () => {
+    init: async (force = false) => {
+      if (_initialized && !force) {
+        return;
+      }
       try {
         const tenantCode = injector.get(CookieService).get("__tenant");
         if (tenantCode) {
           const tenantData = await module.loadTenantData(tenantCode);
-          current.set(tenantData ?? null);
+          _current.set(tenantData ?? null);
         }
+        _initialized = true;
       } catch (err) {
         console.error(err);
       }
     },
-    current,
+    current: guardedSignal(_current, () => _initialized),
     async loadTenantData(code) {
       const res = await firstValueFrom(
         injector.get(Apollo).mutate({ mutation: GQL_CHECK_TENANT, variables: { code } })
@@ -118,17 +142,22 @@ function createTenantModule(injector) {
   return module;
 }
 function createAuthModule(injector) {
-  const user = signal(null);
+  const _user = signal(null);
+  let _initialized = false;
   const module = {
-    init: async () => {
+    init: async (force = false) => {
+      if (_initialized && !force) {
+        return;
+      }
       try {
         const userData = await module.loadUserData();
-        user.set(userData ?? null);
+        _user.set(userData ?? null);
+        _initialized = true;
       } catch (err) {
         console.error(err);
       }
     },
-    user,
+    user: guardedSignal(_user, () => _initialized),
     async loadUserData() {
       const oAuthService = injector.get(OAuthService);
       try {
@@ -157,30 +186,48 @@ function createAuthModule(injector) {
   return module;
 }
 function createIdentityModule(injector) {
-  const orgsSignal = signal([]);
-  const userOwnedOrgsSignal = signal([]);
+  const _orgsSignal = signal([]);
+  const _userOwnedOrgsSignal = signal([]);
+  let _initialized = false;
   const module = {
-    orgs: orgsSignal,
-    userOwnedOrgs: userOwnedOrgsSignal,
-    async init() {
+    orgs: guardedSignal(_orgsSignal, () => _initialized),
+    userOwnedOrgs: guardedSignal(_userOwnedOrgsSignal, () => _initialized),
+    async init(force = false) {
+      if (_initialized && !force) {
+        return;
+      }
       try {
-        const orgs$ = injector.get(Apollo).watchQuery({ query: GQL_ORGS_CACHE }).valueChanges.pipe(map((res) => deepCopy(res.data.orgs.items)));
-        orgs$.subscribe((orgs) => {
-          runInInjectionContext(injector, () => {
-            orgsSignal.set(orgs);
-            const userData = geex.auth.user();
-            let allOwned = [];
-            if (orgs?.length && userData) {
-              if (userData.id === "000000000000000000000001") {
-                allOwned = deepCopy(orgs);
-              } else {
-                const ownedCodes = userData.orgs.map((x) => x.code);
-                allOwned = orgs.filter((o) => ownedCodes.some((code) => o.code.startsWith(code)));
-              }
+        await new Promise((resolve, reject) => {
+          const orgs$ = injector.get(Apollo).watchQuery({ query: GQL_ORGS_CACHE }).valueChanges.pipe(map((res) => deepCopy(res.data.orgs.items)));
+          let isFirstEmit = true;
+          orgs$.subscribe({
+            next: (orgs) => {
+              runInInjectionContext(injector, () => {
+                _orgsSignal.set(orgs);
+                const userData = geex.auth.user();
+                let allOwned = [];
+                if (orgs?.length && userData) {
+                  if (userData.id === "000000000000000000000001") {
+                    allOwned = deepCopy(orgs);
+                  } else {
+                    const ownedCodes = userData.orgs.map((x) => x.code);
+                    allOwned = orgs.filter((o) => ownedCodes.some((code) => o.code.startsWith(code)));
+                  }
+                }
+                _userOwnedOrgsSignal.set(allOwned);
+                if (isFirstEmit) {
+                  isFirstEmit = false;
+                  resolve();
+                }
+              });
+            },
+            error: (err) => {
+              console.error(err);
+              reject(err);
             }
-            userOwnedOrgsSignal.set(allOwned);
           });
         });
+        _initialized = true;
       } catch (error) {
         console.error(error);
       }
@@ -189,8 +236,12 @@ function createIdentityModule(injector) {
   return module;
 }
 function createMessagingModule(injector) {
+  let _initialized = false;
   const module = {
-    async init() {
+    async init(force = false) {
+      if (_initialized && !force) {
+        return;
+      }
       try {
         await geex.auth.init();
         if (injector.get(OAuthService).hasValidAccessToken()) {
@@ -199,6 +250,7 @@ function createMessagingModule(injector) {
             module.onPublicNotify(notify);
           });
         }
+        _initialized = true;
       } catch (err) {
         console.error(err);
       }
@@ -210,30 +262,40 @@ function createMessagingModule(injector) {
   return module;
 }
 function createSettingsModule(injector) {
-  const settingsSignal = signal([]);
+  const _settingsSignal = signal([]);
+  let _initialized = false;
   const module = {
-    settings: settingsSignal,
-    async init() {
+    settings: guardedSignal(_settingsSignal, () => _initialized),
+    async init(force = false) {
+      if (_initialized && !force) {
+        return;
+      }
       const res = await firstValueFrom(
         injector.get(Apollo).query({ query: GQL_INIT_SETTINGS })
       );
       const settings = res.data.initSettings;
-      settingsSignal.set(settings);
+      _settingsSignal.set(settings);
+      _initialized = true;
     }
   };
   return module;
 }
 function createUiModule(injector) {
-  const fullScreenSignal = signal(false);
-  const isMobile = toSignal(fromEvent(window, "resize").pipe(
+  const _fullScreenSignal = signal(false);
+  const _isMobile = toSignal(fromEvent(window, "resize").pipe(
     debounceTime(200),
     switchMap(async () => window.innerHeight / window.innerWidth >= 1.5)
   ));
+  let _initialized = false;
   const module = {
-    fullScreen: fullScreenSignal,
-    isMobile,
+    fullScreen: guardedSignal(_fullScreenSignal, () => _initialized),
+    isMobile: guardedSignal(_isMobile, () => _initialized),
     activeRoutedComponent: void 0,
-    async init() {
+    async init(force = false) {
+      if (_initialized && !force) {
+        return;
+      }
+      _initialized = true;
       return;
     }
   };
@@ -248,13 +310,13 @@ function configGeex(injector, overrides = {}) {
     ...overrides
   };
   runInInjectionContext2(injector, () => {
-    modules.init ?? (modules.init = async () => {
+    modules.init ?? (modules.init = async (force = false) => {
       const entries = Object.entries(modules).filter(([key]) => key !== "init");
       return Object.fromEntries(await Promise.all(
         entries.map(async ([key, mod]) => {
           const maybeInit = mod.init;
           try {
-            return [key, await maybeInit()];
+            return [key, await maybeInit(force)];
           } catch (err) {
             console.error(err);
             return [key, null];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geexcode/geex-angular",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "description": "Angular adapter for Geex core.",
   "module": "dist/index.js",
   "main": "dist/index.cjs",