Merge branch 'main' into mr-fix-missing-strictQualifiedDateTimes

accordproject · May 1, 2024 · b6dcb16 · b6dcb16
2 parents a337bfc + dfbf14c
commit b6dcb16
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 46 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/concerto-core/api.txt b/packages/concerto-core/api.txt
@@ -132,6 +132,7 @@ class Declaration extends Decorated {
 }
 class Decorator {
    + void constructor(ClassDeclaration|Property,Object) throws IllegalModelException
+   + Object accept(Object,Object) 
    + void getParent() 
    + string getName() 
    + object[] getArguments() 
@@ -161,6 +162,7 @@ class IllegalModelException extends BaseFileException {
 }
 class Introspector {
    + void constructor(ModelManager) 
+   + Object accept(Object,Object) 
    + ClassDeclaration[] getClassDeclarations() 
    + ClassDeclaration getClassDeclaration(String) throws Error
 }
@@ -208,6 +210,7 @@ class ModelFile extends Decorated {
    + string getVersion() 
    + Boolean isSystemModelFile() 
    + boolean isExternal() 
+   + Object accept(Object,Object) 
    + ModelManager getModelManager() 
    + string[] getImports() 
    ~ void validate() throws IllegalModelException

diff --git a/packages/concerto-core/changelog.txt b/packages/concerto-core/changelog.txt
@@ -24,9 +24,14 @@
 # Note that the latest public API is documented using JSDocs and is available in api.txt.
 #
 
+
 Version 3.16.7 {44d3b20134cd254582e44ccb6d5dd276} 2024-05-01
 - Added missing `strictQualifiedDateTimes` option to Serializer.fromJSON
 
+Version 3.13.4 {56df3674b9e8d094cec0ae690c07ea1f} 2024-04-20
+- Mark accept methods in introspect classes as public
+- Generate changes in TypeScript definitions
+
 Version 3.13.3 {8f59b43e6071c4d3ae42e94476142f7a} 2023-11-07
 - Added DCS and vocabulary extraction support for decoratorManager
 - Added errortype to BaseException and used that to define error types in introspect

diff --git a/packages/concerto-core/lib/introspect/decorated.js b/packages/concerto-core/lib/introspect/decorated.js
@@ -64,7 +64,6 @@ class Decorated {
      * @param {Object} visitor - the visitor
      * @param {Object} parameters  - the parameter
      * @return {Object} the result of visiting or null
-     * @private
      */
     accept(visitor,parameters) {
         return visitor.visit(this, parameters);

diff --git a/packages/concerto-core/lib/introspect/decorator.js b/packages/concerto-core/lib/introspect/decorator.js
@@ -49,7 +49,6 @@ class Decorator {
      * @param {Object} visitor - the visitor
      * @param {Object} parameters  - the parameter
      * @return {Object} the result of visiting or null
-     * @private
      */
     accept(visitor, parameters) {
         return visitor.visit(this, parameters);

diff --git a/packages/concerto-core/lib/introspect/introspector.js b/packages/concerto-core/lib/introspect/introspector.js
@@ -44,7 +44,6 @@ class Introspector {
      * @param {Object} visitor - the visitor
      * @param {Object} parameters  - the parameter
      * @return {Object} the result of visiting or null
-     * @private
      */
     accept(visitor,parameters) {
         return visitor.visit(this, parameters);

diff --git a/packages/concerto-core/lib/introspect/modelfile.js b/packages/concerto-core/lib/introspect/modelfile.js
@@ -183,7 +183,6 @@ class ModelFile extends Decorated {
      * @param {Object} visitor - the visitor
      * @param {Object} parameters  - the parameter
      * @return {Object} the result of visiting or null
-     * @private
      */
     accept(visitor,parameters) {
         return visitor.visit(this, parameters);

diff --git a/packages/concerto-core/lib/introspect/validator.js b/packages/concerto-core/lib/introspect/validator.js
@@ -59,7 +59,6 @@ class Validator {
      * @param {Object} visitor - the visitor
      * @param {Object} parameters  - the parameter
      * @return {Object} the result of visiting or null
-     * @private
      */
     accept(visitor,parameters) {
         return visitor.visit(this, parameters);

diff --git a/packages/concerto-core/types/lib/introspect/decorated.d.ts b/packages/concerto-core/types/lib/introspect/decorated.d.ts
@@ -30,9 +30,8 @@ declare class Decorated {
      * @param {Object} visitor - the visitor
      * @param {Object} parameters  - the parameter
      * @return {Object} the result of visiting or null
-     * @private
      */
-    private accept;
+    accept(visitor: any, parameters: any): any;
     /**
      * Process the AST and build the model
      *

diff --git a/packages/concerto-core/types/lib/introspect/decorator.d.ts b/packages/concerto-core/types/lib/introspect/decorator.d.ts
@@ -20,9 +20,8 @@ declare class Decorator {
      * @param {Object} visitor - the visitor
      * @param {Object} parameters  - the parameter
      * @return {Object} the result of visiting or null
-     * @private
      */
-    private accept;
+    accept(visitor: any, parameters: any): any;
     /**
      * Returns the owner of this property
      * @return {ClassDeclaration|Property} the parent class or property declaration

diff --git a/packages/concerto-core/types/lib/introspect/introspector.d.ts b/packages/concerto-core/types/lib/introspect/introspector.d.ts
@@ -18,9 +18,8 @@ declare class Introspector {
      * @param {Object} visitor - the visitor
      * @param {Object} parameters  - the parameter
      * @return {Object} the result of visiting or null
-     * @private
      */
-    private accept;
+    accept(visitor: any, parameters: any): any;
     /**
      * Returns all the class declarations for the business network.
      * @return {ClassDeclaration[]} the array of class declarations

diff --git a/packages/concerto-core/types/lib/introspect/validator.d.ts b/packages/concerto-core/types/lib/introspect/validator.d.ts
@@ -29,9 +29,8 @@ declare class Validator {
      * @param {Object} visitor - the visitor
      * @param {Object} parameters  - the parameter
      * @return {Object} the result of visiting or null
-     * @private
      */
-    private accept;
+    accept(visitor: any, parameters: any): any;
     /**
      * Returns the field or scalar declaration that this validator applies to
      * @return {Object} the field