@u4/opencv4nodejs - npm Package Compare versions

Comparing version 6.0.4 to 6.0.5

install/compileLib.js

@@ -13,3 +13,2 @@ "use strict";
 const picocolors_1 = __importDefault(require("picocolors"));
-const mri_1 = __importDefault(require("mri"));
 const path_1 = __importDefault(require("path"));
@@ -24,5 +23,5 @@ const os_1 = require("os");
  */
-function getDefaultIncludeDirs() {
+function getDefaultIncludeDirs(env) {
     npmlog_1.default.info('install', 'OPENCV_INCLUDE_DIR is not set, looking for default include dir');
-    if ((0, opencv_build_1.isWin)()) {
+    if (env.isWin) {
         throw new Error('OPENCV_INCLUDE_DIR has to be defined on windows when auto build is disabled');
@@ -35,5 +34,5 @@ }
  */
-function getDefaultLibDir() {
+function getDefaultLibDir(env) {
     npmlog_1.default.info('install', 'OPENCV_LIB_DIR is not set, looking for default lib dir');
-    if ((0, opencv_build_1.isWin)()) {
+    if (env.isWin) {
         throw new Error('OPENCV_LIB_DIR has to be defined on windows when auto build is disabled');
@@ -48,3 +47,3 @@ }
     if (env.isAutoBuildDisabled) {
-        return (0, commons_1.resolvePath)(process.env.OPENCV_LIB_DIR) || getDefaultLibDir();
+        return (0, commons_1.resolvePath)(process.env.OPENCV_LIB_DIR) || getDefaultLibDir(env);
     }
@@ -59,4 +58,4 @@ else {
 }
-function getOPENCV4NODEJS_LIBRARIES(libDir, libsFoundInDir) {
-    const libs = (0, opencv_build_1.isWin)()
+function getOPENCV4NODEJS_LIBRARIES(env, libDir, libsFoundInDir) {
+    const libs = env.isWin
         ? libsFoundInDir.map(lib => (0, commons_1.resolvePath)(lib.libPath))
@@ -85,3 +84,3 @@ // dynamically link libs if not on windows
     const includes = env.isAutoBuildDisabled
-        ? (explicitIncludeDir ? [explicitIncludeDir] : getDefaultIncludeDirs())
+        ? (explicitIncludeDir ? [explicitIncludeDir] : getDefaultIncludeDirs(env))
         : [(0, commons_1.resolvePath)(env.opencvInclude), (0, commons_1.resolvePath)(env.opencv4Include)];
@@ -95,28 +94,14 @@ npmlog_1.default.info('install', '${EOL}setting the following includes:');
     let JOBS = 'max';
-    const parsed = (0, mri_1.default)(args);
-    if (parsed.help || parsed.h || !args.includes('build')) {
+    if (args.includes('--help') || args.includes('-h') || !args.includes('build')) {
         console.log('Usage: install [--version=<version>] [--dry-run] [--flags=<flags>] [--cuda] [--nocontrib] [--nobuild] build');
+        console.log((0, opencv_build_1.genHelp)());
         return;
     }
-    const options = {
-        autoBuildOpencvVersion: parsed.version,
-        autoBuildFlags: parsed.flags
-    };
-    if (parsed.cuda)
-        options.autoBuildBuildCuda = true;
-    if (parsed.nocontrib)
-        options.autoBuildWithoutContrib = true;
-    if (parsed.nobuild)
-        options.disableAutoBuild = true;
-    // https://github.com/justadudewhohacks/opencv4nodejs/issues/826
-    // https://github.com/justadudewhohacks/opencv4nodejs/pull/827
-    // https://github.com/justadudewhohacks/opencv4nodejs/pull/824
-    if (parsed.jobs)
-        JOBS = parsed.jobs;
-    if (parsed.j)
-        JOBS = parsed.j;
-    dryRun = parsed.dryrun || parsed['dry-run'];
-    // Version = '3.4.16'; // failed
-    // cc\xfeatures2d\siftdetector.h(9): error C2039: 'SIFT': is not a member of 'cv::xfeatures2d' [opencv4nodejs\build\opencv4nodejs.vcxproj]
-    // cc\xfeatures2d\siftdetector.h(9): error C3203: 'Ptr': unspecialized class template can't be used as a template argument for template parameter 'T', expected a real type [\opencv4nodejs\build\opencv4nodejs.vcxproj]
+    const options = (0, opencv_build_1.args2Option)(args);
+    dryRun = (args.includes('--dry-run') || args.includes('--dryrun'));
+    let njobs = args.indexOf('--jobs');
+    if (njobs === -1)
+        njobs = args.indexOf('-j');
+    if (njobs > 0)
+        JOBS = args[njobs + 1];
     for (const K in ['autoBuildFlags']) {
@@ -149,3 +134,3 @@ if (options[K])
     const OPENCV4NODEJS_INCLUDES = getOPENCV4NODEJS_INCLUDES(builder.env, libsFoundInDir).join(';');
-    const OPENCV4NODEJS_LIBRARIES = getOPENCV4NODEJS_LIBRARIES(libDir, libsFoundInDir).join(';');
+    const OPENCV4NODEJS_LIBRARIES = getOPENCV4NODEJS_LIBRARIES(builder.env, libDir, libsFoundInDir).join(';');
     process.env['OPENCV4NODEJS_DEFINES'] = OPENCV4NODEJS_DEFINES;
@@ -152,0 +137,0 @@ process.env['OPENCV4NODEJS_INCLUDES'] = OPENCV4NODEJS_INCLUDES;

install/compileLib.ts

@@ -1,2 +0,2 @@
-import { OpencvModule, OpenCVBuilder, OpenCVBuildEnv, isWin, OpenCVBuildEnvParams } from '@u4/opencv-build'
+import { OpencvModule, OpenCVBuilder, OpenCVBuildEnv, OpenCVBuildEnvParams, args2Option, genHelp } from '@u4/opencv-build'
 import child_process from 'child_process'
@@ -7,3 +7,2 @@ import fs from 'fs'
 import pc from 'picocolors'
-import mri from 'mri';
 import path from 'path'
@@ -20,5 +19,5 @@ import { EOL } from 'os'
  */
-function getDefaultIncludeDirs() {
+function getDefaultIncludeDirs(env: OpenCVBuildEnv) {
     log.info('install', 'OPENCV_INCLUDE_DIR is not set, looking for default include dir')
-    if (isWin()) {
+    if (env.isWin) {
         throw new Error('OPENCV_INCLUDE_DIR has to be defined on windows when auto build is disabled')
@@ -32,5 +31,5 @@ }
  */
-function getDefaultLibDir() {
+function getDefaultLibDir(env: OpenCVBuildEnv) {
     log.info('install', 'OPENCV_LIB_DIR is not set, looking for default lib dir')
-    if (isWin()) {
+    if (env.isWin) {
         throw new Error('OPENCV_LIB_DIR has to be defined on windows when auto build is disabled')
@@ -46,3 +45,3 @@ }
     if (env.isAutoBuildDisabled) {
-        return resolvePath(process.env.OPENCV_LIB_DIR) || getDefaultLibDir();
+        return resolvePath(process.env.OPENCV_LIB_DIR) || getDefaultLibDir(env);
     } else {
@@ -57,4 +56,4 @@ const dir = resolvePath(env.opencvLibDir);
 
-function getOPENCV4NODEJS_LIBRARIES(libDir: string, libsFoundInDir: OpencvModule[]): string[] {
-    const libs = isWin()
+function getOPENCV4NODEJS_LIBRARIES(env: OpenCVBuildEnv, libDir: string, libsFoundInDir: OpencvModule[]): string[] {
+    const libs = env.isWin
         ? libsFoundInDir.map(lib => resolvePath(lib.libPath))
@@ -85,3 +84,3 @@ // dynamically link libs if not on windows
     const includes = env.isAutoBuildDisabled
-        ? (explicitIncludeDir ? [explicitIncludeDir] : getDefaultIncludeDirs())
+        ? (explicitIncludeDir ? [explicitIncludeDir] : getDefaultIncludeDirs(env))
         : [resolvePath(env.opencvInclude), resolvePath(env.opencv4Include)]
@@ -96,26 +95,16 @@ log.info('install', '${EOL}setting the following includes:')
     let JOBS = 'max';
-    const parsed = mri(args);
 
-    if (parsed.help || parsed.h || !args.includes('build')) {
+    if (args.includes('--help') || args.includes('-h') || !args.includes('build')) {
         console.log('Usage: install [--version=<version>] [--dry-run] [--flags=<flags>] [--cuda] [--nocontrib] [--nobuild] build');
+        console.log(genHelp());
         return;
     }
-
-    const options: OpenCVBuildEnvParams = {
-        autoBuildOpencvVersion: parsed.version,
-        autoBuildFlags: parsed.flags
-    }
-    if (parsed.cuda) options.autoBuildBuildCuda = true;
-    if (parsed.nocontrib) options.autoBuildWithoutContrib = true;
-    if (parsed.nobuild) options.disableAutoBuild = true;
-    // https://github.com/justadudewhohacks/opencv4nodejs/issues/826
-    // https://github.com/justadudewhohacks/opencv4nodejs/pull/827
-    // https://github.com/justadudewhohacks/opencv4nodejs/pull/824
-    if (parsed.jobs) JOBS = parsed.jobs;
-    if (parsed.j) JOBS = parsed.j;
-    dryRun = parsed.dryrun || parsed['dry-run'];
-
-    // Version = '3.4.16'; // failed
-    // cc\xfeatures2d\siftdetector.h(9): error C2039: 'SIFT': is not a member of 'cv::xfeatures2d' [opencv4nodejs\build\opencv4nodejs.vcxproj]
-    // cc\xfeatures2d\siftdetector.h(9): error C3203: 'Ptr': unspecialized class template can't be used as a template argument for template parameter 'T', expected a real type [\opencv4nodejs\build\opencv4nodejs.vcxproj]
+    const options: OpenCVBuildEnvParams = args2Option(args)
+    dryRun = (args.includes('--dry-run') || args.includes('--dryrun'));
+    let njobs = args.indexOf('--jobs')
+    if (njobs === -1)
+        njobs = args.indexOf('-j')
+    if (njobs > 0)
+        JOBS = args[njobs + 1];
+    
     for (const K in ['autoBuildFlags']) {
@@ -147,3 +136,3 @@ if (options[K]) console.log(`using ${K}:`, options[K]);
     const OPENCV4NODEJS_INCLUDES = getOPENCV4NODEJS_INCLUDES(builder.env, libsFoundInDir).join(';');
-    const OPENCV4NODEJS_LIBRARIES = getOPENCV4NODEJS_LIBRARIES(libDir, libsFoundInDir).join(';');
+    const OPENCV4NODEJS_LIBRARIES = getOPENCV4NODEJS_LIBRARIES(builder.env, libDir, libsFoundInDir).join(';');
     process.env['OPENCV4NODEJS_DEFINES'] = OPENCV4NODEJS_DEFINES;
@@ -150,0 +139,0 @@ process.env['OPENCV4NODEJS_INCLUDES'] = OPENCV4NODEJS_INCLUDES;

package.json

 {
   "name": "@u4/opencv4nodejs",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "description": "Asynchronous OpenCV 3.x nodejs bindings with JavaScript and TypeScript API.",
@@ -53,4 +53,3 @@ "keywords": [
   "dependencies": {
-    "@u4/opencv-build": "^0.3.10",
-    "mri": "^1.2.0",
+    "@u4/opencv-build": "^0.4.0",
     "nan": "^2.15.0",
@@ -57,0 +56,0 @@ "native-node-utils": "^0.2.7",

No alert changes

Improved metrics

Dependency count

7

decreased by-12.5%

Worsened metrics

Total package byte prevSize

11353622

decreased by-0.01%

Lines of code

3042

decreased by-0.82%

Dependency changes

• + Added@u4/opencv-build@0.4.7(transitive)

• + Addedbrace-expansion@2.0.1(transitive)

• + Addedglob@8.1.0(transitive)

• + Addedminimatch@5.1.6(transitive)

• - Removedmri@^1.2.0

• - Removed@u4/opencv-build@0.3.11(transitive)

• - Removedmri@1.2.0(transitive)

• Updated@u4/opencv-build@^0.4.0