solc-typed-ast 7.0.2 → 8.0.1

package/dist/ast/definitions.js

@@ -5,12 +5,14 @@ const semver_1 = require("semver");
 const misc_1 = require("../misc");
 const abi_1 = require("../types/abi");
 const constants_1 = require("./constants");
-const declaration_1 = require("./implementation/declaration");
 const contract_definition_1 = require("./implementation/declaration/contract_definition");
+const enum_definition_1 = require("./implementation/declaration/enum_definition");
 const error_definition_1 = require("./implementation/declaration/error_definition");
 const event_definition_1 = require("./implementation/declaration/event_definition");
 const function_definition_1 = require("./implementation/declaration/function_definition");
 const modifier_definition_1 = require("./implementation/declaration/modifier_definition");
+const struct_definition_1 = require("./implementation/declaration/struct_definition");
+const user_defined_value_type_definition_1 = require("./implementation/declaration/user_defined_value_type_definition");
 const variable_declaration_1 = require("./implementation/declaration/variable_declaration");
 const meta_1 = require("./implementation/meta");
 const statement_1 = require("./implementation/statement");
@@ -19,7 +21,7 @@ const statement_1 = require("./implementation/statement");
  * scope node. Note that `Block` is only a scope in 0.4.x
  */
 function isScope(node, version) {
-    if (semver_1.lt(version, "0.5.0") && node instanceof statement_1.Block) {
+    if ((0, semver_1.lt)(version, "0.5.0") && node instanceof statement_1.Block) {
         return true;
     }
     return (node instanceof meta_1.SourceUnit ||
@@ -61,7 +63,7 @@ function getContainingScope(node, version) {
         return getContainingScope(pt, version);
     }
     if (pt instanceof statement_1.Block || pt instanceof statement_1.UncheckedBlock) {
-        if (semver_1.gte(version, "0.5.0")) {
+        if ((0, semver_1.gte)(version, "0.5.0")) {
             const ptChildren = pt.children;
             for (let i = ptChildren.indexOf(node) - 1; i >= 0; i--) {
                 const sibling = ptChildren[i];
@@ -92,9 +94,10 @@ function* lookupInSourceUnit(name, scope, visitedUnits) {
         if ((child instanceof variable_declaration_1.VariableDeclaration ||
             child instanceof function_definition_1.FunctionDefinition ||
             child instanceof contract_definition_1.ContractDefinition ||
-            child instanceof declaration_1.StructDefinition ||
-            child instanceof declaration_1.EnumDefinition ||
-            child instanceof error_definition_1.ErrorDefinition) &&
+            child instanceof struct_definition_1.StructDefinition ||
+            child instanceof enum_definition_1.EnumDefinition ||
+            child instanceof error_definition_1.ErrorDefinition ||
+            child instanceof user_defined_value_type_definition_1.UserDefinedValueTypeDefinition) &&
             child.name === name) {
             yield child;
         }
@@ -119,7 +122,7 @@ function* lookupInSourceUnit(name, scope, visitedUnits) {
                         if (foreignDef instanceof meta_1.ImportDirective) {
                             symImportName = foreignDef.unitAlias;
                             if (symImportName === "") {
-                                throw new Error(`Unexpected ImportDirective foreign def with non-unit alias ${misc_1.pp(foreignDef)}`);
+                                throw new Error(`Unexpected ImportDirective foreign def with non-unit alias ${(0, misc_1.pp)(foreignDef)}`);
                             }
                         }
                         else {
@@ -145,9 +148,10 @@ function* lookupInContractDefinition(name, scope) {
                 child instanceof function_definition_1.FunctionDefinition ||
                 child instanceof modifier_definition_1.ModifierDefinition ||
                 child instanceof event_definition_1.EventDefinition ||
-                child instanceof declaration_1.StructDefinition ||
-                child instanceof declaration_1.EnumDefinition ||
-                child instanceof error_definition_1.ErrorDefinition) &&
+                child instanceof struct_definition_1.StructDefinition ||
+                child instanceof enum_definition_1.EnumDefinition ||
+                child instanceof error_definition_1.ErrorDefinition ||
+                child instanceof user_defined_value_type_definition_1.UserDefinedValueTypeDefinition) &&
                 child.name === name) {
                 let sigHash;
                 if (child instanceof function_definition_1.FunctionDefinition) {
@@ -231,7 +235,7 @@ function lookupInScope(name, scope, visitedUnits = new Set()) {
             : [];
     }
     else {
-        throw new Error(`Unknown scope node ${misc_1.pp(scope)}`);
+        throw new Error(`Unknown scope node ${(0, misc_1.pp)(scope)}`);
     }
     return new Set(results);
 }
@@ -265,7 +269,7 @@ function resolveAny(name, ctx, version, inclusive = false) {
                     // Sanity check - when multiple results are found, they must either be overloaded events
                     // or overloaded functions/public state vars.
                     if (res.size > 1) {
-                        if (!misc_1.forAll(res, (def) => def instanceof event_definition_1.EventDefinition ||
+                        if (!(0, misc_1.forAll)(res, (def) => def instanceof event_definition_1.EventDefinition ||
                             def instanceof function_definition_1.FunctionDefinition ||
                             (def instanceof variable_declaration_1.VariableDeclaration &&
                                 def.stateVariable &&
@@ -305,7 +309,7 @@ function resolveAny(name, ctx, version, inclusive = false) {
         // identifier path (e.g. multiple resolutions for `A` in `A.B`). This
         // shouldn't happen.
         if (res.size > 1) {
-            throw new Error(`Ambigious path resolution for ${element} in ${name} in ctx ${misc_1.pp(ctx)}: got ${[
+            throw new Error(`Ambigious path resolution for ${element} in ${name} in ctx ${(0, misc_1.pp)(ctx)}: got ${[
                 ...res
             ]
                 .map(misc_1.pp)
@@ -315,7 +319,7 @@ function resolveAny(name, ctx, version, inclusive = false) {
         // An intermediate segment in an identifier path (e.g. `A` in `A.B`) should always resolve to a
         // single imported source unit or contract.
         if (!(resolvedNode instanceof meta_1.ImportDirective || resolvedNode instanceof contract_definition_1.ContractDefinition)) {
-            throw new Error(`Unexpected non-scope node for ${element} in ${name} in ctx ${misc_1.pp(ctx)}: got ${misc_1.pp(resolvedNode)}`);
+            throw new Error(`Unexpected non-scope node for ${element} in ${name} in ctx ${(0, misc_1.pp)(ctx)}: got ${(0, misc_1.pp)(resolvedNode)}`);
         }
         scope = resolvedNode instanceof meta_1.ImportDirective ? resolvedNode.vSourceUnit : resolvedNode;
     }

package/dist/ast/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/ast/definitions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/ast/definitions.ts"],"names":[],"mappings":"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"}

package/dist/ast/implementation/declaration/contract_definition.d.ts

@@ -11,6 +11,7 @@ import { EventDefinition } from "./event_definition";
 import { FunctionDefinition } from "./function_definition";
 import { ModifierDefinition } from "./modifier_definition";
 import { StructDefinition } from "./struct_definition";
+import { UserDefinedValueTypeDefinition } from "./user_defined_value_type_definition";
 import { VariableDeclaration } from "./variable_declaration";
 export declare class ContractDefinition extends ASTNodeWithChildren<ASTNode> {
     private docString?;
@@ -51,7 +52,7 @@ export declare class ContractDefinition extends ASTNodeWithChildren<ASTNode> {
      * Used error definition ids (including external definition ids)
      */
     usedErrors: number[];
-    constructor(id: number, src: string, type: string, name: string, scope: number, kind: ContractKind, abstract: boolean, fullyImplemented: boolean, linearizedBaseContracts: number[], usedErrors: number[], documentation?: string | StructuredDocumentation, children?: Iterable<ASTNode>, nameLocation?: string, raw?: any);
+    constructor(id: number, src: string, name: string, scope: number, kind: ContractKind, abstract: boolean, fullyImplemented: boolean, linearizedBaseContracts: number[], usedErrors: number[], documentation?: string | StructuredDocumentation, children?: Iterable<ASTNode>, nameLocation?: string, raw?: any);
     /**
      * Optional documentation appearing above the contract definition:
      * - Is `undefined` when not specified.
@@ -111,6 +112,10 @@ export declare class ContractDefinition extends ASTNodeWithChildren<ASTNode> {
      * Enums of the contract
      */
     get vEnums(): readonly EnumDefinition[];
+    /**
+     * User-defined value type definitions of contract
+     */
+    get vUserDefinedValueTypes(): readonly UserDefinedValueTypeDefinition[];
     /**
      * Constructor reference (if definition is present for this contract)
      */

package/dist/ast/implementation/declaration/contract_definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/contract_definition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contract_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/contract_definition.ts"],"names":[],"mappings":"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"}

package/dist/ast/implementation/declaration/contract_definition.js

@@ -12,10 +12,11 @@ const event_definition_1 = require("./event_definition");
 const function_definition_1 = require("./function_definition");
 const modifier_definition_1 = require("./modifier_definition");
 const struct_definition_1 = require("./struct_definition");
+const user_defined_value_type_definition_1 = require("./user_defined_value_type_definition");
 const variable_declaration_1 = require("./variable_declaration");
 class ContractDefinition extends ast_node_1.ASTNodeWithChildren {
-    constructor(id, src, type, name, scope, kind, abstract, fullyImplemented, linearizedBaseContracts, usedErrors, documentation, children, nameLocation, raw) {
-        super(id, src, type, raw);
+    constructor(id, src, name, scope, kind, abstract, fullyImplemented, linearizedBaseContracts, usedErrors, documentation, children, nameLocation, raw) {
+        super(id, src, raw);
         this.name = name;
         this.scope = scope;
         this.kind = kind;
@@ -145,6 +146,12 @@ class ContractDefinition extends ast_node_1.ASTNodeWithChildren {
     get vEnums() {
         return this.ownChildren.filter((node) => node instanceof enum_definition_1.EnumDefinition);
     }
+    /**
+     * User-defined value type definitions of contract
+     */
+    get vUserDefinedValueTypes() {
+        return this.ownChildren.filter((node) => node instanceof user_defined_value_type_definition_1.UserDefinedValueTypeDefinition);
+    }
     /**
      * Constructor reference (if definition is present for this contract)
      */

package/dist/ast/implementation/declaration/contract_definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"contract_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/contract_definition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contract_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/contract_definition.ts"],"names":[],"mappings":"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"}

package/dist/ast/implementation/declaration/enum_definition.d.ts

@@ -11,11 +11,11 @@ export declare class EnumDefinition extends ASTNodeWithChildren<EnumValue> {
      * The source range for name string
      */
     nameLocation?: string;
+    constructor(id: number, src: string, name: string, members: Iterable<EnumValue>, nameLocation?: string, raw?: any);
     /**
      * Canonical name (or qualified name), e.g. `DefiningContract.SomeEnum`
      */
-    canonicalName: string;
-    constructor(id: number, src: string, type: string, name: string, canonicalName: string, members: Iterable<EnumValue>, nameLocation?: string, raw?: any);
+    get canonicalName(): string;
     /**
      * Array of the enum values
      */

package/dist/ast/implementation/declaration/enum_definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enum_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/enum_definition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,qBAAa,cAAe,SAAQ,mBAAmB,CAAC,SAAS,CAAC;IAC9D;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;gBAGlB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,EAC5B,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAcb;;OAEG;IACH,IAAI,QAAQ,IAAI,SAAS,EAAE,CAE1B;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,kBAAkB,GAAG,UAAU,CAE5C;IAED,gBAAgB,IAAI,MAAM;CAG7B"}
+{"version":3,"file":"enum_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/enum_definition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,qBAAa,cAAe,SAAQ,mBAAmB,CAAC,SAAS,CAAC;IAC9D;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;gBAGlB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,EAC5B,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAab;;OAEG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,SAAS,EAAE,CAE1B;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,kBAAkB,GAAG,UAAU,CAE5C;IAED,gBAAgB,IAAI,MAAM;CAG7B"}

package/dist/ast/implementation/declaration/enum_definition.js

@@ -4,15 +4,20 @@ exports.EnumDefinition = void 0;
 const __1 = require("../../..");
 const ast_node_1 = require("../../ast_node");
 class EnumDefinition extends ast_node_1.ASTNodeWithChildren {
-    constructor(id, src, type, name, canonicalName, members, nameLocation, raw) {
-        super(id, src, type, raw);
+    constructor(id, src, name, members, nameLocation, raw) {
+        super(id, src, raw);
         this.name = name;
-        this.canonicalName = canonicalName;
         for (const member of members) {
             this.appendChild(member);
         }
         this.nameLocation = nameLocation;
     }
+    /**
+     * Canonical name (or qualified name), e.g. `DefiningContract.SomeEnum`
+     */
+    get canonicalName() {
+        return (0, __1.getUserDefinedTypeFQName)(this);
+    }
     /**
      * Array of the enum values
      */
@@ -26,7 +31,7 @@ class EnumDefinition extends ast_node_1.ASTNodeWithChildren {
         return this.parent;
     }
     toUintTypeString() {
-        return __1.enumToIntType(this).pp();
+        return (0, __1.enumToIntType)(this).pp();
     }
 }
 exports.EnumDefinition = EnumDefinition;

package/dist/ast/implementation/declaration/enum_definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"enum_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/enum_definition.ts"],"names":[],"mappings":";;;AAAA,gCAAyC;AACzC,6CAAqD;AAKrD,MAAa,cAAe,SAAQ,8BAA8B;IAgB9D,YACI,EAAU,EACV,GAAW,EACX,IAAY,EACZ,IAAY,EACZ,aAAqB,EACrB,OAA4B,EAC5B,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAE1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SAC5B;QAED,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,WAA0B,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAyC,CAAC;IAC1D,CAAC;IAED,gBAAgB;QACZ,OAAO,iBAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC;IACpC,CAAC;CACJ;AAvDD,wCAuDC"}
+{"version":3,"file":"enum_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/enum_definition.ts"],"names":[],"mappings":";;;AAAA,gCAAmE;AACnE,6CAAqD;AAKrD,MAAa,cAAe,SAAQ,8BAA8B;IAW9D,YACI,EAAU,EACV,GAAW,EACX,IAAY,EACZ,OAA4B,EAC5B,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAEpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SAC5B;QAED,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,IAAI,aAAa;QACb,OAAO,IAAA,4BAAwB,EAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,WAA0B,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAyC,CAAC;IAC1D,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAA,iBAAa,EAAC,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC;IACpC,CAAC;CACJ;AAtDD,wCAsDC"}

package/dist/ast/implementation/declaration/enum_value.d.ts

@@ -8,6 +8,6 @@ export declare class EnumValue extends ASTNode {
      * The source range for name string
      */
     nameLocation?: string;
-    constructor(id: number, src: string, type: string, name: string, nameLocation?: string, raw?: any);
+    constructor(id: number, src: string, name: string, nameLocation?: string, raw?: any);
 }
 //# sourceMappingURL=enum_value.d.ts.map

package/dist/ast/implementation/declaration/enum_value.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enum_value.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/enum_value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,SAAU,SAAQ,OAAO;IAClC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;gBAGlB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;CAOhB"}
+{"version":3,"file":"enum_value.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/enum_value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,SAAU,SAAQ,OAAO;IAClC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;gBAEV,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG;CAMtF"}

package/dist/ast/implementation/declaration/enum_value.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnumValue = void 0;
 const ast_node_1 = require("../../ast_node");
 class EnumValue extends ast_node_1.ASTNode {
-    constructor(id, src, type, name, nameLocation, raw) {
-        super(id, src, type, raw);
+    constructor(id, src, name, nameLocation, raw) {
+        super(id, src, raw);
         this.name = name;
         this.nameLocation = nameLocation;
     }

package/dist/ast/implementation/declaration/enum_value.js.map

@@ -1 +1 @@
-{"version":3,"file":"enum_value.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/enum_value.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAEzC,MAAa,SAAU,SAAQ,kBAAO;IAWlC,YACI,EAAU,EACV,GAAW,EACX,IAAY,EACZ,IAAY,EACZ,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAE1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;CACJ;AAxBD,8BAwBC"}
+{"version":3,"file":"enum_value.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/enum_value.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAEzC,MAAa,SAAU,SAAQ,kBAAO;IAWlC,YAAY,EAAU,EAAE,GAAW,EAAE,IAAY,EAAE,YAAqB,EAAE,GAAS;QAC/E,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAEpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;CACJ;AAjBD,8BAiBC"}

package/dist/ast/implementation/declaration/error_definition.d.ts

@@ -24,7 +24,7 @@ export declare class ErrorDefinition extends ASTNode {
      * A list of values that is passed on to the EVM logging facility
      */
     vParameters: ParameterList;
-    constructor(id: number, src: string, type: string, name: string, parameters: ParameterList, documentation?: string | StructuredDocumentation, nameLocation?: string, raw?: any);
+    constructor(id: number, src: string, name: string, parameters: ParameterList, documentation?: string | StructuredDocumentation, nameLocation?: string, raw?: any);
     get children(): readonly ASTNode[];
     /**
      * Reference to a scoped `ContractDefinition` if event is declared in contract.

package/dist/ast/implementation/declaration/error_definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/error_definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,eAAgB,SAAQ,OAAO;IACxC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC;IAEjD;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;gBAGvB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,aAAa,EACzB,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAChD,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAab,IAAI,QAAQ,IAAI,SAAS,OAAO,EAAE,CAEjC;IAED;;;OAGG;IACH,IAAI,MAAM,IAAI,kBAAkB,GAAG,UAAU,CAE5C;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAQ7D;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;CAGpE"}
+{"version":3,"file":"error_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/error_definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,eAAgB,SAAQ,OAAO;IACxC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC;IAEjD;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;gBAGvB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,aAAa,EACzB,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAChD,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAab,IAAI,QAAQ,IAAI,SAAS,OAAO,EAAE,CAEjC;IAED;;;OAGG;IACH,IAAI,MAAM,IAAI,kBAAkB,GAAG,UAAU,CAE5C;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAQ7D;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;CAGpE"}

package/dist/ast/implementation/declaration/error_definition.js

@@ -4,8 +4,8 @@ exports.ErrorDefinition = void 0;
 const ast_node_1 = require("../../ast_node");
 const utils_1 = require("../../utils");
 class ErrorDefinition extends ast_node_1.ASTNode {
-    constructor(id, src, type, name, parameters, documentation, nameLocation, raw) {
-        super(id, src, type, raw);
+    constructor(id, src, name, parameters, documentation, nameLocation, raw) {
+        super(id, src, raw);
         this.name = name;
         this.documentation = documentation;
         this.nameLocation = nameLocation;
@@ -34,7 +34,7 @@ class ErrorDefinition extends ast_node_1.ASTNode {
      * applied to the canonical representation of the error signature.
      */
     canonicalSignatureHash(encoderVersion) {
-        return utils_1.encodeSignature(this.canonicalSignature(encoderVersion));
+        return (0, utils_1.encodeSignature)(this.canonicalSignature(encoderVersion));
     }
 }
 exports.ErrorDefinition = ErrorDefinition;

package/dist/ast/implementation/declaration/error_definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"error_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/error_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,uCAA8C;AAM9C,MAAa,eAAgB,SAAQ,kBAAO;IAwBxC,YACI,EAAU,EACV,GAAW,EACX,IAAY,EACZ,IAAY,EACZ,UAAyB,EACzB,aAAgD,EAChD,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAE1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAE9B,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED;;;OAGG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAyC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAiC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,GAAG,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC7C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,cAAiC;QACpD,OAAO,uBAAe,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ;AA3ED,0CA2EC"}
+{"version":3,"file":"error_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/error_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,uCAA8C;AAM9C,MAAa,eAAgB,SAAQ,kBAAO;IAwBxC,YACI,EAAU,EACV,GAAW,EACX,IAAY,EACZ,UAAyB,EACzB,aAAgD,EAChD,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAEpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAE9B,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED;;;OAGG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAyC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAiC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,GAAG,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC7C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,cAAiC;QACpD,OAAO,IAAA,uBAAe,EAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ;AA1ED,0CA0EC"}

package/dist/ast/implementation/declaration/event_definition.d.ts

@@ -28,7 +28,7 @@ export declare class EventDefinition extends ASTNode {
      * A list of values that is passed on to the EVM logging facility
      */
     vParameters: ParameterList;
-    constructor(id: number, src: string, type: string, anonymous: boolean, name: string, parameters: ParameterList, documentation?: string | StructuredDocumentation, nameLocation?: string, raw?: any);
+    constructor(id: number, src: string, anonymous: boolean, name: string, parameters: ParameterList, documentation?: string | StructuredDocumentation, nameLocation?: string, raw?: any);
     get children(): readonly ASTNode[];
     /**
      * Reference to its scoped contract

package/dist/ast/implementation/declaration/event_definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/event_definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,eAAgB,SAAQ,OAAO;IACxC;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC;IAEjD;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;gBAGvB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,OAAO,EAClB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,aAAa,EACzB,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAChD,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAcb,IAAI,QAAQ,IAAI,SAAS,OAAO,EAAE,CAEjC;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,kBAAkB,CAE/B;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAQ7D;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;CAGpE"}
+{"version":3,"file":"event_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/event_definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,eAAgB,SAAQ,OAAO;IACxC;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC;IAEjD;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;gBAGvB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,OAAO,EAClB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,aAAa,EACzB,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAChD,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAcb,IAAI,QAAQ,IAAI,SAAS,OAAO,EAAE,CAEjC;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,kBAAkB,CAE/B;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAQ7D;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;CAGpE"}

package/dist/ast/implementation/declaration/event_definition.js

@@ -4,8 +4,8 @@ exports.EventDefinition = void 0;
 const ast_node_1 = require("../../ast_node");
 const utils_1 = require("../../utils");
 class EventDefinition extends ast_node_1.ASTNode {
-    constructor(id, src, type, anonymous, name, parameters, documentation, nameLocation, raw) {
-        super(id, src, type, raw);
+    constructor(id, src, anonymous, name, parameters, documentation, nameLocation, raw) {
+        super(id, src, raw);
         this.anonymous = anonymous;
         this.name = name;
         this.documentation = documentation;
@@ -34,7 +34,7 @@ class EventDefinition extends ast_node_1.ASTNode {
      * applied to the canonical representation of the event signature.
      */
     canonicalSignatureHash(encoderVersion) {
-        return utils_1.encodeSignature(this.canonicalSignature(encoderVersion));
+        return (0, utils_1.encodeSignature)(this.canonicalSignature(encoderVersion));
     }
 }
 exports.EventDefinition = EventDefinition;

package/dist/ast/implementation/declaration/event_definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"event_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/event_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,uCAA8C;AAK9C,MAAa,eAAgB,SAAQ,kBAAO;IA8BxC,YACI,EAAU,EACV,GAAW,EACX,IAAY,EACZ,SAAkB,EAClB,IAAY,EACZ,UAAyB,EACzB,aAAgD,EAChD,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAE1B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAE9B,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAA4B,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAiC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,GAAG,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC7C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,cAAiC;QACpD,OAAO,uBAAe,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ;AAlFD,0CAkFC"}
+{"version":3,"file":"event_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/event_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,uCAA8C;AAK9C,MAAa,eAAgB,SAAQ,kBAAO;IA8BxC,YACI,EAAU,EACV,GAAW,EACX,SAAkB,EAClB,IAAY,EACZ,UAAyB,EACzB,aAAgD,EAChD,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAEpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAE9B,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAA4B,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAiC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,GAAG,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC7C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,cAAiC;QACpD,OAAO,IAAA,uBAAe,EAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ;AAjFD,0CAiFC"}

package/dist/ast/implementation/declaration/function_definition.d.ts

@@ -78,7 +78,7 @@ export declare class FunctionDefinition extends ASTNode {
      * A list of local variables that are declared and returned to the caller
      */
     vReturnParameters: ParameterList;
-    constructor(id: number, src: string, type: string, scope: number, kind: FunctionKind, name: string, virtual: boolean, visibility: FunctionVisibility, stateMutability: FunctionStateMutability, isConstructor: boolean, parameters: ParameterList, returnParameters: ParameterList, modifiers: ModifierInvocation[], overrideSpecifier?: OverrideSpecifier, body?: Block, documentation?: string | StructuredDocumentation, nameLocation?: string, raw?: any);
+    constructor(id: number, src: string, scope: number, kind: FunctionKind, name: string, virtual: boolean, visibility: FunctionVisibility, stateMutability: FunctionStateMutability, isConstructor: boolean, parameters: ParameterList, returnParameters: ParameterList, modifiers: ModifierInvocation[], overrideSpecifier?: OverrideSpecifier, body?: Block, documentation?: string | StructuredDocumentation, nameLocation?: string, raw?: any);
     get children(): readonly ASTNode[];
     /**
      * Reference to a scoped `ContractDefinition` if function is declared in contract.

package/dist/ast/implementation/declaration/function_definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/function_definition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAiC,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAEH,YAAY,EACZ,uBAAuB,EACvB,kBAAkB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,kBAAmB,SAAQ,OAAO;IAC3C;;;OAGG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,UAAU,EAAE,kBAAkB,CAAC;IAE/B;;;OAGG;IACH,eAAe,EAAE,uBAAuB,CAAC;IAEzC;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC;IAEjD;;OAEG;IACH,UAAU,EAAE,kBAAkB,EAAE,CAAC;IAEjC;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;OAEG;IACH,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;IAEvC;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;IAE3B;;OAEG;IACH,iBAAiB,EAAE,aAAa,CAAC;gBAG7B,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,uBAAuB,EACxC,aAAa,EAAE,OAAO,EACtB,UAAU,EAAE,aAAa,EACzB,gBAAgB,EAAE,aAAa,EAC/B,SAAS,EAAE,kBAAkB,EAAE,EAC/B,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,IAAI,CAAC,EAAE,KAAK,EACZ,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAChD,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAwBb,IAAI,QAAQ,IAAI,SAAS,OAAO,EAAE,CASjC;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,kBAAkB,GAAG,UAAU,CAE5C;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,kBAAkB,GAAG,UAAU,EAMhD;IAED;;;;OAIG;IACH,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAyB7D;;;;;OAKG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;CAKpE"}
+{"version":3,"file":"function_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/function_definition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAiC,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAEH,YAAY,EACZ,uBAAuB,EACvB,kBAAkB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,kBAAmB,SAAQ,OAAO;IAC3C;;;OAGG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,UAAU,EAAE,kBAAkB,CAAC;IAE/B;;;OAGG;IACH,eAAe,EAAE,uBAAuB,CAAC;IAEzC;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC;IAEjD;;OAEG;IACH,UAAU,EAAE,kBAAkB,EAAE,CAAC;IAEjC;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;OAEG;IACH,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;IAEvC;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;IAE3B;;OAEG;IACH,iBAAiB,EAAE,aAAa,CAAC;gBAG7B,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,uBAAuB,EACxC,aAAa,EAAE,OAAO,EACtB,UAAU,EAAE,aAAa,EACzB,gBAAgB,EAAE,aAAa,EAC/B,SAAS,EAAE,kBAAkB,EAAE,EAC/B,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,IAAI,CAAC,EAAE,KAAK,EACZ,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAChD,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAwBb,IAAI,QAAQ,IAAI,SAAS,OAAO,EAAE,CASjC;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,kBAAkB,GAAG,UAAU,CAE5C;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,kBAAkB,GAAG,UAAU,EAMhD;IAED;;;;OAIG;IACH,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAyB7D;;;;;OAKG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;CAKpE"}

package/dist/ast/implementation/declaration/function_definition.js

@@ -8,8 +8,8 @@ const constants_1 = require("../../constants");
 const utils_1 = require("../../utils");
 const contract_definition_1 = require("./contract_definition");
 class FunctionDefinition extends ast_node_1.ASTNode {
-    constructor(id, src, type, scope, kind, name, virtual, visibility, stateMutability, isConstructor, parameters, returnParameters, modifiers, overrideSpecifier, body, documentation, nameLocation, raw) {
-        super(id, src, type, raw);
+    constructor(id, src, scope, kind, name, virtual, visibility, stateMutability, isConstructor, parameters, returnParameters, modifiers, overrideSpecifier, body, documentation, nameLocation, raw) {
+        super(id, src, raw);
         this.implemented = body !== undefined;
         this.virtual = virtual;
         this.scope = scope;
@@ -58,7 +58,7 @@ class FunctionDefinition extends ast_node_1.ASTNode {
         // or a contract method
         if (this.vScope instanceof contract_definition_1.ContractDefinition &&
             this.vScope.kind === constants_1.ContractKind.Library) {
-            args = this.vParameters.vParameters.map((arg) => abi_1.abiTypeToLibraryCanonicalName(types_1.variableDeclarationToTypeNode(arg)));
+            args = this.vParameters.vParameters.map((arg) => (0, abi_1.abiTypeToLibraryCanonicalName)((0, types_1.variableDeclarationToTypeNode)(arg)));
         }
         else {
             args = this.vParameters.vParameters.map((arg) => arg.canonicalSignatureType(encoderVersion));
@@ -73,7 +73,7 @@ class FunctionDefinition extends ast_node_1.ASTNode {
      */
     canonicalSignatureHash(encoderVersion) {
         const signature = this.canonicalSignature(encoderVersion);
-        return signature ? utils_1.encodeSignature(signature) : "";
+        return signature ? (0, utils_1.encodeSignature)(signature) : "";
     }
 }
 exports.FunctionDefinition = FunctionDefinition;

package/dist/ast/implementation/declaration/function_definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"function_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/function_definition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"function_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/function_definition.ts"],"names":[],"mappings":"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"}

package/dist/ast/implementation/declaration/index.d.ts

@@ -6,5 +6,6 @@ export * from "./event_definition";
 export * from "./function_definition";
 export * from "./modifier_definition";
 export * from "./struct_definition";
+export * from "./user_defined_value_type_definition";
 export * from "./variable_declaration";
 //# sourceMappingURL=index.d.ts.map

package/dist/ast/implementation/declaration/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sCAAsC,CAAC;AACrD,cAAc,wBAAwB,CAAC"}

package/dist/ast/implementation/declaration/index.js

@@ -18,5 +18,6 @@ __exportStar(require("./event_definition"), exports);
 __exportStar(require("./function_definition"), exports);
 __exportStar(require("./modifier_definition"), exports);
 __exportStar(require("./struct_definition"), exports);
+__exportStar(require("./user_defined_value_type_definition"), exports);
 __exportStar(require("./variable_declaration"), exports);
 //# sourceMappingURL=index.js.map

package/dist/ast/implementation/declaration/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAsC;AACtC,oDAAkC;AAClC,+CAA6B;AAC7B,qDAAmC;AACnC,qDAAmC;AACnC,wDAAsC;AACtC,wDAAsC;AACtC,sDAAoC;AACpC,yDAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAsC;AACtC,oDAAkC;AAClC,+CAA6B;AAC7B,qDAAmC;AACnC,qDAAmC;AACnC,wDAAsC;AACtC,wDAAsC;AACtC,sDAAoC;AACpC,uEAAqD;AACrD,yDAAuC"}

package/dist/ast/implementation/declaration/modifier_definition.d.ts

@@ -44,7 +44,7 @@ export declare class ModifierDefinition extends ASTNode {
      * Modifier body
      */
     vBody?: Block;
-    constructor(id: number, src: string, type: string, name: string, virtual: boolean, visibility: string, parameters: ParameterList, overrideSpecifier?: OverrideSpecifier, body?: Block, documentation?: string | StructuredDocumentation, nameLocation?: string, raw?: any);
+    constructor(id: number, src: string, name: string, virtual: boolean, visibility: string, parameters: ParameterList, overrideSpecifier?: OverrideSpecifier, body?: Block, documentation?: string | StructuredDocumentation, nameLocation?: string, raw?: any);
     get children(): readonly ASTNode[];
     /**
      * Reference to its scoped contract

package/dist/ast/implementation/declaration/modifier_definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modifier_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/modifier_definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,kBAAmB,SAAQ,OAAO;IAC3C;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC;IAEjD;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;IAE3B;;OAEG;IACH,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;IAEvC;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;gBAGV,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,aAAa,EACzB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,IAAI,CAAC,EAAE,KAAK,EACZ,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAChD,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAiBb,IAAI,QAAQ,IAAI,SAAS,OAAO,EAAE,CAOjC;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,kBAAkB,CAE/B;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAQ7D;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;CAGpE"}
+{"version":3,"file":"modifier_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/modifier_definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,kBAAmB,SAAQ,OAAO;IAC3C;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC;IAEjD;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;IAE3B;;OAEG;IACH,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;IAEvC;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;gBAGV,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,aAAa,EACzB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,IAAI,CAAC,EAAE,KAAK,EACZ,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAChD,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAiBb,IAAI,QAAQ,IAAI,SAAS,OAAO,EAAE,CAOjC;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,kBAAkB,CAE/B;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAQ7D;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;CAGpE"}

package/dist/ast/implementation/declaration/modifier_definition.js

@@ -4,8 +4,8 @@ exports.ModifierDefinition = void 0;
 const ast_node_1 = require("../../ast_node");
 const utils_1 = require("../../utils");
 class ModifierDefinition extends ast_node_1.ASTNode {
-    constructor(id, src, type, name, virtual, visibility, parameters, overrideSpecifier, body, documentation, nameLocation, raw) {
-        super(id, src, type, raw);
+    constructor(id, src, name, virtual, visibility, parameters, overrideSpecifier, body, documentation, nameLocation, raw) {
+        super(id, src, raw);
         this.name = name;
         this.virtual = virtual;
         this.visibility = visibility;
@@ -37,7 +37,7 @@ class ModifierDefinition extends ast_node_1.ASTNode {
      * applied to the canonical representation of the modifier signature.
      */
     canonicalSignatureHash(encoderVersion) {
-        return utils_1.encodeSignature(this.canonicalSignature(encoderVersion));
+        return (0, utils_1.encodeSignature)(this.canonicalSignature(encoderVersion));
     }
 }
 exports.ModifierDefinition = ModifierDefinition;

package/dist/ast/implementation/declaration/modifier_definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"modifier_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/modifier_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,uCAA8C;AAO9C,MAAa,kBAAmB,SAAQ,kBAAO;IA+C3C,YACI,EAAU,EACV,GAAW,EACX,IAAY,EACZ,IAAY,EACZ,OAAgB,EAChB,UAAkB,EAClB,UAAyB,EACzB,iBAAqC,EACrC,IAAY,EACZ,aAAgD,EAChD,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAE1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CACjB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,KAAK,CACb,CAAC;IACN,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAA4B,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAiC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,GAAG,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC7C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,cAAiC;QACpD,OAAO,uBAAe,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ;AA9GD,gDA8GC"}
+{"version":3,"file":"modifier_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/modifier_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,uCAA8C;AAO9C,MAAa,kBAAmB,SAAQ,kBAAO;IA+C3C,YACI,EAAU,EACV,GAAW,EACX,IAAY,EACZ,OAAgB,EAChB,UAAkB,EAClB,UAAyB,EACzB,iBAAqC,EACrC,IAAY,EACZ,aAAgD,EAChD,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAEpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CACjB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,KAAK,CACb,CAAC;IACN,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAA4B,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAiC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,GAAG,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC7C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,cAAiC;QACpD,OAAO,IAAA,uBAAe,EAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ;AA7GD,gDA6GC"}