Move jcad model to schema package

.eslintignore

@@ -8,3 +8,4 @@ ui-tests
 **/build/
 jupytercad/
 examples/
+packages/opencascade/build.yml

.prettierignore

@@ -5,3 +5,4 @@ node_modules
 jupytercad
 **/*.d.ts
 **/*.js
+packages/opencascade/build.yml

packages/base/src/annotation/model.ts

@@ -1,14 +1,12 @@
-import { DocumentRegistry } from '@jupyterlab/docregistry';
-import { User } from '@jupyterlab/services';
-
-import { ISignal, Signal } from '@lumino/signaling';
-
 import {
-  IAnnotationModel,
   IAnnotation,
   IAnnotationContent,
+  IAnnotationModel,
   IJupyterCadModel
-} from '../types';
+} from '@jupytercad/schema';
+import { DocumentRegistry } from '@jupyterlab/docregistry';
+import { User } from '@jupyterlab/services';
+import { ISignal, Signal } from '@lumino/signaling';
 
 export class AnnotationModel implements IAnnotationModel {
   constructor(options: AnnotationModel.IOptions) {

packages/base/src/annotation/view.tsx

@@ -1,10 +1,9 @@
-import { caretRightIcon, closeIcon } from '@jupyterlab/ui-components';
+import { IAnnotationModel } from '@jupytercad/schema';
 import { Dialog, showDialog } from '@jupyterlab/apputils';
-
+import { caretRightIcon, closeIcon } from '@jupyterlab/ui-components';
 import * as React from 'react';
 
 import { minimizeIcon } from '../tools';
-import { IAnnotationModel } from '../types';
 import { Message } from './message';
 
 interface IAnnotationProps {

packages/base/src/commands.ts

@@ -1,8 +1,18 @@
+import {
+  IDict,
+  IJCadObject,
+  IJupyterCadDoc,
+  IJupyterCadModel,
+  Parts
+} from '@jupytercad/schema';
+import formSchema from '@jupytercad/schema/lib/_interface/forms.json';
 import { JupyterFrontEnd } from '@jupyterlab/application';
 import { showErrorMessage, WidgetTracker } from '@jupyterlab/apputils';
 import { ITranslator } from '@jupyterlab/translation';
-import { SketcherDialog } from './sketcher/sketcherdialog';
+import { redoIcon, undoIcon } from '@jupyterlab/ui-components';
+
 import { FormDialog } from './formdialog';
+import { SketcherDialog } from './sketcher/sketcherdialog';
 import {
   axesIcon,
   boxIcon,
@@ -16,12 +26,7 @@ import {
   torusIcon,
   unionIcon
 } from './tools';
-
-import { IDict, IJupyterCadDoc, IJupyterCadModel } from './types';
 import { JupyterCadPanel, JupyterCadWidget } from './widget';
-import formSchema from '@jupytercad/schema/lib/_interface/forms.json';
-import { IJCadObject, Parts } from '@jupytercad/schema';
-import { redoIcon, undoIcon } from '@jupyterlab/ui-components';
 
 const FORM_SCHEMA = {};
 // Injecting "name" in the schema, as it's not part of the official schema but

packages/base/src/factory.ts

@@ -1,7 +1,7 @@
+import { JupyterCadModel } from '@jupytercad/schema';
 import { ABCWidgetFactory, DocumentRegistry } from '@jupyterlab/docregistry';
 import { CommandRegistry } from '@lumino/commands';
 
-import { JupyterCadModel } from './model';
 import { IJupyterCadTracker } from './token';
 import { ToolbarWidget } from './toolbar/widget';
 import { JupyterCadPanel, JupyterCadWidget } from './widget';

packages/base/src/fcplugin/modelfactory.ts

@@ -1,9 +1,11 @@
+import {
+  IAnnotationModel,
+  IJupyterCadDoc,
+  JupyterCadModel
+} from '@jupytercad/schema';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { Contents } from '@jupyterlab/services';
 
-import { IAnnotationModel, IJupyterCadDoc } from '../types';
-import { JupyterCadModel } from '../model';
-
 /**
  * A Model factory to create new instances of JupyterCadModel.
  */

packages/base/src/fcplugin/plugins.ts

@@ -2,6 +2,7 @@ import {
   ICollaborativeDrive,
   SharedDocumentFactory
 } from '@jupyter/docprovider';
+import { IAnnotationModel, JupyterCadDoc } from '@jupytercad/schema';
 import {
   JupyterFrontEnd,
   JupyterFrontEndPlugin
@@ -17,10 +18,9 @@ import { ILauncher } from '@jupyterlab/launcher';
 import { fileIcon } from '@jupyterlab/ui-components';
 
 import { JupyterCadWidgetFactory } from '../factory';
-import { JupyterCadDoc } from '../model';
 import { IAnnotationToken, IJupyterCadDocTracker } from '../token';
 import { requestAPI } from '../tools';
-import { IAnnotationModel, IJupyterCadWidget } from '../types';
+import { IJupyterCadWidget } from '../types';
 import { JupyterCadFCModelFactory } from './modelfactory';
 
 const FACTORY = 'Jupytercad Freecad Factory';

packages/base/src/formdialog.tsx

@@ -1,9 +1,14 @@
-import * as React from 'react';
+import {
+  IDict,
+  IJupyterCadClientState,
+  IJupyterCadModel
+} from '@jupytercad/schema';
 import { Dialog } from '@jupyterlab/apputils';
+import { DocumentRegistry } from '@jupyterlab/docregistry';
+import * as React from 'react';
+
 import { ObjectPropertiesForm } from './panelview/formbuilder';
-import { IDict, IJupyterCadClientState, IJupyterCadModel } from './types';
 import { focusInputField, removeStyleFromProperty } from './tools';
-import { DocumentRegistry } from '@jupyterlab/docregistry';
 
 export interface IFormDialogOptions {
   schema: IDict;

packages/base/src/index.ts

@@ -29,7 +29,6 @@ export * from './commands';
 export * from './factory';
 export * from './formdialog';
 export * from './mainview';
-export * from './model';
 export * from './token';
 export * from './tools';
 export * from './types';

packages/base/src/jcadplugin/modelfactory.ts

@@ -1,8 +1,11 @@
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { Contents } from '@jupyterlab/services';
 
-import { IAnnotationModel, IJupyterCadDoc } from '../types';
-import { JupyterCadModel } from '../model';
+import {
+  IAnnotationModel,
+  IJupyterCadDoc,
+  JupyterCadModel
+} from '@jupytercad/schema';
 
 /**
  * A Model factory to create new instances of JupyterCadModel.

packages/base/src/jcadplugin/plugins.ts

@@ -1,30 +1,25 @@
+import {
+  ICollaborativeDrive,
+  SharedDocumentFactory
+} from '@jupyter/docprovider';
+import { IAnnotationModel, JupyterCadDoc } from '@jupytercad/schema';
 import {
   JupyterFrontEnd,
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
-
 import {
   ICommandPalette,
   IThemeManager,
   WidgetTracker
 } from '@jupyterlab/apputils';
-
-import { fileIcon } from '@jupyterlab/ui-components';
-
 import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
-
 import { ILauncher } from '@jupyterlab/launcher';
+import { fileIcon } from '@jupyterlab/ui-components';
 
-import {
-  ICollaborativeDrive,
-  SharedDocumentFactory
-} from '@jupyter/docprovider';
-
-import { IAnnotationModel, IJupyterCadWidget } from '../types';
-import { IAnnotationToken, IJupyterCadDocTracker } from '../token';
 import { JupyterCadWidgetFactory } from '../factory';
+import { IAnnotationToken, IJupyterCadDocTracker } from '../token';
+import { IJupyterCadWidget } from '../types';
 import { JupyterCadJcadModelFactory } from './modelfactory';
-import { JupyterCadDoc } from '../model';
 
 const FACTORY = 'Jupytercad Jcad Factory';
 const PALETTE_CATEGORY = 'JupyterCAD';

packages/base/src/mainview.tsx

@@ -6,6 +6,14 @@ import {
   MainAction,
   WorkerAction
 } from '@jupytercad/occ-worker';
+import {
+  IAnnotation,
+  IDict,
+  IJcadObjectDocChange,
+  IJupyterCadClientState,
+  IJupyterCadDoc,
+  IJupyterCadModel
+} from '@jupytercad/schema';
 import { IObservableMap, ObservableMap } from '@jupyterlab/observables';
 import { User } from '@jupyterlab/services';
 import { CommandRegistry } from '@lumino/commands';
@@ -24,17 +32,7 @@ import { v4 as uuid } from 'uuid';
 
 import { FloatingAnnotation } from './annotation/view';
 import { getCSSVariableColor, throttle } from './tools';
-import {
-  AxeHelper,
-  CameraSettings,
-  ExplodedView,
-  IAnnotation,
-  IDict,
-  IJcadObjectDocChange,
-  IJupyterCadClientState,
-  IJupyterCadDoc,
-  IJupyterCadModel
-} from './types';
+import { AxeHelper, CameraSettings, ExplodedView } from './types';
 
 // Apply the BVH extension
 THREE.BufferGeometry.prototype.computeBoundsTree = computeBoundsTree;

packages/base/src/notebookrenderer/index.ts

@@ -19,7 +19,7 @@ import {
   IJupyterYWidget
 } from 'yjs-widgets';
 
-import { JupyterCadModel } from '../model';
+import { JupyterCadModel } from '@jupytercad/schema';
 import { JupyterCadPanel } from '../widget';
 
 export interface ICommMetadata {

packages/base/src/panelview/annotations.tsx

@@ -1,8 +1,7 @@
+import { IAnnotationModel } from '@jupytercad/schema';
 import { PanelWithToolbar, ReactWidget } from '@jupyterlab/ui-components';
-
 import * as React from 'react';
 
-import { IAnnotationModel } from '../types';
 import { Annotation } from '../annotation/view';
 
 interface IProps {

packages/base/src/panelview/leftpanel.tsx

@@ -1,11 +1,11 @@
+import { IAnnotationModel, JupyterCadDoc } from '@jupytercad/schema';
 import { SidePanel } from '@jupyterlab/ui-components';
 
-import { JupyterCadDoc } from '../model';
-import { IControlPanelModel, IAnnotationModel } from '../types';
+import { IJupyterCadTracker } from '../token';
+import { IControlPanelModel } from '../types';
+import { Annotations } from './annotations';
 import { ControlPanelHeader } from './header';
 import { ObjectTree } from './objecttree';
-import { Annotations } from './annotations';
-import { IJupyterCadTracker } from '../token';
 
 export class LeftPanelWidget extends SidePanel {
   constructor(options: LeftPanelWidget.IOptions) {

packages/base/src/panelview/model.ts

@@ -1,12 +1,8 @@
+import { IJupyterCadDoc, IJupyterCadModel } from '@jupytercad/schema';
 import { ISignal } from '@lumino/signaling';
 
 import { IJupyterCadTracker } from '../token';
-import {
-  IControlPanelModel,
-  IJupyterCadDoc,
-  IJupyterCadModel,
-  IJupyterCadWidget
-} from '../types';
+import { IControlPanelModel, IJupyterCadWidget } from '../types';
 
 export class ControlPanelModel implements IControlPanelModel {
   constructor(options: ControlPanelModel.IOptions) {

packages/base/src/panelview/objectproperties.tsx

@@ -1,4 +1,11 @@
-import { IJCadModel } from '@jupytercad/schema';
+import {
+  IDict,
+  IJCadModel,
+  IJcadObjectDocChange,
+  IJupyterCadClientState,
+  IJupyterCadDoc,
+  IJupyterCadModel
+} from '@jupytercad/schema';
 import formSchema from '@jupytercad/schema/lib/_interface/forms.json';
 import { ReactWidget } from '@jupyterlab/apputils';
 import { PanelWithToolbar } from '@jupyterlab/ui-components';
@@ -11,14 +18,7 @@ import {
   itemFromName,
   removeStyleFromProperty
 } from '../tools';
-import {
-  IControlPanelModel,
-  IDict,
-  IJcadObjectDocChange,
-  IJupyterCadClientState,
-  IJupyterCadDoc,
-  IJupyterCadModel
-} from '../types';
+import { IControlPanelModel } from '../types';
 import { ObjectPropertiesForm } from './formbuilder';
 
 export class ObjectProperties extends PanelWithToolbar {

packages/base/src/panelview/objecttree.tsx

@@ -1,33 +1,33 @@
-import * as React from 'react';
-import { JSONObject } from '@lumino/coreutils';
-
+import {
+  IDict,
+  IJCadModel,
+  IJCadObject,
+  IJcadObjectDocChange,
+  IJupyterCadClientState,
+  IJupyterCadDoc,
+  IJupyterCadModel
+} from '@jupytercad/schema';
 import { ReactWidget } from '@jupyterlab/apputils';
 import {
+  closeIcon,
   LabIcon,
   PanelWithToolbar,
-  ToolbarButtonComponent,
-  closeIcon
+  ToolbarButtonComponent
 } from '@jupyterlab/ui-components';
+import { JSONObject } from '@lumino/coreutils';
 import { Panel } from '@lumino/widgets';
 import {
   ReactTree,
   ThemeSettings,
   TreeNodeId,
   TreeNodeList
 } from '@naisutech/react-tree';
+import * as React from 'react';
+import { v4 as uuid } from 'uuid';
 
 import visibilitySvg from '../../style/icon/visibility.svg';
 import visibilityOffSvg from '../../style/icon/visibilityOff.svg';
-import { IJCadModel, IJCadObject } from '@jupytercad/schema';
-import {
-  IControlPanelModel,
-  IDict,
-  IJcadObjectDocChange,
-  IJupyterCadClientState,
-  IJupyterCadDoc,
-  IJupyterCadModel
-} from '../types';
-import { v4 as uuid } from 'uuid';
+import { IControlPanelModel } from '../types';
 
 const visibilityIcon = new LabIcon({
   name: 'jupytercad:visibilityIcon',

packages/base/src/panelview/rightpanel.tsx

@@ -1,6 +1,6 @@
+import { JupyterCadDoc } from '@jupytercad/schema';
 import { SidePanel } from '@jupyterlab/ui-components';
 
-import { JupyterCadDoc } from '../model';
 import { IControlPanelModel } from '../types';
 import { ControlPanelHeader } from './header';
 import { ObjectProperties } from './objectproperties';

packages/base/src/sketcher/sketcherdialog.tsx

@@ -1,6 +1,7 @@
+import { IDict, IJupyterCadDoc } from '@jupytercad/schema';
 import { Dialog } from '@jupyterlab/apputils';
 import * as React from 'react';
-import { IDict, IJupyterCadDoc } from '../types';
+
 import { SketcherModel } from './sketchermodel';
 import { SketcherReactWidget } from './sketcherwidget';