rebuild

.eslintrc.json

@@ -31,6 +31,7 @@
     "@typescript-eslint/no-var-requires": "off",
     "camelcase": "off",
     "class-methods-use-this": "off",
+    "default-param-last": "off",
     "dot-notation": "off",
     "func-names": "off",
     "guard-for-in": "off",

CHANGELOG.md

@@ -9,12 +9,15 @@
   
 ## Changelog
   
+### **1.5.8** 2021/11/30 mandic00@live.com
+
+
+### **origin/master** 2021/10/28 mandic00@live.com
+
+
 ### **1.5.7** 2021/10/28 mandic00@live.com
 
 
-### **origin/master** 2021/10/23 mandic00@live.com
-
-
 ### **1.5.6** 2021/10/22 mandic00@live.com
 
 

build.json

@@ -10,7 +10,7 @@
     "development": ["serve", "watch", "compile"]
   },
   "clean": {
-    "locations": ["dist/*", "types/*", "typedoc/*"]
+    "locations": ["dist/*", "types/src/*", "typedoc/*"]
   },
   "lint": {
     "locations": [ "src/**" ],

dist/face-api.esm-nobundle.js

@@ -426,12 +426,7 @@ var Box = class {
 // src/classes/BoundingBox.ts
 var BoundingBox = class extends Box {
   constructor(left, top, right, bottom, allowNegativeDimensions = false) {
-    super({
+    super({ left, top, right, bottom }, allowNegativeDimensions);
-      left,
-      top,
-      right,
-      bottom
-    }, allowNegativeDimensions);
   }
 };
 
@@ -580,12 +575,7 @@ function inverseSigmoid(x) {
 // src/classes/Rect.ts
 var Rect = class extends Box {
   constructor(x, y, width, height, allowNegativeDimensions = false) {
-    super({
+    super({ x, y, width, height }, allowNegativeDimensions);
-      x,
-      y,
-      width,
-      height
-    }, allowNegativeDimensions);
   }
 };
 
@@ -1104,7 +1094,7 @@ function isMediaLoaded(media) {
 function awaitMediaLoaded(media) {
   return new Promise((resolve, reject) => {
     if (media instanceof env.getEnv().Canvas || isMediaLoaded(media))
-      return resolve(null);
+      resolve(null);
     function onError(e) {
       if (!e.currentTarget)
         return;
@@ -2147,7 +2137,7 @@ function drawFaceLandmarks(canvasArg, faceLandmarks) {
 }
 
 // package.json
-var version10 = "1.5.7";
+var version10 = "1.5.8";
 
 // src/xception/extractParams.ts
 function extractorsFactory2(extractWeights, paramMappings) {

dist/face-api.esm.js

@@ -1368,7 +1368,7 @@ var require_long = __commonJS({
   }
 });
 var require_browser = __commonJS({
-  "(disabled):node_modules/.pnpm/node-fetch@2.6.5/node_modules/node-fetch/browser.js"() {
+  "(disabled):node_modules/.pnpm/node-fetch@2.6.6/node_modules/node-fetch/browser.js"() {
   }
 });
 var require_alea = __commonJS({
@@ -63738,12 +63738,7 @@ var Box = class {
 // src/classes/BoundingBox.ts
 var BoundingBox = class extends Box {
   constructor(left, top, right, bottom, allowNegativeDimensions = false) {
-    super({
+    super({ left, top, right, bottom }, allowNegativeDimensions);
-      left,
-      top,
-      right,
-      bottom
-    }, allowNegativeDimensions);
   }
 };
 
@@ -63892,12 +63887,7 @@ function inverseSigmoid(x) {
 // src/classes/Rect.ts
 var Rect = class extends Box {
   constructor(x, y, width, height, allowNegativeDimensions = false) {
-    super({
+    super({ x, y, width, height }, allowNegativeDimensions);
-      x,
-      y,
-      width,
-      height
-    }, allowNegativeDimensions);
   }
 };
 
@@ -64416,7 +64406,7 @@ function isMediaLoaded(media) {
 function awaitMediaLoaded(media) {
   return new Promise((resolve, reject) => {
     if (media instanceof env2.getEnv().Canvas || isMediaLoaded(media))
-      return resolve(null);
+      resolve(null);
     function onError(e) {
       if (!e.currentTarget)
         return;
@@ -65459,7 +65449,7 @@ function drawFaceLandmarks(canvasArg, faceLandmarks) {
 }
 
 // package.json
-var version6 = "1.5.7";
+var version6 = "1.5.8";
 
 // src/xception/extractParams.ts
 function extractorsFactory2(extractWeights, paramMappings) {

dist/face-api.node-gpu.js

@@ -550,12 +550,7 @@ var Box = class {
 // src/classes/BoundingBox.ts
 var BoundingBox = class extends Box {
   constructor(left, top, right, bottom, allowNegativeDimensions = false) {
-    super({
+    super({ left, top, right, bottom }, allowNegativeDimensions);
-      left,
-      top,
-      right,
-      bottom
-    }, allowNegativeDimensions);
   }
 };
 
@@ -706,12 +701,7 @@ function inverseSigmoid(x) {
 // src/classes/Rect.ts
 var Rect = class extends Box {
   constructor(x, y, width, height, allowNegativeDimensions = false) {
-    super({
+    super({ x, y, width, height }, allowNegativeDimensions);
-      x,
-      y,
-      width,
-      height
-    }, allowNegativeDimensions);
   }
 };
 
@@ -1233,7 +1223,7 @@ function isMediaLoaded(media) {
 function awaitMediaLoaded(media) {
   return new Promise((resolve, reject) => {
     if (media instanceof env.getEnv().Canvas || isMediaLoaded(media))
-      return resolve(null);
+      resolve(null);
     function onError(e) {
       if (!e.currentTarget)
         return;
@@ -2302,7 +2292,7 @@ function drawFaceLandmarks(canvasArg, faceLandmarks) {
 }
 
 // package.json
-var version = "1.5.7";
+var version = "1.5.8";
 
 // src/ageGenderNet/AgeGenderNet.ts
 var tf20 = __toModule(require_tfjs_esm());

dist/face-api.node.js

@@ -550,12 +550,7 @@ var Box = class {
 // src/classes/BoundingBox.ts
 var BoundingBox = class extends Box {
   constructor(left, top, right, bottom, allowNegativeDimensions = false) {
-    super({
+    super({ left, top, right, bottom }, allowNegativeDimensions);
-      left,
-      top,
-      right,
-      bottom
-    }, allowNegativeDimensions);
   }
 };
 
@@ -706,12 +701,7 @@ function inverseSigmoid(x) {
 // src/classes/Rect.ts
 var Rect = class extends Box {
   constructor(x, y, width, height, allowNegativeDimensions = false) {
-    super({
+    super({ x, y, width, height }, allowNegativeDimensions);
-      x,
-      y,
-      width,
-      height
-    }, allowNegativeDimensions);
   }
 };
 
@@ -1233,7 +1223,7 @@ function isMediaLoaded(media) {
 function awaitMediaLoaded(media) {
   return new Promise((resolve, reject) => {
     if (media instanceof env.getEnv().Canvas || isMediaLoaded(media))
-      return resolve(null);
+      resolve(null);
     function onError(e) {
       if (!e.currentTarget)
         return;
@@ -2302,7 +2292,7 @@ function drawFaceLandmarks(canvasArg, faceLandmarks) {
 }
 
 // package.json
-var version = "1.5.7";
+var version = "1.5.8";
 
 // src/ageGenderNet/AgeGenderNet.ts
 var tf20 = __toModule(require_tfjs_esm());

dist/tfjs.esm.js

@@ -863,9 +863,9 @@ var require_long = __commonJS({
   }
 });
 
-// (disabled):node_modules/.pnpm/node-fetch@2.6.5/node_modules/node-fetch/browser.js
+// (disabled):node_modules/.pnpm/node-fetch@2.6.6/node_modules/node-fetch/browser.js
 var require_browser = __commonJS({
-  "(disabled):node_modules/.pnpm/node-fetch@2.6.5/node_modules/node-fetch/browser.js"() {
+  "(disabled):node_modules/.pnpm/node-fetch@2.6.6/node_modules/node-fetch/browser.js"() {
   }
 });
 

package.json

@@ -66,7 +66,7 @@
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.1",
+    "eslint-plugin-promise": "^5.2.0",
     "node-fetch": "^3.1.0",
     "rimraf": "^3.0.2",
     "seedrandom": "^3.0.5",

src/classes/BoundingBox.ts

@@ -7,10 +7,8 @@ export interface IBoundingBox {
   bottom: number
 }
 
-export class BoundingBox extends Box<BoundingBox> implements IBoundingBox {
+export class BoundingBox extends Box implements IBoundingBox {
   constructor(left: number, top: number, right: number, bottom: number, allowNegativeDimensions = false) {
-    super({
+    super({ left, top, right, bottom }, allowNegativeDimensions);
-      left, top, right, bottom,
-    }, allowNegativeDimensions);
   }
 }

src/classes/LabeledBox.ts

@@ -3,10 +3,9 @@ import { IBoundingBox } from './BoundingBox';
 import { Box } from './Box';
 import { IRect } from './Rect';
 
-export class LabeledBox extends Box<LabeledBox> {
+export class LabeledBox extends Box {
   public static assertIsValidLabeledBox(box: any, callee: string) {
     Box.assertIsValidBox(box, callee);
-
     if (!isValidNumber(box.label)) {
       throw new Error(`${callee} - expected property label (${box.label}) to be a number`);
     }

src/classes/Rect.ts

@@ -7,10 +7,8 @@ export interface IRect {
   height: number
 }
 
-export class Rect extends Box<Rect> implements IRect {
+export class Rect extends Box implements IRect {
   constructor(x: number, y: number, width: number, height: number, allowNegativeDimensions = false) {
-    super({
+    super({ x, y, width, height }, allowNegativeDimensions);
-      x, y, width, height,
-    }, allowNegativeDimensions);
   }
 }

src/dom/awaitMediaLoaded.ts

@@ -4,7 +4,7 @@ import { isMediaLoaded } from './isMediaLoaded';
 export function awaitMediaLoaded(media: HTMLImageElement | HTMLVideoElement | HTMLCanvasElement) {
   // eslint-disable-next-line consistent-return
   return new Promise((resolve, reject) => {
-    if (media instanceof env.getEnv().Canvas || isMediaLoaded(media)) return resolve(null);
+    if (media instanceof env.getEnv().Canvas || isMediaLoaded(media)) resolve(null);
 
     function onError(e: Event) {
       if (!e.currentTarget) return;

src/draw/drawFaceExpressions.ts

@@ -7,12 +7,7 @@ import { DrawTextField } from './DrawTextField';
 
 export type DrawFaceExpressionsInput = FaceExpressions | WithFaceExpressions<{}>
 
-export function drawFaceExpressions(
+export function drawFaceExpressions(canvasArg: string | HTMLCanvasElement, faceExpressions: DrawFaceExpressionsInput | Array<DrawFaceExpressionsInput>, minConfidence = 0.1, textFieldAnchor?: IPoint) {
-  canvasArg: string | HTMLCanvasElement,
-  faceExpressions: DrawFaceExpressionsInput | Array<DrawFaceExpressionsInput>,
-  minConfidence = 0.1,
-  textFieldAnchor?: IPoint,
-) {
   const faceExpressionsArray = Array.isArray(faceExpressions) ? faceExpressions : [faceExpressions];
 
   faceExpressionsArray.forEach((e) => {

types/dist/tfjs.esm.d.ts

@@ -0,0 +1 @@
+export * from '@tensorflow/tfjs';

types/src/NeuralNetwork.d.ts

@@ -12,15 +12,15 @@ export declare abstract class NeuralNetwork<TNetParams> {
     reassignParamFromPath(paramPath: string, tensor: tf.Tensor): void;
     getParamList(): {
         path: string;
-        tensor: any;
+        tensor: tf.Tensor;
     }[];
     getTrainableParams(): {
         path: string;
-        tensor: any;
+        tensor: tf.Tensor;
     }[];
     getFrozenParams(): {
         path: string;
-        tensor: any;
+        tensor: tf.Tensor;
     }[];
     variable(): void;
     freeze(): void;

types/src/classes/BoundingBox.d.ts

@@ -5,6 +5,6 @@ export interface IBoundingBox {
     right: number;
     bottom: number;
 }
-export declare class BoundingBox extends Box<BoundingBox> implements IBoundingBox {
+export declare class BoundingBox extends Box implements IBoundingBox {
     constructor(left: number, top: number, right: number, bottom: number, allowNegativeDimensions?: boolean);
 }

types/src/classes/LabeledBox.d.ts

@@ -1,7 +1,7 @@
 import { IBoundingBox } from './BoundingBox';
 import { Box } from './Box';
 import { IRect } from './Rect';
-export declare class LabeledBox extends Box<LabeledBox> {
+export declare class LabeledBox extends Box {
     static assertIsValidLabeledBox(box: any, callee: string): void;
     private _label;
     constructor(box: IBoundingBox | IRect | any, label: number);

types/src/classes/Rect.d.ts

@@ -5,6 +5,6 @@ export interface IRect {
     width: number;
     height: number;
 }
-export declare class Rect extends Box<Rect> implements IRect {
+export declare class Rect extends Box implements IRect {
     constructor(x: number, y: number, width: number, height: number, allowNegativeDimensions?: boolean);
 }

types/src/faceExpressionNet/FaceExpressionNet.d.ts

@@ -3,12 +3,11 @@ import { NetInput, TNetInput } from '../dom/index';
 import { FaceFeatureExtractor } from '../faceFeatureExtractor/FaceFeatureExtractor';
 import { FaceFeatureExtractorParams } from '../faceFeatureExtractor/types';
 import { FaceProcessor } from '../faceProcessor/FaceProcessor';
-import { FaceExpressions } from './FaceExpressions';
 export declare class FaceExpressionNet extends FaceProcessor<FaceFeatureExtractorParams> {
     constructor(faceFeatureExtractor?: FaceFeatureExtractor);
     forwardInput(input: NetInput | tf.Tensor4D): tf.Tensor2D;
     forward(input: TNetInput): Promise<tf.Tensor2D>;
-    predictExpressions(input: TNetInput): Promise<FaceExpressions | FaceExpressions[]>;
+    predictExpressions(input: TNetInput): Promise<any>;
     protected getDefaultModelName(): string;
     protected getClassifierChannelsIn(): number;
     protected getClassifierChannelsOut(): number;

types/src/faceProcessor/util.d.ts

@@ -1,5 +1,5 @@
 import * as tf from '../../dist/tfjs.esm';
 export declare function seperateWeightMaps(weightMap: tf.NamedTensorMap): {
-    featureExtractorMap: any;
+    featureExtractorMap: tf.NamedTensorMap;
-    classifierMap: any;
+    classifierMap: tf.NamedTensorMap;
 };

types/src/faceRecognitionNet/convLayer.d.ts

@@ -1,5 +1,5 @@
 import * as tf from '../../dist/tfjs.esm';
 import { ConvLayerParams } from './types';
-export declare function conv(x: tf.Tensor4D, params: ConvLayerParams): any;
+export declare function conv(x: tf.Tensor4D, params: ConvLayerParams): tf.Tensor4D;
-export declare function convNoRelu(x: tf.Tensor4D, params: ConvLayerParams): any;
+export declare function convNoRelu(x: tf.Tensor4D, params: ConvLayerParams): tf.Tensor4D;
-export declare function convDown(x: tf.Tensor4D, params: ConvLayerParams): any;
+export declare function convDown(x: tf.Tensor4D, params: ConvLayerParams): tf.Tensor4D;