should be relasable.

UrielCh · Jan 1, 2023 · d65ad93 · d65ad93
1 parent 45e1d3f
commit d65ad93
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/install/compileLib.js b/install/compileLib.js
@@ -190,7 +190,7 @@ async function compileLib(args) {
     if (buildOptions.extra.jobs) {
         JOBS = buildOptions.extra.jobs;
     }
-    if (buildOptions.disableAutoBuild || env.OPENCV4NODEJS_DISABLE_AUTOBUILD || npmEnv.disableAutoBuild) {
+    if (buildOptions.disableAutoBuild || toBool(env.OPENCV4NODEJS_DISABLE_AUTOBUILD) || npmEnv.disableAutoBuild) {
         const summery = opencv_build_1.OpenCVBuildEnv.autoLocatePrebuild();
         log.info('envAutodetect', `autodetect ${pc.green('%d')} changes`, summery.changes);
         for (const txt of summery.summery) {

diff --git a/install/compileLib.ts b/install/compileLib.ts
@@ -200,7 +200,7 @@ export async function compileLib(args: string[]) {
         JOBS = buildOptions.extra.jobs;
     }
 
-    if (buildOptions.disableAutoBuild || env.OPENCV4NODEJS_DISABLE_AUTOBUILD || npmEnv.disableAutoBuild) {
+    if (buildOptions.disableAutoBuild || toBool(env.OPENCV4NODEJS_DISABLE_AUTOBUILD) || npmEnv.disableAutoBuild) {
         const summery = OpenCVBuildEnv.autoLocatePrebuild();
         log.info('envAutodetect', `autodetect ${pc.green('%d')} changes`, summery.changes)
         for (const txt of summery.summery) {

diff --git a/package.json b/package.json
@@ -46,15 +46,15 @@
     "install_4_6_0_cuda_30XX": "npm run build && cross-env OPENCV4NODEJS_DISABLE_AUTOBUILD= node bin/install.js --keepsource --version 4.6.0 --cuda --cudaArch=8.6",
     "test": "cd test && pnpm install && pnpm run test",
     "samples": "cd examples && pnpm install && npm run build && node ./src/templateMatch/multiMatchBench.js && node ./src/templateMatch/multiMatchColision.js && node ./src/applyColorMap.js && node ./src/asyncMatchFeatures.js && node ./src/faceDetect/asyncFaceDetection.js",
-    "do-build": "npm run build && node bin/install.js --version 4.5.5 --jobs MAX build",
-    "do-rebuild": "npm run build && node bin/install.js --version 4.5.5 --jobs MAX rebuild",
+    "do-build": "npm run build && node bin/install.js --version 4.6.0 --jobs MAX build",
+    "do-rebuild": "npm run build && node bin/install.js --version 4.6.0 --jobs MAX rebuild",
     "lint": "eslint examples/**/*.ts lib/**/*.ts typings/**/*.ts ",
     "clean": "node-gyp clean",
     "cleanjs": "rimraf {install,lib,examples}/**/*.{d.ts,js,map}",
     "build-debug": "npm run build && BINDINGS_DEBUG=true node bin/install.js rebuild"
   },
   "dependencies": {
-    "@u4/opencv-build": "0.6.1",
+    "@u4/opencv-build": "0.6.3",
     "@u4/tiny-glob": "^0.3.2",
     "nan": "^2.17.0",
     "native-node-utils": "^0.2.7",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/tests/index.test.ts b/test/tests/index.test.ts
@@ -30,7 +30,7 @@ const xmodules = [
 ];
 
 describe('cv', () => {
-  const toTest = {
+  const toTest: {[key: string]: boolean} = {
     core: true,
     imgproc: false, // to fix
     calib3d: true,

diff --git a/test/tests/io/ioTests.ts b/test/tests/io/ioTests.ts
@@ -81,6 +81,7 @@ export default function (args: TestContext) {
       const ext = '.png';
       const flags = [cv.IMWRITE_PNG_COMPRESSION];
       generateAPITests({
+        prefix: 'io imencode png',
         getDut: () => cv,
         methodName: 'imencode',
         getRequiredArgs: () => ([
@@ -102,6 +103,7 @@ export default function (args: TestContext) {
       const ext = '.jpg';
       const flags = [cv.IMWRITE_JPEG_QUALITY];
       generateAPITests({
+        prefix: 'io imencode jpg',
         getDut: () => cv,
         methodName: 'imencode',
         getRequiredArgs: () => ([

diff --git a/test/tests/model.ts b/test/tests/model.ts
@@ -8,6 +8,7 @@ import {
 export type OpenCV = typeof cv
 
 export interface APITestOpts {
+    prefix?: string,
     getDut?: () => any,
     methodName?: string,
     methodNameSpace?: string,

diff --git a/test/utils/generateAPITests.ts b/test/utils/generateAPITests.ts
@@ -48,6 +48,7 @@ export const generateAPITests = (opts: Partial<APITestOpts>): void => {
     getOptionalArgsMap().forEach(([k, v]: [string, any]) => { optionalArgsObject[k] = v; });
     return optionalArgsObject;
   };
+  const prefix = opts.prefix ? `${opts.prefix} ` : '';
   const hasRequiredArgs = !!opts.getRequiredArgs;
   const hasOptArgs = !!getOptionalArg || !!getOptionalArgsMap;
   const hasOptArgsObject = !!getOptionalArgsMap;
@@ -77,7 +78,7 @@ export const generateAPITests = (opts: Partial<APITestOpts>): void => {
     const isAsync = isCallbacked || isPromised;
 
     const method = isAsync ? methodNameAsync : methodName;
-    const capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
+    const capitalize = (str: string) => str.charAt(0).toUpperCase() + str.slice(1);
 
     const getErrPrefix = () => `${(methodNameSpace ? `${methodNameSpace}::` : '')}${capitalize(method)} - Error:`;
     const typeErrMsg = (argN) => `${getErrPrefix()} expected argument ${argN} to be of type`;
@@ -132,36 +133,36 @@ export const generateAPITests = (opts: Partial<APITestOpts>): void => {
       return done();
     };
 
-    it('should be callable with required args', (done: DoneError) => {
+    it(`${prefix}should be callable with required args`, (done: DoneError) => {
       const args = getRequiredArgs().slice();
       expectSuccess(args, done);
     });
 
     if (hasRequiredArgs) {
-      it('should throw if required arg invalid', (done: DoneError) => {
+      it(`${prefix}should throw if required arg invalid`, (done: DoneError) => {
         const args = [undefined];
         expectError(args, typeErrMsg(0), done);
       });
     }
 
     if (hasOptArgs) {
-      it('should be callable with optional args', (done: DoneError) => {
+      it(`${prefix}should be callable with optional args`, (done: DoneError) => {
         const args = getRequiredArgs().slice().concat(getOptionalArgs());
         expectSuccess(args, done);
       });
 
-      it('should throw if opt arg invalid', (done: DoneError) => {
+      it(`${prefix}should throw if opt arg invalid`, (done: DoneError) => {
         const args = getRequiredArgs().slice().concat(undefined);
         expectError(args, typeErrMsg(getRequiredArgs().length), done);
       });
 
       if (hasOptArgsObject) {
-        it('should be callable with optional args object', (done: DoneError) => {
+        it(`${prefix}should be callable with optional args object`, (done: DoneError) => {
           const args = getRequiredArgs().slice().concat(getOptionalArgsObject());
           expectSuccess(args, done);
         });
 
-        it('should throw if opt arg object prop invalid', (done: DoneError) => {
+        it(`${prefix}should throw if opt arg object prop invalid`, (done: DoneError) => {
           const prop = getOptionalArgsMap()[0][0];
           const args = getRequiredArgs().slice().concat({
             [prop]: undefined,
@@ -190,12 +191,12 @@ export const generateAPITests = (opts: Partial<APITestOpts>): void => {
   });
 
   if (hasAsync) {
-    describe('async', () => {
+    describe(`${prefix}async`, () => {
       if (hasRequiredArgs) {
         asyncFuncShouldRequireArgs(() => getDut()[methodNameAsync]());
       }
 
-      describe('callbacked', () => {
+      describe(`${prefix}callbacked`, () => {
         if (beforeHook) {
           beforeEach(() => beforeHook());
         }
@@ -208,7 +209,7 @@ export const generateAPITests = (opts: Partial<APITestOpts>): void => {
         otherAsyncCallbackedTests();
       });
 
-      describe('promisified', () => {
+      describe(`${prefix}promisified`, () => {
         if (beforeHook) {
           beforeEach(() => beforeHook());
         }