add some more stuff to MCL and mocha system

2024-08-26 22:56:40 -04:00 · 2024-08-26 22:56:40 -04:00 · 57b16fc34e
commit 57b16fc34e
parent ca5d5c0b4a
24 changed files with 395 additions and 98 deletions
--- a/mocha-common/build
+++ b/mocha-common/build
@ -5,3 +5,4 @@ if [ ! -d output ]; then
 fi

 ./yaml2mcl --export-entities=output/net.alcetech.Mocha.System.cs -o output/net.alcetech.Mocha.System.mcl data/libraries/yaml/net.alcetech.Mocha.System
+./yaml2mcl --reference output/net.alcetech.Mocha.System.mcl --export-entities=output/net.alcetech.Mocha.Web.cs -o output/net.alcetech.Mocha.Web.mcl data/libraries/yaml/net.alcetech.Mocha.Web
--- a/mocha-common/compilers/yaml2mcl/Program.py
+++ b/mocha-common/compilers/yaml2mcl/Program.py
@ -29,10 +29,12 @@ class Yaml2Mcl:
 	def start(self):

 		args = sys.argv[1:]
+		# args = [ '-o', '/tmp/net.alcetech.Mocha.System.mcl', '/home/beckermj/Documents/Projects/mochapowered/mocha-dotnet/mocha-common/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System' ]

 		filenames = [ ]
 		outputFileName = ""
 		exportEntitiesFileName = None
+		libraryReferences = [ ]

 		while (len(args) > 0):
 			# print (args[0])
@ -45,6 +47,9 @@ class Yaml2Mcl:
 			elif args[0].startswith("--export-entities="):
 				exportEntitiesFileName = args[0].split('=', 2)[1]
 				args = args[1:]
+			elif args[0] == "--reference":
+				libraryReferences.append(args[1])
+				args = args[2:]
 			else:
 				filenames.append(args[0])
 				args = args[1:]
@ -54,6 +59,10 @@ class Yaml2Mcl:
 		print ("Version 1.0")
 		print ("")

+		print ("refs: ")
+		print (libraryReferences)
+		print ("")
+
 		print (filenames)
 		print ("output to: " + outputFileName)

--- a/mocha-common/compilers/yaml2mcl/mocha/core/init.py
+++ b/mocha-common/compilers/yaml2mcl/mocha/core/init.py
@ -0,0 +1,18 @@
+# Copyright (C) 2024 Michael Becker  <alcexhim@gmail.com>
+# 
+# This file is part of yaml2mcl.
+# 
+# yaml2mcl is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# yaml2mcl is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with yaml2mcl.  If not, see <https://www.gnu.org/licenses/>.
+
+from .Guid import Guid
--- a/mocha-common/compilers/yaml2mcl/mocha/library/editormini/DataFormat.py
+++ b/mocha-common/compilers/yaml2mcl/mocha/library/editormini/DataFormat.py
@ -0,0 +1,20 @@
+# Copyright (C) 2024 Michael Becker  <alcexhim@gmail.com>
+# 
+# This file is part of yaml2mcl.
+# 
+# yaml2mcl is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# yaml2mcl is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with yaml2mcl.  If not, see <https://www.gnu.org/licenses/>.
+
+class DataFormat:
+
+	pass
--- a/mocha-common/compilers/yaml2mcl/mocha/library/editormini/dataformats/McxDataFormat.py
+++ b/mocha-common/compilers/yaml2mcl/mocha/library/editormini/dataformats/McxDataFormat.py
@ -0,0 +1,22 @@
+# Copyright (C) 2024 Michael Becker  <alcexhim@gmail.com>
+# 
+# This file is part of yaml2mcl.
+# 
+# yaml2mcl is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# yaml2mcl is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with yaml2mcl.  If not, see <https://www.gnu.org/licenses/>.
+
+class McxDataFormat (DataFormat):
+
+	def load_internal(self, stream):
+
+		r = Reader(stream)
--- a/mocha-common/compilers/yaml2mcl/mocha/library/manager/sectionfile/Section.py
+++ b/mocha-common/compilers/yaml2mcl/mocha/library/manager/sectionfile/Section.py
@ -106,3 +106,19 @@ class ResourcesSection (Section):
 	def write_data(self, f):
 		for rsrc in self.data:
 			f.write(rsrc)
+
+class DefinitionsSection(Section):
+	def __init__(self, data: list):
+		Section.__init__(self, 'Defs', data, 0)
+
+	def get_length(self):
+		length = 4
+		for item in self.data:
+			length += len(item) + 1 + 32
+		return length
+	def write_data(self, f):
+		for item in self.data:
+			f.write(item[0].encode('utf-8'))
+			f.write(int.to_bytes(0, 1))
+			f.write(item[1].encode('utf-8'))
+			f.write(int.to_bytes(0, 1))
--- a/mocha-common/compilers/yaml2mcl/mocha/library/manager/sectionfile/SectionFile.py
+++ b/mocha-common/compilers/yaml2mcl/mocha/library/manager/sectionfile/SectionFile.py
@ -15,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with yaml2mcl.  If not, see <https://www.gnu.org/licenses/>.

+from mocha.core import Guid
 from .Section import Section

 class SectionFile:
@ -47,7 +48,9 @@ class SectionFile:
 		section_count = len(self.sections)
 		f.write(int.to_bytes(section_count, 4, 'little'))

-		offset = 16 + (section_count * 32)
+		f.write(Guid.create().to_bytes())
+
+		offset = 32 + (section_count * 32)
 		lastLength = 0
 		for sect in self.sections:
 			offset += lastLength
@ -55,9 +58,9 @@ class SectionFile:
 			
 			f.write(str(sect.name).ljust(16, '\0').encode("utf-8"))
 			f.write(int.to_bytes(offset, 4, 'little'))
-			f.write(int.to_bytes(length, 4, 'little'))
+			f.write(int.to_bytes(length, 4, 'little')) # compressed length for compressed sections
+			f.write(int.to_bytes(length, 4, 'little')) # decompressed length for compressed sections
 			f.write(int.to_bytes(len(sect.data), 4, 'little'))
-			f.write(int.to_bytes(0, 4, 'little')) # reserved or padding

 			lastLength = length

--- a/mocha-common/compilers/yaml2mcl/mocha/library/manager/sectionfile/init.py
+++ b/mocha-common/compilers/yaml2mcl/mocha/library/manager/sectionfile/init.py
@ -13,4 +13,4 @@
 # limitations under the License.

 from .SectionFile import SectionFile
-from .Section import Section, GuidSection, InstancesSection, AttributesSection, RelationshipsSection, StringTableSection, ResourcesSection
+from .Section import Section, GuidSection, InstancesSection, AttributesSection, RelationshipsSection, StringTableSection, ResourcesSection, DefinitionsSection
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/002-Attributes.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/002-Attributes.yaml
@ -16,6 +16,7 @@
  - IDA_Comment: '{a70cbe2b-9e17-45d0-a109-e250b5d500f1}'
  - IDA_MethodName: '{de275bb8-5281-48ab-9919-6fa2d790549e}'
  - IDA_NotInUse: '{55777441-33b5-4303-93bf-20a77dec3b6f}'
+  - IDA_MinimumLength: '{8590e809-3947-418a-a32d-fdbfc0776a55}'
  - IDA_MaximumLength: '{6d69fee2-f220-4aad-ab89-01bfa491dae1}'
  - IDA_MinimumValueNumeric: '{bc90ffdf-9b6e-444a-a484-f9d06d7f3c31}'
  - IDA_MaximumValueNumeric: '{b9353b1c-2597-4097-96eb-449a6fafcdab}'
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml
@ -41,9 +41,6 @@
  - IDR_Relationship__has_sibling__Relationship: "{656110FF-4502-48B8-A7F3-D07F017AEA3F}"
  - IDR_Relationship__is_sibling__Relationship: "{FA08B2A4-71E2-44CB-9252-8CE336E2E1AD}"

-  - IDR_Translation__has__Translation_Value: "{F9B60C00-FF1D-438F-AC74-6EDFA8DD7324}"
-  - IDR_Translation_Value__has__Language: "{3655AEC2-E2C9-4DDE-8D98-0C4D3CE1E569}"
-
  - IDR_Element_Content__built_from__BEM_Process: '{3d7094ff-33e5-4800-9e4e-93dde0d1d331}'
  - IDR_BEM_Process__builds__Element_Content: '{9d3220a3-6919-4ebe-97be-49bb9c304c2d}'

@ -139,7 +136,7 @@

  - IDR_Prompt_Value__has__Prompt: "{7CD62362-DDCE-4BFC-87B9-B5499B0BC141}"

-  - IDR_User__has_display_name__Translatable_Text_Constant: "{6C29856C-3B10-4F5B-A291-DD3CA4C04A2F}"
+  - IDR_User__has_display_name__Translation: "{6C29856C-3B10-4F5B-A291-DD3CA4C04A2F}"
  - IDR_User_Login__has__User: "{85B40E4B-849B-4006-A9C0-4E201B25975F}"

  - IDR_System_Account__for__Person: "{f0c07f27-7601-4760-ab3d-851395aa325e}"
@ -168,13 +165,15 @@


  - IDR_Tenant__has__Application: "{22936f51-2629-4503-a30b-a02d61a6c0e0}"
+  - IDR_Application__for__Tenant: '{c4ac2f1f-56c8-496f-9f93-3a0a2bb9a54c}'
+  
  - IDR_Tenant__has_sidebar__Menu: "{D62DFB9F-48D5-4697-AAAD-1CAD0EA7ECFA}"
  - IDR_Tenant__has__Tenant_Type: "{E94B6C9D-3307-4858-9726-F24B7DB21E2D}"

  - IDR_Tenant__has_company_logo_image__File: "{3540c81c-b229-4eac-b9b5-9d4b4c6ad1eb}"

  - IDR_Menu__has__Menu_Section: "{a22d949f-f8d1-4dcc-a3eb-d9f910228dfd}"
-  - IDR_Menu_Item__has_title__Translatable_Text_Constant: "{65E3C87E-A2F7-4A33-9FA7-781EFA801E02}"
+  - IDR_Menu_Item__has_title__Translation: "{65E3C87E-A2F7-4A33-9FA7-781EFA801E02}"
  - IDR_Menu_Section__has__Menu_Item: "{5b659d7c-58f9-453c-9826-dd3205c3c97f}"

  - IDR_Command_Menu_Item__has__Icon: "{8859DAEF-01F7-46FA-8F3E-7B2F28E0A520}"
@ -194,7 +193,7 @@
  - IDR_Page_Component__has__Style: "{818CFF50-7D42-43B2-B6A7-92C3C54D450D}"
  - IDR_Style__for__Page_Component: "{007563E7-7277-4436-8C82-06D5F156D8E1}"

-  - IDR_Button_Page_Component__has_text__Translatable_Text_Constant: "{C25230B1-4D23-4CFE-8B75-56C33E8293AF}"
+  - IDR_Button_Page_Component__has_text__Translation: "{C25230B1-4D23-4CFE-8B75-56C33E8293AF}"
  - IDR_Image_Page_Component__has_source__Method: "{481E3FBE-B82A-4C76-9DDF-D66C6BA8C590}"

  - IDR_Sequential_Container_Page_Component__has__Sequential_Container_Orientation: "{DD55F506-8718-4240-A894-21346656E804}"
@ -213,18 +212,16 @@
  - IDR_Tenant__has_logo_image__File: "{4C399E80-ECA2-4A68-BFB4-26A5E6E97047}"
  - IDR_Tenant__has_background_image__File: "{39B0D963-4BE0-49C8-BFA2-607051CB0101}"
  - IDR_Tenant__has_icon_image__File: "{CC4E65BD-7AAA-40DA-AECA-C607D7042CE3}"
-  - IDR_Tenant__has_login_header__Translatable_Text_Constant: "{41D66ACB-AFDE-4B6F-892D-E66255F10DEB}"
-  - IDR_Tenant__has_login_footer__Translatable_Text_Constant: "{A6203B6B-5BEB-4008-AE49-DB5E7DDBA45B}"
  - IDR_Tenant__has_application_title__Translation: "{76683437-67ba-46d9-a5e7-2945be635345}"
  - IDR_Tenant__has_mega__Menu: "{cdd743cb-c74a-4671-9922-652c7db9f2d8}"

-  - IDR_Tenant_Type__has_title__Translatable_Text_Constant: "{79AAE09C-5690-471C-8442-1B230610456C}"
+  - IDR_Tenant_Type__has_title__Translation: "{79AAE09C-5690-471C-8442-1B230610456C}"

-  - IDR_Prompt__has_title__Translatable_Text_Constant: "{081ee211-7534-43c4-99b5-24bd9537babc}"
+  - IDR_Prompt__has_title__Translation: "{081ee211-7534-43c4-99b5-24bd9537babc}"

-  - IDR_Report__has_title__Translatable_Text_Constant: "{DF93EFB0-8B5E-49E7-8BC0-553F9E7602F9}"
-  - IDR_Report__has_description__Translatable_Text_Constant: "{D5AA18A7-7ACD-4792-B039-6C620A151BAD}"
-  - IDR_Report_Field__has_title__Translatable_Text_Constant: "{6780BFC2-DBC0-40AE-83EE-BFEF979F0054}"
+  - IDR_Report__has_title__Translation: "{DF93EFB0-8B5E-49E7-8BC0-553F9E7602F9}"
+  - IDR_Report__has_description__Translation: "{D5AA18A7-7ACD-4792-B039-6C620A151BAD}"
+  - IDR_Report_Field__has_title__Translation: "{6780BFC2-DBC0-40AE-83EE-BFEF979F0054}"

  - IDR_Content_Page_Component__gets_content_from__Method: "{0E002E6F-AA79-457C-93B8-2CCE1AEF5F7E}"
  - IDR_Method__provides_content_for__Content_Page_Component: "{5E75000D-2421-4AD4-9E5F-B9FDD9CB4744}"
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00020-NumericAttribute.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00020-NumericAttribute.yaml
@ -32,6 +32,9 @@
  - numericAttribute: '&IDA_MaximumLength;'
    name:         'Maximum Length'
    index:        4
+  - numericAttribute: '&IDA_MinimumLength;'
+    name:         'Minimum Length'
+    index:        8
  - numericAttribute: '&IDA_WholeNumber;'
    name:         'Whole Number'
    decimalPositions: 0
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00041-Application.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00041-Application.yaml
@ -1,8 +1,26 @@
 - entityDefinitions:
  - IDC_Application: '{06b6e9bc-812d-49fa-aab2-33654069f815}'

+  - IDR_Application__has_title__Translation: '{17e7437a-95bb-472f-a068-c433b715c3e4}'
+  - IDR_Translation__title_for__Application: '{79aca30e-ddf9-4d3b-8be7-80b4aaf82c1f}'
+
 - library: '&IDL_MochaBaseSystem;'
  instances:
  - class: '&IDC_Application;'
    name: Application
    index: 41
+
+  
+  - relationship: '&IDR_Application__has_title__Translation;'
+    sourceClassId: '&IDC_Application;'
+    type: 'has title'
+    destinationClassId: '&IDC_Translation;'
+    siblingRelationshipId: '&IDR_Translation__title_for__Application;'
+    singular: yes
+
+  - relationship: '&IDR_Translation__title_for__Application;'
+    sourceClassId: '&IDC_Translation;'
+    type: 'title for'
+    destinationClassId: '&IDC_Application;'
+    siblingRelationshipId: '&IDR_Application__has_title__Translation;'
+    singular: no
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00085-ReturnElementMethodBinding.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00085-ReturnElementMethodBinding.yaml
@ -0,0 +1,28 @@
+---
+- library: '&IDL_MochaBaseSystem;'
+  instances:
+  - class:    '&IDC_ReturnElementMethodBinding;'
+    name:      Return Element Method Binding
+    index:     85
+    customTagName: returnElementMethodBinding
+    superclasses:
+    - instance: '&IDC_MethodBinding;'
+    # - instance: '&IDC_ExecutableReturningElement;'
+    instancesLabeledByRAMB: '&IDMB_Method_Binding__get__Executes_Method_and_Method_Type_RAMB;'
+    # defaultTask: '&IDI_Task_ViewReturnElementMethodBinding;'
+    # relatedTasks:
+    # - instance: '&IDI_Task_ViewReturnElementMethodBinding;'
+    # - instance: '&IDI_Task_EditReturnElementMethodBinding;'
+    # - instance: '&IDI_Task_TestMethodBinding;'
+    # - instance: '&IDI_Task_CloneMethodBinding;'
+    translations:
+    - relationship: '&IDR_Class__has_title__Translation;'
+      values:
+      - languageInstanceId: '&IDI_Language_English;'
+        value: 'Return Element Method Binding'
+    relationships: # FIXME: remove this when we can properly inherit definitions in zq-python
+    - instance: '&IDR_Method_Binding__executes__Method;'
+      customTagName: 'executesMethod'
+    - instance: '&IDR_Method_Binding__has__Parameter_Assignment;'
+      customTagName: 'parameterAssignments'
+      customTagNameCreatesInstanceOf: '&IDC_ParameterAssignment;'
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00361-Tenant.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00361-Tenant.yaml
@ -1,3 +1,9 @@
+- entityDefinitions:
+  - IDR_Tenant__has_login_header__Translation: "{41D66ACB-AFDE-4B6F-892D-E66255F10DEB}"
+  - IDR_Translation__login_header_for__Tenant: "{c17cb672-22e1-43b7-af67-79175200631b}"
+  - IDR_Tenant__has_login_footer__Translation: "{A6203B6B-5BEB-4008-AE49-DB5E7DDBA45B}"
+  - IDR_Translation__login_footer_for__Tenant: "{5d4c15f9-fa08-4369-99df-585e1adfc9e4}"
+  
 - library: '&IDL_MochaBaseSystem;'
  instances:
  - class: '&IDC_Tenant;'
@ -10,3 +16,46 @@
  - tenant: '&IDI_Tenant_Singleton;'
    index: 1
    
+  - relationship: '&IDR_Tenant__has__Application;'
+    sourceClassId: '&IDC_Tenant;'
+    type: 'has'
+    destinationClassId: '&IDC_Application;'
+    siblingRelationshipId: '&IDR_Application__for__Tenant;'
+    singular: yes
+
+  - relationship: '&IDR_Application__for__Tenant;'
+    sourceClassId: '&IDC_Application;'
+    type: 'for'
+    destinationClassId: '&IDC_Tenant;'
+    siblingRelationshipId: '&IDR_Tenant__has__Application;'
+    singular: no
+
+  - relationship: '&IDR_Tenant__has_login_header__Translation;'
+    sourceClassId: '&IDC_Tenant;'
+    type: 'has login header'
+    destinationClassId: '&IDC_Translation;'
+    siblingRelationshipId: '&IDR_Translation__login_header_for__Tenant;'
+    singular: yes
+
+  - relationship: '&IDR_Translation__login_header_for__Tenant;'
+    sourceClassId: '&IDC_Translation;'
+    type: 'login header for'
+    destinationClassId: '&IDC_Tenant;'
+    siblingRelationshipId: '&IDR_Tenant__has_login_header__Translation;'
+    singular: no
+
+  
+  - relationship: '&IDR_Tenant__has_login_footer__Translation;'
+    sourceClassId: '&IDC_Tenant;'
+    type: 'has login footer'
+    destinationClassId: '&IDC_Translation;'
+    siblingRelationshipId: '&IDR_Translation__login_footer_for__Tenant;'
+    singular: yes
+
+  - relationship: '&IDR_Translation__login_footer_for__Tenant;'
+    sourceClassId: '&IDC_Translation;'
+    type: 'login footer for'
+    destinationClassId: '&IDC_Tenant;'
+    siblingRelationshipId: '&IDR_Tenant__has_login_footer__Translation;'
+    singular: no
+
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00922-DerivedElementContent.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00922-DerivedElementContent.yaml
@ -0,0 +1,37 @@
+---
+- entityDefinitions:
+  - IDC_DerivedElementContent: '{6c0b11ff-fea0-4376-a58a-e993fddd2f39}'
+  
+- library: '&IDL_MochaBaseSystem;'
+  instances:
+  - class:      '&IDC_DerivedElementContent;'
+    name:      Derived Element Content
+    index:     922
+    customTagName: 'derivedElementContent'
+    registerForTemplate: yes
+    defaultTask: '&IDI_Task_ViewElementContent;'
+    superclasses:
+    - instance: '&IDC_ElementContent;'
+    instancesLabeledByRAMB: '&IDMB_Element_Content__get__Fully_Qualified_Name;'
+    relatedTasks:
+    - instance: '&IDI_Task_ViewElementContent;'
+    - instance: '&IDI_Task_EditElementContent;'
+    relationships:
+    - instance: '&IDR_Element_Content__has__Instance;'
+      customTagName: 'defaultDataType'
+    - instance: '&IDR_Element_Content__has__Element_Content_Display_Option;'
+      customTagName: 'displayOptions'
+    - instance: '&IDR_Element_Content__has__Layout;'
+      customTagName: 'layout'
+    - instance: '&IDR_Element_Content__built_from__BEM_Process;'
+      customTagName: 'builtFromBEMProcess'
+      customTagNameCreatesInstanceOf: '&IDC_BEMProcess;'
+    - instance: '&IDR_Derived_Element_Content__update_with__Executable_returning_Work_Data;'
+      customTagName: 'value'
+    - instance: '&IDR_Element_Content__has__EC_Dynamic_Display_Option;'
+      customTagName: 'dynamicDisplayOptions'
+      customTagNameCreatesInstanceOf: '&IDC_ECDynamicDisplayOption;'
+    - instance: '&IDR_Element_Content__has__Parameter_Assignment;'
+      customTagName: 'parameterAssignments'
+      customTagNameCreatesInstanceOf: '&IDC_ParameterAssignment;'
+      
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01502-Translation.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01502-Translation.yaml
@ -0,0 +1,34 @@
+---
+- entityDefinitions:
+  - IDR_Translation__has__Translation_Value: '{F9B60C00-FF1D-438F-AC74-6EDFA8DD7324}'
+  - IDR_Translation_Value__for__Translation: '{458c218a-9965-44ba-884b-deda5bf2931d}'
+
+- library: '&IDL_MochaBaseSystem;'
+  instances:
+  - class:    '&IDC_Translation;'
+    name:      Translation
+    index:     1502
+    registerForTemplate: yes
+    # customTagName: translation
+    # instancesLabeledByRAMB: '&IDMB_Method_Binding__get__Executes_Method_and_Method_Type_RAMB;'
+    # defaultTask: '&IDI_Task_ViewTranslation;'
+    # relatedTasks:
+    # - instance: '&IDI_Task_ViewTranslation;'
+    # - instance: '&IDI_Task_EditTranslation;'
+    relationships: # FIXME: remove this when we can properly inherit definitions in zq-python
+    - instance: '&IDR_Translation__has__Translation_Value;'
+      customTagName: 'values'
+      
+  - relationship: '&IDR_Translation__has__Translation_Value;'
+    sourceClassId: '&IDC_Translation;'
+    type: 'has'
+    destinationClassId: '&IDC_TranslationValue;'
+    siblingRelationshipId: '&IDR_Translation_Value__for__Translation;'
+    singular: no
+
+  - relationship: '&IDR_Translation_Value__for__Translation;'
+    sourceClassId: '&IDC_TranslationValue;'
+    type: 'for'
+    destinationClassId: '&IDC_Translation;'
+    siblingRelationshipId: '&IDR_Translation__has__Translation_Value;'
+    singular: no
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01509-TranslationValue.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01509-TranslationValue.yaml
@ -0,0 +1,34 @@
+---
+- entityDefinitions:
+  - IDR_Translation_Value__has__Language: '{3655AEC2-E2C9-4DDE-8D98-0C4D3CE1E569}'
+  - IDR_Language__for__Translation_Value: '{bf885bb1-da84-447c-95dc-143ce9deac65}'
+
+- library: '&IDL_MochaBaseSystem;'
+  instances:
+  - class:    '&IDC_TranslationValue;'
+    name:      Translation Value
+    index:     1509
+    registerForTemplate: yes
+    # customTagName: translation
+    # instancesLabeledByRAMB: '&IDMB_Method_Binding__get__Executes_Method_and_Method_Type_RAMB;'
+    # defaultTask: '&IDI_Task_ViewTranslation;'
+    # relatedTasks:
+    # - instance: '&IDI_Task_ViewTranslation;'
+    # - instance: '&IDI_Task_EditTranslation;'
+    relationships: # FIXME: remove this when we can properly inherit definitions in zq-python
+    - instance: '&IDR_Translation_Value__has__Language;'
+      customTagName: 'language'
+      
+  - relationship: '&IDR_Translation_Value__has__Language;'
+    sourceClassId: '&IDC_TranslationValue;'
+    type: 'has'
+    destinationClassId: '&IDC_Language;'
+    siblingRelationshipId: '&IDR_Language__for__Translation_Value;'
+    singular: yes
+
+  - relationship: '&IDR_Language__for__Translation_Value;'
+    sourceClassId: '&IDC_Language;'
+    type: 'for'
+    destinationClassId: '&IDC_TranslationValue;'
+    siblingRelationshipId: '&IDR_Translation_Value__has__Language;'
+    singular: no
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Web/000-EntityDefinitions/001-Classes.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Web/000-EntityDefinitions/001-Classes.yaml
@ -1,3 +0,0 @@
- entityDefinitions:
-  - IDC_Route: '{6c589422-3f1e-4402-afc7-27b6956aa588}'
-  - IDC_RouteTable: '{76e5ce90-5f64-4355-a0ee-f659cf615a63}'
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Web/000-EntityDefinitions/002-Attributes.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Web/000-EntityDefinitions/002-Attributes.yaml
@ -1,2 +0,0 @@
- entityDefinitions:
-  - IDA_RouteURL: '{304d9fb0-a5fc-4503-b6e5-96842b856bb1}'
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Web/000-EntityDefinitions/003-Relationships.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Web/000-EntityDefinitions/003-Relationships.yaml
@ -1,7 +0,0 @@
- entityDefinitions:
-  - IDR_Route_Table__has__Route: '{551efe23-f97c-4e11-b5cc-e3c99117a9cc}'
-  - IDR_Route__for__Route_Table: '{1d38259e-b4f4-4bf9-a7ab-1cb09561bf3b}'
-
-  - IDR_Tenant__has__Route_Table: '{1af6c245-2faa-4f31-9368-4148b3051c04}'
-  - IDR_Route_Table__for__Tenant: '{e55755c3-3574-41f5-b8e7-ed634050fe67}'
-  
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Web/001-Classes/00434-Route.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Web/001-Classes/00434-Route.yaml
@ -0,0 +1,80 @@
+--- #definitions for YAML
+- entityDefinitions:
+  - IDC_Route: '{6c589422-3f1e-4402-afc7-27b6956aa588}'
+  - IDC_RouteTable: '{76e5ce90-5f64-4355-a0ee-f659cf615a63}'
+
+  - IDA_RouteURL: '{304d9fb0-a5fc-4503-b6e5-96842b856bb1}'
+
+  - IDR_Route_Table__has__Route: '{551efe23-f97c-4e11-b5cc-e3c99117a9cc}'
+  - IDR_Route__for__Route_Table: '{1d38259e-b4f4-4bf9-a7ab-1cb09561bf3b}'
+
+  - IDR_Tenant__has__Route_Table: '{1af6c245-2faa-4f31-9368-4148b3051c04}'
+  - IDR_Route_Table__for__Tenant: '{e55755c3-3574-41f5-b8e7-ed634050fe67}'
+  
+- library: '&IDL_MochaWeb;'
+  instances:
+  - textAttribute:       '&IDA_RouteURL;'
+    name: 'Route URL'
+    index: 438
+
+  - class: '&IDC_Route;'
+    name: Route
+    index: 434
+    customTagName: 'route'
+    attributes:
+    - instance: '&IDA_Name;'
+      customTagName: 'name'
+    - instance: '&IDA_RouteURL;'
+      customTagName: 'url'
+
+  - class: '&IDC_RouteTable;'
+    name: Route Table
+    index: 439
+    customTagName: 'routeTable'
+    attributes:
+    - instance: '&IDA_Name;'
+      customTagName: 'name'
+    relationships:
+    - instance: '&IDR_Route_Table__has__Route;'
+      customTagName: 'routes'
+
+  - relationship: '&IDR_Route_Table__has__Route;'
+    sourceClassId: '&IDC_RouteTable;'
+    type: 'has'
+    destinationClassId: '&IDC_Route;'
+    siblingRelationshipId: '&IDR_Route__for__Route_Table;'
+    singular: no
+
+  - relationship: '&IDR_Route__for__Route_Table;'
+    sourceClassId: '&IDC_Route;'
+    type: 'for'
+    destinationClassId: '&IDC_RouteTable;'
+    siblingRelationshipId: '&IDR_Route_Table__has__Route;'
+    singular: no
+
+  - relationship: '&IDR_Tenant__has__Route_Table;'
+    sourceClassId: '&IDC_Tenant;'
+    type: 'has'
+    destinationClassId: '&IDC_RouteTable;'
+    siblingRelationshipId: '&IDR_Route_Table__for__Tenant;'
+    singular: yes
+
+  - relationship: '&IDR_Route_Table__for__Tenant;'
+    sourceClassId: '&IDC_RouteTable;'
+    type: 'for'
+    destinationClassId: '&IDC_Tenant;'
+    siblingRelationshipId: '&IDR_Tenant__has__Route_Table;'
+    singular: no
+
+  - routeTable: '{641ea97b-a1c2-4005-9bda-c0111a254365}'
+    routes:
+    - instance: '{1184d102-0710-4632-bf64-6362b9485a0f}'
+    - instance: '{88de14b6-53ca-4394-8500-bd4120499875}'
+
+  - route: '{1184d102-0710-4632-bf64-6362b9485a0f}'
+    name: MADI Authentication Gateway Login
+    url: 'madi/authgwy/{tenant}/login.htmld'
+
+  - route: '{88de14b6-53ca-4394-8500-bd4120499875}'
+    name: MADI Authentication Gateway Login
+    url: 'madi/authgwy/{tenant}/login.htmld'
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Web/003-Classes/00434-Route.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Web/003-Classes/00434-Route.yaml
@ -1,66 +0,0 @@
--- #definitions for YAML
- textAttribute:       '&IDA_RouteURL;'
-  name: 'Route URL'
-  index: 438
-
- instance: '&IDC_Route;'
-  name: Route
-  index: 434
-  customTagName: 'route'
-  attributes:
-  - instance: '&IDA_Name;'
-    customTagName: 'name'
-  - instance: '&IDA_RouteURL;'
-    customTagName: 'url'
-
- instance: '&IDC_RouteTable;'
-  name: Route Table
-  index: 439
-  customTagName: 'routeTable'
-  attributes:
-  - instance: '&IDA_Name;'
-    customTagName: 'name'
-  relationships:
-  - instance: '&IDR_Route_Table__has__Route;'
-    customTagName: 'routes'
-
- relationship: '&IDR_Route_Table__has__Route;'
-  sourceClassId: '&IDC_RouteTable;'
-  type: 'has'
-  destinationClassId: '&IDC_Route;'
-  siblingRelationshipId: '&IDR_Route__for__Route_Table;'
-  singular: no
-
- relationship: '&IDR_Route__for__Route_Table;'
-  sourceClassId: '&IDC_Route;'
-  type: 'for'
-  destinationClassId: '&IDC_RouteTable;'
-  siblingRelationshipId: '&IDR_Route_Table__has__Route;'
-  singular: no
-
- relationship: '&IDR_Tenant__has__Route_Table;'
-  sourceClassId: '&IDC_Tenant;'
-  type: 'has'
-  destinationClassId: '&IDC_RouteTable;'
-  siblingRelationshipId: '&IDR_Route_Table__for__Tenant;'
-  singular: yes
-
- relationship: '&IDR_Route_Table__for__Tenant;'
-  sourceClassId: '&IDC_RouteTable;'
-  type: 'for'
-  destinationClassId: '&IDC_Tenant;'
-  siblingRelationshipId: '&IDR_Tenant__has__Route_Table;'
-  singular: no
-
- routeTable: '{641ea97b-a1c2-4005-9bda-c0111a254365}'
-  routes:
-  - instance: '{1184d102-0710-4632-bf64-6362b9485a0f}'
-  - instance: '{88de14b6-53ca-4394-8500-bd4120499875}'
-
- route: '{1184d102-0710-4632-bf64-6362b9485a0f}'
-  name: MADI Authentication Gateway Login
-  url: 'madi/authgwy/{tenant}/login.htmld'
-
- route: '{88de14b6-53ca-4394-8500-bd4120499875}'
-  name: MADI Authentication Gateway Login
-  url: 'madi/authgwy/{tenant}/login.htmld'
--- a/mocha-common/data/libraries/yaml/test/003-Relationship.yaml
+++ b/mocha-common/data/libraries/yaml/test/003-Relationship.yaml
@ -17,7 +17,7 @@
  - IDR_Relationship__has_destination__Class: "{F220F1C2-0499-4E87-A32E-BDBF80C1F8A4}"
  - IDR_Relationship__has_sibling__Relationship: "{656110FF-4502-48B8-A7F3-D07F017AEA3F}"

-  - IDR_Class__has_super__Class: "{100F0308-855D-4EC5-99FA-D8976CA20053}"
+  - IDR_Class__has_super__Class: "{100f0308-855d-4ec5-99fa-d8976ca20053}"
  - IDR_Class__has_sub__Class: "{C14BC80D-879C-4E6F-9123-E8DFB13F4666}"

 - relationship: '&IDR_Relationship__has_source__Class;'