paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-27 01:29:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Sanitize property names and type names

Browse Source
This commit is contained in:
Michaël Van Canneyt 2025-07-16 11:44:40 +02:00
parent 9424e9fda5
commit 3c1e3b663a
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/fcl-jsonschema/src/fpjson.schema.pascaltypes.pp
View File

@ -247,6 +247,8 @@ Type
function GetSchemaTypeData(aType: TPascalTypeData; lSchema: TJSONSchema; AllowCreate: Boolean=False): TPascalTypeData;
// Add a type to the alias list
Procedure AddAliasType(aType : TPascalTypeData); virtual;
// Sanitize identifier
function Sanitize(const aName : string) : String;
// Sort types in dependency order
procedure SortTypes;
Public
@ -803,6 +805,19 @@ begin
FAliasList.Add(aType);
end;
function TSchemaData.Sanitize(const aName: string): String;
var
i : integer;
lRes : string;
begin
lRes:=aName;
UniqueString(lRes);
For I:=1 to Length(lRes) do
if not (lRes[i] in ['a'..'z','A'..'Z','0'..'9','_']) then
lRes[i]:='_';
Result:=lRes;
end;
// Determine the PascalType and pascal type name of the given schema
@ -825,7 +840,7 @@ begin
end;
end;
Procedure TSchemaData.FinishAutoCreatedType(aName : string; aType: TPascalTypeData; lElementTypeData: TPascalTypeData);
procedure TSchemaData.FinishAutoCreatedType(aName: string; aType: TPascalTypeData; lElementTypeData: TPascalTypeData);
begin
AddType(aName,aType);
@ -899,7 +914,7 @@ begin
lElTypeData:=GetSchemaTypeData(Nil,lSchema.Items[0]);
// if
// Data.FindSchemaTypeData('Array of string')
lPascalName:=ArrayTypePrefix+lElTypeData.PascalName+ArrayTypeSuffix;
lPascalName:=Sanitize(ArrayTypePrefix+lElTypeData.PascalName+ArrayTypeSuffix);
if lElTypeData.SchemaName='MeetingOption' then
Writeln('Ah');
lName:='['+lElTypeData.SchemaName;
@ -929,7 +944,7 @@ begin
else
lBaseName:='Nested_'+lSchema.Name;
lName:='{'+lBaseName+'}';
lPascalName:='T'+lBaseName;
lPascalName:=ObjectTypePrefix+Sanitize(lBaseName);
Result:=FindSchemaTypeData(lName);
if (Result=Nil) and AllowCreate then
begin
@ -961,7 +976,7 @@ var
begin
lName:=aName;
if lName='' then
lName:=EscapeKeyWord(lProp.Name);
lName:=EscapeKeyWord(Sanitize(lProp.Name));
Writeln('Adding property name ',lName,' to ',aType.PascalName);
if lProp.Validations.TypesCount>1 then
Raise ESchemaData.CreateFmt('Creating property for schema with multiple types ("%s") is not supported',[lName]);