Changes for 1.0.3

haavardlian · Feb 6, 2017 · 57a5362 · 57a5362
1 parent a283b05
commit 57a5362
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 74 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.2",
+  "version": "1.0.3",
   "name": "escpos-print",
   "bugs": {
     "url": "https://github.com/haavardlian/escpos/issues"
@@ -32,6 +32,7 @@
   },
   "contributors": [],
   "devDependencies": {
+    "@types/fs-extra": "0.0.37",
     "@types/iconv-lite": "^0.0.1",
     "@types/node": "^6.0.45",
     "@types/serialport": "^4.0.6",
@@ -43,7 +44,8 @@
     "get-pixels": "^3.3.0",
     "iconv-lite": "^0.4.15",
     "mutable-buffer": "^2.0.3",
-    "serialport": "^4.0.3"
+    "serialport": "^4.0.3",
+    "moment": "^2.17.1"
   },
   "scripts": {
     "compile": "tsc",

diff --git a/scripts/createPackageDir.js b/scripts/createPackageDir.js
@@ -2,85 +2,75 @@ const path = require('path');
 const fse = require('fs-extra');
 
 const files = [
-  'README.md',
-  'LICENSE',
+    'README.md',
+    'LICENSE',
 ];
 
-Promise.all(
-  files.map((file) => copyFile(file))
-)
-.then(() => createPackageFile());
+Promise.all(files.map(file => copyFile(file))).then(() => createPackageFile());
 
 function copyFile(file) {
-  const buildPath = resolveBuildPath(file);
-  return new Promise((resolve) => {
-    fse.copy(
-      file,
-      buildPath,
-      (err) => {
-        if (err) throw err;
-        resolve();
-      }
-    );
-  })
-  .then(() => console.log(`Copied ${file} to ${buildPath}`));
+    const buildPath = resolveBuildPath(file);
+    return new Promise(resolve => {
+        fse.copy(file, buildPath, (err) => {
+            if (err) throw err;
+            resolve();
+        });
+    })
+    .then(() => console.log(`Copied ${file} to ${buildPath}`));
 }
 
 function resolveBuildPath(file) {
-  return path.resolve(__dirname, '../dist/', path.basename(file));
+    return path.resolve(__dirname, '../dist/', path.basename(file));
 }
 
 function createPackageFile() {
-  return new Promise((resolve) => {
-    fse.readFile(path.resolve(__dirname, '../package.json'), 'utf8', (err, data) => {
-      if (err) {
-        throw err;
-      }
-
-      resolve(data);
-    });
-  })
-  .then((data) => JSON.parse(data))
-  .then((packageData) => {
-    const {
-      author,
-      name,
-      version,
-      description,
-      keywords,
-      repository,
-      license,
-      bugs,
-      homepage,
-      peerDependencies,
-      typings,
-      dependencies,
-    } = packageData;
+    return new Promise((resolve) => {
+        fse.readFile(path.resolve(__dirname, '../package.json'), 'utf8', (err, data) => {
+            if (err) throw err;
+            resolve(data);
+        });
+    })
+    .then((data) => JSON.parse(data))
+    .then((packageData) => {
+        const {
+            author,
+            name,
+            version,
+            description,
+            keywords,
+            repository,
+            license,
+            bugs,
+            homepage,
+            peerDependencies,
+            typings,
+            dependencies,
+        } = packageData;
 
-    const minimalPackage = {
-      name,
-      author,
-      version,
-      description,
-      main: './index.js',
-      typings: './index.d.ts',
-      keywords,
-      repository,
-      license,
-      bugs,
-      homepage,
-      peerDependencies,
-      dependencies,
-    };
+        const minimalPackage = {
+            name,
+            author,
+            version,
+            description,
+            main: './index.js',
+            typings: './',
+            keywords,
+            repository,
+            license,
+            bugs,
+            homepage,
+            peerDependencies,
+            dependencies,
+        };
 
-    return new Promise((resolve) => {
-      const buildPath = path.resolve(__dirname, '../dist/package.json');
-      const data = JSON.stringify(minimalPackage, null, 2);
-      fse.writeFile(buildPath, data, (err) => {
-        if (err) throw (err);
-        console.log(`Created package.json in ${buildPath}`);
-        resolve();
-      });
+        return new Promise((resolve) => {
+            const buildPath = path.resolve(__dirname, '../dist/package.json');
+            const data = JSON.stringify(minimalPackage, null, 2);
+            fse.writeFile(buildPath, data, (err) => {
+                if (err) throw (err);
+                console.log(`Created package.json in ${buildPath}`);
+                resolve();
+            });
+        });
     });
-  });
-}
+}
diff --git a/src/adapters/Console.ts b/src/adapters/Console.ts
@@ -1,6 +1,13 @@
 import Adapter from "../Adapter";
 
 export default class Console extends Adapter {
+    private numbersPerLine: number;
+
+    constructor(numbersPerLine: number = 16) {
+        super();
+        this.numbersPerLine = numbersPerLine;
+    }
+
     public open(): Promise<undefined> {
         return new Promise((resolve) => {
             resolve();
@@ -9,8 +16,9 @@ export default class Console extends Adapter {
 
     public write(data: Buffer): Promise<undefined> {
         return new Promise((resolve) => {
-            // tslint:disable-next-line
-            console.log(data.toString("hex").replace(/(.{2})/g, "$1 ").replace(/(.{48})/g, "$1\n"));
+            const regex = new RegExp(`/(.{${this.numbersPerLine * 3}})`, "g");
+            // tslint:disable-next-line no-console
+            console.log(data.toString("hex").replace(/(.{2})/g, "$1 ").replace(regex, "$1\n"));
             resolve();
         });
     }

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,12 +1,13 @@
 {
     "typeRoots": ["node_modules/@types"],
-    "types": ["node", "serialport", "iconv-lite"],
+    "types": ["node", "serialport", "iconv-lite", "fs-extra"],
     "files": [
         "src/Adapter.ts",
         "src/Adapters.ts",
         "src/adapters/Console.ts",
         "src/adapters/Network.ts",
         "src/adapters/Serial.ts",
+        "src/adapters/PNG.ts",
         "src/Printer.ts",
         "src/Commands.ts",
         "src/Image.ts",