additional updates for 1.0

- re: #2
satisfactory-dev · Sep 15, 2024 · aa2e42b · aa2e42b
1 parent 73c69a9
commit aa2e42b
Show file tree

Hide file tree

Showing 5 changed files with 811 additions and 163 deletions.
diff --git a/lib/CustomParsingTypes/TypedStringConst.ts b/lib/CustomParsingTypes/TypedStringConst.ts
@@ -52,7 +52,7 @@ class TypedStringConst extends SupportedSubSchemaType<
 			.replace(/\(/g, '\\(')
 			.replace(/\)/g, '\\)');
 
-		return `(?:(${lazy_escape}|"${lazy_escape}"))`;
+		return `(?:(${lazy_escape}|"${lazy_escape}"|\\\\"${lazy_escape}\\\\"))`;
 	}
 }
 

diff --git a/lib/CustomParsingTypes/TypedStringEnum.ts b/lib/CustomParsingTypes/TypedStringEnum.ts
@@ -51,7 +51,7 @@ class TypedStringEnum extends SupportedSubSchemaType<
 	}
 	value_regex(value: enum_schema_type): string {
 		const enums = `(?:${value.enum.join('|')})`;
-		return `(?:${enums}|"${enums}")`;
+		return `(?:${enums}|"${enums}"|\\\\"${enums}\\\\")`;
 	}
 }
 

diff --git a/lib/CustomParsingTypes/UnrealEngineString.ts b/lib/CustomParsingTypes/UnrealEngineString.ts
@@ -258,7 +258,8 @@ export const UnrealEngineString_left_default = [
 	'/Script/Engine.BlueprintGeneratedClass',
 ];
 const right_value_starts_with_suffix =
-	'(?:[A-Z][A-Za-z0-9_.]+/)*[A-Z][A-Za-z_.0-9-]+(?::[A-Z][A-Za-z0-9]+)?';
+	// eslint-disable-next-line max-len
+	'(?:_?[A-Z0-9][A-Za-z0-9_.]+/)*[A-Z0-9][A-Za-z_.0-9-]+(?::[A-Z0-9][A-Za-z0-9]+)?';
 
 export class UnrealEngineString {
 	private static already_configured:WeakSet<Ajv> = new WeakSet<Ajv>();

diff --git a/lib/CustomParsingTypes/ValueToRegexFormatter.ts b/lib/CustomParsingTypes/ValueToRegexFormatter.ts
@@ -169,7 +169,7 @@ export class ValueToRegexFormatter
 		return `\\(${regex}${
 			undefined === typed_string_array.minItems
 				? ''
-				: `(?:,${regex}){${typed_string_array.minItems - 1},}`
+				: `(?:, ?${regex}){${typed_string_array.minItems - 1},}`
 		}\\)`;
 	}