diff --git a/src/task_1/app.ts b/src/task_1/app.ts new file mode 100644 index 0000000..0ab1a63 --- /dev/null +++ b/src/task_1/app.ts @@ -0,0 +1,16 @@ + +var Custom; +(function (Custom) { + var User = /** @class */ (function () { + function User(a, n) { + this.age = a; + this.name = n; + } + User.prototype.upAgeByYear = function () { + this.age++; + }; + return User; + }()); + Custom.user = new User(18, "Михаил"); +})(Custom || (Custom = {})); +Custom.user.upAgeByYear(); \ No newline at end of file diff --git a/src/task_1/typing.d.ts b/src/task_1/typing.d.ts new file mode 100644 index 0000000..0330fb1 --- /dev/null +++ b/src/task_1/typing.d.ts @@ -0,0 +1,6 @@ +declare class User { + public age: number; + public name: string; + constructor(a: number, n: string); + public upAgeByYear():void; +}; \ No newline at end of file diff --git a/src/task_2/Example.ts b/src/task_2/Example.ts new file mode 100644 index 0000000..ebd4169 --- /dev/null +++ b/src/task_2/Example.ts @@ -0,0 +1,9 @@ +export class Example { + public title: string; + public id: number; + private _setting: Setting; + + constructor(s: Setting) { + this._setting = s; + } +} \ No newline at end of file diff --git a/src/task_2/Setting.ts b/src/task_2/Setting.ts new file mode 100644 index 0000000..bfc2b98 --- /dev/null +++ b/src/task_2/Setting.ts @@ -0,0 +1,9 @@ +export class Setting { + public key: string; + public value: SettingValue; + + constructor(k: string, ov: SettingValue) { + this.key = k; + this.value = ov; + } +} \ No newline at end of file diff --git a/src/task_2/SettingValue.ts b/src/task_2/SettingValue.ts new file mode 100644 index 0000000..5f90b42 --- /dev/null +++ b/src/task_2/SettingValue.ts @@ -0,0 +1,9 @@ +export class SettingValue { + public property1: string; + public property2: string; + + constructor(p1: string, p2: string) { + this.property1 = p1; + this.property2 = p2; + } +} \ No newline at end of file diff --git a/src/task_2/index.html b/src/task_2/index.html new file mode 100644 index 0000000..aa98e50 --- /dev/null +++ b/src/task_2/index.html @@ -0,0 +1,12 @@ + + + + + + + Document + + + + + \ No newline at end of file diff --git a/src/task_2/index.ts b/src/task_2/index.ts index a2fa801..38bf67f 100644 --- a/src/task_2/index.ts +++ b/src/task_2/index.ts @@ -6,33 +6,10 @@ * все остальные файлы должны подгрузиться асинхронно по цепочке, используя requireJS. */ -class SettingValue { - public property1: string; - public property2: string; - - constructor(p1: string, p2: string) { - this.property1 = p1; - this.property2 = p2; - } -} - -class Setting { - public key: string; - public value: SettingValue; - - constructor(k: string, ov: SettingValue) { - this.key = k; - this.value = ov; - } -} - - -class Example { - public title: string; - public id: number; - private _setting: Setting; - - constructor(s: Setting) { - this._setting = s; - } -} +import {Example} from './Example'; +import {Setting} from './Setting'; +import {SettingValue} from './SettingValue'; + +const message = new Example(new Setting("You shall not work!", new SettingValue("Dead", "inside"))); + +console.log(message); \ No newline at end of file diff --git a/src/task_2/tsconfig.json b/src/task_2/tsconfig.json new file mode 100644 index 0000000..4143001 --- /dev/null +++ b/src/task_2/tsconfig.json @@ -0,0 +1,73 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig.json to read more about this file */ + + /* Basic Options */ + // "incremental": true, /* Enable incremental compilation */ + "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */ + "module": "amd", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', 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": "./", /* 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 */ + // "tsBuildInfoFile": "./", /* 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. */ + // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ + + /* 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. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* 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. */ + + /* Advanced Options */ + "skipLibCheck": true, /* Skip type checking of declaration files. */ + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + }, + "exclude": [ + "node_modules" + ] +} diff --git a/src/task_3/index.ts b/src/task_3/index.ts index 04eaab2..7b7ceaa 100644 --- a/src/task_3/index.ts +++ b/src/task_3/index.ts @@ -16,33 +16,27 @@ class HttpError extends Error { } } -function req(url: string): Promise { - return fetch(url) - .then((response: Response) => { - if (response.status == 200) { - return response.json(); - } else { - throw new HttpError(response); - } - }) +async function req(url: string): Promise { + let response = await fetch(url); + if (response.status == 200) { + return response.json(); + } else { + throw new HttpError(response); + } } // Запрашивать логин, пока github не вернёт существующего пользователя. -function getGitHub() { +async function getGitHub() { let name = prompt("Введите логин на GitHub?", ""); + let result = req(`https://api.github.com/users/${name}`); + if (await result) { + document.write(`Полное имя: ${(await result).name}, уникальный номер: ${(await result).id}.`); + return result; + } + if (result instanceof HttpError && result.response.status == 404) { + document.write("Такого пользователя не существует."); + } - return req(`https://api.github.com/users/${name}`) - .then(user => { - document.write(`Полное имя: ${user.name}, уникальный номер: ${user.id}.`); - return user; - }) - .catch(err => { - if (err instanceof HttpError && err.response.status == 404) { - document.write("Такого пользователя не существует."); - } else { - throw err; - } - }); } getGitHub();