From c54939bc481f167f9c9a8903afdd7e444c073369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Kval=C3=B8y?= Date: Fri, 5 Apr 2019 13:17:46 +0200 Subject: [PATCH 1/3] Exclude the js dir from files to compile --- base.tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/base.tsconfig.json b/base.tsconfig.json index 02c4e79..ced29a8 100644 --- a/base.tsconfig.json +++ b/base.tsconfig.json @@ -17,6 +17,7 @@ "test-ts/", "test-js/", "dist/", + "js", "test/", "node_modules" ] From 926f76e7551fe6cc9a75a3d4491acb6dbf4fecbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Kval=C3=B8y?= Date: Fri, 5 Apr 2019 13:22:32 +0200 Subject: [PATCH 2/3] Return type SubModuleObject instead of instance of VuexModule --- src/module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/module.ts b/src/module.ts index 7861a24..e67b307 100644 --- a/src/module.ts +++ b/src/module.ts @@ -8,11 +8,11 @@ export type VuexClassConstructor = new () => T export class VuexModule { - static CreateSubModule(SubModule: V) { + static CreateSubModule(SubModule: V) :SubModuleObject { return { type: _submodule, store: SubModule, - } as InstanceType + } } static CreateProxy($store: Store, cls: V) { From f7f0b44eeb44bd5e601eea5177ff8bafdc7fb753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Kval=C3=B8y?= Date: Fri, 5 Apr 2019 14:38:21 +0200 Subject: [PATCH 3/3] Include generated definition and map files for changed signature in module.ts --- dist/module.d.ts | 4 ++-- dist/module.js.map | 2 +- js/module.d.ts | 4 ++-- js/module.js.map | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/module.d.ts b/dist/module.d.ts index 5918fac..a0ecf45 100644 --- a/dist/module.d.ts +++ b/dist/module.d.ts @@ -1,9 +1,9 @@ import { ActionRegister } from "./actions"; -import { _state, _mutations, _getters, _proxy, _map, _store, _namespacedPath, _actions_register, _actions, MutationFunction, GetterFunction, ActionFunction, VuexMap, _submodule, _module, _target } from "./symbols"; +import { _state, _mutations, _getters, _proxy, _map, _store, _namespacedPath, _actions_register, _actions, MutationFunction, GetterFunction, ActionFunction, VuexMap, _submodule, SubModuleObject, _module, _target } from "./symbols"; import { Store } from "vuex"; export declare type VuexClassConstructor = new () => T; export declare class VuexModule { - static CreateSubModule(SubModule: V): InstanceType; + static CreateSubModule(SubModule: V): SubModuleObject; static CreateProxy($store: Store, cls: V): InstanceType; static ExtractVuexModule(cls: typeof VuexModule): { namespaced: boolean; diff --git a/dist/module.js.map b/dist/module.js.map index 2703920..943f2a2 100644 --- a/dist/module.js.map +++ b/dist/module.js.map @@ -1 +1 @@ -{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/js/module.d.ts b/js/module.d.ts index 5918fac..a0ecf45 100644 --- a/js/module.d.ts +++ b/js/module.d.ts @@ -1,9 +1,9 @@ import { ActionRegister } from "./actions"; -import { _state, _mutations, _getters, _proxy, _map, _store, _namespacedPath, _actions_register, _actions, MutationFunction, GetterFunction, ActionFunction, VuexMap, _submodule, _module, _target } from "./symbols"; +import { _state, _mutations, _getters, _proxy, _map, _store, _namespacedPath, _actions_register, _actions, MutationFunction, GetterFunction, ActionFunction, VuexMap, _submodule, SubModuleObject, _module, _target } from "./symbols"; import { Store } from "vuex"; export declare type VuexClassConstructor = new () => T; export declare class VuexModule { - static CreateSubModule(SubModule: V): InstanceType; + static CreateSubModule(SubModule: V): SubModuleObject; static CreateProxy($store: Store, cls: V): InstanceType; static ExtractVuexModule(cls: typeof VuexModule): { namespaced: boolean; diff --git a/js/module.js.map b/js/module.js.map index 6313366..f6e0011 100644 --- a/js/module.js.map +++ b/js/module.js.map @@ -1 +1 @@ -{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"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"} \ No newline at end of file