@applicaster/quick-brick-core 16.0.0-rc.126 → 16.0.0-rc.127

package/App/ActionSetters/index.ts

@@ -4,8 +4,8 @@ import { allSettled } from "promise";
 import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
 
 import * as React from "react";
-import { coreAppLogger } from "../logger";
-const logger = coreAppLogger.addSubsystem("AppLifeCycleManager");
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
+const logger = subsystemLogger("app/lifecycle", "AppLifeCycleManager");
 
 const debugActions = (actions) =>
   logger.debug({

package/App/ActionsProvider/ActionsProvider.tsx

@@ -8,7 +8,7 @@ import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
 import { LegacyActionsRegistryAdapter } from "./LegacyActionsRegistryAdapter";
 
 const { log_debug } = createLogger({
-  subsystem: "ActionsProvider",
+  subsystem: "core/actions",
   category: "ActionRegistration",
 });
 

package/App/ActionsProvider/LegacyActionsRegistryAdapter.tsx

@@ -5,7 +5,7 @@ import { uiActionsRegistry } from "@applicaster/zapp-react-native-utils/uiAction
 import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
 
 const { log_debug, log_warning } = createLogger({
-  subsystem: "LegacyActionsRegistryAdapter",
+  subsystem: "core/actions/legacy_registry",
   category: "ActionRegistration",
 });
 

package/App/AssetCache/logger.ts

@@ -5,6 +5,6 @@ import { coreAppLogger } from "../logger";
 export const { log_verbose, log_debug, log_warning, log_info, log_error } =
   createLogger({
     category: "AssetCache",
-    subsystem: "quick-brick-core",
+    subsystem: "storage/asset_cache",
     parent: coreAppLogger,
   });

package/App/DeepLinking/logger.ts

@@ -5,6 +5,6 @@ import { coreAppLogger } from "../logger";
 export const { log_verbose, log_debug, log_warning, log_info, log_error } =
   createLogger({
     category: "DeepLinking",
-    subsystem: "General",
+    subsystem: "app/deep_linking",
     parent: coreAppLogger,
   });

package/App/ErrorBoundary/index.tsx

@@ -1,13 +1,16 @@
 import * as React from "react";
 import pick from "lodash/pick";
 
-import { coreLogger } from "@applicaster/zapp-react-native-utils/logger";
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
 import { ErrorScreen } from "@applicaster/zapp-react-native-ui-components/Components/ErrorScreen";
 
 import { useErrorStore } from "./store";
 import * as QuickBrickManager from "@applicaster/zapp-react-native-bridge/QuickBrick";
 
-const errorBoundaryLogger = coreLogger.addSubsystem("react_error-boundary");
+const errorBoundaryLogger = subsystemLogger(
+  "crash/error_boundary",
+  "ErrorBoundary"
+);
 
 type Props = {
   children: React.ReactNode;

package/App/NavigationProvider/NavigationProvider.tsx

@@ -45,7 +45,6 @@ import {
   startUpHookPluginIdentifiersSelector,
 } from "./navigator/selectors";
 
-import { coreAppLogger } from "../logger";
 import {
   getPlatform,
   isTV,
@@ -89,8 +88,9 @@ import {
   useLayoutVersion,
   useRivers,
 } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
 
-const logger = coreAppLogger.addSubsystem("Navigator");
+const logger = subsystemLogger("ui/navigation", "Navigator");
 
 type Props = {
   children?: React.ReactChild;

package/App/NavigationProvider/utils.ts

@@ -7,16 +7,16 @@ import {
 } from "@applicaster/zapp-react-native-utils/navigationUtils";
 import { findPluginByType } from "@applicaster/zapp-react-native-utils/pluginUtils";
 
-import { coreAppLogger } from "../logger";
 import { isString } from "@applicaster/zapp-react-native-utils/stringUtils";
 import { SCREEN_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/itemTypes";
 import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
 
 const EXTERNAL_URL_TYPE = "external_url";
 const EXTERNAL_URL_FLAG = "open_external_url";
 const WEBVIEW_SCREEN_IDENTIFIER = "webview_screen_qb";
 
-const logger = coreAppLogger.addSubsystem("Navigator");
+const logger = subsystemLogger("ui/navigation", "Navigator");
 
 /**
  * Drops a leading `/hooks/<screen_id>` segment from a path.

package/App/NetworkStatusProvider/NetworkStatusProvider.tsx

@@ -12,11 +12,12 @@ import {
   unsubscribeToDeviceNetworkChanges,
 } from "./utils";
 import { usePrevious } from "@applicaster/zapp-react-native-utils/reactHooks/utils";
-import { coreAppLogger } from "../logger";
+
 import { useResumeVerifiedNetInfo } from "./useResumeVerifiedNetInfo";
 import { describeNetInfo } from "./resumeVerification";
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
 
-const logger = coreAppLogger.addSubsystem("NetworkStatusProvider");
+const logger = subsystemLogger("network/reachability", "NetworkStatusProvider");
 
 // Use default netInfo config for all platforms (important for web platform which otherwise
 // will use backend root which is not responding for HEAD request)

package/App/NetworkStatusProvider/ResumeVerificationController.ts

@@ -1,7 +1,6 @@
 import { AppState, AppStateStatus } from "react-native";
 import { NetInfoState } from "@react-native-community/netinfo";
 
-import { coreAppLogger } from "../logger";
 import { isOnline } from "./utils";
 import {
   RESUME_VERIFICATION_DELAY_MS,
@@ -10,8 +9,9 @@ import {
   isBackgroundAppState,
   isResumeVerificationEnabled,
 } from "./resumeVerification";
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
 
-const logger = coreAppLogger.addSubsystem("NetworkStatusProvider");
+const logger = subsystemLogger("network/reachability", "NetworkStatusProvider");
 
 export type ConnectionInfo = NetInfoState & { deviceStatus?: NetStatus };
 

package/App/NetworkStatusProvider/__tests__/NetworkStatusProvider.test.tsx

@@ -16,18 +16,33 @@ const mockLogger = {
   error: jest.fn(),
 };
 
-// addSubsystem runs at module load, before mockLogger is initialised: delegate lazily
-jest.mock("../../logger", () => ({
-  coreAppLogger: {
-    addSubsystem: () => ({
-      warning: (event) => mockLogger.warning(event),
-      debug: (event) => mockLogger.debug(event),
-      info: (event) => mockLogger.info(event),
-      log: (event) => mockLogger.log(event),
-      error: (event) => mockLogger.error(event),
-    }),
-  },
-}));
+// subsystemLogger runs at module load, before mockLogger is initialised: delegate lazily
+jest.mock("@applicaster/zapp-react-native-utils/logger", () => {
+  const actual = jest.requireActual(
+    "@applicaster/zapp-react-native-utils/logger"
+  );
+
+  return {
+    ...actual,
+    // Only the logger of this subsystem is replaced; every other module keeps its real one.
+    subsystemLogger: (subsystem: string) => {
+      if (subsystem !== "network/reachability") {
+        return actual.subsystemLogger(subsystem);
+      }
+
+      const logger = {
+        warning: (event) => mockLogger.warning(event),
+        debug: (event) => mockLogger.debug(event),
+        info: (event) => mockLogger.info(event),
+        log: (event) => mockLogger.log(event),
+        error: (event) => mockLogger.error(event),
+        addSubsystem: () => logger,
+      };
+
+      return logger;
+    },
+  };
+});
 
 jest.mock("react-native/Libraries/AppState/AppState", () => {
   const { EventEmitter } = require("events");

package/App/NetworkStatusProvider/__tests__/ResumeVerificationController.test.ts

@@ -12,18 +12,33 @@ const mockLogger = {
   error: jest.fn(),
 };
 
-// addSubsystem runs at module load, before mockLogger is initialised: delegate lazily
-jest.mock("../../logger", () => ({
-  coreAppLogger: {
-    addSubsystem: () => ({
-      warning: (event) => mockLogger.warning(event),
-      debug: (event) => mockLogger.debug(event),
-      info: (event) => mockLogger.info(event),
-      log: (event) => mockLogger.log(event),
-      error: (event) => mockLogger.error(event),
-    }),
-  },
-}));
+// subsystemLogger runs at module load, before mockLogger is initialised: delegate lazily
+jest.mock("@applicaster/zapp-react-native-utils/logger", () => {
+  const actual = jest.requireActual(
+    "@applicaster/zapp-react-native-utils/logger"
+  );
+
+  return {
+    ...actual,
+    // Only the logger of this subsystem is replaced; every other module keeps its real one.
+    subsystemLogger: (subsystem: string) => {
+      if (subsystem !== "network/reachability") {
+        return actual.subsystemLogger(subsystem);
+      }
+
+      const logger = {
+        warning: (event) => mockLogger.warning(event),
+        debug: (event) => mockLogger.debug(event),
+        info: (event) => mockLogger.info(event),
+        log: (event) => mockLogger.log(event),
+        error: (event) => mockLogger.error(event),
+        addSubsystem: () => logger,
+      };
+
+      return logger;
+    },
+  };
+});
 
 jest.mock("react-native/Libraries/AppState/AppState", () => {
   const { EventEmitter } = require("events");

package/App/NetworkStatusProvider/__tests__/useResumeVerifiedNetInfo.test.ts

@@ -14,18 +14,33 @@ const mockLogger = {
   error: jest.fn(),
 };
 
-// addSubsystem runs at module load, before mockLogger is initialised: delegate lazily
-jest.mock("../../logger", () => ({
-  coreAppLogger: {
-    addSubsystem: () => ({
-      warning: (event) => mockLogger.warning(event),
-      debug: (event) => mockLogger.debug(event),
-      info: (event) => mockLogger.info(event),
-      log: (event) => mockLogger.log(event),
-      error: (event) => mockLogger.error(event),
-    }),
-  },
-}));
+// subsystemLogger runs at module load, before mockLogger is initialised: delegate lazily
+jest.mock("@applicaster/zapp-react-native-utils/logger", () => {
+  const actual = jest.requireActual(
+    "@applicaster/zapp-react-native-utils/logger"
+  );
+
+  return {
+    ...actual,
+    // Only the logger of this subsystem is replaced; every other module keeps its real one.
+    subsystemLogger: (subsystem: string) => {
+      if (subsystem !== "network/reachability") {
+        return actual.subsystemLogger(subsystem);
+      }
+
+      const logger = {
+        warning: (event) => mockLogger.warning(event),
+        debug: (event) => mockLogger.debug(event),
+        info: (event) => mockLogger.info(event),
+        log: (event) => mockLogger.log(event),
+        error: (event) => mockLogger.error(event),
+        addSubsystem: () => logger,
+      };
+
+      return logger;
+    },
+  };
+});
 
 jest.mock("react-native/Libraries/AppState/AppState", () => {
   const { EventEmitter } = require("events");

package/App/appLifeCycleManager/index.tsx

@@ -12,13 +12,13 @@ import { isAndroidPlatform } from "@applicaster/zapp-react-native-utils/reactUti
 import { networkStatusReady } from "../NetworkStatusProvider/networkStatusReady";
 import { updateSessionNumber } from "../SessionCounter/sessionCounter";
 
-import { coreAppLogger } from "../logger";
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
 import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { requiredSessionKeys } from "../../const";
 import { initializeActionSetters, useActionSetters } from "../ActionSetters";
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
 
-const logger = coreAppLogger.addSubsystem("AppLifeCycleManager");
+const logger = subsystemLogger("app/lifecycle", "AppLifeCycleManager");
 
 const isAndroid = isAndroidPlatform();
 

package/App/appRemoteDataLoader/index.tsx

@@ -2,11 +2,11 @@ import * as React from "react";
 
 import { getRemoteContextData } from "../remoteContextReloader/getRemoteContextData";
 
-import { coreAppLogger } from "../logger";
 import { UnknownAction, Dispatch } from "@reduxjs/toolkit";
 import { isAndroidPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
 
-const logger = coreAppLogger.addSubsystem("AppRemoteDataLoader");
+const logger = subsystemLogger("app/loading", "AppRemoteDataLoader");
 
 /**
  * adds a call to the QuickBrickManager to tell the app is ready, reloads remote

package/App/appRemoteDataLoader/remoteDataLoader.ts

@@ -5,8 +5,8 @@ import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
 import { coreAppLogger } from "../logger";
 
 const logger = createLogger({
-  category: "PlayerController",
-  subsystem: "RemoteDataLoader",
+  category: "RemoteDataLoader",
+  subsystem: "app/loading",
   parent: coreAppLogger,
 });
 

package/App/logger.js

@@ -1,3 +1,3 @@
-import { coreLogger } from "@applicaster/zapp-react-native-utils/logger";
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
 
-export const coreAppLogger = coreLogger.addSubsystem("app");
+export const coreAppLogger = subsystemLogger("app");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "16.0.0-rc.126",
+  "version": "16.0.0-rc.127",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,13 +28,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "16.0.0-rc.126",
-    "@applicaster/quick-brick-core-plugins": "16.0.0-rc.126",
-    "@applicaster/zapp-pipes-v2-client": "16.0.0-rc.126",
-    "@applicaster/zapp-react-native-bridge": "16.0.0-rc.126",
-    "@applicaster/zapp-react-native-redux": "16.0.0-rc.126",
-    "@applicaster/zapp-react-native-ui-components": "16.0.0-rc.126",
-    "@applicaster/zapp-react-native-utils": "16.0.0-rc.126",
+    "@applicaster/applicaster-types": "16.0.0-rc.127",
+    "@applicaster/quick-brick-core-plugins": "16.0.0-rc.127",
+    "@applicaster/zapp-pipes-v2-client": "16.0.0-rc.127",
+    "@applicaster/zapp-react-native-bridge": "16.0.0-rc.127",
+    "@applicaster/zapp-react-native-redux": "16.0.0-rc.127",
+    "@applicaster/zapp-react-native-ui-components": "16.0.0-rc.127",
+    "@applicaster/zapp-react-native-utils": "16.0.0-rc.127",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",