Skip to content

fix: thread checkSchemas through IfcxLayerStack so --no-validate works #134

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
mikan-atomoki wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: thread checkSchemas through IfcxLayerStack so --no-validate works #134

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
2 changes: 1 addition & 1 deletion src/ifcx-cli/ifcx-cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ async function processArgs(args: string[])
new InMemoryLayerProvider().AddAll([userDefinedOrder, ...files]),
...providers
]);
let layerStack = await (new IfcxLayerStackBuilder(provider).FromId(userDefinedOrder.header.id)).Build();
let layerStack = await (new IfcxLayerStackBuilder(provider).FromId(userDefinedOrder.header.id)).Build(validate);
if (layerStack instanceof Error)
{
throw layerStack;
Expand Down
10 changes: 6 additions & 4 deletions src/ifcx-core/layers/layer-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ export class IfcxLayerStack
private tree: PostCompositionNode;
private schemas: {[key:string]:IfcxSchema};
private federated: IfcxFile;
private checkSchemas: boolean;

constructor(layers: IfcxFile[])
constructor(layers: IfcxFile[], checkSchemas: boolean = true)
{
this.layers = layers;
this.checkSchemas = checkSchemas;
this.Compose();
}

Expand All @@ -28,7 +30,7 @@ export class IfcxLayerStack
this.federated = Federate(this.layers);
// TODO: schema files
this.schemas = this.federated.schemas;
this.tree = LoadIfcxFile(this.federated);
this.tree = LoadIfcxFile(this.federated, this.checkSchemas);
}

public GetFullTree()
Expand Down Expand Up @@ -64,7 +66,7 @@ export class IfcxLayerStackBuilder
return this;
}

async Build(): Promise<IfcxLayerStack | Error>
async Build(checkSchemas: boolean = true): Promise<IfcxLayerStack | Error>
{
if (!this.mainLayerId) throw new Error(`no main layer ID specified`);

Expand All @@ -77,7 +79,7 @@ export class IfcxLayerStackBuilder

try
{
return new IfcxLayerStack(layers);
return new IfcxLayerStack(layers, checkSchemas);
}
catch (e)
{
Expand Down