OpenPBRMaterial (including loading and exporting glTF)

packages/dev/buildTools/src/addJSToCompiledFiles.ts

@@ -8,6 +8,8 @@ function ProcessSource(sourceCode: string, forceMJS: boolean) {
     const extension = forceMJS ? ".mjs" : ".js";
     return (
         sourceCode
+            // replace imports from directories with index.js (mixins are generating them)
+            .replace(/import\("([./]+)"\)/g, `import("$1/index${extension}")`)
             // replace imports and exports with js extensions
             .replace(/((import|export).*["'](@babylonjs\/.*\/|\.{1,2}\/)((?!\.scss|\.svg|\.png|\.jpg).)*?)("|');/g, `$1${extension}$5;`)
             .replace(/((import|export)\(["']((@babylonjs\/.*\/|\.{1,2}\/)((?!\.scss|\.svg|\.png|\.jpg).)*?))(["'])\)/g, `$1${extension}$6)`)

packages/dev/buildTools/src/generateDeclaration.ts

@@ -76,45 +76,56 @@ function GetModuleDeclaration(
                     line = line.startsWith("    ") ? "    //" + line.substring(3) : "// " + line;
                 }
 
+                // replace type imports from directories with index (mixins are generating them)
+                line = line.replace(/import\("([./]+)"\)/g, `import("$1/index")`);
+
                 [
                     // Declaration
-                    /declare module ['"](.*)['"]/,
+                    /declare module ['"](.*)['"]/g,
                     // From
-                    / from ['"](.*)['"]/,
+                    / from ['"](.*)['"]/g,
                     // Module augmentation
-                    / {4}module ['"](.*)['"]/,
-                    /^module ['"](\..*)['"]/,
+                    / {4}module ['"](.*)['"]/g,
+                    /^module ['"](\..*)['"]/g,
                     // Inlined Import
-                    /import\(['"](.*)['"]/,
+                    /import\(['"]([^'"]*)['"]/g,
                     // Side Effect Import
-                    /import ['"](.*)['"]/,
+                    /import ['"](.*)['"]/g,
                 ].forEach((regex) => {
-                    const match = line.match(regex);
-                    if (match) {
-                        if (match[1][0] === ".") {
-                            const newLocation = path.join(sourceDir, match[1]).replace(/\\/g, "/");
-                            line = line.replace(match[1], newLocation);
-                        } else {
-                            let found = false;
-                            Object.keys(mapping).forEach((devPackageName) => {
-                                if (match[1].startsWith(devPackageName)) {
-                                    line = line.replace(
-                                        match[1],
-                                        getPublicPackageName(
-                                            mapping[(isValidDevPackageName(devPackageName, true) ? devPackageName : kebabize(config.devPackageName)) as DevPackageName][buildType],
-                                            match[1]
-                                        ) + match[1].substring(devPackageName.length)
-                                    );
-                                    found = true;
-                                }
-                            });
-                            if (!found) {
-                                // not a dev dependency
-                                // TODO - make a list of external dependencies per package
-                                // for now - we support react
-                                if (match[1] !== "react" /* && !match[1].startsWith("@fluentui")*/) {
-                                    // check what the line imports
-                                    line = "";
+                    const matches = line.matchAll(regex);
+                    if (matches) {
+                        for (const match of matches) {
+                            const group = match[1];
+                            if (group[0] === ".") {
+                                const newLocation = path.join(sourceDir, group).replace(/\\/g, "/");
+                                // replaceAll only avaialable by modifying the typescript lib
+                                // which we prefered to not change for now
+                                line = (line as any).replace(group, newLocation);
+                                // while (line.indexOf("//") > -1) {}
+                            } else {
+                                let found = false;
+                                Object.keys(mapping).forEach((devPackageName) => {
+                                    if (group.startsWith(devPackageName)) {
+                                        line = line.replace(
+                                            group,
+                                            getPublicPackageName(
+                                                mapping[(isValidDevPackageName(devPackageName, true) ? devPackageName : kebabize(config.devPackageName)) as DevPackageName][
+                                                    buildType
+                                                ],
+                                                group
+                                            ) + group.substring(devPackageName.length)
+                                        );
+                                        found = true;
+                                    }
+                                });
+                                if (!found) {
+                                    // not a dev dependency
+                                    // TODO - make a list of external dependencies per package
+                                    // for now - we support react
+                                    if (group !== "react" /* && !group.startsWith("@fluentui")*/) {
+                                        // check what the line imports
+                                        line = "";
+                                    }
                                 }
                             }
                         }
@@ -319,8 +330,8 @@ function GetPackageDeclaration(
     while (i < lines.length) {
         let line = lines[i];
 
-        if (/import\("\.(.*)\)./g.test(line) && !/^declare type (.*) import/g.test(line)) {
-            line = line.replace(/import\((.*)\)./, "");
+        if (/import\("\.([^)]*)\)./g.test(line) && !/^declare type (.*) import/g.test(line)) {
+            line = line.replace(/import\(([^)]*)\)./g, "");
         }
 
         if (!line.includes("const enum") && !line.includes("=")) {

packages/dev/buildTools/src/packageMapping.ts

@@ -290,6 +290,7 @@ const packageMapping: {
     // },
     namespace: {
         core: (filePath?: string) => {
+            filePath = filePath?.replaceAll("\\", "/");
             if (
                 filePath &&
                 (filePath.includes("/Debug/axesViewer") ||
@@ -304,6 +305,7 @@ const packageMapping: {
         gui: "BABYLON.GUI",
         materials: "BABYLON",
         loaders: (filePath?: string) => {
+            filePath = filePath?.replaceAll("\\", "/");
             if (filePath) {
                 if (filePath.includes("/glTF/1.0")) {
                     // was .endsWith
@@ -320,6 +322,7 @@ const packageMapping: {
         },
         serializers: "BABYLON",
         inspector: (filePath?: string) => {
+            filePath = filePath?.replaceAll("\\", "/");
             if (filePath) {
                 if (filePath.includes("shared-ui-components/") || filePath.includes("/sharedUiComponents/")) {
                     // was .endsWith
@@ -331,6 +334,7 @@ const packageMapping: {
             return "INSPECTOR";
         },
         "node-editor": (filePath?: string) => {
+            filePath = filePath?.replaceAll("\\", "/");
             if (filePath) {
                 if (filePath.includes("shared-ui-components/") || filePath.includes("/sharedUiComponents/")) {
                     // was .endsWith
@@ -342,6 +346,7 @@ const packageMapping: {
             return "BABYLON.NodeEditor";
         },
         "node-geometry-editor": (filePath?: string) => {
+            filePath = filePath?.replaceAll("\\", "/");
             if (filePath) {
                 if (filePath.includes("shared-ui-components/") || filePath.includes("/sharedUiComponents/")) {
                     // was .endsWith
@@ -353,6 +358,7 @@ const packageMapping: {
             return "BABYLON.NodeGeometryEditor";
         },
         "node-render-graph-editor": (filePath?: string) => {
+            filePath = filePath?.replaceAll("\\", "/");
             if (filePath) {
                 if (filePath.includes("shared-ui-components/") || filePath.includes("/sharedUiComponents/")) {
                     // was .endsWith
@@ -364,6 +370,7 @@ const packageMapping: {
             return "BABYLON.NodeRenderGraphEditor";
         },
         "node-particle-editor": (filePath?: string) => {
+            filePath = filePath?.replaceAll("\\", "/");
             if (filePath) {
                 if (filePath.includes("shared-ui-components/") || filePath.includes("/sharedUiComponents/")) {
                     // was .endsWith
@@ -375,6 +382,7 @@ const packageMapping: {
             return "BABYLON.NodeParticleEditor";
         },
         "gui-editor": (filePath?: string) => {
+            filePath = filePath?.replaceAll("\\", "/");
             if (filePath) {
                 if (filePath.includes("shared-ui-components/") || filePath.includes("/sharedUiComponents/")) {
                     // was .endsWith