koffi 2.3.6-beta.6 → 2.3.7

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 ### Koffi 2.3
 
+#### Koffi 2.3.7
+
+**Main fixes:**
+
+- Fix missing require in index.js ([@gastonFrecceroNapse](https://github.com/gastonFrecceroNapse))
+- Reduce NPM package bloat (from 65 MB to 20 MB) caused by changes in 2.3.6
+
 #### Koffi 2.3.6
 
 **Main changes:**

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "koffi",
-    "version": "2.3.6-beta.6",
-    "stable": "2.3.5",
+    "version": "2.3.7",
+    "stable": "2.3.7",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/cnoke/cnoke.js

@@ -16,10 +16,9 @@
 'use strict';
 
 const fs = require('fs');
-const { Builder } = require('./src/index.js');
+const cnoke = require('./src/index.js');
 
 const VALID_COMMANDS = ['build', 'configure', 'clean'];
-const DEFAULT_MODE = 'RelWithDebInfo';
 
 main();
 
@@ -27,9 +26,6 @@ async function main() {
     let config = {};
     let command = 'build';
 
-    // Default options
-    config.mode = DEFAULT_MODE;
-
     // Parse options
     {
         let i = 2;
@@ -127,7 +123,7 @@ async function main() {
     }
 
     try {
-        let builder = new Builder(config);
+        let builder = new cnoke.Builder(config);
         await builder[command]();
     } catch (err) {
         console.error(err);
@@ -148,7 +144,7 @@ Options:
                                          (default: current working directory)
 
     -B, --config <CONFIG>                Change build type: RelWithDebInfo, Debug, Release
-                                         (default: ${DEFAULT_MODE})
+                                         (default: ${cnoke.DefaultOptions.mode})
     -D, --debug                          Shortcut for --config Debug
 
         --prebuild                       Use prebuilt binari if available

package/src/cnoke/src/builder.js

@@ -19,6 +19,10 @@ const path = require('path');
 const { spawnSync } = require('child_process');
 const tools = require('./tools.js');
 
+const DefaultOptions = {
+    mode: 'RelWithDebInfo'
+};
+
 function Builder(config = {}) {
     let self = this;
 
@@ -27,7 +31,7 @@ function Builder(config = {}) {
     let package_dir = null;
 
     if (app_dir == null)
-        app_dir = path.join(__dirname.replace(/\\/g, '/'), '..');
+        app_dir = __dirname.replace(/\\/g, '/') + '/..';
     if (project_dir == null)
         project_dir = process.cwd();
     app_dir = app_dir.replace(/\\/g, '/');
@@ -38,7 +42,7 @@ function Builder(config = {}) {
     let arch = config.arch;
     let toolset = config.toolset || null;
     let prefer_clang = config.prefer_clang || false;
-    let mode = config.mode;
+    let mode = config.mode || DefaultOptions.mode;
     let targets = config.targets || [];
     let verbose = config.verbose || false;
     let prebuild = config.prebuild || false;
@@ -49,8 +53,6 @@ function Builder(config = {}) {
         runtime_version = runtime_version.substr(1);
     if (arch == null)
         arch = tools.determine_arch();
-    if (mode == null)
-        throw new Error('Missing required mode setting');
 
     let cache_dir = get_cache_directory();
     let build_dir = config.build_dir;
@@ -63,7 +65,7 @@ function Builder(config = {}) {
             build_dir = expand_path(pkg.cnoke.output);
 
             if (!tools.path_is_absolute(build_dir))
-                build_dir = path.join(package_dir, build_dir);
+                build_dir = package_dir + '/' + build_dir;
         } else {
             build_dir = project_dir + '/build';
         }
@@ -447,5 +449,6 @@ function Builder(config = {}) {
 }
 
 module.exports = {
-    Builder
+    Builder,
+    DefaultOptions
 };

package/src/cnoke/src/index.js

@@ -11,10 +11,10 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program. If not, see https://www.gnu.org/licenses/.
 
-const { Builder } = require('./builder.js');
+const builder = require('./builder.js');
 const tools = require('./tools.js');
 
 module.exports = {
-    Builder,
+    ...builder,
     ...tools
 };

package/src/koffi/src/ffi.cc

@@ -2021,8 +2021,8 @@ static void SetExports(Napi::Env env, Func func)
 
     func("struct", Napi::Function::New(env, CreatePaddedStructType));
     func("pack", Napi::Function::New(env, CreatePackedStructType));
-    // func("union", Napi::Function::New(env, CreateUnionType));
-    // func("Union", Napi::Function::New(env, InstantiateUnion));
+    func("union", Napi::Function::New(env, CreateUnionType));
+    func("Union", Napi::Function::New(env, InstantiateUnion));
     func("opaque", Napi::Function::New(env, CreateOpaqueType));
     func("pointer", Napi::Function::New(env, CreatePointerType));
     func("array", Napi::Function::New(env, CreateArrayType));

package/src/koffi/src/index.d.ts

@@ -78,8 +78,8 @@ declare module 'koffi' {
     export function pack(name: string, def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
     export function pack(def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
 
-    // export function union(name: string, def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
-    // export function union(def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
+    export function union(name: string, def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
+    export function union(def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
 
     export function array(ref: TypeSpec, len: number, hint?: ArrayHint | null): IKoffiCType;
 

package/src/koffi/src/index.js

@@ -15,6 +15,7 @@
 
 const cnoke = require('../../cnoke/src/index.js');
 const util = require('util');
+const fs = require('fs');
 
 const pkg = (() => {
     try {

package/vendor/brotli/BUILD

@@ -1,144 +0,0 @@
-# Description:
-#   Brotli is a generic-purpose lossless compression algorithm.
-
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-licenses(["notice"])  # MIT
-
-exports_files(["LICENSE"])
-
-config_setting(
-    name = "darwin",
-    values = {"cpu": "darwin"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "darwin_x86_64",
-    values = {"cpu": "darwin_x86_64"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "windows",
-    values = {"cpu": "x64_windows"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "windows_msvc",
-    values = {"cpu": "x64_windows_msvc"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "windows_msys",
-    values = {"cpu": "x64_windows_msys"},
-    visibility = ["//visibility:public"],
-)
-
-load(":compiler_config_setting.bzl", "create_msvc_config")
-
-create_msvc_config()
-
-STRICT_C_OPTIONS = select({
-    ":msvc": [],
-    "//conditions:default": [
-        "--pedantic-errors",
-        "-Wall",
-        "-Wconversion",
-        "-Werror",
-        "-Wextra",
-        "-Wlong-long",
-        "-Wmissing-declarations",
-        "-Wmissing-prototypes",
-        "-Wno-strict-aliasing",
-        "-Wshadow",
-        "-Wsign-compare",
-    ],
-})
-
-filegroup(
-    name = "public_headers",
-    srcs = glob(["c/include/brotli/*.h"]),
-)
-
-filegroup(
-    name = "common_headers",
-    srcs = glob(["c/common/*.h"]),
-)
-
-filegroup(
-    name = "common_sources",
-    srcs = glob(["c/common/*.c"]),
-)
-
-filegroup(
-    name = "dec_headers",
-    srcs = glob(["c/dec/*.h"]),
-)
-
-filegroup(
-    name = "dec_sources",
-    srcs = glob(["c/dec/*.c"]),
-)
-
-filegroup(
-    name = "enc_headers",
-    srcs = glob(["c/enc/*.h"]),
-)
-
-filegroup(
-    name = "enc_sources",
-    srcs = glob(["c/enc/*.c"]),
-)
-
-cc_library(
-    name = "brotli_inc",
-    hdrs = [":public_headers"],
-    copts = STRICT_C_OPTIONS,
-    strip_include_prefix = "c/include",
-)
-
-cc_library(
-    name = "brotlicommon",
-    srcs = [":common_sources"],
-    hdrs = [":common_headers"],
-    copts = STRICT_C_OPTIONS,
-    deps = [":brotli_inc"],
-)
-
-cc_library(
-    name = "brotlidec",
-    srcs = [":dec_sources"],
-    hdrs = [":dec_headers"],
-    copts = STRICT_C_OPTIONS,
-    deps = [":brotlicommon"],
-)
-
-cc_library(
-    name = "brotlienc",
-    srcs = [":enc_sources"],
-    hdrs = [":enc_headers"],
-    copts = STRICT_C_OPTIONS,
-    linkopts = ["-lm"],
-    deps = [":brotlicommon"],
-)
-
-cc_binary(
-    name = "brotli",
-    srcs = ["c/tools/brotli.c"],
-    copts = STRICT_C_OPTIONS,
-    linkstatic = 1,
-    deps = [
-        ":brotlidec",
-        ":brotlienc",
-    ],
-)
-
-filegroup(
-    name = "dictionary",
-    srcs = ["c/common/dictionary.bin"],
-)