From 12b08baed9d3ba78f28efba790c310b522982eac Mon Sep 17 00:00:00 2001 From: Atul R Date: Sat, 21 Sep 2019 00:05:46 +0200 Subject: [PATCH] Cleans up addon import --- src/lib/QtGui/QApplication/index.ts | 4 +- src/lib/QtGui/QClipboard/index.ts | 2 +- src/lib/QtGui/QCursor/index.ts | 6 +-- src/lib/QtGui/QEvent/QKeyEvent/index.ts | 2 +- src/lib/QtGui/QIcon/index.ts | 2 +- src/lib/QtGui/QPixmap/index.ts | 4 +- src/lib/QtWidgets/QCheckBox/index.ts | 2 +- src/lib/QtWidgets/QDial/index.ts | 2 +- src/lib/QtWidgets/QGridLayout/index.ts | 2 +- src/lib/QtWidgets/QLabel/index.ts | 2 +- src/lib/QtWidgets/QLineEdit/index.ts | 2 +- src/lib/QtWidgets/QMainWindow/index.ts | 2 +- src/lib/QtWidgets/QPlainTextEdit/index.ts | 2 +- src/lib/QtWidgets/QProgressBar/index.ts | 2 +- src/lib/QtWidgets/QPushButton/index.ts | 2 +- src/lib/QtWidgets/QRadioButton/index.ts | 2 +- src/lib/QtWidgets/QScrollArea/index.ts | 2 +- src/lib/QtWidgets/QSpinBox/index.ts | 2 +- src/lib/QtWidgets/QTabWidget/index.ts | 2 +- src/lib/QtWidgets/QWidget/index.ts | 4 +- src/lib/core/FlexLayout/index.ts | 2 +- src/lib/{core => utils}/addon.ts | 0 src/lib/{utils.ts => utils/helpers.ts} | 2 +- tsconfig.json | 66 +++-------------------- 24 files changed, 35 insertions(+), 85 deletions(-) rename src/lib/{core => utils}/addon.ts (100%) rename src/lib/{utils.ts => utils/helpers.ts} (76%) diff --git a/src/lib/QtGui/QApplication/index.ts b/src/lib/QtGui/QApplication/index.ts index cca01ed5c..22b7e2165 100644 --- a/src/lib/QtGui/QApplication/index.ts +++ b/src/lib/QtGui/QApplication/index.ts @@ -1,6 +1,6 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { Component, NativeElement } from "../../core/Component"; -import { checkIfNativeElement } from "../../utils"; +import { checkIfNativeElement } from "../../utils/helpers"; import { QClipboard } from "../QClipboard"; type arg = NativeElement; diff --git a/src/lib/QtGui/QClipboard/index.ts b/src/lib/QtGui/QClipboard/index.ts index e2a871325..caaa0eb3e 100644 --- a/src/lib/QtGui/QClipboard/index.ts +++ b/src/lib/QtGui/QClipboard/index.ts @@ -1,5 +1,5 @@ import { Component, NativeElement } from "../../core/Component"; -import { checkIfNativeElement } from "../../utils"; +import { checkIfNativeElement } from "../../utils/helpers"; export class QClipboard extends Component { native: NativeElement; diff --git a/src/lib/QtGui/QCursor/index.ts b/src/lib/QtGui/QCursor/index.ts index 352e3d62e..e792f50b2 100644 --- a/src/lib/QtGui/QCursor/index.ts +++ b/src/lib/QtGui/QCursor/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { Component, NativeElement } from "../../core/Component"; import { QPixmap } from "../QPixmap"; @@ -15,8 +15,8 @@ export class QCursor extends Component { } pos = (): { x: number; y: number } => { return this.native.pos(); - } + }; setPos = (x: number, y: number) => { return this.native.setPos(x, y); - } + }; } diff --git a/src/lib/QtGui/QEvent/QKeyEvent/index.ts b/src/lib/QtGui/QEvent/QKeyEvent/index.ts index 3966410ec..63f914bd6 100644 --- a/src/lib/QtGui/QEvent/QKeyEvent/index.ts +++ b/src/lib/QtGui/QEvent/QKeyEvent/index.ts @@ -1,4 +1,4 @@ -import addon from "../../../core/addon"; +import addon from "../../../utils/addon"; import { NativeElement } from "../../../core/Component"; import { NativeEvent } from "../../../core/EventWidget"; diff --git a/src/lib/QtGui/QIcon/index.ts b/src/lib/QtGui/QIcon/index.ts index b35fe6351..0408dcebb 100644 --- a/src/lib/QtGui/QIcon/index.ts +++ b/src/lib/QtGui/QIcon/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { Component, NativeElement } from "../../core/Component"; import { QPixmap } from "../../QtGui/QPixmap"; diff --git a/src/lib/QtGui/QPixmap/index.ts b/src/lib/QtGui/QPixmap/index.ts index 7d7699fcf..821bebbe5 100644 --- a/src/lib/QtGui/QPixmap/index.ts +++ b/src/lib/QtGui/QPixmap/index.ts @@ -1,7 +1,7 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { Component, NativeElement } from "../../core/Component"; import { AspectRatioMode } from "../../QtEnums"; -import { checkIfNativeElement } from "../../utils"; +import { checkIfNativeElement } from "../../utils/helpers"; type arg = string | NativeElement; export class QPixmap extends Component { diff --git a/src/lib/QtWidgets/QCheckBox/index.ts b/src/lib/QtWidgets/QCheckBox/index.ts index 29b6b8127..df318da43 100644 --- a/src/lib/QtWidgets/QCheckBox/index.ts +++ b/src/lib/QtWidgets/QCheckBox/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QDial/index.ts b/src/lib/QtWidgets/QDial/index.ts index dac398cfe..bdfe3c3d4 100644 --- a/src/lib/QtWidgets/QDial/index.ts +++ b/src/lib/QtWidgets/QDial/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QGridLayout/index.ts b/src/lib/QtWidgets/QGridLayout/index.ts index 0a91c0a56..98997e848 100644 --- a/src/lib/QtWidgets/QGridLayout/index.ts +++ b/src/lib/QtWidgets/QGridLayout/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { NodeLayout } from "../QLayout"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QLabel/index.ts b/src/lib/QtWidgets/QLabel/index.ts index 14a518ded..a24f4ed6f 100644 --- a/src/lib/QtWidgets/QLabel/index.ts +++ b/src/lib/QtWidgets/QLabel/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QLineEdit/index.ts b/src/lib/QtWidgets/QLineEdit/index.ts index 52e67fa1b..09449bfac 100644 --- a/src/lib/QtWidgets/QLineEdit/index.ts +++ b/src/lib/QtWidgets/QLineEdit/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QMainWindow/index.ts b/src/lib/QtWidgets/QMainWindow/index.ts index 34e36d51f..fd7ace615 100644 --- a/src/lib/QtWidgets/QMainWindow/index.ts +++ b/src/lib/QtWidgets/QMainWindow/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QPlainTextEdit/index.ts b/src/lib/QtWidgets/QPlainTextEdit/index.ts index 65f2d9e57..e5357713e 100644 --- a/src/lib/QtWidgets/QPlainTextEdit/index.ts +++ b/src/lib/QtWidgets/QPlainTextEdit/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QProgressBar/index.ts b/src/lib/QtWidgets/QProgressBar/index.ts index 1cc5081de..5687c706c 100644 --- a/src/lib/QtWidgets/QProgressBar/index.ts +++ b/src/lib/QtWidgets/QProgressBar/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QPushButton/index.ts b/src/lib/QtWidgets/QPushButton/index.ts index 926aeeabd..5807b1842 100644 --- a/src/lib/QtWidgets/QPushButton/index.ts +++ b/src/lib/QtWidgets/QPushButton/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QRadioButton/index.ts b/src/lib/QtWidgets/QRadioButton/index.ts index af1410657..745c5ec3d 100644 --- a/src/lib/QtWidgets/QRadioButton/index.ts +++ b/src/lib/QtWidgets/QRadioButton/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QScrollArea/index.ts b/src/lib/QtWidgets/QScrollArea/index.ts index 0859b366c..b4f5784bd 100644 --- a/src/lib/QtWidgets/QScrollArea/index.ts +++ b/src/lib/QtWidgets/QScrollArea/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QSpinBox/index.ts b/src/lib/QtWidgets/QSpinBox/index.ts index 76f9a04e2..f47c8e9c9 100644 --- a/src/lib/QtWidgets/QSpinBox/index.ts +++ b/src/lib/QtWidgets/QSpinBox/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QTabWidget/index.ts b/src/lib/QtWidgets/QTabWidget/index.ts index cb80aeba7..0d87c01f7 100644 --- a/src/lib/QtWidgets/QTabWidget/index.ts +++ b/src/lib/QtWidgets/QTabWidget/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; diff --git a/src/lib/QtWidgets/QWidget/index.ts b/src/lib/QtWidgets/QWidget/index.ts index 48caf7163..1295fe377 100644 --- a/src/lib/QtWidgets/QWidget/index.ts +++ b/src/lib/QtWidgets/QWidget/index.ts @@ -1,4 +1,4 @@ -import addon from "../../core/addon"; +import addon from "../../utils/addon"; import { NodeLayout } from "../QLayout"; import { EventWidget, BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; @@ -12,7 +12,7 @@ import { StyleSheet, prepareInlineStyleSheet } from "../../core/Style/StyleSheet"; -import { checkIfNativeElement } from "../../utils"; +import { checkIfNativeElement } from "../../utils/helpers"; // All Widgets should extend from NodeWidget // Implement all native QWidget methods here so that all widgets get access to those aswell export abstract class NodeWidget extends EventWidget { diff --git a/src/lib/core/FlexLayout/index.ts b/src/lib/core/FlexLayout/index.ts index 0824749e1..2f28210c0 100644 --- a/src/lib/core/FlexLayout/index.ts +++ b/src/lib/core/FlexLayout/index.ts @@ -1,4 +1,4 @@ -import addon from "../addon"; +import addon from "../../utils/addon"; import { NodeWidget } from "../../QtWidgets/QWidget"; import { NodeLayout } from "../../QtWidgets/QLayout"; import { FlexNode } from "../YogaWidget"; diff --git a/src/lib/core/addon.ts b/src/lib/utils/addon.ts similarity index 100% rename from src/lib/core/addon.ts rename to src/lib/utils/addon.ts diff --git a/src/lib/utils.ts b/src/lib/utils/helpers.ts similarity index 76% rename from src/lib/utils.ts rename to src/lib/utils/helpers.ts index 00f059216..41ce065a0 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils/helpers.ts @@ -1,4 +1,4 @@ -import { NativeElement } from "./core/Component"; +import { NativeElement } from "../core/Component"; export const checkIfNativeElement = (arg: any) => { const nativeArg = arg as NativeElement; diff --git a/tsconfig.json b/tsconfig.json index f11ab0435..10d7bda8c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,63 +1,13 @@ { "compilerOptions": { - /* Basic Options */ - "target": "ES2015" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */, - "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */, - // "lib": [], /* Specify library files to be included in the compilation. */ - // "allowJs": true /* Allow javascript files to be compiled. */, - // "checkJs": true, /* Report errors in .js files. */ - // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ - "declaration": true /* Generates corresponding '.d.ts' file. */, - // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ - "sourceMap": true /* Generates corresponding '.map' file. */, - // "outFile": "./", /* Concatenate and emit output to single file. */ - "outDir": "./dist" /* Redirect output structure to the directory. */, - // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ - // "composite": true, /* Enable project compilation */ - // "incremental": true, /* Enable incremental compilation */ - // "tsBuildInfoFile": ".cache/tsconfig.tsbuildinfo" /* Specify file to store incremental compilation information */, - // "removeComments": true, /* Do not emit comments to output. */ - // "noEmit": true, /* Do not emit outputs. */ - // "importHelpers": true, /* Import emit helpers from 'tslib'. */ - // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ - // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ - - /* Strict Type-Checking Options */ - "strict": true /* Enable all strict type-checking options. */, - // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* Enable strict null checks. */ - // "strictFunctionTypes": true, /* Enable strict checking of function types. */ - // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ - // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ - // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ - // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ - - /* Additional Checks */ - // "noUnusedLocals": true, /* Report errors on unused locals. */ - // "noUnusedParameters": true, /* Report errors on unused parameters. */ - // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ - // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ - - /* Module Resolution Options */ - "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */, - // "baseUrl": "./" /* Base directory to resolve non-absolute module names. */, - // "paths": {} /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */, - // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ - // "typeRoots": [], /* List of folders to include type definitions from. */ - // "types": [] /* Type declaration files to be included in compilation. */, - // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */, - // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ - - /* Source Map Options */ - // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ - // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ - - /* Experimental Options */ - // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ - // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + "target": "ES2015", + "module": "commonjs", + "declaration": true, + "sourceMap": true, + "outDir": "./dist", + "strict": true, + "moduleResolution": "node", + "esModuleInterop": true, "resolveJsonModule": true }, "include": ["src"]