@accordproject/concerto-cto 2.0.0-alpha.2 → 2.0.0

package/index.js

@@ -22,13 +22,20 @@
  */
 
 // Exceptions
-module.exports.ParseException = require('./lib/parseexception');
+const ParseException = require('./lib/parseexception');
 
 // Parser
-module.exports.Parser = require('./lib/parserMain');
+const Parser = require('./lib/parserMain');
 
 // Printer
-module.exports.Printer = require('./lib/printer');
+const Printer = require('./lib/printer');
 
 // External models resolution
-module.exports.External = require('./lib/external');
+const External = require('./lib/external');
+
+module.exports = {
+    ParseException,
+    Parser,
+    Printer,
+    External
+};

package/lib/external.js

@@ -16,13 +16,12 @@
 
 const path = require('path');
 
-const DefaultFileLoader = require('@accordproject/concerto-util').DefaultFileLoader;
-const FileDownloader = require('@accordproject/concerto-util').FileDownloader;
+const { DefaultFileLoader, FileDownloader }  = require('@accordproject/concerto-util');
 
 const debug = require('debug')('concerto:ModelManager');
 
 const Parser = require('./parser');
-const MetaModelUtil = require('@accordproject/concerto-metamodel').MetaModelUtil;
+const { MetaModelUtil } = require('@accordproject/concerto-metamodel');
 
 /**
  * Update models with a new model

package/lib/parseexception.js

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

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@accordproject/concerto-cto",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0",
   "description": "Parser for Concerto CTO files",
   "homepage": "https://github.com/accordproject/concerto",
   "engines": {
-    "node": ">=12",
+    "node": ">=14",
     "npm": ">=6"
   },
   "main": "index.js",
@@ -16,11 +16,12 @@
     "licchk": "license-check-and-add",
     "postlicchk": "npm run doc",
     "doc": "jsdoc --pedantic --recurse -c jsdoc.json",
+    "postdoc": "npm run build:types",
     "test": "nyc mocha --recursive -t 10000",
     "test:watch": "nyc mocha --watch --recursive -t 10000",
     "mocha": "mocha --recursive -t 10000",
     "nyc": "nyc mocha --recursive -t 10000",
-    "build:types": "npx -p typescript tsc ./lib/*.js index.js --declaration --allowJs --emitDeclarationOnly --outDir types"
+    "build:types": "tsc index.js --declaration --allowJs --emitDeclarationOnly --outDir types"
   },
   "repository": {
     "type": "git",
@@ -46,11 +47,12 @@
     "nyc": "15.1.0",
     "peggy": "1.2.0",
     "sinon": "12.0.0",
-    "sinon-chai": "3.7.0"
+    "sinon-chai": "3.7.0",
+    "typescript": "4.6.3"
   },
   "dependencies": {
-    "@accordproject/concerto-metamodel": "2.0.0-alpha.2",
-    "@accordproject/concerto-util": "2.0.0-alpha.2"
+    "@accordproject/concerto-metamodel": "2.0.0",
+    "@accordproject/concerto-util": "2.0.0"
   },
   "browserslist": "> 0.25%, not dead",
   "license-check-and-add-config": {

package/types/index.d.ts

@@ -1,5 +1,5 @@
-export var BaseException: typeof import("./lib/baseexception");
-export var BaseFileException: typeof import("./lib/basefileexception");
-export var ParseException: typeof import("./lib/parseexception");
-export var Parser: typeof import("./lib/parserMain");
-export var Printer: typeof import("./lib/printer");
+import ParseException = require("./lib/parseexception");
+import Parser = require("./lib/parserMain");
+import Printer = require("./lib/printer");
+import External = require("./lib/external");
+export { ParseException, Parser, Printer, External };

package/types/lib/external.d.ts

@@ -1,7 +1,11 @@
 /**
- * Create decorator argument string from a metamodel
- * @param {string} cto - the Concerto string
- * @param {string} [fileName] - an optional file name
- * @return {object} the string for the decorator argument
+ * Downloads all ModelFiles that are external dependencies and adds or
+ * updates them in this ModelManager.
+ * @param {*} models - the AST for all the known models
+ * @param {Object} [options] - Options object passed to ModelFileLoaders
+ * @param {FileDownloader} [fileDownloader] - an optional FileDownloader
+ * @throws {IllegalModelException} if the models fail validation
+ * @return {Promise} a promise when the download and update operation is completed.
  */
-export function parse(cto: string, fileName?: string): object;
+export function resolveExternal(models: any, options?: any, fileDownloader?: FileDownloader): Promise<any>;
+import { FileDownloader } from "@accordproject/concerto-util";

package/types/lib/parseexception.d.ts

@@ -18,4 +18,4 @@ declare class ParseException extends BaseFileException {
      */
     constructor(message: string, fileLocation?: string, fileName?: string, fullMessageOverride?: string, component?: string);
 }
-import BaseFileException = require("./basefileexception");
+import { BaseFileException } from "@accordproject/concerto-util";

package/types/lib/parserMain.d.ts

@@ -11,13 +11,3 @@ export function parse(cto: string, fileName?: string): object;
  * @return {*} the AST / metamodel
  */
 export function parseModels(files: string[]): any;
-/**
- * Downloads all ModelFiles that are external dependencies and adds or
- * updates them in this ModelManager.
- * @param {*} models - the AST for all the known models
- * @param {Object} [options] - Options object passed to ModelFileLoaders
- * @param {FileDownloader} [fileDownloader] - an optional FileDownloader
- * @throws {IllegalModelException} if the models fail validation
- * @return {Promise} a promise when the download and update operation is completed.
- */
-export function resolve(models: any, options?: any, fileDownloader?: typeof import("@accordproject/concerto-util/types/lib/filedownloader")): Promise<any>;