diff --git a/package-lock.json b/package-lock.json index 34baf719e..abfdb9a4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -199,12 +199,12 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", - "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", + "version": "7.24.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz", + "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==", "dev": true, "dependencies": { - "@babel/types": "^7.22.15" + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -321,14 +321,14 @@ } }, "node_modules/@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -665,13 +665,14 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "dev": true, - "license": "MIT", "dependencies": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -686,9 +687,10 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -699,9 +701,9 @@ "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz", - "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -3241,9 +3243,9 @@ } }, "node_modules/browserslist": { - "version": "4.22.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", - "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", "dev": true, "funding": [ { @@ -3260,8 +3262,8 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001565", - "electron-to-chromium": "^1.4.601", + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, @@ -3434,9 +3436,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001580", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001580.tgz", - "integrity": "sha512-mtj5ur2FFPZcCEpXFy8ADXbDACuNFXg6mxVDqp7tqooX6l3zwm+d8EPoeOSIFRDvHs8qu7/SLFOGniULkcH2iA==", + "version": "1.0.30001611", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001611.tgz", + "integrity": "sha512-19NuN1/3PjA3QI8Eki55N8my4LzfkMCRLgCVfrl/slbSAchQfV0+GwjPrK3rq37As4UCLlM/DHajbKkAqbv92Q==", "dev": true, "funding": [ { @@ -4210,9 +4212,9 @@ } }, "node_modules/ejs": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", - "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "dev": true, "dependencies": { "jake": "^10.8.5" @@ -4225,9 +4227,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.647", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.647.tgz", - "integrity": "sha512-Z/fTNGwc45WrYQhPaEcz5tAJuZZ8G7S/DBnhS6Kgp4BxnS40Z/HqlJ0hHg3Z79IGVzuVartIlTcjw/cQbPLgOw==", + "version": "1.4.745", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.745.tgz", + "integrity": "sha512-tRbzkaRI5gbUn5DEvF0dV4TQbMZ5CLkWeTAXmpC9IrYT+GE+x76i9p+o3RJ5l9XmdQlI1pPhVtE9uNcJJ0G0EA==", "dev": true }, "node_modules/emoji-regex": { diff --git a/packages/concerto-core/api.txt b/packages/concerto-core/api.txt index ecd60e0ab..139c8c287 100644 --- 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 index 3c5d1d0a9..37909cb4e 100644 --- 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 index bcfd155d3..a15b9723d 100644 --- 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 index 48379d08b..c514aa4ee 100644 --- 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 index cbd36bc15..8e63e4467 100644 --- 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 index fe245a477..e95d31ad4 100644 --- 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 index 3f790e6f3..10ada40e5 100644 --- 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 index f4bcd9f59..16985fd4a 100644 --- 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 index 17b8dd7b9..ba0b04b0f 100644 --- 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 index 5d1c40ccc..3e255b830 100644 --- 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 index b7627d9da..7ead6f93b 100644 --- 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