Skip to content

fix(schema): wrap IfcArcIndex/IfcLineIndex indices as IfcPositiveInteger #2042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beachtom wants to merge 1 commit into
base: main
Choose a base branch
from
+2,133 −2,086
Open

fix(schema): wrap IfcArcIndex/IfcLineIndex indices as IfcPositiveInteger #2042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/schema-generator/gen_functional_types_helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ export function generateInitialiser(type: Type, initialisersDone: Set<string>,bu
if (type.isList)
{
if (initialisersDone.has(type.name)) return;
buffer.push(`${crc32(type.name.toUpperCase(),crcTable)}:(v:any) => new ${schemaName}.${type.name}(v.map( (x:any) => x.value)),`);
const elementIsIfcType = types.some((t: Type) => t.name === type.typeName);
const valueExpr = elementIsIfcType ? `new ${schemaName}.${type.typeName}(x.value)` : `x.value`;
buffer.push(`${crc32(type.name.toUpperCase(),crcTable)}:(v:any) => new ${schemaName}.${type.name}(v.map( (x:any) => ${valueExpr})),`);
initialisersDone.add(type.name);
return
}
Expand Down Expand Up @@ -69,7 +71,11 @@ export function generatePropAssignment(p: Prop, i:number, types:Type[],schemaNam

}
else if (isType) {
if (type?.isList) content='new '+schemaName+'.'+p.type+'(v['+i+'].map( (x:any) => x.value))';
if (type?.isList) {
const elemIsIfcType = type.typeName ? types.some((t: Type) => t.name === type.typeName) : false;
const valExpr = elemIsIfcType ? `new ${schemaName}.${type.typeName}(x.value)` : `x.value`;
content = `new ${schemaName}.${p.type}(v[${i}].map( (x:any) => ${valExpr}))`;
}
else content = 'new '+schemaName+'.'+p.type+'(' + valueCheckPrefix + 'v['+i+'].value)';
}
else if (p.primitive && p.type === "number") content = 'new NumberHandle('+valueCheckPrefix+'v['+i+'].value, '+p.typeNum+')';
Expand Down
Loading