Small changes to support integration with OSMD.

Include offscreencanvas type information directly, to remove a dependency.

.eslintrc

@@ -47,7 +47,8 @@
       }
     },
     {
-      "files": ["demos/**/*.js", "demos/**/*.mjs"],
+      // disable some eslint rules in the demos and tools folders.
+      "files": ["{demos,tools}/**/*.{js,cjs,mjs}"],
       "extends": ["eslint:recommended", "prettier"],
       "rules": {
         "no-console": "off",
@@ -57,15 +58,6 @@
     {
       "files": ["src/**/*.js"],
       "extends": ["eslint:recommended", "prettier"]
-    },
-    {
-      "files": ["tests/**/*.js"],
-      "extends": ["eslint:recommended", "prettier"],
-      "rules": {
-        "no-restricted-globals": "off",
-        "no-undef": "off",
-        "no-undef-init": "off"
-      }
     }
   ]
 }

package.json

@@ -56,9 +56,7 @@
   "bugs": {
     "url": "https://github.com/0xfe/vexflow/issues"
   },
-  "dependencies": {
-    "@types/offscreencanvas": "^2019.6.4"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@typescript-eslint/parser": "^5.4.0",

src/canvascontext.ts

@@ -6,6 +6,35 @@ import { GroupAttributes, RenderContext, TextMeasure } from './rendercontext';
 import { globalObject, warn } from './util';
 import { isHTMLCanvas } from './web';
 
+// https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/offscreencanvas
+// https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/master/types/offscreencanvas/index.d.ts
+
+interface OffscreenCanvas extends EventTarget {
+  width: number;
+  height: number;
+  // ...more stuff that we removed.
+}
+
+// https://html.spec.whatwg.org/multipage/canvas.html#offscreencanvasrenderingcontext2d
+interface OffscreenCanvasRenderingContext2D
+  extends CanvasState,
+    CanvasTransform,
+    CanvasCompositing,
+    CanvasImageSmoothing,
+    CanvasFillStrokeStyles,
+    CanvasShadowStyles,
+    CanvasFilters,
+    CanvasRect,
+    CanvasDrawPath,
+    CanvasText,
+    CanvasDrawImage,
+    CanvasImageData,
+    CanvasPathDrawingStyles,
+    CanvasTextDrawingStyles,
+    CanvasPath {
+  readonly canvas: OffscreenCanvas;
+}
+
 /**
  * A rendering context for the Canvas backend. This class serves as a proxy for the
  * underlying CanvasRenderingContext2D object, part of the browser's API.

src/textformatter.ts

@@ -66,6 +66,7 @@ export class TextFormatter {
    * This method will return a fallback formatter if there are no matches.
    */
   static create(requestedFont: FontInfo = {}): TextFormatter {
+    L('create: ', requestedFont);
     if (!requestedFont.family) {
       requestedFont.family = Font.SANS_SERIF;
     }
@@ -138,6 +139,7 @@ export class TextFormatter {
    * @param overwrite
    */
   static registerInfo(info: TextFormatterInfo, overwrite: boolean = false): void {
+    L('registerInfo: ', info, overwrite);
     const fontFamily = info.family;
     const currFontInfo = registry[fontFamily];
     if (currFontInfo === undefined || overwrite) {

src/version.ts

@@ -1,2 +1,3 @@
 export const VERSION: string = '4.0.0';
-export const BUILD: string = '9b46e51d13c77870fe742e3eae9a1777df489d95';
+export const BUILD: string = '8526732110cb6f2fb843ec54a99809bb161b91f0';
+export const DATE: string = '2021-12-10T22:57:36.968Z';

tests/offscreencanvas_tests.ts

@@ -26,6 +26,8 @@ const OffscreenCanvasTests = {
 
 function simpleTest(): void {
   // Create a CanvasContext from an OffscreenCanvas.
+  // eslint-disable-next-line
+  // @ts-ignore
   const offscreenCanvas = new OffscreenCanvas(550, 200);
   const offscreenCtx = offscreenCanvas.getContext('2d');
   if (offscreenCtx == null) {

tools/esm/fix-imports-and-exports.js

@@ -20,8 +20,6 @@
 // - Assume single quoted strings.
 // - Assume import(...) function uses only string literals.
 
-/* eslint-disable no-console */
-
 import * as fs from 'fs';
 import * as path from 'path';
 

tools/generate_png_images.js

@@ -4,8 +4,6 @@
 // This meant to be used with the visual regression test system in
 // `tools/visual_regression.sh`.
 
-/* eslint-disable no-console */
-
 const { JSDOM } = require('jsdom');
 const fs = require('fs');
 const path = require('path');

tools/generate_version_file.js

@@ -2,13 +2,14 @@ const path = require('path');
 const fs = require('fs');
 const child_process = require('child_process');
 
-/* eslint-disable no-console */
-
 const outputFile = process.argv[2] ?? path.join(__dirname, '../src/version.ts');
 
 const PACKAGE_JSON = JSON.parse(fs.readFileSync('package.json'));
 const VEXFLOW_VERSION = PACKAGE_JSON.version;
 const GIT_COMMIT_HASH = child_process.execSync('git rev-parse HEAD').toString().trim();
 
-const contents = `export const VERSION: string = '${VEXFLOW_VERSION}';\nexport const BUILD: string = '${GIT_COMMIT_HASH}';`;
-fs.writeFileSync(outputFile, contents);
+const VERSION = `export const VERSION: string = '${VEXFLOW_VERSION}';`;
+const BUILD = `export const BUILD: string = '${GIT_COMMIT_HASH}';`;
+const DATE = `export const DATE: string = '${new Date().toISOString()}';`;
+
+fs.writeFileSync(outputFile, `${VERSION}\n${BUILD}\n${DATE}`);