Merge pull request #32 from pvasek/fix/regression_v0.0.12

Fixing #31 regression issues for verison v0.0.12

Author: pvasek

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-docgen-typescript",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

src/__tests__/data/Regression_v0_0_12.tsx

@@ -0,0 +1,74 @@
+import * as React from 'react';
+
+type Coords = { x: number; y: number };
+
+export interface Props extends React.HTMLAttributes<Element> {
+  /**
+   * The x-axis value of the zoom origin, which corresponds to the mouse pointer
+   * location relative to the wrapped element without the zoom applied
+   */
+  originX: number;
+  /** The y-axis value of the zoom origin, which corresponds to the mouse pointer
+   * location relative to the wrapped element without the zoom applied
+   */
+  originY: number;
+  /** The zoom level */
+  scaleFactor: number;
+  /** Maximum zoom level */
+  maxScale?: number;
+  /** Minimum zoom level */
+  minScale?: number;
+  /**
+   * The zoom change handler for controlled components.
+   * It should update the other props in order to reflect the zoom change.
+   */
+  onZoom(
+    scale: number,
+    translateX: number,
+    translateY: number,
+  ): void;
+}
+
+type Matrix = string;
+
+interface State {
+  matrix: Matrix;
+  canZoomIn: boolean;
+  canZoomOut: boolean;
+}
+
+function getCanZoomIn({ maxScale = Infinity, scaleFactor }: Props): boolean {
+  return scaleFactor < maxScale;
+}
+
+function getCanZoomOut({ minScale = Infinity, scaleFactor }: Props): boolean {
+  return scaleFactor > minScale;
+}
+
+/** A Zoomable component wraps any DOM element and provides mouse-based
+ * zooming capabilities. Support for touch gestures is planned soon.
+ */
+export class Zoomable extends React.PureComponent<Props, State> {
+
+  render() {
+    const {
+      style,
+      className,
+      children,
+      scaleFactor,
+      onZoom,
+      minScale,
+      maxScale,
+      originX,
+      originY,
+      ...rest,
+    } = this.props;
+    const { canZoomIn, canZoomOut } = this.state;
+
+    return (
+      <div />
+    );
+  }
+}
+
+export default Zoomable;

src/__tests__/getFileDocumentation.spec.ts

@@ -292,4 +292,11 @@ describe('getFileDocumentation', () => {
         assert.equal(p1.name, 'ExternalPropsComponentProps');
         // assert.equal(p1.comment, 'ExternalPropsComponentProps props');
     });
+
+    it('Should parse file that worked in v0.0.11', function() {
+        const fileName = path.join(__dirname, '../../src/__tests__/data/Regression_v0_0_12.tsx'); // it's running in ./temp        
+        const result = getFileDocumentation(fileName);
+        assert.ok(result.components);
+    })
+
 });

src/transformAST.ts

@@ -172,18 +172,22 @@ export function transformAST(sourceFile: ts.SourceFile, checker: ts.TypeChecker)
         .map(i => {
             const type = checker.getTypeAtLocation(i.name) as ts.IntersectionType;                
             const properties: PropertyEntry[] = [];
-            type.types.forEach(t => {
-                const props = (t as any).properties;
-                let ownProperties: string[] = [];
-                if (props) {
-                    ownProperties = props
-                        .map((p: ts.Symbol) => p.getName());
-                }
-                properties.push(...getProperties(checker, t, i));
 
-                properties
-                    .forEach(p => p.isOwn = ownProperties.indexOf(p.name) > -1);
-            });
+            if (type.types) {                
+                type.types.forEach(t => {
+                    const props = (t as any).properties;
+                    let ownProperties: string[] = [];
+                    if (props) {
+                        ownProperties = props
+                            .map((p: ts.Symbol) => p.getName());
+                    }
+                    properties.push(...getProperties(checker, t, i));
+
+                    properties
+                        .forEach(p => p.isOwn = ownProperties.indexOf(p.name) > -1);
+                });
+            }
+
             const symbol = checker.getSymbolAtLocation(i.name);
             return {
                 name: i.name.getText(),