rename plugin to bundle

modules/context/index.ts

@@ -1,4 +1,4 @@
-import {ProjectService} from "cad/projectPlugin";
+import {ProjectService} from "cad/projectBundle";
 
 export interface LegacyContext {
   services: any,

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<any> = {
   id: 'OCC_BOTTLE',

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 {

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: [];

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 {

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";

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";

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";
 

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';

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";

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 {

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";

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";

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";

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";

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";

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";

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";

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";
 

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 {

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 {

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 {

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;

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 {

web/app/cad/actions/actionSystemBundle.ts

@@ -155,7 +155,7 @@ export interface ActionService {
   hint$: StateStream<Hint>;
 }
 
-export interface ActionSystemPlugin {
+export interface ActionSystemBundle {
   actionService: ActionService;
 }
 

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";

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<AttributesPluginInputContext, AttributesPluginContext, AttributesPluginWorkingContext> = {
+export const AttributesBundle: Plugin<AttributesPluginInputContext, AttributesPluginContext, AttributesPluginWorkingContext> = {
 
   inputContextSpec: {
     actionService: 'required',

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,

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";

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`;
 

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";

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) {

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) {

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";

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;
 

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";

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<DomPluginInputContext, DomPluginContext, DomPluginWorkingContext> = {
+export const DomBundle: Plugin<DomPluginInputContext, DomPluginContext, DomPluginWorkingContext> = {
 
   inputContextSpec: {
     appTabsService: 'required',

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];

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,

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) {
 

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";

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";

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 [

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";
 

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) {

web/app/cad/scene/highlightBundle.ts

@@ -53,7 +53,7 @@ export interface HighlightPluginContext {
 
 type HighlightPluginWorkingContext = HighlightPluginInputContext&HighlightPluginContext;
 
-export const HighlightPlugin: Plugin<HighlightPluginInputContext, HighlightPluginContext, HighlightPluginWorkingContext> = {
+export const HighlightBundle: Plugin<HighlightPluginInputContext, HighlightPluginContext, HighlightPluginWorkingContext> = {
 
   inputContextSpec: {
     viewer: 'required',

web/app/cad/workbench/workbenchBundle.ts

@@ -8,7 +8,7 @@ export interface WorkbenchBundleContext {
   workbenchService: WorkbenchService;
 }
 
-export const WorkbenchPlugin = {
+export const WorkbenchBundle = {
 
   activate(ctx: ApplicationContext) {
 

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";
 

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,