* glb (color-assimp2 branch) + model-viewer
* color support + customizable output format
* cleanup
* disable monaco on iOS
* reinstate STL viewer when output is stl
* default to stl
* fix iOS editor
* script to build openscad-wasm from a branch / local repo
* update fork link + build instructions
* Update build-openscad-wasm.sh
* Update initial-state.ts
* update openscad3 refs
* update wasm build script
* Update Dockerfile.wasm
* add jszip dep
* multimaterial: color conversion + 3MF face painting
* ignore ts error about compression apis
* Update tsconfig.json
* multimaterial support w/ extruder colors input component
* fix wasm build script
* symlinks for openscad.{js,wasm} under src
* fix error line shift for bundled files
* remove obsolete build script
* set OPENSCADPATH env var
* render-colors feature renamed
* Customizer + prepare Multi-asset support
* hide customizer button if unselected, hide it if no params,
* Create build-openscad-wasm.sh
* update build script
* complete sound
* fetchSource util
* wider rotation allowance
* use CSG-modules.scad as default
* Update CustomizerPanel.tsx
* Update index.html
* capture save, allow Ctrl+Shift+Save to save project
* customizer: fieldsets are better than accordion
* expand customizer tabs by default
* tooltip for reset buttons
* pretty c++ exceptions
* Delete inline-openscad-worker.ts
* shuffle ux
* use uzip instead of jszip for 3mf materialization
* handle legacy links
* update links to fork
* use render-modifiers feature from color-assimp2 in preview mode
* include NopSCADlib's STL files in archive
* bind global f5 / f6
* update homepage back to openscad2
* styling fixes (editor alpha, customizer margins)
* Add help link for customizer
* fix customizer sliders (also need to show value input)
* fix vector customizer component
* style fallback editor
* shorter logs button
* customizer: rm reset button tooltip
* customizer: allow dnd on viewer below, tweak background
* add lights to modelviewer using an env image (gltf lights hard to plug across assimp for now)
* update customizer styles
* Update .gitignore
* add license for UZIP.js (MIT)
* Update skybox-lights.jpg
* Update actions.ts
* include NopSCADlib's STLs
* Update LICENSE.md
* include YAPP_Box examples
* limit customizer height
* Update skybox-lights.jpg
* Update skybox-lights.jpg
* Update openscad-worker.ts
* build-openscad-wasm.sh fix: docker won't mount files outside home directory
* Use Google CDN instead of unpkg for modelviewer
* tmp updates before merge
* Add ccache support to build-openscad-wasm.sh
* Fix makefile
* Update README.md
* Fix ts imports
* Delete build-openscad-wasm.sh
* Crude off -> glb converter
* Remove assimp related code
* gltf diffs
* Build using head openscad
* readme: Update build prerequisites
* make: attempt to build wasm binary in parallel first
* Remove 3mf extruder color mapping & fix render / export flows (render all 3d to off)
* off2glb: triangulate faces + add default color
* Add simple e2e puppeteer test
* ci: update pinned build to master output artefact
* Update Makefile
* Update test.yml
* Update test.yml
* Update test.yml
* Update test.yml
* ci: use relative node version names
* Update test.yml
* state: Remove renderFormat, introduce is2D
* disable service worker in devel mode
* remove dead code
* build: fix NODE_ENV define
* ci: simplify env vars
* cleanups
* Update README.md
97 lines
No EOL
2.9 KiB
TypeScript
97 lines
No EOL
2.9 KiB
TypeScript
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
|
|
import { MergedOutputs } from "./openscad-worker";
|
|
|
|
const ignoredLogs = new Set([
|
|
'Could not initialize localization.'
|
|
]);
|
|
|
|
type MergedOutputsOptions = {
|
|
shiftSourceLines?: {
|
|
sourcePath: string,
|
|
skipLines: number,
|
|
}
|
|
}
|
|
|
|
export const processMergedOutputs = (outputs: MergedOutputs, opts: MergedOutputsOptions) => ({
|
|
logText: joinMergedOutputs(outputs, opts),
|
|
markers: parseMergedOutputs(outputs, opts)
|
|
});
|
|
|
|
export function joinMergedOutputs(mergedOutputs: MergedOutputs, opts: MergedOutputsOptions) {
|
|
let allLines = [];
|
|
for (const {stderr, stdout, error} of mergedOutputs){
|
|
const line = stderr ?? stdout ?? `EXCEPTION: ${error}`;
|
|
if (ignoredLogs.has(line)) {
|
|
continue;
|
|
}
|
|
allLines.push(line);
|
|
}
|
|
|
|
return allLines.join("\n");
|
|
}
|
|
|
|
export function parseMergedOutputs(mergedOutputs: MergedOutputs, opts: MergedOutputsOptions): monaco.editor.IMarkerData[] {
|
|
let unmatchedLines = [];
|
|
|
|
const markers = [];
|
|
let warningCount = 0, errorCount = 0;
|
|
const addError = (error: string, file: string, line: number) => {
|
|
markers.push({
|
|
startLineNumber: Number(line),
|
|
startColumn: 1,
|
|
endLineNumber: Number(line),
|
|
endColumn: 1000,
|
|
message: error,
|
|
severity: monaco.MarkerSeverity.Error
|
|
})
|
|
}
|
|
const shiftSourceName = opts.shiftSourceLines && opts.shiftSourceLines.sourcePath;
|
|
const getLine = (path: string, lineStr: string) => {
|
|
const line = Number(lineStr);
|
|
if (shiftSourceName && path.endsWith(shiftSourceName)) {
|
|
return line - opts.shiftSourceLines!.skipLines;
|
|
} else {
|
|
return line;
|
|
}
|
|
}
|
|
for (const {stderr, stdout, error} of mergedOutputs){
|
|
if (stderr) {
|
|
if (stderr.startsWith('ERROR:')) errorCount++;
|
|
if (stderr.startsWith('WARNING:')) warningCount++;
|
|
|
|
let m = /^ERROR: Parser error in file "([^"]+)", line (\d+): (.*)$/.exec(stderr)
|
|
if (m) {
|
|
const [_, file, line, error] = m
|
|
addError(error, file, getLine(file, line));
|
|
continue;
|
|
}
|
|
|
|
m = /^ERROR: Parser error: (.*?) in file ([^",]+), line (\d+)$/.exec(stderr)
|
|
if (m) {
|
|
const [_, error, file, line] = m
|
|
addError(error, file, getLine(file, line));
|
|
continue;
|
|
}
|
|
|
|
m = /^WARNING: (.*?),? in file ([^,]+), line (\d+)\.?/.exec(stderr);
|
|
if (m) {
|
|
const [_, warning, file, line] = m
|
|
markers.push({
|
|
startLineNumber: getLine(file, line),
|
|
startColumn: 1,
|
|
endLineNumber: getLine(file, line),
|
|
endColumn: 1000,
|
|
message: warning,
|
|
severity: monaco.MarkerSeverity.Warning
|
|
})
|
|
continue;
|
|
}
|
|
}
|
|
unmatchedLines.push(stderr ?? stdout ?? `EXCEPTION: ${error}`);
|
|
}
|
|
if (errorCount || warningCount) unmatchedLines = [`${errorCount} errors, ${warningCount} warnings!`, '', ...unmatchedLines];
|
|
|
|
// logsElement.innerText = unmatchedLines.join("\n")
|
|
|
|
return markers;
|
|
} |