Release package version 0.0.3

Added color parse and color interfaces

lib/src/interfaces/color.ts

@@ -0,0 +1,13 @@
+export type ColorType = "rgb";
+
+export interface IColor {
+  type: ColorType;
+}
+
+export interface IRgbColor extends IColor {
+  type: "rgb";
+  r: number;
+  g: number;
+  b: number;
+  a: number;
+}

lib/src/interfaces/fill.ts

@@ -1,4 +1,4 @@
-import { IColor } from "@gxc-solutions/colors";
+import { IColor } from "./color";
 
 export type FillType = "solid" | "texture";
 export type GradientType = "liner" | "radial" | "conic";

lib/src/interfaces/index.ts

@@ -1,3 +1,4 @@
 export * from "./fill";
 export * from "./models";
 export * from "./stroke";
+export * from "./color";

lib/src/interfaces/models.ts

@@ -1,7 +1,7 @@
 import { UUID_V4 } from "@gxc-solutions/lett-js";
+import { IPoint } from "@gxc-solutions/math";
 import { ISolidFill } from "./fill";
 import { IStroke } from "./stroke";
-import { IPoint } from "@gxc-solutions/math";
 
 export type ModelConstructor = new (...args: any[]) => IModel;
 

lib/src/interfaces/stroke.ts

@@ -1,4 +1,4 @@
-import { IColor } from "@gxc-solutions/colors";
+import { IColor } from "./color";
 
 export interface IStroke {
   width: number;

lib/src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gxc-solutions/model-base",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "index.js",
   "author": "GXC Solutions",
   "publishConfig": {

lib/src/parser.ts

@@ -1,13 +1,16 @@
 import { _switch } from "@gxc-solutions/lett-js";
 import {
+  ColorType,
   FillType,
   GradientType,
   IBaseFill,
+  IColor,
   IEllipseModel,
   IImageModel,
   IModel,
   IRectangle,
   IRectangleModel,
+  IRgbColor,
   ISolidFill,
   IStroke,
   ITransform,
@@ -19,6 +22,7 @@ import { Stroke } from "./models/stroke";
 import { SolidFill } from "./models/solid-fill";
 import { Ellipse, Rectangle, Transform } from "@gxc-solutions/math";
 import { RectangleItem } from "./models/objects/rectangle";
+import { RgbColor } from "@gxc-solutions/colors";
 
 export class Parser {
   constructor() {}
@@ -74,14 +78,25 @@ export class Parser {
   }
 
   parseStroke(strokeObj: IStroke) {
-    return new Stroke(strokeObj.width, strokeObj.color, strokeObj.dash);
+    const color = this.parseColor(strokeObj.color);
+    return new Stroke(strokeObj.width, color, strokeObj.dash);
   }
 
   parseFill(fillObj: IBaseFill) {
     return _switch<GradientType | FillType, SolidFill>(fillObj.type)
       .case("solid", () => {
         const solidFillObj = fillObj as ISolidFill;
-        return new SolidFill(solidFillObj.color);
+        const color = this.parseColor(solidFillObj.color);
+        return new SolidFill(color);
+      })
+      .result();
+  }
+
+  parseColor(colorObj: IColor) {
+    return _switch<ColorType, RgbColor>(colorObj.type)
+      .case("rgb", () => {
+        const { a, b, g, r } = colorObj as IRgbColor;
+        return new RgbColor(r, g, b, a);
       })
       .result();
   }