From 43f3feddbba60193d2476f1be4b23069acf129d6 Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Sat, 13 Aug 2022 02:57:38 -0700 Subject: [PATCH] rename plugin to bundle --- modules/context/index.ts | 2 +- .../examples/features/occ_bottle/index.ts | 2 +- .../actions/getVolume/getVolume.action.ts | 2 +- .../features/boolean/boolean.operation.ts | 2 +- .../deleteBody/deleteBody.operation.ts | 2 +- .../features/extrude/extrude.operation.ts | 2 +- .../features/fillet/fillet.operation.ts | 2 +- .../modeler/features/hole/Hole.operation.ts | 2 +- .../importModel/importModel.operation.ts | 2 +- .../modeler/features/loft/loft.operation.ts | 2 +- .../mirrorBody/mirrorBody.operation.ts | 2 +- .../patternLinear/patternLinear.operation.ts | 2 +- .../patternRadial/patternRadial.operation.ts | 2 +- .../primitiveBox/primitiveBox.operation.ts | 2 +- .../primitiveCone/PrimitiveCone.operation.ts | 2 +- .../PrimitiveCylinder.operation.ts | 2 +- .../PrimitiveSphere.operation.ts | 2 +- .../PrimitiveTorus.operation.ts | 2 +- .../features/revolve/revolve.operation.ts | 2 +- .../features/scaleBody/scaleBody.operation.ts | 2 +- .../modeler/features/shell/shell.operation.ts | 2 +- .../modeler/features/sweep/sweep.operation.ts | 2 +- .../features/smFlange/smFlange.operation.ts | 2 +- .../features/smTab/smTab.operation.ts | 2 +- ...nSystemPlugin.ts => actionSystemBundle.ts} | 2 +- .../{assemblyPlugin.ts => assemblyBundle.ts} | 0 web/app/cad/assembly/assemblySolver.ts | 2 +- ...ttributesPlugin.ts => attributesBundle.ts} | 6 +-- web/app/cad/context/index.ts | 48 ++++++++--------- ...RegistryPlugin.ts => cadRegistryBundle.ts} | 0 .../craft/{craftPlugin.ts => craftBundle.ts} | 0 web/app/cad/craft/e0/OCCUtils.ts | 2 +- .../craft/e0/{occtPlugin.ts => occtBundle.ts} | 0 web/app/cad/craft/extensionsPlugin.js | 2 +- ...{operationPlugin.ts => operationBundle.ts} | 4 +- web/app/cad/craft/operationHelper.ts | 2 +- .../{wizardPlugin.ts => wizardBundle.ts} | 4 +- .../cad/craft/wizard/wizardSelectionPlugin.ts | 6 +-- web/app/cad/craft/wizard/wizardTypes.ts | 4 +- .../{appTabsPlugin.ts => appTabsBundle.ts} | 0 web/app/cad/dom/components/SelectionView.tsx | 2 +- .../cad/dom/{domPlugin.ts => domBundle.ts} | 4 +- web/app/cad/dom/{uiPlugin.ts => uiBundle.ts} | 0 ...ressionsPlugin.ts => expressionsBundle.ts} | 0 web/app/cad/init/startApplication.js | 54 +++++++++---------- .../{LocationPlugin.ts => LocationBundle.ts} | 0 .../importPartOperation.ts | 4 +- ...otePartsPlugin.ts => remotePartsBundle.ts} | 14 ++--- web/app/cad/partImport/remotePartsConfig.ts | 2 +- web/app/cad/partImport/ui/PartCatalog.tsx | 2 +- web/app/cad/plugins.js | 4 +- .../{projectPlugin.ts => projectBundle.ts} | 2 +- ...nagerPlugin.ts => projectManagerBundle.ts} | 4 +- ...ontextPlugin.ts => entityContextBundle.ts} | 0 ...{highlightPlugin.ts => highlightBundle.ts} | 2 +- .../scene/{scenePlugin.ts => sceneBundle.ts} | 0 ...toragePlugin.ts => sketchStorageBundle.ts} | 0 .../{sketcherPlugin.ts => sketcherBundle.ts} | 0 .../{storagePlugin.ts => storageBundle.ts} | 0 ...{workbenchPlugin.ts => workbenchBundle.ts} | 2 +- web/app/cad/workbench/workbenchService.ts | 6 +-- .../cad/workbench/workbenchesLoaderPlugin.ts | 2 +- 62 files changed, 117 insertions(+), 117 deletions(-) rename web/app/cad/actions/{actionSystemPlugin.ts => actionSystemBundle.ts} (99%) rename web/app/cad/assembly/{assemblyPlugin.ts => assemblyBundle.ts} (100%) rename web/app/cad/attributes/{attributesPlugin.ts => attributesBundle.ts} (90%) rename web/app/cad/craft/{cadRegistryPlugin.ts => cadRegistryBundle.ts} (100%) rename web/app/cad/craft/{craftPlugin.ts => craftBundle.ts} (100%) rename web/app/cad/craft/e0/{occtPlugin.ts => occtBundle.ts} (100%) rename web/app/cad/craft/{operationPlugin.ts => operationBundle.ts} (98%) rename web/app/cad/craft/wizard/{wizardPlugin.ts => wizardBundle.ts} (97%) rename web/app/cad/dom/{appTabsPlugin.ts => appTabsBundle.ts} (100%) rename web/app/cad/dom/{domPlugin.ts => domBundle.ts} (91%) rename web/app/cad/dom/{uiPlugin.ts => uiBundle.ts} (100%) rename web/app/cad/expressions/{expressionsPlugin.ts => expressionsBundle.ts} (100%) rename web/app/cad/location/{LocationPlugin.ts => LocationBundle.ts} (100%) rename web/app/cad/partImport/{remotePartsPlugin.ts => remotePartsBundle.ts} (95%) rename web/app/cad/{projectPlugin.ts => projectBundle.ts} (98%) rename web/app/cad/projectManager/{projectManagerPlugin.ts => projectManagerBundle.ts} (98%) rename web/app/cad/scene/{entityContextPlugin.ts => entityContextBundle.ts} (100%) rename web/app/cad/scene/{highlightPlugin.ts => highlightBundle.ts} (96%) rename web/app/cad/scene/{scenePlugin.ts => sceneBundle.ts} (100%) rename web/app/cad/sketch/{sketchStoragePlugin.ts => sketchStorageBundle.ts} (100%) rename web/app/cad/sketch/{sketcherPlugin.ts => sketcherBundle.ts} (100%) rename web/app/cad/storage/{storagePlugin.ts => storageBundle.ts} (100%) rename web/app/cad/workbench/{workbenchPlugin.ts => workbenchBundle.ts} (96%) diff --git a/modules/context/index.ts b/modules/context/index.ts index 86f343e8..cde39749 100644 --- a/modules/context/index.ts +++ b/modules/context/index.ts @@ -1,4 +1,4 @@ -import {ProjectService} from "cad/projectPlugin"; +import {ProjectService} from "cad/projectBundle"; export interface LegacyContext { services: any, diff --git a/modules/workbenches/examples/features/occ_bottle/index.ts b/modules/workbenches/examples/features/occ_bottle/index.ts index df40ce35..fec44926 100644 --- a/modules/workbenches/examples/features/occ_bottle/index.ts +++ b/modules/workbenches/examples/features/occ_bottle/index.ts @@ -4,7 +4,7 @@ import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; import {createOCCBottle} from './bottle.occ'; import {occ2brep} from 'cad/occ/occ2models'; import icon from './icon.svg'; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; export const OCCBottle:OperationDescriptor = { id: 'OCC_BOTTLE', diff --git a/modules/workbenches/modeler/actions/getVolume/getVolume.action.ts b/modules/workbenches/modeler/actions/getVolume/getVolume.action.ts index 45a15439..897d2b4c 100644 --- a/modules/workbenches/modeler/actions/getVolume/getVolume.action.ts +++ b/modules/workbenches/modeler/actions/getVolume/getVolume.action.ts @@ -1,7 +1,7 @@ import {MShell} from "cad/model/mshell"; import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; -import {ActionDefinition} from "cad/actions/actionSystemPlugin"; +import {ActionDefinition} from "cad/actions/actionSystemBundle"; interface getVolumeParams { diff --git a/modules/workbenches/modeler/features/boolean/boolean.operation.ts b/modules/workbenches/modeler/features/boolean/boolean.operation.ts index c5c70b0c..fb2d9a62 100644 --- a/modules/workbenches/modeler/features/boolean/boolean.operation.ts +++ b/modules/workbenches/modeler/features/boolean/boolean.operation.ts @@ -2,7 +2,7 @@ import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; interface BooleanParams { tools: []; diff --git a/modules/workbenches/modeler/features/deleteBody/deleteBody.operation.ts b/modules/workbenches/modeler/features/deleteBody/deleteBody.operation.ts index ce5430e5..becdb480 100644 --- a/modules/workbenches/modeler/features/deleteBody/deleteBody.operation.ts +++ b/modules/workbenches/modeler/features/deleteBody/deleteBody.operation.ts @@ -1,7 +1,7 @@ import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {MShell} from "cad/model/mshell"; interface DeleteBodyParams { diff --git a/modules/workbenches/modeler/features/extrude/extrude.operation.ts b/modules/workbenches/modeler/features/extrude/extrude.operation.ts index e0a378dc..f273f5f4 100644 --- a/modules/workbenches/modeler/features/extrude/extrude.operation.ts +++ b/modules/workbenches/modeler/features/extrude/extrude.operation.ts @@ -4,7 +4,7 @@ import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition"; import {UnitVector} from "math/vector"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {MObject} from "cad/model/mobject"; import {FaceRef} from "cad/craft/e0/OCCUtils"; import {FromSketchProductionAnalyzer, PushPullFaceProductionAnalyzer} from "cad/craft/production/productionAnalyzer"; diff --git a/modules/workbenches/modeler/features/fillet/fillet.operation.ts b/modules/workbenches/modeler/features/fillet/fillet.operation.ts index abbcc26c..c599f8be 100644 --- a/modules/workbenches/modeler/features/fillet/fillet.operation.ts +++ b/modules/workbenches/modeler/features/fillet/fillet.operation.ts @@ -2,7 +2,7 @@ import {ApplicationContext} from 'cad/context'; import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; import {EntityKind} from "cad/model/entities"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {FromMObjectProductionAnalyzer} from "cad/craft/production/productionAnalyzer"; import {MEdge} from "cad/model/medge"; import {MObject} from "cad/model/mobject"; diff --git a/modules/workbenches/modeler/features/hole/Hole.operation.ts b/modules/workbenches/modeler/features/hole/Hole.operation.ts index e55d92b1..6b180acd 100644 --- a/modules/workbenches/modeler/features/hole/Hole.operation.ts +++ b/modules/workbenches/modeler/features/hole/Hole.operation.ts @@ -1,7 +1,7 @@ import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {SetLocation} from "cad/craft/e0/interact"; import {MDatum} from "cad/model/mdatum"; diff --git a/modules/workbenches/modeler/features/importModel/importModel.operation.ts b/modules/workbenches/modeler/features/importModel/importModel.operation.ts index 8a5d4b95..57b59add 100644 --- a/modules/workbenches/modeler/features/importModel/importModel.operation.ts +++ b/modules/workbenches/modeler/features/importModel/importModel.operation.ts @@ -1,5 +1,5 @@ import {ApplicationContext} from "cad/context"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {LocalFile, LocalFileAdapter} from "ui/components/controls/FileControl"; import CadError from "../../../../../web/app/utils/errors"; import {parseStringPromise} from 'xml2js'; diff --git a/modules/workbenches/modeler/features/loft/loft.operation.ts b/modules/workbenches/modeler/features/loft/loft.operation.ts index fa6999dc..efb64f0c 100644 --- a/modules/workbenches/modeler/features/loft/loft.operation.ts +++ b/modules/workbenches/modeler/features/loft/loft.operation.ts @@ -2,7 +2,7 @@ import { roundValueForPresentation as r } from 'cad/craft/operationHelper'; import { ApplicationContext } from "cad/context"; import { EntityKind } from "cad/model/entities"; import { BooleanDefinition } from "cad/craft/schema/common/BooleanDefinition"; -import { OperationDescriptor } from "cad/craft/operationPlugin"; +import { OperationDescriptor } from "cad/craft/operationBundle"; import { MSketchLoop } from "cad/model/mloop"; import { FromSketchProductionAnalyzer } from "cad/craft/production/productionAnalyzer"; import {FaceRef} from "cad/craft/e0/OCCUtils"; diff --git a/modules/workbenches/modeler/features/mirrorBody/mirrorBody.operation.ts b/modules/workbenches/modeler/features/mirrorBody/mirrorBody.operation.ts index dedeb924..eb1fd101 100644 --- a/modules/workbenches/modeler/features/mirrorBody/mirrorBody.operation.ts +++ b/modules/workbenches/modeler/features/mirrorBody/mirrorBody.operation.ts @@ -3,7 +3,7 @@ import { MFace } from "cad/model/mface"; import { ApplicationContext } from "cad/context"; import { EntityKind } from "cad/model/entities"; import Axis from "math/axis"; -import { OperationDescriptor } from "cad/craft/operationPlugin"; +import { OperationDescriptor } from "cad/craft/operationBundle"; import { MShell } from 'cad/model/mshell'; interface MirrorBodyParams { diff --git a/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts b/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts index 167cb58f..21ad7eda 100644 --- a/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts +++ b/modules/workbenches/modeler/features/patternLinear/patternLinear.operation.ts @@ -4,7 +4,7 @@ import { ApplicationContext } from "cad/context"; import { EntityKind } from "cad/model/entities"; import Axis from "math/axis"; import { UnitVector } from "math/vector"; -import { OperationDescriptor } from "cad/craft/operationPlugin"; +import { OperationDescriptor } from "cad/craft/operationBundle"; import { MShell } from 'cad/model/mshell'; import { MDatum } from "cad/model/mdatum"; import {Matrix3x4} from "math/matrix"; diff --git a/modules/workbenches/modeler/features/patternRadial/patternRadial.operation.ts b/modules/workbenches/modeler/features/patternRadial/patternRadial.operation.ts index e9d51c8a..b7684da5 100644 --- a/modules/workbenches/modeler/features/patternRadial/patternRadial.operation.ts +++ b/modules/workbenches/modeler/features/patternRadial/patternRadial.operation.ts @@ -3,7 +3,7 @@ import {MFace} from "cad/model/mface"; import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; import Axis from "math/axis"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {MShell} from 'cad/model/mshell'; import {Matrix3x4} from "math/matrix"; import {AddLocation, SetLocation} from "cad/craft/e0/interact"; diff --git a/modules/workbenches/modeler/features/primitiveBox/primitiveBox.operation.ts b/modules/workbenches/modeler/features/primitiveBox/primitiveBox.operation.ts index 3f2bdd0d..8b2ded14 100644 --- a/modules/workbenches/modeler/features/primitiveBox/primitiveBox.operation.ts +++ b/modules/workbenches/modeler/features/primitiveBox/primitiveBox.operation.ts @@ -2,7 +2,7 @@ import {ApplicationContext} from 'cad/context'; import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; import {EntityKind} from "cad/model/entities"; import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import CSys from "math/csys"; import {MDatum} from "cad/model/mdatum"; import {ExpectedOrderProductionAnalyzer} from "cad/craft/production/productionAnalyzer"; diff --git a/modules/workbenches/modeler/features/primitiveCone/PrimitiveCone.operation.ts b/modules/workbenches/modeler/features/primitiveCone/PrimitiveCone.operation.ts index 02809753..029df4a4 100644 --- a/modules/workbenches/modeler/features/primitiveCone/PrimitiveCone.operation.ts +++ b/modules/workbenches/modeler/features/primitiveCone/PrimitiveCone.operation.ts @@ -2,7 +2,7 @@ import { ApplicationContext } from 'cad/context'; import { roundValueForPresentation as r } from 'cad/craft/operationHelper'; import { EntityKind } from "cad/model/entities"; import { BooleanDefinition } from "cad/craft/schema/common/BooleanDefinition"; -import { OperationDescriptor } from "cad/craft/operationPlugin"; +import { OperationDescriptor } from "cad/craft/operationBundle"; import { MDatum } from "cad/model/mdatum"; import CSys from "math/csys"; import { ExpectedOrderProductionAnalyzer } from "cad/craft/production/productionAnalyzer"; diff --git a/modules/workbenches/modeler/features/primitiveCylinder/PrimitiveCylinder.operation.ts b/modules/workbenches/modeler/features/primitiveCylinder/PrimitiveCylinder.operation.ts index 7217e95a..1587934b 100644 --- a/modules/workbenches/modeler/features/primitiveCylinder/PrimitiveCylinder.operation.ts +++ b/modules/workbenches/modeler/features/primitiveCylinder/PrimitiveCylinder.operation.ts @@ -2,7 +2,7 @@ import {ApplicationContext} from 'cad/context'; import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; import {EntityKind} from "cad/model/entities"; import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {MDatum} from "cad/model/mdatum"; import CSys from "math/csys"; import { ExpectedOrderProductionAnalyzer } from "cad/craft/production/productionAnalyzer"; diff --git a/modules/workbenches/modeler/features/primitiveSphere/PrimitiveSphere.operation.ts b/modules/workbenches/modeler/features/primitiveSphere/PrimitiveSphere.operation.ts index f0aba6e5..001b45d9 100644 --- a/modules/workbenches/modeler/features/primitiveSphere/PrimitiveSphere.operation.ts +++ b/modules/workbenches/modeler/features/primitiveSphere/PrimitiveSphere.operation.ts @@ -2,7 +2,7 @@ import {ApplicationContext} from 'cad/context'; import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; import {EntityKind} from "cad/model/entities"; import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {MDatum} from "cad/model/mdatum"; import CSys from "math/csys"; import { ExpectedOrderProductionAnalyzer } from "cad/craft/production/productionAnalyzer"; diff --git a/modules/workbenches/modeler/features/primitiveTorus/PrimitiveTorus.operation.ts b/modules/workbenches/modeler/features/primitiveTorus/PrimitiveTorus.operation.ts index 5c256dce..5b3df787 100644 --- a/modules/workbenches/modeler/features/primitiveTorus/PrimitiveTorus.operation.ts +++ b/modules/workbenches/modeler/features/primitiveTorus/PrimitiveTorus.operation.ts @@ -2,7 +2,7 @@ import { ApplicationContext } from 'cad/context'; import { roundValueForPresentation as r } from 'cad/craft/operationHelper'; import { EntityKind } from "cad/model/entities"; import { BooleanDefinition } from "cad/craft/schema/common/BooleanDefinition"; -import { OperationDescriptor } from "cad/craft/operationPlugin"; +import { OperationDescriptor } from "cad/craft/operationBundle"; import { MDatum } from "cad/model/mdatum"; import CSys from "math/csys"; import { ExpectedOrderProductionAnalyzer } from "cad/craft/production/productionAnalyzer"; diff --git a/modules/workbenches/modeler/features/revolve/revolve.operation.ts b/modules/workbenches/modeler/features/revolve/revolve.operation.ts index 1eb9bb86..dcc122d8 100644 --- a/modules/workbenches/modeler/features/revolve/revolve.operation.ts +++ b/modules/workbenches/modeler/features/revolve/revolve.operation.ts @@ -4,7 +4,7 @@ import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition"; import Axis from "math/axis"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {FaceRef} from "cad/craft/e0/OCCUtils"; import {FromMObjectProductionAnalyzer, FromSketchProductionAnalyzer} from "cad/craft/production/productionAnalyzer"; diff --git a/modules/workbenches/modeler/features/scaleBody/scaleBody.operation.ts b/modules/workbenches/modeler/features/scaleBody/scaleBody.operation.ts index 1b6f5c43..c3b75ab3 100644 --- a/modules/workbenches/modeler/features/scaleBody/scaleBody.operation.ts +++ b/modules/workbenches/modeler/features/scaleBody/scaleBody.operation.ts @@ -2,7 +2,7 @@ import {MShell} from 'cad/model/mshell'; import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; interface scaleParams { diff --git a/modules/workbenches/modeler/features/shell/shell.operation.ts b/modules/workbenches/modeler/features/shell/shell.operation.ts index 48f7756a..11626da0 100644 --- a/modules/workbenches/modeler/features/shell/shell.operation.ts +++ b/modules/workbenches/modeler/features/shell/shell.operation.ts @@ -2,7 +2,7 @@ import {roundValueForPresentation as r} from 'cad/craft/operationHelper'; import {MFace} from "cad/model/mface"; import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; interface ShellParams { diff --git a/modules/workbenches/modeler/features/sweep/sweep.operation.ts b/modules/workbenches/modeler/features/sweep/sweep.operation.ts index 6f7ed85a..eddb42fd 100644 --- a/modules/workbenches/modeler/features/sweep/sweep.operation.ts +++ b/modules/workbenches/modeler/features/sweep/sweep.operation.ts @@ -1,7 +1,7 @@ import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {MSketchLoop} from "cad/model/mloop"; interface SweepParams { diff --git a/modules/workbenches/sheetMetal/features/smFlange/smFlange.operation.ts b/modules/workbenches/sheetMetal/features/smFlange/smFlange.operation.ts index 937ccd28..977e8ec8 100644 --- a/modules/workbenches/sheetMetal/features/smFlange/smFlange.operation.ts +++ b/modules/workbenches/sheetMetal/features/smFlange/smFlange.operation.ts @@ -4,7 +4,7 @@ import { ApplicationContext } from "cad/context"; import { EntityKind } from "cad/model/entities"; import { BooleanDefinition, BooleanKind } from "cad/craft/schema/common/BooleanDefinition"; import Axis from "math/axis"; -import { OperationDescriptor } from "cad/craft/operationPlugin"; +import { OperationDescriptor } from "cad/craft/operationBundle"; interface smFlangeParams { angle: number; diff --git a/modules/workbenches/sheetMetal/features/smTab/smTab.operation.ts b/modules/workbenches/sheetMetal/features/smTab/smTab.operation.ts index 7160b73a..2215d3c1 100644 --- a/modules/workbenches/sheetMetal/features/smTab/smTab.operation.ts +++ b/modules/workbenches/sheetMetal/features/smTab/smTab.operation.ts @@ -4,7 +4,7 @@ import {ApplicationContext} from "cad/context"; import {EntityKind} from "cad/model/entities"; import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition"; import {UnitVector} from "math/vector"; -import {OperationDescriptor} from "cad/craft/operationPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; import {FromSketchProductionAnalyzer} from "cad/craft/production/productionAnalyzer"; interface smTabParams { diff --git a/web/app/cad/actions/actionSystemPlugin.ts b/web/app/cad/actions/actionSystemBundle.ts similarity index 99% rename from web/app/cad/actions/actionSystemPlugin.ts rename to web/app/cad/actions/actionSystemBundle.ts index 4170aedf..bb69cb47 100644 --- a/web/app/cad/actions/actionSystemPlugin.ts +++ b/web/app/cad/actions/actionSystemBundle.ts @@ -155,7 +155,7 @@ export interface ActionService { hint$: StateStream; } -export interface ActionSystemPlugin { +export interface ActionSystemBundle { actionService: ActionService; } diff --git a/web/app/cad/assembly/assemblyPlugin.ts b/web/app/cad/assembly/assemblyBundle.ts similarity index 100% rename from web/app/cad/assembly/assemblyPlugin.ts rename to web/app/cad/assembly/assemblyBundle.ts diff --git a/web/app/cad/assembly/assemblySolver.ts b/web/app/cad/assembly/assemblySolver.ts index 9ed3e739..0cdfd567 100644 --- a/web/app/cad/assembly/assemblySolver.ts +++ b/web/app/cad/assembly/assemblySolver.ts @@ -1,7 +1,7 @@ import {SolveStatus} from "../../sketcher/constr/AlgNumSystem"; import {MShell} from "../model/mshell"; import {MObject} from "../model/mobject"; -import {CadRegistry} from "../craft/cadRegistryPlugin"; +import {CadRegistry} from "../craft/cadRegistryBundle"; import {AssemblyConstraint, AssemblyConstraintDefinition} from "./assemblyConstraint"; import {AssemblyConstraintsSchemas} from "./assemblySchemas"; import {dfs} from "gems/traverse"; diff --git a/web/app/cad/attributes/attributesPlugin.ts b/web/app/cad/attributes/attributesBundle.ts similarity index 90% rename from web/app/cad/attributes/attributesPlugin.ts rename to web/app/cad/attributes/attributesBundle.ts index 5ea497ae..719b25ac 100644 --- a/web/app/cad/attributes/attributesPlugin.ts +++ b/web/app/cad/attributes/attributesBundle.ts @@ -2,13 +2,13 @@ import {Plugin} from "plugable/pluginSystem"; import {AttributesService} from "cad/attributes/attributesService"; import {contributeComponent} from "cad/dom/components/ContributedComponents"; import {DisplayOptionsDialogManager} from "cad/attributes/ui/DisplayOptionsDialog"; -import {ActionSystemPlugin} from "cad/actions/actionSystemPlugin"; +import {ActionSystemBundle} from "cad/actions/actionSystemBundle"; import {RequiresAnyModelSelection} from "cad/actions/actionHelpers"; import {IoColorPalette} from "react-icons/io5"; import {FaTable} from "react-icons/fa"; import {ApplicationContext} from "cad/context"; -type AttributesPluginInputContext = ActionSystemPlugin; +type AttributesPluginInputContext = ActionSystemBundle; export interface AttributesPluginContext { attributesService: AttributesService; @@ -16,7 +16,7 @@ export interface AttributesPluginContext { type AttributesPluginWorkingContext = AttributesPluginInputContext&AttributesPluginContext; -export const AttributesPlugin: Plugin = { +export const AttributesBundle: Plugin = { inputContextSpec: { actionService: 'required', diff --git a/web/app/cad/context/index.ts b/web/app/cad/context/index.ts index 3f72d9c0..fc26d5e2 100644 --- a/web/app/cad/context/index.ts +++ b/web/app/cad/context/index.ts @@ -1,26 +1,26 @@ -import {ProjectBundleContext} from "cad/projectPlugin"; -import {ActionSystemPlugin} from "cad/actions/actionSystemPlugin"; -import {AssemblyBundleContext} from "cad/assembly/assemblyPlugin"; -import {AttributesPluginContext} from "cad/attributes/attributesPlugin"; -import {CadRegistryBundleContext} from "cad/craft/cadRegistryPlugin"; -import {CraftBundleContext} from "cad/craft/craftPlugin"; -import {OperationBundleContext} from "cad/craft/operationPlugin"; -import {OCCBundleContext} from "cad/craft/e0/occtPlugin"; -import {WizardPluginContext} from "cad/craft/wizard/wizardPlugin"; -import {AppTabsBundleContext} from "cad/dom/appTabsPlugin"; -import {DomPluginContext} from "cad/dom/domPlugin"; -import {UIBundleContext} from "cad/dom/uiPlugin"; -import {ExpressionBundleContext} from "cad/expressions/expressionsPlugin"; -import {LocationBundleContext} from "cad/location/LocationPlugin"; -import {RemotePartsBundleContext} from "cad/partImport/remotePartsPlugin"; -import {ProjectManagerBundleContext} from "cad/projectManager/projectManagerPlugin"; -import {EntityContextBundleContext} from "cad/scene/entityContextPlugin"; -import {HighlightPluginContext} from "cad/scene/highlightPlugin"; -import {SceneBundleContext} from "cad/scene/scenePlugin"; -import {SketcherBundleContext} from "cad/sketch/sketcherPlugin"; -import {SketchStorageBundleContext} from "cad/sketch/sketchStoragePlugin"; -import {StorageBundleContext} from "cad/storage/storagePlugin"; -import {WorkbenchBundleContext} from "cad/workbench/workbenchPlugin"; +import {ProjectBundleContext} from "cad/projectBundle"; +import {ActionSystemBundle} from "cad/actions/actionSystemBundle"; +import {AssemblyBundleContext} from "cad/assembly/assemblyBundle"; +import {AttributesPluginContext} from "cad/attributes/attributesBundle"; +import {CadRegistryBundleContext} from "cad/craft/cadRegistryBundle"; +import {CraftBundleContext} from "cad/craft/craftBundle"; +import {OperationBundleContext} from "cad/craft/operationBundle"; +import {OCCBundleContext} from "cad/craft/e0/occtBundle"; +import {WizardPluginContext} from "cad/craft/wizard/wizardBundle"; +import {AppTabsBundleContext} from "cad/dom/appTabsBundle"; +import {DomPluginContext} from "cad/dom/domBundle"; +import {UIBundleContext} from "cad/dom/uiBundle"; +import {ExpressionBundleContext} from "cad/expressions/expressionsBundle"; +import {LocationBundleContext} from "cad/location/LocationBundle"; +import {RemotePartsBundleContext} from "cad/partImport/remotePartsBundle"; +import {ProjectManagerBundleContext} from "cad/projectManager/projectManagerBundle"; +import {EntityContextBundleContext} from "cad/scene/entityContextBundle"; +import {HighlightPluginContext} from "cad/scene/highlightBundle"; +import {SceneBundleContext} from "cad/scene/sceneBundle"; +import {SketcherBundleContext} from "cad/sketch/sketcherBundle"; +import {SketchStorageBundleContext} from "cad/sketch/sketchStorageBundle"; +import {StorageBundleContext} from "cad/storage/storageBundle"; +import {WorkbenchBundleContext} from "cad/workbench/workbenchBundle"; export interface LegacyContext { services: any, @@ -30,7 +30,7 @@ export interface LegacyContext { export interface ApplicationContext extends LegacyContext, ProjectBundleContext, - ActionSystemPlugin, + ActionSystemBundle, AssemblyBundleContext, AttributesPluginContext, CadRegistryBundleContext, diff --git a/web/app/cad/craft/cadRegistryPlugin.ts b/web/app/cad/craft/cadRegistryBundle.ts similarity index 100% rename from web/app/cad/craft/cadRegistryPlugin.ts rename to web/app/cad/craft/cadRegistryBundle.ts diff --git a/web/app/cad/craft/craftPlugin.ts b/web/app/cad/craft/craftBundle.ts similarity index 100% rename from web/app/cad/craft/craftPlugin.ts rename to web/app/cad/craft/craftBundle.ts diff --git a/web/app/cad/craft/e0/OCCUtils.ts b/web/app/cad/craft/e0/OCCUtils.ts index 486f29ee..43161f91 100644 --- a/web/app/cad/craft/e0/OCCUtils.ts +++ b/web/app/cad/craft/e0/OCCUtils.ts @@ -1,7 +1,7 @@ import {SketchGeom} from "cad/sketch/sketchReader"; import {CoreContext} from "cad/context"; import CSys from "math/csys"; -import {OperationResult} from "cad/craft/craftPlugin"; +import {OperationResult} from "cad/craft/craftBundle"; import {BooleanDefinition, BooleanKind} from "cad/craft/schema/common/BooleanDefinition"; import {WireRef} from "cad/craft/e0/occSketchLoader"; import {FromMObjectProductionAnalyzer, ProductionAnalyzer} from "cad/craft/production/productionAnalyzer"; diff --git a/web/app/cad/craft/e0/occtPlugin.ts b/web/app/cad/craft/e0/occtBundle.ts similarity index 100% rename from web/app/cad/craft/e0/occtPlugin.ts rename to web/app/cad/craft/e0/occtBundle.ts diff --git a/web/app/cad/craft/extensionsPlugin.js b/web/app/cad/craft/extensionsPlugin.js index c9790956..157d14a2 100644 --- a/web/app/cad/craft/extensionsPlugin.js +++ b/web/app/cad/craft/extensionsPlugin.js @@ -1,4 +1,4 @@ -import {STORAGE_GLOBAL_PREFIX} from '../projectPlugin'; +import {STORAGE_GLOBAL_PREFIX} from '../projectBundle'; const EXTENSIONS_STORAGE_PREFIX = `${STORAGE_GLOBAL_PREFIX}.Extensions`; diff --git a/web/app/cad/craft/operationPlugin.ts b/web/app/cad/craft/operationBundle.ts similarity index 98% rename from web/app/cad/craft/operationPlugin.ts rename to web/app/cad/craft/operationBundle.ts index 27913a23..34b29efe 100644 --- a/web/app/cad/craft/operationPlugin.ts +++ b/web/app/cad/craft/operationBundle.ts @@ -1,9 +1,9 @@ import React from 'react'; import {state} from 'lstream'; import {IconType} from "react-icons"; -import {ActionAppearance} from "../actions/actionSystemPlugin"; +import {ActionAppearance} from "../actions/actionSystemBundle"; import {ApplicationContext, CoreContext} from "cad/context"; -import {OperationResult} from "./craftPlugin"; +import {OperationResult} from "./craftBundle"; import {OperationSchema, SchemaField, schemaIterator, unwrapMetadata} from "cad/craft/schema/schema"; import {FormDefinition} from "cad/mdf/ui/uiDefinition"; import {Types} from "cad/craft/schema/types"; diff --git a/web/app/cad/craft/operationHelper.ts b/web/app/cad/craft/operationHelper.ts index 145918ef..f0644ce6 100644 --- a/web/app/cad/craft/operationHelper.ts +++ b/web/app/cad/craft/operationHelper.ts @@ -1,4 +1,4 @@ -import {Operation} from "cad/craft/operationPlugin"; +import {Operation} from "cad/craft/operationBundle"; import {resolveIcon} from "cad/craft/ui/iconResolver"; export function roundValueForPresentation(value) { diff --git a/web/app/cad/craft/wizard/wizardPlugin.ts b/web/app/cad/craft/wizard/wizardBundle.ts similarity index 97% rename from web/app/cad/craft/wizard/wizardPlugin.ts rename to web/app/cad/craft/wizard/wizardBundle.ts index 7eee976c..c94153b5 100644 --- a/web/app/cad/craft/wizard/wizardPlugin.ts +++ b/web/app/cad/craft/wizard/wizardBundle.ts @@ -3,7 +3,7 @@ import initializeBySchema from '../schema/initializeBySchema'; import {clone} from 'gems/objects'; import materializeParams from '../schema/materializeParams'; import {createFunctionList} from 'gems/func'; -import {CraftHistory, OperationRequest} from "cad/craft/craftPlugin"; +import {CraftHistory, OperationRequest} from "cad/craft/craftBundle"; import { NewOperationCall, ParamsPath, @@ -15,7 +15,7 @@ import { import _ from "lodash"; import {OperationParamValue} from "cad/craft/schema/schema"; import {ApplicationContext} from "cad/context"; -import {Operation} from "cad/craft/operationPlugin"; +import {Operation} from "cad/craft/operationBundle"; import produce from "immer" export function activate(ctx: ApplicationContext) { diff --git a/web/app/cad/craft/wizard/wizardSelectionPlugin.ts b/web/app/cad/craft/wizard/wizardSelectionPlugin.ts index 38963588..0605ae3c 100644 --- a/web/app/cad/craft/wizard/wizardSelectionPlugin.ts +++ b/web/app/cad/craft/wizard/wizardSelectionPlugin.ts @@ -1,11 +1,11 @@ import {FACE, SHELL} from 'cad/model/entities'; -import {OperationRequest} from "cad/craft/craftPlugin"; +import {OperationRequest} from "cad/craft/craftBundle"; import {ParamsPath, WizardService} from "cad/craft/wizard/wizardTypes"; import {OperationParamPrimitive} from "cad/craft/schema/schema"; -import {EntityReference} from "cad/craft/operationPlugin"; +import {EntityReference} from "cad/craft/operationBundle"; import {Plugin} from "plugable/pluginSystem"; import {MarkerPluginContext} from "cad/scene/selectionMarker/markerPlugin"; -import {WizardPluginContext} from "cad/craft/wizard/wizardPlugin"; +import {WizardPluginContext} from "cad/craft/wizard/wizardBundle"; import {PickControlPluginContext} from "cad/scene/controls/pickControlPlugin"; import _ from "lodash"; import {MObject} from "cad/model/mobject"; diff --git a/web/app/cad/craft/wizard/wizardTypes.ts b/web/app/cad/craft/wizard/wizardTypes.ts index 0a785ebd..b3155b8f 100644 --- a/web/app/cad/craft/wizard/wizardTypes.ts +++ b/web/app/cad/craft/wizard/wizardTypes.ts @@ -1,7 +1,7 @@ import {StateStream} from "lstream"; -import {CraftHints, OperationRequest} from "cad/craft/craftPlugin"; +import {CraftHints, OperationRequest} from "cad/craft/craftBundle"; import {MaterializedOperationParams, OperationParamValue, OperationParams} from "cad/craft/schema/schema"; -import {Operation} from "cad/craft/operationPlugin"; +import {Operation} from "cad/craft/operationBundle"; export type ParamsPathSegment = string|number; diff --git a/web/app/cad/dom/appTabsPlugin.ts b/web/app/cad/dom/appTabsBundle.ts similarity index 100% rename from web/app/cad/dom/appTabsPlugin.ts rename to web/app/cad/dom/appTabsBundle.ts diff --git a/web/app/cad/dom/components/SelectionView.tsx b/web/app/cad/dom/components/SelectionView.tsx index 9d8dbccb..01e550a6 100644 --- a/web/app/cad/dom/components/SelectionView.tsx +++ b/web/app/cad/dom/components/SelectionView.tsx @@ -1,6 +1,6 @@ import React, {useContext} from 'react'; import {useStream, useStreamWithPatcher} from "ui/effects"; -import {SELECTABLE_ENTITIES} from "../../scene/entityContextPlugin"; +import {SELECTABLE_ENTITIES} from "../../scene/entityContextBundle"; import {AppContext} from "cad/dom/components/AppContext"; import Field from "ui/components/controls/Field"; import {InnerFolder} from "ui/components/Folder"; diff --git a/web/app/cad/dom/domPlugin.ts b/web/app/cad/dom/domBundle.ts similarity index 91% rename from web/app/cad/dom/domPlugin.ts rename to web/app/cad/dom/domBundle.ts index a09b80e2..95d101b0 100644 --- a/web/app/cad/dom/domPlugin.ts +++ b/web/app/cad/dom/domBundle.ts @@ -1,6 +1,6 @@ import {contributeComponent} from './components/ContributedComponents'; import {Plugin} from "plugable/pluginSystem"; -import {AppTabsService} from "cad/dom/appTabsPlugin"; +import {AppTabsService} from "cad/dom/appTabsBundle"; export interface DomService { @@ -23,7 +23,7 @@ export interface DomPluginContext { type DomPluginWorkingContext = DomPluginInputContext&DomPluginContext; -export const DomPlugin: Plugin = { +export const DomBundle: Plugin = { inputContextSpec: { appTabsService: 'required', diff --git a/web/app/cad/dom/uiPlugin.ts b/web/app/cad/dom/uiBundle.ts similarity index 100% rename from web/app/cad/dom/uiPlugin.ts rename to web/app/cad/dom/uiBundle.ts diff --git a/web/app/cad/expressions/expressionsPlugin.ts b/web/app/cad/expressions/expressionsBundle.ts similarity index 100% rename from web/app/cad/expressions/expressionsPlugin.ts rename to web/app/cad/expressions/expressionsBundle.ts diff --git a/web/app/cad/init/startApplication.js b/web/app/cad/init/startApplication.js index bb3b54e6..a33ff961 100644 --- a/web/app/cad/init/startApplication.js +++ b/web/app/cad/init/startApplication.js @@ -1,47 +1,47 @@ import * as LifecyclePlugin from './lifecyclePlugin'; -import * as AppTabsPlugin from '../dom/appTabsPlugin'; -import {DomPlugin} from '../dom/domPlugin'; +import * as AppTabsPlugin from '../dom/appTabsBundle'; +import {DomBundle} from '../dom/domBundle'; import * as PickControlPlugin from '../scene/controls/pickControlPlugin'; import * as MouseEventSystemPlugin from '../scene/controls/mouseEventSystemPlugin'; -import * as ScenePlugin from '../scene/scenePlugin'; +import * as ScenePlugin from '../scene/sceneBundle'; import * as MarkerPlugin from '../scene/selectionMarker/markerPlugin'; -import * as ActionSystemPlugin from '../actions/actionSystemPlugin'; -import * as UiPlugin from '../dom/uiPlugin'; +import * as ActionSystemPlugin from '../actions/actionSystemBundle'; +import * as UiPlugin from '../dom/uiBundle'; import * as MenuPlugin from '../dom/menu/menuPlugin'; import * as KeyboardPlugin from '../keyboard/keyboardPlugin'; -import * as WizardPlugin from '../craft/wizard/wizardPlugin'; +import * as WizardPlugin from '../craft/wizard/wizardBundle'; import {WizardSelectionPlugin} from '../craft/wizard/wizardSelectionPlugin'; import * as PreviewPlugin from '../preview/previewPlugin'; -import * as OperationPlugin from '../craft/operationPlugin'; +import * as OperationPlugin from '../craft/operationBundle'; import * as ExtensionsPlugin from '../craft/extensionsPlugin'; -import * as CadRegistryPlugin from '../craft/cadRegistryPlugin'; -import * as CraftPlugin from '../craft/craftPlugin'; -import * as RemotePartsPlugin from '../partImport/remotePartsPlugin'; +import * as CadRegistryPlugin from '../craft/cadRegistryBundle'; +import * as CraftPlugin from '../craft/craftBundle'; +import * as RemotePartsPlugin from '../partImport/remotePartsBundle'; import * as CraftUiPlugin from '../craft/craftUiPlugin'; -import * as StoragePlugin from '../storage/storagePlugin'; -import * as ProjectPlugin from '../projectPlugin'; -import * as ProjectManagerPlugin from '../projectManager/projectManagerPlugin'; -import * as SketcherPlugin from '../sketch/sketcherPlugin'; -import * as SketcherStoragePlugin from '../sketch/sketchStoragePlugin'; +import * as StoragePlugin from '../storage/storageBundle'; +import * as ProjectPlugin from '../projectBundle'; +import * as ProjectManagerPlugin from '../projectManager/projectManagerBundle'; +import * as SketcherPlugin from '../sketch/sketcherBundle'; +import * as SketcherStoragePlugin from '../sketch/sketchStorageBundle'; import * as ExportPlugin from '../exportPlugin'; import * as ExposurePlugin from '../exposure/exposurePlugin'; import {ViewSyncPlugin} from '../scene/viewSyncPlugin'; -import * as EntityContextPlugin from '../scene/entityContextPlugin'; -import * as OCCTPlugin from '../craft/e0/occtPlugin'; +import * as EntityContextPlugin from '../scene/entityContextBundle'; +import * as OCCTPlugin from '../craft/e0/occtBundle'; import context from 'cad/context'; import startReact from "../dom/startReact"; import * as UIConfigPlugin from "../workbench/uiConfigPlugin"; import * as DebugPlugin from "../debugPlugin"; -import * as ExpressionsPlugin from "../expressions/expressionsPlugin"; -import {WorkbenchPlugin} from "../workbench/workbenchPlugin"; -import * as LocationPlugin from "../location/LocationPlugin"; -import * as AssemblyPlugin from "../assembly/assemblyPlugin"; +import * as ExpressionsPlugin from "../expressions/expressionsBundle"; +import {WorkbenchBundle} from "../workbench/workbenchBundle"; +import * as LocationPlugin from "../location/LocationBundle"; +import * as AssemblyPlugin from "../assembly/assemblyBundle"; import {WorkbenchesLoaderPlugin} from "cad/workbench/workbenchesLoaderPlugin"; import {PluginSystem} from "plugable/pluginSystem"; -import {AttributesPlugin} from "cad/attributes/attributesPlugin"; -import {HighlightPlugin} from "cad/scene/highlightPlugin"; +import {AttributesBundle} from "cad/attributes/attributesBundle"; +import {HighlightBundle} from "cad/scene/highlightBundle"; export default function startApplication(callback) { @@ -70,14 +70,14 @@ export default function startApplication(callback) { ]; let plugins = [ - DomPlugin, + DomBundle, ScenePlugin, MouseEventSystemPlugin, MarkerPlugin, PickControlPlugin, EntityContextPlugin, WorkbenchesLoaderPlugin, - WorkbenchPlugin, + WorkbenchBundle, SketcherPlugin, UIConfigPlugin, DebugPlugin, @@ -86,8 +86,8 @@ export default function startApplication(callback) { RemotePartsPlugin, ViewSyncPlugin, WizardSelectionPlugin, - AttributesPlugin, - HighlightPlugin + AttributesBundle, + HighlightBundle ]; let allPlugins = [...preUIPlugins, ...plugins]; diff --git a/web/app/cad/location/LocationPlugin.ts b/web/app/cad/location/LocationBundle.ts similarity index 100% rename from web/app/cad/location/LocationPlugin.ts rename to web/app/cad/location/LocationBundle.ts diff --git a/web/app/cad/partImport/importPartOperation/importPartOperation.ts b/web/app/cad/partImport/importPartOperation/importPartOperation.ts index db28716b..ce7a34c9 100644 --- a/web/app/cad/partImport/importPartOperation/importPartOperation.ts +++ b/web/app/cad/partImport/importPartOperation/importPartOperation.ts @@ -1,9 +1,9 @@ import {GrCloudDownload} from "react-icons/gr"; import {ImportPartForm} from "./ImportPartForm"; import importPartSchema from "./importPartSchema"; -import {OperationDescriptor} from "../../craft/operationPlugin"; +import {OperationDescriptor} from "../../craft/operationBundle"; import {ApplicationContext} from "cad/context"; -import {OperationResult} from "../../craft/craftPlugin"; +import {OperationResult} from "../../craft/craftBundle"; export interface ImportPartOperationParams { partRef: string, diff --git a/web/app/cad/partImport/remotePartsPlugin.ts b/web/app/cad/partImport/remotePartsBundle.ts similarity index 95% rename from web/app/cad/partImport/remotePartsPlugin.ts rename to web/app/cad/partImport/remotePartsBundle.ts index be1ff33f..2bb6a9c4 100644 --- a/web/app/cad/partImport/remotePartsPlugin.ts +++ b/web/app/cad/partImport/remotePartsBundle.ts @@ -8,14 +8,14 @@ import {ImportPartOperation} from "./importPartOperation/importPartOperation"; import {MObject, MObjectIdGenerator} from "../model/mobject"; import {WEB_CAD_ORG_PARTS_REPO, WEB_CAD_ORG_COMMONS_CATALOG} from "./remotePartsConfig"; import {indexById} from "gems/iterables"; -import {ModelBundle} from "../projectManager/projectManagerPlugin"; +import {ModelBundle} from "../projectManager/projectManagerBundle"; import {PartRepository} from "./partRepository"; -import {initProjectService} from "../projectPlugin"; -import {activate as activateCraftPlugin} from '../craft/craftPlugin'; -import {activate as activateExpressionsPlugin} from '../expressions/expressionsPlugin'; -import {activate as activateCadRegistryPlugin} from '../craft/cadRegistryPlugin'; -import {activate as activateStoragePlugin} from '../storage/storagePlugin'; -import {activate as activateSketchStoragePlugin} from '../sketch/sketchStoragePlugin'; +import {initProjectService} from "../projectBundle"; +import {activate as activateCraftPlugin} from '../craft/craftBundle'; +import {activate as activateExpressionsPlugin} from '../expressions/expressionsBundle'; +import {activate as activateCadRegistryPlugin} from '../craft/cadRegistryBundle'; +import {activate as activateStoragePlugin} from '../storage/storageBundle'; +import {activate as activateSketchStoragePlugin} from '../sketch/sketchStorageBundle'; export function activate(ctx: ApplicationContext) { diff --git a/web/app/cad/partImport/remotePartsConfig.ts b/web/app/cad/partImport/remotePartsConfig.ts index dd93f8f5..f5c0770f 100644 --- a/web/app/cad/partImport/remotePartsConfig.ts +++ b/web/app/cad/partImport/remotePartsConfig.ts @@ -1,4 +1,4 @@ -import {PartsCatalog} from "./remotePartsPlugin"; +import {PartsCatalog} from "./remotePartsBundle"; import {GitHubRepoRepository} from "../repository/GitHubRepoRepository"; import {GrCubes} from "react-icons/gr"; import {PartRepository} from "./partRepository"; diff --git a/web/app/cad/partImport/ui/PartCatalog.tsx b/web/app/cad/partImport/ui/PartCatalog.tsx index 0ee26d44..d00be9e7 100644 --- a/web/app/cad/partImport/ui/PartCatalog.tsx +++ b/web/app/cad/partImport/ui/PartCatalog.tsx @@ -1,5 +1,5 @@ import React, {ReactNode} from "react"; -import {CatalogCategory, CatalogPart} from "../remotePartsPlugin"; +import {CatalogCategory, CatalogPart} from "../remotePartsBundle"; import {Tree} from "ui/components/Tree"; import {FiBox} from "react-icons/fi"; import {GrCubes} from "react-icons/gr"; diff --git a/web/app/cad/plugins.js b/web/app/cad/plugins.js index 516c6424..15ae0402 100644 --- a/web/app/cad/plugins.js +++ b/web/app/cad/plugins.js @@ -1,6 +1,6 @@ -import * as DomPlugin from './dom/domPlugin'; +import * as DomPlugin from './dom/domBundle'; import * as PickControlPlugin from './scene/controls/pickControlPlugin'; -import * as ScenePlugin from './scene/scenePlugin'; +import * as ScenePlugin from './scene/sceneBundle'; import * as SelectionMarkerPlugin from './scene/selectionMarker/markerPlugin'; export default [ diff --git a/web/app/cad/projectPlugin.ts b/web/app/cad/projectBundle.ts similarity index 98% rename from web/app/cad/projectPlugin.ts rename to web/app/cad/projectBundle.ts index 51350a5e..e0c5bc16 100644 --- a/web/app/cad/projectPlugin.ts +++ b/web/app/cad/projectBundle.ts @@ -2,7 +2,7 @@ import {setSketchPrecision} from './sketch/sketchReader'; import {runSandbox} from './sandbox'; import {LOG_FLAGS} from './logFlags'; import {ApplicationContext} from "cad/context"; -import {ProjectModel} from "./projectManager/projectManagerPlugin"; +import {ProjectModel} from "./projectManager/projectManagerBundle"; import {DebugMode$} from "debugger/Debugger"; import {fillUpMissingFields} from "cad/craft/schema/initializeBySchema"; diff --git a/web/app/cad/projectManager/projectManagerPlugin.ts b/web/app/cad/projectManager/projectManagerBundle.ts similarity index 98% rename from web/app/cad/projectManager/projectManagerPlugin.ts rename to web/app/cad/projectManager/projectManagerBundle.ts index 2955f023..a553a165 100644 --- a/web/app/cad/projectManager/projectManagerPlugin.ts +++ b/web/app/cad/projectManager/projectManagerBundle.ts @@ -1,9 +1,9 @@ -import {PROJECTS_PREFIX, SKETCH_SUFFIX} from '../projectPlugin'; +import {PROJECTS_PREFIX, SKETCH_SUFFIX} from '../projectBundle'; import {ProjectManager} from './ProjectManager'; import exportTextData from 'gems/exportTextData'; import {SketchFormat_V3} from "sketcher/io"; import {ApplicationContext} from "cad/context"; -import {OperationRequest} from "../craft/craftPlugin"; +import {OperationRequest} from "../craft/craftBundle"; import {AssemblyConstraintDefinition} from "cad/assembly/assemblyConstraint"; export function activate(ctx: ApplicationContext) { diff --git a/web/app/cad/scene/entityContextPlugin.ts b/web/app/cad/scene/entityContextBundle.ts similarity index 100% rename from web/app/cad/scene/entityContextPlugin.ts rename to web/app/cad/scene/entityContextBundle.ts diff --git a/web/app/cad/scene/highlightPlugin.ts b/web/app/cad/scene/highlightBundle.ts similarity index 96% rename from web/app/cad/scene/highlightPlugin.ts rename to web/app/cad/scene/highlightBundle.ts index 74f6e0c8..bb47eba0 100644 --- a/web/app/cad/scene/highlightPlugin.ts +++ b/web/app/cad/scene/highlightBundle.ts @@ -53,7 +53,7 @@ export interface HighlightPluginContext { type HighlightPluginWorkingContext = HighlightPluginInputContext&HighlightPluginContext; -export const HighlightPlugin: Plugin = { +export const HighlightBundle: Plugin = { inputContextSpec: { viewer: 'required', diff --git a/web/app/cad/scene/scenePlugin.ts b/web/app/cad/scene/sceneBundle.ts similarity index 100% rename from web/app/cad/scene/scenePlugin.ts rename to web/app/cad/scene/sceneBundle.ts diff --git a/web/app/cad/sketch/sketchStoragePlugin.ts b/web/app/cad/sketch/sketchStorageBundle.ts similarity index 100% rename from web/app/cad/sketch/sketchStoragePlugin.ts rename to web/app/cad/sketch/sketchStorageBundle.ts diff --git a/web/app/cad/sketch/sketcherPlugin.ts b/web/app/cad/sketch/sketcherBundle.ts similarity index 100% rename from web/app/cad/sketch/sketcherPlugin.ts rename to web/app/cad/sketch/sketcherBundle.ts diff --git a/web/app/cad/storage/storagePlugin.ts b/web/app/cad/storage/storageBundle.ts similarity index 100% rename from web/app/cad/storage/storagePlugin.ts rename to web/app/cad/storage/storageBundle.ts diff --git a/web/app/cad/workbench/workbenchPlugin.ts b/web/app/cad/workbench/workbenchBundle.ts similarity index 96% rename from web/app/cad/workbench/workbenchPlugin.ts rename to web/app/cad/workbench/workbenchBundle.ts index 8f9fb234..f54b1ad2 100644 --- a/web/app/cad/workbench/workbenchPlugin.ts +++ b/web/app/cad/workbench/workbenchBundle.ts @@ -8,7 +8,7 @@ export interface WorkbenchBundleContext { workbenchService: WorkbenchService; } -export const WorkbenchPlugin = { +export const WorkbenchBundle = { activate(ctx: ApplicationContext) { diff --git a/web/app/cad/workbench/workbenchService.ts b/web/app/cad/workbench/workbenchService.ts index d2381e1f..5ec3e7db 100644 --- a/web/app/cad/workbench/workbenchService.ts +++ b/web/app/cad/workbench/workbenchService.ts @@ -1,9 +1,9 @@ -import {OperationDescriptor} from "cad/craft/operationPlugin"; -import {ActionDefinition} from "cad/actions/actionSystemPlugin"; +import {OperationDescriptor} from "cad/craft/operationBundle"; +import {ActionDefinition} from "cad/actions/actionSystemBundle"; import {state} from "lstream"; import {Index} from "gems/indexType"; import {ApplicationContext, CoreContext} from "cad/context"; -import {ActionRef} from "cad/dom/uiPlugin"; +import {ActionRef} from "cad/dom/uiBundle"; import {IconDeclaration} from "cad/icons/IconDeclaration"; import {CurrentWorkbenchIcon} from "cad/workbench/CurrentWorkbenchIcon"; diff --git a/web/app/cad/workbench/workbenchesLoaderPlugin.ts b/web/app/cad/workbench/workbenchesLoaderPlugin.ts index a9b6bab1..1df03219 100644 --- a/web/app/cad/workbench/workbenchesLoaderPlugin.ts +++ b/web/app/cad/workbench/workbenchesLoaderPlugin.ts @@ -6,7 +6,7 @@ import rotateDatumOperation from "cad/craft/datum/rotate/rotateDatumOperation"; import datumOperation from "cad/craft/primitives/plane/planeOperation"; import {Plugin} from "plugable/pluginSystem"; import {WorkbenchService} from "cad/workbench/workbenchService"; -import {OperationService} from "cad/craft/operationPlugin"; +import {OperationService} from "cad/craft/operationBundle"; export interface WorkbenchesLoaderInputContext { workbenchService: WorkbenchService,