@accordproject/concerto-core 4.0.0-alpha.2 → 4.0.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/astmodelmanager.d.ts +3 -3
- package/dist/astmodelmanager.js.map +1 -1
- package/dist/basemodelmanager.d.ts +72 -95
- package/dist/basemodelmanager.js +29 -20
- package/dist/basemodelmanager.js.map +1 -1
- package/dist/concerto-core.js +1 -1
- package/dist/concerto-core.js.LICENSE.txt +1 -1
- package/dist/datetimeutil.d.ts +8 -1
- package/dist/datetimeutil.js.map +1 -1
- package/dist/dcsconverter.d.ts +12 -2
- package/dist/dcsconverter.js.map +1 -1
- package/dist/decoratorextractor.d.ts +30 -23
- package/dist/decoratorextractor.js.map +1 -1
- package/dist/decoratormanager.d.ts +34 -76
- package/dist/decoratormanager.js +31 -14
- package/dist/decoratormanager.js.map +1 -1
- package/dist/decoratormodelhelper.d.ts +13 -0
- package/dist/{decoratormodel.js → decoratormodelhelper.js} +4 -3
- package/dist/decoratormodelhelper.js.map +1 -0
- package/dist/factory.d.ts +11 -28
- package/dist/factory.js.map +1 -1
- package/dist/globalize.d.ts +16 -13
- package/dist/globalize.js.map +1 -1
- package/dist/index.d.ts +1 -11
- package/dist/index.js +2 -8
- package/dist/index.js.map +1 -1
- package/dist/introspect/assetdeclaration.d.ts +4 -4
- package/dist/introspect/assetdeclaration.js +1 -1
- package/dist/introspect/assetdeclaration.js.map +1 -1
- package/dist/introspect/classdeclaration.d.ts +67 -25
- package/dist/introspect/classdeclaration.js +1 -1
- package/dist/introspect/classdeclaration.js.map +1 -1
- package/dist/introspect/conceptdeclaration.d.ts +9 -2
- package/dist/introspect/conceptdeclaration.js +1 -1
- package/dist/introspect/conceptdeclaration.js.map +1 -1
- package/dist/introspect/declaration.d.ts +37 -12
- package/dist/introspect/declaration.js.map +1 -1
- package/dist/introspect/decorated.d.ts +10 -12
- package/dist/introspect/decorated.js +1 -0
- package/dist/introspect/decorated.js.map +1 -1
- package/dist/introspect/decorator.d.ts +12 -14
- package/dist/introspect/decorator.js +1 -1
- package/dist/introspect/decorator.js.map +1 -1
- package/dist/introspect/decoratorfactory.d.ts +2 -5
- package/dist/introspect/decoratorfactory.js.map +1 -1
- package/dist/introspect/enumdeclaration.d.ts +14 -2
- package/dist/introspect/enumdeclaration.js +1 -1
- package/dist/introspect/enumdeclaration.js.map +1 -1
- package/dist/introspect/enumvaluedeclaration.d.ts +16 -2
- package/dist/introspect/enumvaluedeclaration.js +1 -1
- package/dist/introspect/enumvaluedeclaration.js.map +1 -1
- package/dist/introspect/eventdeclaration.d.ts +5 -5
- package/dist/introspect/eventdeclaration.js +1 -1
- package/dist/introspect/eventdeclaration.js.map +1 -1
- package/dist/introspect/field.d.ts +24 -12
- package/dist/introspect/field.js +1 -1
- package/dist/introspect/field.js.map +1 -1
- package/dist/introspect/identifieddeclaration.d.ts +9 -2
- package/dist/introspect/identifieddeclaration.js +1 -1
- package/dist/introspect/identifieddeclaration.js.map +1 -1
- package/dist/introspect/illegalmodelexception.d.ts +4 -6
- package/dist/introspect/illegalmodelexception.js +1 -1
- package/dist/introspect/illegalmodelexception.js.map +1 -1
- package/dist/introspect/introspector.d.ts +7 -9
- package/dist/introspect/introspector.js.map +1 -1
- package/dist/introspect/mapdeclaration.d.ts +11 -18
- package/dist/introspect/mapdeclaration.js +1 -1
- package/dist/introspect/mapdeclaration.js.map +1 -1
- package/dist/introspect/mapkeytype.d.ts +27 -13
- package/dist/introspect/mapkeytype.js.map +1 -1
- package/dist/introspect/mapvaluetype.d.ts +27 -13
- package/dist/introspect/mapvaluetype.js.map +1 -1
- package/dist/introspect/metamodel.d.ts +9 -4
- package/dist/introspect/metamodel.js.map +1 -1
- package/dist/introspect/modelfile.d.ts +61 -67
- package/dist/introspect/modelfile.js +4 -3
- package/dist/introspect/modelfile.js.map +1 -1
- package/dist/introspect/numbervalidator.d.ts +35 -6
- package/dist/introspect/numbervalidator.js.map +1 -1
- package/dist/introspect/participantdeclaration.d.ts +4 -4
- package/dist/introspect/participantdeclaration.js +1 -1
- package/dist/introspect/participantdeclaration.js.map +1 -1
- package/dist/introspect/property.d.ts +26 -20
- package/dist/introspect/property.js.map +1 -1
- package/dist/introspect/relationshipdeclaration.d.ts +21 -2
- package/dist/introspect/relationshipdeclaration.js +1 -1
- package/dist/introspect/relationshipdeclaration.js.map +1 -1
- package/dist/introspect/scalardeclaration.d.ts +50 -19
- package/dist/introspect/scalardeclaration.js.map +1 -1
- package/dist/introspect/stringvalidator.d.ts +23 -9
- package/dist/introspect/stringvalidator.js.map +1 -1
- package/dist/introspect/transactiondeclaration.d.ts +4 -4
- package/dist/introspect/transactiondeclaration.js +1 -1
- package/dist/introspect/transactiondeclaration.js.map +1 -1
- package/dist/introspect/validator.d.ts +9 -9
- package/dist/introspect/validator.js.map +1 -1
- package/dist/messages/en.json +18 -4
- package/dist/messages/pt.json +5 -0
- package/dist/metamodelexception.d.ts +4 -5
- package/dist/metamodelexception.js.map +1 -1
- package/dist/model/identifiable.d.ts +13 -11
- package/dist/model/identifiable.js.map +1 -1
- package/dist/model/relationship.d.ts +25 -14
- package/dist/model/relationship.js +3 -3
- package/dist/model/relationship.js.map +1 -1
- package/dist/model/resource.d.ts +32 -5
- package/dist/model/resource.js.map +1 -1
- package/dist/model/resourceid.d.ts +13 -13
- package/dist/model/resourceid.js.map +1 -1
- package/dist/model/typed.d.ts +18 -20
- package/dist/model/typed.js +2 -2
- package/dist/model/typed.js.map +1 -1
- package/dist/model/validatedresource.d.ts +18 -4
- package/dist/model/validatedresource.js.map +1 -1
- package/dist/modelloader.d.ts +11 -11
- package/dist/modelloader.js +48 -12
- package/dist/modelloader.js.map +1 -1
- package/dist/modelmanager.d.ts +5 -7
- package/dist/modelmanager.js +8 -6
- package/dist/modelmanager.js.map +1 -1
- package/dist/modelutil.d.ts +26 -33
- package/dist/modelutil.js.map +1 -1
- package/dist/rootmodel.json +1 -1
- package/dist/rootmodelhelper.d.ts +13 -0
- package/dist/{rootmodel.js → rootmodelhelper.js} +1 -2
- package/dist/rootmodelhelper.js.map +1 -0
- package/dist/securityexception.d.ts +4 -5
- package/dist/securityexception.js.map +1 -1
- package/dist/serializer/instancegenerator.d.ts +9 -9
- package/dist/serializer/instancegenerator.js +1 -1
- package/dist/serializer/instancegenerator.js.map +1 -1
- package/dist/serializer/jsongenerator.d.ts +14 -14
- package/dist/serializer/jsongenerator.js.map +1 -1
- package/dist/serializer/jsonpopulator.d.ts +44 -13
- package/dist/serializer/jsonpopulator.js +29 -22
- package/dist/serializer/jsonpopulator.js.map +1 -1
- package/dist/serializer/resourcevalidator.d.ts +88 -96
- package/dist/serializer/resourcevalidator.js +5 -5
- package/dist/serializer/resourcevalidator.js.map +1 -1
- package/dist/serializer/validationexception.d.ts +4 -5
- package/dist/serializer/validationexception.js.map +1 -1
- package/dist/serializer/valuegenerator.d.ts +153 -3
- package/dist/serializer/valuegenerator.js.map +1 -1
- package/dist/serializer.d.ts +8 -26
- package/dist/serializer.js +1 -1
- package/dist/serializer.js.map +1 -1
- package/dist/typenotfoundexception.d.ts +5 -7
- package/dist/typenotfoundexception.js +3 -1
- package/dist/typenotfoundexception.js.map +1 -1
- package/dist/types.d.ts +17 -0
- package/dist/types.js +16 -0
- package/dist/types.js.map +1 -0
- package/package.json +6 -5
- package/types/lib/dcsIndexWrapper.d.ts +16 -0
- package/types/lib/dcsconverter.d.ts +12 -0
- package/dist/decoratormodel.js.map +0 -1
- package/dist/rootmodel.d.ts +0 -5
- package/dist/rootmodel.js.map +0 -1
- /package/{dist → types/lib}/decoratormodel.d.ts +0 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
declare const Typed: any;
|
|
2
2
|
/**
|
|
3
3
|
* Identifiable is an entity with a namespace, type and an identifier.
|
|
4
4
|
* Applications should retrieve instances from {@link Factory}
|
|
@@ -24,31 +24,33 @@ declare class Identifiable extends Typed {
|
|
|
24
24
|
* @param {string} timestamp - The timestamp of this instance
|
|
25
25
|
* @protected
|
|
26
26
|
*/
|
|
27
|
-
|
|
28
|
-
$identifierFieldName: any;
|
|
29
|
-
$timestamp: string;
|
|
27
|
+
constructor(modelManager: any, classDeclaration: any, ns: any, type: any, id: any, timestamp: any);
|
|
30
28
|
/**
|
|
31
29
|
* Get the timestamp of this instance
|
|
32
30
|
* @return {string} The timestamp for this object
|
|
33
31
|
*/
|
|
34
|
-
getTimestamp():
|
|
32
|
+
getTimestamp(): any;
|
|
35
33
|
/**
|
|
36
34
|
* Get the identifier of this instance
|
|
37
35
|
* @return {string} The identifier for this object
|
|
38
36
|
*/
|
|
39
|
-
getIdentifier():
|
|
37
|
+
getIdentifier(): any;
|
|
40
38
|
/**
|
|
41
39
|
* Set the identifier of this instance
|
|
42
40
|
* @param {string} id - the new identifier for this object
|
|
43
41
|
*/
|
|
44
|
-
setIdentifier(id:
|
|
45
|
-
$identifier: string | undefined;
|
|
42
|
+
setIdentifier(id: any): void;
|
|
46
43
|
/**
|
|
47
44
|
* Get the fully qualified identifier of this instance.
|
|
48
45
|
* (namespace '.' type '#' identifier).
|
|
49
46
|
* @return {string} the fully qualified identifier of this instance
|
|
50
47
|
*/
|
|
51
|
-
getFullyQualifiedIdentifier():
|
|
48
|
+
getFullyQualifiedIdentifier(): any;
|
|
49
|
+
/**
|
|
50
|
+
* Returns the string representation of this class
|
|
51
|
+
* @return {String} the string representation of the class
|
|
52
|
+
*/
|
|
53
|
+
toString(): string;
|
|
52
54
|
/**
|
|
53
55
|
* Determine if this identifiable is a relationship.
|
|
54
56
|
* @return {boolean} True if this identifiable is a relationship,
|
|
@@ -65,6 +67,6 @@ declare class Identifiable extends Typed {
|
|
|
65
67
|
* Returns a URI representation of a reference to this identifiable
|
|
66
68
|
* @return {String} the URI for the identifiable
|
|
67
69
|
*/
|
|
68
|
-
toURI():
|
|
70
|
+
toURI(): any;
|
|
69
71
|
}
|
|
70
|
-
|
|
72
|
+
export = Identifiable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identifiable.js","sourceRoot":"","sources":["../../src/model/identifiable.
|
|
1
|
+
{"version":3,"file":"identifiable.js","sourceRoot":"","sources":["../../src/model/identifiable.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEjC;;;;;;;;GAQG;AACH,MAAM,YAAa,SAAQ,KAAK;IAC5B;;;;;;;;;;;;;;OAcG;IACH,YAAY,YAAY,EAAE,gBAAgB,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS;QAC/D,KAAK,CAAC,YAAY,EAAE,gBAAgB,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAEhD,kCAAkC;QAClC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,oBAAoB,GAAG,eAAe,EAAE,sBAAsB,EAAE,IAAI,aAAa,CAAC;QAEvF,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IAED;;;OAGG;IACH,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,aAAa;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,EAAE;QACZ,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC;IACzC,CAAC;IAED;;;;OAIG;IACH,2BAA2B;QACvB,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,qBAAqB,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACrE,CAAC;QACD,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACxC,CAAC;IAED;;;OAGG;IACH,QAAQ;QACJ,OAAO,mBAAmB,GAAG,IAAI,CAAC,2BAA2B,EAAE,GAAE,GAAG,CAAC;IACzE,CAAC;IAED;;;;OAIG;IACH,cAAc;QACV,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACH,UAAU;QACN,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;OAGG;IACH,KAAK;QACD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAC7F,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAED,iBAAS,YAAY,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
declare const Identifiable: any;
|
|
2
|
+
import type ModelManager = require('../modelmanager');
|
|
3
|
+
import type ClassDeclaration = require('../introspect/classdeclaration');
|
|
2
4
|
/**
|
|
3
5
|
* A Relationship is a typed pointer to an instance. I.e the relationship
|
|
4
6
|
* with namespace = 'org.example', type = 'Vehicle' and id = 'ABC' creates
|
|
@@ -13,15 +15,6 @@ export = Relationship;
|
|
|
13
15
|
* @memberof module:concerto-core
|
|
14
16
|
*/
|
|
15
17
|
declare class Relationship extends Identifiable {
|
|
16
|
-
/**
|
|
17
|
-
* Contructs a Relationship instance from a URI representation (created using toURI).
|
|
18
|
-
* @param {ModelManager} modelManager - the model manager to bind the relationship to
|
|
19
|
-
* @param {String} uriAsString - the URI as a string, generated using Identifiable.toURI()
|
|
20
|
-
* @param {String} [defaultNamespace] - default namespace to use for backwards compatability
|
|
21
|
-
* @param {String} [defaultType] - default type to use for backwards compatability
|
|
22
|
-
* @return {Relationship} the relationship
|
|
23
|
-
*/
|
|
24
|
-
static fromURI(modelManager: ModelManager, uriAsString: string, defaultNamespace?: string, defaultType?: string): Relationship;
|
|
25
18
|
/**
|
|
26
19
|
* Create an asset. Use the Factory to create instances.
|
|
27
20
|
* <p>
|
|
@@ -37,8 +30,26 @@ declare class Relationship extends Identifiable {
|
|
|
37
30
|
* @param {string} timestamp - The timestamp of this instance
|
|
38
31
|
* @private
|
|
39
32
|
*/
|
|
40
|
-
|
|
41
|
-
|
|
33
|
+
constructor(modelManager: ModelManager, classDeclaration: ClassDeclaration, ns: string, type: string, id: string, timestamp?: string);
|
|
34
|
+
/**
|
|
35
|
+
* Returns the string representation of this class
|
|
36
|
+
* @return {String} the string representation of the class
|
|
37
|
+
*/
|
|
38
|
+
toString(): string;
|
|
39
|
+
/**
|
|
40
|
+
* Determine if this identifiable is a relationship.
|
|
41
|
+
* @return {boolean} True if this identifiable is a relationship,
|
|
42
|
+
* false if not.
|
|
43
|
+
*/
|
|
44
|
+
isRelationship(): boolean;
|
|
45
|
+
/**
|
|
46
|
+
* Constructs a Relationship instance from a URI representation (created using toURI).
|
|
47
|
+
* @param {ModelManager} modelManager - the model manager to bind the relationship to
|
|
48
|
+
* @param {String} uriAsString - the URI as a string, generated using Identifiable.toURI()
|
|
49
|
+
* @param {String} [defaultNamespace] - default namespace to use for backwards compatibility
|
|
50
|
+
* @param {String} [defaultType] - default type to use for backwards compatibility
|
|
51
|
+
* @return {Relationship} the relationship
|
|
52
|
+
*/
|
|
53
|
+
static fromURI(modelManager: any, uriAsString: any, defaultNamespace: any, defaultType: any): Relationship;
|
|
42
54
|
}
|
|
43
|
-
|
|
44
|
-
import ModelManager = require("../modelmanager");
|
|
55
|
+
export = Relationship;
|
|
@@ -72,11 +72,11 @@ class Relationship extends Identifiable {
|
|
|
72
72
|
return true;
|
|
73
73
|
}
|
|
74
74
|
/**
|
|
75
|
-
*
|
|
75
|
+
* Constructs a Relationship instance from a URI representation (created using toURI).
|
|
76
76
|
* @param {ModelManager} modelManager - the model manager to bind the relationship to
|
|
77
77
|
* @param {String} uriAsString - the URI as a string, generated using Identifiable.toURI()
|
|
78
|
-
* @param {String} [defaultNamespace] - default namespace to use for backwards
|
|
79
|
-
* @param {String} [defaultType] - default type to use for backwards
|
|
78
|
+
* @param {String} [defaultNamespace] - default namespace to use for backwards compatibility
|
|
79
|
+
* @param {String} [defaultType] - default type to use for backwards compatibility
|
|
80
80
|
* @return {Relationship} the relationship
|
|
81
81
|
*/
|
|
82
82
|
static fromURI(modelManager, uriAsString, defaultNamespace, defaultType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relationship.js","sourceRoot":"","sources":["../../src/model/relationship.
|
|
1
|
+
{"version":3,"file":"relationship.js","sourceRoot":"","sources":["../../src/model/relationship.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAI3C,0CAA0C;AAC1C,mCAAmC;AACnC,0BAA0B;AAC1B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;IACvB,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACpD,CAAC;AACD,kCAAkC;AAElC;;;;;;;;;;;;GAYG;AACH,MAAM,YAAa,SAAQ,YAAY;IACnC;;;;;;;;;;;;;;OAcG;IACH,YAAY,YAA0B,EAAE,gBAAkC,EAAE,EAAU,EAAE,IAAY,EAAE,EAAU,EAAE,SAAkB;QAChI,KAAK,CAAC,YAAY,EAAE,gBAAgB,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;QAC/D,iEAAiE;QACjE,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,QAAQ;QACJ,OAAO,mBAAmB,GAAG,IAAI,CAAC,2BAA2B,EAAE,GAAG,GAAG,CAAC;IAC1E,CAAC;IAED;;;;OAIG;IACH,cAAc;QACV,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW;QACnE,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC;QAClF,IAAI,GAAG,GAAG,SAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QACjF,IAAI,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,YAAY,GAAG,IAAI,YAAY,CAAC,YAAY,EAAE,gBAAgB,EAAE,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAC1H,OAAO,YAAY,CAAC;IACxB,CAAC;CACJ;AAED,iBAAS,YAAY,CAAC"}
|
package/dist/model/resource.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
declare const Identifiable: any;
|
|
2
2
|
/**
|
|
3
3
|
*
|
|
4
4
|
* Resource is an instance that has a type. The type of the resource
|
|
@@ -19,24 +19,51 @@ export = Resource;
|
|
|
19
19
|
* @public
|
|
20
20
|
*/
|
|
21
21
|
declare class Resource extends Identifiable {
|
|
22
|
+
/**
|
|
23
|
+
* This constructor should not be called directly.
|
|
24
|
+
* <p>
|
|
25
|
+
* <strong>Note: Only to be called by framework code. Applications should
|
|
26
|
+
* retrieve instances from {@link Factory}</strong>
|
|
27
|
+
* </p>
|
|
28
|
+
*
|
|
29
|
+
* @param {ModelManager} modelManager - The ModelManager for this instance
|
|
30
|
+
* @param {ClassDeclaration} classDeclaration - The class declaration for this instance.
|
|
31
|
+
* @param {string} ns - The namespace this instance.
|
|
32
|
+
* @param {string} type - The type this instance.
|
|
33
|
+
* @param {string} id - The identifier of this instance.
|
|
34
|
+
* @param {string} timestamp - The timestamp of this instance
|
|
35
|
+
* @private
|
|
36
|
+
*/
|
|
37
|
+
constructor(modelManager: any, classDeclaration: any, ns: any, type: any, id: any, timestamp: any);
|
|
38
|
+
/**
|
|
39
|
+
* Returns the string representation of this class
|
|
40
|
+
* @return {String} the string representation of the class
|
|
41
|
+
*/
|
|
42
|
+
toString(): string;
|
|
43
|
+
/**
|
|
44
|
+
* Determine if this identifiable is a resource.
|
|
45
|
+
* @return {boolean} True if this identifiable is a resource,
|
|
46
|
+
* false if not.
|
|
47
|
+
*/
|
|
48
|
+
isResource(): boolean;
|
|
22
49
|
/**
|
|
23
50
|
* Determine if this identifiable is a concept.
|
|
24
51
|
* @return {boolean} True if this identifiable is a concept,
|
|
25
52
|
* false if not.
|
|
26
53
|
*/
|
|
27
|
-
isConcept():
|
|
54
|
+
isConcept(): any;
|
|
28
55
|
/**
|
|
29
56
|
* Determine if this object is identifiable.
|
|
30
57
|
* @return {boolean} True if this object has an identifiying field
|
|
31
58
|
* false if not.
|
|
32
59
|
*/
|
|
33
|
-
isIdentifiable():
|
|
60
|
+
isIdentifiable(): any;
|
|
34
61
|
/**
|
|
35
62
|
* Serialize this resource into a JavaScript object suitable for serialization to JSON,
|
|
36
63
|
* using the default options for the serializer. If you need to set additional options
|
|
37
64
|
* for the serializer, use the {@link Serializer#toJSON} method instead.
|
|
38
65
|
* @return {Object} A JavaScript object suitable for serialization to JSON.
|
|
39
66
|
*/
|
|
40
|
-
toJSON():
|
|
67
|
+
toJSON(): any;
|
|
41
68
|
}
|
|
42
|
-
|
|
69
|
+
export = Resource;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/model/resource.
|
|
1
|
+
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/model/resource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAE/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,QAAS,SAAQ,YAAY;IAC/B;;;;;;;;;;;;;;OAcG;IACH,YAAY,YAAY,EAAE,gBAAgB,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS;QAC/D,KAAK,CAAC,YAAY,EAAE,gBAAgB,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IACnE,CAAC;IAED;;;OAGG;IACH,QAAQ;QACJ,OAAO,eAAe,GAAG,IAAI,CAAC,2BAA2B,EAAE,GAAE,GAAG,CAAC;IACrE,CAAC;IAED;;;;OAIG;IACH,UAAU;QACN,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,SAAS;QACL,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC,SAAS,EAAE,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACH,cAAc;QACV,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC,YAAY,EAAE,CAAC;IACrD,CAAC;IAED;;;;;OAKG;IACH,MAAM;QACF,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;CAEJ;AAED,iBAAS,QAAQ,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export = ResourceId;
|
|
2
1
|
/**
|
|
3
2
|
* All the identifying properties of a resource.
|
|
4
3
|
* @private
|
|
@@ -9,6 +8,17 @@ export = ResourceId;
|
|
|
9
8
|
* @property {String} id
|
|
10
9
|
*/
|
|
11
10
|
declare class ResourceId {
|
|
11
|
+
namespace: any;
|
|
12
|
+
type: any;
|
|
13
|
+
id: any;
|
|
14
|
+
/**
|
|
15
|
+
* <strong>Note: only for use by internal framework code.</strong>
|
|
16
|
+
* @param {String} namespace - Namespace containing the type.
|
|
17
|
+
* @param {String} type - Short type name.
|
|
18
|
+
* @param {String} id - Instance identifier.
|
|
19
|
+
* @private
|
|
20
|
+
*/
|
|
21
|
+
constructor(namespace: any, type: any, id: any);
|
|
12
22
|
/**
|
|
13
23
|
* Parse a URI into an identifier.
|
|
14
24
|
* <p>
|
|
@@ -24,21 +34,11 @@ declare class ResourceId {
|
|
|
24
34
|
* @return {Identifier} - An identifier.
|
|
25
35
|
* @throws {Error} - On an invalid resource URI.
|
|
26
36
|
*/
|
|
27
|
-
static fromURI(uri:
|
|
28
|
-
/**
|
|
29
|
-
* <strong>Note: only for use by internal framework code.</strong>
|
|
30
|
-
* @param {String} namespace - Namespace containing the type.
|
|
31
|
-
* @param {String} type - Short type name.
|
|
32
|
-
* @param {String} id - Instance identifier.
|
|
33
|
-
* @private
|
|
34
|
-
*/
|
|
35
|
-
private constructor();
|
|
36
|
-
namespace: string;
|
|
37
|
-
type: string;
|
|
38
|
-
id: string;
|
|
37
|
+
static fromURI(uri: any, legacyNamespace: any, legacyType: any): ResourceId;
|
|
39
38
|
/**
|
|
40
39
|
* URI representation of this identifier.
|
|
41
40
|
* @return {String} A URI.
|
|
42
41
|
*/
|
|
43
42
|
toURI(): string;
|
|
44
43
|
}
|
|
44
|
+
export = ResourceId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resourceid.js","sourceRoot":"","sources":["../../src/model/resourceid.
|
|
1
|
+
{"version":3,"file":"resourceid.js","sourceRoot":"","sources":["../../src/model/resourceid.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,YAAY,CAAC;AAEb,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE3C,MAAM,eAAe,GAAG,UAAU,CAAC;AAEnC;;;;;;;;GAQG;AACH,MAAM,UAAU;IAIZ;;;;;;OAMG;IACH,YAAY,SAAS,EAAE,IAAI,EAAE,EAAE;QAC3B,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,UAAU;QAC3C,IAAI,aAAa,CAAC;QAClB,IAAI,CAAC;YACD,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,GAAG,EAAC,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC;QACtC,6DAA6D;QAC7D,IAAI,MAAM,IAAI,MAAM,KAAK,eAAe,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,GAAG,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,aAAa,CAAC,QAAQ,IAAI,aAAa,CAAC,QAAQ,IAAI,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;YAChG,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,GAAG,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,SAAS,EAAE,IAAI,CAAC;QACpB,IAAI,EAAE,GAAG,aAAa,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,+CAA+C;YAC/C,SAAS,GAAG,eAAe,CAAC;YAC5B,IAAI,GAAG,UAAU,CAAC;YAClB,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC;QAC5B,CAAC;aAAM,CAAC;YACJ,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC;YACzC,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACnD,IAAI,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAClD,CAAC;QAED,OAAO,IAAI,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC;IAED;;;OAGG;IACH,KAAK;QACD,MAAM,aAAa,GAAG,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAClF,OAAO,eAAe,GAAG,GAAG,GAAI,aAAa,GAAG,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7E,CAAC;CAEJ;AAED,iBAAS,UAAU,CAAC"}
|
package/dist/model/typed.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export = Typed;
|
|
2
1
|
/**
|
|
3
2
|
* Object is an instance with a namespace and a type.
|
|
4
3
|
*
|
|
@@ -8,6 +7,10 @@ export = Typed;
|
|
|
8
7
|
* @memberof module:concerto-core
|
|
9
8
|
*/
|
|
10
9
|
declare class Typed {
|
|
10
|
+
$modelManager: any;
|
|
11
|
+
$classDeclaration: any;
|
|
12
|
+
$namespace: any;
|
|
13
|
+
$type: any;
|
|
11
14
|
/**
|
|
12
15
|
* Create an instance.
|
|
13
16
|
* <p>
|
|
@@ -21,11 +24,7 @@ declare class Typed {
|
|
|
21
24
|
* @param {string} type - The type this instance.
|
|
22
25
|
* @protected
|
|
23
26
|
*/
|
|
24
|
-
|
|
25
|
-
$modelManager: ModelManager;
|
|
26
|
-
$classDeclaration: ClassDeclaration;
|
|
27
|
-
$namespace: string;
|
|
28
|
-
$type: string;
|
|
27
|
+
constructor(modelManager: any, classDeclaration: any, ns: any, type: any);
|
|
29
28
|
/**
|
|
30
29
|
* Visitor design pattern
|
|
31
30
|
* @param {Object} visitor - the visitor
|
|
@@ -33,52 +32,52 @@ declare class Typed {
|
|
|
33
32
|
* @return {Object} the result of visiting or null
|
|
34
33
|
* @private
|
|
35
34
|
*/
|
|
36
|
-
|
|
35
|
+
accept(visitor: any, parameters: any): any;
|
|
37
36
|
/**
|
|
38
37
|
* Get the ModelManager for this instance
|
|
39
38
|
* @return {ModelManager} The ModelManager for this object
|
|
40
39
|
* @private
|
|
41
40
|
*/
|
|
42
|
-
|
|
41
|
+
getModelManager(): any;
|
|
43
42
|
/**
|
|
44
43
|
* Get the type of the instance (a short name, not including namespace).
|
|
45
44
|
* @return {string} The type of this object
|
|
46
45
|
*/
|
|
47
|
-
getType():
|
|
46
|
+
getType(): any;
|
|
48
47
|
/**
|
|
49
48
|
* Get the fully-qualified type name of the instance (including namespace).
|
|
50
49
|
* @return {string} The fully-qualified type name of this object
|
|
51
50
|
*/
|
|
52
|
-
getFullyQualifiedType():
|
|
51
|
+
getFullyQualifiedType(): any;
|
|
53
52
|
/**
|
|
54
53
|
* Get the namespace of the instance.
|
|
55
54
|
* @return {string} The namespace of this object
|
|
56
55
|
*/
|
|
57
|
-
getNamespace():
|
|
56
|
+
getNamespace(): any;
|
|
58
57
|
/**
|
|
59
58
|
* Returns the class declaration for this instance object.
|
|
60
59
|
*
|
|
61
60
|
* @return {ClassDeclaration} - the class declaration for this instance
|
|
62
61
|
* @private
|
|
63
62
|
*/
|
|
64
|
-
|
|
63
|
+
getClassDeclaration(): any;
|
|
65
64
|
/**
|
|
66
65
|
* Sets a property on this Resource
|
|
67
66
|
* @param {string} propName - the name of the field
|
|
68
67
|
* @param {string} value - the value of the property
|
|
69
68
|
*/
|
|
70
|
-
setPropertyValue(propName:
|
|
69
|
+
setPropertyValue(propName: any, value: any): void;
|
|
71
70
|
/**
|
|
72
71
|
* Adds a value to an array property on this Resource
|
|
73
72
|
* @param {string} propName - the name of the field
|
|
74
73
|
* @param {string} value - the value of the property
|
|
75
74
|
*/
|
|
76
|
-
addArrayValue(propName:
|
|
75
|
+
addArrayValue(propName: any, value: any): void;
|
|
77
76
|
/**
|
|
78
77
|
* Sets the fields to their default values, based on the model
|
|
79
78
|
* @private
|
|
80
79
|
*/
|
|
81
|
-
|
|
80
|
+
assignFieldDefaults(): void;
|
|
82
81
|
/**
|
|
83
82
|
* Check to see if this instance is an instance of the specified fully qualified
|
|
84
83
|
* type name.
|
|
@@ -86,13 +85,12 @@ declare class Typed {
|
|
|
86
85
|
* @returns {boolean} True if this instance is an instance of the specified fully
|
|
87
86
|
* qualified type name, false otherwise.
|
|
88
87
|
*/
|
|
89
|
-
instanceOf(fqt:
|
|
88
|
+
instanceOf(fqt: any): boolean;
|
|
90
89
|
/**
|
|
91
|
-
*
|
|
90
|
+
* Overridden to prevent people accidentally converting a resource to JSON
|
|
92
91
|
* without using the Serializer.
|
|
93
92
|
* @protected
|
|
94
93
|
*/
|
|
95
|
-
|
|
94
|
+
toJSON(): void;
|
|
96
95
|
}
|
|
97
|
-
|
|
98
|
-
import ClassDeclaration = require("../introspect/classdeclaration");
|
|
96
|
+
export = Typed;
|
package/dist/model/typed.js
CHANGED
|
@@ -179,7 +179,7 @@ class Typed {
|
|
|
179
179
|
if (classDeclaration.getFullyQualifiedName() === fqt) {
|
|
180
180
|
return true;
|
|
181
181
|
}
|
|
182
|
-
// Now walk the class
|
|
182
|
+
// Now walk the class hierarchy looking to see if it's an instance of the specified type.
|
|
183
183
|
let superTypeDeclaration = classDeclaration.getSuperTypeDeclaration();
|
|
184
184
|
while (superTypeDeclaration) {
|
|
185
185
|
if (superTypeDeclaration.getFullyQualifiedName() === fqt) {
|
|
@@ -190,7 +190,7 @@ class Typed {
|
|
|
190
190
|
return false;
|
|
191
191
|
}
|
|
192
192
|
/**
|
|
193
|
-
*
|
|
193
|
+
* Overridden to prevent people accidentally converting a resource to JSON
|
|
194
194
|
* without using the Serializer.
|
|
195
195
|
* @protected
|
|
196
196
|
*/
|
package/dist/model/typed.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typed.js","sourceRoot":"","sources":["../../src/model/typed.
|
|
1
|
+
{"version":3,"file":"typed.js","sourceRoot":"","sources":["../../src/model/typed.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
declare const Resource: any;
|
|
2
2
|
/**
|
|
3
3
|
* ValidatedResource is a Resource that can validate that property
|
|
4
4
|
* changes (or the whole instance) do not violate the structure of
|
|
@@ -9,6 +9,7 @@ export = ValidatedResource;
|
|
|
9
9
|
* @memberof module:concerto-core
|
|
10
10
|
*/
|
|
11
11
|
declare class ValidatedResource extends Resource {
|
|
12
|
+
$validator: any;
|
|
12
13
|
/**
|
|
13
14
|
* This constructor should not be called directly.
|
|
14
15
|
* Use the Factory class to create instances.
|
|
@@ -26,8 +27,21 @@ declare class ValidatedResource extends Resource {
|
|
|
26
27
|
* @param {ResourceValidator} resourceValidator - The validator to use for this instance
|
|
27
28
|
* @private
|
|
28
29
|
*/
|
|
29
|
-
|
|
30
|
-
|
|
30
|
+
constructor(modelManager: any, classDeclaration: any, ns: any, type: any, id: any, timestamp: any, resourceValidator: any);
|
|
31
|
+
/**
|
|
32
|
+
* Sets a property, validating that it does not violate the model
|
|
33
|
+
* @param {string} propName - the name of the field
|
|
34
|
+
* @param {string} value - the value of the property
|
|
35
|
+
* @throws {Error} if the value is not compatible with the model definition for the field
|
|
36
|
+
*/
|
|
37
|
+
setPropertyValue(propName: any, value: any): void;
|
|
38
|
+
/**
|
|
39
|
+
* Adds an array property value, validating that it does not violate the model
|
|
40
|
+
* @param {string} propName - the name of the field
|
|
41
|
+
* @param {string} value - the value of the property
|
|
42
|
+
* @throws {Error} if the value is not compatible with the model definition for the field
|
|
43
|
+
*/
|
|
44
|
+
addArrayValue(propName: any, value: any): void;
|
|
31
45
|
/**
|
|
32
46
|
* Validates the instance against its model.
|
|
33
47
|
*
|
|
@@ -35,4 +49,4 @@ declare class ValidatedResource extends Resource {
|
|
|
35
49
|
*/
|
|
36
50
|
validate(): void;
|
|
37
51
|
}
|
|
38
|
-
|
|
52
|
+
export = ValidatedResource;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validatedresource.js","sourceRoot":"","sources":["../../src/model/validatedresource.
|
|
1
|
+
{"version":3,"file":"validatedresource.js","sourceRoot":"","sources":["../../src/model/validatedresource.ts"],"names":[],"mappings":"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"}
|
package/dist/modelloader.d.ts
CHANGED
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
import type { FileLoader } from '@accordproject/concerto-util';
|
|
2
|
+
import type { ModelManagerOptions } from './types';
|
|
3
|
+
import ModelFile = require('./introspect/modelfile');
|
|
4
|
+
import ModelManager = require('./modelmanager');
|
|
5
|
+
type ModelLoaderOptions = ModelManagerOptions & {
|
|
6
|
+
offline?: boolean;
|
|
7
|
+
};
|
|
2
8
|
/**
|
|
3
9
|
* Create a ModelManager from model files, with an optional system model.
|
|
4
10
|
*
|
|
@@ -17,7 +23,7 @@ declare class ModelLoader {
|
|
|
17
23
|
* @return {Promise<ModelManager>} the model manager
|
|
18
24
|
* @private
|
|
19
25
|
*/
|
|
20
|
-
|
|
26
|
+
static addModel(modelFileLoader: FileLoader<ModelFile>, modelManager: ModelManager, ctoFile: string): Promise<ModelManager>;
|
|
21
27
|
/**
|
|
22
28
|
* Load models in a new model manager
|
|
23
29
|
*
|
|
@@ -27,10 +33,7 @@ declare class ModelLoader {
|
|
|
27
33
|
* @param {number} [options.utcOffset] - UTC Offset for this execution
|
|
28
34
|
* @return {Promise<ModelManager>} the model manager
|
|
29
35
|
*/
|
|
30
|
-
static loadModelManager(ctoFiles: string[], options?:
|
|
31
|
-
offline?: boolean | undefined;
|
|
32
|
-
utcOffset?: number | undefined;
|
|
33
|
-
}): Promise<ModelManager>;
|
|
36
|
+
static loadModelManager(ctoFiles: string[], options?: ModelLoaderOptions): Promise<ModelManager>;
|
|
34
37
|
/**
|
|
35
38
|
* Load system and models in a new model manager from model files objects
|
|
36
39
|
*
|
|
@@ -41,9 +44,6 @@ declare class ModelLoader {
|
|
|
41
44
|
* @param {number} [options.utcOffset] - UTC Offset for this execution
|
|
42
45
|
* @return {Promise<ModelManager>} the model manager
|
|
43
46
|
*/
|
|
44
|
-
static loadModelManagerFromModelFiles(modelFiles:
|
|
45
|
-
offline?: boolean | undefined;
|
|
46
|
-
utcOffset?: number | undefined;
|
|
47
|
-
}): Promise<ModelManager>;
|
|
47
|
+
static loadModelManagerFromModelFiles(modelFiles: Array<string | ModelFile>, fileNames?: string[], options?: ModelLoaderOptions): Promise<ModelManager>;
|
|
48
48
|
}
|
|
49
|
-
|
|
49
|
+
export = ModelLoader;
|
package/dist/modelloader.js
CHANGED
|
@@ -12,11 +12,44 @@
|
|
|
12
12
|
* limitations under the License.
|
|
13
13
|
*/
|
|
14
14
|
'use strict';
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
16
|
+
if (k2 === undefined) k2 = k;
|
|
17
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
18
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
19
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
20
|
+
}
|
|
21
|
+
Object.defineProperty(o, k2, desc);
|
|
22
|
+
}) : (function(o, m, k, k2) {
|
|
23
|
+
if (k2 === undefined) k2 = k;
|
|
24
|
+
o[k2] = m[k];
|
|
25
|
+
}));
|
|
26
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
27
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
28
|
+
}) : function(o, v) {
|
|
29
|
+
o["default"] = v;
|
|
30
|
+
});
|
|
31
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
32
|
+
var ownKeys = function(o) {
|
|
33
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
34
|
+
var ar = [];
|
|
35
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
36
|
+
return ar;
|
|
37
|
+
};
|
|
38
|
+
return ownKeys(o);
|
|
39
|
+
};
|
|
40
|
+
return function (mod) {
|
|
41
|
+
if (mod && mod.__esModule) return mod;
|
|
42
|
+
var result = {};
|
|
43
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
44
|
+
__setModuleDefault(result, mod);
|
|
45
|
+
return result;
|
|
46
|
+
};
|
|
47
|
+
})();
|
|
48
|
+
const fs = __importStar(require("fs"));
|
|
49
|
+
const concerto_cto_1 = require("@accordproject/concerto-cto");
|
|
50
|
+
const concerto_util_1 = require("@accordproject/concerto-util");
|
|
51
|
+
const ModelFile = require("./introspect/modelfile");
|
|
52
|
+
const ModelManager = require("./modelmanager");
|
|
20
53
|
/**
|
|
21
54
|
* Create a ModelManager from model files, with an optional system model.
|
|
22
55
|
*
|
|
@@ -42,7 +75,7 @@ class ModelLoader {
|
|
|
42
75
|
}
|
|
43
76
|
else {
|
|
44
77
|
const content = fs.readFileSync(ctoFile, 'utf8');
|
|
45
|
-
const ast = Parser.parse(content, ctoFile);
|
|
78
|
+
const ast = concerto_cto_1.Parser.parse(content, ctoFile);
|
|
46
79
|
modelFile = new ModelFile(modelManager, ast, content, ctoFile);
|
|
47
80
|
}
|
|
48
81
|
modelManager.addModelFile(modelFile, null, modelFile.getName(), true);
|
|
@@ -58,19 +91,20 @@ class ModelLoader {
|
|
|
58
91
|
* @return {Promise<ModelManager>} the model manager
|
|
59
92
|
*/
|
|
60
93
|
static async loadModelManager(ctoFiles, options = { offline: false }) {
|
|
61
|
-
|
|
94
|
+
const opts = options || { offline: false };
|
|
95
|
+
let modelManager = new ModelManager(opts);
|
|
62
96
|
// How to create a modelfile from the external content
|
|
63
97
|
const processFile = (name, data) => {
|
|
64
|
-
const ast = Parser.parse(data);
|
|
98
|
+
const ast = concerto_cto_1.Parser.parse(data);
|
|
65
99
|
return new ModelFile(modelManager, ast, data, name);
|
|
66
100
|
};
|
|
67
|
-
const modelFileLoader = new DefaultFileLoader(processFile);
|
|
101
|
+
const modelFileLoader = new concerto_util_1.DefaultFileLoader(processFile);
|
|
68
102
|
// Load user models
|
|
69
103
|
for (let ctoFile of ctoFiles) {
|
|
70
104
|
modelManager = await ModelLoader.addModel(modelFileLoader, modelManager, ctoFile);
|
|
71
105
|
}
|
|
72
106
|
// Validate the models, either offline or with external model resolution
|
|
73
|
-
if (
|
|
107
|
+
if (opts && opts.offline) {
|
|
74
108
|
modelManager.validateModelFiles();
|
|
75
109
|
return modelManager;
|
|
76
110
|
}
|
|
@@ -90,11 +124,13 @@ class ModelLoader {
|
|
|
90
124
|
* @return {Promise<ModelManager>} the model manager
|
|
91
125
|
*/
|
|
92
126
|
static async loadModelManagerFromModelFiles(modelFiles, fileNames, options = { offline: false }) {
|
|
93
|
-
|
|
127
|
+
const opts = options || { offline: false };
|
|
128
|
+
// FIX: Cast to 'any' to bypass strict constructor signature check
|
|
129
|
+
let modelManager = new ModelManager(opts);
|
|
94
130
|
// Load system model
|
|
95
131
|
modelManager.addModelFiles(modelFiles, fileNames, true);
|
|
96
132
|
// Validate the models, either offline or with external model resolution
|
|
97
|
-
if (
|
|
133
|
+
if (opts && opts.offline) {
|
|
98
134
|
modelManager.validateModelFiles();
|
|
99
135
|
return modelManager;
|
|
100
136
|
}
|
package/dist/modelloader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelloader.js","sourceRoot":"","sources":["../src/modelloader.
|
|
1
|
+
{"version":3,"file":"modelloader.js","sourceRoot":"","sources":["../src/modelloader.ts"],"names":[],"mappings":"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"}
|