@fluffy-spoon/csharp-parser - npm Package Compare versions

Comparing version 1.141.0 to 1.143.0

dist/src/AttributeParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AttributeParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var RegExHelper_1 = require("./RegExHelper");

dist/src/ClassParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var ScopeHelper_1 = require("./ScopeHelper");

dist/src/EnumParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnumParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var ScopeHelper_1 = require("./ScopeHelper");

dist/src/FieldParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FieldParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var ScopeHelper_1 = require("./ScopeHelper");

dist/src/FileParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var NamespaceParser_1 = require("./NamespaceParser");

dist/src/Index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var ClassParser_1 = require("./ClassParser");
-exports.ClassParser = ClassParser_1.ClassParser;
+Object.defineProperty(exports, "ClassParser", { enumerable: true, get: function () { return ClassParser_1.ClassParser; } });
 var EnumParser_1 = require("./EnumParser");
-exports.EnumParser = EnumParser_1.EnumParser;
+Object.defineProperty(exports, "EnumParser", { enumerable: true, get: function () { return EnumParser_1.EnumParser; } });
 var FileParser_1 = require("./FileParser");
-exports.FileParser = FileParser_1.FileParser;
+Object.defineProperty(exports, "FileParser", { enumerable: true, get: function () { return FileParser_1.FileParser; } });
 var TypeParser_1 = require("./TypeParser");
-exports.TypeParser = TypeParser_1.TypeParser;
+Object.defineProperty(exports, "TypeParser", { enumerable: true, get: function () { return TypeParser_1.TypeParser; } });
 var MethodParser_1 = require("./MethodParser");
-exports.MethodParser = MethodParser_1.MethodParser;
+Object.defineProperty(exports, "MethodParser", { enumerable: true, get: function () { return MethodParser_1.MethodParser; } });
 var NamespaceParser_1 = require("./NamespaceParser");
-exports.NamespaceParser = NamespaceParser_1.NamespaceParser;
+Object.defineProperty(exports, "NamespaceParser", { enumerable: true, get: function () { return NamespaceParser_1.NamespaceParser; } });
 var UsingsParser_1 = require("./UsingsParser");
-exports.UsingsParser = UsingsParser_1.UsingsParser;
+Object.defineProperty(exports, "UsingsParser", { enumerable: true, get: function () { return UsingsParser_1.UsingsParser; } });
 var AttributeParser_1 = require("./AttributeParser");
-exports.AttributeParser = AttributeParser_1.AttributeParser;
+Object.defineProperty(exports, "AttributeParser", { enumerable: true, get: function () { return AttributeParser_1.AttributeParser; } });
 var FieldParser_1 = require("./FieldParser");
-exports.FieldParser = FieldParser_1.FieldParser;
+Object.defineProperty(exports, "FieldParser", { enumerable: true, get: function () { return FieldParser_1.FieldParser; } });
 var StructParser_1 = require("./StructParser");
-exports.StructParser = StructParser_1.StructParser;
+Object.defineProperty(exports, "StructParser", { enumerable: true, get: function () { return StructParser_1.StructParser; } });
 var InterfaceParser_1 = require("./InterfaceParser");
-exports.InterfaceParser = InterfaceParser_1.InterfaceParser;
+Object.defineProperty(exports, "InterfaceParser", { enumerable: true, get: function () { return InterfaceParser_1.InterfaceParser; } });
 var ScopeHelper_1 = require("./ScopeHelper");
-exports.ScopeHelper = ScopeHelper_1.ScopeHelper;
+Object.defineProperty(exports, "ScopeHelper", { enumerable: true, get: function () { return ScopeHelper_1.ScopeHelper; } });
 var LiteralParser_1 = require("./LiteralParser");
-exports.LiteralParser = LiteralParser_1.LiteralParser;
+Object.defineProperty(exports, "LiteralParser", { enumerable: true, get: function () { return LiteralParser_1.LiteralParser; } });
 var Models_1 = require("./Models");
-exports.CSharpType = Models_1.CSharpType;
-exports.CSharpNamespace = Models_1.CSharpNamespace;
-exports.CSharpFile = Models_1.CSharpFile;
-exports.CSharpMethod = Models_1.CSharpMethod;
-exports.CSharpNamedToken = Models_1.CSharpNamedToken;
-exports.CSharpMethodParameter = Models_1.CSharpMethodParameter;
-exports.CSharpClass = Models_1.CSharpClass;
-exports.CSharpInterface = Models_1.CSharpInterface;
-exports.CSharpEnum = Models_1.CSharpEnum;
-exports.CSharpEnumOption = Models_1.CSharpEnumOption;
-exports.CSharpAttribute = Models_1.CSharpAttribute;
-exports.CSharpAttributeParameter = Models_1.CSharpAttributeParameter;
-exports.CSharpProperty = Models_1.CSharpProperty;
-exports.CSharpPropertyComponent = Models_1.CSharpPropertyComponent;
-exports.CSharpField = Models_1.CSharpField;
-exports.CSharpStruct = Models_1.CSharpStruct;
+Object.defineProperty(exports, "CSharpType", { enumerable: true, get: function () { return Models_1.CSharpType; } });
+Object.defineProperty(exports, "CSharpNamespace", { enumerable: true, get: function () { return Models_1.CSharpNamespace; } });
+Object.defineProperty(exports, "CSharpFile", { enumerable: true, get: function () { return Models_1.CSharpFile; } });
+Object.defineProperty(exports, "CSharpMethod", { enumerable: true, get: function () { return Models_1.CSharpMethod; } });
+Object.defineProperty(exports, "CSharpNamedToken", { enumerable: true, get: function () { return Models_1.CSharpNamedToken; } });
+Object.defineProperty(exports, "CSharpMethodParameter", { enumerable: true, get: function () { return Models_1.CSharpMethodParameter; } });
+Object.defineProperty(exports, "CSharpClass", { enumerable: true, get: function () { return Models_1.CSharpClass; } });
+Object.defineProperty(exports, "CSharpInterface", { enumerable: true, get: function () { return Models_1.CSharpInterface; } });
+Object.defineProperty(exports, "CSharpEnum", { enumerable: true, get: function () { return Models_1.CSharpEnum; } });
+Object.defineProperty(exports, "CSharpEnumOption", { enumerable: true, get: function () { return Models_1.CSharpEnumOption; } });
+Object.defineProperty(exports, "CSharpAttribute", { enumerable: true, get: function () { return Models_1.CSharpAttribute; } });
+Object.defineProperty(exports, "CSharpAttributeParameter", { enumerable: true, get: function () { return Models_1.CSharpAttributeParameter; } });
+Object.defineProperty(exports, "CSharpProperty", { enumerable: true, get: function () { return Models_1.CSharpProperty; } });
+Object.defineProperty(exports, "CSharpPropertyComponent", { enumerable: true, get: function () { return Models_1.CSharpPropertyComponent; } });
+Object.defineProperty(exports, "CSharpField", { enumerable: true, get: function () { return Models_1.CSharpField; } });
+Object.defineProperty(exports, "CSharpStruct", { enumerable: true, get: function () { return Models_1.CSharpStruct; } });
 //# sourceMappingURL=Index.js.map

dist/src/InterfaceParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InterfaceParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var ScopeHelper_1 = require("./ScopeHelper");

dist/src/LiteralParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.LiteralParser = void 0;
 var ScopeHelper_1 = require("./ScopeHelper");
@@ -4,0 +5,0 @@ var RegExHelper_1 = require("./RegExHelper");

dist/src/MethodParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MethodParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var ScopeHelper_1 = require("./ScopeHelper");

dist/src/Models.d.ts

@@ -7,4 +7,4 @@ export declare class CSharpType implements CSharpGenericParameterContainer {
     constructor(name: string);
-    readonly isGeneric: boolean;
-    readonly fullName: string;
+    get isGeneric(): boolean;
+    get fullName(): string;
 }
@@ -45,3 +45,3 @@ export interface CSharpUsing {
     constructor(name: string);
-    readonly fullName: string;
+    get fullName(): string;
     getAllClassesRecursively(): CSharpClass[];
@@ -77,4 +77,5 @@ }
     constructor(name: string);
-    readonly isGeneric: boolean;
-    isPublic: boolean;
+    get isGeneric(): boolean;
+    get isPublic(): boolean;
+    set isPublic(isPublic: boolean);
 }
@@ -104,5 +105,6 @@ export declare type CSharpToken = boolean | number | string | CSharpNamedToken;
     constructor(name: string);
-    readonly isGeneric: boolean;
-    isPublic: boolean;
-    readonly fullName: string;
+    get isGeneric(): boolean;
+    get isPublic(): boolean;
+    set isPublic(isPublic: boolean);
+    get fullName(): string;
 }
@@ -120,5 +122,6 @@ export declare class CSharpInterface implements CSharpInterfaceTypeDeclarationScope, CSharpGenericParameterContainer {
     constructor(name: string);
-    readonly isGeneric: boolean;
-    isPublic: boolean;
-    readonly fullName: string;
+    get isGeneric(): boolean;
+    get isPublic(): boolean;
+    set isPublic(isPublic: boolean);
+    get fullName(): string;
 }
@@ -143,5 +146,6 @@ export declare class CSharpClass implements CSharpImplementationTypeDeclarationScope, CSharpGenericParameterContainer {
     constructor(name: string);
-    readonly isGeneric: boolean;
-    isPublic: boolean;
-    readonly fullName: string;
+    get isGeneric(): boolean;
+    get isPublic(): boolean;
+    set isPublic(isPublic: boolean);
+    get fullName(): string;
     getAllClassesRecursively(): CSharpClass[];
@@ -158,4 +162,5 @@ }
     constructor(name: string);
-    isPublic: boolean;
-    readonly fullName: string;
+    get isPublic(): boolean;
+    set isPublic(isPublic: boolean);
+    get fullName(): string;
 }
@@ -187,4 +192,5 @@ export declare class CSharpField {
     constructor(name: string);
-    readonly isReadOnly: boolean;
-    isPublic: boolean;
+    get isReadOnly(): boolean;
+    get isPublic(): boolean;
+    set isPublic(isPublic: boolean);
 }
@@ -191,0 +197,0 @@ export declare class CSharpAttribute {

dist/src/Models.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CSharpEnumOption = exports.CSharpAttributeParameter = exports.CSharpAttribute = exports.CSharpProperty = exports.CSharpPropertyComponent = exports.CSharpField = exports.CSharpEnum = exports.CSharpClass = exports.CSharpInterface = exports.CSharpStruct = exports.CSharpMethodParameter = exports.CSharpNamedToken = exports.CSharpMethod = exports.CSharpFile = exports.CSharpNamespace = exports.CSharpType = void 0;
 var CSharpType = /** @class */ (function () {
@@ -12,3 +13,3 @@ function CSharpType(name) {
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -24,3 +25,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -49,3 +50,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -105,3 +106,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -116,3 +117,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -150,3 +151,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -164,3 +165,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -176,3 +177,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -196,3 +197,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -210,3 +211,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -222,3 +223,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -248,3 +249,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -262,3 +263,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -274,3 +275,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -305,3 +306,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -317,3 +318,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -348,3 +349,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -359,3 +360,3 @@ });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
@@ -362,0 +363,0 @@ });

dist/src/NamespaceParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.NamespaceParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var ScopeHelper_1 = require("./ScopeHelper");

dist/src/PropertyParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PropertyParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var ScopeHelper_1 = require("./ScopeHelper");

dist/src/RegExHelper.d.ts

@@ -9,2 +9,3 @@ export declare class RegExHelper {
     getLiteralCharacterRegex(capture: boolean): string;
+    getTypeOfRegex(capture: boolean): string;
     getLiteralRegex(capture: boolean): string;
@@ -11,0 +12,0 @@ getMethodParameterRegex(capture: boolean, captureAttributes: boolean, captureModifiers: boolean, captureType: boolean, captureName: boolean, captureDefaultValue: boolean): string;

dist/src/RegExHelper.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RegExHelper = void 0;
 var RegExHelper = /** @class */ (function () {
@@ -40,2 +41,5 @@ function RegExHelper() {
     };
+    RegExHelper.prototype.getTypeOfRegex = function (capture) {
+        return this.wrapInGroup(capture, false, "typeof" + this.wrapInGroup(false, true, this.getMethodParametersWrapperRegex(false, false)));
+    };
     RegExHelper.prototype.getLiteralRegex = function (capture) {
@@ -215,3 +219,4 @@ return this.wrapInGroup(capture, true, this.getLiteralNumberRegex(false) + "{1}?|" +
         result += this.wrapInGroup(false, true, this.getNameRegex(captureName) + "=") + "??";
-        result += this.getLiteralRegex(captureValue);
+        result += this.getLiteralRegex(captureValue) + "|";
+        result += this.getTypeOfRegex(captureValue);
         return this.wrapInGroup(capture, true, result);
@@ -218,0 +223,0 @@ };

dist/src/ScopeHelper.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScopeHelper = void 0;
 var ScopeHelper = /** @class */ (function () {
@@ -4,0 +5,0 @@ function ScopeHelper() {

dist/src/StructParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.StructParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var ScopeHelper_1 = require("./ScopeHelper");

dist/src/TypeParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypeParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var ScopeHelper_1 = require("./ScopeHelper");

dist/src/UsingsParser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.UsingsParser = void 0;
 var Models_1 = require("./Models");
@@ -4,0 +5,0 @@ var ScopeHelper_1 = require("./ScopeHelper");

package.json

 {
   "name": "@fluffy-spoon/csharp-parser",
-  "version": "1.141.0",
+  "version": "1.143.0",
   "description": "Parses C# code as well as possible into objects in TypeScript.",
@@ -31,4 +31,4 @@ "main": "./dist/src/Index",
   "dependencies": {
-    "nearley": "^2.19.0"
+    "nearley": "^2.19.4"
   }
 }

src/RegExHelper.ts

@@ -50,2 +50,6 @@ export class RegExHelper {
 
+	public getTypeOfRegex(capture: boolean) {
+		return this.wrapInGroup(capture, false, "typeof" + this.wrapInGroup(false, true, this.getMethodParametersWrapperRegex(false, false)));
+	}
+
 	public getLiteralRegex(capture: boolean) {
@@ -293,3 +297,4 @@ return this.wrapInGroup(capture, true,
 		result += this.wrapInGroup(false, true, this.getNameRegex(captureName) + "=") + "??";
-		result += this.getLiteralRegex(captureValue);
+		result += this.getLiteralRegex(captureValue) + "|";
+		result += this.getTypeOfRegex(captureValue);
 
@@ -296,0 +301,0 @@ return this.wrapInGroup(capture, true, result);

No alert changes

Improved metrics

Total package byte prevSize

438967

increased by0.97%

Lines of code

5791

increased by0.56%

Dependency changes

• Updatednearley@^2.19.4