Merge pull request #12 from matheuslenke/refactor/fixing-tonto-import-for-catalog

Refactor/fixing tonto import for catalog

Author: matheuslenke

.eslintrc.json

@@ -18,10 +18,8 @@
         "@typescript-eslint"
     ],
     "rules": {
-        "indent": [
-            "error",
-            2
-        ],
+        "indent": "off",
+        "@typescript-eslint/indent": ["error"],
         "linebreak-style": [
             "error",
             "unix"

.vscode/launch.json

@@ -19,7 +19,7 @@
             ]
         },
         {
-            "name": "CLI: Import Modular",
+            "name": "CLI: Import From JSON",
             "program": "${workspaceFolder}/packages/tonto/bin/cli",
             "request": "launch",
             "skipFiles": [
@@ -28,7 +28,8 @@
             "type": "node",
             "args": [
                 "import",
-                "${workspaceFolder}/examples/library/ontology.json"
+                "${workspaceFolder}/examples/newGeneration/ontology.json",
+                "generated"
             ]
         },
         {
@@ -41,7 +42,7 @@
             "type": "node",
             "args": [
                 "validate",
-                "${workspaceFolder}/examples/library",
+                "${workspaceFolder}/examples/newGeneration",
                 "--local",
                 ">> errors.txt"
             ]
@@ -96,7 +97,8 @@
             "request": "launch",
             "args": [
                 // "${workspaceFolder}/../tonto-example-models/Library",
-                "${workspaceFolder}/../tonto-catalog/models/abel2015petroleum-system",
+                // "${workspaceFolder}/../tonto-catalog/models/abel2015petroleum-system",
+                "${workspaceFolder}/examples/newGeneration",
                 "--extensionDevelopmentPath=${workspaceFolder}/packages/tonto-vscode"
             ],
             "outFiles": [

examples/University/CoreDatatypes.tonto

@@ -0,0 +1,15 @@
+package PersonAndOrganizationDatatypes
+
+datatype int specializes number
+
+datatype Address {
+  country: string
+  city: string
+  postalCode: string
+  street: string
+  streetNumber: int
+}
+
+enum EyeColor { Blue, Green, Brown, Black }
+
+

examples/University/PersonAndOrganizationDatatypes.tonto

@@ -0,0 +1,30 @@
+import PersonAndOrganizationDatatypes
+
+package Persons
+
+kind Person {
+  age: number { derived }
+  eyeColor: EyeColor [1..2]
+  birthDate: date { const }
+  firstName: string
+  preferredNames: string [1..*] { ordered }
+}
+
+type PersonTypeByAge
+
+phase Child
+phase Teenager
+phase Adult
+
+disjoint complete genset PhasesOfPerson {
+  general Person
+  categorizer PersonTypeByAge
+  specifics Child, Teenager, Adult
+}
+
+role UniversityStudent specializes Person
+
+role Employee specializes Person
+role Professor specializes Employee
+
+role PhDCandidate specializes Person

examples/University/PersonPhases.tonto

@@ -1,44 +1,28 @@
-import CoreDatatypes
-import PersonPhases
+import PersonAndOrganizationDatatypes
+import Persons
 package University
 
 category Organization
 kind University specializes Organization {
   address: Address
-  @componentOf
-  [1] <>-- has -- [1..*] Department
-  @componentOf
-  [1] <>-- [0..*] Classroom
+  @componentOf [1] <o>-- has -- [2..*] Department
 }
 
-relation Department [1] <>-- [1] JuniorStaff
+relation Department [1] -- [1] Staff
 
 kind Department {
-  name: string
+  [1] -- constitutedBy -- [1] Staff
 }
-collective Staff
-subkind JuniorStaff specializes Staff
-
-kind teste {
-  
+collective Staff {
+  @memberOf [1..*] <>-- members -- [2..*] Employee
 }
 
-kind Room
-subkind Classroom specializes Room
-
-// collective Staff {
-//   [1] <o>-- hasMember -- [0..*] Employee
-// }
-
-subkind SeniorStaff specializes Staff
-
-roleMixin Employer
-
-role UniversityEmployer specializes Employer, University
+collective SeniorStaff {
+  @subCollectionOf [1] --<o> [1] Staff
+  @memberOf [1..*] <>-- professors -- [2..*] Professor ({subsets members})
+}
 
-relator EmploymentContract {
-  @mediation
-  [1..*] -- [1] Employee
-  @mediation
-  [1..*] -- [1] Employer
-}
+relator PhDEnrollment {
+  @mediation [*] -- [1] University
+  @mediation [1..*] -- [1] Persons.PhDCandidate
+}

examples/University/Persons.tonto

@@ -0,0 +1,45 @@
+import SPO
+import RDBSO
+import SwO
+
+package DBSO
+
+category DBMS_Item of functional-complexes  specializes Software_Item 
+
+subkind Data_Language of functional-complexes  specializes Language 
+
+collective Database specializes DBMS_Item {
+    [1] -- [1..*] Data_File 
+}
+
+subkind Data_Schema of functional-complexes  specializes Schema 
+
+kind Schema specializes DBMS_Item {
+    [1..*] -- describes -- [1] Database 
+}
+
+subkind Information_Schema of functional-complexes  specializes Schema {
+    [1] -- defines -- [0..*] Data_Schema 
+}
+
+kind Dictionary specializes DBMS_Item {
+    [1] -- records -- [1..*] Schema 
+    [1] -- records -- [1..*] DBMS_Account 
+}
+
+kind DBMS_Account specializes DBMS_Item 
+
+subkind DBMS specializes Software_System {
+    [0..*] -- adopts -- [1] Data_Language 
+}
+
+mode Loaded_DBMS_Copy specializes Loaded_Software_System_Copy {
+    [0..*] -- manages -- [1..*] DBMS_Item 
+    [0..*] -- materialization_of -- [1] DBMS 
+}
+
+subkind Database_System of functional-complexes  specializes Computer_System {
+    [1] -- has -- [*] DBMS_Item 
+    [1] -- has -- [1..*] Loaded_DBMS_Copy 
+}
+