.github/workflows/ci.yml

@@ -9,40 +9,52 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        arch:
+          - x64
+          - x86
         node:
-          - 10
           - 12
           - 14
+          - 16
         os:
-          - macOS-latest
-          - ubuntu-16.04
+          - macos-11
+          - ubuntu-18.04
           - windows-latest
+        exclude:
+          - arch: x86
+            os: macos-11
+          - arch: x86
+            os: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
+          architecture: ${{ matrix.arch }}
       - run: npm install
       - run: npm test
       - run: npm run prebuild
-        if: matrix.node == 14 && startsWith(github.ref, 'refs/tags/')
-      - run: npm run prebuild-ia32
         if:
-          matrix.node == 14 && matrix.os == 'windows-latest' &&
-          startsWith(github.ref, 'refs/tags/')
+          matrix.node == 14 && matrix.os != 'macos-11' && startsWith(github.ref,
+          'refs/tags/')
+      - run: npm run prebuild-darwin-x64+arm64
+        if:
+          matrix.node == 14 && matrix.os == 'macos-11' && startsWith(github.ref,
+          'refs/tags/')
       - run: npm run prebuild-linux-arm
         if:
-          matrix.node == 14 && matrix.os == 'ubuntu-16.04' &&
+          matrix.node == 14 && matrix.os == 'ubuntu-18.04' &&
           startsWith(github.ref, 'refs/tags/')
       - uses: actions/upload-artifact@v2
         if: matrix.node == 14 && startsWith(github.ref, 'refs/tags/')
         with:
           name: ${{ matrix.os }}
           path: prebuilds
+          retention-days: 1
   release:
     if: startsWith(github.ref, 'refs/tags/')
     needs: test
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
@@ -51,17 +63,17 @@ jobs:
       - run: echo ::set-output name=version::$(git describe --tags)
         id: get_version
       - run:
-          tar -cvf "${{ steps.get_version.outputs.version }}-darwin-x64.tar" -C
-          "prebuilds/macOS-latest" .
+          tar -cvf "${{ steps.get_version.outputs.version
+          }}-darwin-x64+arm64.tar" -C "prebuilds/macos-11" .
       - run:
           tar -cvf "${{ steps.get_version.outputs.version }}-linux-arm.tar" -C
-          "prebuilds/ubuntu-16.04" linux-arm
+          "prebuilds/ubuntu-18.04" linux-arm
       - run:
           tar -cvf "${{ steps.get_version.outputs.version }}-linux-arm64.tar" -C
-          "prebuilds/ubuntu-16.04" linux-arm64
+          "prebuilds/ubuntu-18.04" linux-arm64
       - run:
           tar -cvf "${{ steps.get_version.outputs.version }}-linux-x64.tar" -C
-          "prebuilds/ubuntu-16.04" linux-x64
+          "prebuilds/ubuntu-18.04" linux-x64
       - run:
           tar -cvf "${{ steps.get_version.outputs.version }}-win32-ia32.tar" -C
           "prebuilds/windows-latest" win32-ia32

LICENSE

@@ -1,5 +1,3 @@
-The MIT License (MIT)
-
 Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com> (http://2x.io)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

README.md

@@ -1,8 +1,7 @@
 # utf-8-validate
 
 [![Version npm](https://img.shields.io/npm/v/utf-8-validate.svg)](https://www.npmjs.com/package/utf-8-validate)
-[![Build Status](https://img.shields.io/github/workflow/status/websockets/utf-8-validate/CI/master?label=build)](https://github.com/websockets/utf-8-validate/actions?query=workflow%3ACI+branch%3Amaster)
-[![Windows x86 Build](https://ci.appveyor.com/api/projects/status/github/websockets/utf-8-validate?branch=master&svg=true)](https://ci.appveyor.com/project/lpinca/utf-8-validate)
+[![Linux/macOS/Windows Build](https://img.shields.io/github/workflow/status/websockets/utf-8-validate/CI/master?label=build)](https://github.com/websockets/utf-8-validate/actions?query=workflow%3ACI+branch%3Amaster)
 
 Check if a buffer contains valid UTF-8 encoded text.
 

appveyor.yml

@@ -2,9 +2,9 @@ build: off
 configuration: Release
 environment:
   matrix:
+    - nodejs_version: "16"
     - nodejs_version: "14"
     - nodejs_version: "12"
-    - nodejs_version: "10"
 platform:
   - x86
 matrix:

binding.gyp

@@ -3,7 +3,12 @@
     {
       'target_name': 'validation',
       'sources': ['src/validation.c'],
-      'cflags': ['-std=c99']
+      'cflags': ['-std=c99'],
+      'xcode_settings': {
+        'MACOSX_DEPLOYMENT_TARGET': '10.7',
+        'OTHER_CFLAGS': ['-arch x86_64', '-arch arm64'],
+        'OTHER_LDFLAGS': ['-arch x86_64', '-arch arm64']
+      }
     }
   ]
 }

package.json

@@ -1,12 +1,15 @@
 {
   "name": "utf-8-validate",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "Check if a buffer contains valid UTF-8",
   "main": "index.js",
+  "engines": {
+    "node": ">=6.14.2"
+  },
   "scripts": {
     "install": "node-gyp-build",
     "prebuild": "prebuildify --napi --strip",
-    "prebuild-ia32": "prebuildify --arch=ia32 --napi --strip",
+    "prebuild-darwin-x64+arm64": "prebuildify --arch x64+arm64 --napi --strip",
     "prebuild-linux-arm": "prebuildify-cross -i linux-armv6 -i linux-armv7 -i linux-arm64 --napi --strip",
     "test": "mocha"
   },
@@ -27,7 +30,7 @@
     "node-gyp-build": "^4.2.0"
   },
   "devDependencies": {
-    "mocha": "^8.0.1",
+    "mocha": "^9.0.3",
     "node-gyp": "^7.1.2",
     "prebuildify": "^4.0.0",
     "prebuildify-cross": "^4.0.0"

src/validation.c

@@ -55,9 +55,9 @@ napi_value IsValidUTF8(napi_env env, napi_callback_info info) {
         (buf[i] & 0xfe) == 0xc0  // overlong
       ) {
         break;
-      } else {
-        i += 2;
       }
+
+      i += 2;
     } else if ((buf[i] & 0xf0) == 0xe0) {  // 1110xxxx 10xxxxxx 10xxxxxx
       if (
         i + 2 >= len ||
@@ -67,9 +67,9 @@ napi_value IsValidUTF8(napi_env env, napi_callback_info info) {
         (buf[i] == 0xed && (buf[i + 1] & 0xe0) == 0xa0)  // surrogate (U+D800 - U+DFFF)
       ) {
         break;
-      } else {
-        i += 3;
       }
+
+      i += 3;
     } else if ((buf[i] & 0xf8) == 0xf0) {  // 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
       if (
         i + 3 >= len ||
@@ -80,9 +80,9 @@ napi_value IsValidUTF8(napi_env env, napi_callback_info info) {
         (buf[i] == 0xf4 && buf[i + 1] > 0x8f) || buf[i] > 0xf4  // > U+10FFFF
       ) {
         break;
-      } else {
-        i += 4;
       }
+
+      i += 4;
     } else {
       break;
     }