ata-validator 0.6.1 → 0.7.1

package/CMakeLists.txt

@@ -0,0 +1,132 @@
+cmake_minimum_required(VERSION 3.28)
+cmake_policy(SET CMP0091 NEW)
+cmake_policy(SET CMP0042 NEW)
+
+project(ata VERSION 0.1.0 LANGUAGES CXX)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS True)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+if(MSVC)
+  set(ABSL_MSVC_STATIC_RUNTIME ON)
+  set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>" CACHE STRING "" FORCE)
+  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
+
+option(ATA_TESTING "Build test suite" ON)
+option(ATA_BENCHMARKS "Build benchmarks" OFF)
+option(ATA_SANITIZE "Enable address sanitizer" OFF)
+
+# Fetch simdjson
+include(FetchContent)
+FetchContent_Declare(
+  simdjson
+  GIT_REPOSITORY https://github.com/simdjson/simdjson.git
+  GIT_TAG v3.12.2
+  GIT_SHALLOW TRUE
+)
+
+# RE2 — fast regex engine (replaces std::regex)
+set(RE2_BUILD_TESTING OFF CACHE BOOL "" FORCE)
+FetchContent_Declare(
+  re2
+  GIT_REPOSITORY https://github.com/google/re2.git
+  GIT_TAG 2024-07-02
+  GIT_SHALLOW TRUE
+  EXCLUDE_FROM_ALL
+)
+
+# Abseil — required by RE2
+set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "" FORCE)
+set(ABSL_BUILD_TESTING OFF CACHE BOOL "" FORCE)
+set(ABSL_ENABLE_INSTALL ON CACHE BOOL "" FORCE)
+FetchContent_Declare(
+  abseil-cpp
+  GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
+  GIT_TAG 20240722.0
+  GIT_SHALLOW TRUE
+)
+
+FetchContent_MakeAvailable(abseil-cpp simdjson re2)
+
+if (CMAKE_JS_VERSION)
+  # add_definitions(-DNAPI_VERSION=10)
+  include_directories(${CMAKE_JS_INC})
+  file(GLOB SOURCE_FILES "binding/*.cpp" "src/*.cpp" "deps/simdjson/*.cpp")
+else()
+  file(GLOB SOURCE_FILES "src/*.cpp")
+endif()
+
+
+if (CMAKE_JS_VERSION)
+  add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC})
+
+  # Include Node-API wrappers
+  execute_process(
+    COMMAND node -p "require('node-addon-api').include"
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE NODE_ADDON_API_DIR
+  )
+
+  string(REGEX REPLACE "[\r\n\"]" "" NODE_ADDON_API_DIR ${NODE_ADDON_API_DIR})
+  target_include_directories(${PROJECT_NAME} PRIVATE ${NODE_ADDON_API_DIR})
+
+  # Include Node-API C headers
+  execute_process(
+    COMMAND node -p "require('node-api-headers').include_dir"
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE NODE_API_HEADERS_DIR
+  )
+
+  string(REGEX REPLACE "[\r\n\"]" "" NODE_API_HEADERS_DIR ${NODE_API_HEADERS_DIR})
+  target_include_directories(${PROJECT_NAME} PRIVATE ${NODE_API_HEADERS_DIR})
+else()
+  add_library(${PROJECT_NAME} ${SOURCE_FILES})
+endif()
+
+target_include_directories(${PROJECT_NAME} PUBLIC include)
+target_link_libraries(${PROJECT_NAME} PRIVATE simdjson re2)
+
+if (CMAKE_JS_VERSION)
+  target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC})
+  target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB})
+  set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
+endif()
+
+add_library(ata::ata ALIAS ata)
+
+if(CMAKE_JS_VERSION AND UNIX AND NOT APPLE)
+  target_compile_options(${PROJECT_NAME} PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
+  target_link_options(${PROJECT_NAME} PRIVATE -Wl,--exclude-libs,ALL)
+endif()
+
+if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
+  # Generate node.lib
+  execute_process(COMMAND ${CMAKE_AR} /def:${CMAKE_JS_NODELIB_DEF} /out:${CMAKE_JS_NODELIB_TARGET} ${CMAKE_STATIC_LINKER_FLAGS})
+endif()
+
+if(ATA_SANITIZE)
+  target_compile_options(ata PRIVATE -fsanitize=address -fno-omit-frame-pointer)
+  target_link_options(ata PRIVATE -fsanitize=address)
+endif()
+
+# Tests
+if(ATA_TESTING)
+  enable_testing()
+  add_executable(ata_tests tests/test.cpp)
+  target_link_libraries(ata_tests PRIVATE ata simdjson)
+  if(ATA_SANITIZE)
+    target_compile_options(ata_tests PRIVATE -fsanitize=address -fno-omit-frame-pointer)
+    target_link_options(ata_tests PRIVATE -fsanitize=address)
+  endif()
+  add_test(NAME ata_tests COMMAND ata_tests)
+endif()
+
+# Benchmarks
+if(ATA_BENCHMARKS)
+  add_executable(ata_bench benchmark/bench.cpp)
+  target_link_libraries(ata_bench PRIVATE ata simdjson)
+endif()

package/compat.mjs

@@ -0,0 +1,3 @@
+import Ata from './compat.js';
+export { Ata };
+export default Ata;

package/index.browser.mjs

@@ -0,0 +1,4 @@
+// Browser ESM entry — same code, native addon stubbed out by bundler via "browser" field.
+import mod from './index.js';
+export const { Validator, validate, version, createPaddedBuffer, SIMDJSON_PADDING } = mod;
+export default mod;

package/index.js

@@ -1,7 +1,7 @@
 // Native addon: optional. Core validate() uses JS codegen and works without it.
 // Buffer APIs (isValid, countValid, isValidParallel) require native.
 let native;
-try { native = require("node-gyp-build")(__dirname); } catch {}
+try { native = require("pkg-prebuilds")(__dirname, require("./binding-options")); } catch {}
 const {
   compileToJS,
   compileToJSCodegen,
@@ -282,6 +282,7 @@ function parsePointerPath(path) {
 }
 
 function createPaddedBuffer(jsonStr) {
+  if (typeof Buffer === 'undefined') throw new Error('createPaddedBuffer requires Node.js Buffer');
   const jsonBuf = Buffer.from(jsonStr);
   const padded = Buffer.allocUnsafe(jsonBuf.length + SIMDJSON_PADDING);
   jsonBuf.copy(padded);
@@ -405,11 +406,12 @@ class Validator {
       : this._schemaStr;
     const cached = _compileCache.get(mapKey);
     let jsFn, jsCombinedFn, jsErrFn;
-    if (cached && !process.env.ATA_FORCE_NAPI) {
+    var _forceNapi = typeof process !== 'undefined' && process.env && process.env.ATA_FORCE_NAPI;
+    if (cached && !_forceNapi) {
       jsFn = cached.jsFn;
       jsCombinedFn = cached.combined;
       jsErrFn = cached.errFn;
-    } else if (!process.env.ATA_FORCE_NAPI) {
+    } else if (!_forceNapi) {
       jsFn = compileToJSCodegen(schemaObj, sm) || compileToJS(schemaObj, null, sm);
       jsCombinedFn = compileToJSCombined(schemaObj, VALID_RESULT, sm);
       jsErrFn = compileToJSCodegenWithErrors(schemaObj, sm);
@@ -686,7 +688,7 @@ class Validator {
 
   _ensureCodegen() {
     if (this._jsFn) return;
-    if (process.env.ATA_FORCE_NAPI) return;
+    if (typeof process !== 'undefined' && process.env && process.env.ATA_FORCE_NAPI) return;
     const sm = this._schemaMap.size > 0 ? this._schemaMap : null;
     const mapKey = this._schemaMap.size > 0
       ? this._schemaStr + '\0' + [...this._schemaMap.keys()].sort().join('\0')
@@ -902,7 +904,7 @@ function validate(schema, data) {
 
 function version() {
   if (native) return native.version();
-  return require("./package.json").version;
+  try { return require("./package.json").version; } catch { return "unknown"; }
 }
 
 // Bundle multiple validators into a single JS file for fast startup.

package/index.mjs

@@ -0,0 +1,3 @@
+import mod from './index.js';
+export const { Validator, validate, version, createPaddedBuffer, SIMDJSON_PADDING } = mod;
+export default mod;

package/lib/js-compiler.js

@@ -2331,13 +2331,16 @@ function genCodeC(schema, v, pathExpr, lines, ctx, schemaPrefix) {
     if (destructKeys.length > 0) lines.push(`const{${destructKeys.join(',')}}=${v}`)
     for (const key of schema.required) {
       const check = hoisted[key] ? `${hoisted[key]}===undefined` : `${v}[${JSON.stringify(key)}]===undefined`
-      // Pre-allocate required errors as frozen closure variables
-      const ei = ctx.varCounter++
-      const errVar = `_E${ei}`
-      const pathVal = pathExpr ? pathExpr.slice(1, -1) : ''
-      ctx.closureVars.push(errVar)
-      ctx.closureVals.push(Object.freeze({keyword: 'required', instancePath: pathVal, schemaPath: `${schemaPrefix}/required`, params: Object.freeze({missingProperty: key}), message: `must have required property '${key}'`}))
-      lines.push(`if(${check}){(_e||(_e=[])).push(${errVar})}`)
+      if (isStaticPath) {
+        const ei = ctx.varCounter++
+        const errVar = `_E${ei}`
+        const pathVal = pathExpr ? pathExpr.slice(1, -1) : ''
+        ctx.closureVars.push(errVar)
+        ctx.closureVals.push(Object.freeze({keyword: 'required', instancePath: pathVal, schemaPath: `${schemaPrefix}/required`, params: Object.freeze({missingProperty: key}), message: `must have required property '${key}'`}))
+        lines.push(`if(${check}){(_e||(_e=[])).push(${errVar})}`)
+      } else {
+        lines.push(`if(${check}){(_e||(_e=[])).push({keyword:'required',instancePath:${pathExpr||'""'},schemaPath:'${schemaPrefix}/required',params:{missingProperty:'${esc(key)}'},message:"must have required property '${esc(key)}'"})}`)
+      }
     }
   } else if (schema.required) {
     for (const key of schema.required) {

package/package.json

@@ -1,18 +1,41 @@
 {
   "name": "ata-validator",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "Ultra-fast JSON Schema validator. 4.7x faster validation, 1,800x faster compilation. Works without native addon. Cross-schema $ref, Draft 2020-12 + Draft 7, V8-optimized JS codegen, simdjson, RE2, multi-core. Standard Schema V1 compatible.",
   "main": "index.js",
+  "module": "index.mjs",
   "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "browser": {
+        "import": "./index.browser.mjs",
+        "require": "./index.js"
+      },
+      "import": "./index.mjs",
+      "require": "./index.js"
+    },
+    "./compat": {
+      "types": "./compat.d.ts",
+      "import": "./compat.mjs",
+      "require": "./compat.js"
+    }
+  },
+  "sideEffects": false,
+  "browser": {
+    "pkg-prebuilds": false
+  },
   "scripts": {
-    "install": "node-gyp-build",
-    "build": "node-gyp rebuild",
-    "prebuild": "prebuildify --napi --strip",
-    "prebuild-all": "prebuildify --napi --strip --arch x64 && prebuildify --napi --strip --arch arm64",
+    "install": "pkg-prebuilds-verify ./binding-options.js || cmake-js compile --target ata",
+    "build": "cmake-js build --target ata",
+    "rebuild": "cmake-js rebuild --target ata",
+    "prebuild": "pkg-prebuilds-copy --baseDir build/Release --source ata.node --name=ata --strip --napi_version=10",
+    "prebuild-all": "npm run prebuild -- --arch x64 && npm run prebuild -- --arch arm64",
     "test": "node test.js",
     "test:suite": "node tests/run_suite.js",
     "test:compat": "node tests/test_compat.js",
     "test:standard-schema": "node tests/test_standard_schema.js",
+    "test:browser": "node tests/test_browser.js",
     "bench": "node benchmark/bench_large.js",
     "fuzz": "node tests/fuzz_differential.js",
     "fuzz:long": "FUZZ_ITERATIONS=100000 node tests/fuzz_differential.js"
@@ -47,9 +70,12 @@
   },
   "files": [
     "index.js",
+    "index.mjs",
+    "index.browser.mjs",
     "index.d.ts",
     "lib/",
     "compat.js",
+    "compat.mjs",
     "compat.d.ts",
     "binding.gyp",
     "binding/",
@@ -57,21 +83,26 @@
     "src/",
     "deps/",
     "prebuilds/",
+    "/CMakeLists.txt",
     "README.md",
     "LICENSE"
   ],
   "dependencies": {
-    "node-addon-api": "^8.0.0",
-    "node-gyp-build": "^4.8.4"
+    "node-addon-api": "^8.7.0",
+    "node-api-headers": "^1.8.0",
+    "pkg-prebuilds": "^1.0.0"
   },
   "devDependencies": {
     "@sinclair/typebox": "^0.34.49",
+    "cmake-js": "^8.0.0",
     "mitata": "^1.0.34",
-    "node-gyp": "^11.0.0",
-    "prebuildify": "^6.0.1",
     "typebox": "^1.1.7",
     "valibot": "^1.3.1",
     "zod": "^4.3.6"
   },
-  "gypfile": true
+  "binary": {
+    "napi_versions": [
+      10
+    ]
+  }
 }

package/src/ata.cpp

@@ -19,6 +19,14 @@
 #include <unistd.h>
 #endif
 
+// MSVC implementation by Pavel P (https://gist.github.com/pps83/3210a2f980fd02bb2ba2e5a1fc4a2ef0)
+#if defined(_MSC_VER) && !defined(__clang__)
+#include <intrin.h>
+#ifndef __builtin_popcount
+#define __builtin_popcount __popcnt
+#endif
+#endif // defined(_MSC_VER) && !defined(__clang__)
+
 #include "simdjson.h"
 
 // --- Fast format validators (no std::regex) ---

package/binding.gyp

@@ -1,44 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "ata",
-      "sources": [
-        "binding/ata_napi.cpp",
-        "src/ata.cpp",
-        "deps/simdjson/simdjson.cpp"
-      ],
-      "include_dirs": [
-        "<!@(node -p \"require('node-addon-api').include\")",
-        "include",
-        "deps/simdjson",
-        "<!@(node -e \"var p=process.platform,a=process.arch;if(p==='darwin'){console.log(a==='arm64'?'/opt/homebrew/opt/re2/include':'/usr/local/opt/re2/include');console.log(a==='arm64'?'/opt/homebrew/opt/abseil/include':'/usr/local/opt/abseil/include');console.log(a==='arm64'?'/opt/homebrew/opt/mimalloc/include':'/usr/local/opt/mimalloc/include')}else{console.log('/usr/include')}\")"
-      ],
-      "libraries": [
-        "<!@(node -e \"var p=process.platform,a=process.arch;if(p==='darwin'){var pre=a==='arm64'?'/opt/homebrew/opt/re2':'/usr/local/opt/re2';var mi=a==='arm64'?'/opt/homebrew/opt/mimalloc':'/usr/local/opt/mimalloc';console.log('-L'+pre+'/lib -lre2 -L'+mi+'/lib -lmimalloc')}else{console.log('-lre2')}\")"
-      ],
-      "dependencies": [
-        "<!(node -p \"require('node-addon-api').gyp\")"
-      ],
-      "cflags!": ["-fno-exceptions"],
-      "cflags_cc!": ["-fno-exceptions"],
-      "cflags_cc": ["-std=c++20"],
-      "defines": ["NAPI_DISABLE_CPP_EXCEPTIONS", "NDEBUG"],
-      "conditions": [
-        ["OS=='mac'", {
-          "xcode_settings": {
-            "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-            "CLANG_CXX_LANGUAGE_STANDARD": "c++20",
-            "MACOSX_DEPLOYMENT_TARGET": "12.0"
-          }
-        }],
-        ["OS=='win'", {
-          "msvs_settings": {
-            "VCCLCompilerTool": {
-              "AdditionalOptions": ["/std:c++20", "/EHsc"]
-            }
-          }
-        }]
-      ]
-    }
-  ]
-}