Skip to content

Commit fa3a3d9

Browse files
committed
Merge branch 'aymasse-master'
2 parents b39884a + 464a9e2 commit fa3a3d9

File tree

10 files changed

+13
-10
lines changed

10 files changed

+13
-10
lines changed

dist/proxy.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/proxy.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/submodule.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/submodule.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/proxy.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/proxy.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/submodule.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/submodule.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/proxy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ function createGettersAndMutationProxyFromState({ cls, proxy, state, $store, nam
302302
if (currentField.length && !currentField.endsWith(".")) currentField += ".";
303303
const path = currentField + field;
304304

305-
if ( maxDepth === 0 || typeof value !== "object" ) {
305+
if ( maxDepth === 0 || typeof value !== "object" || (typeof value === 'object' && !fieldIsSubmodule) ) {
306306

307307
if( !strict || fieldIsSubmodule ) {
308308

src/submodule.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import { extractVuexModule } from "./module";
33
import { toCamelCase, getClassPath } from "./utils"
44

55
export function isFieldASubModule( instance :VuexModule & Map, field :string ) {
6-
return(
6+
return(
7+
instance[ field ] != null &&
78
typeof instance[ field ] === "object" &&
89
instance[ field ][ "__submodule_type__" ] === "submodule"
910
)

0 commit comments

Comments
 (0)