From 92132e45789263356e23ca9e313a409d7f3fcdc0 Mon Sep 17 00:00:00 2001
From: Jerome Simeon <jeromesimeon@me.com>
Date: Sun, 18 Apr 2021 23:35:43 -0400
Subject: [PATCH] fix(modelfile) Remove unused options for system files

Signed-off-by: Jerome Simeon <jeromesimeon@me.com>
---
 packages/concerto-core/api.txt                | 12 ++++----
 packages/concerto-core/changelog.txt          |  4 +++
 .../concerto-core/lib/introspect/modelfile.js | 30 ++++++++-----------
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/packages/concerto-core/api.txt b/packages/concerto-core/api.txt
index 052e197d7e..53d59c081b 100644
--- a/packages/concerto-core/api.txt
+++ b/packages/concerto-core/api.txt
@@ -115,12 +115,12 @@ class ModelFile {
    + ParticipantDeclaration getParticipantDeclaration(string) 
    + string getNamespace() 
    + string getName() 
-   + AssetDeclaration[] getAssetDeclarations(Boolean) 
-   + TransactionDeclaration[] getTransactionDeclarations(Boolean) 
-   + EventDeclaration[] getEventDeclarations(Boolean) 
-   + ParticipantDeclaration[] getParticipantDeclarations(Boolean) 
-   + ConceptDeclaration[] getConceptDeclarations(Boolean) 
-   + EnumDeclaration[] getEnumDeclarations(Boolean) 
+   + AssetDeclaration[] getAssetDeclarations() 
+   + TransactionDeclaration[] getTransactionDeclarations() 
+   + EventDeclaration[] getEventDeclarations() 
+   + ParticipantDeclaration[] getParticipantDeclarations() 
+   + ConceptDeclaration[] getConceptDeclarations() 
+   + EnumDeclaration[] getEnumDeclarations() 
    + ClassDeclaration[] getDeclarations(Function) 
    + ClassDeclaration[] getAllDeclarations() 
    + string getDefinitions() 
diff --git a/packages/concerto-core/changelog.txt b/packages/concerto-core/changelog.txt
index 7ed8ccb3e7..7e62b0ab56 100644
--- a/packages/concerto-core/changelog.txt
+++ b/packages/concerto-core/changelog.txt
@@ -24,6 +24,10 @@
 # Note that the latest public API is documented using JSDocs and is available in api.txt.
 #
 
+Version 1.0.0-alpha.7 {e791f955bbe9bdac6bcd8944d6111e1a} 2021-04-17
+- Remove unused systemtime options in modelfile API
+- Fixes to the validation option targeting the ergo ES6 runtime
+
 Version 1.0.0-alpha.5 {446997953e3ac90783ff9d492a8e7fdc} 2021-04-08
 - Support Concerto version pragma at the beginning of model files
 - Remove allowEmptyId option in factory API
diff --git a/packages/concerto-core/lib/introspect/modelfile.js b/packages/concerto-core/lib/introspect/modelfile.js
index 47368e9d49..116867fe82 100644
--- a/packages/concerto-core/lib/introspect/modelfile.js
+++ b/packages/concerto-core/lib/introspect/modelfile.js
@@ -546,56 +546,50 @@ class ModelFile {
 
     /**
      * Get the AssetDeclarations defined in this ModelFile
-     * @param {Boolean} includeSystemType - Include the decalarations of system type in returned data
      * @return {AssetDeclaration[]} the AssetDeclarations defined in the model file
      */
-    getAssetDeclarations(includeSystemType = true) {
-        return this.getDeclarations(AssetDeclaration, includeSystemType);
+    getAssetDeclarations() {
+        return this.getDeclarations(AssetDeclaration);
     }
 
     /**
      * Get the TransactionDeclarations defined in this ModelFile
-     * @param {Boolean} includeSystemType - Include the decalarations of system type in returned data
      * @return {TransactionDeclaration[]} the TransactionDeclarations defined in the model file
      */
-    getTransactionDeclarations(includeSystemType = true) {
-        return this.getDeclarations(TransactionDeclaration, includeSystemType);
+    getTransactionDeclarations() {
+        return this.getDeclarations(TransactionDeclaration);
     }
 
     /**
      * Get the EventDeclarations defined in this ModelFile
-     * @param {Boolean} includeSystemType - Include the decalarations of system type in returned data
      * @return {EventDeclaration[]} the EventDeclarations defined in the model file
      */
-    getEventDeclarations(includeSystemType = true) {
-        return this.getDeclarations(EventDeclaration, includeSystemType);
+    getEventDeclarations() {
+        return this.getDeclarations(EventDeclaration);
     }
 
     /**
      * Get the ParticipantDeclarations defined in this ModelFile
-     * @param {Boolean} includeSystemType - Include the decalarations of system type in returned data
      * @return {ParticipantDeclaration[]} the ParticipantDeclaration defined in the model file
      */
-    getParticipantDeclarations(includeSystemType = true) {
-        return this.getDeclarations(ParticipantDeclaration, includeSystemType);
+    getParticipantDeclarations() {
+        return this.getDeclarations(ParticipantDeclaration);
     }
 
     /**
      * Get the ConceptDeclarations defined in this ModelFile
-     * @param {Boolean} includeSystemType - Include the decalarations of system type in returned data
      * @return {ConceptDeclaration[]} the ParticipantDeclaration defined in the model file
      */
-    getConceptDeclarations(includeSystemType = true) {
-        return this.getDeclarations(ConceptDeclaration, includeSystemType);
+    getConceptDeclarations() {
+        return this.getDeclarations(ConceptDeclaration);
     }
 
     /**
      * Get the EnumDeclarations defined in this ModelFile
-     * @param {Boolean} includeSystemType - Include the decalarations of system type in returned data
      * @return {EnumDeclaration[]} the EnumDeclaration defined in the model file
      */
-    getEnumDeclarations(includeSystemType = true) {
-        return this.getDeclarations(EnumDeclaration, includeSystemType);
+    getEnumDeclarations() {
+        return this.getDeclarations(EnumDeclaration);
     }
 
     /**