From 758adcd502d5742111d01d2e46032cd7cc67b0c7 Mon Sep 17 00:00:00 2001 From: Nathan Muir Date: Wed, 20 Aug 2025 09:39:20 +1200 Subject: [PATCH] refactor: remove rename-imports scripts Update approach of dealing with file extensions differences between typescript & node. Leverages `rewriteRelativeImportExtensions` that was added in typescript 5.7 [1], and that is recommended path by node to run typescript in the future [2] [1] https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-7.html#path-rewriting-for-relative-paths [2] https://nodejs.org/api/typescript.html#type-stripping --- package.json | 7 +- rename-imports-test.mjs | 36 ---- rename-imports.mjs | 37 ---- src/Animation.ts | 8 +- src/Canvas.ts | 6 +- src/Container.ts | 14 +- src/Context.ts | 12 +- src/Core.ts | 4 +- src/DragAndDrop.ts | 10 +- src/Factory.ts | 8 +- src/FastLayer.ts | 6 +- src/Group.ts | 10 +- src/Layer.ts | 22 +-- src/Node.ts | 24 +-- src/PointerEvents.ts | 8 +- src/Shape.ts | 20 +- src/Stage.ts | 22 +-- src/Tween.ts | 10 +- src/Util.ts | 6 +- src/Validators.ts | 4 +- src/_CoreInternals.ts | 28 +-- src/_FullInternals.ts | 74 ++++---- src/canvas-backend.ts | 3 +- src/filters/Blur.ts | 6 +- src/filters/Brighten.ts | 6 +- src/filters/Contrast.ts | 6 +- src/filters/Emboss.ts | 8 +- src/filters/Enhance.ts | 6 +- src/filters/Grayscale.ts | 2 +- src/filters/HSL.ts | 6 +- src/filters/HSV.ts | 6 +- src/filters/Invert.ts | 2 +- src/filters/Kaleidoscope.ts | 8 +- src/filters/Mask.ts | 6 +- src/filters/Noise.ts | 6 +- src/filters/Pixelate.ts | 8 +- src/filters/Posterize.ts | 6 +- src/filters/RGB.ts | 6 +- src/filters/RGBA.ts | 6 +- src/filters/Sepia.ts | 2 +- src/filters/Solarize.ts | 2 +- src/filters/Threshold.ts | 6 +- src/index-node.ts | 3 +- src/index-types.d.ts | 224 ++++++++++++----------- src/index.ts | 2 +- src/shapes/Arc.ts | 14 +- src/shapes/Arrow.ts | 14 +- src/shapes/Circle.ts | 12 +- src/shapes/Ellipse.ts | 12 +- src/shapes/Image.ts | 14 +- src/shapes/Label.ts | 18 +- src/shapes/Line.ts | 12 +- src/shapes/Path.ts | 10 +- src/shapes/Rect.ts | 14 +- src/shapes/RegularPolygon.ts | 14 +- src/shapes/Ring.ts | 12 +- src/shapes/Sprite.ts | 14 +- src/shapes/Star.ts | 12 +- src/shapes/Text.ts | 16 +- src/shapes/TextPath.ts | 18 +- src/shapes/Transformer.ts | 22 +-- src/shapes/Wedge.ts | 14 +- src/skia-backend.ts | 2 +- test/manual/Blur-test.ts | 2 +- test/manual/Brighten-test.ts | 2 +- test/manual/Contrast-test.ts | 2 +- test/manual/Emboss-test.ts | 2 +- test/manual/Enhance-test.ts | 2 +- test/manual/Filter-test.ts | 2 +- test/manual/Grayscale-test.ts | 2 +- test/manual/HSL-test.ts | 2 +- test/manual/HSV-test.ts | 2 +- test/manual/Invert-test.ts | 2 +- test/manual/Kaleidoscope-test.ts | 2 +- test/manual/Manual-test.ts | 2 +- test/manual/Mask-test.ts | 2 +- test/manual/Noise-test.ts | 2 +- test/manual/Pixelate-test.ts | 4 +- test/manual/Posterize-test.ts | 2 +- test/manual/RGB-test.ts | 2 +- test/manual/RGBA-test.ts | 2 +- test/manual/Sepia-test.ts | 2 +- test/manual/Solarize-test.ts | 2 +- test/manual/Threshold-test.ts | 2 +- test/node-canvas-global-setup.mjs | 10 +- test/node-skia-global-setup.mjs | 2 +- test/package.json | 3 - test/unit/Animation-test.ts | 2 +- test/unit/Arc-test.ts | 2 +- test/unit/Arrow-test.ts | 2 +- test/unit/AutoDraw-test.ts | 2 +- test/unit/Blob-test.ts | 4 +- test/unit/Canvas-test.ts | 2 +- test/unit/Circle-test.ts | 2 +- test/unit/Container-test.ts | 2 +- test/unit/Context-test.ts | 2 +- test/unit/DragAndDrop-test.ts | 2 +- test/unit/DragAndDropEvents-test.ts | 2 +- test/unit/Ellipse-test.ts | 2 +- test/unit/Global-test.ts | 2 +- test/unit/Group-test.ts | 2 +- test/unit/Image-test.ts | 2 +- test/unit/Label-test.ts | 7 +- test/unit/Layer-test.ts | 2 +- test/unit/Line-test.ts | 2 +- test/unit/MouseEvents-test.ts | 2 +- test/unit/Node-cache-test.ts | 2 +- test/unit/Node-test.ts | 4 +- test/unit/Path-test.ts | 6 +- test/unit/PointerEvents-test.ts | 2 +- test/unit/Polygon-test.ts | 2 +- test/unit/Rect-test.ts | 2 +- test/unit/RegularPolygon-test.ts | 2 +- test/unit/Ring-test.ts | 2 +- test/unit/Shape-test.ts | 4 +- test/unit/Spline-test.ts | 2 +- test/unit/Sprite-test.ts | 2 +- test/unit/Stage-test.ts | 2 +- test/unit/Star-test.ts | 2 +- test/unit/Text-test.ts | 2 +- test/unit/TextPath-test.ts | 7 +- test/unit/TouchEvents-test.ts | 2 +- test/unit/Transformer-test.ts | 6 +- test/unit/Tween-test.ts | 2 +- test/unit/Util-test.ts | 2 +- test/unit/Wedge-test.ts | 2 +- test/unit/imagediff.ts | 2 +- test/unit/test-utils.ts | 8 +- tsconfig.json | 19 +- test/tsconfig.json => tsconfig.test.json | 16 +- tsconfig.testing.json | 10 - 131 files changed, 548 insertions(+), 624 deletions(-) delete mode 100644 rename-imports-test.mjs delete mode 100644 rename-imports.mjs delete mode 100644 test/package.json rename test/tsconfig.json => tsconfig.test.json (51%) delete mode 100644 tsconfig.testing.json diff --git a/package.json b/package.json index e267861d..f6a9a10a 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "scripts": { "start": "npm run test:watch", "compile": "npm run clean && npm run tsc && cp ./src/index-types.d.ts ./lib/index-types.d.ts && npm run rollup", - "build": "npm run compile && cp ./src/index-types.d.ts ./lib && gulp build && node ./rename-imports.mjs", + "build": "npm run compile && cp ./src/index-types.d.ts ./lib && gulp build", "fmt": "prettier --write .", "fmt:check": "prettier --check .", "test:import": "npm run build && node ./test/import-test.cjs && node ./test/import-test.mjs", @@ -42,8 +42,8 @@ "test:build": "PARCEL_WORKER_BACKEND=process parcel build ./test/unit-tests.html --dist-dir ./test-build --target none --public-url ./ --no-source-maps", "test:browser": "npm run test:build && mocha-headless-chrome -f ./test-build/unit-tests.html -a disable-web-security -a no-sandbox -a disable-setuid-sandbox", "test:watch": "rm -rf ./.parcel-cache && PARCEL_WORKERS=0 parcel serve ./test/unit-tests.html ./test/manual-tests.html ./test/sandbox.html ./test/text-paths.html ./test/bunnies.html", - "test:node:canvas": "rm -rf ./.test-temp && mkdir ./.test-temp && (tsc -p ./test/tsconfig.json --outDir ./.test-temp || true) && node ./rename-imports-test.mjs && mocha './.test-temp/test/unit/**/*.js' -r ./test/node-canvas-global-setup.mjs --exit && rm -rf ./.test-temp", - "test:node:skia": "rm -rf ./.test-temp && mkdir ./.test-temp && (tsc -p ./test/tsconfig.json --outDir ./.test-temp || true) && node ./rename-imports-test.mjs && mocha './.test-temp/test/unit/**/*.js' -r ./test/node-skia-global-setup.mjs --exit && rm -rf ./.test-temp", + "test:node:canvas": "mocha -r tsx -r ./test/node-canvas-global-setup.mjs --extension ts --recursive './test/unit/' --exit", + "test:node:skia": "mocha -r tsx -r ./test/node-skia-global-setup.mjs --extension ts --recursive './test/unit/' --exit", "test:node": "npm run test:node:canvas && npm run test:node:skia", "tsc": "tsc --removeComments", "rollup": "rollup -c", @@ -110,6 +110,7 @@ "skia-canvas": "^2.0.2", "ts-mocha": "^11.1.0", "ts-node": "^10.9.2", + "tsx": "^4.20.4", "typescript": "^5.9.2" }, "keywords": [ diff --git a/rename-imports-test.mjs b/rename-imports-test.mjs deleted file mode 100644 index 4b2feb92..00000000 --- a/rename-imports-test.mjs +++ /dev/null @@ -1,36 +0,0 @@ -import FileHound from 'filehound'; -import fs from 'fs'; - -const files = FileHound.create().paths('./.test-temp').ext(['js', 'ts']).find(); - -files.then((filePaths) => { - filePaths.forEach((filepath) => { - fs.readFile(filepath, 'utf8', (err, text) => { - if (!text.match(/import .* from/g)) { - return; - } - text = text.replace(/(import .* from\s+['"])(.*)(?=['"])/g, '$1$2.js'); - if (text.match(/export .* from/g)) { - text = text.replace(/(export .* from\s+['"])(.*)(?=['"])/g, '$1$2.js'); - } - - if (err) throw err; - - // stupid replacement back - text = text.replace("from 'canvas.js';", "from 'canvas';"); - text = text.replace("from 'chai.js';", "from 'chai';"); - text = text.replace("from 'skia-canvas.js';", "from 'skia-canvas';"); - - // Handle import("./x/y/z") syntax. - text = text.replace(/(import\s*\(\s*['"])(.*)(?=['"])/g, '$1$2.js'); - - fs.writeFile(filepath, text, function (err) { - if (err) { - throw err; - } - }); - }); - }); -}); - -// Removed CommonJS export rewriting to keep ESM output intact diff --git a/rename-imports.mjs b/rename-imports.mjs deleted file mode 100644 index 3b1ba401..00000000 --- a/rename-imports.mjs +++ /dev/null @@ -1,37 +0,0 @@ -import FileHound from 'filehound'; -import fs from 'fs'; - -const files = FileHound.create().paths('./lib').ext(['js', 'ts']).find(); - -files.then((filePaths) => { - filePaths.forEach((filepath) => { - fs.readFile(filepath, 'utf8', (err, text) => { - if (!text.match(/import .* from/g)) { - return; - } - text = text.replace(/(import .* from\s+['"])(.*)(?=['"])/g, '$1$2.js'); - if (text.match(/export .* from/g)) { - text = text.replace(/(export .* from\s+['"])(.*)(?=['"])/g, '$1$2.js'); - } - - if (err) throw err; - - // stupid replacement back - text = text.replace( - "import * as Canvas from 'canvas.js';", - "import * as Canvas from 'canvas';" - ); - - // Handle import("./x/y/z") syntax. - text = text.replace(/(import\s*\(\s*['"])(.*)(?=['"])/g, '$1$2.js'); - - fs.writeFile(filepath, text, function (err) { - if (err) { - throw err; - } - }); - }); - }); -}); - -// Removed CommonJS export rewriting to keep ESM output intact diff --git a/src/Animation.ts b/src/Animation.ts index 2f6bd558..23a1494f 100644 --- a/src/Animation.ts +++ b/src/Animation.ts @@ -1,7 +1,7 @@ -import { glob } from './Global'; -import { Layer } from './Layer'; -import { IFrame, AnimationFn } from './types'; -import { Util } from './Util'; +import { glob } from './Global.ts'; +import { Layer } from './Layer.ts'; +import { IFrame, AnimationFn } from './types.ts'; +import { Util } from './Util.ts'; const now = (function (): () => number { if (glob.performance && glob.performance.now) { diff --git a/src/Canvas.ts b/src/Canvas.ts index b5d6a1ed..56a05270 100644 --- a/src/Canvas.ts +++ b/src/Canvas.ts @@ -1,6 +1,6 @@ -import { Util } from './Util'; -import { SceneContext, HitContext, Context } from './Context'; -import { Konva } from './Global'; +import { Util } from './Util.ts'; +import { SceneContext, HitContext, Context } from './Context.ts'; +import { Konva } from './Global.ts'; // calculate pixel ratio let _pixelRatio; diff --git a/src/Container.ts b/src/Container.ts index f3e5df74..3b95bcb8 100644 --- a/src/Container.ts +++ b/src/Container.ts @@ -1,10 +1,10 @@ -import { HitCanvas, SceneCanvas } from './Canvas'; -import { SceneContext } from './Context'; -import { Factory } from './Factory'; -import { Node, NodeConfig } from './Node'; -import { Shape } from './Shape'; -import { GetSet, IRect } from './types'; -import { getNumberValidator } from './Validators'; +import { HitCanvas, SceneCanvas } from './Canvas.ts'; +import { SceneContext } from './Context.ts'; +import { Factory } from './Factory.ts'; +import { Node, NodeConfig } from './Node.ts'; +import { Shape } from './Shape.ts'; +import { GetSet, IRect } from './types.ts'; +import { getNumberValidator } from './Validators.ts'; export type ClipFuncOutput = | void diff --git a/src/Context.ts b/src/Context.ts index 751901ab..e054787b 100644 --- a/src/Context.ts +++ b/src/Context.ts @@ -1,9 +1,9 @@ -import { Util } from './Util'; -import { Konva } from './Global'; -import { Canvas } from './Canvas'; -import { Shape } from './Shape'; -import { IRect } from './types'; -import type { Node } from './Node'; +import { Util } from './Util.ts'; +import { Konva } from './Global.ts'; +import { Canvas } from './Canvas.ts'; +import { Shape } from './Shape.ts'; +import { IRect } from './types.ts'; +import type { Node } from './Node.ts'; function simplifyArray(arr: Array) { const retArr: Array = [], diff --git a/src/Core.ts b/src/Core.ts index e6eecb92..918e00f7 100644 --- a/src/Core.ts +++ b/src/Core.ts @@ -1,5 +1,5 @@ // enter file of limited Konva version with only core functions -export { Konva } from './_CoreInternals'; -import { Konva } from './_CoreInternals'; +export { Konva } from './_CoreInternals.ts'; +import { Konva } from './_CoreInternals.ts'; export default Konva; diff --git a/src/DragAndDrop.ts b/src/DragAndDrop.ts index 4bed333e..42e709f8 100644 --- a/src/DragAndDrop.ts +++ b/src/DragAndDrop.ts @@ -1,8 +1,8 @@ -import { Container } from './Container'; -import { Konva } from './Global'; -import { Node } from './Node'; -import { Vector2d } from './types'; -import { Util } from './Util'; +import { Container } from './Container.ts'; +import { Konva } from './Global.ts'; +import { Node } from './Node.ts'; +import { Vector2d } from './types.ts'; +import { Util } from './Util.ts'; export const DD = { get isDragging() { diff --git a/src/Factory.ts b/src/Factory.ts index 9efae790..cbab6e63 100644 --- a/src/Factory.ts +++ b/src/Factory.ts @@ -1,7 +1,7 @@ -import { Node } from './Node'; -import { GetSet } from './types'; -import { Util } from './Util'; -import { getComponentValidator } from './Validators'; +import { Node } from './Node.ts'; +import { GetSet } from './types.ts'; +import { Util } from './Util.ts'; +import { getComponentValidator } from './Validators.ts'; const GET = 'get'; const SET = 'set'; diff --git a/src/FastLayer.ts b/src/FastLayer.ts index 0c782cba..3092859c 100644 --- a/src/FastLayer.ts +++ b/src/FastLayer.ts @@ -1,6 +1,6 @@ -import { Util } from './Util'; -import { Layer } from './Layer'; -import { _registerNode } from './Global'; +import { Util } from './Util.ts'; +import { Layer } from './Layer.ts'; +import { _registerNode } from './Global.ts'; /** * FastLayer constructor. **DEPRECATED!** Please use `Konva.Layer({ listening: false})` instead. Layers are tied to their own canvas element and are used diff --git a/src/Group.ts b/src/Group.ts index 77e83ad7..b751c678 100644 --- a/src/Group.ts +++ b/src/Group.ts @@ -1,8 +1,8 @@ -import { Util } from './Util'; -import { Container, ContainerConfig } from './Container'; -import { _registerNode } from './Global'; -import { Node } from './Node'; -import { Shape } from './Shape'; +import { Util } from './Util.ts'; +import { Container, ContainerConfig } from './Container.ts'; +import { _registerNode } from './Global.ts'; +import { Node } from './Node.ts'; +import { Shape } from './Shape.ts'; export interface GroupConfig extends ContainerConfig {} diff --git a/src/Layer.ts b/src/Layer.ts index 5a13b2d5..b99be812 100644 --- a/src/Layer.ts +++ b/src/Layer.ts @@ -1,15 +1,15 @@ -import { Util } from './Util'; -import { Container, ContainerConfig } from './Container'; -import { Node } from './Node'; -import { Factory } from './Factory'; -import { SceneCanvas, HitCanvas } from './Canvas'; -import { Stage } from './Stage'; -import { getBooleanValidator } from './Validators'; +import { Util } from './Util.ts'; +import { Container, ContainerConfig } from './Container.ts'; +import { Node } from './Node.ts'; +import { Factory } from './Factory.ts'; +import { SceneCanvas, HitCanvas } from './Canvas.ts'; +import { Stage } from './Stage.ts'; +import { getBooleanValidator } from './Validators.ts'; -import { GetSet, Vector2d } from './types'; -import { Group } from './Group'; -import { Shape, shapes } from './Shape'; -import { _registerNode } from './Global'; +import { GetSet, Vector2d } from './types.ts'; +import { Group } from './Group.ts'; +import { Shape, shapes } from './Shape.ts'; +import { _registerNode } from './Global.ts'; export interface LayerConfig extends ContainerConfig { clearBeforeDraw?: boolean; diff --git a/src/Node.ts b/src/Node.ts index 524be132..003ebcff 100644 --- a/src/Node.ts +++ b/src/Node.ts @@ -1,19 +1,19 @@ -import { Canvas, HitCanvas, SceneCanvas } from './Canvas'; -import { Container } from './Container'; -import { Context } from './Context'; -import { DD } from './DragAndDrop'; -import { Factory } from './Factory'; -import { Konva } from './Global'; -import { Layer } from './Layer'; -import { Shape } from './Shape'; -import { Stage } from './Stage'; -import { GetSet, IRect, Vector2d } from './types'; -import { Transform, Util } from './Util'; +import { Canvas, HitCanvas, SceneCanvas } from './Canvas.ts'; +import { Container } from './Container.ts'; +import { Context } from './Context.ts'; +import { DD } from './DragAndDrop.ts'; +import { Factory } from './Factory.ts'; +import { Konva } from './Global.ts'; +import { Layer } from './Layer.ts'; +import { Shape } from './Shape.ts'; +import { Stage } from './Stage.ts'; +import { GetSet, IRect, Vector2d } from './types.ts'; +import { Transform, Util } from './Util.ts'; import { getBooleanValidator, getNumberValidator, getStringValidator, -} from './Validators'; +} from './Validators.ts'; export type Filter = (this: Node, imageData: ImageData) => void; diff --git a/src/PointerEvents.ts b/src/PointerEvents.ts index 82515948..bbc5ef87 100644 --- a/src/PointerEvents.ts +++ b/src/PointerEvents.ts @@ -1,8 +1,8 @@ -import { KonvaEventObject } from './Node'; -import { Konva } from './Global'; +import { KonvaEventObject } from './Node.ts'; +import { Konva } from './Global.ts'; -import { Shape } from './Shape'; -import { Stage } from './Stage'; +import { Shape } from './Shape.ts'; +import { Stage } from './Stage.ts'; const Captures = new Map(); diff --git a/src/Shape.ts b/src/Shape.ts index 6fc27361..d9e07a04 100644 --- a/src/Shape.ts +++ b/src/Shape.ts @@ -1,21 +1,21 @@ -import { Konva } from './Global'; -import { Transform, Util } from './Util'; -import { Factory } from './Factory'; -import { Node, NodeConfig } from './Node'; +import { Konva } from './Global.ts'; +import { Transform, Util } from './Util.ts'; +import { Factory } from './Factory.ts'; +import { Node, NodeConfig } from './Node.ts'; import { getNumberValidator, getNumberOrAutoValidator, getStringValidator, getBooleanValidator, getStringOrGradientValidator, -} from './Validators'; +} from './Validators.ts'; -import { Context, SceneContext } from './Context'; -import { _registerNode } from './Global'; -import * as PointerEvents from './PointerEvents'; +import { Context, SceneContext } from './Context.ts'; +import { _registerNode } from './Global.ts'; +import * as PointerEvents from './PointerEvents.ts'; -import { GetSet, Vector2d } from './types'; -import { HitCanvas, SceneCanvas } from './Canvas'; +import { GetSet, Vector2d } from './types.ts'; +import { HitCanvas, SceneCanvas } from './Canvas.ts'; // hack from here https://stackoverflow.com/questions/52667959/what-is-the-purpose-of-bivariancehack-in-typescript-types/52668133#52668133 export type ShapeConfigHandler = { diff --git a/src/Stage.ts b/src/Stage.ts index efab6faf..33cb7ca0 100644 --- a/src/Stage.ts +++ b/src/Stage.ts @@ -1,14 +1,14 @@ -import { Util } from './Util'; -import { Factory } from './Factory'; -import { Container, ContainerConfig } from './Container'; -import { Konva } from './Global'; -import { SceneCanvas, HitCanvas } from './Canvas'; -import { GetSet, Vector2d } from './types'; -import { Shape } from './Shape'; -import { Layer } from './Layer'; -import { DD } from './DragAndDrop'; -import { _registerNode } from './Global'; -import * as PointerEvents from './PointerEvents'; +import { Util } from './Util.ts'; +import { Factory } from './Factory.ts'; +import { Container, ContainerConfig } from './Container.ts'; +import { Konva } from './Global.ts'; +import { SceneCanvas, HitCanvas } from './Canvas.ts'; +import { GetSet, Vector2d } from './types.ts'; +import { Shape } from './Shape.ts'; +import { Layer } from './Layer.ts'; +import { DD } from './DragAndDrop.ts'; +import { _registerNode } from './Global.ts'; +import * as PointerEvents from './PointerEvents.ts'; export interface StageConfig extends ContainerConfig { container?: HTMLDivElement | string; diff --git a/src/Tween.ts b/src/Tween.ts index b744e914..912a8f7b 100644 --- a/src/Tween.ts +++ b/src/Tween.ts @@ -1,8 +1,8 @@ -import { Util } from './Util'; -import { Animation } from './Animation'; -import { Node, NodeConfig } from './Node'; -import { Konva } from './Global'; -import { Line } from './shapes/Line'; +import { Util } from './Util.ts'; +import { Animation } from './Animation.ts'; +import { Node, NodeConfig } from './Node.ts'; +import { Konva } from './Global.ts'; +import { Line } from './shapes/Line.ts'; const blacklist = { node: 1, diff --git a/src/Util.ts b/src/Util.ts index 5a3835b7..44701ba8 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -1,6 +1,6 @@ -import { Konva } from './Global'; -import { Context } from './Context'; -import { IRect, RGB, Vector2d } from './types'; +import { Konva } from './Global.ts'; +import { Context } from './Context.ts'; +import { IRect, RGB, Vector2d } from './types.ts'; const NODE_ERROR = `Konva.js unsupported environment. diff --git a/src/Validators.ts b/src/Validators.ts index ffb457d7..531a2dbe 100644 --- a/src/Validators.ts +++ b/src/Validators.ts @@ -1,5 +1,5 @@ -import { Konva } from './Global'; -import { Util } from './Util'; +import { Konva } from './Global.ts'; +import { Util } from './Util.ts'; function _formatValue(val: any) { if (Util._isString(val)) { diff --git a/src/_CoreInternals.ts b/src/_CoreInternals.ts index 9744e3a0..161a4873 100644 --- a/src/_CoreInternals.ts +++ b/src/_CoreInternals.ts @@ -1,26 +1,26 @@ // what is core parts of Konva? -import { Konva as Global } from './Global'; +import { Konva as Global } from './Global.ts'; -import { Util, Transform } from './Util'; -import { Node } from './Node'; -import { Container } from './Container'; +import { Util, Transform } from './Util.ts'; +import { Node } from './Node.ts'; +import { Container } from './Container.ts'; -import { Stage, stages } from './Stage'; +import { Stage, stages } from './Stage.ts'; -import { Layer } from './Layer'; -import { FastLayer } from './FastLayer'; +import { Layer } from './Layer.ts'; +import { FastLayer } from './FastLayer.ts'; -import { Group } from './Group'; +import { Group } from './Group.ts'; -import { DD } from './DragAndDrop'; +import { DD } from './DragAndDrop.ts'; -import { Shape, shapes } from './Shape'; +import { Shape, shapes } from './Shape.ts'; -import { Animation } from './Animation'; -import { Tween, Easings } from './Tween'; +import { Animation } from './Animation.ts'; +import { Tween, Easings } from './Tween.ts'; -import { Context } from './Context'; -import { Canvas } from './Canvas'; +import { Context } from './Context.ts'; +import { Canvas } from './Canvas.ts'; export const Konva = Util._assign(Global, { Util, diff --git a/src/_FullInternals.ts b/src/_FullInternals.ts index d257f4cd..5cf9d46b 100644 --- a/src/_FullInternals.ts +++ b/src/_FullInternals.ts @@ -1,46 +1,46 @@ // we need to import core of the Konva and then extend it with all additional objects -import { Konva as Core } from './_CoreInternals'; +import { Konva as Core } from './_CoreInternals.ts'; // shapes -import { Arc } from './shapes/Arc'; -import { Arrow } from './shapes/Arrow'; -import { Circle } from './shapes/Circle'; -import { Ellipse } from './shapes/Ellipse'; -import { Image } from './shapes/Image'; -import { Label, Tag } from './shapes/Label'; -import { Line } from './shapes/Line'; -import { Path } from './shapes/Path'; -import { Rect } from './shapes/Rect'; -import { RegularPolygon } from './shapes/RegularPolygon'; -import { Ring } from './shapes/Ring'; -import { Sprite } from './shapes/Sprite'; -import { Star } from './shapes/Star'; -import { Text } from './shapes/Text'; -import { TextPath } from './shapes/TextPath'; -import { Transformer } from './shapes/Transformer'; -import { Wedge } from './shapes/Wedge'; +import { Arc } from './shapes/Arc.ts'; +import { Arrow } from './shapes/Arrow.ts'; +import { Circle } from './shapes/Circle.ts'; +import { Ellipse } from './shapes/Ellipse.ts'; +import { Image } from './shapes/Image.ts'; +import { Label, Tag } from './shapes/Label.ts'; +import { Line } from './shapes/Line.ts'; +import { Path } from './shapes/Path.ts'; +import { Rect } from './shapes/Rect.ts'; +import { RegularPolygon } from './shapes/RegularPolygon.ts'; +import { Ring } from './shapes/Ring.ts'; +import { Sprite } from './shapes/Sprite.ts'; +import { Star } from './shapes/Star.ts'; +import { Text } from './shapes/Text.ts'; +import { TextPath } from './shapes/TextPath.ts'; +import { Transformer } from './shapes/Transformer.ts'; +import { Wedge } from './shapes/Wedge.ts'; // filters -import { Blur } from './filters/Blur'; -import { Brighten } from './filters/Brighten'; -import { Contrast } from './filters/Contrast'; -import { Emboss } from './filters/Emboss'; -import { Enhance } from './filters/Enhance'; -import { Grayscale } from './filters/Grayscale'; -import { HSL } from './filters/HSL'; -import { HSV } from './filters/HSV'; -import { Invert } from './filters/Invert'; -import { Kaleidoscope } from './filters/Kaleidoscope'; -import { Mask } from './filters/Mask'; -import { Noise } from './filters/Noise'; -import { Pixelate } from './filters/Pixelate'; -import { Posterize } from './filters/Posterize'; -import { RGB } from './filters/RGB'; -import { RGBA } from './filters/RGBA'; -import { Sepia } from './filters/Sepia'; -import { Solarize } from './filters/Solarize'; -import { Threshold } from './filters/Threshold'; +import { Blur } from './filters/Blur.ts'; +import { Brighten } from './filters/Brighten.ts'; +import { Contrast } from './filters/Contrast.ts'; +import { Emboss } from './filters/Emboss.ts'; +import { Enhance } from './filters/Enhance.ts'; +import { Grayscale } from './filters/Grayscale.ts'; +import { HSL } from './filters/HSL.ts'; +import { HSV } from './filters/HSV.ts'; +import { Invert } from './filters/Invert.ts'; +import { Kaleidoscope } from './filters/Kaleidoscope.ts'; +import { Mask } from './filters/Mask.ts'; +import { Noise } from './filters/Noise.ts'; +import { Pixelate } from './filters/Pixelate.ts'; +import { Posterize } from './filters/Posterize.ts'; +import { RGB } from './filters/RGB.ts'; +import { RGBA } from './filters/RGBA.ts'; +import { Sepia } from './filters/Sepia.ts'; +import { Solarize } from './filters/Solarize.ts'; +import { Threshold } from './filters/Threshold.ts'; export const Konva = Core.Util._assign(Core, { Arc, diff --git a/src/canvas-backend.ts b/src/canvas-backend.ts index f9f665c1..030e2574 100644 --- a/src/canvas-backend.ts +++ b/src/canvas-backend.ts @@ -1,8 +1,9 @@ -import { Konva } from './_CoreInternals'; +import { Konva } from './_CoreInternals.ts'; import * as Canvas from 'canvas'; const canvas = Canvas['default'] || Canvas; +// @ts-ignore global.DOMMatrix = canvas.DOMMatrix; Konva.Util['createCanvasElement'] = () => { diff --git a/src/filters/Blur.ts b/src/filters/Blur.ts index cbd9632c..0245511d 100644 --- a/src/filters/Blur.ts +++ b/src/filters/Blur.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Node, Filter } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Node, Filter } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; /* the Gauss filter master repo: https://github.com/pavelpower/kineticjsGaussFilter diff --git a/src/filters/Brighten.ts b/src/filters/Brighten.ts index d7d981b7..c790ce86 100644 --- a/src/filters/Brighten.ts +++ b/src/filters/Brighten.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Node, Filter } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Node, Filter } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; /** * Brighten Filter. diff --git a/src/filters/Contrast.ts b/src/filters/Contrast.ts index 80ec38b4..899bd382 100644 --- a/src/filters/Contrast.ts +++ b/src/filters/Contrast.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Node, Filter } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Node, Filter } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; /** * Contrast Filter. * @function diff --git a/src/filters/Emboss.ts b/src/filters/Emboss.ts index f457d1f4..4bf4af8b 100644 --- a/src/filters/Emboss.ts +++ b/src/filters/Emboss.ts @@ -1,7 +1,7 @@ -import { Factory } from '../Factory'; -import { Node, Filter } from '../Node'; -import { Util } from '../Util'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Node, Filter } from '../Node.ts'; +import { Util } from '../Util.ts'; +import { getNumberValidator } from '../Validators.ts'; /** * Emboss Filter. * Pixastic Lib - Emboss filter - v0.1.0 diff --git a/src/filters/Enhance.ts b/src/filters/Enhance.ts index 35c75be4..284c5b1d 100644 --- a/src/filters/Enhance.ts +++ b/src/filters/Enhance.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Node, Filter } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Node, Filter } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; function remap( fromValue: number, diff --git a/src/filters/Grayscale.ts b/src/filters/Grayscale.ts index 4457a95f..a478c7e9 100644 --- a/src/filters/Grayscale.ts +++ b/src/filters/Grayscale.ts @@ -1,4 +1,4 @@ -import { Filter } from '../Node'; +import { Filter } from '../Node.ts'; /** * Grayscale Filter diff --git a/src/filters/HSL.ts b/src/filters/HSL.ts index 47763ad2..b3f153f2 100644 --- a/src/filters/HSL.ts +++ b/src/filters/HSL.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Node, Filter } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Node, Filter } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; Factory.addGetterSetter( Node, diff --git a/src/filters/HSV.ts b/src/filters/HSV.ts index 5dc5a302..2557fa90 100644 --- a/src/filters/HSV.ts +++ b/src/filters/HSV.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Filter, Node } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Filter, Node } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; /** * HSV Filter. Adjusts the hue, saturation and value diff --git a/src/filters/Invert.ts b/src/filters/Invert.ts index 766c9506..5d3f5d30 100644 --- a/src/filters/Invert.ts +++ b/src/filters/Invert.ts @@ -1,4 +1,4 @@ -import { Filter } from '../Node'; +import { Filter } from '../Node.ts'; /** * Invert Filter * @function diff --git a/src/filters/Kaleidoscope.ts b/src/filters/Kaleidoscope.ts index 1a08ad8e..88e6e23b 100644 --- a/src/filters/Kaleidoscope.ts +++ b/src/filters/Kaleidoscope.ts @@ -1,7 +1,7 @@ -import { Factory } from '../Factory'; -import { Filter, Node } from '../Node'; -import { Util } from '../Util'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Filter, Node } from '../Node.ts'; +import { Util } from '../Util.ts'; +import { getNumberValidator } from '../Validators.ts'; /* * ToPolar Filter. Converts image data to polar coordinates. Performs diff --git a/src/filters/Mask.ts b/src/filters/Mask.ts index ede87ce7..c5e76938 100644 --- a/src/filters/Mask.ts +++ b/src/filters/Mask.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Filter, Node } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Filter, Node } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; function pixelAt(idata, x: number, y: number) { let idx = (y * idata.width + x) * 4; diff --git a/src/filters/Noise.ts b/src/filters/Noise.ts index 77a9d710..9bf7655d 100644 --- a/src/filters/Noise.ts +++ b/src/filters/Noise.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Filter, Node } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Filter, Node } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; /** * Noise Filter. Randomly adds or substracts to the color channels diff --git a/src/filters/Pixelate.ts b/src/filters/Pixelate.ts index 882def3e..8f76c752 100644 --- a/src/filters/Pixelate.ts +++ b/src/filters/Pixelate.ts @@ -1,7 +1,7 @@ -import { Factory } from '../Factory'; -import { Util } from '../Util'; -import { Node, Filter } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Util } from '../Util.ts'; +import { Node, Filter } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; /** * Pixelate Filter. Averages groups of pixels and redraws diff --git a/src/filters/Posterize.ts b/src/filters/Posterize.ts index 6fb89b91..33f82e4e 100644 --- a/src/filters/Posterize.ts +++ b/src/filters/Posterize.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Filter, Node } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Filter, Node } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; /** * Posterize Filter. Adjusts the channels so that there are no more diff --git a/src/filters/RGB.ts b/src/filters/RGB.ts index e5ea879c..1b1c0d7a 100644 --- a/src/filters/RGB.ts +++ b/src/filters/RGB.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Node, Filter } from '../Node'; -import { RGBComponent } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Node, Filter } from '../Node.ts'; +import { RGBComponent } from '../Validators.ts'; /** * RGB Filter diff --git a/src/filters/RGBA.ts b/src/filters/RGBA.ts index dcd140c0..ddca47b2 100644 --- a/src/filters/RGBA.ts +++ b/src/filters/RGBA.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Node, Filter } from '../Node'; -import { RGBComponent } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Node, Filter } from '../Node.ts'; +import { RGBComponent } from '../Validators.ts'; /** * RGBA Filter diff --git a/src/filters/Sepia.ts b/src/filters/Sepia.ts index 3719ffe3..d44ebc8d 100644 --- a/src/filters/Sepia.ts +++ b/src/filters/Sepia.ts @@ -1,4 +1,4 @@ -import { Filter } from '../Node'; +import { Filter } from '../Node.ts'; // based on https://stackoverflow.com/questions/1061093/how-is-a-sepia-tone-created diff --git a/src/filters/Solarize.ts b/src/filters/Solarize.ts index c576b6f7..274c5592 100644 --- a/src/filters/Solarize.ts +++ b/src/filters/Solarize.ts @@ -1,4 +1,4 @@ -import { Filter } from '../Node'; +import { Filter } from '../Node.ts'; /** * Solarize Filter * Pixastic Lib - Solarize filter - v0.1.0 diff --git a/src/filters/Threshold.ts b/src/filters/Threshold.ts index 1cdb8bb0..ad317f87 100644 --- a/src/filters/Threshold.ts +++ b/src/filters/Threshold.ts @@ -1,6 +1,6 @@ -import { Factory } from '../Factory'; -import { Node, Filter } from '../Node'; -import { getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { Node, Filter } from '../Node.ts'; +import { getNumberValidator } from '../Validators.ts'; /** * Threshold Filter. Pushes any value above the mid point to * the max and any value below the mid point to the min. diff --git a/src/index-node.ts b/src/index-node.ts index 31a28e6d..60beb218 100644 --- a/src/index-node.ts +++ b/src/index-node.ts @@ -1,9 +1,10 @@ // main entry for umd build for rollup -import { Konva } from './_FullInternals'; +import { Konva } from './_FullInternals.ts'; import * as Canvas from 'canvas'; const canvas = Canvas['default'] || Canvas; +// @ts-ignore global.DOMMatrix = canvas.DOMMatrix; const isNode = typeof global.document === 'undefined'; diff --git a/src/index-types.d.ts b/src/index-types.d.ts index 77ae5a1c..50ae40e7 100644 --- a/src/index-types.d.ts +++ b/src/index-types.d.ts @@ -7,25 +7,25 @@ // so here we just need to define full API of Konva manually // filters -import { Blur } from './filters/Blur'; -import { Brighten } from './filters/Brighten'; -import { Contrast } from './filters/Contrast'; -import { Emboss } from './filters/Emboss'; -import { Enhance } from './filters/Enhance'; -import { Grayscale } from './filters/Grayscale'; -import { HSL } from './filters/HSL'; -import { HSV } from './filters/HSV'; -import { Invert } from './filters/Invert'; -import { Kaleidoscope } from './filters/Kaleidoscope'; -import { Mask } from './filters/Mask'; -import { Noise } from './filters/Noise'; -import { Pixelate } from './filters/Pixelate'; -import { Posterize } from './filters/Posterize'; -import { RGB } from './filters/RGB'; -import { RGBA } from './filters/RGBA'; -import { Sepia } from './filters/Sepia'; -import { Solarize } from './filters/Solarize'; -import { Threshold } from './filters/Threshold'; +import { Blur } from './filters/Blur.ts'; +import { Brighten } from './filters/Brighten.ts'; +import { Contrast } from './filters/Contrast.ts'; +import { Emboss } from './filters/Emboss.ts'; +import { Enhance } from './filters/Enhance.ts'; +import { Grayscale } from './filters/Grayscale.ts'; +import { HSL } from './filters/HSL.ts'; +import { HSV } from './filters/HSV.ts'; +import { Invert } from './filters/Invert.ts'; +import { Kaleidoscope } from './filters/Kaleidoscope.ts'; +import { Mask } from './filters/Mask.ts'; +import { Noise } from './filters/Noise.ts'; +import { Pixelate } from './filters/Pixelate.ts'; +import { Posterize } from './filters/Posterize.ts'; +import { RGB } from './filters/RGB.ts'; +import { RGBA } from './filters/RGBA.ts'; +import { Sepia } from './filters/Sepia.ts'; +import { Solarize } from './filters/Solarize.ts'; +import { Threshold } from './filters/Threshold.ts'; declare namespace Konva { export let enableTrace: number; @@ -41,119 +41,121 @@ declare namespace Konva { export const isDragReady: () => boolean; export const getAngle: (angle: number) => number; - export type Vector2d = import('./types').Vector2d; + export type Vector2d = import('./types.ts').Vector2d; - export const Node: typeof import('./Node').Node; - export type Node = import('./Node').Node; - export type NodeConfig = import('./Node').NodeConfig; + export const Node: typeof import('./Node.ts').Node; + export type Node = import('./Node.ts').Node; + export type NodeConfig = import('./Node.ts').NodeConfig; export type KonvaEventObject = - import('./Node').KonvaEventObject; + import('./Node.ts').KonvaEventObject; - export type KonvaPointerEvent = import('./PointerEvents').KonvaPointerEvent; + export type KonvaPointerEvent = + import('./PointerEvents.ts').KonvaPointerEvent; export type KonvaEventListener = - import('./Node').KonvaEventListener; + import('./Node.ts').KonvaEventListener; - export const Container: typeof import('./Container').Container; - export type Container = import('./Container').Container; - export type ContainerConfig = import('./Container').ContainerConfig; + export const Container: typeof import('./Container.ts').Container; + export type Container = import('./Container.ts').Container; + export type ContainerConfig = import('./Container.ts').ContainerConfig; - export const Transform: typeof import('./Util').Transform; - export type Transform = import('./Util').Transform; + export const Transform: typeof import('./Util.ts').Transform; + export type Transform = import('./Util.ts').Transform; - export const Util: typeof import('./Util').Util; + export const Util: typeof import('./Util.ts').Util; - export const Context: typeof import('./Context').Context; - export type Context = import('./Context').Context; + export const Context: typeof import('./Context.ts').Context; + export type Context = import('./Context.ts').Context; - export const Stage: typeof import('./Stage').Stage; - export type Stage = import('./Stage').Stage; - export type StageConfig = import('./Stage').StageConfig; - export const stages: typeof import('./Stage').stages; + export const Stage: typeof import('./Stage.ts').Stage; + export type Stage = import('./Stage.ts').Stage; + export type StageConfig = import('./Stage.ts').StageConfig; + export const stages: typeof import('./Stage.ts').stages; - export const Layer: typeof import('./Layer').Layer; - export type Layer = import('./Layer').Layer; - export type LayerConfig = import('./Layer').LayerConfig; + export const Layer: typeof import('./Layer.ts').Layer; + export type Layer = import('./Layer.ts').Layer; + export type LayerConfig = import('./Layer.ts').LayerConfig; - export const FastLayer: typeof import('./FastLayer').FastLayer; - export type FastLayer = import('./FastLayer').FastLayer; + export const FastLayer: typeof import('./FastLayer.ts').FastLayer; + export type FastLayer = import('./FastLayer.ts').FastLayer; - export const Group: typeof import('./Group').Group; - export type Group = import('./Group').Group; - export type GroupConfig = import('./Group').GroupConfig; + export const Group: typeof import('./Group.ts').Group; + export type Group = import('./Group.ts').Group; + export type GroupConfig = import('./Group.ts').GroupConfig; - export const DD: typeof import('./DragAndDrop').DD; + export const DD: typeof import('./DragAndDrop.ts').DD; - export const Shape: typeof import('./Shape').Shape; - export type Shape = import('./Shape').Shape; - export type ShapeConfig = import('./Shape').ShapeConfig; - export const shapes: typeof import('./Shape').shapes; + export const Shape: typeof import('./Shape.ts').Shape; + export type Shape = import('./Shape.ts').Shape; + export type ShapeConfig = import('./Shape.ts').ShapeConfig; + export const shapes: typeof import('./Shape.ts').shapes; - export const Animation: typeof import('./Animation').Animation; - export type Animation = import('./Animation').Animation; + export const Animation: typeof import('./Animation.ts').Animation; + export type Animation = import('./Animation.ts').Animation; - export const Tween: typeof import('./Tween').Tween; - export type Tween = import('./Tween').Tween; - export type TweenConfig = import('./Tween').TweenConfig; - export const Easings: typeof import('./Tween').Easings; + export const Tween: typeof import('./Tween.ts').Tween; + export type Tween = import('./Tween.ts').Tween; + export type TweenConfig = import('./Tween.ts').TweenConfig; + export const Easings: typeof import('./Tween.ts').Easings; - export const Arc: typeof import('./shapes/Arc').Arc; - export type Arc = import('./shapes/Arc').Arc; - export type ArcConfig = import('./shapes/Arc').ArcConfig; - export const Arrow: typeof import('./shapes/Arrow').Arrow; - export type Arrow = import('./shapes/Arrow').Arrow; - export type ArrowConfig = import('./shapes/Arrow').ArrowConfig; - export const Circle: typeof import('./shapes/Circle').Circle; - export type Circle = import('./shapes/Circle').Circle; - export type CircleConfig = import('./shapes/Circle').CircleConfig; - export const Ellipse: typeof import('./shapes/Ellipse').Ellipse; - export type Ellipse = import('./shapes/Ellipse').Ellipse; - export type EllipseConfig = import('./shapes/Ellipse').EllipseConfig; - export const Image: typeof import('./shapes/Image').Image; - export type Image = import('./shapes/Image').Image; - export type ImageConfig = import('./shapes/Image').ImageConfig; - export const Label: typeof import('./shapes/Label').Label; - export type Label = import('./shapes/Label').Label; - export type LabelConfig = import('./shapes/Label').LabelConfig; - export const Tag: typeof import('./shapes/Label').Tag; - export type Tag = import('./shapes/Label').Tag; - export type TagConfig = import('./shapes/Label').TagConfig; - export const Line: typeof import('./shapes/Line').Line; - export type Line = import('./shapes/Line').Line; - export type LineConfig = import('./shapes/Line').LineConfig; - export const Path: typeof import('./shapes/Path').Path; - export type Path = import('./shapes/Path').Path; - export type PathConfig = import('./shapes/Path').PathConfig; - export const Rect: typeof import('./shapes/Rect').Rect; - export type Rect = import('./shapes/Rect').Rect; - export type RectConfig = import('./shapes/Rect').RectConfig; - export const RegularPolygon: typeof import('./shapes/RegularPolygon').RegularPolygon; - export type RegularPolygon = import('./shapes/RegularPolygon').RegularPolygon; + export const Arc: typeof import('./shapes/Arc.ts').Arc; + export type Arc = import('./shapes/Arc.ts').Arc; + export type ArcConfig = import('./shapes/Arc.ts').ArcConfig; + export const Arrow: typeof import('./shapes/Arrow.ts').Arrow; + export type Arrow = import('./shapes/Arrow.ts').Arrow; + export type ArrowConfig = import('./shapes/Arrow.ts').ArrowConfig; + export const Circle: typeof import('./shapes/Circle.ts').Circle; + export type Circle = import('./shapes/Circle.ts').Circle; + export type CircleConfig = import('./shapes/Circle.ts').CircleConfig; + export const Ellipse: typeof import('./shapes/Ellipse.ts').Ellipse; + export type Ellipse = import('./shapes/Ellipse.ts').Ellipse; + export type EllipseConfig = import('./shapes/Ellipse.ts').EllipseConfig; + export const Image: typeof import('./shapes/Image.ts').Image; + export type Image = import('./shapes/Image.ts').Image; + export type ImageConfig = import('./shapes/Image.ts').ImageConfig; + export const Label: typeof import('./shapes/Label.ts').Label; + export type Label = import('./shapes/Label.ts').Label; + export type LabelConfig = import('./shapes/Label.ts').LabelConfig; + export const Tag: typeof import('./shapes/Label.ts').Tag; + export type Tag = import('./shapes/Label.ts').Tag; + export type TagConfig = import('./shapes/Label.ts').TagConfig; + export const Line: typeof import('./shapes/Line.ts').Line; + export type Line = import('./shapes/Line.ts').Line; + export type LineConfig = import('./shapes/Line.ts').LineConfig; + export const Path: typeof import('./shapes/Path.ts').Path; + export type Path = import('./shapes/Path.ts').Path; + export type PathConfig = import('./shapes/Path.ts').PathConfig; + export const Rect: typeof import('./shapes/Rect.ts').Rect; + export type Rect = import('./shapes/Rect.ts').Rect; + export type RectConfig = import('./shapes/Rect.ts').RectConfig; + export const RegularPolygon: typeof import('./shapes/RegularPolygon.ts').RegularPolygon; + export type RegularPolygon = + import('./shapes/RegularPolygon.ts').RegularPolygon; export type RegularPolygonConfig = - import('./shapes/RegularPolygon').RegularPolygonConfig; - export const Ring: typeof import('./shapes/Ring').Ring; - export type Ring = import('./shapes/Ring').Ring; - export type RingConfig = import('./shapes/Ring').RingConfig; - export const Sprite: typeof import('./shapes/Sprite').Sprite; - export type Sprite = import('./shapes/Sprite').Sprite; - export type SpriteConfig = import('./shapes/Sprite').SpriteConfig; - export const Star: typeof import('./shapes/Star').Star; - export type Star = import('./shapes/Star').Star; - export type StarConfig = import('./shapes/Star').StarConfig; - export const Text: typeof import('./shapes/Text').Text; - export type Text = import('./shapes/Text').Text; - export type TextConfig = import('./shapes/Text').TextConfig; - export const TextPath: typeof import('./shapes/TextPath').TextPath; - export type TextPath = import('./shapes/TextPath').TextPath; - export type TextPathConfig = import('./shapes/TextPath').TextPathConfig; - export const Transformer: typeof import('./shapes/Transformer').Transformer; - export type Transformer = import('./shapes/Transformer').Transformer; + import('./shapes/RegularPolygon.ts').RegularPolygonConfig; + export const Ring: typeof import('./shapes/Ring.ts').Ring; + export type Ring = import('./shapes/Ring.ts').Ring; + export type RingConfig = import('./shapes/Ring.ts').RingConfig; + export const Sprite: typeof import('./shapes/Sprite.ts').Sprite; + export type Sprite = import('./shapes/Sprite.ts').Sprite; + export type SpriteConfig = import('./shapes/Sprite.ts').SpriteConfig; + export const Star: typeof import('./shapes/Star.ts').Star; + export type Star = import('./shapes/Star.ts').Star; + export type StarConfig = import('./shapes/Star.ts').StarConfig; + export const Text: typeof import('./shapes/Text.ts').Text; + export type Text = import('./shapes/Text.ts').Text; + export type TextConfig = import('./shapes/Text.ts').TextConfig; + export const TextPath: typeof import('./shapes/TextPath.ts').TextPath; + export type TextPath = import('./shapes/TextPath.ts').TextPath; + export type TextPathConfig = import('./shapes/TextPath.ts').TextPathConfig; + export const Transformer: typeof import('./shapes/Transformer.ts').Transformer; + export type Transformer = import('./shapes/Transformer.ts').Transformer; export type TransformerConfig = - import('./shapes/Transformer').TransformerConfig; - export const Wedge: typeof import('./shapes/Wedge').Wedge; - export type Wedge = import('./shapes/Wedge').Wedge; - export type WedgeConfig = import('./shapes/Wedge').WedgeConfig; + import('./shapes/Transformer.ts').TransformerConfig; + export const Wedge: typeof import('./shapes/Wedge.ts').Wedge; + export type Wedge = import('./shapes/Wedge.ts').Wedge; + export type WedgeConfig = import('./shapes/Wedge.ts').WedgeConfig; export const Filters: { Blur: typeof Blur; diff --git a/src/index.ts b/src/index.ts index 75ffb064..1bda54de 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,3 @@ -import { Konva } from './_FullInternals'; +import { Konva } from './_FullInternals.ts'; export default Konva; diff --git a/src/shapes/Arc.ts b/src/shapes/Arc.ts index f92162d5..b185b75f 100644 --- a/src/shapes/Arc.ts +++ b/src/shapes/Arc.ts @@ -1,10 +1,10 @@ -import { Factory } from '../Factory'; -import { Shape, ShapeConfig } from '../Shape'; -import { Konva } from '../Global'; -import { GetSet } from '../types'; -import { getNumberValidator, getBooleanValidator } from '../Validators'; -import { _registerNode } from '../Global'; -import { Context } from '../Context'; +import { Factory } from '../Factory.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { Konva } from '../Global.ts'; +import { GetSet } from '../types.ts'; +import { getNumberValidator, getBooleanValidator } from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; +import { Context } from '../Context.ts'; export interface ArcConfig extends ShapeConfig { angle: number; diff --git a/src/shapes/Arrow.ts b/src/shapes/Arrow.ts index 2503743f..d1316f06 100644 --- a/src/shapes/Arrow.ts +++ b/src/shapes/Arrow.ts @@ -1,10 +1,10 @@ -import { Factory } from '../Factory'; -import { Line, LineConfig } from './Line'; -import { GetSet } from '../types'; -import { getNumberValidator } from '../Validators'; -import { _registerNode } from '../Global'; -import { Path } from './Path'; -import { Context } from '../Context'; +import { Factory } from '../Factory.ts'; +import { Line, LineConfig } from './Line.ts'; +import { GetSet } from '../types.ts'; +import { getNumberValidator } from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; +import { Path } from './Path.ts'; +import { Context } from '../Context.ts'; export interface ArrowConfig extends LineConfig { points: number[]; diff --git a/src/shapes/Circle.ts b/src/shapes/Circle.ts index 67b47ec5..924bf280 100644 --- a/src/shapes/Circle.ts +++ b/src/shapes/Circle.ts @@ -1,9 +1,9 @@ -import { Factory } from '../Factory'; -import { Shape, ShapeConfig } from '../Shape'; -import { GetSet } from '../types'; -import { getNumberValidator } from '../Validators'; -import { _registerNode } from '../Global'; -import { Context } from '../Context'; +import { Factory } from '../Factory.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { GetSet } from '../types.ts'; +import { getNumberValidator } from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; +import { Context } from '../Context.ts'; export interface CircleConfig extends ShapeConfig { radius?: number; diff --git a/src/shapes/Ellipse.ts b/src/shapes/Ellipse.ts index 2c115ae6..69380811 100644 --- a/src/shapes/Ellipse.ts +++ b/src/shapes/Ellipse.ts @@ -1,10 +1,10 @@ -import { Factory } from '../Factory'; -import { Shape, ShapeConfig } from '../Shape'; -import { getNumberValidator } from '../Validators'; -import { _registerNode } from '../Global'; -import { Context } from '../Context'; +import { Factory } from '../Factory.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { getNumberValidator } from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; +import { Context } from '../Context.ts'; -import { GetSet, Vector2d } from '../types'; +import { GetSet, Vector2d } from '../types.ts'; export interface EllipseConfig extends ShapeConfig { radiusX: number; diff --git a/src/shapes/Image.ts b/src/shapes/Image.ts index b4ef1935..73be4ebb 100644 --- a/src/shapes/Image.ts +++ b/src/shapes/Image.ts @@ -1,14 +1,14 @@ -import { Util } from '../Util'; -import { Factory } from '../Factory'; -import { Shape, ShapeConfig } from '../Shape'; -import { _registerNode } from '../Global'; +import { Util } from '../Util.ts'; +import { Factory } from '../Factory.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { _registerNode } from '../Global.ts'; import { getNumberOrArrayOfNumbersValidator, getNumberValidator, -} from '../Validators'; +} from '../Validators.ts'; -import { GetSet, IRect } from '../types'; -import { Context } from '../Context'; +import { GetSet, IRect } from '../types.ts'; +import { Context } from '../Context.ts'; export interface ImageConfig extends ShapeConfig { image: CanvasImageSource | undefined; diff --git a/src/shapes/Label.ts b/src/shapes/Label.ts index be15df8c..8b043b1a 100644 --- a/src/shapes/Label.ts +++ b/src/shapes/Label.ts @@ -1,16 +1,16 @@ -import { Factory } from '../Factory'; -import { Shape, ShapeConfig } from '../Shape'; -import { Group } from '../Group'; -import { Context } from '../Context'; -import { ContainerConfig } from '../Container'; +import { Factory } from '../Factory.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { Group } from '../Group.ts'; +import { Context } from '../Context.ts'; +import { ContainerConfig } from '../Container.ts'; import { getNumberOrArrayOfNumbersValidator, getNumberValidator, -} from '../Validators'; -import { _registerNode } from '../Global'; +} from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; -import { GetSet } from '../types'; -import { Text } from './Text'; +import { GetSet } from '../types.ts'; +import { Text } from './Text.ts'; export interface LabelConfig extends ContainerConfig {} diff --git a/src/shapes/Line.ts b/src/shapes/Line.ts index 0ba7c15a..b49f6df6 100644 --- a/src/shapes/Line.ts +++ b/src/shapes/Line.ts @@ -1,10 +1,10 @@ -import { Factory } from '../Factory'; -import { _registerNode } from '../Global'; -import { Shape, ShapeConfig } from '../Shape'; -import { getNumberArrayValidator, getNumberValidator } from '../Validators'; +import { Factory } from '../Factory.ts'; +import { _registerNode } from '../Global.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { getNumberArrayValidator, getNumberValidator } from '../Validators.ts'; -import { Context } from '../Context'; -import { GetSet } from '../types'; +import { Context } from '../Context.ts'; +import { GetSet } from '../types.ts'; function getControlPoints( x0: number, diff --git a/src/shapes/Path.ts b/src/shapes/Path.ts index 3be973ba..aa749ab3 100644 --- a/src/shapes/Path.ts +++ b/src/shapes/Path.ts @@ -1,13 +1,13 @@ -import { Factory } from '../Factory'; -import { _registerNode } from '../Global'; -import { Shape, ShapeConfig } from '../Shape'; +import { Factory } from '../Factory.ts'; +import { _registerNode } from '../Global.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; import { getCubicArcLength, getQuadraticArcLength, t2length, -} from '../BezierFunctions'; -import { GetSet, PathSegment } from '../types'; +} from '../BezierFunctions.ts'; +import { GetSet, PathSegment } from '../types.ts'; export interface PathConfig extends ShapeConfig { data?: string; diff --git a/src/shapes/Rect.ts b/src/shapes/Rect.ts index ec8ad79d..d0ef3143 100644 --- a/src/shapes/Rect.ts +++ b/src/shapes/Rect.ts @@ -1,11 +1,11 @@ -import { Factory } from '../Factory'; -import { Shape, ShapeConfig } from '../Shape'; -import { _registerNode } from '../Global'; +import { Factory } from '../Factory.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { _registerNode } from '../Global.ts'; -import { Util } from '../Util'; -import { GetSet } from '../types'; -import { Context } from '../Context'; -import { getNumberOrArrayOfNumbersValidator } from '../Validators'; +import { Util } from '../Util.ts'; +import { GetSet } from '../types.ts'; +import { Context } from '../Context.ts'; +import { getNumberOrArrayOfNumbersValidator } from '../Validators.ts'; export interface RectConfig extends ShapeConfig { cornerRadius?: number | number[]; diff --git a/src/shapes/RegularPolygon.ts b/src/shapes/RegularPolygon.ts index 758921df..7bf9a888 100644 --- a/src/shapes/RegularPolygon.ts +++ b/src/shapes/RegularPolygon.ts @@ -1,13 +1,13 @@ -import { Factory } from '../Factory'; -import { Shape, ShapeConfig } from '../Shape'; -import { GetSet, Vector2d } from '../types'; +import { Factory } from '../Factory.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { GetSet, Vector2d } from '../types.ts'; import { getNumberOrArrayOfNumbersValidator, getNumberValidator, -} from '../Validators'; -import { _registerNode } from '../Global'; -import { Context } from '../Context'; -import { Util } from '../Util'; +} from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; +import { Context } from '../Context.ts'; +import { Util } from '../Util.ts'; export interface RegularPolygonConfig extends ShapeConfig { sides: number; diff --git a/src/shapes/Ring.ts b/src/shapes/Ring.ts index f22a4769..567f81c0 100644 --- a/src/shapes/Ring.ts +++ b/src/shapes/Ring.ts @@ -1,9 +1,9 @@ -import { Factory } from '../Factory'; -import { Shape, ShapeConfig } from '../Shape'; -import { GetSet } from '../types'; -import { getNumberValidator } from '../Validators'; -import { _registerNode } from '../Global'; -import { Context } from '../Context'; +import { Factory } from '../Factory.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { GetSet } from '../types.ts'; +import { getNumberValidator } from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; +import { Context } from '../Context.ts'; export interface RingConfig extends ShapeConfig { innerRadius: number; diff --git a/src/shapes/Sprite.ts b/src/shapes/Sprite.ts index a4ac4918..8265a561 100644 --- a/src/shapes/Sprite.ts +++ b/src/shapes/Sprite.ts @@ -1,11 +1,11 @@ -import { Factory } from '../Factory'; -import { Context } from '../Context'; -import { Shape, ShapeConfig } from '../Shape'; -import { Animation } from '../Animation'; -import { getNumberValidator } from '../Validators'; -import { _registerNode } from '../Global'; +import { Factory } from '../Factory.ts'; +import { Context } from '../Context.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { Animation } from '../Animation.ts'; +import { getNumberValidator } from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; -import { GetSet } from '../types'; +import { GetSet } from '../types.ts'; export interface SpriteConfig extends ShapeConfig { animation: string; diff --git a/src/shapes/Star.ts b/src/shapes/Star.ts index 8dee6d54..b0319604 100644 --- a/src/shapes/Star.ts +++ b/src/shapes/Star.ts @@ -1,10 +1,10 @@ -import { Factory } from '../Factory'; -import { Context } from '../Context'; -import { Shape, ShapeConfig } from '../Shape'; -import { getNumberValidator } from '../Validators'; -import { _registerNode } from '../Global'; +import { Factory } from '../Factory.ts'; +import { Context } from '../Context.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { getNumberValidator } from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; -import { GetSet } from '../types'; +import { GetSet } from '../types.ts'; export interface StarConfig extends ShapeConfig { numPoints: number; diff --git a/src/shapes/Text.ts b/src/shapes/Text.ts index cfdb107a..ab8f5949 100644 --- a/src/shapes/Text.ts +++ b/src/shapes/Text.ts @@ -1,17 +1,17 @@ -import { Util } from '../Util'; -import { Context } from '../Context'; -import { Factory } from '../Factory'; -import { Shape, ShapeConfig } from '../Shape'; -import { Konva } from '../Global'; +import { Util } from '../Util.ts'; +import { Context } from '../Context.ts'; +import { Factory } from '../Factory.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { Konva } from '../Global.ts'; import { getNumberValidator, getStringValidator, getNumberOrAutoValidator, getBooleanValidator, -} from '../Validators'; -import { _registerNode } from '../Global'; +} from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; -import { GetSet } from '../types'; +import { GetSet } from '../types.ts'; export interface CharRenderProps { char: string; diff --git a/src/shapes/TextPath.ts b/src/shapes/TextPath.ts index 1ae77462..39b65b27 100644 --- a/src/shapes/TextPath.ts +++ b/src/shapes/TextPath.ts @@ -1,13 +1,13 @@ -import { Util } from '../Util'; -import { Factory } from '../Factory'; -import { Context } from '../Context'; -import { Shape, ShapeConfig } from '../Shape'; -import { Path } from './Path'; -import { Text, stringToArray } from './Text'; -import { getNumberValidator } from '../Validators'; -import { _registerNode } from '../Global'; +import { Util } from '../Util.ts'; +import { Factory } from '../Factory.ts'; +import { Context } from '../Context.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { Path } from './Path.ts'; +import { Text, stringToArray } from './Text.ts'; +import { getNumberValidator } from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; -import { GetSet, PathSegment, Vector2d } from '../types'; +import { GetSet, PathSegment, Vector2d } from '../types.ts'; export interface TextPathConfig extends ShapeConfig { text?: string; diff --git a/src/shapes/Transformer.ts b/src/shapes/Transformer.ts index 65082e73..be99aeaf 100644 --- a/src/shapes/Transformer.ts +++ b/src/shapes/Transformer.ts @@ -1,15 +1,15 @@ -import { Util, Transform } from '../Util'; -import { Factory } from '../Factory'; -import { Node } from '../Node'; -import { Shape } from '../Shape'; -import { Rect } from './Rect'; -import { Group } from '../Group'; -import { ContainerConfig } from '../Container'; -import { Konva } from '../Global'; -import { getBooleanValidator, getNumberValidator } from '../Validators'; -import { _registerNode } from '../Global'; +import { Util, Transform } from '../Util.ts'; +import { Factory } from '../Factory.ts'; +import { Node } from '../Node.ts'; +import { Shape } from '../Shape.ts'; +import { Rect } from './Rect.ts'; +import { Group } from '../Group.ts'; +import { ContainerConfig } from '../Container.ts'; +import { Konva } from '../Global.ts'; +import { getBooleanValidator, getNumberValidator } from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; -import { GetSet, IRect, Vector2d } from '../types'; +import { GetSet, IRect, Vector2d } from '../types.ts'; export interface Box extends IRect { rotation: number; diff --git a/src/shapes/Wedge.ts b/src/shapes/Wedge.ts index 1a312961..fee22d90 100644 --- a/src/shapes/Wedge.ts +++ b/src/shapes/Wedge.ts @@ -1,11 +1,11 @@ -import { Factory } from '../Factory'; -import { Context } from '../Context'; -import { Shape, ShapeConfig } from '../Shape'; -import { Konva } from '../Global'; -import { getNumberValidator } from '../Validators'; -import { _registerNode } from '../Global'; +import { Factory } from '../Factory.ts'; +import { Context } from '../Context.ts'; +import { Shape, ShapeConfig } from '../Shape.ts'; +import { Konva } from '../Global.ts'; +import { getNumberValidator } from '../Validators.ts'; +import { _registerNode } from '../Global.ts'; -import { GetSet } from '../types'; +import { GetSet } from '../types.ts'; export interface WedgeConfig extends ShapeConfig { angle: number; diff --git a/src/skia-backend.ts b/src/skia-backend.ts index 6d1e0a86..294dfe73 100644 --- a/src/skia-backend.ts +++ b/src/skia-backend.ts @@ -1,4 +1,4 @@ -import { Konva } from './_CoreInternals'; +import { Konva } from './_CoreInternals.ts'; import { Canvas, DOMMatrix, Image } from 'skia-canvas'; global.DOMMatrix = DOMMatrix as any; diff --git a/test/manual/Blur-test.ts b/test/manual/Blur-test.ts index 9bafa8e3..7cf89691 100644 --- a/test/manual/Blur-test.ts +++ b/test/manual/Blur-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Blur', function () { // ====================================================== diff --git a/test/manual/Brighten-test.ts b/test/manual/Brighten-test.ts index 06112211..058499d4 100644 --- a/test/manual/Brighten-test.ts +++ b/test/manual/Brighten-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Brighten', function () { // ====================================================== diff --git a/test/manual/Contrast-test.ts b/test/manual/Contrast-test.ts index 0528af45..eb41816a 100644 --- a/test/manual/Contrast-test.ts +++ b/test/manual/Contrast-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Filter Contrast', function () { // ====================================================== diff --git a/test/manual/Emboss-test.ts b/test/manual/Emboss-test.ts index 841e44fe..f4c6b909 100644 --- a/test/manual/Emboss-test.ts +++ b/test/manual/Emboss-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Emboss', function () { // ====================================================== diff --git a/test/manual/Enhance-test.ts b/test/manual/Enhance-test.ts index 0f93f2b1..d6611665 100644 --- a/test/manual/Enhance-test.ts +++ b/test/manual/Enhance-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Enhance', function () { // ====================================================== diff --git a/test/manual/Filter-test.ts b/test/manual/Filter-test.ts index a12af132..da344152 100644 --- a/test/manual/Filter-test.ts +++ b/test/manual/Filter-test.ts @@ -1,4 +1,4 @@ -import { addStage, Konva, cloneAndCompareLayer } from '../unit/test-utils'; +import { addStage, Konva, cloneAndCompareLayer } from '../unit/test-utils.ts'; describe('Filter', function () { it('pixelRaio check', function () { diff --git a/test/manual/Grayscale-test.ts b/test/manual/Grayscale-test.ts index 0b04baa0..28c4b6b7 100644 --- a/test/manual/Grayscale-test.ts +++ b/test/manual/Grayscale-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Grayscale', function () { // ====================================================== diff --git a/test/manual/HSL-test.ts b/test/manual/HSL-test.ts index ea4fc340..4e6fb3dd 100644 --- a/test/manual/HSL-test.ts +++ b/test/manual/HSL-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('HSL', function () { // ====================================================== diff --git a/test/manual/HSV-test.ts b/test/manual/HSV-test.ts index 69526617..14bb117e 100644 --- a/test/manual/HSV-test.ts +++ b/test/manual/HSV-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('HSV', function () { // ====================================================== diff --git a/test/manual/Invert-test.ts b/test/manual/Invert-test.ts index 800cebf9..ffb7d2c6 100644 --- a/test/manual/Invert-test.ts +++ b/test/manual/Invert-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Invert', function () { // ====================================================== diff --git a/test/manual/Kaleidoscope-test.ts b/test/manual/Kaleidoscope-test.ts index ef400ac1..941e2b5e 100644 --- a/test/manual/Kaleidoscope-test.ts +++ b/test/manual/Kaleidoscope-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Kaleidoscope', function () { // ====================================================== diff --git a/test/manual/Manual-test.ts b/test/manual/Manual-test.ts index 32bf3294..62661ccb 100644 --- a/test/manual/Manual-test.ts +++ b/test/manual/Manual-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage, showHit } from '../unit/test-utils'; +import { addStage, Konva, loadImage, showHit } from '../unit/test-utils.ts'; describe('Manual', function () { // ====================================================== diff --git a/test/manual/Mask-test.ts b/test/manual/Mask-test.ts index 870c4f31..82a5c62a 100644 --- a/test/manual/Mask-test.ts +++ b/test/manual/Mask-test.ts @@ -1,4 +1,4 @@ -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Mask', function () { // ====================================================== diff --git a/test/manual/Noise-test.ts b/test/manual/Noise-test.ts index c910a640..9b6867ab 100644 --- a/test/manual/Noise-test.ts +++ b/test/manual/Noise-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Noise', function () { // ====================================================== diff --git a/test/manual/Pixelate-test.ts b/test/manual/Pixelate-test.ts index a8a9dc41..80f97b12 100644 --- a/test/manual/Pixelate-test.ts +++ b/test/manual/Pixelate-test.ts @@ -1,5 +1,5 @@ -import { addStage, Konva, loadImage } from '../unit/test-utils'; -import { cloneAndCompareLayer } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; +import { cloneAndCompareLayer } from '../unit/test-utils.ts'; describe('Pixelate', function () { // ====================================================== diff --git a/test/manual/Posterize-test.ts b/test/manual/Posterize-test.ts index e83f14d4..ca066df0 100644 --- a/test/manual/Posterize-test.ts +++ b/test/manual/Posterize-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Posterize', function () { // ====================================================== diff --git a/test/manual/RGB-test.ts b/test/manual/RGB-test.ts index 2fef7e74..64359d11 100644 --- a/test/manual/RGB-test.ts +++ b/test/manual/RGB-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('RGB', function () { // ====================================================== diff --git a/test/manual/RGBA-test.ts b/test/manual/RGBA-test.ts index 37c67133..a23f1565 100644 --- a/test/manual/RGBA-test.ts +++ b/test/manual/RGBA-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('RGBA', function () { // ====================================================== diff --git a/test/manual/Sepia-test.ts b/test/manual/Sepia-test.ts index e22a132a..2bd66bcb 100644 --- a/test/manual/Sepia-test.ts +++ b/test/manual/Sepia-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Filter Sepia', function () { // ====================================================== diff --git a/test/manual/Solarize-test.ts b/test/manual/Solarize-test.ts index a32faec0..ef53646e 100644 --- a/test/manual/Solarize-test.ts +++ b/test/manual/Solarize-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Solarize', function () { // ====================================================== diff --git a/test/manual/Threshold-test.ts b/test/manual/Threshold-test.ts index df1d0701..1daa067f 100644 --- a/test/manual/Threshold-test.ts +++ b/test/manual/Threshold-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from '../unit/test-utils'; +import { addStage, Konva, loadImage } from '../unit/test-utils.ts'; describe('Threshold', function () { // ====================================================== diff --git a/test/node-canvas-global-setup.mjs b/test/node-canvas-global-setup.mjs index 2a8f1163..3798899c 100644 --- a/test/node-canvas-global-setup.mjs +++ b/test/node-canvas-global-setup.mjs @@ -1,13 +1,5 @@ export async function mochaGlobalSetup() { - // Load node-canvas polyfills on the compiled test output - // Path from this file (test/) to compiled file (.test-temp/src/...) - try { - await import( - new URL('../.test-temp/src/canvas-backend.js', import.meta.url) - ); - } catch (e) { - // If not compiled yet or path missing, keep going; tests that need it will fail clearly - } + await import('../src/canvas-backend.ts'); globalThis.Path2D ??= class Path2D { constructor(path) { diff --git a/test/node-skia-global-setup.mjs b/test/node-skia-global-setup.mjs index dbbcb187..a53e2abe 100644 --- a/test/node-skia-global-setup.mjs +++ b/test/node-skia-global-setup.mjs @@ -1,5 +1,5 @@ export async function mochaGlobalSetup() { - await import(new URL('../.test-temp/src/skia-backend.js', import.meta.url)); + await import('../src/skia-backend.ts'); globalThis.Path2D ??= class Path2D { constructor(path) { diff --git a/test/package.json b/test/package.json deleted file mode 100644 index 5bbefffb..00000000 --- a/test/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "commonjs" -} diff --git a/test/unit/Animation-test.ts b/test/unit/Animation-test.ts index 856632e2..63f5c84f 100644 --- a/test/unit/Animation-test.ts +++ b/test/unit/Animation-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva } from './test-utils'; +import { addStage, Konva } from './test-utils.ts'; describe('Animation', function () { // ====================================================== diff --git a/test/unit/Arc-test.ts b/test/unit/Arc-test.ts index 6fe18537..7a5e79a0 100644 --- a/test/unit/Arc-test.ts +++ b/test/unit/Arc-test.ts @@ -6,7 +6,7 @@ import { createCanvas, compareLayerAndCanvas, assertAlmostDeepEqual, -} from './test-utils'; +} from './test-utils.ts'; describe('Arc', function () { // ====================================================== diff --git a/test/unit/Arrow-test.ts b/test/unit/Arrow-test.ts index c610db8e..df94a29f 100644 --- a/test/unit/Arrow-test.ts +++ b/test/unit/Arrow-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, cloneAndCompareLayer } from './test-utils'; +import { addStage, Konva, cloneAndCompareLayer } from './test-utils.ts'; describe('Arrow', function () { // ====================================================== diff --git a/test/unit/AutoDraw-test.ts b/test/unit/AutoDraw-test.ts index 42e24a4c..6ccc6747 100644 --- a/test/unit/AutoDraw-test.ts +++ b/test/unit/AutoDraw-test.ts @@ -1,5 +1,5 @@ import { assert } from 'chai'; -import { addStage, isNode, Konva } from './test-utils'; +import { addStage, isNode, Konva } from './test-utils.ts'; describe('AutoDraw', function () { // ====================================================== diff --git a/test/unit/Blob-test.ts b/test/unit/Blob-test.ts index aa4315af..a79af6ca 100644 --- a/test/unit/Blob-test.ts +++ b/test/unit/Blob-test.ts @@ -1,7 +1,7 @@ import { assert } from 'chai'; -import { Line } from '../../src/shapes/Line'; +import { Line } from '../../src/shapes/Line.ts'; -import { addStage, Konva, cloneAndCompareLayer } from './test-utils'; +import { addStage, Konva, cloneAndCompareLayer } from './test-utils.ts'; describe('Blob', function () { // ====================================================== diff --git a/test/unit/Canvas-test.ts b/test/unit/Canvas-test.ts index 05fa37f9..71a76429 100644 --- a/test/unit/Canvas-test.ts +++ b/test/unit/Canvas-test.ts @@ -1,5 +1,5 @@ import { assert } from 'chai'; -import { addStage, Konva } from './test-utils'; +import { addStage, Konva } from './test-utils.ts'; describe('Canvas', function () { // ====================================================== diff --git a/test/unit/Circle-test.ts b/test/unit/Circle-test.ts index 11c1c266..f7af384a 100644 --- a/test/unit/Circle-test.ts +++ b/test/unit/Circle-test.ts @@ -6,7 +6,7 @@ import { createCanvas, compareLayerAndCanvas, loadImage, -} from './test-utils'; +} from './test-utils.ts'; describe('Circle', function () { // ====================================================== diff --git a/test/unit/Container-test.ts b/test/unit/Container-test.ts index c25adbcc..399e882a 100644 --- a/test/unit/Container-test.ts +++ b/test/unit/Container-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; import { Shape } from '../../src/Shape.js'; -import { addStage, Konva, compareLayers, isNode } from './test-utils'; +import { addStage, Konva, compareLayers, isNode } from './test-utils.ts'; describe('Container', function () { // ====================================================== diff --git a/test/unit/Context-test.ts b/test/unit/Context-test.ts index 7cf6fc5d..2bf13ca7 100644 --- a/test/unit/Context-test.ts +++ b/test/unit/Context-test.ts @@ -1,5 +1,5 @@ import { assert } from 'chai'; -import { addStage, Konva } from './test-utils'; +import { addStage, Konva } from './test-utils.ts'; describe('Context', function () { // ====================================================== diff --git a/test/unit/DragAndDrop-test.ts b/test/unit/DragAndDrop-test.ts index c734fcec..a189b153 100644 --- a/test/unit/DragAndDrop-test.ts +++ b/test/unit/DragAndDrop-test.ts @@ -8,7 +8,7 @@ import { simulateTouchStart, simulateTouchEnd, simulateTouchMove, -} from './test-utils'; +} from './test-utils.ts'; describe('DragAndDrop', function () { // ====================================================== diff --git a/test/unit/DragAndDropEvents-test.ts b/test/unit/DragAndDropEvents-test.ts index 2eb0474d..2ddc882e 100644 --- a/test/unit/DragAndDropEvents-test.ts +++ b/test/unit/DragAndDropEvents-test.ts @@ -9,7 +9,7 @@ import { simulatePointerDown, simulatePointerMove, simulatePointerUp, -} from './test-utils'; +} from './test-utils.ts'; describe('DragAndDropEvents', function () { // ====================================================== diff --git a/test/unit/Ellipse-test.ts b/test/unit/Ellipse-test.ts index 2411dc50..8148c6dc 100644 --- a/test/unit/Ellipse-test.ts +++ b/test/unit/Ellipse-test.ts @@ -5,7 +5,7 @@ import { Konva, createCanvas, compareLayerAndCanvas, -} from './test-utils'; +} from './test-utils.ts'; describe('Ellipse', function () { // ====================================================== diff --git a/test/unit/Global-test.ts b/test/unit/Global-test.ts index 551542e4..2a713d55 100644 --- a/test/unit/Global-test.ts +++ b/test/unit/Global-test.ts @@ -1,5 +1,5 @@ import { assert } from 'chai'; -import { Konva } from './test-utils'; +import { Konva } from './test-utils.ts'; describe('Global', function () { // ====================================================== diff --git a/test/unit/Group-test.ts b/test/unit/Group-test.ts index 14c69ad8..18455f6f 100644 --- a/test/unit/Group-test.ts +++ b/test/unit/Group-test.ts @@ -1,4 +1,4 @@ -import { addStage, cloneAndCompareLayer, Konva } from './test-utils'; +import { addStage, cloneAndCompareLayer, Konva } from './test-utils.ts'; import { assert } from 'chai'; describe('Group', function () { diff --git a/test/unit/Image-test.ts b/test/unit/Image-test.ts index 834b048c..f2c7adcc 100644 --- a/test/unit/Image-test.ts +++ b/test/unit/Image-test.ts @@ -8,7 +8,7 @@ import { loadImage, isNode, isBrowser, -} from './test-utils'; +} from './test-utils.ts'; describe('Image', function () { // ====================================================== diff --git a/test/unit/Label-test.ts b/test/unit/Label-test.ts index 4645bf86..08a1da8f 100644 --- a/test/unit/Label-test.ts +++ b/test/unit/Label-test.ts @@ -1,6 +1,11 @@ import { assert } from 'chai'; -import { addStage, Konva, cloneAndCompareLayer, isBrowser } from './test-utils'; +import { + addStage, + Konva, + cloneAndCompareLayer, + isBrowser, +} from './test-utils.ts'; describe('Label', function () { // ====================================================== diff --git a/test/unit/Layer-test.ts b/test/unit/Layer-test.ts index bf9424ce..5dfb9bba 100644 --- a/test/unit/Layer-test.ts +++ b/test/unit/Layer-test.ts @@ -9,7 +9,7 @@ import { Konva, loadImage, isNode, -} from './test-utils'; +} from './test-utils.ts'; describe('Layer', function () { // ====================================================== diff --git a/test/unit/Line-test.ts b/test/unit/Line-test.ts index 2e510ddd..2dea75b6 100644 --- a/test/unit/Line-test.ts +++ b/test/unit/Line-test.ts @@ -6,7 +6,7 @@ import { createCanvas, compareLayerAndCanvas, compareLayers, -} from './test-utils'; +} from './test-utils.ts'; describe('Line', function () { // ====================================================== diff --git a/test/unit/MouseEvents-test.ts b/test/unit/MouseEvents-test.ts index cb369f3d..620821b7 100644 --- a/test/unit/MouseEvents-test.ts +++ b/test/unit/MouseEvents-test.ts @@ -9,7 +9,7 @@ import { simulateTouchStart, simulateTouchEnd, isNode, -} from './test-utils'; +} from './test-utils.ts'; describe('MouseEvents', function () { // ====================================================== diff --git a/test/unit/Node-cache-test.ts b/test/unit/Node-cache-test.ts index da9310d2..1eeeb33c 100644 --- a/test/unit/Node-cache-test.ts +++ b/test/unit/Node-cache-test.ts @@ -8,7 +8,7 @@ import { createCanvas, loadImage, getPixelRatio, -} from './test-utils'; +} from './test-utils.ts'; describe('Caching', function () { it('cache simple rectangle', function () { diff --git a/test/unit/Node-test.ts b/test/unit/Node-test.ts index 8e3359c4..53f6a633 100644 --- a/test/unit/Node-test.ts +++ b/test/unit/Node-test.ts @@ -1,5 +1,5 @@ import { assert } from 'chai'; -import { Shape } from '../../src/Shape'; +import { Shape } from '../../src/Shape.ts'; import { addStage, @@ -13,7 +13,7 @@ import { Konva, isBrowser, simulateMouseMove, -} from './test-utils'; +} from './test-utils.ts'; describe('Node', function () { // ====================================================== diff --git a/test/unit/Path-test.ts b/test/unit/Path-test.ts index 02608bd4..513627b7 100644 --- a/test/unit/Path-test.ts +++ b/test/unit/Path-test.ts @@ -1,7 +1,7 @@ import { assert } from 'chai'; -import worldMap from '../assets/worldMap'; -import tiger from '../assets/tiger'; +import worldMap from '../assets/worldMap.ts'; +import tiger from '../assets/tiger.ts'; import { addStage, @@ -12,7 +12,7 @@ import { isNode, assertAlmostDeepEqual, isBrowser, -} from './test-utils'; +} from './test-utils.ts'; describe('Path', function () { // ====================================================== diff --git a/test/unit/PointerEvents-test.ts b/test/unit/PointerEvents-test.ts index f2d36095..e54b2f0a 100644 --- a/test/unit/PointerEvents-test.ts +++ b/test/unit/PointerEvents-test.ts @@ -6,7 +6,7 @@ import { simulatePointerDown, simulatePointerMove, simulatePointerUp, -} from './test-utils'; +} from './test-utils.ts'; describe.skip('PointerEvents', function () { // ====================================================== diff --git a/test/unit/Polygon-test.ts b/test/unit/Polygon-test.ts index d1b6e576..020ca9b1 100644 --- a/test/unit/Polygon-test.ts +++ b/test/unit/Polygon-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva } from './test-utils'; +import { addStage, Konva } from './test-utils.ts'; describe('Polygon', function () { it('add polygon', function () { diff --git a/test/unit/Rect-test.ts b/test/unit/Rect-test.ts index 7dcb61d3..02e7f472 100644 --- a/test/unit/Rect-test.ts +++ b/test/unit/Rect-test.ts @@ -5,7 +5,7 @@ import { Konva, createCanvas, compareLayerAndCanvas, -} from './test-utils'; +} from './test-utils.ts'; describe('Rect', function () { // ====================================================== diff --git a/test/unit/RegularPolygon-test.ts b/test/unit/RegularPolygon-test.ts index 63b03481..17190077 100644 --- a/test/unit/RegularPolygon-test.ts +++ b/test/unit/RegularPolygon-test.ts @@ -7,7 +7,7 @@ import { assertAlmostEqual, createCanvas, compareLayerAndCanvas, -} from './test-utils'; +} from './test-utils.ts'; describe('RegularPolygon', function () { // ====================================================== diff --git a/test/unit/Ring-test.ts b/test/unit/Ring-test.ts index 7abe4f75..9a39094e 100644 --- a/test/unit/Ring-test.ts +++ b/test/unit/Ring-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, compareLayers } from './test-utils'; +import { addStage, Konva, compareLayers } from './test-utils.ts'; describe('Ring', function () { // ====================================================== diff --git a/test/unit/Shape-test.ts b/test/unit/Shape-test.ts index 8c3070dd..94a2719c 100644 --- a/test/unit/Shape-test.ts +++ b/test/unit/Shape-test.ts @@ -13,9 +13,9 @@ import { loadImage, Konva, compareCanvases, -} from './test-utils'; +} from './test-utils.ts'; -import { getOffsetY } from './Text-test'; +import { getOffsetY } from './Text-test.ts'; describe('Shape', function () { // ====================================================== diff --git a/test/unit/Spline-test.ts b/test/unit/Spline-test.ts index 8ec01420..9ea077ee 100644 --- a/test/unit/Spline-test.ts +++ b/test/unit/Spline-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva } from './test-utils'; +import { addStage, Konva } from './test-utils.ts'; describe('Spline', function () { // ====================================================== diff --git a/test/unit/Sprite-test.ts b/test/unit/Sprite-test.ts index 727220ba..222245ff 100644 --- a/test/unit/Sprite-test.ts +++ b/test/unit/Sprite-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, loadImage } from './test-utils'; +import { addStage, Konva, loadImage } from './test-utils.ts'; describe('Sprite', function () { // ====================================================== diff --git a/test/unit/Stage-test.ts b/test/unit/Stage-test.ts index ce9c8c0e..f890d90c 100644 --- a/test/unit/Stage-test.ts +++ b/test/unit/Stage-test.ts @@ -16,7 +16,7 @@ import { isNode, isBrowser, Konva, -} from './test-utils'; +} from './test-utils.ts'; describe('Stage', function () { // ====================================================== diff --git a/test/unit/Star-test.ts b/test/unit/Star-test.ts index 52cc3fd9..ff929970 100644 --- a/test/unit/Star-test.ts +++ b/test/unit/Star-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva, cloneAndCompareLayer } from './test-utils'; +import { addStage, Konva, cloneAndCompareLayer } from './test-utils.ts'; describe('Star', function () { // ====================================================== diff --git a/test/unit/Text-test.ts b/test/unit/Text-test.ts index 4e6a7b28..4a8103c5 100644 --- a/test/unit/Text-test.ts +++ b/test/unit/Text-test.ts @@ -9,7 +9,7 @@ import { loadImage, isBrowser, compareCanvases, -} from './test-utils'; +} from './test-utils.ts'; export function getOffsetY( context: CanvasRenderingContext2D, diff --git a/test/unit/TextPath-test.ts b/test/unit/TextPath-test.ts index f492c008..4381ec14 100644 --- a/test/unit/TextPath-test.ts +++ b/test/unit/TextPath-test.ts @@ -1,6 +1,11 @@ import { assert } from 'chai'; -import { addStage, Konva, cloneAndCompareLayer, isBrowser } from './test-utils'; +import { + addStage, + Konva, + cloneAndCompareLayer, + isBrowser, +} from './test-utils.ts'; describe('TextPath', function () { // ====================================================== diff --git a/test/unit/TouchEvents-test.ts b/test/unit/TouchEvents-test.ts index 5d8fa770..d32537dd 100644 --- a/test/unit/TouchEvents-test.ts +++ b/test/unit/TouchEvents-test.ts @@ -6,7 +6,7 @@ import { simulateTouchStart, simulateTouchEnd, simulateTouchMove, -} from './test-utils'; +} from './test-utils.ts'; describe('TouchEvents', function () { // ====================================================== diff --git a/test/unit/Transformer-test.ts b/test/unit/Transformer-test.ts index ee7abc19..3e3847c3 100644 --- a/test/unit/Transformer-test.ts +++ b/test/unit/Transformer-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { Transformer } from '../../src/shapes/Transformer'; -import type { Rect } from '../../src/shapes/Rect'; +import { Transformer } from '../../src/shapes/Transformer.ts'; +import type { Rect } from '../../src/shapes/Rect.ts'; import { addStage, @@ -10,7 +10,7 @@ import { simulateMouseMove as sm, simulateMouseUp as su, assertAlmostEqual, -} from './test-utils'; +} from './test-utils.ts'; function simulateMouseDown(tr, pos) { sd(tr.getStage(), pos); diff --git a/test/unit/Tween-test.ts b/test/unit/Tween-test.ts index dc076029..2b538d95 100644 --- a/test/unit/Tween-test.ts +++ b/test/unit/Tween-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva } from './test-utils'; +import { addStage, Konva } from './test-utils.ts'; describe('Tween', function () { // ====================================================== diff --git a/test/unit/Util-test.ts b/test/unit/Util-test.ts index be49bebc..9e1f7881 100644 --- a/test/unit/Util-test.ts +++ b/test/unit/Util-test.ts @@ -1,5 +1,5 @@ import { assert } from 'chai'; -import { Konva } from './test-utils'; +import { Konva } from './test-utils.ts'; describe('Util', function () { it('test _prepareToStringify', function () { diff --git a/test/unit/Wedge-test.ts b/test/unit/Wedge-test.ts index 0b0c231d..6856e834 100644 --- a/test/unit/Wedge-test.ts +++ b/test/unit/Wedge-test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai'; -import { addStage, Konva } from './test-utils'; +import { addStage, Konva } from './test-utils.ts'; describe('Wedge', function () { // ====================================================== diff --git a/test/unit/imagediff.ts b/test/unit/imagediff.ts index f0895ea9..a64213ac 100644 --- a/test/unit/imagediff.ts +++ b/test/unit/imagediff.ts @@ -1,4 +1,4 @@ -import KonvaModule from '../../src/index'; +import KonvaModule from '../../src/index.ts'; export const Konva = KonvaModule; var TYPE_ARRAY = /\[object Array\]/i, diff --git a/test/unit/test-utils.ts b/test/unit/test-utils.ts index 8b595463..7db90f68 100644 --- a/test/unit/test-utils.ts +++ b/test/unit/test-utils.ts @@ -1,5 +1,5 @@ import { assert } from 'chai'; -import KonvaModule from '../../src/index'; +import KonvaModule from '../../src/index.ts'; export const Konva = KonvaModule; @@ -8,9 +8,9 @@ export const Konva = KonvaModule; Konva.enableTrace = true; Konva.showWarnings = true; -import { imagediff } from './imagediff'; -import { Layer } from '../../src/Layer'; -import { Stage } from '../../src/Stage'; +import { imagediff } from './imagediff.ts'; +import { Layer } from '../../src/Layer.ts'; +import { Stage } from '../../src/Stage.ts'; // reset some data beforeEach(function () { diff --git a/tsconfig.json b/tsconfig.json index 732a0413..3e84e17d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,12 +1,17 @@ { "compilerOptions": { "outDir": "lib", - "module": "ESNext", "target": "ES2018", + "lib": ["ES2019", "dom"], + "module": "nodenext", + "noUncheckedSideEffectImports": true, + "rewriteRelativeImportExtensions": true, + "isolatedModules": true, + // ideally we want to enable erasableSyntaxOnly & verbatimModuleSyntax for true node interop + "erasableSyntaxOnly": false, + "verbatimModuleSyntax": false, // "sourceMap": true, "noEmitOnError": true, - "lib": ["ES2019", "dom"], - "moduleResolution": "node", "declaration": true, "removeComments": false, @@ -17,7 +22,11 @@ "skipLibCheck": true, // probably we would never enable this one // because it's too strict, konva generates many functions on the runtime - "strictPropertyInitialization": false + "strictPropertyInitialization": false, + // our initializer `field: GetSet` will cause `field` to + // be set to undefined if target>=ES2022, this also affects tools like `tsx` running locally + // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#the-usedefineforclassfields-flag-and-the-declare-property-modifier + "useDefineForClassFields": false }, - "include": ["./src/**/*.ts"] + "include": ["src"] } diff --git a/test/tsconfig.json b/tsconfig.test.json similarity index 51% rename from test/tsconfig.json rename to tsconfig.test.json index 5556fbdd..8c2f4d95 100644 --- a/test/tsconfig.json +++ b/tsconfig.test.json @@ -1,14 +1,10 @@ { + "extends": "./tsconfig.json", "compilerOptions": { - "target": "ES2015", - "noEmitOnError": false, - "moduleResolution": "node", - "lib": ["ES2015", "dom"], - "module": "ESNext", - "skipLibCheck": true, + "strict": false, "noImplicitAny": false, "allowJs": true, - "noEmit": false, + "noEmit": true, "checkJs": false, "allowUnreachableCode": true, "allowUnusedLabels": true, @@ -17,9 +13,7 @@ "noImplicitThis": false, "noPropertyAccessFromIndexSignature": false, "noUnusedLocals": false, - "noUnusedParameters": false, - "strict": false + "noUnusedParameters": false }, - "include": ["../src/**/*.ts", "./**/*.ts"], - "exclude": ["../node_modules/**/*"] + "include": ["src", "test"] } diff --git a/tsconfig.testing.json b/tsconfig.testing.json deleted file mode 100644 index 0177d39c..00000000 --- a/tsconfig.testing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "compilerOptions": { - "outDir": "lib", - "target": "ES2015", - "noEmitOnError": true, - "moduleResolution": "node", - "lib": ["ES2015", "dom"] - }, - "include": ["./src/**/*.ts"] -}