bimplus-renderer 1.8.41 → 1.8.42

package/README.md

@@ -150,6 +150,17 @@ npm run test-vitest-modelviewer-chrome
 npm run test-vitest-modelviewer-chrome-long
 ```
 
+Run all four Firefox geometry and visual suites (short and long datasets) with:
+
+```sh
+npm run test-modelviewer-all
+```
+
+The suites run serially and continue after failures. A final table lists each
+suite's PASS/FAIL status, exit code, and duration, followed by an overall result.
+The command exits with code 1 if any suite fails, or 0 if all four pass.
+Individual test counts remain in each suite's output.
+
 ### Modelviewer image comparison (Playwright Test)
 
 The standalone Playwright suite loads each IFC into the real renderer, checks

package/package.json

@@ -6,7 +6,7 @@
   "                 set there the full version string!                                              ": "",
   "                 e.g.: semverRange: '1.8.20-my-tag-name-01'                                      ": "",
   "================================================================================================-": "",
-  "version": "1.8.41",
+  "version": "1.8.42",
   "description": "bim+ renderer",
   "types": "types/bimplus-renderer.d.ts",
   "keywords": [
@@ -48,11 +48,11 @@
     "build-lls": "npm run copy-wasm-node-modules && npm run build-worker-dev && npm run eslint && webpack --config webpack.dev.js && npm run copy-wasm-lls",
     "build-prod-lls": "npm run copy-wasm-node-modules && npm run build-worker-prod && npm run eslint && webpack --config webpack.prod.js && npm run check-es2019 && npm run copy-wasm-lls",
     "code-metrics": "plato -r -d metrics src",
-    "copy-compiled-worker": "cpy --flat ./dist/GlbProcessorWorker.bimplus-renderer.worker.js ./src/compiledWorkers",
+    "copy-compiled-worker": "node scripts/copy-files.js --flat ./dist/GlbProcessorWorker.bimplus-renderer.worker.js ./src/compiledWorkers",
     "cleanup-compiled-worker": "rimraf ./src/compiledWorkers/GlbProcessorWorker.bimplus-renderer.worker.js",
-    "copy-wasm": "cpy ./src/wasm/*.wasm ./dist/",
-    "copy-wasm-node-modules": "cpy ./node_modules/web-ifc/web-ifc.wasm ./node_modules/web-ifc/web-ifc-mt.wasm ./src/wasm/ --flat",
-    "copy-wasm-lls": "cpy './src/wasm/*.wasm' ./dist/",
+    "copy-wasm": "node scripts/copy-files.js \"./src/wasm/*.wasm\" ./dist/",
+    "copy-wasm-node-modules": "node scripts/copy-files.js ./node_modules/web-ifc/web-ifc.wasm ./node_modules/web-ifc/web-ifc-mt.wasm ./src/wasm/ --flat",
+    "copy-wasm-lls": "node scripts/copy-files.js \"./src/wasm/*.wasm\" ./dist/",
     "npm-publish-lls": "npm run build-prod-lls && npm run publish",
     "npm-publish-rc-lls": "npm run build-prod-lls && npm run publish --tag rc",
     "npm-publish-branch-lls": "npm run build-prod-lls && npm run publish --tag",
@@ -65,6 +65,7 @@
     "test": "npm run test-firefox-coverage",
     "test-chrome": "npm run test-chrome-headed",
     "test-firefox": "npm run test-firefox-headed",
+    "test-all": "npm run test-firefox-coverage && npm run test-modelviewer-all",
     "//===================== Test helpers and browser/Polly prerequisites ==========================": "",
     "test-firefox-task": "vitest run --project=firefox --outputFile.junit=test-results/vitest-firefox.xml",
     "test-firefox-headed": "start-server-and-test test-polly-listen-task tcp:localhost:3000 \"npm run test-firefox-task -- --browser.headless=false\"",
@@ -101,6 +102,7 @@
     "//=========================================================================================-===": "",
     "// 2.)                   DDT TESTS           Scripts starting modelviewer-data-driven-tests    ": "",
     "//============================================================================================-": "",
+    "test-modelviewer-all": "node scripts/test-modelviewer-all.js",
     "test-modelviewer-ddt": "npm run test-vitest-modelviewer-firefox",
     "test-modelviewer-ddt-long": "npm run test-vitest-modelviewer-firefox-long",
     "test-modelviewer-ddt-watch": "npm run test-vitest-modelviewer-firefox-watch",
@@ -137,10 +139,9 @@
     "@vitest/coverage-istanbul": "5.0.5",
     "acorn": "8.19.0",
     "babel-loader": "^10.1.1",
-    "bimplus-websdk": "^1.0.71",
+    "bimplus-websdk": "^1.0.72",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^14.0.0",
-    "cpy-cli": "^7.0.0",
     "eslint": "^10.13.0",
     "file-loader": "6.2.0",
     "globals": "17.13.0",

package/scripts/copy-files.js

@@ -0,0 +1,83 @@
+// Minimal dependency-free replacement for cpy-cli, covering the copy tasks
+// used by this package.
+//
+// Usage: node scripts/copy-files.js [--flat] <file|glob>... <destinationDirectory>
+//
+// - Wildcards (* and ?) are supported in the file name part of a pattern only,
+//   e.g. "./src/wasm/*.wasm". Recursive globs (**) are not supported.
+// - All files are copied directly into the destination directory. Because
+//   wildcards are restricted to the file name part, this matches both the
+//   default and the --flat behavior of cpy for the patterns used here.
+//   The --flat flag is accepted and ignored for compatibility.
+
+const fs = require('fs');
+const path = require('path');
+
+const args = process.argv.slice(2).filter((arg) => arg !== '--flat');
+
+if (args.length < 2) {
+  console.error('Usage: node scripts/copy-files.js [--flat] <file|glob>... <destinationDirectory>');
+  process.exit(1);
+}
+
+const destination = args.pop();
+const patterns = args;
+
+const hasWildcard = (text) => /[*?]/.test(text);
+
+// Convert a wildcard pattern ("*" and "?") to a regular expression.
+const wildcardToRegExp = (pattern) => {
+  const escaped = pattern
+    .replace(/[.+^${}()|[\]\\]/g, '\\$&')
+    .replace(/\*/g, '.*')
+    .replace(/\?/g, '.');
+  return new RegExp(`^${escaped}$`);
+};
+
+const resolvePattern = (pattern) => {
+  const directory = path.dirname(pattern);
+  const fileNamePattern = path.basename(pattern);
+
+  if (hasWildcard(directory)) {
+    console.error(`Wildcards are only supported in the file name part of a pattern: ${pattern}`);
+    process.exit(1);
+  }
+
+  if (!hasWildcard(fileNamePattern)) {
+    return [pattern];
+  }
+
+  if (!fs.existsSync(directory)) {
+    return [];
+  }
+
+  const matcher = wildcardToRegExp(fileNamePattern);
+  return fs
+    .readdirSync(directory, { withFileTypes: true })
+    .filter((entry) => entry.isFile() && matcher.test(entry.name))
+    .map((entry) => path.join(directory, entry.name));
+};
+
+let copiedCount = 0;
+for (const pattern of patterns) {
+  const files = resolvePattern(pattern.replace(/\\/g, '/'));
+
+  if (files.length === 0) {
+    console.error(`No files matched pattern: ${pattern}`);
+    process.exit(1);
+  }
+
+  for (const file of files) {
+    if (!fs.existsSync(file)) {
+      console.error(`File not found: ${file}`);
+      process.exit(1);
+    }
+
+    const destinationPath = path.join(destination, path.basename(file));
+    fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
+    fs.copyFileSync(file, destinationPath);
+    copiedCount += 1;
+  }
+}
+
+console.log(`Copied ${copiedCount} file(s) to ${destination}`);

package/scripts/test-modelviewer-all.js

@@ -0,0 +1,35 @@
+const { spawnSync } = require('node:child_process');
+const path = require('node:path');
+
+const scripts = [
+  'test-modelviewer-ddt',
+  'test-modelviewer-ddt-long',
+  'test-modelviewer-ddt-visual',
+  'test-modelviewer-ddt-visual-long'
+];
+
+const results = scripts.map(script => {
+  console.log(`\n=== ${script} ===\n`);
+  const started = Date.now();
+  const result = spawnSync(process.execPath, [process.env.npm_execpath, 'run', script], {
+    cwd: path.resolve(__dirname, '..'),
+    stdio: 'inherit'
+  });
+
+  if (result.error) {
+    console.error(result.error.message);
+  }
+
+  return {
+    Suite: script,
+    Result: result.status === 0 ? 'PASS' : 'FAIL',
+    'Exit Code': result.status === null ? result.signal || 'ERROR' : result.status,
+    Duration: `${((Date.now() - started) / 1000).toFixed(1)}s`
+  };
+});
+
+const failed = results.filter(result => result.Result === 'FAIL').length;
+console.log('\n=== Modelviewer Test Summary ===\n');
+console.table(results);
+console.log(`Overall: ${failed === 0 ? 'PASS' : 'FAIL'} (${results.length - failed} passed, ${failed} failed)`);
+process.exitCode = failed === 0 ? 0 : 1;