font-range 0.1.2 → 0.2.1

package/__tests__/main.test.ts

@@ -1,6 +1,6 @@
 import { targets, getUnicodeRanges, fontRange } from '../src/main';
 import { join, parse } from 'path';
-import { existsSync } from 'fs';
+import { existsSync, unlink, NoParamCallback } from 'fs';
 import fetch from 'node-fetch';
 
 describe("Preset Check", () => {
@@ -22,11 +22,39 @@ describe("Preset Check", () => {
   });
 });
 
-describe("FontRange Feature", () => {
-  const fontPath = join("__tests__", "font", "NotoSansKR-Regular.otf");
-  const fontInfo = parse(fontPath);
-  const fontDir  = fontInfo.dir;
-  const fontName = fontInfo.name;
+const fontPath = join("__tests__", "font", "NotoSansKR-Regular.otf");
+const fontInfo = parse(fontPath);
+const fontDir  = fontInfo.dir;
+const fontName = fontInfo.name;
+const errCallback: NoParamCallback = (err) => {
+  if(err) {
+    console.error(err);
+    return;
+  }
+}
+
+describe("FontRange Offline Feature", () => {
+  const cssPath = join("__tests__", "font", "NotoSansKR-Local.css");
+  beforeAll(() => {
+    return fontRange(cssPath, fontPath, {
+      nameFormat: "{NAME}.subset.{INDEX}{EXT}"
+    });
+  });
+
+  it("Font Created Check", async () => {
+    const ranges  = await getUnicodeRanges(fontDir, cssPath);
+    const rangesL = ranges.length;
+    for (let counts = 0; counts < rangesL; counts++) {
+      const eachFontPath = join(fontDir, fontName + ".subset." + counts + ".woff2");
+      expect(existsSync(eachFontPath)).toBe(true);
+
+      // Remove file
+      unlink(eachFontPath, errCallback);
+    }
+  });
+});
+
+describe("FontRange Online Feature", () => {
   beforeAll(() => {
     return fontRange(targets.korean, fontPath);
   });
@@ -42,6 +70,9 @@ describe("FontRange Feature", () => {
     for (let counts = 0; counts < rangesL; counts++) {
       const eachFontPath = join(fontDir, fontName + "_" + counts + ".woff2");
       expect(existsSync(eachFontPath)).toBe(true);
+
+      // Remove file
+      unlink(eachFontPath, errCallback);
     }
   });
 });

package/build/src/main.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="node" />
+export declare const targets: {
+    weston: string;
+    korean: string;
+    japanese: string;
+    chinese: string;
+    chinese_traditional: string;
+};
+export declare function getUnicodeRanges(dirPath?: string, url?: string): Promise<string[]>;
+interface fontRangeOptionI {
+    savePath: string;
+    format: string;
+    nameFormat: string;
+    defaultArgs: string;
+    etcArgs: string;
+}
+export declare function fontRange(url?: string, fontPath?: string, fontRangeOption?: fontRangeOptionI['savePath'] | Partial<fontRangeOptionI>): Promise<Buffer[]>;
+export {};

package/build/src/main.js

@@ -0,0 +1,199 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fontRange = exports.getUnicodeRanges = exports.targets = void 0;
+const tslib_1 = require("tslib");
+const path_1 = require("path");
+const fs_1 = require("fs");
+const node_fetch_1 = require("node-fetch");
+const css_tree_1 = require("css-tree");
+const child_process_1 = require("child_process");
+exports.targets = {
+    weston: "https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap",
+    korean: "https://fonts.googleapis.com/css2?family=Noto+Sans+KR&display=swap",
+    japanese: "https://fonts.googleapis.com/css2?family=Noto+Sans+JP&display=swap",
+    chinese: "https://fonts.googleapis.com/css2?family=Noto+Sans+SC&display=swap",
+    chinese_traditional: "https://fonts.googleapis.com/css2?family=Noto+Sans+TC&display=swap",
+};
+function getFontName(url) {
+    const encodedURL = decodeURI(url);
+    const urlObj = new URL(encodedURL);
+    const urlParams = urlObj.searchParams;
+    const fontName = urlParams.get("family");
+    return fontName;
+}
+function validURL(str) {
+    const pattern = new RegExp("^(https?:\\/\\/)?" +
+        "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" +
+        "((\\d{1,3}\\.){3}\\d{1,3}))" +
+        "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" +
+        "(\\?[;&a-z\\d%_.~+=-]*)?" +
+        "(\\#[-a-z\\d_]*)?$", "i");
+    return !!pattern.test(str);
+}
+function getCSSPath(dirPath, url) {
+    if (validURL(url)) {
+        const fontName = getFontName(url);
+        const cssPath = (0, path_1.join)(dirPath, fontName + ".css");
+        return cssPath;
+    }
+    if (!(0, fs_1.existsSync)(url)) {
+        throw new Error(url + "Not vaild URL or PATH");
+    }
+    return url;
+}
+function saveCSS(path, url) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const headers = new node_fetch_1.Headers({
+            "Accept": "text/html,application/xhtml+xml,application/xml;",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0"
+        });
+        const res = yield (0, node_fetch_1.default)(url, {
+            method: "GET",
+            headers: headers
+        });
+        const fileStream = (0, fs_1.createWriteStream)(path);
+        yield new Promise((resolve, reject) => {
+            res.body.pipe(fileStream);
+            res.body.on("error", (err) => {
+                console.log('File write Error.');
+                reject(err);
+            });
+            fileStream.on("finish", function () {
+                resolve();
+            });
+        });
+    });
+}
+function readCSS(path) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            const readData = [];
+            (0, fs_1.createReadStream)(path)
+                .on('data', (data) => {
+                readData.push(data);
+            })
+                .on('end', () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+                yield Promise.all(readData);
+                const css = readData.join('');
+                resolve(css);
+            }))
+                .on('error', reject);
+        });
+    });
+}
+const parseOptions = {
+    parseAtrulePrelude: false,
+    parseRulePrelude: false,
+    parseValue: false
+};
+function loadAST(dirPath, url = exports.targets.korean, parseOption = parseOptions) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const cssPath = getCSSPath(dirPath, url);
+        if (!(0, fs_1.existsSync)(dirPath)) {
+            (0, fs_1.mkdirSync)(dirPath);
+        }
+        if (!(0, fs_1.existsSync)(cssPath)) {
+            yield saveCSS(cssPath, url);
+        }
+        const css = yield readCSS(cssPath);
+        const ast = yield (0, css_tree_1.parse)(css, parseOption);
+        return ast;
+    });
+}
+function parseUnicodeRanges(parsed) {
+    const fontFaceL = parsed.children;
+    const uniRangeL = fontFaceL.map((faceValObj => {
+        const faceBlockL = faceValObj.block.children;
+        const uniRangeBlockL = faceBlockL.filter(faceBlock => faceBlock.property === "unicode-range");
+        const uniRangeL = uniRangeBlockL.map(uniRangeBlock => uniRangeBlock.value.value);
+        return uniRangeL.head.data;
+    }));
+    const uniRanges = [];
+    uniRangeL.forEach(unicodeRange => {
+        uniRanges.push(unicodeRange);
+    });
+    return uniRanges;
+}
+function getUnicodeRanges(dirPath = "src", url = exports.targets.korean) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const ast = yield loadAST(dirPath, url);
+        return parseUnicodeRanges(ast);
+    });
+}
+exports.getUnicodeRanges = getUnicodeRanges;
+function getDefaultOptions() {
+    return {
+        format: "woff2",
+        nameFormat: "{NAME}_{INDEX}{EXT}",
+        defaultArgs: "--layout-features='*' \
+                  --glyph-names \
+                  --symbol-cmap \
+                  --legacy-cmap \
+                  --notdef-glyph \
+                  --notdef-outline \
+                  --recommended-glyphs \
+                  --name-legacy \
+                  --drop-tables= \
+                  --name-IDs='*' \
+                  --name-languages='*'",
+        etcArgs: ""
+    };
+}
+function getOption(options, key, alterValue) {
+    return Object.prototype.hasOwnProperty.call(options, key)
+        ? options[key]
+        : alterValue;
+}
+function getName(nameFormat, fontName, index, fontExt) {
+    return nameFormat
+        .replace("{NAME}", fontName)
+        .replace("{INDEX}", index.toString())
+        .replace("{EXT}", fontExt);
+}
+function getFormat(format) {
+    switch (format) {
+        case "otf": return "otf";
+        case "ttf": return "ttf";
+        case "woff2": return "woff2";
+        case "woff": return "woff";
+        case "woff-zopfli": return "woff";
+        default: return "woff2";
+    }
+}
+function formatOption(format, ext = true) {
+    const formatName = getFormat(format);
+    if (ext)
+        return "." + formatName;
+    if (format === "otf" || format === "ttf")
+        return "";
+    return "--flavor='" + ((format === "woff-zopfli")
+        ? formatName + "' --with-zopfli "
+        : formatName + "' ");
+}
+function fontRange(url = exports.targets.korean, fontPath = "", fontRangeOption) {
+    const options = Object.assign(getDefaultOptions(), typeof (fontRangeOption) === 'string'
+        ? { savePath: fontRangeOption }
+        : fontRangeOption);
+    const format = options.format;
+    const pathInfo = (0, path_1.parse)(fontPath);
+    const fontDir = pathInfo.dir;
+    const fontName = pathInfo.name;
+    const fontExt = formatOption(format);
+    const dirPath = getOption(options, 'savePath', fontDir);
+    const ranges = getUnicodeRanges(dirPath, url);
+    const convertOption = formatOption(format, false);
+    const defaultOption = options.defaultArgs;
+    const etcOption = options.etcArgs;
+    const nameFormat = options.nameFormat;
+    return ranges.then(eachRanges => eachRanges.map((unicodes, i) => {
+        const saveOption = "--output-file='" +
+            (0, path_1.join)(dirPath, getName(nameFormat, fontName, i, fontExt)) + "' ";
+        const unicodeRanges = unicodes.split(', ').join(',');
+        const unicodeOption = "--unicodes='" + unicodeRanges + "' ";
+        const options = " '" + fontPath + "' " + saveOption + unicodeOption
+            + convertOption + defaultOption + etcOption;
+        return (0, child_process_1.execSync)("pyftsubset" + options);
+    }));
+}
+exports.fontRange = fontRange;
+//# sourceMappingURL=main.js.map

package/build/src/main.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}

package/build/src/types.d.ts

@@ -0,0 +1,4 @@
+declare type Diff<T, U> = T extends U ? never : T;
+export declare type RequiredByValueExcept<T, TOptional extends keyof T> = Pick<T, Diff<keyof T, TOptional>> & Partial<T>;
+export declare type ValueOf<T> = T[keyof T];
+export {};

package/build/src/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/build/src/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "font-range",
   "description": " Font subset with google font's ML result.",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "author": "black7375 <alstjr7375@daum.net>",
   "license": "MIT",
   "keywords": [
@@ -27,21 +27,23 @@
     "node": ">= 12.13"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.2",
+    "@types/jest": "^27.4.0",
     "@types/node": "^16.10.9",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
     "command-exists": "^1.2.9",
-    "eslint": "~7.31.0",
+    "eslint": "~8.7.0",
     "eslint-config-prettier": "~8.3.0",
-    "eslint-plugin-jest": "^25.0.5",
-    "jest": "^27.2.5",
-    "prettier": "^2.4.1",
+    "eslint-plugin-jest": "^26.0.0",
+    "jest": "^27.4.7",
+    "prettier": "^2.5.1",
     "rimraf": "~3.0.2",
-    "ts-jest": "^27.0.5",
+    "ts-jest": "^27.1.3",
     "tsutils": "~3.21.0",
-    "typescript": "^4.4.4"
+    "typescript": "^4.4.5"
   },
+  "main": "build/src/main.js",
+  "typings": "build/src/main.d.ts",
   "scripts": {
     "clean": "rimraf coverage build tmp",
     "build": "tsc -p tsconfig.release.json",
@@ -51,14 +53,14 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@types/css-tree": "^1.0.6",
+    "@types/css-tree": "^1.0.7",
     "@types/node-fetch": "^2.5.12",
-    "css-tree": "^1.1.3",
-    "node-fetch": "^2.6.1",
+    "css-tree": "^2.0.4",
+    "node-fetch": "^2.6.7",
     "tslib": "^2.3.1"
   },
   "volta": {
     "node": "16.10.0",
-    "npm": "7.24.1"
+    "npm": "8.3.2"
   }
 }

package/requirements.txt

@@ -1,7 +1,10 @@
+## pip-outdated requirements.txt
+# https://pypi.org/project/pip-outdated/
+
 appdirs~=1.4.4
 six~=1.10
 fs<3,>=2.2.0
 pytz~=2021.1
-fonttools~=4.25.2
+fonttools~=4.29.0
 Brotli~=1.0.9
 zopfli~=0.1.8

package/src/main.ts

@@ -3,6 +3,7 @@ import { createReadStream, createWriteStream, existsSync, mkdirSync } from 'fs';
 import fetch, { Headers } from 'node-fetch';
 import { parse as parseCSS, ParseOptions } from 'css-tree';
 import { execSync } from 'child_process';
+import { RequiredByValueExcept, ValueOf } from './types';
 
 // == Resouce Basics ==========================================================
 export const targets = {
@@ -21,10 +22,28 @@ function getFontName(url: string) {
   return fontName;
 }
 
+// https://stackoverflow.com/questions/5717093/check-if-a-javascript-string-is-a-url
+function validURL(str: string) {
+  const pattern = new RegExp("^(https?:\\/\\/)?"+       // protocol
+    "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|"+ // domain name
+    "((\\d{1,3}\\.){3}\\d{1,3}))"+                      // OR ip (v4) address
+    "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*"+                  // port and path
+    "(\\?[;&a-z\\d%_.~+=-]*)?"+                         // query string
+    "(\\#[-a-z\\d_]*)?$","i");                          // fragment locator
+  return !!pattern.test(str);
+}
+
 function getCSSPath(dirPath: string, url: string) {
-  const fontName = getFontName(url);
-  const cssPath  = join(dirPath, fontName + ".css");
-  return cssPath;
+  if (validURL(url)) {
+    const fontName = getFontName(url);
+    const cssPath  = join(dirPath, fontName + ".css");
+    return cssPath;
+  }
+
+  if (!existsSync(url)) {
+    throw new Error(url + "Not vaild URL or PATH");
+  }
+  return url;
 }
 
 // == CSS I/O ==================================================================
@@ -112,6 +131,47 @@ export async function getUnicodeRanges(dirPath = "src", url = targets.korean): P
   return parseUnicodeRanges(ast);
 }
 
+// == Options =================================================================
+interface fontRangeOptionI {
+  savePath:    string;
+  format:      string;
+  nameFormat:  string;
+  defaultArgs: string;
+  etcArgs:     string;
+}
+
+function getDefaultOptions(): RequiredByValueExcept<fontRangeOptionI, 'savePath'> {
+  return {
+    format:      "woff2",
+    nameFormat:  "{NAME}_{INDEX}{EXT}",
+    defaultArgs: "--layout-features='*' \
+                  --glyph-names \
+                  --symbol-cmap \
+                  --legacy-cmap \
+                  --notdef-glyph \
+                  --notdef-outline \
+                  --recommended-glyphs \
+                  --name-legacy \
+                  --drop-tables= \
+                  --name-IDs='*' \
+                  --name-languages='*'",
+    etcArgs:      ""
+  };
+}
+
+function getOption(options: Partial<fontRangeOptionI>, key: keyof fontRangeOptionI, alterValue: ValueOf<fontRangeOptionI>) {
+  return Object.prototype.hasOwnProperty.call(options, key)
+    ? options[key]
+    : alterValue;
+}
+
+function getName(nameFormat: string, fontName: string, index: number, fontExt: string) {
+  return nameFormat
+    .replace( "{NAME}", fontName)
+    .replace("{INDEX}", index.toString())
+    .replace(  "{EXT}", fontExt);
+}
+
 // == Main ====================================================================
 function getFormat(format: string) {
   switch(format) {
@@ -134,37 +194,39 @@ function formatOption(format: string, ext = true) {
        : formatName + "' ");
 }
 
-export function fontRange(url = targets.korean, fontPath = "", savePath?: string,
-                          format = "woff2"): Promise<Buffer[]> {
+export function fontRange(
+  url = targets.korean, fontPath = "",
+  fontRangeOption?: fontRangeOptionI['savePath'] | Partial<fontRangeOptionI>
+): Promise<Buffer[]> {
+  const options = Object.assign(
+    getDefaultOptions(),
+    typeof(fontRangeOption) === 'string'
+      ? { savePath: fontRangeOption }
+      : fontRangeOption
+  );
+
+  const format   = options.format;
   const pathInfo = parse(fontPath);
   const fontDir  = pathInfo.dir;
   const fontName = pathInfo.name;
   const fontExt  = formatOption(format);
 
-  const dirPath  = (savePath === undefined) ? fontDir : savePath;
+  const dirPath  = getOption(options, 'savePath', fontDir);
   const ranges   = getUnicodeRanges(dirPath, url);
 
   const convertOption = formatOption(format, false);
-  const defautOptions = "--layout-features='*' \
-  --glyph-names \
-  --symbol-cmap \
-  --legacy-cmap \
-  --notdef-glyph \
-  --notdef-outline \
-  --recommended-glyphs \
-  --name-legacy \
-  --drop-tables= \
-  --name-IDs='*' \
-  --name-languages='*'";
+  const defaultOption = options.defaultArgs;
+  const etcOption     = options.etcArgs;
 
+  const nameFormat = options.nameFormat;
   return ranges.then(eachRanges => eachRanges.map((unicodes, i) => {
     const saveOption = "--output-file='" +
-      join(dirPath, fontName + "_" + i + fontExt) + "' ";
+      join(dirPath, getName(nameFormat, fontName, i, fontExt)) + "' ";
     const unicodeRanges = unicodes.split(', ').join(',');
     const unicodeOption = "--unicodes='" + unicodeRanges + "' ";
 
     const options = " '" + fontPath + "' " + saveOption + unicodeOption
-      + convertOption + defautOptions;
+      + convertOption + defaultOption + etcOption;
     return execSync("pyftsubset" + options);
   }));
 }

package/src/types.ts

@@ -0,0 +1,5 @@
+// https://stackoverflow.com/questions/52703321/make-some-properties-optional-in-a-typescript-type
+type Diff<T, U> = T extends U ? never : T;
+export type RequiredByValueExcept<T, TOptional extends keyof T> = Pick<T, Diff<keyof T, TOptional>> & Partial<T>;
+
+export type ValueOf<T> = T[keyof T];

package/tsconfig.json

@@ -24,5 +24,8 @@
   "include": [
     "src/**/*",
     "__tests__/**/*"
+  ],
+  "exclude": [
+    "build/**/*"
   ]
 }

package/tsconfig.release.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build",
-    "removeComments": true
+    "removeComments": true,
+    "declaration": true
   },
   "include": [
     "src/**/*"