fix: 修复循环问题

Author: arvinxx

src/function/nodeToSketchGroup.ts

@@ -2,7 +2,7 @@ import nodeToSketchLayers from './nodeToSketchLayers';
 import { isNodeVisible } from '../helpers/visibility';
 import { getName } from '../helpers/name';
 import { Group, Style } from '../model';
-import { AnyLayer } from '../model/utils';
+import { AnyLayer } from '../model/type';
 
 import { isExistPseudo } from '../helpers/shape';
 

src/function/nodeToSketchLayers.ts

@@ -3,11 +3,11 @@ import { defaultNodeStyle } from '../model/utils';
 import transferToSvg from '../parser/svg';
 import transferToShape from '../parser/shape';
 import transferToText from '../parser/text';
-import praserPseudo from '../parser/pseudo';
+import parserPseudo from '../parser/pseudo';
 
 import { isTextVisible } from '../helpers/visibility';
 import { isTextNode } from '../helpers/nodeType';
-import { AnyLayer } from '../model/utils';
+import { AnyLayer } from '../model/type';
 import { isExistPseudo } from '../helpers/shape';
 
 /**
@@ -73,7 +73,7 @@ const nodeToSketchLayers = (node: Element): AnyLayer[] => {
   // 如果图层存在样式(阴影 边框等 返回 shape 节点
   if (isImage || isShape || isExistPseudo(node)) {
     // 判断一下是否有伪类
-    const afterEl = praserPseudo(node, 'after');
+    const afterEl = parserPseudo(node, 'after');
     console.log(afterEl);
 
     if (afterEl) {
@@ -88,7 +88,7 @@ const nodeToSketchLayers = (node: Element): AnyLayer[] => {
     }
 
     // 判断一下是否有伪类
-    const beforeEl = praserPseudo(node, 'before');
+    const beforeEl = parserPseudo(node, 'before');
     console.log(beforeEl);
 
     if (beforeEl) {

src/index.ts

@@ -9,5 +9,3 @@ export interface CGPoint {
   x: number;
   y: number;
 }
-
-export { default as SketchFormat } from '@sketch-hq/sketch-file-format-ts';

src/model/Frame.ts

@@ -1,10 +1,10 @@
-import { SketchFormat } from '../index';
+import SketchFormat from '@sketch-hq/sketch-file-format-ts';
 
 export interface FrameInitParams {
   x?: number;
   y?: number;
-  width: number;
-  height: number;
+  width?: number;
+  height?: number;
 }
 /**
  * @class
@@ -17,15 +17,24 @@ class Frame {
   height: number;
 
   constructor(params: FrameInitParams) {
-    const { height, width, x = 0, y = 0 } = params;
+    const { height = 0, width = 0, x = 0, y = 0 } = params;
     this.x = x;
     this.y = y;
     this.width = width;
     this.height = height;
   }
 
   /**
-   * 转为 Sketch JSON对象
+   * 转换为 JSON 对象
+   */
+  toJSON = () => ({
+    height: this.height,
+    width: this.width,
+    x: this.x,
+    y: this.y,
+  });
+  /**
+   * 转为 Sketch JSON 对象
    */
   toSketchJSON = (): SketchFormat.Rect => {
     return {

src/model/Layer/Artboard.ts

@@ -1,4 +1,4 @@
-import { SketchFormat } from '../../index';
+import SketchFormat from '@sketch-hq/sketch-file-format-ts';
 
 import Base, { BaseLayerParams } from './Base';
 import { defaultRuleData, defaultExportOptions } from '../utils';

src/model/Layer/Base.ts

@@ -1,20 +1,24 @@
-import { SketchFormat } from '../../index';
 import uuid from '../../helpers/uuid';
 import Frame from '../Frame';
 import Style from '../Style/Style';
 import {
   calculateResizingConstraintValue,
   RESIZING_CONSTRAINTS,
 } from '../../helpers/layout';
-import { AnyLayer } from '../utils';
+import { AnyLayer } from '../type';
+import SketchFormat from '@sketch-hq/sketch-file-format-ts';
 
 const DEFAULT_USER_INFO_SCOPE = 'html2sketch';
 
+export interface ToSketchJSON<T> {
+  toSketchJSON: () => T;
+}
+
 export interface BaseLayerParams {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
+  x?: number;
+  y?: number;
+  width?: number;
+  height?: number;
 }
 class Base {
   constructor(params: BaseLayerParams) {
@@ -207,8 +211,6 @@ class Base {
     };
   };
 
-
-
   /**
    * 解析 Border string 圆角
    * @param borderRadius

src/model/Layer/Bitmap.ts

@@ -1,4 +1,4 @@
-import { SketchFormat } from '../../index';
+import SketchFormat from '@sketch-hq/sketch-file-format-ts';
 import Base, { BaseLayerParams } from './Base';
 import { sketchImage, defaultExportOptions } from '../utils';
 

src/model/Layer/Group.ts

@@ -1,7 +1,8 @@
-import { SketchFormat } from '../../index';
+import SketchFormat from '@sketch-hq/sketch-file-format-ts';
 import Base, { BaseLayerParams } from './Base';
-import { defaultExportOptions, AnyLayer } from '../utils';
+import { defaultExportOptions } from '../utils';
 import { getGroupLayout } from '../../helpers/layout';
+import { AnyLayer } from '../type';
 
 class Group extends Base {
   constructor(params: BaseLayerParams) {

src/model/Layer/Page.ts

@@ -1,6 +1,6 @@
 import Base, { BaseLayerParams } from './Base';
 import { defaultRuleData, defaultExportOptions } from '../utils';
-import { SketchFormat } from '../../index';
+import SketchFormat from '@sketch-hq/sketch-file-format-ts';
 
 interface PageInitParams extends Pick<BaseLayerParams, 'height' | 'width'> {}
 

src/model/Layer/Rectangle.ts

@@ -1,6 +1,6 @@
 import FileFormat from '@sketch-hq/sketch-file-format-ts';
 import Base, { BaseLayerParams } from './Base';
-import { SketchFormat } from '../..';
+import SketchFormat from '@sketch-hq/sketch-file-format-ts';
 import { defaultExportOptions } from '../utils';
 
 type CornerRadius =