opticss - npm Package Compare versions

Comparing version 0.8.1 to 0.9.0

CHANGELOG.md

@@ -6,2 +6,18 @@ # Change Log
 
+# [0.9.0](https://github.com/linkedin/opticss/compare/opticss@0.8.1...opticss@0.9.0) (2020-09-13)
+
+
+### Bug Fixes
+
+* Handle unsupport css properties during shorthand expansion. ([5e2df42](https://github.com/linkedin/opticss/commit/5e2df42))
+
+
+### Features
+
+* Issue a warning instead of a note for css property issues. ([1c5d032](https://github.com/linkedin/opticss/commit/1c5d032))
+
+
+
+
+
 ## [0.8.1](https://github.com/linkedin/opticss/compare/opticss@0.8.0...opticss@0.8.1) (2020-08-06)
@@ -8,0 +24,0 @@

dist/src/Actions/index.d.ts

@@ -19,3 +19,4 @@ import { Action } from "./Action";
 export { Note } from "./actions/Note";
+export { Warning } from "./actions/Warning";
 export * from "./Action";
 //# sourceMappingURL=index.d.ts.map

dist/src/Actions/index.js

@@ -38,3 +38,5 @@ "use strict";
 exports.Note = Note_1.Note;
+var Warning_1 = require("./actions/Warning");
+exports.Warning = Warning_1.Warning;
 __export(require("./Action"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQWN0aW9ucy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUVBOztHQUVHO0FBQ0gsTUFBYSxPQUFPO0lBRWxCO1FBQ0UsSUFBSSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7SUFDdEIsQ0FBQztJQUNELE9BQU8sQ0FBQyxNQUFjO1FBQ3BCLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFDRCxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO0lBQ2hELENBQUM7Q0FFRjtBQVpELDBCQVlDO0FBRUQsdUJBQXVCO0FBQ3ZCLHlFQUF3RTtBQUEvRCx3REFBQSxxQkFBcUIsQ0FBQTtBQUM5QiwyREFBMEQ7QUFBakQsMENBQUEsY0FBYyxDQUFBO0FBQ3ZCLDZEQUE0RDtBQUFuRCw0Q0FBQSxlQUFlLENBQUE7QUFDeEIsbUZBQWtGO0FBQXpFLGtFQUFBLDBCQUEwQixDQUFBO0FBQ25DLG1EQUFrRDtBQUF6QyxrQ0FBQSxVQUFVLENBQUE7QUFDbkIsaUVBQWdFO0FBQXZELGdEQUFBLGlCQUFpQixDQUFBO0FBQzFCLGlFQUFnRTtBQUF2RCxnREFBQSxpQkFBaUIsQ0FBQTtBQUMxQix1Q0FBc0M7QUFBN0Isc0JBQUEsSUFBSSxDQUFBO0FBQ2IsOEJBQXlCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQWN0aW9ucy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUVBOztHQUVHO0FBQ0gsTUFBYSxPQUFPO0lBRWxCO1FBQ0UsSUFBSSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7SUFDdEIsQ0FBQztJQUNELE9BQU8sQ0FBQyxNQUFjO1FBQ3BCLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFDRCxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO0lBQ2hELENBQUM7Q0FFRjtBQVpELDBCQVlDO0FBRUQsdUJBQXVCO0FBQ3ZCLHlFQUF3RTtBQUEvRCx3REFBQSxxQkFBcUIsQ0FBQTtBQUM5QiwyREFBMEQ7QUFBakQsMENBQUEsY0FBYyxDQUFBO0FBQ3ZCLDZEQUE0RDtBQUFuRCw0Q0FBQSxlQUFlLENBQUE7QUFDeEIsbUZBQWtGO0FBQXpFLGtFQUFBLDBCQUEwQixDQUFBO0FBQ25DLG1EQUFrRDtBQUF6QyxrQ0FBQSxVQUFVLENBQUE7QUFDbkIsaUVBQWdFO0FBQXZELGdEQUFBLGlCQUFpQixDQUFBO0FBQzFCLGlFQUFnRTtBQUF2RCxnREFBQSxpQkFBaUIsQ0FBQTtBQUMxQix1Q0FBc0M7QUFBN0Isc0JBQUEsSUFBSSxDQUFBO0FBQ2IsNkNBQTRDO0FBQW5DLDRCQUFBLE9BQU8sQ0FBQTtBQUNoQiw4QkFBeUIifQ==

dist/src/optimizations/MergeDeclarations/DeclarationMapper.js

@@ -85,3 +85,3 @@ "use strict";
                         // values because selectors can conflict across different optimization contexts.
-                        let longhandDeclarations = shorthandProperties_1.expandIfNecessary(context.authoredProps, decl.prop, decl.value, pass.actions);
+                        let longhandDeclarations = shorthandProperties_1.expandIfNecessary(context.authoredProps, decl.prop, decl.value, pass.actions, decl);
                         let longHandProps = Object.keys(longhandDeclarations);
@@ -169,2 +169,2 @@ let longHandDeclInfos = new Array();
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DeclarationMapper.js","sourceRoot":"","sources":["../../../../src/optimizations/MergeDeclarations/DeclarationMapper.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DeclarationMapper.js","sourceRoot":"","sources":["../../../../src/optimizations/MergeDeclarations/DeclarationMapper.ts"],"names":[],"mappings":"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"}

dist/src/optimizations/MergeDeclarations/index.js

@@ -307,3 +307,3 @@ "use strict";
             }
-            let expanded = shorthandProperties_1.expandIfNecessary(context.authoredProps, declInfos[0].prop, declInfos[0].value, actions);
+            let expanded = shorthandProperties_1.expandIfNecessary(context.authoredProps, declInfos[0].prop, declInfos[0].value, actions, declInfos[0].decl);
             nextMerge: for (let unmergedDecl of declInfos) {
@@ -505,2 +505,2 @@ nextGroup: for (let segment of segmentedMergeables) {
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/optimizations/MergeDeclarations/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/optimizations/MergeDeclarations/index.ts"],"names":[],"mappings":"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"}

dist/src/Optimizer.js

 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -167,17 +175,12 @@ const template_api_1 = require("@opticss/template-api");
     optimize(outputFilename) {
-        let pass = new OptimizationPass_1.OptimizationPass(this.options, this.templateOptions);
-        let start = new Date();
-        // Parse all input files.
-        return this.parseFiles(this.sources)
+        return __awaiter(this, void 0, void 0, function* () {
+            let pass = new OptimizationPass_1.OptimizationPass(this.options, this.templateOptions);
+            let start = new Date();
+            // Parse all input files.
+            let files = yield this.parseFiles(this.sources);
             // Run all initializers on parsed files.
-            .then(files => {
             this.initialize(pass, files);
-            return files;
-        })
             // Run all optimizers on parsed files.
-            .then(files => {
-            return this.optimizeFiles(pass, files);
-        })
+            files = yield this.optimizeFiles(pass, files);
             // Concatenate all files and return optimization result.
-            .then((files) => {
             let output = this.concatenateFiles(files, outputFilename);
@@ -228,3 +231,3 @@ this.logTiming("total", start, new Date());
 // This use of this plugin silences a postcss warning.
-exports.POSTCSS_NOOP_PLUGIN = postcss.plugin("css-blocks-plugin", function (_opts) {
+exports.POSTCSS_NOOP_PLUGIN = postcss.plugin("noop-plugin", function (_opts) {
     return function (_root, _result) {
@@ -234,2 +237,2 @@ return Promise.resolve();
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3B0aW1pemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL09wdGltaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHdEQU0rQjtBQUMvQixpREFBa0Q7QUFDbEQsbUNBQW1DO0FBSW5DLGlEQUE0RDtBQUM1RCxxREFBbUU7QUFDbkUseURBQXNEO0FBQ3RELG1EQUt5QjtBQUN6QiwwREFBaUU7QUFrQmpFLE1BQWEsU0FBUztJQWdCcEI7Ozs7Ozs7OztPQVNHO0lBQ0gsWUFBWSxPQUFnQyxFQUFFLGVBQW9EO1FBRWhHLGtEQUFrRDtRQUNsRCxJQUFJLFFBQVEsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN4QyxNQUFNLElBQUksS0FBSyxDQUFDLHVDQUF1QyxDQUFDLENBQUM7U0FDMUQ7UUFFRCxJQUFJLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUNsQixJQUFJLENBQUMsUUFBUSxHQUFHLEVBQUUsQ0FBQztRQUNuQix1RkFBdUY7UUFDdkYsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxnQ0FBZSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQzNELElBQUksQ0FBQyxlQUFlLEdBQUcsdUNBQXdCLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDakUsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQy9CLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQywrREFBK0Q7UUFDakgsSUFBSSxDQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7UUFFbEIsOEJBQThCO1FBQzlCLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRTtZQUFFLE9BQU87U0FBRTtRQUV0Qyw4RUFBOEU7UUFDOUUsSUFBSSxJQUFJLEdBQWEsSUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3B0aW1pemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL09wdGltaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsd0RBTStCO0FBQy9CLGlEQUFrRDtBQUNsRCxtQ0FBbUM7QUFJbkMsaURBQTREO0FBQzVELHFEQUFtRTtBQUNuRSx5REFBc0Q7QUFDdEQsbURBS3lCO0FBQ3pCLDBEQUFpRTtBQWtCakUsTUFBYSxTQUFTO0lBZ0JwQjs7Ozs7Ozs7O09BU0c7SUFDSCxZQUFZLE9BQWdDLEVBQUUsZUFBb0Q7UUFFaEcsa0RBQWtEO1FBQ2xELElBQUksUUFBUSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3hDLE1BQU0sSUFBSSxLQUFLLENBQUMsdUNBQXVDLENBQUMsQ0FBQztTQUMxRDtRQUVELElBQUksQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1FBQ2xCLElBQUksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFDO1FBQ25CLHVGQUF1RjtRQUN2RixJQUFJLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLGdDQUFlLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDM0QsSUFBSSxDQUFDLGVBQWUsR0FBRyx1Q0FBd0IsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUNqRSxJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7UUFDL0IsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLEdBQUcsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxDQUFDLCtEQUErRDtRQUNqSCxJQUFJLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUVsQiw4QkFBOEI7UUFDOUIsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFO1lBQUUsT0FBTztTQUFFO1FBRXRDLDhFQUE4RTtRQUM5RSxJQUFJLElBQUks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

dist/src/util/shorthandProperties.d.ts

 import { StringDict } from "@opticss/util";
-import * as propParser from "css-property-parser";
+import * as postcss from "postcss";
 import { Actions } from "../Actions";
 export declare function expandPropertyName(prop: string, recursively?: boolean): string[];
-export declare function fullyExpandShorthandProperty(prop: string, value: string): propParser.Declarations;
-export declare function expandIfNecessary(authoredProps: Set<string>, prop: string, value: string, actions: Actions): StringDict;
+export declare function expandIfNecessary(authoredProps: Set<string>, prop: string, value: string, actions: Actions, decl: postcss.Declaration): StringDict;
 //# sourceMappingURL=shorthandProperties.d.ts.map

dist/src/util/shorthandProperties.js

@@ -15,28 +15,3 @@ "use strict";
 exports.expandPropertyName = expandPropertyName;
-function fullyExpandShorthandProperty(prop, value) {
-    try {
-        let expanded = propParser.expandShorthandProperty(prop, value, true);
-        for (let p of Object.keys(expanded)) {
-            if (propParser.isShorthandProperty(p)) {
-                delete expanded[p];
-            }
-        }
-        return expanded;
-    }
-    catch (e) {
-        if (/parsing shorthand property/.test(e.message)) {
-            // TODO: instrument this so it can be added to the optimization logger.
-            // tslint:disable-next-line:no-console
-            console.log(e.message + `(long hands for this declaration will not be optimized)`);
-            return {
-                [prop]: value,
-            };
-        }
-        else {
-            throw e;
-        }
-    }
-}
-exports.fullyExpandShorthandProperty = fullyExpandShorthandProperty;
-function expandIfNecessary(authoredProps, prop, value, actions) {
+function expandIfNecessary(authoredProps, prop, value, actions, decl) {
     if (!propParser.isShorthandProperty(prop)) {
@@ -54,5 +29,9 @@ return { [prop]: value };
         if (/parsing shorthand property/.test(e.message)) {
-            actions.perform(new Actions_1.Note("mergeDeclarations", e.message + `(long hands for this declaration will not be optimized)`));
+            actions.perform(new Actions_1.Warning("mergeDeclarations", e.message + ` (long hands for this declaration will not be optimized)`, sourcePositionForNode(decl)));
             return { [prop]: value };
         }
+        else if (/is not a supported property/.test(e.message)) {
+            actions.perform(new Actions_1.Warning("mergeDeclarations", e.message + ` (long hands for this declaration with conflicting values will not be understood as such which could result in incorrect optimization output.)`, sourcePositionForNode(decl)));
+            return { [prop]: value };
+        }
         else {
@@ -65,3 +44,3 @@ throw e;
         let v = longHandValues[p];
-        let expanded = expandIfNecessary(authoredProps, p, v, actions);
+        let expanded = expandIfNecessary(authoredProps, p, v, actions, decl);
         if (Object.keys(expanded).some(key => authoredProps.has(key))) {
@@ -80,2 +59,14 @@ Object.assign(longhandDeclarations, expanded);
 exports.expandIfNecessary = expandIfNecessary;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hvcnRoYW5kUHJvcGVydGllcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy91dGlsL3Nob3J0aGFuZFByb3BlcnRpZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxrREFBa0Q7QUFFbEQsd0NBR29CO0FBRXBCLFNBQWdCLGtCQUFrQixDQUFDLElBQVksRUFBRSxXQUFXLEdBQUcsS0FBSztJQUNsRSxJQUFJLEtBQUssR0FBRyxVQUFVLENBQUMsOEJBQThCLENBQUMsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3pFLElBQUksV0FBVyxFQUFFO1FBQ2YsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDN0Q7U0FBTTtRQUNMLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7QUFDSCxDQUFDO0FBUEQsZ0RBT0M7QUFFRCxTQUFnQiw0QkFBNEIsQ0FBQyxJQUFZLEVBQUUsS0FBYTtJQUN0RSxJQUFJO1FBQ0YsSUFBSSxRQUFRLEdBQUcsVUFBVSxDQUFDLHVCQUF1QixDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDckUsS0FBSyxJQUFJLENBQUMsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ25DLElBQUksVUFBVSxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQyxFQUFFO2dCQUNyQyxPQUFPLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQzthQUNwQjtTQUNGO1FBQ0QsT0FBTyxRQUFRLENBQUM7S0FDakI7SUFBQyxPQUFPLENBQUMsRUFBRTtRQUNWLElBQUksNEJBQTRCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUNoRCx1RUFBdUU7WUFDdkUsc0NBQXNDO1lBQ3RDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFD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
+function sourcePositionForNode(node) {
+    if (node.source && node.source.start) {
+        return {
+            filename: node.source.input.file,
+            line: node.source.start.line,
+            column: node.source.start.column,
+        };
+    }
+    else {
+        return undefined;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hvcnRoYW5kUHJvcGVydGllcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy91dGlsL3Nob3J0aGFuZFByb3BlcnRpZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxrREFBa0Q7QUFHbEQsd0NBR29CO0FBRXBCLFNBQWdCLGtCQUFrQixDQUFDLElBQVksRUFBRSxXQUFXLEdBQUcsS0FBSztJQUNsRSxJQUFJLEtBQUssR0FBRyxVQUFVLENBQUMsOEJBQThCLENBQUMsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3pFLElBQUksV0FBVyxFQUFFO1FBQ2YsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDN0Q7U0FBTTtRQUNMLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7QUFDSCxDQUFDO0FBUEQsZ0RBT0M7QUFFRCxTQUFnQixpQkFBaUIsQ0FBQyxhQUEwQixFQUFFLElBQVksRUFBRSxLQUFhLEVBQUUsT0FBZ0IsRUFBRSxJQUF5QjtJQUNwSSxJQUFJLENBQUMsVUFBVSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxFQUFFO1FBQ3pDLE9BQU8sRUFBQyxDQUFDLElBQUksQ0FBQyxFQUFFLEtBQUssRUFBQyxDQUFDO0tBQ3hCO0lBQ0QsSUFBSSxvQkFBb0IsR0FBZSxFQUFFLENBQUM7SUFDMUMsSUFBSSxhQUFhLENBQUM7SUFDbEIsSUFBSSxjQUFjLENBQUM7SUFDbkIsSUFBSTtRQUNGLGNBQWMsR0FBRyxVQUFVLENBQUMsdUJBQXVCLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDOUUsYUFBYSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7S0FDN0M7SUFBQyxPQUFPLENBQUMsRUFBRTtRQUNWLElBQUksNEJBQTRCLENBQUMs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

dist/test/integration-tests.js

@@ -10,5 +10,7 @@ "use strict";
 const simple_template_1 = require("@opticss/simple-template");
+const chai_1 = require("chai");
 const fs = require("fs");
 const mocha_typescript_1 = require("mocha-typescript");
 const path = require("path");
+const src_1 = require("../src");
 const assertCascade_1 = require("./util/assertCascade");
@@ -31,3 +33,8 @@ // import { debugSize } from "./util/assertSmaller";
         let template = new simple_template_1.TestTemplate("test", markup, true);
-        return testDefaults(css, template).then(_result => {
+        return testDefaults(css, template).then(result => {
+            let warnings = result.optimization.actions.performed.filter(a => a instanceof src_1.Warning);
+            chai_1.assert.equal(warnings.length, 3);
+            chai_1.assert.equal(warnings[0].logString(), `${process.cwd()}/test1.css:111:3 [mergeDeclarations] ` +
+                `Unsupported property error: grid-template is not a supported property ` +
+                `(long hands for this declaration with conflicting values will not be understood as such which could result in incorrect optimization output.)`);
             // logOptimizations(result.optimization);
@@ -38,3 +45,5 @@ // return debugSize(result).then(() => {
         }).catch(e => {
-            assertCascade_1.logOptimizations(e.optimization);
+            if (e.optimization) {
+                assertCascade_1.logOptimizations(e.optimization);
+            }
             assertCascade_1.debugCascadeError(e);
@@ -52,2 +61,2 @@ throw e;
 exports.IntegrationTests = IntegrationTests;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWdyYXRpb24tdGVzdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90ZXN0L2ludGVncmF0aW9uLXRlc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsOERBRWtDO0FBQ2xDLHlCQUF5QjtBQUN6Qix1REFLMEI7QUFDMUIsNkJBQTZCO0FBRTdCLHdEQU84QjtBQUM5QixvREFBb0Q7QUFFcEQsU0FBUyxZQUFZLENBQUMsR0FBRyxrQkFBZ0Q7SUFDdkUsT0FBTyx1Q0FBdUIsQ0FDNUIsRUFBRyxFQUNIO1FBQ0UsYUFBYSxFQUFFLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFO1FBQ3hDLGtCQUFrQixFQUFFLEVBQUU7UUFDdEIsZ0JBQWdCLEVBQUUsSUFBSTtLQUN2QixFQUNELEdBQUcsa0JBQWtCLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFtQixFQUFFLEVBQUU7UUFDbkQsMEJBQVUsQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsS0FBSyxRQUFRLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDaEYsTUFBTSxDQUFDLENBQUM7SUFDVixDQUFDLENBQUMsQ0FBQztBQUNQLENBQUM7QUFHRCxJQUFhLGdCQUFnQixHQUE3QixNQUFhLGdCQUFnQjtJQUNyQixhQUFhO1FBQ2pCLElBQUksR0FBRyxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUseURBQXlELENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUN2SCxJQUFJLE1BQU0sR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLDBEQUEwRCxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDM0gsSUFBSSxRQUFRLEdBQUcsSUFBSSw4QkFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDdEQsT0FBTyxZQUFZLENBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUNoRCx5Q0FBeUM7WUFDekMsd0NBQXdDO1lBQ3hDLGlDQUFpQztZQUNqQyxNQUFNO1FBQ1IsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQ1gsZ0NBQWdCLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBQ2pDLGlDQUFpQixDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3JCLE1BQU0sQ0FBQyxDQUFDO1FBQ1YsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YsQ0FBQTtBQWZPO0lBQUwsdUJBQUk7bURBY0o7QUFmVSxnQkFBZ0I7SUFENUIsd0JBQUssQ0FBQyxtQkFBbUIsRUFBRSx1QkFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLDBCQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7R0FDekMsZ0JBQWdCLENBZ0I1QjtBQWhCWSw0Q0FBZ0IifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWdyYXRpb24tdGVzdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90ZXN0L2ludGVncmF0aW9uLXRlc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsOERBQXdEO0FBQ3hELCtCQUE4QjtBQUM5Qix5QkFBeUI7QUFDekIsdURBSzBCO0FBQzFCLDZCQUE2QjtBQUU3QixnQ0FBaUM7QUFFakMsd0RBTzhCO0FBRTlCLG9EQUFvRDtBQUVwRCxTQUFTLFlBQVksQ0FBQyxHQUFHLGtCQUFnRDtJQUN2RSxPQUFPLHVDQUF1QixDQUM1QixFQUFHLEVBQ0g7UUFDRSxhQUFhLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUU7UUFDeEMsa0JBQWtCLEVBQUUsRUFBRTtRQUN0QixnQkFBZ0IsRUFBRSxJQUFJO0tBQ3ZCLEVBQ0QsR0FBRyxrQkFBa0IsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQW1CLEVBQUUsRUFBRTtRQUNuRCwwQkFBVSxDQUFDLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUNoRixNQUFNLENBQUMsQ0FBQztJQUNWLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQztBQUdELElBQWEsZ0JBQWdCLEdBQTdCLE1BQWEsZ0JBQWdCO0lBQ3JCLGFBQWE7UUFDakIsSUFBSSxHQUFHLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSx5REFBeUQsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ3ZILElBQUksTUFBTSxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsMERBQTBELENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUMzSCxJQUFJLFFBQVEsR0FBRyxJQUFJLDhCQUFZLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUN0RCxPQUFPLFlBQVksQ0FBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQy9DLElBQUksUUFBUSxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLFlBQVksYUFBTyxDQUFDLENBQUM7WUFDdkYsYUFBTSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQ2pDLGFBQU0sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSx1Q0FBdUM7Z0JBQzNGLHdFQUF3RTtnQkFDeEUsK0lBQStJLENBQUMsQ0FBQztZQUNuSix5Q0FBeUM7WUFDekMsd0NBQXdDO1lBQ3hDLGlDQUFpQztZQUNqQyxNQUFNO1FBQ1IsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQ1gsSUFBSSxDQUFDLENBQUMsWUFBWSxFQUFFO2dCQUNsQixnQ0FBZ0IsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUM7YUFDbEM7WUFDRCxpQ0FBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNyQixNQUFNLENBQUMsQ0FBQztRQUNWLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUE7QUF0Qk87SUFBTCx1QkFBSTttREFxQko7QUF0QlUsZ0JBQWdCO0lBRDVCLHdCQUFLLENBQUMsbUJBQW1CLEVBQUUsdUJBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSwwQkFBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0dBQ3pDLGdCQUFnQixDQXVCNUI7QUF2QlksNENBQWdCIn0=

package.json

 {
   "name": "opticss",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "A CSS Optimizer",
@@ -81,3 +81,3 @@ "main": "dist/src/index.js",
   },
-  "gitHead": "e2af389dfbfea8f7f16ffee0ea8b1aa84abeb241"
+  "gitHead": "09ad45fbd39bf55a62a912f500db0e01ae4db570"
 }

src/Actions/index.ts

@@ -29,2 +29,3 @@ import { Action } from "./Action";
 export { Note } from "./actions/Note";
+export { Warning } from "./actions/Warning";
 export * from "./Action";

src/optimizations/MergeDeclarations/DeclarationMapper.ts

@@ -121,3 +121,3 @@ import { Element } from "@opticss/element-analysis";
             // values because selectors can conflict across different optimization contexts.
-            let longhandDeclarations = expandIfNecessary(context.authoredProps, decl.prop, decl.value, pass.actions);
+            let longhandDeclarations = expandIfNecessary(context.authoredProps, decl.prop, decl.value, pass.actions, decl);
             let longHandProps = Object.keys(longhandDeclarations);
@@ -124,0 +124,0 @@ let longHandDeclInfos = new Array<DeclarationInfo>();

src/optimizations/MergeDeclarations/index.ts

@@ -405,3 +405,3 @@ import {
       }
-      let expanded = expandIfNecessary(context.authoredProps, declInfos[0].prop, declInfos[0].value, actions);
+      let expanded = expandIfNecessary(context.authoredProps, declInfos[0].prop, declInfos[0].value, actions, declInfos[0].decl);
       nextMerge:
@@ -408,0 +408,0 @@ for (let unmergedDecl of declInfos) {

src/Optimizer.ts

@@ -220,3 +220,3 @@ import {
    */
-  optimize(outputFilename: string): Promise<OptimizationResult> {
+  async optimize(outputFilename: string): Promise<OptimizationResult> {
     let pass = new OptimizationPass(this.options, this.templateOptions);
@@ -226,30 +226,23 @@ let start = new Date();
     // Parse all input files.
-    return this.parseFiles(this.sources)
+    let files = await this.parseFiles(this.sources);
 
     // Run all initializers on parsed files.
-    .then(files => {
-      this.initialize(pass, files);
-      return files;
-    })
+    this.initialize(pass, files);
 
     // Run all optimizers on parsed files.
-    .then(files => {
-      return this.optimizeFiles(pass, files);
-    })
+    files = await this.optimizeFiles(pass, files);
 
     // Concatenate all files and return optimization result.
-    .then((files) => {
-      let output = this.concatenateFiles(files, outputFilename);
-      this.logTiming("total", start, new Date());
-      return {
-        output: {
-          filename: outputFilename,
-          content: output.content.toString(),
-          sourceMap: output.sourceMap,
-        },
-        styleMapping: pass.styleMapping,
-        actions: pass.actions,
-      };
-    });
+    let output = this.concatenateFiles(files, outputFilename);
+    this.logTiming("total", start, new Date());
 
+    return {
+      output: {
+        filename: outputFilename,
+        content: output.content.toString(),
+        sourceMap: output.sourceMap,
+      },
+      styleMapping: pass.styleMapping,
+      actions: pass.actions,
+    };
   }
@@ -288,3 +281,3 @@ }
 // This use of this plugin silences a postcss warning.
-export const POSTCSS_NOOP_PLUGIN = postcss.plugin("css-blocks-plugin", function (_opts) {
+export const POSTCSS_NOOP_PLUGIN = postcss.plugin("noop-plugin", function (_opts) {
   return function (_root, _result) {
@@ -291,0 +284,0 @@ return Promise.resolve();

src/util/shorthandProperties.ts

@@ -0,7 +1,9 @@
+import { SourcePosition } from "@opticss/element-analysis";
 import { StringDict } from "@opticss/util";
 import * as propParser from "css-property-parser";
+import * as postcss from "postcss";
 
 import {
   Actions,
-  Note,
+  Warning,
 } from "../Actions";
@@ -18,26 +20,3 @@
 
-export function fullyExpandShorthandProperty(prop: string, value: string) {
-  try {
-    let expanded = propParser.expandShorthandProperty(prop, value, true);
-    for (let p of Object.keys(expanded)) {
-      if (propParser.isShorthandProperty(p)) {
-        delete expanded[p];
-      }
-    }
-    return expanded;
-  } catch (e) {
-    if (/parsing shorthand property/.test(e.message)) {
-      // TODO: instrument this so it can be added to the optimization logger.
-      // tslint:disable-next-line:no-console
-      console.log(e.message + `(long hands for this declaration will not be optimized)`);
-      return {
-        [prop]: value,
-      };
-    } else {
-      throw e;
-    }
-  }
-}
-
-export function expandIfNecessary(authoredProps: Set<string>, prop: string, value: string, actions: Actions): StringDict {
+export function expandIfNecessary(authoredProps: Set<string>, prop: string, value: string, actions: Actions, decl: postcss.Declaration): StringDict {
   if (!propParser.isShorthandProperty(prop)) {
@@ -54,4 +33,7 @@ return {[prop]: value};
     if (/parsing shorthand property/.test(e.message)) {
-      actions.perform(new Note("mergeDeclarations", e.message + `(long hands for this declaration will not be optimized)`));
+      actions.perform(new Warning("mergeDeclarations", e.message + ` (long hands for this declaration will not be optimized)`, sourcePositionForNode(decl)));
       return { [prop]: value };
+    } else if (/is not a supported property/.test(e.message)) {
+      actions.perform(new Warning("mergeDeclarations", e.message + ` (long hands for this declaration with conflicting values will not be understood as such which could result in incorrect optimization output.)`, sourcePositionForNode(decl)));
+      return { [prop]: value };
     } else {
@@ -64,3 +46,3 @@ throw e;
     let v = longHandValues[p];
-    let expanded = expandIfNecessary(authoredProps, p, v, actions);
+    let expanded = expandIfNecessary(authoredProps, p, v, actions, decl);
     if (Object.keys(expanded).some(key => authoredProps.has(key))) {
@@ -77,1 +59,13 @@ Object.assign(longhandDeclarations, expanded);
 }
+
+function sourcePositionForNode(node: postcss.NodeBase): SourcePosition | undefined {
+  if (node.source && node.source.start) {
+    return {
+      filename: node.source.input.file,
+      line: node.source.start.line,
+      column: node.source.start.column,
+    };
+  } else {
+    return undefined;
+  }
+}

test/integration-tests.ts

@@ -1,4 +0,3 @@
-import {
-  TestTemplate,
-} from "@opticss/simple-template";
+import { TestTemplate } from "@opticss/simple-template";
+import { assert } from "chai";
 import * as fs from "fs";
@@ -13,2 +12,4 @@ import {
 
+import { Warning } from "../src";
+
 import {
@@ -22,2 +23,3 @@ CascadeTestError,
 } from "./util/assertCascade";
+
 // import { debugSize } from "./util/assertSmaller";
@@ -45,3 +47,8 @@
     let template = new TestTemplate("test", markup, true);
-    return testDefaults(css, template).then(_result => {
+    return testDefaults(css, template).then(result => {
+      let warnings = result.optimization.actions.performed.filter(a => a instanceof Warning);
+      assert.equal(warnings.length, 3);
+      assert.equal(warnings[0].logString(), `${process.cwd()}/test1.css:111:3 [mergeDeclarations] ` +
+        `Unsupported property error: grid-template is not a supported property ` +
+        `(long hands for this declaration with conflicting values will not be understood as such which could result in incorrect optimization output.)`);
       // logOptimizations(result.optimization);
@@ -52,3 +59,5 @@ // return debugSize(result).then(() => {
     }).catch(e => {
-      logOptimizations(e.optimization);
+      if (e.optimization) {
+        logOptimizations(e.optimization);
+      }
       debugCascadeError(e);
@@ -55,0 +64,0 @@ throw e;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1167003

increased by0.45%

Number of package files

227

increased by1.79%

Lines of code

14503

increased by0.15%

No dependency changes