font-range 1.0.2 → 1.0.3

package/README.md

@@ -21,7 +21,7 @@ Google Font provides a subset of [Korean](https://design.google/news/google-font
 It has dependencies on the following packages:
 
 ```sh
-pip install fonttools[ufo,woff,unicode] zopfli brotli
+pip3 install fonttools[ufo,woff,unicode] zopfli brotli
 ```
 
 ### Basics
@@ -117,9 +117,9 @@ interface FontRangeOptionI extends FontDefaultOptionI {
 ```
 - `default`: The `index` of the file name increases in the generated order
 - `srcIndex`: The `index` of the file name uses [`src`](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src) in CSS [#9](https://github.com/black7375/font-range/issues/9)
-  - Based on the first `url()`
+  - Chooses the first `url()` that matches the requested output format; otherwise use the first `url()`.
 - `srcName`: The file name uses [`src`](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src) in CSS
-  - Based on the first `url()`
+  - Uses the first `url()` that matches the requested output format; otherwise use the first `url()`.
 
 ### Font Subset
 
@@ -140,7 +140,7 @@ interface FontSubsetOptionI extends FontDefaultOptionI {
 
 It offers a simple API when doing a large amount of subsets.
 
-Performance is optimized using worker poll and provides sharding for distributed environments.
+Performance is optimized using worker pool and provides sharding for distributed environments.
 
 #### Option
 
@@ -164,7 +164,7 @@ fontPipe([{ font_path1 }, { font_path2 }], "<index>/<total>");
 
 - Environment Variable: Make it easy to use in CI, npm scripts, ..etc.
 ```sh
-SHARD=<index>/total
+SHARD="<index>/<total>"
 node subset.js
 ```
 

package/build/main.js

@@ -104,12 +104,29 @@ const parseOptions = {
     parseRulePrelude: false,
     parseValue: false
 };
+function existsDir(dirPath) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            yield (0, promises_1.stat)(dirPath);
+        }
+        catch (err) {
+            if (err.code === "ENOENT") {
+                try {
+                    yield (0, promises_1.mkdir)(dirPath);
+                }
+                catch (err) {
+                    if (err.code !== "EEXIST") {
+                        throw err;
+                    }
+                }
+            }
+        }
+    });
+}
 function loadAST(dirPath, url = exports.targets.korean, parseOption = parseOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const cssPath = getCSSPath(dirPath, url);
-        if (!(0, fs_1.existsSync)(dirPath)) {
-            yield (0, promises_1.mkdir)(dirPath);
-        }
+        yield existsDir(dirPath);
         if (!(0, fs_1.existsSync)(cssPath)) {
             yield saveCSS(cssPath, url);
         }
@@ -236,27 +253,60 @@ function getOptionInfos(fontPath = "", fontOption, indexIndicate = "") {
         logMsg,
         baseOption,
         worker,
+        format,
         fromCSS: options.fromCSS
     };
 }
-function getSrcInfo(src) {
-    const first = src.split(",").find((str) => {
-        return str.indexOf("url(") === 0;
+function getURLCandidates(src) {
+    const reStr = "url\\(";
+    const reMdl = "(.+?)";
+    const reEnd = "\\)";
+    const quote = "(\\\\?['\"])?";
+    const regex = new RegExp(reStr + quote + reMdl + quote + reEnd, "g");
+    const candidates = [];
+    let matched = regex.exec(src);
+    while (matched !== null) {
+        const candidate = matched[2].trim();
+        if (candidate !== "") {
+            candidates.push(candidate);
+        }
+        matched = regex.exec(src);
+    }
+    return candidates;
+}
+function getURLCandidateByFormat(candidates, format) {
+    const normalizedFormat = getFormat(format).toLowerCase();
+    const target = candidates.find((candidate) => {
+        const parsedPath = (() => {
+            try {
+                return new URL(candidate).pathname;
+            }
+            catch (_a) {
+                return candidate;
+            }
+        })();
+        const ext = (0, path_1.parse)(parsedPath.split(/[?#]/)[0])
+            .ext.toLowerCase()
+            .replace(".", "");
+        return ext === normalizedFormat;
     });
-    if (typeof first === "undefined")
+    return (typeof target === "undefined") ? candidates[0] : target;
+}
+function getSrcInfo(src, format) {
+    const candidates = getURLCandidates(src);
+    if (candidates.length === 0)
         return {
             base: "",
+            name: "",
             index: 0
         };
-    const reStr = "url\\(";
-    const reMdl = "(.+?)";
-    const reEnd = "\\)";
-    const quote = "(\\\\?['\"])?";
-    const regex = new RegExp(reStr + quote + reMdl + quote + reEnd);
-    const urlContent = first.match(regex)[2];
-    const parsedURL = (0, path_1.parse)(urlContent);
+    const srcPath = (typeof format === "undefined")
+        ? candidates[0]
+        : getURLCandidateByFormat(candidates, format);
+    const parsedURL = (0, path_1.parse)(srcPath.split(/[?#]/)[0]);
     return {
         base: parsedURL.base,
+        name: parsedURL.name,
         index: parseInt(parsedURL.name.split(".").pop())
     };
 }
@@ -278,15 +328,18 @@ function getSubsetOption(fontSubsetOption) {
 }
 function fontRange(fontPath = "", url = exports.targets.korean, fontRangeOption) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { dirPath, initName, logMsg, baseOption, worker, fromCSS } = getOptionInfos(fontPath, fontRangeOption, "n");
+        const { dirPath, initName, logMsg, baseOption, worker, format, fromCSS } = getOptionInfos(fontPath, fontRangeOption, "n");
         const ranges = yield parseCSS(dirPath, url);
         const result = ranges.map(({ src, unicodes }, i) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const srcInfo = getSrcInfo(src);
-            const saveOption = getSaveOption(dirPath, (fromCSS === "srcName" && srcInfo.base !== "")
-                ? srcInfo.base
-                : initName, (fromCSS === "srcIndex" && srcInfo.base !== "")
+            const srcInfo = getSrcInfo(src, format);
+            const srcIndex = ((fromCSS === "srcIndex" && srcInfo.base !== "") &&
+                !Number.isNaN(srcInfo.index))
                 ? srcInfo.index
-                : i);
+                : i;
+            const srcName = (fromCSS === "srcName" && srcInfo.base !== "")
+                ? srcInfo.name + "." + getFormat(format)
+                : initName;
+            const saveOption = getSaveOption(dirPath, srcName, srcIndex);
             const unicodeRanges = unicodes.split(", ").join(",");
             const unicodeOption = "--unicodes=" + unicodeRanges;
             const options = [fontPath, saveOption, unicodeOption, ...baseOption];
@@ -301,8 +354,7 @@ exports.fontRange = fontRange;
 function fontSubset(fontPath = "", fontSubsetOption) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { dirPath, initName, logMsg, baseOption, worker } = getOptionInfos(fontPath, fontSubsetOption);
-        if (!(0, fs_1.existsSync)(dirPath))
-            yield (0, promises_1.mkdir)(dirPath);
+        yield existsDir(dirPath);
         const subsetOption = getSubsetOption(fontSubsetOption);
         const saveOption = getSaveOption(dirPath, initName);
         const options = [fontPath, saveOption, subsetOption, ...baseOption];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "font-range",
   "description": " Font subset with google font's ML result.",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": "black7375 <alstjr7375@daum.net>",
   "license": "MIT",
   "files": [
@@ -31,18 +31,18 @@
   },
   "devDependencies": {
     "@types/command-exists": "^1.2.0",
-    "@types/jest": "^29.2.5",
-    "@types/node": "^18.11.18",
-    "@typescript-eslint/eslint-plugin": "^5.48.0",
-    "@typescript-eslint/parser": "^5.48.0",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^20.4.10",
+    "@typescript-eslint/eslint-plugin": "^6.3.0",
+    "@typescript-eslint/parser": "^6.3.0",
     "command-exists": "^1.2.9",
-    "eslint": "^8.31.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-jest": "^27.2.1",
-    "jest": "^29.3.1",
-    "prettier": "^2.8.1",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^29.0.3",
+    "eslint": "^8.47.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-jest": "^27.2.3",
+    "jest": "^29.7.0",
+    "prettier": "^3.0.1",
+    "rimraf": "^5.0.1",
+    "ts-jest": "^29.4.6",
     "tsutils": "^3.21.0",
     "typescript": "^4.9.4"
   },
@@ -53,16 +53,16 @@
     "build": "tsc -p tsconfig.release.json",
     "build:watch": "tsc -w -p tsconfig.release.json",
     "lint": "eslint . --ext .ts,.tsx",
-    "test": "jest --coverage --detectOpenHandles",
+    "test": "jest --coverage --detectOpenHandles --forceExit --testTimeout=120000",
     "test:watch": "jest --watch"
   },
   "dependencies": {
     "@esm2cjs/execa": "^6.1.1-cjs.1",
-    "@esm2cjs/node-fetch": "^3.2.10",
-    "@types/css-tree": "^2.0.1",
+    "@esm2cjs/node-fetch": "^3.3.1",
+    "@types/css-tree": "^2.3.1",
     "css-tree": "^2.3.1",
     "piscina": "^3.2.0",
-    "tslib": "^2.4.1"
+    "tslib": "^2.6.1"
   },
   "volta": {
     "node": "16.16.0",