refactor(util): Move base exceptions to @accordproject/concerto-util

packages/concerto-cli/lib/commands.js

@@ -19,16 +19,19 @@ const path = require('path');
 const mkdirp = require('mkdirp');
 
 const Logger = require('@accordproject/concerto-util').Logger;
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
+
+const MetaModelUtil = require('@accordproject/concerto-metamodel').MetaModelUtil;
+
 const Printer = require('@accordproject/concerto-cto').Printer;
 const Parser = require('@accordproject/concerto-cto').Parser;
 const External = require('@accordproject/concerto-cto').External;
+
 const ModelLoader = require('@accordproject/concerto-core').ModelLoader;
 const Factory = require('@accordproject/concerto-core').Factory;
 const Serializer = require('@accordproject/concerto-core').Serializer;
 const Concerto = require('@accordproject/concerto-core').Concerto;
-const FileWriter = require('@accordproject/concerto-tools').FileWriter;
 const CodeGen = require('@accordproject/concerto-tools').CodeGen;
-const MetaModelUtil = require('@accordproject/concerto-metamodel').MetaModelUtil;
 
 const GoLangVisitor = CodeGen.GoLangVisitor;
 const JavaVisitor = CodeGen.JavaVisitor;

packages/concerto-core/lib/introspect/illegalmodelexception.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const BaseFileException = require('@accordproject/concerto-cto').BaseFileException;
+const BaseFileException = require('@accordproject/concerto-util').BaseFileException;
 
 /**
  * Exception throws when a composer file is semantically invalid

packages/concerto-core/lib/securityexception.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const BaseException = require('@accordproject/concerto-cto').BaseException;
+const BaseException = require('@accordproject/concerto-util').BaseException;
 
 /**
 * Class representing a security exception

packages/concerto-core/lib/serializer/validationexception.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const BaseException = require('@accordproject/concerto-cto').BaseException;
+const BaseException = require('@accordproject/concerto-util').BaseException;
 
 /**
  * Exception thrown when a resource fails to model against the model

packages/concerto-core/lib/typenotfoundexception.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const BaseException = require('@accordproject/concerto-cto').BaseException;
+const BaseException = require('@accordproject/concerto-util').BaseException;
 const Globalize = require('./globalize');
 
 /**

packages/concerto-core/package.json

@@ -72,7 +72,7 @@
     "randexp": "0.5.3",
     "semver": "7.3.5",
     "slash": "3.0.0",
-    "urijs": "1.19.9",
+    "urijs": "1.19.10",
     "uuid": "8.3.2"
   },
   "browserslist": "> 0.25%, not dead",

packages/concerto-core/test/introspect/illegalmodelexception.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const BaseFileException = require('@accordproject/concerto-cto').BaseFileException;
+const BaseFileException = require('@accordproject/concerto-util').BaseFileException;
 const IllegalModelException = require('../../lib/introspect/illegalmodelexception');
 const ModelFile = require('../../lib/introspect/modelfile');
 
@@ -37,7 +37,7 @@ describe('IllegalModelException', function () {
         it('should return an instance of BaseFileException', function () {
             let exc = new IllegalModelException('message', modelFile, fileLocation);
             exc.should.be.an.instanceOf(BaseFileException);
-            exc.component.should.equal('@accordproject/concerto-cto');
+            exc.component.should.equal('@accordproject/concerto-util');
         });
 
         it('should return an instance of BaseFileException for another component', function () {

packages/concerto-core/test/securityexception.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const BaseException = require('@accordproject/concerto-cto').BaseException;
+const BaseException = require('@accordproject/concerto-util').BaseException;
 const SecurityException = require('../lib/securityexception');
 
 require('chai').should();

packages/concerto-core/test/typenotfoundexception.js

@@ -25,14 +25,14 @@ describe('TypeNotFoundException', function() {
             const typeName = 'namespace.TypeName';
             const obj = new TypeNotFoundException(typeName);
             obj.toString().should.include(typeName);
-            obj.component.should.equal('@accordproject/concerto-cto');
+            obj.component.should.equal('@accordproject/concerto-util');
         });
 
         it('with two arguments', function() {
             const message = 'MESSAGE_TEXT';
             const obj = new TypeNotFoundException('namespace.TypeName', message);
             obj.toString().should.include(message);
-            obj.component.should.equal('@accordproject/concerto-cto');
+            obj.component.should.equal('@accordproject/concerto-util');
         });
 
         it('with three arguments', function() {

packages/concerto-cto/index.js

@@ -22,8 +22,6 @@
  */
 
 // Exceptions
-module.exports.BaseException = require('./lib/baseexception');
-module.exports.BaseFileException = require('./lib/basefileexception');
 module.exports.ParseException = require('./lib/parseexception');
 
 // Parser

packages/concerto-cto/lib/parseexception.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const BaseFileException = require('./basefileexception');
+const BaseFileException = require('@accordproject/concerto-util').BaseFileException;
 
 /**
  * Exception throws when a Concerto file is syntactically invalid

packages/concerto-cto/test/parseexception.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const BaseFileException = require('../lib/basefileexception');
+const BaseFileException = require('@accordproject/concerto-util').BaseFileException;
 const ParseException = require('../lib/parseexception');
 
 require('chai').should();

packages/concerto-tools/index.js

@@ -19,6 +19,5 @@
  * @module concerto-tools
  */
 
-module.exports.FileWriter = require('./lib/filewriter');
-module.exports.CodeGen = require('./lib/codegen/codegen.js');
+module.exports.CodeGen = require('./lib/codegen/codegen');
 module.exports.version = require('./package.json');

packages/concerto-tools/test/codegen/fromcto/csharp/csharpvisitor.js

@@ -27,7 +27,7 @@ const Field = require('@accordproject/concerto-core').Field;
 const ModelFile = require('@accordproject/concerto-core').ModelFile;
 const ModelManager = require('@accordproject/concerto-core').ModelManager;
 const RelationshipDeclaration = require('@accordproject/concerto-core').RelationshipDeclaration;
-const FileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 
 describe('CSharpVisitor', function () {
     let csharpVisitor;

packages/concerto-tools/test/codegen/fromcto/golang/golangvisitor.js

@@ -30,14 +30,14 @@ const ModelFile = require('@accordproject/concerto-core').ModelFile;
 const ModelManager = require('@accordproject/concerto-core').ModelManager;
 const RelationshipDeclaration = require('@accordproject/concerto-core').RelationshipDeclaration;
 const TransactionDeclaration = require('@accordproject/concerto-core').TransactionDeclaration;
-const fileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 
 describe('GoLangVisitor', function () {
     let goVisit;
     let mockFileWriter;
     beforeEach(() => {
         goVisit = new GoLangVisitor();
-        mockFileWriter = sinon.createStubInstance(fileWriter);
+        mockFileWriter = sinon.createStubInstance(FileWriter);
     });
 
     describe('visit', () => {

packages/concerto-tools/test/codegen/fromcto/graphql/graphqlvisitor.js

@@ -26,7 +26,7 @@ const ClassDeclaration = require('@accordproject/concerto-core').ClassDeclaratio
 const EnumValueDeclaration = require('@accordproject/concerto-core').EnumValueDeclaration;
 const Field = require('@accordproject/concerto-core').Field;
 const RelationshipDeclaration = require('@accordproject/concerto-core').RelationshipDeclaration;
-const fileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 
 const MODEL_WITH_DECORATORS = `
 namespace test
@@ -57,7 +57,7 @@ describe('GraphQLVisitor', function () {
     let mockFileWriter;
     beforeEach(() => {
         graphQLVisitor = new GraphQLVisitor();
-        mockFileWriter = sinon.createStubInstance(fileWriter);
+        mockFileWriter = sinon.createStubInstance(FileWriter);
     });
 
     describe('visit', () => {

packages/concerto-tools/test/codegen/fromcto/java/javamissingplugin.js

@@ -23,15 +23,15 @@ const AbstractPlugin = require('../../../../lib/codegen/abstractplugin.js');
 
 const ClassDeclaration = require('@accordproject/concerto-core').ClassDeclaration;
 const EnumDeclaration = require('@accordproject/concerto-core').EnumDeclaration;
-const fileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 
 describe('JavaMissingPlugin', function () {
     let javaVisit;
     let mockFileWriter;
     beforeEach(() => {
         javaVisit = new JavaVisitor();
         javaVisit.plugin = new AbstractPlugin();
-        mockFileWriter = sinon.createStubInstance(fileWriter);
+        mockFileWriter = sinon.createStubInstance(FileWriter);
     });
 
     describe('startClassFile', () => {

packages/concerto-tools/test/codegen/fromcto/java/javavisitor.js

@@ -27,14 +27,14 @@ const Field = require('@accordproject/concerto-core').Field;
 const ModelFile = require('@accordproject/concerto-core').ModelFile;
 const ModelManager = require('@accordproject/concerto-core').ModelManager;
 const RelationshipDeclaration = require('@accordproject/concerto-core').RelationshipDeclaration;
-const fileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 
 describe('JavaVisitor', function () {
     let javaVisit;
     let mockFileWriter;
     beforeEach(() => {
         javaVisit = new JavaVisitor();
-        mockFileWriter = sinon.createStubInstance(fileWriter);
+        mockFileWriter = sinon.createStubInstance(FileWriter);
     });
 
     describe('visit', () => {

packages/concerto-tools/test/codegen/fromcto/jsonschema/jsonschemavisitor.js

@@ -21,7 +21,7 @@ const { expect } = require('chai');
 const chai = require('chai');
 chai.should();
 
-const FileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 const ModelManager = require('@accordproject/concerto-core').ModelManager;
 const JSONSchemaVisitor = require('../../../../lib/codegen/fromcto/jsonschema/jsonschemavisitor.js');
 const RecursionDetectionVisitor = require('../../../../lib/codegen/fromcto/jsonschema/recursionvisitor.js');

packages/concerto-tools/test/codegen/fromcto/loopback/loopbackvisitor.js

@@ -32,14 +32,14 @@ const ModelFile = require('@accordproject/concerto-core').ModelFile;
 const ModelManager = require('@accordproject/concerto-core').ModelManager;
 const RelationshipDeclaration = require('@accordproject/concerto-core').RelationshipDeclaration;
 const TransactionDeclaration = require('@accordproject/concerto-core').TransactionDeclaration;
-const fileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 
 describe('LoopbackVisitor', () => {
     let loopbackVisit;
     let mockFileWriter;
     beforeEach(() => {
         loopbackVisit = new LoopbackVisitor();
-        mockFileWriter = sinon.createStubInstance(fileWriter);
+        mockFileWriter = sinon.createStubInstance(FileWriter);
     });
 
     describe('visit', () => {

packages/concerto-tools/test/codegen/fromcto/loopback/loopbackvisitorcircular.js

@@ -15,7 +15,7 @@
 'use strict';
 
 const fs = require('fs');
-const FileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 const ModelManager = require('@accordproject/concerto-core').ModelManager;
 const LoopbackVisitor = require('../../../../lib/codegen/fromcto/loopback/loopbackvisitor');
 const path = require('path');

packages/concerto-tools/test/codegen/fromcto/plantuml/plantumlvisitor.js

@@ -30,14 +30,14 @@ const EnumValueDeclaration = require('@accordproject/concerto-core').EnumValueDe
 const Field = require('@accordproject/concerto-core').Field;
 const RelationshipDeclaration = require('@accordproject/concerto-core').RelationshipDeclaration;
 const TransactionDeclaration = require('@accordproject/concerto-core').TransactionDeclaration;
-const fileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 
 describe('PlantUMLVisitor', function () {
     let plantUMLvisitor;
     let mockFileWriter;
     beforeEach(() => {
         plantUMLvisitor = new PlantUMLVisitor();
-        mockFileWriter = sinon.createStubInstance(fileWriter);
+        mockFileWriter = sinon.createStubInstance(FileWriter);
     });
 
     describe('visit', () => {

packages/concerto-tools/test/codegen/fromcto/typescript/typescriptvisitor.js

@@ -27,7 +27,7 @@ const Field = require('@accordproject/concerto-core').Field;
 const ModelFile = require('@accordproject/concerto-core').ModelFile;
 const ModelManager = require('@accordproject/concerto-core').ModelManager;
 const RelationshipDeclaration = require('@accordproject/concerto-core').RelationshipDeclaration;
-const FileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 
 describe('TypescriptVisitor', function () {
     let typescriptVisitor;

packages/concerto-tools/test/codegen/fromcto/xmlschema/xmlschemavisitor.js

@@ -27,14 +27,14 @@ const Field = require('@accordproject/concerto-core').Field;
 const ModelFile = require('@accordproject/concerto-core').ModelFile;
 const ModelManager = require('@accordproject/concerto-core').ModelManager;
 const RelationshipDeclaration = require('@accordproject/concerto-core').RelationshipDeclaration;
-const fileWriter = require('../../../../lib/filewriter');
+const FileWriter = require('@accordproject/concerto-util').FileWriter;
 
 describe('XmlSchemaVisitor', function () {
     let xmlSchemaVisitor;
     let mockFileWriter;
     beforeEach(() => {
         xmlSchemaVisitor = new XmlSchemaVisitor();
-        mockFileWriter = sinon.createStubInstance(fileWriter);
+        mockFileWriter = sinon.createStubInstance(FileWriter);
     });
 
     describe('visit', () => {

packages/concerto-util/index.js

@@ -21,6 +21,10 @@
  * @module concerto-util
  */
 
+// Exceptions
+module.exports.BaseException = require('./lib/baseexception');
+module.exports.BaseFileException = require('./lib/basefileexception');
+
 // Transitive closure downloader
 module.exports.FileDownloader = require('./lib/filedownloader');
 
@@ -32,6 +36,7 @@ module.exports.HTTPFileLoader = require('./lib/loaders/httpfileloader');
 
 // Writers
 module.exports.Writer = require('./lib/writer');
+module.exports.FileWriter = require('./lib/filewriter');
 module.exports.ModelWriter = require('./lib/modelwriter');
 
 // Logger

packages/concerto-tools/lib/filewriter.js → packages/concerto-util/lib/filewriter.js

@@ -17,7 +17,8 @@
 const fs = require('fs');
 const mkdirp = require('mkdirp');
 const path = require('path');
-const Writer = require('@accordproject/concerto-util').Writer;
+
+const Writer = require('./writer');
 
 /**
  * FileWriter creates text files under a directory tree. It can be used

packages/concerto-cto/test/baseexception.js → packages/concerto-util/test/baseexception.js

@@ -25,7 +25,7 @@ describe('BaseException', function () {
         it('should return an instance of Error', function () {
             let exc = new BaseException('hello world');
             exc.should.be.an.instanceOf(Error);
-            exc.component.should.equal('@accordproject/concerto-cto');
+            exc.component.should.equal('@accordproject/concerto-util');
         });
 
         it('should return an instance of Error for another component', function () {

packages/concerto-cto/test/basefileexception.js → packages/concerto-util/test/basefileexception.js

@@ -26,7 +26,7 @@ describe('BaseFileException', function () {
         it('should return an instance of BaseFileException', function () {
             let exc = new BaseFileException('message', {start: 1, end: 2}, 'full message');
             exc.should.be.an.instanceOf(BaseException);
-            exc.component.should.equal('@accordproject/concerto-cto');
+            exc.component.should.equal('@accordproject/concerto-util');
         });
 
         it('should return an instance of BaseFileException for another component', function () {

packages/concerto-tools/test/filewriter.js → packages/concerto-util/test/filewriter.js

@@ -24,7 +24,7 @@ const fs = require('fs');
 const mkdirp = require('mkdirp');
 const path = require('path');
 
-const Writer = require('@accordproject/concerto-util').Writer;
+const Writer = require('../lib/writer');
 const FileWriter = require('../lib/filewriter');
 
 describe('FileWriter', function () {