addons-scanner-utils 8.1.0 → 8.3.0

package/dist/functions.d.ts

@@ -3,20 +3,20 @@
 import fs from 'fs';
 import { Request, RequestHandler } from 'express';
 import fetch from 'node-fetch';
-declare type ApiError = Error & {
+type ApiError = Error & {
     extraInfo?: string;
     status?: number;
 };
-declare type CreateApiErrorParams = {
+type CreateApiErrorParams = {
     message: string;
     extraInfo?: string;
     status?: number;
 };
 export declare const createApiError: ({ message, extraInfo, status, }: CreateApiErrorParams) => ApiError;
-export declare type RequestWithFiles = Request & {
+export type RequestWithFiles = Request & {
     xpiFilepath?: string;
 };
-export declare type FunctionConfig = {
+export type FunctionConfig = {
     _console?: typeof console;
     _fetch?: typeof fetch;
     _process?: typeof process;

package/dist/io/base.d.ts

@@ -2,9 +2,9 @@
 /// <reference types="node" />
 import { Readable } from 'stream';
 import { Stderr } from '../stdio';
-declare type ScanFileFunction = (_path: string, isDirectory: boolean) => boolean;
-declare type Files = Record<string, unknown>;
-export declare type IOBaseConstructorParams = {
+type ScanFileFunction = (_path: string, isDirectory: boolean) => boolean;
+type Files = Record<string, unknown>;
+export type IOBaseConstructorParams = {
     filePath: string;
     stderr: Stderr;
 };

package/dist/io/crx.d.ts

@@ -5,7 +5,7 @@ import yauzl, { ZipFile } from 'yauzl';
 import { IOBaseConstructorParams } from './base';
 import { Xpi } from './xpi';
 export declare function defaultParseCRX(buf: Buffer): Buffer;
-declare type CrxConstructorParams = IOBaseConstructorParams & {
+type CrxConstructorParams = IOBaseConstructorParams & {
     fs?: typeof defaultFs;
     parseCRX?: typeof defaultParseCRX;
     zipLib?: typeof yauzl;

package/dist/io/directory.d.ts

@@ -3,12 +3,12 @@
 import { Readable } from 'stream';
 import { IOBase, IOBaseConstructorParams } from './base';
 import { walkPromise } from './utils';
-declare type Files = {
+type Files = {
     [filename: string]: {
         size: number;
     };
 };
-declare type DirectoryConstructorParams = IOBaseConstructorParams;
+type DirectoryConstructorParams = IOBaseConstructorParams;
 export declare class Directory extends IOBase {
     files: Files;
     constructor({ filePath, stderr }: DirectoryConstructorParams);

package/dist/io/utils.d.ts

@@ -4,7 +4,7 @@ import { Stderr } from '../stdio';
 export declare const lstat: typeof fs.lstat.__promisify__;
 export declare const readFile: typeof fs.readFile.__promisify__;
 export declare const readdir: typeof fs.readdir.__promisify__;
-export declare type WalkPromiseOptions = {
+export type WalkPromiseOptions = {
     shouldIncludePath?: (_path: string, isDirectory: boolean) => boolean;
     stderr: Stderr;
 };

package/dist/io/xpi.d.ts

@@ -3,16 +3,17 @@
 import { Readable } from 'stream';
 import yauzl, { Entry, ZipFile } from 'yauzl';
 import { IOBaseConstructorParams, IOBase } from './base';
-declare type Files = {
+export type Files = {
     [filename: string]: Entry;
 };
-declare type XpiConstructorParams = IOBaseConstructorParams & {
+type XpiConstructorParams = IOBaseConstructorParams & {
     autoClose?: boolean;
     zipLib?: typeof yauzl;
 };
 export declare class Xpi extends IOBase {
     autoClose: boolean;
     files: Files;
+    processed: boolean;
     zipLib: typeof yauzl;
     zipfile: ZipFile | undefined;
     constructor({ autoClose, filePath, stderr, zipLib, }: XpiConstructorParams);

package/dist/io/xpi.js

@@ -31,8 +31,9 @@ const errors_1 = require("../errors");
 class Xpi extends base_1.IOBase {
     constructor({ autoClose = true, filePath, stderr, zipLib = yauzl_1.default, }) {
         super({ filePath, stderr });
-        this.files = {};
         this.autoClose = autoClose;
+        this.files = {};
+        this.processed = false;
         this.zipLib = zipLib;
     }
     open() {
@@ -85,7 +86,7 @@ class Xpi extends base_1.IOBase {
         return __awaiter(this, void 0, void 0, function* () {
             // If we have already processed the file and have data on this instance
             // return that.
-            if (Object.keys(this.files).length) {
+            if (this.processed) {
                 const wantedFiles = {};
                 Object.keys(this.files).forEach((fileName) => {
                     if (this.shouldScanFile(fileName, false)) {
@@ -114,6 +115,7 @@ class Xpi extends base_1.IOBase {
                 //
                 // See: https://github.com/mozilla/addons-linter/pull/43
                 zipfile.on('end', () => {
+                    this.processed = true;
                     resolve(this.files);
                 });
                 if (_onEventsSubscribed) {

package/dist/stdio.d.ts

@@ -1,15 +1,15 @@
-export declare type Stderr = {
+export type Stderr = {
     debug: (message: string) => void;
     error: (message: string) => void;
     info: (message: string) => void;
 };
-declare type CreateConsoleStderrParams = {
+type CreateConsoleStderrParams = {
     _console?: typeof console;
     programName: string;
     verboseLevel: number;
 };
 export declare const createConsoleStderr: ({ _console, programName, verboseLevel, }: CreateConsoleStderrParams) => Stderr;
-export declare type InMemoryStderr = Stderr & {
+export type InMemoryStderr = Stderr & {
     messages: {
         debug: string[];
         error: string[];
@@ -17,13 +17,13 @@ export declare type InMemoryStderr = Stderr & {
     };
 };
 export declare const createInMemoryStderr: () => InMemoryStderr;
-export declare type Stdout = {
+export type Stdout = {
     write: (message: string) => void;
 };
 export declare const createConsoleStdout: ({ _console }?: {
     _console?: Console | undefined;
 }) => Stdout;
-export declare type InMemoryStdout = Stdout & {
+export type InMemoryStdout = Stdout & {
     output: string;
 };
 export declare const createInMemoryStdout: () => InMemoryStdout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "addons-scanner-utils",
-  "version": "8.1.0",
+  "version": "8.3.0",
   "description": "Various addons related helpers to build CLIs.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -39,9 +39,9 @@
   },
   "devDependencies": {
     "@types/common-tags": "^1.8.0",
-    "@types/express": "4.17.14",
+    "@types/express": "4.17.15",
     "@types/jest": "^29.0.0",
-    "@types/node": "^14.0.0",
+    "@types/node": "^18.0.0",
     "@types/node-fetch": "^2.6.2",
     "@types/safe-compare": "^1.1.0",
     "@types/sinon": "^10.0.0",
@@ -55,11 +55,11 @@
     "express": "4.18.2",
     "jest": "^29.0.0",
     "node-fetch": "2.6.7",
-    "prettier": "2.7.1",
+    "prettier": "2.8.1",
     "pretty-quick": "^3.0.0",
     "rimraf": "^3.0.0",
     "safe-compare": "1.1.4",
-    "sinon": "^14.0.0",
+    "sinon": "^15.0.0",
     "supertest": "^6.0.0",
     "ts-jest": "^29.0.0",
     "type-coverage": "^2.3.0",