awilix - npm Package Compare versions

Comparing version 4.2.3 to 4.2.4

CHANGELOG.md

@@ -0,5 +1,9 @@
+# v4.2.4
+
+- Fix issue with parsing comments ([#165](https://github.com/jeffijoe/awilix/pull/165), reported by [Jamie Corkhill](https://github.com/JamieCorkhill))
+
 # v4.2.3
 
-* Fix issue where calling `JSON.stringify` on the cradle would result in memory leak ([#153](https://github.com/jeffijoe/awilix/pull/119), [berndartmueller](https://github.com/berndartmueller))
-* Update packages
+- Fix issue where calling `JSON.stringify` on the cradle would result in memory leak ([#153](https://github.com/jeffijoe/awilix/pull/119), [berndartmueller](https://github.com/berndartmueller))
+- Update packages
 
@@ -6,0 +10,0 @@ # v4.2.2

lib/awilix.browser.js

@@ -277,3 +277,3 @@ /*! *****************************************************************************
                     if (nextCh === '/') {
-                        skipUntil(function (c) { return c === '\n'; });
+                        skipUntil(function (c) { return c === '\n'; }, true);
                         pos++;
@@ -285,3 +285,3 @@ }
                             return c === '*' && closing === '/';
-                        });
+                        }, true);
                         pos++;
@@ -343,4 +343,9 @@ }
      * Skips strings and whilespace until the predicate is true.
+     *
+     * @param callback stops skipping when this returns `true`.
+     * @param dumb if `true`, does not skip whitespace and strings;
+     * it only stops once the callback returns `true`.
      */
-    function skipUntil(callback) {
+    function skipUntil(callback, dumb) {
+        if (dumb === void 0) { dumb = false; }
         while (pos < source.length) {
@@ -351,10 +356,12 @@ var ch = source.charAt(pos);
             }
-            if (isWhiteSpace(ch)) {
-                pos++;
-                continue;
+            if (!dumb) {
+                if (isWhiteSpace(ch)) {
+                    pos++;
+                    continue;
+                }
+                if (isStringQuote(ch)) {
+                    skipString();
+                    continue;
+                }
             }
-            if (isStringQuote(ch)) {
-                skipString();
-                continue;
-            }
             pos++;
@@ -361,0 +368,0 @@ }

lib/awilix.module.js

 import { sync } from 'glob';
 import { basename, resolve } from 'path';
 import { inspect } from 'util';
+import { camelCase } from 'camel-case';
 
@@ -190,3 +191,3 @@ /**
                     if (nextCh === '/') {
-                        skipUntil(c => c === '\n');
+                        skipUntil(c => c === '\n', true);
                         pos++;
@@ -198,3 +199,3 @@ }
                             return c === '*' && closing === '/';
-                        });
+                        }, true);
                         pos++;
@@ -256,4 +257,8 @@ }
      * Skips strings and whilespace until the predicate is true.
+     *
+     * @param callback stops skipping when this returns `true`.
+     * @param dumb if `true`, does not skip whitespace and strings;
+     * it only stops once the callback returns `true`.
      */
-    function skipUntil(callback) {
+    function skipUntil(callback, dumb = false) {
         while (pos < source.length) {
@@ -264,10 +269,12 @@ let ch = source.charAt(pos);
             }
-            if (isWhiteSpace(ch)) {
-                pos++;
-                continue;
+            if (!dumb) {
+                if (isWhiteSpace(ch)) {
+                    pos++;
+                    continue;
+                }
+                if (isStringQuote(ch)) {
+                    skipString();
+                    continue;
+                }
             }
-            if (isStringQuote(ch)) {
-                skipString();
-                continue;
-            }
             pos++;
@@ -995,5 +1002,4 @@ }
 
-const camelCase = require('camel-case');
 const nameFormatters = {
-    camelCase
+    camelCase: s => camelCase(s)
 };
@@ -1000,0 +1006,0 @@ /**

lib/awilix.umd.js

@@ -283,3 +283,3 @@ (function (global, factory) {
                         if (nextCh === '/') {
-                            skipUntil(function (c) { return c === '\n'; });
+                            skipUntil(function (c) { return c === '\n'; }, true);
                             pos++;
@@ -291,3 +291,3 @@ }
                                 return c === '*' && closing === '/';
-                            });
+                            }, true);
                             pos++;
@@ -349,4 +349,9 @@ }
          * Skips strings and whilespace until the predicate is true.
+         *
+         * @param callback stops skipping when this returns `true`.
+         * @param dumb if `true`, does not skip whitespace and strings;
+         * it only stops once the callback returns `true`.
          */
-        function skipUntil(callback) {
+        function skipUntil(callback, dumb) {
+            if (dumb === void 0) { dumb = false; }
             while (pos < source.length) {
@@ -357,10 +362,12 @@ var ch = source.charAt(pos);
                 }
-                if (isWhiteSpace(ch)) {
-                    pos++;
-                    continue;
+                if (!dumb) {
+                    if (isWhiteSpace(ch)) {
+                        pos++;
+                        continue;
+                    }
+                    if (isStringQuote(ch)) {
+                        skipString();
+                        continue;
+                    }
                 }
-                if (isStringQuote(ch)) {
-                    skipString();
-                    continue;
-                }
                 pos++;
@@ -367,0 +374,0 @@ }

lib/function-tokenizer.js

@@ -74,3 +74,3 @@ "use strict";
                     if (nextCh === '/') {
-                        skipUntil(c => c === '\n');
+                        skipUntil(c => c === '\n', true);
                         pos++;
@@ -82,3 +82,3 @@ }
                             return c === '*' && closing === '/';
-                        });
+                        }, true);
                         pos++;
@@ -140,4 +140,8 @@ }
      * Skips strings and whilespace until the predicate is true.
+     *
+     * @param callback stops skipping when this returns `true`.
+     * @param dumb if `true`, does not skip whitespace and strings;
+     * it only stops once the callback returns `true`.
      */
-    function skipUntil(callback) {
+    function skipUntil(callback, dumb = false) {
         while (pos < source.length) {
@@ -148,10 +152,12 @@ let ch = source.charAt(pos);
             }
-            if (isWhiteSpace(ch)) {
-                pos++;
-                continue;
+            if (!dumb) {
+                if (isWhiteSpace(ch)) {
+                    pos++;
+                    continue;
+                }
+                if (isStringQuote(ch)) {
+                    skipString();
+                    continue;
+                }
             }
-            if (isStringQuote(ch)) {
-                skipString();
-                continue;
-            }
             pos++;
@@ -158,0 +164,0 @@ }

lib/load-modules.js

@@ -6,5 +6,5 @@ "use strict";
 const utils_1 = require("./utils");
-const camelCase = require('camel-case');
+const camel_case_1 = require("camel-case");
 const nameFormatters = {
-    camelCase
+    camelCase: s => camel_case_1.camelCase(s)
 };
@@ -11,0 +11,0 @@ /**

package.json

 {
   "name": "awilix",
-  "version": "4.2.3",
+  "version": "4.2.4",
   "description": "Extremely powerful dependency injection container.",
@@ -53,32 +53,32 @@ "main": "lib/awilix.js",
   "devDependencies": {
-    "@babel/core": "^7.7.4",
-    "@babel/plugin-transform-runtime": "^7.7.4",
-    "@babel/preset-env": "^7.7.4",
-    "@babel/runtime": "^7.7.4",
+    "@babel/core": "^7.8.4",
+    "@babel/plugin-transform-runtime": "^7.8.3",
+    "@babel/preset-env": "^7.8.4",
+    "@babel/runtime": "^7.8.4",
     "@types/glob": "^7.1.1",
-    "@types/jest": "^24.0.23",
-    "@types/node": "^12.12.12",
+    "@types/jest": "^25.1.3",
+    "@types/node": "^13.7.4",
     "@types/prettier": "^1.19.0",
-    "babel-jest": "^24.9.0",
-    "coveralls": "^3.0.8",
-    "husky": "^3.1.0",
+    "babel-jest": "^25.1.0",
+    "coveralls": "^3.0.9",
+    "husky": "^4.2.3",
     "istanbul": "^0.4.5",
-    "jest": "^24.9.0",
-    "lint-staged": "^9.4.3",
+    "jest": "^25.1.0",
+    "lint-staged": "^10.0.7",
     "prettier": "^1.19.1",
-    "rollup": "^1.27.5",
+    "rollup": "^1.31.1",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-typescript2": "^0.25.2",
+    "rollup-plugin-typescript2": "^0.26.0",
     "smid": "^0.1.1",
-    "ts-jest": "^24.2.0",
+    "ts-jest": "^25.2.1",
     "tslib": "^1.10.0",
-    "tslint": "^5.20.1",
+    "tslint": "^6.0.0",
     "tslint-config-prettier": "^1.18.0",
     "tslint-config-standard": "^9.0.0",
-    "typescript": "^3.7.2"
+    "typescript": "^3.7.5"
   },
   "dependencies": {
-    "camel-case": "^3.0.0",
+    "camel-case": "^4.1.1",
     "glob": "^7.1.6"
@@ -85,0 +85,0 @@ },

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

304990

increased by0.53%

Lines of code

6426

increased by0.41%

Dependency changes

• + Addedcamel-case@4.1.2(transitive)

• + Addedlower-case@2.0.2(transitive)

• + Addedno-case@3.0.4(transitive)

• + Addedpascal-case@3.1.2(transitive)

• + Addedtslib@2.7.0(transitive)

• - Removedcamel-case@3.0.0(transitive)

• - Removedlower-case@1.1.4(transitive)

• - Removedno-case@2.3.2(transitive)

• - Removedupper-case@1.1.3(transitive)

• Updatedcamel-case@^4.1.1