diff --git a/packages/chili-core/src/application.ts b/packages/chili-core/src/application.ts index 39918c33..bc61c7bb 100644 --- a/packages/chili-core/src/application.ts +++ b/packages/chili-core/src/application.ts @@ -2,9 +2,9 @@ import { IShapeFactory } from "chili-geo"; import { IVisualFactory } from "chili-vis"; -import { IStorage } from "./base"; import { ICommand } from "./command"; import { IDocument } from "./document"; +import { IStorage } from "./foundation"; import { Serialized } from "./serialize"; import { IService } from "./service"; diff --git a/packages/chili-core/src/command/command.ts b/packages/chili-core/src/command/command.ts index 732e0af7..29148018 100644 --- a/packages/chili-core/src/command/command.ts +++ b/packages/chili-core/src/command/command.ts @@ -1,7 +1,7 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. import { IApplication } from "../application"; -import { AsyncController, Observable, PubSub } from "../base"; +import { AsyncController, Observable, PubSub } from "../foundation"; import { Property } from "../property"; export interface ICommand { diff --git a/packages/chili-core/src/config.ts b/packages/chili-core/src/config.ts index 9fb7562d..eeedd410 100644 --- a/packages/chili-core/src/config.ts +++ b/packages/chili-core/src/config.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Color, Lazy, PubSub } from "./base"; +import { Color, Lazy, PubSub } from "./foundation"; import { ObjectSnapType } from "./snapType"; export class VisualConfig { diff --git a/packages/chili-core/src/converter/colorConverter.ts b/packages/chili-core/src/converter/colorConverter.ts index 3fc491e2..a10c0887 100644 --- a/packages/chili-core/src/converter/colorConverter.ts +++ b/packages/chili-core/src/converter/colorConverter.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Color, Result } from "../base"; +import { Color, Result } from "../foundation"; import { IConverter } from "./converter"; export class ColorConverter implements IConverter { diff --git a/packages/chili-core/src/converter/converter.ts b/packages/chili-core/src/converter/converter.ts index 2e16c237..54508f7f 100644 --- a/packages/chili-core/src/converter/converter.ts +++ b/packages/chili-core/src/converter/converter.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Result } from "../base"; +import { Result } from "../foundation"; export interface IConverter { convert(value: TFrom): Result; diff --git a/packages/chili-core/src/converter/numberConverter.ts b/packages/chili-core/src/converter/numberConverter.ts index dddb3491..133b4960 100644 --- a/packages/chili-core/src/converter/numberConverter.ts +++ b/packages/chili-core/src/converter/numberConverter.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Result } from "../base"; +import { Result } from "../foundation"; import { IConverter } from "./converter"; export class NumberConverter implements IConverter { diff --git a/packages/chili-core/src/converter/quaternionConverter.ts b/packages/chili-core/src/converter/quaternionConverter.ts index 736c8f34..674878d6 100644 --- a/packages/chili-core/src/converter/quaternionConverter.ts +++ b/packages/chili-core/src/converter/quaternionConverter.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Result } from "../base"; +import { Result } from "../foundation"; import { Quaternion } from "../math"; import { IConverter } from "./converter"; diff --git a/packages/chili-core/src/converter/stringConverter.ts b/packages/chili-core/src/converter/stringConverter.ts index 13a27df2..f7f684f3 100644 --- a/packages/chili-core/src/converter/stringConverter.ts +++ b/packages/chili-core/src/converter/stringConverter.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Result } from "../base"; +import { Result } from "../foundation"; import { IConverter } from "./converter"; export class StringConverter implements IConverter { diff --git a/packages/chili-core/src/converter/xyzConverter.ts b/packages/chili-core/src/converter/xyzConverter.ts index e2ad5168..a0108ac7 100644 --- a/packages/chili-core/src/converter/xyzConverter.ts +++ b/packages/chili-core/src/converter/xyzConverter.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Result } from "../base"; +import { Result } from "../foundation"; import { XYZ } from "../math"; import { IConverter } from "./converter"; diff --git a/packages/chili-core/src/document.ts b/packages/chili-core/src/document.ts index 25a55b57..52ae1089 100644 --- a/packages/chili-core/src/document.ts +++ b/packages/chili-core/src/document.ts @@ -1,7 +1,7 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. import { IApplication } from "./application"; -import { History, IDisposable, IPropertyChanged } from "./base"; +import { History, IDisposable, IPropertyChanged } from "./foundation"; import { INode, INodeLinkedList } from "./model/node"; import { ISelection } from "./selection"; import { ISerialize, Serialized } from "./serialize"; diff --git a/packages/chili-core/src/base/asyncController.ts b/packages/chili-core/src/foundation/asyncController.ts similarity index 100% rename from packages/chili-core/src/base/asyncController.ts rename to packages/chili-core/src/foundation/asyncController.ts diff --git a/packages/chili-core/src/base/collection.ts b/packages/chili-core/src/foundation/collection.ts similarity index 100% rename from packages/chili-core/src/base/collection.ts rename to packages/chili-core/src/foundation/collection.ts diff --git a/packages/chili-core/src/base/color.ts b/packages/chili-core/src/foundation/color.ts similarity index 100% rename from packages/chili-core/src/base/color.ts rename to packages/chili-core/src/foundation/color.ts diff --git a/packages/chili-core/src/base/disposable.ts b/packages/chili-core/src/foundation/disposable.ts similarity index 100% rename from packages/chili-core/src/base/disposable.ts rename to packages/chili-core/src/foundation/disposable.ts diff --git a/packages/chili-core/src/dto/index.ts b/packages/chili-core/src/foundation/dto/index.ts similarity index 100% rename from packages/chili-core/src/dto/index.ts rename to packages/chili-core/src/foundation/dto/index.ts diff --git a/packages/chili-core/src/base/equalityComparer.ts b/packages/chili-core/src/foundation/equalityComparer.ts similarity index 100% rename from packages/chili-core/src/base/equalityComparer.ts rename to packages/chili-core/src/foundation/equalityComparer.ts diff --git a/packages/chili-core/src/base/history.ts b/packages/chili-core/src/foundation/history.ts similarity index 100% rename from packages/chili-core/src/base/history.ts rename to packages/chili-core/src/foundation/history.ts diff --git a/packages/chili-core/src/id.ts b/packages/chili-core/src/foundation/id.ts similarity index 100% rename from packages/chili-core/src/id.ts rename to packages/chili-core/src/foundation/id.ts diff --git a/packages/chili-core/src/base/index.ts b/packages/chili-core/src/foundation/index.ts similarity index 88% rename from packages/chili-core/src/base/index.ts rename to packages/chili-core/src/foundation/index.ts index 8cc4fa0a..818a262f 100644 --- a/packages/chili-core/src/base/index.ts +++ b/packages/chili-core/src/foundation/index.ts @@ -4,8 +4,10 @@ export * from "./asyncController"; export * from "./collection"; export * from "./color"; export * from "./disposable"; +export * from "./dto"; export * from "./equalityComparer"; export * from "./history"; +export * from "./id"; export * from "./lazy"; export * from "./linkedList"; export * from "./logger"; @@ -16,3 +18,4 @@ export * from "./pubsub"; export * from "./result"; export * from "./storage"; export * from "./transaction"; +export * from "./utils"; diff --git a/packages/chili-core/src/base/lazy.ts b/packages/chili-core/src/foundation/lazy.ts similarity index 100% rename from packages/chili-core/src/base/lazy.ts rename to packages/chili-core/src/foundation/lazy.ts diff --git a/packages/chili-core/src/base/linkedList.ts b/packages/chili-core/src/foundation/linkedList.ts similarity index 100% rename from packages/chili-core/src/base/linkedList.ts rename to packages/chili-core/src/foundation/linkedList.ts diff --git a/packages/chili-core/src/base/logger.ts b/packages/chili-core/src/foundation/logger.ts similarity index 100% rename from packages/chili-core/src/base/logger.ts rename to packages/chili-core/src/foundation/logger.ts diff --git a/packages/chili-core/src/base/messageType.ts b/packages/chili-core/src/foundation/messageType.ts similarity index 100% rename from packages/chili-core/src/base/messageType.ts rename to packages/chili-core/src/foundation/messageType.ts diff --git a/packages/chili-core/src/base/observer.ts b/packages/chili-core/src/foundation/observer.ts similarity index 100% rename from packages/chili-core/src/base/observer.ts rename to packages/chili-core/src/foundation/observer.ts diff --git a/packages/chili-core/src/base/precision.ts b/packages/chili-core/src/foundation/precision.ts similarity index 100% rename from packages/chili-core/src/base/precision.ts rename to packages/chili-core/src/foundation/precision.ts diff --git a/packages/chili-core/src/base/pubsub.ts b/packages/chili-core/src/foundation/pubsub.ts similarity index 100% rename from packages/chili-core/src/base/pubsub.ts rename to packages/chili-core/src/foundation/pubsub.ts diff --git a/packages/chili-core/src/base/result.ts b/packages/chili-core/src/foundation/result.ts similarity index 100% rename from packages/chili-core/src/base/result.ts rename to packages/chili-core/src/foundation/result.ts diff --git a/packages/chili-core/src/base/storage.ts b/packages/chili-core/src/foundation/storage.ts similarity index 100% rename from packages/chili-core/src/base/storage.ts rename to packages/chili-core/src/foundation/storage.ts diff --git a/packages/chili-core/src/base/transaction.ts b/packages/chili-core/src/foundation/transaction.ts similarity index 100% rename from packages/chili-core/src/base/transaction.ts rename to packages/chili-core/src/foundation/transaction.ts diff --git a/packages/chili-core/src/utils/debounce.ts b/packages/chili-core/src/foundation/utils/debounce.ts similarity index 100% rename from packages/chili-core/src/utils/debounce.ts rename to packages/chili-core/src/foundation/utils/debounce.ts diff --git a/packages/chili-core/src/utils/download.ts b/packages/chili-core/src/foundation/utils/download.ts similarity index 100% rename from packages/chili-core/src/utils/download.ts rename to packages/chili-core/src/foundation/utils/download.ts diff --git a/packages/chili-core/src/utils/index.ts b/packages/chili-core/src/foundation/utils/index.ts similarity index 100% rename from packages/chili-core/src/utils/index.ts rename to packages/chili-core/src/foundation/utils/index.ts diff --git a/packages/chili-core/src/utils/readFileAsync.ts b/packages/chili-core/src/foundation/utils/readFileAsync.ts similarity index 98% rename from packages/chili-core/src/utils/readFileAsync.ts rename to packages/chili-core/src/foundation/utils/readFileAsync.ts index 343f1dc3..6d7248b9 100644 --- a/packages/chili-core/src/utils/readFileAsync.ts +++ b/packages/chili-core/src/foundation/utils/readFileAsync.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Result } from "../base"; +import { Result } from ".."; export interface FileData { fileName: string; diff --git a/packages/chili-core/src/geometry/meshData.ts b/packages/chili-core/src/geometry/meshData.ts index d801493d..5da7a35f 100644 --- a/packages/chili-core/src/geometry/meshData.ts +++ b/packages/chili-core/src/geometry/meshData.ts @@ -1,7 +1,7 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Color, Colors } from "../base"; import { Config } from "../config"; +import { Color, Colors } from "../foundation"; import { XYZ } from "../math"; import { LineType } from "./lineType"; import { IShape } from "./shape"; diff --git a/packages/chili-core/src/geometry/shape.ts b/packages/chili-core/src/geometry/shape.ts index 30e42fed..182f8132 100644 --- a/packages/chili-core/src/geometry/shape.ts +++ b/packages/chili-core/src/geometry/shape.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Result } from "../base"; +import { Result } from "../foundation"; import { Matrix4, Ray, XYZ } from "../math"; import { ICurve } from "./geometry"; import { IShapeMeshData } from "./meshData"; diff --git a/packages/chili-core/src/geometry/shapeConverter.ts b/packages/chili-core/src/geometry/shapeConverter.ts index 98ca3f3c..acaa777e 100644 --- a/packages/chili-core/src/geometry/shapeConverter.ts +++ b/packages/chili-core/src/geometry/shapeConverter.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Result } from "../base"; +import { Result } from "../foundation"; import { IShape } from "./shape"; export interface IShapeConverter { diff --git a/packages/chili-core/src/index.ts b/packages/chili-core/src/index.ts index 0bf8bc59..fb6dc4b8 100644 --- a/packages/chili-core/src/index.ts +++ b/packages/chili-core/src/index.ts @@ -1,17 +1,15 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. export * from "./application"; -export * from "./base"; export * from "./command"; export * from "./config"; export * from "./constants"; export * from "./converter"; export * from "./document"; -export * from "./dto"; export * from "./editor"; +export * from "./foundation"; export * from "./geometry"; export * from "./i18n"; -export * from "./id"; export * from "./math"; export * from "./model"; export * from "./property"; @@ -20,5 +18,4 @@ export * from "./selectionFilter"; export * from "./serialize"; export * from "./service"; export * from "./snapType"; -export * from "./utils"; export * from "./visual"; diff --git a/packages/chili-core/src/math/mathUtils.ts b/packages/chili-core/src/math/mathUtils.ts index 86193a96..6b8a6e78 100644 --- a/packages/chili-core/src/math/mathUtils.ts +++ b/packages/chili-core/src/math/mathUtils.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Precision } from "../base"; +import { Precision } from "../foundation"; export class MathUtils { static degToRad(degrees: number) { diff --git a/packages/chili-core/src/math/planeAngle.ts b/packages/chili-core/src/math/planeAngle.ts index 2c5f6d2b..f09a02c9 100644 --- a/packages/chili-core/src/math/planeAngle.ts +++ b/packages/chili-core/src/math/planeAngle.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Precision } from "../base"; +import { Precision } from "../foundation"; import { Plane } from "./plane"; import { XYZ } from "./xyz"; diff --git a/packages/chili-core/src/math/xy.ts b/packages/chili-core/src/math/xy.ts index e64c3e2d..6f6d377b 100644 --- a/packages/chili-core/src/math/xy.ts +++ b/packages/chili-core/src/math/xy.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Precision } from "../base"; +import { Precision } from "../foundation"; import { MathUtils } from "./mathUtils"; export class XY { diff --git a/packages/chili-core/src/math/xyz.ts b/packages/chili-core/src/math/xyz.ts index c1dfcea5..dfcb763c 100644 --- a/packages/chili-core/src/math/xyz.ts +++ b/packages/chili-core/src/math/xyz.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Precision } from "../base"; +import { Precision } from "../foundation"; import { Serializer } from "../serialize"; import { MathUtils } from "./mathUtils"; diff --git a/packages/chili-core/src/model/entity.ts b/packages/chili-core/src/model/entity.ts index b25aa5d9..1ca067b5 100644 --- a/packages/chili-core/src/model/entity.ts +++ b/packages/chili-core/src/model/entity.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { HistoryObservable, IEqualityComparer, Result } from "../base"; +import { HistoryObservable, IEqualityComparer, Result } from "../foundation"; import { IShape } from "../geometry"; import { I18nKeys } from "../i18n"; diff --git a/packages/chili-core/src/model/model.ts b/packages/chili-core/src/model/model.ts index 33384676..9e5f0c7f 100644 --- a/packages/chili-core/src/model/model.ts +++ b/packages/chili-core/src/model/model.ts @@ -1,9 +1,9 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Color, Colors, Logger } from "../base"; import { IDocument } from "../document"; +import { Color, Colors, Logger } from "../foundation"; +import { Id } from "../foundation/id"; import { ICompound, IShape } from "../geometry"; -import { Id } from "../id"; import { Matrix4 } from "../math"; import { Property } from "../property"; import { Serializer } from "../serialize"; diff --git a/packages/chili-core/src/model/node.ts b/packages/chili-core/src/model/node.ts index 23fd398d..e26da7f4 100644 --- a/packages/chili-core/src/model/node.ts +++ b/packages/chili-core/src/model/node.ts @@ -1,9 +1,9 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Color, HistoryObservable, IDisposable, IPropertyChanged } from "../base"; import { IDocument } from "../document"; +import { Color, HistoryObservable, IDisposable, IPropertyChanged } from "../foundation"; +import { Id } from "../foundation/id"; import { IShape } from "../geometry"; -import { Id } from "../id"; import { Matrix4 } from "../math"; import { Property } from "../property"; import { Serialized, Serializer } from "../serialize"; diff --git a/packages/chili-core/src/model/nodeLinkedList.ts b/packages/chili-core/src/model/nodeLinkedList.ts index 0cb258e2..6c349218 100644 --- a/packages/chili-core/src/model/nodeLinkedList.ts +++ b/packages/chili-core/src/model/nodeLinkedList.ts @@ -1,8 +1,15 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Logger, NodeAction, NodeLinkedListHistoryRecord, NodeRecord, PubSub, Transaction } from "../base"; import { IDocument } from "../document"; -import { Id } from "../id"; +import { + Logger, + NodeAction, + NodeLinkedListHistoryRecord, + NodeRecord, + PubSub, + Transaction, +} from "../foundation"; +import { Id } from "../foundation/id"; import { Serializer } from "../serialize"; import { INode, INodeLinkedList, Node } from "./node"; diff --git a/packages/chili-core/src/selection.ts b/packages/chili-core/src/selection.ts index 9f525bc9..760293d9 100644 --- a/packages/chili-core/src/selection.ts +++ b/packages/chili-core/src/selection.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { AsyncController, IDisposable } from "./base"; +import { AsyncController, IDisposable } from "./foundation"; import { ShapeType } from "./geometry"; import { I18nKeys } from "./i18n"; import { IModel, INode } from "./model"; diff --git a/packages/chili-core/src/visual/eventHandler.ts b/packages/chili-core/src/visual/eventHandler.ts index 4aabd071..8f185c47 100644 --- a/packages/chili-core/src/visual/eventHandler.ts +++ b/packages/chili-core/src/visual/eventHandler.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { IDisposable } from "../base"; +import { IDisposable } from "../foundation"; import { IView } from "./view"; export interface IEventHandler extends IDisposable { diff --git a/packages/chili-core/src/visual/textGenerator.ts b/packages/chili-core/src/visual/textGenerator.ts index 60842c87..568b6d45 100644 --- a/packages/chili-core/src/visual/textGenerator.ts +++ b/packages/chili-core/src/visual/textGenerator.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Color } from "../base"; +import { Color } from "../foundation"; import { IVisualObject } from "./visualObject"; export interface ITextGenerator { diff --git a/packages/chili-core/src/visual/view.ts b/packages/chili-core/src/visual/view.ts index e573aa69..cad8f738 100644 --- a/packages/chili-core/src/visual/view.ts +++ b/packages/chili-core/src/visual/view.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { IDisposable, IPropertyChanged } from "../base"; +import { IDisposable, IPropertyChanged } from "../foundation"; import { ShapeType } from "../geometry"; import { Plane, Ray, XY, XYZ } from "../math"; import { IShapeFilter } from "../selectionFilter"; diff --git a/packages/chili-core/src/visual/viewer.ts b/packages/chili-core/src/visual/viewer.ts index 364fbd3b..8965230c 100644 --- a/packages/chili-core/src/visual/viewer.ts +++ b/packages/chili-core/src/visual/viewer.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { IDisposable } from "../base"; +import { IDisposable } from "../foundation"; import { Plane } from "../math"; import { CursorType } from "./cursorType"; import { IView } from "./view"; diff --git a/packages/chili-core/src/visual/visual.ts b/packages/chili-core/src/visual/visual.ts index a4fcb096..b0ec9fda 100644 --- a/packages/chili-core/src/visual/visual.ts +++ b/packages/chili-core/src/visual/visual.ts @@ -1,7 +1,7 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { IDisposable } from "../base"; import { IDocument } from "../document"; +import { IDisposable } from "../foundation"; import { IEventHandler } from "./eventHandler"; import { IHighlighter } from "./highlighter"; import { ITextGenerator } from "./textGenerator"; diff --git a/packages/chili-core/src/visual/visualContext.ts b/packages/chili-core/src/visual/visualContext.ts index c00d5d61..d1674cf2 100644 --- a/packages/chili-core/src/visual/visualContext.ts +++ b/packages/chili-core/src/visual/visualContext.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { IDisposable } from "../base"; +import { IDisposable } from "../foundation"; import { ShapeMeshData } from "../geometry"; import { IModel } from "../model"; import { IVisualObject } from "./visualObject"; diff --git a/packages/chili-core/src/visual/visualShape.ts b/packages/chili-core/src/visual/visualShape.ts index fdf70584..afec2214 100644 --- a/packages/chili-core/src/visual/visualShape.ts +++ b/packages/chili-core/src/visual/visualShape.ts @@ -1,6 +1,6 @@ // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license. -import { Color } from "../base"; +import { Color } from "../foundation"; import { IShape, ShapeType } from "../geometry"; import { IVisualObject } from "./visualObject";