fix(store-get-state-return-object-to-flat): null guard

azu · azu · commit c1e0c0b6ac18 · 2017-04-22T00:01:52.000+09:00
diff --git a/README.md b/README.md
@@ -18,12 +18,11 @@ Install with [npm](https://www.npmjs.com/):
 
 ```bash
 # Install to global
-npm install -g jscodeshift
-# Install to local
-npm install @almin/migration-tools 
+npm install -g jscodeshift @almin/migration-tools 
 # Run migration scripts
 ## Target: your almin store files
-jscodeshift -t ./node_modules/@almin/scripts/store-get-state-return-object-to-flat.js <path>
+### Notice: Use this script with `--run-in-band` arguments(serial running)
+jscodeshift --run-in-band -t `npm root -g`/@almin/migration-tools/scripts/store-get-state-return-object-to-flat.js <path>
 ```
 
 Store#getState return value migration.
@@ -59,12 +58,10 @@ The `almin-store-state-mapping.json` is used with next script(Convert StoreGroup
 
 ```bash
 # Install to global
-npm install -g jscodeshift
-# Install to local
-npm install @almin/migration-tools 
+npm install -g jscodeshift @almin/migration-tools 
 # Run migration scripts
 ## Target: your almin StoreGroup file
-jscodeshift -t ./node_modules/@almin/scripts/store-group-arguments.js <path>
+jscodeshift -t `npm root -g`/@almin/migration-tools/scripts/store-group-arguments.js <path>
 ```
 
 Migrate StoreGroup constructor arguments.
diff --git a/scripts/__testfixtures__/store-get-state-return-object-to-flat/ProductStore.input.js b/scripts/__testfixtures__/store-get-state-return-object-to-flat/ProductStore.input.js
@@ -0,0 +1,24 @@
+import {Store} from "almin";
+import CartState from "./CartState";
+export default class CartStore extends Store {
+    /**
+     * @param {CartRepository} cartRepository
+     */
+    constructor(cartRepository) {
+        super();
+        this.state = new CartState();
+        cartRepository.onChange(cart => {
+            const newState = new CartState(cart);
+            if (this.state !== newState) {
+                this.state = newState;
+                this.emitChange();
+            }
+        });
+    }
+
+    getState() {
+        return {
+            CartState: this.state
+        };
+    }
+}
diff --git a/scripts/__testfixtures__/store-get-state-return-object-to-flat/ProductStore.output.js b/scripts/__testfixtures__/store-get-state-return-object-to-flat/ProductStore.output.js
@@ -0,0 +1,22 @@
+import {Store} from "almin";
+import CartState from "./CartState";
+export default class CartStore extends Store {
+    /**
+     * @param {CartRepository} cartRepository
+     */
+    constructor(cartRepository) {
+        super();
+        this.state = new CartState();
+        cartRepository.onChange(cart => {
+            const newState = new CartState(cart);
+            if (this.state !== newState) {
+                this.state = newState;
+                this.emitChange();
+            }
+        });
+    }
+
+    getState() {
+        return this.state;
+    }
+}
diff --git a/scripts/__tests__/store-get-state-return-object-to-flat.test.js b/scripts/__tests__/store-get-state-return-object-to-flat.test.js
@@ -11,7 +11,7 @@ describe('store-getState', () => {
             __dirname,
             'store-get-state-return-object-to-flat',
             {
-                dry: true
+                dry: false
             },
             `store-get-state-return-object-to-flat/${ test }`
         )
diff --git a/scripts/store-get-state-return-object-to-flat.js b/scripts/store-get-state-return-object-to-flat.js
@@ -78,7 +78,7 @@ module.exports = function(file, api, options) {
         return path.value.properties[0].value;
     })
     .toSource();
-    if (!options.dry) {
+    if (!options.dry && stateName && filePath) {
         updateState(outputJSONPath, stateName, filePath);
     }
     return replaced;

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ describe('store-getState', () => {`
`11`	`11`	`__dirname,`
`12`	`12`	`'store-get-state-return-object-to-flat',`
`13`	`13`	`{`
`14`		`- dry: true`
	`14`	`+ dry: false`
`15`	`15`	`},`
`16`	`16`	`store-get-state-return-object-to-flat/${ test }`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ module.exports = function(file, api, options) {`
`78`	`78`	`return path.value.properties[0].value;`
`79`	`79`	`})`
`80`	`80`	`.toSource();`
`81`		`- if (!options.dry) {`
	`81`	`+ if (!options.dry && stateName && filePath) {`
`82`	`82`	`updateState(outputJSONPath, stateName, filePath);`
`83`	`83`	`}`
`84`	`84`	`return replaced;`