refactor(mmel): Extract libmmel out as a separate package

.github/workflows/build.yml

@@ -84,7 +84,7 @@ jobs:
         if: steps.build_cache.outputs.cache-hit != 'true'
         shell: bash
         run: |
-          pnpm run -r build-dist
+          pnpm run -r dist
 
       - name: Save built artefacts to cache
         if: steps.build_cache.outputs.cache-hit != 'true'

.gitignore

@@ -3,6 +3,9 @@
 /dist
 .vs
 
+*.d.ts
+*.d.ts.map
+
 .pnpm-store/
 
 # Created by https://www.toptal.com/developers/gitignore/api/osx,vim,linux,emacs,eclipse,windows,textmate,webstorm,sublimetext,intellij+all,visualstudiocode,node,yarn

package.json

@@ -2,7 +2,6 @@
   "name": "@paneron/smartytrams",
   "version": "0.0.1",
   "description": "MMEL, SMART, etc.",
-  "main": "plugin.js",
   "repository": "https://github.com/paneron/extension-hls",
   "author": {
     "name": "Ribose Inc.",
@@ -13,9 +12,11 @@
     "build": "pnpm run -r build",
     "clean": "pnpm run -r clean",
     "dev": "pnpm run -r dev",
+    "dist": "pnpm run -r dist",
     "fix": "pnpm run -r fix",
     "lint": "pnpm run -r lint",
-    "test": "pnpm run -r test"
+    "test": "pnpm run -r test",
+    "typecheck": "pnpm run -r typecheck"
   },
   "resolutions": {},
   "dependencies": {

packages/legacy/.swcrc

@@ -5,6 +5,12 @@
   },
   "jsc": {
     "externalHelpers": false,
+    "paths": {
+      "@paneron/*": [
+        "../*/src"
+      ]
+    },
+    "baseUrl": ".",
     "parser": {
       "syntax": "typescript",
       "tsx": true,

packages/legacy/package.json

@@ -2,7 +2,7 @@
   "name": "@paneron/extension-hls",
   "version": "1.0.0-dev23",
   "description": "Paneron extension for SMART model editing",
-  "main": "plugin.js",
+  "main": "dist/plugin.js",
   "repository": "https://github.com/paneron/extension-hls",
   "author": {
     "name": "Ribose Inc.",
@@ -27,7 +27,7 @@
     "inject": "run-script-os",
     "inject:mac": "mkdirp $HOME/'Library/Application Support'/Paneron/plugins/${npm_package_name}; rsync -a ${npm_package_dist_dir}/ $HOME/'Library/Application Support'/Paneron/plugins/${npm_package_name}/",
     "inject:win32": "mkdirp \"%appdata%\\Paneron\\plugins\\@paneron\\extension-hls\" && xcopy /e /y %npm_package_dist_dir% \"%appdata%\\Paneron\\plugins\\@paneron\\extension-hls\" > nul",
-    "build-dist": "concurrently npm:build npm:build:decl",
+    "dist": "concurrently npm:build npm:build:decl",
     "build-inject": "pnpm run build && pnpm run inject",
     "build-typecheck": "concurrently npm:build npm:typecheck",
     "clean-build": "pnpm run clean; pnpm run build",
@@ -50,13 +50,7 @@
     "fix": "pnpm run lint --fix"
   },
   "files": [
-    "README.adoc",
-    "*.js",
-    "*.js.map",
-    "*.d.ts",
-    "**/*.js",
-    "**/*.js.map",
-    "**/*.d.ts"
+    "/dist"
   ],
   "resolutions": {
     "@types/react": "16.14.34",
@@ -70,6 +64,7 @@
     "@emotion/eslint-plugin": "^11.10.0",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
+    "@paneron/libmmel": "workspace:*",
     "@react-three/drei": "^7.27.5",
     "@react-three/fiber": "^7.0.29",
     "@riboseinc/paneron-extension-glossarist": "^2.0.7",

packages/legacy/src/smart/model/FlowContainer.ts

@@ -5,7 +5,7 @@
  */
 
 import { XYPosition } from 'react-flow-renderer';
-import { MMELEdge } from '../serialize/interface/flowcontrolinterface';
+import { MMELEdge } from '@paneron/libmmel/interface/flowcontrolinterface';
 import {
   EditorModel,
   EditorNode,
@@ -20,7 +20,7 @@ import {
   MMELLink,
   MMELRole,
   MMELTable,
-} from '../serialize/interface/supportinterface';
+} from '@paneron/libmmel/interface/supportinterface';
 import { SerializedStyles } from '@emotion/react';
 import React from 'react';
 import { MMELRepo, RepoIndex } from './repo';

packages/legacy/src/smart/model/Measurement.ts

@@ -6,7 +6,7 @@ import {
   MMELVariable,
   MMELView,
   VarType,
-} from '../serialize/interface/supportinterface';
+} from '@paneron/libmmel/interface/supportinterface';
 import { EditorModel } from './editormodel';
 
 export interface MTreeNode {

packages/legacy/src/smart/model/States.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { NodeProps } from 'react-flow-renderer';
 import { HistoryItem, PageHistory } from './history';
 import { ModelWrapper } from './modelwrapper';
-import { DataType } from '../serialize/interface/baseinterface';
+import { DataType } from '@paneron/libmmel/interface/baseinterface';
 import { DataLinkEdge, NormalEdge, SelfLoopEdge } from '../ui/flowui/edgeUI';
 import {
   ApprovalComponent,

packages/legacy/src/smart/model/ViewFunctionModel.ts

@@ -1,13 +1,17 @@
 import { SerializedStyles } from '@emotion/react';
 import React from 'react';
-import { MMELDataAttribute } from '../serialize/interface/datainterface';
+import { textToMMEL } from '@paneron/libmmel';
+import { MMELDataAttribute } from '@paneron/libmmel/interface/datainterface';
 import {
   MMELProvision,
   MMELReference,
-} from '../serialize/interface/supportinterface';
+} from '@paneron/libmmel/interface/supportinterface';
 import { EditorNode } from './editormodel';
 import { LegendInterface } from './States';
 
+
+console.log(textToMMEL);
+
 /**
  * For model viewer. The common interface for different functions.
  * Functions like checklist, version tracking etc.

packages/legacy/src/smart/model/checklist.ts

@@ -2,9 +2,9 @@
  * The data model for checklist
  */
 
-import { MMELProvision } from '../serialize/interface/supportinterface';
-import { MMELDataAttribute } from '../serialize/interface/datainterface';
-import { ModalityType } from '../utils/constants';
+import { MMELProvision } from '@paneron/libmmel/interface/supportinterface';
+import { MMELDataAttribute } from '@paneron/libmmel/interface/datainterface';
+import { ModalityType } from '@/smart/utils/constants';
 import {
   EditorApproval,
   EditorDataClass,

packages/legacy/src/smart/model/editor/commands/comment.ts

@@ -2,7 +2,7 @@
  * This file centralizes the commands generated related to comment components
  */
 
-import { MMELComment } from '../../../serialize/interface/supportinterface';
+import { MMELComment } from '@paneron/libmmel/interface/supportinterface';
 import { ModelAction } from '../model';
 
 /**

packages/legacy/src/smart/model/editor/commands/data.ts

@@ -2,7 +2,7 @@
  * This file centralizes the commands generated related to registry and data class
  */
 
-import { MMELReference } from '../../../serialize/interface/supportinterface';
+import { MMELReference } from '@paneron/libmmel/interface/supportinterface';
 import { EditorDataClass } from '../../editormodel';
 import { RegistryCombined } from '../components/element/registry';
 import { ModelAction } from '../model';

packages/legacy/src/smart/model/editor/commands/elements.ts

@@ -2,13 +2,13 @@
  * This file centralizes the commands related to node elements
  */
 
-import { MMELEdge } from '../../../serialize/interface/flowcontrolinterface';
+import { MMELEdge } from '@paneron/libmmel/interface/flowcontrolinterface';
 import {
   MMELLink,
   MMELNote,
   MMELProvision,
   MMELReference,
-} from '../../../serialize/interface/supportinterface';
+} from '@paneron/libmmel/interface/supportinterface';
 import {
   EditorEGate,
   EditorModel,

packages/legacy/src/smart/model/editor/commands/reference.ts

@@ -2,7 +2,7 @@
  * This file centralizes the commands related to reference
  */
 
-import { MMELReference } from '../../../serialize/interface/supportinterface';
+import { MMELReference } from '@paneron/libmmel/interface/supportinterface';
 import { ModelAction } from '../model';
 
 /**

packages/legacy/src/smart/model/editor/commands/role.ts

@@ -2,7 +2,7 @@
  * This file centralizes the commands related to roles
  */
 
-import { MMELRole } from '../../../serialize/interface/supportinterface';
+import { MMELRole } from '@paneron/libmmel/interface/supportinterface';
 import { ModelAction } from '../model';
 
 /**

packages/legacy/src/smart/model/editor/components/comment.ts

@@ -1,4 +1,4 @@
-import { MMELComment } from '../../../serialize/interface/supportinterface';
+import { MMELComment } from '@paneron/libmmel/interface/supportinterface';
 import { EditorNode, EditorProcess } from '../../editormodel';
 import { UndoReducerInterface } from '../interface';
 import { ModelAction } from '../model';

packages/legacy/src/smart/model/editor/components/element/dc.ts

@@ -1,4 +1,4 @@
-import { MMELSubprocess } from '../../../../serialize/interface/flowcontrolinterface';
+import { MMELSubprocess } from '@paneron/libmmel/interface/flowcontrolinterface';
 import { fillRDCS } from '../../../../utils/ModelFunctions';
 import {
   EditorDataClass,

packages/legacy/src/smart/model/editor/components/element/registry.ts

@@ -1,6 +1,6 @@
-import { DataType } from '../../../../serialize/interface/baseinterface';
-import { MMELSubprocess } from '../../../../serialize/interface/flowcontrolinterface';
-import { isRegistry } from '../../../../serialize/util/validation';
+import { DataType } from '@paneron/libmmel/interface/baseinterface';
+import { MMELSubprocess } from '@paneron/libmmel/interface/flowcontrolinterface';
+import { isRegistry } from '@paneron/libmmel/util/validation';
 import { createRegistry } from '../../../../utils/EditorFactory';
 import {
   fillRDCS,

packages/legacy/src/smart/model/editor/components/enums.ts

@@ -1,4 +1,4 @@
-import { MMELEnum } from '../../../serialize/interface/datainterface';
+import { MMELEnum } from '@paneron/libmmel/interface/datainterface';
 import { EditorNode, isEditorDataClass } from '../../editormodel';
 import { UndoReducerInterface } from '../interface';
 import { ModelAction } from '../model';

packages/legacy/src/smart/model/editor/components/figure.ts

@@ -1,4 +1,4 @@
-import { MMELFigure } from '../../../serialize/interface/supportinterface';
+import { MMELFigure } from '@paneron/libmmel/interface/supportinterface';
 import { EditorNode, isEditorProcess } from '../../editormodel';
 import { UndoReducerInterface } from '../interface';
 import { ModelAction } from '../model';

packages/legacy/src/smart/model/editor/components/links.ts

@@ -1,5 +1,5 @@
 import { useReducer } from 'react';
-import { MMELLink } from '../../../serialize/interface/supportinterface';
+import { MMELLink } from '@paneron/libmmel/interface/supportinterface';
 import { UndoReducerInterface } from '../interface';
 
 interface RefCascadeAction {

packages/legacy/src/smart/model/editor/components/meta.ts

@@ -1,5 +1,5 @@
 import { useReducer } from 'react';
-import { MMELMetadata } from '../../../serialize/interface/supportinterface';
+import { MMELMetadata } from '@paneron/libmmel/interface/supportinterface';
 import { UndoReducerInterface } from '../interface';
 
 interface EditAction {

packages/legacy/src/smart/model/editor/components/notes.ts

@@ -1,5 +1,5 @@
 import { useReducer } from 'react';
-import { MMELNote } from '../../../serialize/interface/supportinterface';
+import { MMELNote } from '@paneron/libmmel/interface/supportinterface';
 import { refNotesReplace } from '../../../utils/handler/cascadeModelHandler';
 import { UndoReducerInterface } from '../interface';
 

packages/legacy/src/smart/model/editor/components/pages.ts

@@ -2,7 +2,7 @@ import { useReducer } from 'react';
 import {
   MMELEdge,
   MMELSubprocess,
-} from '../../../serialize/interface/flowcontrolinterface';
+} from '@paneron/libmmel/interface/flowcontrolinterface';
 import { createSubprocessComponent } from '../../../utils/EditorFactory';
 import {
   dataPageReplace,

packages/legacy/src/smart/model/editor/components/provision.ts

@@ -1,5 +1,5 @@
 import { useReducer } from 'react';
-import { MMELProvision } from '../../../serialize/interface/supportinterface';
+import { MMELProvision } from '@paneron/libmmel/interface/supportinterface';
 import { refProvisionReplace } from '../../../utils/handler/cascadeModelHandler';
 import { UndoReducerInterface } from '../interface';
 

packages/legacy/src/smart/model/editor/components/ref.ts

@@ -2,7 +2,7 @@ import {
   MMELNote,
   MMELProvision,
   MMELReference,
-} from '../../../serialize/interface/supportinterface';
+} from '@paneron/libmmel/interface/supportinterface';
 import { EditorNode, isEditorDataClass } from '../../editormodel';
 import { UndoReducerInterface } from '../interface';
 import { ModelAction } from '../model';

packages/legacy/src/smart/model/editor/components/roles.ts

@@ -1,4 +1,4 @@
-import { MMELRole } from '../../../serialize/interface/supportinterface';
+import { MMELRole } from '@paneron/libmmel/interface/supportinterface';
 import { RoleAttribute } from '../../../utils/handler/cascadeModelHandler';
 import {
   EditorNode,

packages/legacy/src/smart/model/editor/components/sections.ts

@@ -1,4 +1,4 @@
-import { MMELTextSection } from '../../../serialize/interface/supportinterface';
+import { MMELTextSection } from '@paneron/libmmel/interface/supportinterface';
 import { UndoReducerInterface } from '../interface';
 import { ItemAction, useItems } from './itemTemplate';
 

packages/legacy/src/smart/model/editor/components/table.ts

@@ -1,4 +1,4 @@
-import { MMELTable } from '../../../serialize/interface/supportinterface';
+import { MMELTable } from '@paneron/libmmel/interface/supportinterface';
 import { EditorNode, isEditorProcess } from '../../editormodel';
 import { UndoReducerInterface } from '../interface';
 import { ModelAction } from '../model';

packages/legacy/src/smart/model/editor/components/terms.ts

@@ -1,4 +1,4 @@
-import { MMELTerm } from '../../../serialize/interface/supportinterface';
+import { MMELTerm } from '@paneron/libmmel/interface/supportinterface';
 import { UndoReducerInterface } from '../interface';
 import { ItemAction, useItems } from './itemTemplate';
 

packages/legacy/src/smart/model/editor/components/vars.ts

@@ -1,4 +1,4 @@
-import { MMELVariable } from '../../../serialize/interface/supportinterface';
+import { MMELVariable } from '@paneron/libmmel/interface/supportinterface';
 import { UndoReducerInterface } from '../interface';
 import { ModelAction } from '../model';
 import { ItemAction, useItems } from './itemTemplate';

packages/legacy/src/smart/model/editor/components/view.ts

@@ -1,4 +1,4 @@
-import { MMELView } from '../../../serialize/interface/supportinterface';
+import { MMELView } from '@paneron/libmmel/interface/supportinterface';
 import { UndoReducerInterface } from '../interface';
 import { ModelAction } from '../model';
 import { ItemAction, useItems } from './itemTemplate';

packages/legacy/src/smart/model/editor/hybird/distributor.ts

@@ -7,13 +7,13 @@
  * A3. If an undo is needed, execute the 'compiled' actions appended to the undo action
  */
 
-import { MMELEdge } from '../../../serialize/interface/flowcontrolinterface';
+import { MMELEdge } from '@paneron/libmmel/interface/flowcontrolinterface';
 import {
   MMELLink,
   MMELNote,
   MMELProvision,
   MMELReference,
-} from '../../../serialize/interface/supportinterface';
+} from '@paneron/libmmel/interface/supportinterface';
 import {
   EditorDataClass,
   EditorEGate,

packages/legacy/src/smart/model/editor/hybird/egateedit.ts

@@ -1,4 +1,4 @@
-import { MMELEdge } from '../../../serialize/interface/flowcontrolinterface';
+import { MMELEdge } from '@paneron/libmmel/interface/flowcontrolinterface';
 import { EditorModel, isEditorEgate } from '../../editormodel';
 import { ModelAction } from '../model';
 import { HyEditAction } from './distributor';