Change layout.ts to lib.ts

4 files changed, 15 insertions, 19 deletions

diff --git a/src/components/Tile.vue b/src/components/Tile.vue
index 3ca02ce..5869b6c 100644
--- a/src/components/Tile.vue
+++ b/src/components/Tile.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import {defineComponent, PropType} from 'vue';
-import {LayoutNode} from '../layout';
+import {LayoutNode} from '../lib';
 
 export default defineComponent({
 	name: 'tile',
diff --git a/src/components/TileTree.vue b/src/components/TileTree.vue
index e1b1814..461dab0 100644
--- a/src/components/TileTree.vue
+++ b/src/components/TileTree.vue
@@ -1,8 +1,12 @@
 <script lang="ts">
 import {defineComponent} from 'vue';
 import Tile from './Tile.vue';
+import {TolNode, LayoutTree, LayoutNode} from '../lib';
+import type {LayoutOptions} from '../lib';
+//regarding importing a file f1.ts:
+	//using 'import f1.ts' makes vue-tsc complain, and 'import f1.js' makes vite complain
+	//using 'import f1' might cause problems with build systems other than vite
 
-import {TolNode} from '../types';
 import tol from '../tol.json';
 function preprocessTol(tree: any): void {
 	if (!tree.children){
@@ -13,12 +17,6 @@ function preprocessTol(tree: any): void {
 }
 preprocessTol(tol);
 
-import {LayoutTree, LayoutNode} from '../layout';
-import type {LayoutOptions} from '../layout';
-//regarding importing a file f1.ts:
-	//using 'import f1.ts' makes vue-tsc complain, and 'import f1.js' makes vite complain
-	//using 'import f1' might cause problems with build systems other than vite
-
 let defaultLayoutOptions: LayoutOptions = {
 	tileSpacing: 5,
 	headerSz: 20,
diff --git a/src/layout.ts b/src/lib.ts
index 7e44b64..e5bd980 100644
--- a/src/layout.ts
+++ b/src/lib.ts
@@ -1,5 +1,11 @@
-import {TolNode} from './types';
-
+export class TolNode {
+	name: string;
+	children: TolNode[];
+	constructor(name: string, children: TolNode[] = []){
+		this.name = name;
+		this.children = children;
+	}
+}
 export class LayoutTree {
 	root: LayoutNode;
 	options: LayoutOptions;
@@ -120,7 +126,7 @@ export class SepSweptArea {
 	pos: [number, number];
 	dims: [number, number];
 	sweptLeft: boolean;
-	constructor(pos: [number, number], dims: [number, number], sweptLeft: boolean, tileSpacing: number){
+	constructor(pos: [number, number], dims: [number, number], sweptLeft: boolean){
 		this.pos = pos;
 		this.dims = dims;
 		this.sweptLeft = sweptLeft;
diff --git a/src/types.ts b/src/types.ts
deleted file mode 100644
index 87097a7..0000000
--- a/src/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export class TolNode {
-	name: string;
-	children: TolNode[];
-	constructor(name: string, children: TolNode[] = []){
-		this.name = name;
-		this.children = children;
-	}
-}