Parcourir la source

Merge branch 'dev' into 4.0

Kia Ishii il y a 4 ans
Parent
commit
3d110c6dd0
5 fichiers modifiés avec 28 ajouts et 5 suppressions
  1. 3 1
      src/index.cjs.js
  2. 5 2
      src/index.js
  3. 5 0
      types/index.d.ts
  4. 14 0
      types/logger.d.ts
  5. 1 2
      types/test/index.ts

+ 3 - 1
src/index.cjs.js

@@ -1,6 +1,7 @@
 import { createStore, Store } from './store'
 import { createStore, Store } from './store'
 import { useStore } from './injectKey'
 import { useStore } from './injectKey'
 import { mapState, mapMutations, mapGetters, mapActions, createNamespacedHelpers } from './helpers'
 import { mapState, mapMutations, mapGetters, mapActions, createNamespacedHelpers } from './helpers'
+import createLogger from './plugins/logger'
 
 
 export default {
 export default {
   version: '__VERSION__',
   version: '__VERSION__',
@@ -11,5 +12,6 @@ export default {
   mapMutations,
   mapMutations,
   mapGetters,
   mapGetters,
   mapActions,
   mapActions,
-  createNamespacedHelpers
+  createNamespacedHelpers,
+  createLogger
 }
 }

+ 5 - 2
src/index.js

@@ -1,6 +1,7 @@
 import { createStore, Store } from './store'
 import { createStore, Store } from './store'
 import { useStore } from './injectKey'
 import { useStore } from './injectKey'
 import { mapState, mapMutations, mapGetters, mapActions, createNamespacedHelpers } from './helpers'
 import { mapState, mapMutations, mapGetters, mapActions, createNamespacedHelpers } from './helpers'
+import createLogger from './plugins/logger'
 
 
 export default {
 export default {
   version: '__VERSION__',
   version: '__VERSION__',
@@ -11,7 +12,8 @@ export default {
   mapMutations,
   mapMutations,
   mapGetters,
   mapGetters,
   mapActions,
   mapActions,
-  createNamespacedHelpers
+  createNamespacedHelpers,
+  createLogger
 }
 }
 
 
 export {
 export {
@@ -22,5 +24,6 @@ export {
   mapMutations,
   mapMutations,
   mapGetters,
   mapGetters,
   mapActions,
   mapActions,
-  createNamespacedHelpers
+  createNamespacedHelpers,
+  createLogger
 }
 }

+ 5 - 0
types/index.d.ts

@@ -4,8 +4,10 @@ import { App, WatchOptions, InjectionKey } from "vue";
 import "./vue";
 import "./vue";
 
 
 import { mapState, mapMutations, mapGetters, mapActions, createNamespacedHelpers } from "./helpers";
 import { mapState, mapMutations, mapGetters, mapActions, createNamespacedHelpers } from "./helpers";
+import createLogger from "./logger";
 
 
 export * from "./helpers";
 export * from "./helpers";
+export * from "./logger";
 
 
 export declare class Store<S> {
 export declare class Store<S> {
   constructor(options: StoreOptions<S>);
   constructor(options: StoreOptions<S>);
@@ -151,6 +153,8 @@ export interface ModuleTree<R> {
   [key: string]: Module<any, R>;
   [key: string]: Module<any, R>;
 }
 }
 
 
+export { createLogger }
+
 declare const _default: {
 declare const _default: {
   Store: typeof Store;
   Store: typeof Store;
   mapState: typeof mapState,
   mapState: typeof mapState,
@@ -158,5 +162,6 @@ declare const _default: {
   mapGetters: typeof mapGetters,
   mapGetters: typeof mapGetters,
   mapActions: typeof mapActions,
   mapActions: typeof mapActions,
   createNamespacedHelpers: typeof createNamespacedHelpers,
   createNamespacedHelpers: typeof createNamespacedHelpers,
+  createLogger: typeof createLogger
 };
 };
 export default _default;
 export default _default;

+ 14 - 0
types/logger.d.ts

@@ -0,0 +1,14 @@
+import { Payload, Plugin } from "./index";
+
+export interface LoggerOption<S> {
+  collapsed?: boolean;
+  filter?: <P extends Payload>(mutation: P, stateBefore: S, stateAfter: S) => boolean;
+  transformer?: (state: S) => any;
+  mutationTransformer?: <P extends Payload>(mutation: P) => any;
+  actionFilter?: <P extends Payload>(action: P, state: S) => boolean;
+  actionTransformer?: <P extends Payload>(action: P) => any;
+  logMutations?: boolean;
+  logActions?: boolean;
+}
+
+export default function createLogger<S>(option?: LoggerOption<S>): Plugin<S>;

+ 1 - 2
types/test/index.ts

@@ -1,5 +1,4 @@
 import * as Vuex from "../index";
 import * as Vuex from "../index";
-import createLogger from "../../dist/logger";
 
 
 namespace StoreInstance {
 namespace StoreInstance {
   const store = new Vuex.Store({
   const store = new Vuex.Store({
@@ -447,7 +446,7 @@ namespace Plugins {
     });
     });
   }
   }
 
 
-  const logger = createLogger<{ value: number }>({
+  const logger = Vuex.createLogger<{ value: number }>({
     collapsed: true,
     collapsed: true,
     transformer: state => state.value,
     transformer: state => state.value,
     mutationTransformer: (mutation: { type: string }) => mutation.type
     mutationTransformer: (mutation: { type: string }) => mutation.type