diff --git a/.npmignore b/.npmignore index 351fa64..936a665 100644 --- a/.npmignore +++ b/.npmignore @@ -12,8 +12,7 @@ src/ .eslintignore .eslintrc.json .travis.yml -gulpfile.js +./gulpfile.js tsconfig.json tslint.json test/unit/reports/**/* -TODO.md \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 29e501f..4bd3834 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,10 @@ node_js: - "node" install: - npm install -script: - - gulp build - - gulp unit - - gulp coveralls +script: + - gulp build || travis_terminate 1 + - gulp unit || travis_terminate 1 + - gulp coveralls || travis_terminate 1 +cache: + directories: + - node_modules \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d391912..f4091c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,24 +1,34 @@ +# v0.2.1 + +* Fixed Reassigning parameter lint rules + # v0.2.0 + * Finalise API * Unit Tests and Fixes # v0.1.4 + * Housekeeping and CI Integration # v0.1.3 + * Housekeeping and CI Integration # v0.1.2 + * Added png to icns conversion # v0.1.1 + * Rationalised logging/display interfaces # v0.1.0 + * Added svg to png conversion * Added png to ico conversion * Added svg to mask conversion # v0.0.1 -* Initial version +* Initial version \ No newline at end of file diff --git a/dist/svg.js b/dist/svg.js index d1dd345..107e4c2 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -55,18 +55,10 @@ class SVG { else { logger.info("height", { height }); } - if (marginX === undefined) { - marginX = 0; - } - else { - logger.info("marginX", { marginX }); - } - if (marginY === undefined) { - marginY = 0; - } - else { - logger.info("marginY", { marginY }); - } + const mX = marginX === undefined ? 0 : marginX; + const mY = marginY === undefined ? 0 : marginY; + logger.info("marginX", { mX }); + logger.info("marginY", { mY }); if (background !== null && background !== undefined && background.length > 0) { if (!parameterValidation_1.ParameterValidation.isColor(logger, "background", background)) { return 1; @@ -80,9 +72,10 @@ class SVG { if (background && background.length > 0) { style += ` body { background-color: ${background}}`; } - const reducedWidth = width - (marginX * 2); + const reducedWidth = width - (mX * 2); + style += ` img { position: absolute; left: ${mX}px; top: ${mY}px}`; const reducedHeight = height - (marginY * 2); - style += ` img { position: absolute; left: ${marginX}px; top: ${marginY}px}`; + style += ` img { position: absolute; left: ${mX}px; top: ${mY}px}`; const svgFilename = fileSystem.pathAbsolute(fileSystem.pathCombine(sourceFolder, sourceFile)); const content = ``; yield page.property("viewportSize", { width, height }); @@ -166,4 +159,4 @@ class SVG { } exports.SVG = SVG; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../../src/svg.ts"],"names":[],"mappings":"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","file":"svg.js","sourcesContent":["/**\n * SVG class for manipulating SVG images.\n */\nimport { create, WebPage } from \"phantom\";\nimport { TextDecoder, TextEncoder } from \"text-encoding\";\nimport { ParameterValidation } from \"unitejs-framework/dist/helpers/parameterValidation\";\nimport { IFileSystem } from \"unitejs-framework/dist/interfaces/IFileSystem\";\nimport { ILogger } from \"unitejs-framework/dist/interfaces/ILogger\";\nimport { DefaultLogger } from \"unitejs-framework/dist/loggers/defaultLogger\";\n\nexport class SVG {\n    public async toPng(logger: ILogger,\n                       fileSystem: IFileSystem,\n                       sourceFolder: string | undefined | null,\n                       sourceFile: string | undefined | null,\n                       destFolder: string | undefined | null,\n                       destFile: string | undefined | null,\n                       width: number | undefined | null,\n                       height: number | undefined | null,\n                       marginX: number | undefined | null,\n                       marginY: number | undefined | null,\n                       background: string | undefined): Promise<number> {\n        let ret;\n        let phantom;\n\n        try {\n            if (logger === undefined || logger === null) {\n                DefaultLogger.log(\"Unable to continue without logger\");\n                return 1;\n            }\n\n            if (fileSystem === undefined || fileSystem === null) {\n                logger.error(\"Unable to continue without file system\");\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"sourceFolder\", sourceFolder)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"sourceFile\", sourceFile)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"destFolder\", destFolder)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"destFile\", destFile)) {\n                return 1;\n            }\n\n            if (width === undefined || width === null || width <= 0) {\n                logger.error(\"width\", \"parameter must be greater than 0.\");\n                return 1;\n            } else {\n                logger.info(\"width\", { width });\n            }\n\n            if (height === undefined || height === null || height <= 0) {\n                logger.error(\"height\", \"parameter must be greater than 0.\");\n                return 1;\n            } else {\n                logger.info(\"height\", { height });\n            }\n\n            if (marginX === undefined) {\n                marginX = 0;\n            } else {\n                logger.info(\"marginX\", { marginX });\n            }\n\n            if (marginY === undefined) {\n                marginY = 0;\n            } else {\n                logger.info(\"marginY\", { marginY });\n            }\n\n            if (background !== null && background !== undefined && background.length > 0) {\n                if (!ParameterValidation.isColor(logger, \"background\", background)) {\n                    return 1;\n                }\n            }\n\n            const exists = await fileSystem.fileExists(sourceFolder, sourceFile);\n\n            if (exists) {\n                phantom = await create();\n                const page = await phantom.createPage();\n\n                let style = \"* { margin: 0; padding: 0 }\";\n\n                if (background && background.length > 0) {\n                    style += ` body { background-color: ${background}}`;\n                }\n\n                const reducedWidth = width - (marginX * 2);\n                const reducedHeight = height - (marginY * 2);\n\n                style += ` img { position: absolute; left: ${marginX}px; top: ${marginY}px}`;\n\n                const svgFilename = fileSystem.pathAbsolute(fileSystem.pathCombine(sourceFolder, sourceFile));\n\n                const content = `<html><style>${style}</style><body><img width=\"${reducedWidth}\" height=\"${reducedHeight}\" src=\\\"file:///${svgFilename}\\\"/></body></html>`;\n                await page.property(\"viewportSize\", { width, height });\n                await page.property(\"content\", content);\n                const base64 = await page.renderBase64(\"PNG\");\n\n                const dirExists = await fileSystem.directoryExists(destFolder);\n                if (!dirExists) {\n                    await fileSystem.directoryCreate(destFolder);\n                }\n\n                await fileSystem.fileWriteBinary(destFolder, destFile, Buffer.from(base64, \"base64\"));\n\n                ret = 0;\n            } else {\n                logger.error(\"Source Image does not exist\");\n                ret = 1;\n            }\n        } catch (e) {\n            logger.error(\"Conversion failed\", e);\n            ret = 1;\n        }\n\n        if (phantom) {\n            try {\n                phantom.exit();\n            } catch (e) {\n                // Ignore any errors from the exit\n            }\n        }\n\n        return ret;\n    }\n\n    public async toMask(logger: ILogger,\n                        fileSystem: IFileSystem,\n                        sourceFolder: string,\n                        sourceFile: string,\n                        destFolder: string,\n                        destFile: string): Promise<number> {\n        let ret;\n\n        try {\n            if (logger === undefined || logger === null) {\n                DefaultLogger.log(\"Unable to continue without logger\");\n                return 1;\n            }\n\n            if (fileSystem === undefined || fileSystem === null) {\n                logger.error(\"Unable to continue without file system\");\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"sourceFolder\", sourceFolder)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"sourceFile\", sourceFile)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"destFolder\", destFolder)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"destFile\", destFile)) {\n                return 1;\n            }\n\n            const exists = await fileSystem.fileExists(sourceFolder, sourceFile);\n\n            if (exists) {\n\n                const svgData = await fileSystem.fileReadBinary(sourceFolder, sourceFile);\n                let svgText = new TextDecoder().decode(svgData);\n\n                svgText = svgText.replace(/fill=\\\".*?\\\"/gi, \"fill=\\\"rgb(0,0,0)\\\"\");\n\n                const dirExists = await fileSystem.directoryExists(destFolder);\n                if (!dirExists) {\n                    await fileSystem.directoryCreate(destFolder);\n                }\n\n                await fileSystem.fileWriteBinary(destFolder, destFile, new TextEncoder().encode(svgText));\n\n                ret = 0;\n            } else {\n                logger.error(\"Source Image does not exist\");\n                ret = 1;\n            }\n        } catch (e) {\n            logger.error(\"Conversion failed\", e);\n            ret = 1;\n        }\n\n        return ret;\n    }\n}\n"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../../src/svg.ts"],"names":[],"mappings":"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","file":"svg.js","sourcesContent":["/**\n * SVG class for manipulating SVG images.\n */\nimport { create, WebPage } from \"phantom\";\nimport { TextDecoder, TextEncoder } from \"text-encoding\";\nimport { ParameterValidation } from \"unitejs-framework/dist/helpers/parameterValidation\";\nimport { IFileSystem } from \"unitejs-framework/dist/interfaces/IFileSystem\";\nimport { ILogger } from \"unitejs-framework/dist/interfaces/ILogger\";\nimport { DefaultLogger } from \"unitejs-framework/dist/loggers/defaultLogger\";\n\nexport class SVG {\n    public async toPng(logger: ILogger,\n                       fileSystem: IFileSystem,\n                       sourceFolder: string | undefined | null,\n                       sourceFile: string | undefined | null,\n                       destFolder: string | undefined | null,\n                       destFile: string | undefined | null,\n                       width: number | undefined | null,\n                       height: number | undefined | null,\n                       marginX: number | undefined | null,\n                       marginY: number | undefined | null,\n                       background: string | undefined): Promise<number> {\n        let ret;\n        let phantom;\n\n        try {\n            if (logger === undefined || logger === null) {\n                DefaultLogger.log(\"Unable to continue without logger\");\n                return 1;\n            }\n\n            if (fileSystem === undefined || fileSystem === null) {\n                logger.error(\"Unable to continue without file system\");\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"sourceFolder\", sourceFolder)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"sourceFile\", sourceFile)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"destFolder\", destFolder)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"destFile\", destFile)) {\n                return 1;\n            }\n\n            if (width === undefined || width === null || width <= 0) {\n                logger.error(\"width\", \"parameter must be greater than 0.\");\n                return 1;\n            } else {\n                logger.info(\"width\", { width });\n            }\n\n            if (height === undefined || height === null || height <= 0) {\n                logger.error(\"height\", \"parameter must be greater than 0.\");\n                return 1;\n            } else {\n                logger.info(\"height\", { height });\n            }\n\n            const mX = marginX === undefined ? 0 : marginX;\n            const mY = marginY === undefined ? 0 : marginY;\n            logger.info(\"marginX\", { mX });\n            logger.info(\"marginY\", { mY });\n\n            if (background !== null && background !== undefined && background.length > 0) {\n                if (!ParameterValidation.isColor(logger, \"background\", background)) {\n                    return 1;\n                }\n            }\n\n            const exists = await fileSystem.fileExists(sourceFolder, sourceFile);\n\n            if (exists) {\n                phantom = await create();\n                const page = await phantom.createPage();\n\n                let style = \"* { margin: 0; padding: 0 }\";\n\n                if (background && background.length > 0) {\n                    style += ` body { background-color: ${background}}`;\n                }\n\n                const reducedWidth = width - (mX * 2);\n                style += ` img { position: absolute; left: ${mX}px; top: ${mY}px}`;\n                const reducedHeight = height - (marginY * 2);\n\n                style += ` img { position: absolute; left: ${mX}px; top: ${mY}px}`;\n\n                const svgFilename = fileSystem.pathAbsolute(fileSystem.pathCombine(sourceFolder, sourceFile));\n\n                const content = `<html><style>${style}</style><body><img width=\"${reducedWidth}\" height=\"${reducedHeight}\" src=\\\"file:///${svgFilename}\\\"/></body></html>`;\n                await page.property(\"viewportSize\", { width, height });\n                await page.property(\"content\", content);\n                const base64 = await page.renderBase64(\"PNG\");\n\n                const dirExists = await fileSystem.directoryExists(destFolder);\n                if (!dirExists) {\n                    await fileSystem.directoryCreate(destFolder);\n                }\n\n                await fileSystem.fileWriteBinary(destFolder, destFile, Buffer.from(base64, \"base64\"));\n\n                ret = 0;\n            } else {\n                logger.error(\"Source Image does not exist\");\n                ret = 1;\n            }\n        } catch (e) {\n            logger.error(\"Conversion failed\", e);\n            ret = 1;\n        }\n\n        if (phantom) {\n            try {\n                phantom.exit();\n            } catch (e) {\n                // Ignore any errors from the exit\n            }\n        }\n\n        return ret;\n    }\n\n    public async toMask(logger: ILogger,\n                        fileSystem: IFileSystem,\n                        sourceFolder: string,\n                        sourceFile: string,\n                        destFolder: string,\n                        destFile: string): Promise<number> {\n        let ret;\n\n        try {\n            if (logger === undefined || logger === null) {\n                DefaultLogger.log(\"Unable to continue without logger\");\n                return 1;\n            }\n\n            if (fileSystem === undefined || fileSystem === null) {\n                logger.error(\"Unable to continue without file system\");\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"sourceFolder\", sourceFolder)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"sourceFile\", sourceFile)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"destFolder\", destFolder)) {\n                return 1;\n            }\n\n            if (!ParameterValidation.notEmpty(logger, \"destFile\", destFile)) {\n                return 1;\n            }\n\n            const exists = await fileSystem.fileExists(sourceFolder, sourceFile);\n\n            if (exists) {\n\n                const svgData = await fileSystem.fileReadBinary(sourceFolder, sourceFile);\n                let svgText = new TextDecoder().decode(svgData);\n\n                svgText = svgText.replace(/fill=\\\".*?\\\"/gi, \"fill=\\\"rgb(0,0,0)\\\"\");\n\n                const dirExists = await fileSystem.directoryExists(destFolder);\n                if (!dirExists) {\n                    await fileSystem.directoryCreate(destFolder);\n                }\n\n                await fileSystem.fileWriteBinary(destFolder, destFile, new TextEncoder().encode(svgText));\n\n                ret = 0;\n            } else {\n                logger.error(\"Source Image does not exist\");\n                ret = 1;\n            }\n        } catch (e) {\n            logger.error(\"Conversion failed\", e);\n            ret = 1;\n        }\n\n        return ret;\n    }\n}\n"]} diff --git a/gulpfile.js b/gulpfile.js index e6a1398..bdd9429 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -65,7 +65,7 @@ gulp.task("build-transpile", () => { .pipe(gulp.dest(distFolder)) .on("end", () => { if (errorCount > 0) { - process.exit(); + process.exit(1); } })); @@ -138,7 +138,7 @@ gulp.task("unit-transpile", () => { .pipe(gulp.dest(unitDistFolder)) .on("end", () => { if (errorCount > 0) { - process.exit(); + process.exit(1); } }); }); @@ -176,6 +176,8 @@ gulp.task("unit-runner", () => { .pipe(mocha({ "reporter": "spec", "timeout": "360000" + }).on("error", () => { + process.exit(1); })) .pipe(istanbul.writeReports({ "dir": unitReportsFolder, diff --git a/package.json b/package.json index f497791..727ffbd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "unitejs-image", - "version": "0.2.0", + "version": "0.2.1", "description": "Core code for manipulating images", "repository": { "type": "git", @@ -32,7 +32,7 @@ "devDependencies": { "@types/chai": "^4.0.4", "@types/mocha": "^2.2.42", - "@types/node": "^8.0.24", + "@types/node": "^8.0.25", "@types/phantom": "^3.2.3", "@types/sinon": "^2.3.3", "chai": "^4.1.1", @@ -51,7 +51,7 @@ "remap-istanbul": "^0.9.5", "run-sequence": "^2.0.0", "sinon": "^3.2.1", - "tslint": "^5.6.0", + "tslint": "^5.7.0", "tslint-microsoft-contrib": "^5.0.1", "typescript": "^2.5.1" }, @@ -60,6 +60,6 @@ "jimp": "^0.2.28", "phantom": "^4.0.5", "text-encoding": "^0.6.4", - "unitejs-framework": "^0.8.0" + "unitejs-framework": "^0.8.1" } } diff --git a/src/svg.ts b/src/svg.ts index b4c98ea..d015289 100644 --- a/src/svg.ts +++ b/src/svg.ts @@ -64,17 +64,10 @@ export class SVG { logger.info("height", { height }); } - if (marginX === undefined) { - marginX = 0; - } else { - logger.info("marginX", { marginX }); - } - - if (marginY === undefined) { - marginY = 0; - } else { - logger.info("marginY", { marginY }); - } + const mX = marginX === undefined ? 0 : marginX; + const mY = marginY === undefined ? 0 : marginY; + logger.info("marginX", { mX }); + logger.info("marginY", { mY }); if (background !== null && background !== undefined && background.length > 0) { if (!ParameterValidation.isColor(logger, "background", background)) { @@ -94,10 +87,11 @@ export class SVG { style += ` body { background-color: ${background}}`; } - const reducedWidth = width - (marginX * 2); + const reducedWidth = width - (mX * 2); + style += ` img { position: absolute; left: ${mX}px; top: ${mY}px}`; const reducedHeight = height - (marginY * 2); - style += ` img { position: absolute; left: ${marginX}px; top: ${marginY}px}`; + style += ` img { position: absolute; left: ${mX}px; top: ${mY}px}`; const svgFilename = fileSystem.pathAbsolute(fileSystem.pathCombine(sourceFolder, sourceFile));