@gedit/assets-font - npm Package Compare versions

Comparing version 0.1.74 to 0.1.75

lib/browser/assets-font-frontend-contribution.js

@@ -11,90 +11,33 @@ "use strict";
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    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) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsFontFrontendContribution = void 0;
-var inversify_1 = require("inversify");
-var common_1 = require("../common");
-var assets_font_manager_1 = require("../common/assets-font-manager");
-var AssetsFontFrontendContribution = /** @class */ (function () {
-    function AssetsFontFrontendContribution() {
+const inversify_1 = require("inversify");
+const common_1 = require("../common");
+const assets_font_manager_1 = require("../common/assets-font-manager");
+let AssetsFontFrontendContribution = class AssetsFontFrontendContribution {
+    async onStart() {
+        // 加载字体
+        await Promise.all(this.fontManager.getIconFonts().map(async (v) => {
+            // @ts-ignore
+            const font = new FontFace(v.name, `url(${v.src})`);
+            const f = await font.load();
+            // @ts-ignore
+            document.fonts.add(f);
+            // console.log('loading fontFamily:', v.name);
+        }));
+        // console.log('>>>>>>>>>>字体加载完成');
     }
-    AssetsFontFrontendContribution.prototype.onStart = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: 
-                    // 加载字体
-                    return [4 /*yield*/, Promise.all(this.fontManager.getIconFonts().map(function (v) { return __awaiter(_this, void 0, void 0, function () {
-                            var font, f;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        font = new FontFace(v.name, "url(".concat(v.src, ")"));
-                                        return [4 /*yield*/, font.load()];
-                                    case 1:
-                                        f = _a.sent();
-                                        // @ts-ignore
-                                        document.fonts.add(f);
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); }))];
-                    case 1:
-                        // 加载字体
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    __decorate([
-        (0, inversify_1.inject)(common_1.AssetsFontService),
-        __metadata("design:type", Object)
-    ], AssetsFontFrontendContribution.prototype, "assetsFontService", void 0);
-    __decorate([
-        (0, inversify_1.inject)(assets_font_manager_1.AssetsFontManager),
-        __metadata("design:type", assets_font_manager_1.AssetsFontManager)
-    ], AssetsFontFrontendContribution.prototype, "fontManager", void 0);
-    AssetsFontFrontendContribution = __decorate([
-        (0, inversify_1.injectable)()
-    ], AssetsFontFrontendContribution);
-    return AssetsFontFrontendContribution;
-}());
+};
+__decorate([
+    (0, inversify_1.inject)(common_1.AssetsFontService),
+    __metadata("design:type", Object)
+], AssetsFontFrontendContribution.prototype, "assetsFontService", void 0);
+__decorate([
+    (0, inversify_1.inject)(assets_font_manager_1.AssetsFontManager),
+    __metadata("design:type", assets_font_manager_1.AssetsFontManager)
+], AssetsFontFrontendContribution.prototype, "fontManager", void 0);
+AssetsFontFrontendContribution = __decorate([
+    (0, inversify_1.injectable)()
+], AssetsFontFrontendContribution);
 exports.AssetsFontFrontendContribution = AssetsFontFrontendContribution;
 //# sourceMappingURL=assets-font-frontend-contribution.js.map

lib/browser/assets-font-frontend-module.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var inversify_1 = require("inversify");
-var assets_font_service_1 = require("../common/assets-font-service");
-var browser_1 = require("@gedit/application-common/lib/browser");
-var assets_font_frontend_contribution_1 = require("./assets-font-frontend-contribution");
-var assets_font_manager_1 = require("../common/assets-font-manager");
-var connection_1 = require("@gedit/connection");
-exports.default = new inversify_1.ContainerModule(function (bind) {
+const inversify_1 = require("inversify");
+const assets_font_service_1 = require("../common/assets-font-service");
+const browser_1 = require("@gedit/application-common/lib/browser");
+const assets_font_frontend_contribution_1 = require("./assets-font-frontend-contribution");
+const assets_font_manager_1 = require("../common/assets-font-manager");
+const connection_1 = require("@gedit/connection");
+exports.default = new inversify_1.ContainerModule(bind => {
     bind(assets_font_manager_1.AssetsFontManager).toSelf().inSingletonScope();
     bind(assets_font_frontend_contribution_1.AssetsFontFrontendContribution).toSelf().inSingletonScope();
     bind(browser_1.FrontendApplicationContribution).toService(assets_font_frontend_contribution_1.AssetsFontFrontendContribution);
-    bind(assets_font_service_1.AssetsFontService).toDynamicValue(function (ctx) {
-        var connection = ctx.container.get(connection_1.IConnectionProvider);
+    bind(assets_font_service_1.AssetsFontService).toDynamicValue(ctx => {
+        const connection = ctx.container.get(connection_1.IConnectionProvider);
         return connection.createProxy(assets_font_service_1.AssetsFontServicePath);
@@ -16,0 +16,0 @@ }).inSingletonScope();

lib/common/assets-font-manager.js

@@ -10,18 +10,17 @@ "use strict";
 exports.AssetsFontManager = void 0;
-var inversify_1 = require("inversify");
-var assets_font_1 = require("./assets-font");
-var AssetsFontManager = /** @class */ (function () {
-    function AssetsFontManager() {
+const inversify_1 = require("inversify");
+const assets_font_1 = require("./assets-font");
+let AssetsFontManager = class AssetsFontManager {
+    constructor() {
         this.allFonts = assets_font_1.FONT_FAMILY_DEFAULTS.slice();
     }
-    AssetsFontManager.prototype.getAllFonts = function () {
+    getAllFonts() {
         return this.allFonts;
-    };
-    AssetsFontManager.prototype.getIconFonts = function () {
-        return this.allFonts.filter(function (a) { return typeof a === 'object'; });
-    };
-    AssetsFontManager.prototype.addFonts = function (fonts) {
-        var _this = this;
-        fonts.forEach(function (f) { return _this.allFonts.push(f); });
-    };
+    }
+    getIconFonts() {
+        return this.allFonts.filter(a => typeof a === 'object');
+    }
+    addFonts(fonts) {
+        fonts.forEach(f => this.allFonts.push(f));
+    }
     /**
@@ -31,14 +30,13 @@ * Changed all
      */
-    AssetsFontManager.prototype.updateFonts = function (fonts) {
+    updateFonts(fonts) {
         this.allFonts = fonts;
-    };
-    AssetsFontManager.prototype.deleteFonts = function (fontIds) {
-        this.allFonts = this.allFonts.filter(function (c) { return !fontIds.find(function (id) { return typeof c === 'string' ? c === id : c.id === id; }); });
-    };
-    AssetsFontManager = __decorate([
-        (0, inversify_1.injectable)()
-    ], AssetsFontManager);
-    return AssetsFontManager;
-}());
+    }
+    deleteFonts(fontIds) {
+        this.allFonts = this.allFonts.filter(c => !fontIds.find(id => typeof c === 'string' ? c === id : c.id === id));
+    }
+};
+AssetsFontManager = __decorate([
+    (0, inversify_1.injectable)()
+], AssetsFontManager);
 exports.AssetsFontManager = AssetsFontManager;
 //# sourceMappingURL=assets-font-manager.js.map

lib/common/assets-font.js

@@ -71,4 +71,4 @@ "use strict";
 // 字体排序
-exports.FONT_FAMILY_DEFAULTS.sort(function (a, b) {
-    var bName = typeof b === 'string' ? b : b.descName;
+exports.FONT_FAMILY_DEFAULTS.sort((a, b) => {
+    const bName = typeof b === 'string' ? b : b.descName;
     if (typeof a === 'string') {
@@ -75,0 +75,0 @@ return a.localeCompare(bName);

lib/node/assets-font-backend-module.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var inversify_1 = require("inversify");
-var connection_1 = require("@gedit/connection");
-var assets_font_service_by_node_1 = require("./assets-font-service-by-node");
-var assets_font_service_1 = require("../common/assets-font-service");
-var common_1 = require("../common");
-exports.default = new inversify_1.ContainerModule(function (bind) {
+const inversify_1 = require("inversify");
+const connection_1 = require("@gedit/connection");
+const assets_font_service_by_node_1 = require("./assets-font-service-by-node");
+const assets_font_service_1 = require("../common/assets-font-service");
+const common_1 = require("../common");
+exports.default = new inversify_1.ContainerModule(bind => {
     bind(common_1.AssetsFontManager).toSelf().inSingletonScope();
     bind(assets_font_service_by_node_1.AssetsFontServiceByNode).toSelf().inSingletonScope();
     bind(assets_font_service_1.AssetsFontService).toService(assets_font_service_by_node_1.AssetsFontServiceByNode);
-    bind(connection_1.ConnectionHandler).toDynamicValue(function (ctx) { return (new connection_1.JsonRpcConnectionHandler(assets_font_service_1.AssetsFontServicePath, function () { return ctx.container.get(assets_font_service_by_node_1.AssetsFontServiceByNode); })); }).inSingletonScope();
+    bind(connection_1.ConnectionHandler).toDynamicValue(ctx => (new connection_1.JsonRpcConnectionHandler(assets_font_service_1.AssetsFontServicePath, () => ctx.container.get(assets_font_service_by_node_1.AssetsFontServiceByNode)))).inSingletonScope();
 });
 //# sourceMappingURL=assets-font-backend-module.js.map

lib/node/assets-font-service-by-node.js

@@ -8,46 +8,8 @@ "use strict";
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    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) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsFontServiceByNode = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
-var inversify_1 = require("inversify");
-var got_1 = require("got");
-var AssetsFontServiceByNode = /** @class */ (function () {
-    function AssetsFontServiceByNode() {
-    }
+const inversify_1 = require("inversify");
+const got_1 = require("got");
+let AssetsFontServiceByNode = class AssetsFontServiceByNode {
     // async getFontDesc(fontId: number, words: string): Promise<Required<AssetsFont>> {
@@ -57,28 +19,18 @@ //   const res = await got.get(`https://www.iconfont.cn/webfont/fonts?ids=${fontId}&words=${encodeURIComponent(words)}`) as any;
     // }
-    AssetsFontServiceByNode.prototype.getFontCDN = function (fontId, words) {
-        return __awaiter(this, void 0, void 0, function () {
-            var res;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, got_1.default
-                            .post('https://www.iconfont.cn/webfont/fonts/cdn', {
-                            json: {
-                                fontId: fontId,
-                                words: words,
-                            },
-                        })
-                            .json()];
-                    case 1:
-                        res = _a.sent();
-                        return [2 /*return*/, res];
-                }
-            });
-        });
-    };
-    AssetsFontServiceByNode = __decorate([
-        (0, inversify_1.injectable)()
-    ], AssetsFontServiceByNode);
-    return AssetsFontServiceByNode;
-}());
+    async getFontCDN(fontId, words) {
+        const res = await got_1.default
+            .post('https://www.iconfont.cn/webfont/fonts/cdn', {
+            json: {
+                fontId,
+                words,
+            },
+        })
+            .json();
+        return res;
+    }
+};
+AssetsFontServiceByNode = __decorate([
+    (0, inversify_1.injectable)()
+], AssetsFontServiceByNode);
 exports.AssetsFontServiceByNode = AssetsFontServiceByNode;
 //# sourceMappingURL=assets-font-service-by-node.js.map

lib/node/assets-font-service-by-node.spec.js

 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    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) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
+Object.defineProperty(exports, "__esModule", { value: true });
+const assets_font_service_by_node_1 = require("./assets-font-service-by-node");
+describe('assets-2d', () => {
+    const service = new assets_font_service_by_node_1.AssetsFontServiceByNode();
+    it('init', async () => {
+        const data = await service.getFontCDN(172, '站酷文艺体');
+        console.log('>>>: ', data);
     });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var assets_font_service_by_node_1 = require("./assets-font-service-by-node");
-describe('assets-2d', function () {
-    var service = new assets_font_service_by_node_1.AssetsFontServiceByNode();
-    it('init', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var data;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, service.getFontCDN(172, '站酷文艺体')];
-                case 1:
-                    data = _a.sent();
-                    console.log('>>>: ', data);
-                    return [2 /*return*/];
-            }
-        });
-    }); });
 });
 //# sourceMappingURL=assets-font-service-by-node.spec.js.map

package.json

 {
   "name": "@gedit/assets-font",
-  "version": "0.1.74",
+  "version": "0.1.75",
   "license": "MIT",
@@ -12,5 +12,5 @@ "main": "lib/common/index",
   "dependencies": {
-    "@gedit/application-common": "^0.1.68",
-    "@gedit/connection": "^0.1.68",
-    "@gedit/utils": "^0.1.69",
+    "@gedit/application-common": "^0.1.69",
+    "@gedit/connection": "^0.1.69",
+    "@gedit/utils": "^0.1.70",
     "got": "^11.8.2"
@@ -34,3 +34,3 @@ },
   },
-  "gitHead": "1bb1a2c9de07b987e6e1c15053e7278766cbe23c"
+  "gitHead": "8bdf36b3a3898da871ec15be92760865fc6a182a"
 }

No alert changes

Worsened metrics

Total package byte prevSize

31970

decreased by-23.91%

Lines of code

502

decreased by-23.24%

Dependency changes

• Updated@gedit/application-common@^0.1.69

• Updated@gedit/connection@^0.1.69

• Updated@gedit/utils@^0.1.70