From e90375352f609cc1fd606f03e71453defcaad776 Mon Sep 17 00:00:00 2001 From: Alexsandr Tutik Date: Mon, 16 Sep 2024 19:10:58 +0300 Subject: [PATCH] re --- .gitignore | 1 + src/index.ts | 3 ++- src/parser/abstract-parser.ts | 6 +++++- src/parser/bot-parser.ts | 2 +- src/parser/client-abstract-parser.ts | 2 +- src/parser/client/hints/app-hints.ts | 6 +++--- src/parser/client/hints/browser-hints.ts | 2 +- src/parser/device-abstract-parser.ts | 2 +- src/parser/device/alias-device.ts | 5 +++-- src/parser/device/info-device.ts | 2 +- src/parser/os-parser.ts | 2 +- src/parser/vendor-fragment-parser.ts | 2 +- tests/abstract-parser.spec.js | 7 +++++-- tsconfig-cjs.json | 6 +++++- 14 files changed, 31 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 11b58012..fdc87e4f 100755 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules .nyc_output coverage/ +dist diff --git a/src/index.ts b/src/index.ts index 2cb3acaa..3aa18667 100644 --- a/src/index.ts +++ b/src/index.ts @@ -48,6 +48,7 @@ import CLIENT_PARSER_LIST from './parser/const/client-parser'; import MOBILE_BROWSER_LIST from './parser/client/browser-short-mobile'; // helpers import * as helper from './parser/helper'; +import * as module from 'module'; const { hasUserAgentClientHintsFragment, hasDeviceModelByClientHints, attr } = helper; @@ -1075,4 +1076,4 @@ export class DeviceDetector { ); } -} \ No newline at end of file +} diff --git a/src/parser/abstract-parser.ts b/src/parser/abstract-parser.ts index bf3044f7..41bd0e18 100755 --- a/src/parser/abstract-parser.ts +++ b/src/parser/abstract-parser.ts @@ -23,7 +23,7 @@ function fixStringVersion(result) { const collectionMap = {}; -export class AbstractParser { +export default class AbstractParser { public fixtureFile: string|null; public versionTruncation: number|null; @@ -31,6 +31,10 @@ export class AbstractParser { public maxUserAgentSize: number| null; public collectionLength: number| null; + constructor() { + /* */ + } + get collection() { if (!this.hasLoadCollection()) { return null; diff --git a/src/parser/bot-parser.ts b/src/parser/bot-parser.ts index 012aa54c..3f12afd3 100755 --- a/src/parser/bot-parser.ts +++ b/src/parser/bot-parser.ts @@ -1,4 +1,4 @@ -import { AbstractParser} from './abstract-parser'; +import AbstractParser from './abstract-parser'; import { ResultBot } from '../index'; export class BotParser extends AbstractParser { diff --git a/src/parser/client-abstract-parser.ts b/src/parser/client-abstract-parser.ts index cbb1939c..30aa7222 100755 --- a/src/parser/client-abstract-parser.ts +++ b/src/parser/client-abstract-parser.ts @@ -1,6 +1,6 @@ import { IndexerClient } from './client/indexer-client'; -import { AbstractParser } from './abstract-parser'; +import AbstractParser from './abstract-parser'; import { JSONObject, ResultClientHints } from '../client-hints'; import { ResultClient } from '../index'; diff --git a/src/parser/client/hints/app-hints.ts b/src/parser/client/hints/app-hints.ts index f298da8b..b53306e9 100644 --- a/src/parser/client/hints/app-hints.ts +++ b/src/parser/client/hints/app-hints.ts @@ -1,5 +1,5 @@ -import {AbstractParser} from '../../abstract-parser'; +import AbstractParser from '../../abstract-parser'; import { ResultClientHints } from '../../../client-hints'; export class AppHints extends AbstractParser @@ -11,14 +11,14 @@ export class AppHints extends AbstractParser } parse(clientHints: ResultClientHints) { - let appId = clientHints.app; + const appId = clientHints.app; if (!appId) { return null; } if (this.collection[appId] === void 0) { return null; } - let name = this.collection[appId]; + const name = this.collection[appId]; return { name: String(name) }; diff --git a/src/parser/client/hints/browser-hints.ts b/src/parser/client/hints/browser-hints.ts index db210338..444def47 100644 --- a/src/parser/client/hints/browser-hints.ts +++ b/src/parser/client/hints/browser-hints.ts @@ -1,4 +1,4 @@ -import {AbstractParser} from '../../abstract-parser'; +import AbstractParser from '../../abstract-parser'; import { ResultClientHints } from '../../../client-hints'; export class BrowserHints extends AbstractParser diff --git a/src/parser/device-abstract-parser.ts b/src/parser/device-abstract-parser.ts index 694c209c..9a605f7b 100755 --- a/src/parser/device-abstract-parser.ts +++ b/src/parser/device-abstract-parser.ts @@ -1,4 +1,4 @@ -import {AbstractParser} from './abstract-parser'; +import AbstractParser from './abstract-parser'; import * as helper from './helper'; import COLLECTION_BRAND_IDS from './device/brand-short'; diff --git a/src/parser/device/alias-device.ts b/src/parser/device/alias-device.ts index 85dc2804..1f7e5192 100644 --- a/src/parser/device/alias-device.ts +++ b/src/parser/device/alias-device.ts @@ -1,10 +1,11 @@ import {ResultAliasDevice } from '../../index'; -import {AbstractParser } from '../abstract-parser'; +import AbstractParser from '../abstract-parser'; import * as helper from './../helper'; +import BRAND_SHORTS from './brand-short'; -const COLLECTION_BRAND_LIST = helper.revertObject(require('./brand-short')); +const COLLECTION_BRAND_LIST = helper.revertObject(BRAND_SHORTS); const createReplaceBrandRegexp = () => { const escapeeChars = [/\+/gi, /\./gi]; diff --git a/src/parser/device/info-device.ts b/src/parser/device/info-device.ts index e4848fe7..13e9f542 100644 --- a/src/parser/device/info-device.ts +++ b/src/parser/device/info-device.ts @@ -1,4 +1,4 @@ -import { AbstractParser } from '../abstract-parser'; +import AbstractParser from '../abstract-parser'; import {DataPacker} from '../../data-packer'; diff --git a/src/parser/os-parser.ts b/src/parser/os-parser.ts index fea1b523..df631bd6 100755 --- a/src/parser/os-parser.ts +++ b/src/parser/os-parser.ts @@ -1,4 +1,4 @@ -import {AbstractParser} from './abstract-parser' +import AbstractParser from './abstract-parser' import * as helper from './helper'; import * as OS_SYSTEMS from './os/os_systems'; diff --git a/src/parser/vendor-fragment-parser.ts b/src/parser/vendor-fragment-parser.ts index 39afbd17..62a444b3 100755 --- a/src/parser/vendor-fragment-parser.ts +++ b/src/parser/vendor-fragment-parser.ts @@ -2,7 +2,7 @@ import * as helper from './helper'; import BRAND_SHORTS from './device/brand-short'; import { ResultVendor } from '../index'; -import { AbstractParser } from './abstract-parser'; +import AbstractParser from './abstract-parser'; const COLLECTION_BRAND_LIST = helper.revertObject(BRAND_SHORTS); diff --git a/tests/abstract-parser.spec.js b/tests/abstract-parser.spec.js index 8053ebfa..372e3c2f 100644 --- a/tests/abstract-parser.spec.js +++ b/tests/abstract-parser.spec.js @@ -1,8 +1,11 @@ -const AbstractParser = require('../parser/abstract-parser') +const AbstractParser = require('../dist/cjs/parser/abstract-parser') const { should, assert, expect } = require('chai'); +console.log(AbstractParser); + describe('tests AbstractParser', function () { - let parser = new AbstractParser; + + let parser = new AbstractParser(); it('AbstractParser::getBaseRegExp', () => { let regex = 'ASUS_Z012DE'; expect(parser.getBaseRegExp(regex).test('ASUS_Z012DE')).to.equal(true); diff --git a/tsconfig-cjs.json b/tsconfig-cjs.json index 5a569887..75474b00 100644 --- a/tsconfig-cjs.json +++ b/tsconfig-cjs.json @@ -3,6 +3,10 @@ "compilerOptions": { "module": "commonjs", "outDir": "dist/cjs", - "target": "esnext" + "target": "esnext", +// "noImplicitAny": false, +// "skipLibCheck": true, +// "resolveJsonModule": true, +// "esModuleInterop": true } } \ No newline at end of file