hyphen - npm Package Compare versions

Comparing version 1.7.1 to 1.7.2

hyphen.js

@@ -71,81 +71,76 @@ /** Text hyphenation in Javascript.
 
-  function createTextChunkReader(text, hyphenChar, skipHTML, minWordLength) {
-    function readNextTextChunk() {
-      var nextTextChunk = "";
-      shouldHyphenate = void 0;
-      chunkReader: while (nextCharIndex <= text.length) {
-        var nextChar = text.charAt(nextCharIndex++),
-          charIsLetter =
-            (!!nextChar &&
-              !/\s|[\!-\@\[-\`\{-\~\u2013-\u203C]/.test(nextChar)) ||
-            nextChar === "'",
-          charIsAngleOpen = nextChar === "<",
-          charIsAngleClose = nextChar === ">",
-          charIsHyphen = nextChar === hyphenChar;
-        do {
-          if (state === STATE_READ_TAG) {
-            if (charIsAngleClose) {
-              state = STATE_RETURN_UNTOUCHED;
-            }
-            break;
+  function createTextReader(setup) {
+    var char1 = "";
+    var char2 = "";
+    var i = 0;
+    var verifier = setup();
+    return function (text) {
+      while (i < text.length) {
+        char1 = text.charAt(i++);
+        char2 = text.charAt(i);
+        var verified = verifier(char1, char2);
+        if (verified !== void 0) {
+          return verified;
+        }
+      }
+    };
+  }
+
+  var isNotLetter = RegExp.prototype.test.bind(
+    /\s|(?![\'])[\!-\@\[-\`\{-\~\u2013-\u203C]/
+  );
+  function createHyphenationVerifier(hyphenChar, skipHTML, minWordLength) {
+    return function () {
+      var accum0 = "";
+      var accum = "";
+      var isHTMLTag = false;
+      var skipCurrent = false;
+      function resolveWith(value) {
+        accum0 = "";
+        accum = "";
+        isHTMLTag = false;
+        skipCurrent = false;
+        return value;
+      }
+      return function (char1, char2) {
+        accum += char1;
+        if (isHTMLTag) {
+          if (char1 === ">") {
+            accum0 += accum;
+            accum = "";
+            isHTMLTag = false;
           }
-          if (charIsHyphen) {
-            shouldHyphenate = SHOULD_SKIP;
-            state = STATE_READ_WORD;
-            break;
+        } else {
+          if (char1 === hyphenChar) {
+            skipCurrent = true;
           }
-          if (charIsLetter) {
-            state = STATE_READ_WORD;
-            break;
+          if (
+            char1 === "<" &&
+            (!isNotLetter(char2) || char2 === "/") &&
+            skipHTML
+          ) {
+            isHTMLTag = true;
           }
-          if (state === STATE_READ_WORD) {
-            state = STATE_RETURN_WORD;
-            shouldHyphenate =
-              shouldHyphenate ||
-              (nextTextChunk.length >= minWordLength && SHOULD_HYPHENATE);
-            break;
+          if (isNotLetter(char1) && !isNotLetter(char2)) {
+            accum0 += accum;
+            accum = "";
           }
-          shouldHyphenate = SHOULD_SKIP;
-          state = STATE_RETURN_UNTOUCHED;
-        } while (0);
-        if (
-          charIsAngleOpen &&
-          state !== STATE_RETURN_WORD &&
-          skipHTML &&
-          !isSpacelike(text.charAt(nextCharIndex))
-        ) {
-          shouldHyphenate = SHOULD_SKIP;
-          state = STATE_READ_TAG;
+          if (!isNotLetter(char1) && isNotLetter(char2)) {
+            if (accum.length >= minWordLength && !skipCurrent) {
+              return resolveWith([accum0, accum]);
+            } else {
+              accum0 += accum;
+              accum = "";
+            }
+          }
         }
-        switch (state) {
-          case STATE_READ_TAG:
-            nextTextChunk += nextChar;
-            break;
-          case STATE_READ_WORD:
-            nextTextChunk += nextChar;
-            break;
-          case STATE_RETURN_UNTOUCHED:
-            nextTextChunk += nextChar;
-            break chunkReader;
-          case STATE_RETURN_WORD:
-            nextCharIndex--;
-            break chunkReader;
+        if (char2 === "") {
+          if (accum.length < minWordLength || skipCurrent) {
+            accum0 += accum;
+            accum = "";
+          }
+          return resolveWith([accum0, accum]);
         }
-      }
-      return nextTextChunk || void 0;
-    }
-    function shouldNextHyphenate() {
-      return shouldHyphenate === SHOULD_HYPHENATE;
-    }
-    var isSpacelike = RegExp.prototype.test.bind(/\s/);
-    var nextCharIndex = 0,
-      SHOULD_HYPHENATE = 1,
-      SHOULD_SKIP = 2,
-      shouldHyphenate,
-      STATE_READ_TAG = 1,
-      STATE_READ_WORD = 2,
-      STATE_RETURN_UNTOUCHED = 3,
-      STATE_RETURN_WORD = 4,
-      state;
-    return [readNextTextChunk, shouldNextHyphenate];
+      };
+    };
   }
@@ -281,13 +276,12 @@
     }
-    var cacheKey,
-      newText = "",
-      textChunk,
-      reader = createTextChunkReader(text, hyphenChar, skipHTML, minWordLength),
-      readNextTextChunk = reader[0],
-      shouldNextHyphenate = reader[1],
+    var newText = "",
+      fragments,
+      readText = createTextReader(
+        createHyphenationVerifier(hyphenChar, skipHTML, minWordLength)
+      ),
       processedN = 0,
-      hyphenatedN = 0;
-    var allTime = /* @__PURE__ */ new Date(),
-      workTime = 0;
-    var resolveNewText = function () {};
+      hyphenatedN = 0,
+      allTime = /* @__PURE__ */ new Date(),
+      workTime = 0,
+      resolveNewText = function () {};
     function nextTick() {
@@ -297,9 +291,9 @@ var loopStart = /* @__PURE__ */ new Date();
         (!isAsync || /* @__PURE__ */ new Date() - loopStart < 10) &&
-        (textChunk = readNextTextChunk())
+        (fragments = readText(text))
       ) {
-        cacheKey = textChunk.length ? "$" + textChunk : "";
-        if (shouldNextHyphenate()) {
+        if (fragments[1]) {
+          var cacheKey = fragments[1].length ? "$" + fragments[1] : "";
           if (cache[cacheKey] === void 0) {
             cache[cacheKey] = hyphenateWord(
-              textChunk,
+              fragments[1],
               patterns,
@@ -310,12 +304,12 @@ debug,
           }
-          if (textChunk !== cache[cacheKey]) {
+          if (fragments[1] !== cache[cacheKey]) {
             hyphenatedN++;
           }
-          textChunk = cache[cacheKey];
+          fragments[1] = cache[cacheKey];
         }
-        newText += textChunk;
+        newText += fragments[0] + fragments[1];
         processedN++;
       }
       workTime += /* @__PURE__ */ new Date() - loopStart;
-      if (!textChunk) {
+      if (!fragments) {
         done();
@@ -322,0 +316,0 @@ } else {

package.json

 {
   "name": "hyphen",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Text hyphenation in Javascript.",
@@ -5,0 +5,0 @@ "repository": {

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

5413405

increased by1.29%

Number of package files

174

increased by1.16%

Lines of code

349580

increased by1.46%

No dependency changes