Skip to content
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.

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

fix declaration generation #13041

Merged
merged 2 commits into from
Sep 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions packages/dev/buildTools/src/generateDeclaration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export interface IGenerateDeclarationConfig {
buildType?: BuildType;
addToDocumentation?: boolean;
initDocumentation?: boolean;
fileFilterRegex?: string;
}

function getModuleDeclaration(
Expand Down Expand Up @@ -388,7 +389,12 @@ declare module ${defaultModuleName} {
export function generateCombinedDeclaration(declarationFiles: string[], config: IGenerateDeclarationConfig, looseDeclarations: string[] = [], buildType: BuildType = "umd") {
let declarations = "";
let moduleDeclaration = "";
const filterRegex = config.fileFilterRegex ? new RegExp(config.fileFilterRegex) : null;
declarationFiles.forEach((declarationFile) => {
// check if filter applies to this file
if (filterRegex && filterRegex.test(declarationFile)) {
return;
}
// The lines of the files now come as a Function inside declaration file.
const data = fs.readFileSync(declarationFile, "utf8");
const classMap = getClassesMap(data, config.devPackageName, declarationFile);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import { NodeMaterialBlockTargets } from "./Enums/nodeMaterialBlockTargets";
import type { Nullable } from "../../types";
import type { InputBlock } from "./Blocks/Input/inputBlock";
import { Observable } from "../../Misc/observable";

declare type NodeMaterialBlock = import("./nodeMaterialBlock").NodeMaterialBlock;
import type { NodeMaterialBlock } from "./nodeMaterialBlock";

/**
* Enum used to define the compatibility state between two connection points
Expand Down
3 changes: 2 additions & 1 deletion packages/public/umd/babylonjs-gui/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"filename": "babylon.gui.module.d.ts",
"outputDirectory": "./",
"namedExportPathsToExclude": "3D/materials/fluent/fluentMaterial",
"addToDocumentation": true
"addToDocumentation": true,
"fileFilterRegex": "stories"
}
3 changes: 2 additions & 1 deletion packages/public/umd/babylonjs-inspector/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"declarationLibs": ["@dev/inspector", "@dev/shared-ui-components"],
"devPackageName": "inspector",
"filename": "babylon.inspector.module.d.ts",
"outputDirectory": "./"
"outputDirectory": "./",
"fileFilterRegex": "stories"
}
3 changes: 2 additions & 1 deletion packages/public/umd/babylonjs-node-editor/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"declarationLibs": ["@tools/node-editor", "@dev/shared-ui-components"],
"devPackageName": "nodeEditor",
"filename": "babylon.nodeEditor.module.d.ts",
"outputDirectory": "./"
"outputDirectory": "./",
"fileFilterRegex": "stories"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { FragmentOutputBlock } from "core/Materials/Node/Blocks/Fragment/fragmentOutputBlock";
import type { NodeMaterialBlock } from "core/Materials/Node/nodeMaterialBlock";
import type { NodeMaterialConnectionPoint } from "core/Materials/Node/nodeMaterialBlockConnectionPoint";
import { NodeMaterialConnectionPointCompatibilityStates, NodeMaterialConnectionPointDirection } from "core/Materials/Node/nodeMaterialBlockConnectionPoint";
import type { Nullable } from "core/types";
Expand Down Expand Up @@ -79,7 +80,7 @@ export class ConnectionPointPortData implements IPortData {
}
}

public get ownerData() {
public get ownerData(): NodeMaterialBlock {
return this.data.ownerBlock;
}

Expand Down