@inzombieland/nuxt-common 1.18.15 → 1.18.17

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.18.15",
+  "version": "1.18.17",
   "configKey": "nuxt-common",
   "builder": {
     "@nuxt/module-builder": "0.6.0",

package/dist/module.mjs

@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url';
 import { defineNuxtModule, createResolver, addServerHandler, addImportsDir, addPlugin, addComponent } from '@nuxt/kit';
 
 const name = "@inzombieland/nuxt-common";
-const version = "1.18.15";
+const version = "1.18.17";
 
 const module = defineNuxtModule({
   meta: {

package/dist/runtime/packages/core/api-client.mjs

@@ -109,6 +109,10 @@ const optionsHandler = (options = {}, config) => {
 };
 const fetchRequest = (url, options = {}, fetch, config) => {
   const request = async () => {
+    const apiActions = useApiActions();
+    if (typeof window !== "undefined") {
+      await apiActions.value?.getVisitorIdentifier?.();
+    }
     const opts = optionsHandler(options, config);
     try {
       const response = await fetch.raw(url, opts);
@@ -116,7 +120,6 @@ const fetchRequest = (url, options = {}, fetch, config) => {
     } catch (error) {
       const { status } = error?.response ?? { status: 500 };
       if (status === 401 && url !== "/account/1/offline") {
-        const apiActions = useApiActions();
         await apiActions.value?.refreshToken?.();
         return request();
       }

package/dist/runtime/packages/core/composables/use-api-actions.d.ts

@@ -1,13 +1,10 @@
 export declare const useApiActions: () => import("vue").Ref<{
-    initialized: boolean;
     getVisitorIdentifier?: (() => Promise<void>) | undefined;
     refreshToken?: (() => Promise<string>) | undefined;
 }, {
-    initialized: boolean;
     getVisitorIdentifier?: () => Promise<void>;
     refreshToken?: () => Promise<string>;
 } | {
-    initialized: boolean;
     getVisitorIdentifier?: (() => Promise<void>) | undefined;
     refreshToken?: (() => Promise<string>) | undefined;
 }>;

package/dist/runtime/packages/core/composables/use-api-actions.mjs

@@ -1,5 +1,5 @@
 import { ref } from "vue";
-const apiActions = ref({ initialized: false });
+const apiActions = ref({});
 export const useApiActions = () => {
   return apiActions;
 };

package/dist/runtime/packages/core/get-user.mjs

@@ -16,7 +16,6 @@ async function getUserRequest(fetch, config) {
     }
     try {
       const apiActions = useApiActions();
-      await apiActions.value?.getVisitorIdentifier?.();
       await apiActions.value?.refreshToken?.();
     } catch {
       flush();

package/dist/runtime/packages/core/get-visitor.mjs

@@ -8,7 +8,7 @@ const setVisitor = (newVisitor) => {
 };
 const getVisitorRequest = async (config) => {
   const visitor = useVisitor();
-  if (typeof window === "undefined" || visitor.value) {
+  if (visitor.value) {
     return;
   }
   const fp = await load();

package/dist/runtime/packages/core/index.mjs

@@ -22,11 +22,7 @@ export function initApiFetch($fetch, config) {
   const initApplication = createInitApplication();
   const refreshToken = createApiRefreshToken(fetch, config);
   userActions = ref(createApiUserActions(fetch, config, getUser));
-  apiActions.value = {
-    initialized: true,
-    getVisitorIdentifier,
-    refreshToken
-  };
+  apiActions.value = { getVisitorIdentifier, refreshToken };
   if (typeof window !== "undefined") {
     const loggedIn = useLocalStorage("lin", "no");
     const cometServerURL = config.cometServerURL;
@@ -45,7 +41,8 @@ export function initApiFetch($fetch, config) {
       }
       loggedIn.value = user ? "yes" : "no";
     });
-    bus.subscribe("app:beforeMount", () => {
+    const subscription = bus.subscribe("app:beforeMount", () => {
+      subscription.unsubscribe();
       console.log("Service started in mode", import.meta.env.MODE);
       getVisitorIdentifier();
       initApplication();

package/dist/runtime/packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/core",
-  "version": "1.18.15",
+  "version": "1.18.17",
   "type": "module",
   "license": "ISC",
   "main": "./index.mjs",

package/dist/runtime/packages/layer-manager/LayerComponent.vue

@@ -46,6 +46,7 @@ if (typeof component === "string") {
 		/>
 		<component
 			:is="component"
+			:params="layer.params"
 			:search-params="layer.searchParams"
 			@close-layer="closeLayer"
 			@close-all-layers="closeAllLayers"

package/dist/runtime/packages/layer-manager/LayersProvider.vue

@@ -22,22 +22,31 @@ function getLayerHash(s: string): string {
 	return Math.abs(hash).toString()
 }
 
-const createLayer = (name: string): ActiveLayer => {
+const createLayer = (name: string, params?: { [p: string]: any }): ActiveLayer => {
 	return {
 		name,
 		layerId: getLayerHash(name),
 		component: name.charAt(0).toUpperCase() + name.slice(1),
-		searchParams: history.value.query || {},
+		params: Object.assign({}, history.value.query, params),
+		searchParams: Object.assign({}, history.value.query, params),
 		closeLayer: typeof window !== "undefined" ? () => {} : undefined,
 	}
 }
 
-const resolveLayer = (layerName: string, options: { isCloseOtherLayers: boolean } = { isCloseOtherLayers: false }) => {
+const resolveLayer = (
+	layerName: string,
+	options: { isCloseOtherLayers: boolean } = { isCloseOtherLayers: false },
+	params?: { [p: string]: any }
+) => {
 	const activeLayer = activeLayers.value.find(({ name }) => name === layerName)
 	if (activeLayer) {
 		// слой с таким именем уже есть
 		const layer = activeLayers.value.splice(activeLayers.value.indexOf(activeLayer), 1)[0]
 		if (layer) {
+			if (params) {
+				layer.params = params
+				layer.searchParams = params
+			}
 			activeLayers.value.push(layer)
 		}
 	} else {
@@ -47,7 +56,7 @@ const resolveLayer = (layerName: string, options: { isCloseOtherLayers: boolean
 		if (activeLayers.value.length >= layersLimit) {
 			activeLayers.value.shift()
 		}
-		activeLayers.value.push(createLayer(layerName))
+		activeLayers.value.push(createLayer(layerName, params))
 	}
 }
 
@@ -76,7 +85,7 @@ const closeLayer = (layerId: string) => {
 		activeLayers.value = activeLayers.value.filter(s => s.layerId !== layerId)
 
 		const layer = activeLayers.value.at(-1)
-		const queryLayer = layer ? { layer: layer.name, ...layer.searchParams } : {}
+		const queryLayer = layer ? { layer: layer.name, ...layer.params, ...layer.searchParams } : {}
 		const query = { ...(history.value.query?.layer ? queryLayer : {}) }
 
 		router.push({ path: history.value.path, query })
@@ -107,6 +116,7 @@ watch(reactiveHistory, (value, prevValue) => {
 		} else {
 			const activeLayer = activeLayers.value.find(({ name }) => name === value.query.layer)
 			if (activeLayer) {
+				activeLayer.params = value.query
 				activeLayer.searchParams = value.query
 			}
 		}
@@ -122,7 +132,12 @@ onMounted(() => {
 	layerActions.value = {
 		initialized: true,
 		open: (layerName: string, params?: { [p: string]: any }) => {
-			router.push({ path: history.value.path, query: { layer: layerName, ...(params ?? {}) } })
+			if (params?.mode === "router") {
+				const { mode, ...restParams } = params
+				router.push({ path: history.value.path, query: { layer: layerName, ...(restParams ?? {}) } })
+			} else {
+				resolveLayer(layerName, undefined, params)
+			}
 		},
 		getLayer: (layerName: string) => {
 			return activeLayers.value.find(({ name }) => name === layerName)

package/dist/runtime/packages/layer-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/layer-manager",
-  "version": "1.16.7",
+  "version": "1.17.0",
   "type": "module",
   "license": "ISC",
   "main": "./index.mjs",

package/dist/runtime/packages/layer-manager/types.d.ts

@@ -1,8 +1,12 @@
-import type { LocationQuery } from "vue-router";
 export type ActiveLayer = {
     readonly name: string;
     readonly layerId: string;
     readonly component: string;
-    searchParams: LocationQuery;
+    params: {
+        [p: string]: any;
+    };
+    searchParams: {
+        [p: string]: any;
+    };
     closeLayer: (() => void) | undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.18.15",
+  "version": "1.18.17",
   "license": "ISC",
   "type": "module",
   "exports": {