misc: adjust code for linters

Author: zimond

.eslintignore

@@ -1 +1 @@
-wasm-node
+pkg

.github/workflows/CI.yaml

@@ -3,22 +3,22 @@ name: CI
 env:
   DEBUG: napi:*
   APP_NAME: font-toolkit
-  MACOSX_DEPLOYMENT_TARGET: '10.13'
+  MACOSX_DEPLOYMENT_TARGET: "10.13"
 
-'on':
+"on":
   push:
     branches:
       - main
     tags-ignore:
-      - '**'
+      - "**"
     # 忽略以下文件
     paths-ignore:
-      - '**/*.md'
-      - 'LICENSE'
-      - '**/*.gitignore'
-      - '.editorconfig'
-      - 'docs/**'
-      - 'example/*.png'
+      - "**/*.md"
+      - "LICENSE"
+      - "**/*.gitignore"
+      - ".editorconfig"
+      - "docs/**"
+      - "example/*.png"
 
   pull_request: null
 
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['12', '14', '16']
+        node: ["14", "16"]
     runs-on: ubuntu-latest
 
     steps:
@@ -54,7 +54,7 @@ jobs:
       - name: Install wasm-pack
         uses: jetli/[email protected]
         with:
-          version: 'latest'
+          version: "latest"
 
       - name: Install dependencies
         run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
@@ -69,5 +69,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: wasm32
-          path: wasm-node/*.wasm
-
+          path: pkg/**/*.wasm

__test__/wasm.spec.ts

@@ -1,32 +1,37 @@
-import { promises as fs } from 'fs'
-import { join } from 'path'
+import { promises as fs } from 'fs';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
 
-import test from 'ava'
+import test from 'ava';
 
-import { FontKit } from '../wasm-node'
+import ToolKit from '../pkg/node/index.js';
+
+const { FontKit } = ToolKit;
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // init wasm
-let fontData = null
+let fontData: Uint8Array | null = null;
 
 test.before(async () => {
-  fontData = await fs.readFile(join(__dirname, '../examples/OpenSans-Italic.ttf'))
-})
+  fontData = await fs.readFile(join(__dirname, '../examples/OpenSans-Italic.ttf'));
+});
 
 test('em box', (t) => {
-  const fontkit = new FontKit()
-  const key = fontkit.add_font_from_buffer(fontData)
-  const font = fontkit.query(key)
+  const fontkit = new FontKit();
+  const key = fontkit.add_font_from_buffer(fontData!);
+  const font = fontkit.query(key);
 
-  t.is(font.units_per_em, 2048)
-})
+  t.not(font, undefined);
+  t.is(font!.units_per_em, 2048);
+});
 
 test('glyph path to_string()', (t) => {
-  const fontkit = new FontKit()
-  const key = fontkit.add_font_from_buffer(fontData)
-  const font = fontkit.query(key)
+  const fontkit = new FontKit();
+  const key = fontkit.add_font_from_buffer(fontData!);
+  const font = fontkit.query(key);
 
   t.is(
-    font.glyph_path('A').to_string(),
+    font!.glyph_path('A')!.to_string(),
     'M 813 2324 L 317 2324 L 72 2789 L -117 2789 L 682 1327 L 856 1327 L 1040 2789 L 870 2789 L 813 2324 z M 795 2168 L 760 1869 Q 736 1690 731 1519 Q 694 1607 650.5 1694 Q 607 1781 401 2168 L 795 2168 z',
-  )
-})
+  );
+});

node.mjs renamed to node.js

@@ -6,6 +6,8 @@ import { fileURLToPath } from 'url';
 import walkdir from 'walkdir';
 import { WASI } from 'wasi';
 
+export * from 'pkg/node/index';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 const WASM_PATH = resolve(__dirname, 'pkg/wasi/fontkit.wasm');

package.json

@@ -9,44 +9,47 @@
   },
   "files": [
     "pkg",
-    "node.mjs"
+    "node.mjs",
+    "Readme.md"
   ],
   "author": "Zimon Dai <[email protected]>",
   "license": "MIT",
   "types": "./pkg/bundler/index.d.ts",
   "scripts": {
-    "prepack": "cargo build --target wasm32-unknown-unknown --release && wasm-bindgen --target bundler --out-dir pkg/bundler --out-name index ./target/wasm32-unknown-unknown/release/fontkit.wasm",
-    "build": "wasm-pack build --target bundler --out-name index --out-dir pkg/bundler --release",
+    "prepack": "cargo build --target wasm32-unknown-unknown --release && wasm-bindgen --target nodejs --out-dir pkg/node --out-name index ./target/wasm32-unknown-unknown/release/fontkit.wasm",
+    "build": "wasm-pack build --target nodejs --out-name index --out-dir pkg/node --release && wasm-pack build --target nodejs --out-name index --out-dir pkg/node --release && rm -rf pkg/node/package.json && rm -rf pkg/bundler/package.json",
     "build:wasi": "cargo build --release --target wasm32-wasi && mkdir -p pkg/wasi && cp target/wasm32-wasi/release/fontkit.wasm pkg/wasi/",
     "test": "ava",
     "format:rs": "cargo fmt",
     "format:source": "prettier --config ./package.json --write './**/*.{js,ts,mjs}'",
     "format:yaml": "prettier --parser yaml --write './**/*.{yml,yaml}'",
-    "lint": "eslint . -c ./.eslintrc.yml './**/*.{ts,tsx,js}'",
-    "lint:fix": "eslint . -c ./.eslintrc.yml './**/*.{ts,tsx,js}' --fix"
+    "lint": "eslint -c ./.eslintrc.yml './**/*.{ts,tsx,js}'",
+    "lint:fix": "eslint -c ./.eslintrc.yml './**/*.{ts,tsx,js}' --fix"
   },
   "repository": {
     "type": "git",
     "url": "[email protected]:alibaba/font-toolkit.git"
   },
   "devDependencies": {
-    "@swc-node/register": "^1.4.2",
+    "@types/node": "^17.0.41",
     "@typescript-eslint/eslint-plugin": "^5.15.0",
     "@typescript-eslint/parser": "^5.15.0",
-    "ava": "^3.15.0",
+    "ava": "^4.3.0",
     "eslint": "^8.11.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-sonarjs": "^0.12.0",
-    "prettier": "^2.6.0"
+    "prettier": "^2.6.0",
+    "ts-node": "^10.8.1",
+    "typescript": "^4.7.3"
   },
   "ava": {
-    "require": [
-      "@swc-node/register"
-    ],
-    "extensions": [
-      "ts"
+    "extensions": {
+      "ts": "module"
+    },
+    "nodeArguments": [
+      "--loader=ts-node/esm"
     ],
     "timeout": "2m",
     "environmentVariables": {
@@ -65,4 +68,4 @@
   "dependencies": {
     "walkdir": "^0.4.1"
   }
-}
+}

src/ras.rs

@@ -6,8 +6,6 @@ use pathfinder_content::stroke::{LineCap, LineJoin, OutlineStrokeToFill, StrokeS
 use pathfinder_geometry::vector::Vector2F;
 use ttf_parser::{OutlineBuilder, Rect};
 use usvg::PathData;
-#[cfg(wasm)]
-use wasm_bindgen::prelude::*;
 
 impl Font {
     /// Output the outline instructions of a glyph

src/wasm.rs

@@ -2,7 +2,6 @@ use crate::*;
 use pathfinder_content::outline::Outline;
 use pathfinder_geometry::transform2d::Transform2F;
 use pathfinder_geometry::vector::Vector2F;
-use wasm_bindgen::prelude::*;
 
 /// Interface for querying data in a Font
 #[wasm_bindgen(js_name = "Font")]

tsconfig.json

@@ -3,12 +3,16 @@
     "target": "ES2018",
     "strict": true,
     "moduleResolution": "node",
-    "module": "CommonJS",
+    "module": "ES2020",
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
   },
-  "include": ["."],
-  "exclude": ["node_modules"]
-}
+  "include": [
+    "."
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}