base models set up

Author: matas-bitbybit-dev

packages/dev/base/lib/api/inputs/text-inputs.ts

@@ -152,51 +152,7 @@ export namespace Text {
          */
         extrudeOffset? = 0;
     }
-    export class VectorCharResultDto {
-        constructor(width?: number, height?: number, paths?: Base.Point3[][]) {
-            if (width !== undefined) { this.width = width; }
-            if (height !== undefined) { this.height = height; }
-            if (paths !== undefined) { this.paths = paths; }
-        }
-        /**
-         * The width of the char
-         * @default undefined
-         */
-        width?: number;
-        /**
-         * The height of the char
-         * @default undefined
-         */
-        height?: number;
-        /**
-         * The segments of the char
-         * @default undefined
-         */
-        paths?: Base.Point3[][];
-    }
-
-    export class VectorTextResultDto {
-        constructor(width?: number, height?: number, chars?: VectorCharResultDto[]) {
-            if (width !== undefined) { this.width = width; }
-            if (height !== undefined) { this.height = height; }
-            if (chars !== undefined) { this.chars = chars; }
-        }
-        /**
-         * The width of the char
-         * @default undefined
-         */
-        width?: number;
-        /**
-         * The height of the char
-         * @default undefined
-         */
-        height?: number;
-        /**
-         * The segments of the char
-         * @default undefined
-         */
-        chars?: VectorCharResultDto[];
-    }
+    
     export class VectorTextDto {
         constructor(text?: string, xOffset?: number, yOffset?: number, height?: number, lineSpacing?: number, letterSpacing?: number, align?: Base.horizontalAlignEnum, extrudeOffset?: number, centerOnOrigin?: boolean) {
             if (text !== undefined) { this.text = text; }

packages/dev/base/lib/api/models/index.ts

@@ -0,0 +1 @@
+export * from "./text";

packages/dev/base/lib/api/models/text/bucket.ts

@@ -0,0 +1,2 @@
+export * from "./vector-char-data";
+export * from "./vector-text-data";

packages/dev/base/lib/api/models/text/index.ts

@@ -0,0 +1 @@
+export * as Text from "./bucket";

packages/dev/base/lib/api/models/text/vector-char-data.ts

@@ -0,0 +1,24 @@
+import { Base } from "../../inputs/base-inputs";
+
+export class VectorCharData {
+    constructor(width?: number, height?: number, paths?: Base.Point3[][]) {
+        if (width !== undefined) { this.width = width; }
+        if (height !== undefined) { this.height = height; }
+        if (paths !== undefined) { this.paths = paths; }
+    }
+    /**
+     * The width of the char
+     * @default undefined
+     */
+    width?: number;
+    /**
+     * The height of the char
+     * @default undefined
+     */
+    height?: number;
+    /**
+     * The segments of the char
+     * @default undefined
+     */
+    paths?: Base.Point3[][];
+}

packages/dev/base/lib/api/models/text/vector-text-data.ts

@@ -0,0 +1,25 @@
+
+import { VectorCharData } from "./vector-char-data";
+
+export class VectorTextData {
+    constructor(width?: number, height?: number, chars?: VectorCharData[]) {
+        if (width !== undefined) { this.width = width; }
+        if (height !== undefined) { this.height = height; }
+        if (chars !== undefined) { this.chars = chars; }
+    }
+    /**
+     * The width of the char
+     * @default undefined
+     */
+    width?: number;
+    /**
+     * The height of the char
+     * @default undefined
+     */
+    height?: number;
+    /**
+     * The segments of the char
+     * @default undefined
+     */
+    chars?: VectorCharData[];
+}

packages/dev/base/lib/api/services/text.ts

@@ -1,4 +1,5 @@
 import * as Inputs from "../inputs";
+import * as Models from "../models";
 import { defaultsVectorParams } from "../models/simplex";
 import { Point } from "./point";
 
@@ -103,7 +104,7 @@ export class TextBitByBit {
      * @shortname vector char
      * @drawable false
      */
-    vectorChar(inputs: Inputs.Text.VectorCharDto): Inputs.Text.VectorCharResultDto {
+    vectorChar(inputs: Inputs.Text.VectorCharDto): Models.Text.VectorCharData {
         const {
             xOffset, yOffset, font, input, height, extrudeOffset
         } = this.vectorParamsChar(inputs);
@@ -142,7 +143,7 @@ export class TextBitByBit {
      * @shortname vector text
      * @drawable false
      */
-    vectorText(inputs: Inputs.Text.VectorTextDto): Inputs.Text.VectorTextResultDto[] {
+    vectorText(inputs: Inputs.Text.VectorTextDto): Models.Text.VectorTextData[] {
         const {
             xOffset, yOffset, height, align, extrudeOffset, lineSpacing, letterSpacing
         } = Object.assign({}, defaultsVectorParams, inputs);
@@ -155,7 +156,7 @@ export class TextBitByBit {
 
         // manage the list of lines
         let maxWidth = 0; // keep track of max width for final alignment
-        type Line = { width: number, height: number, chars: Inputs.Text.VectorCharResultDto[] };
+        type Line = { width: number, height: number, chars: Models.Text.VectorCharData[] };
         let line: Line = { width: 0, height: 0, chars: [] };
         let lines: Line[] = [];
 

packages/dev/core/lib/api/models/index.ts

@@ -1 +1 @@
-export * as OCCT from "@bitbybit-dev/occt/lib/api/models";
+export * from "@bitbybit-dev/occt/lib/api/models";

packages/dev/occt/lib/api/models/index.ts

@@ -1 +1,2 @@
-export * as OCCT from "./bucket";
+export * from "@bitbybit-dev/base/lib/api/models";
+export * as OCCT from "./bucket";

packages/dev/occt/lib/shape-parser.ts

@@ -1,5 +1,6 @@
 import { TopoDS_Shape } from "../bitbybit-dev-occt/bitbybit-dev-occt";
-import { Inputs, OCCTTransforms, Models } from "./index";
+import { Inputs, OCCTTransforms } from "./index";
+import * as Models from "./api/models";
 
 export class ShapeParser {