From ea882d4003244391f56e885e25424e86a526939c Mon Sep 17 00:00:00 2001 From: Loi Phan Date: Thu, 28 Sep 2023 09:38:58 +0700 Subject: [PATCH] Fix code according to the comments --- .../{helpers/interface.ts => global/types.ts} | 2 +- typescript-practice/src/ts/helpers/helpers.ts | 8 +- .../src/ts/services/commonService.ts | 14 +-- typescript-practice/tsconfig.json | 86 ------------------- 4 files changed, 12 insertions(+), 98 deletions(-) rename typescript-practice/src/ts/{helpers/interface.ts => global/types.ts} (51%) diff --git a/typescript-practice/src/ts/helpers/interface.ts b/typescript-practice/src/ts/global/types.ts similarity index 51% rename from typescript-practice/src/ts/helpers/interface.ts rename to typescript-practice/src/ts/global/types.ts index 21ab1ae..7307404 100644 --- a/typescript-practice/src/ts/helpers/interface.ts +++ b/typescript-practice/src/ts/global/types.ts @@ -1,4 +1,4 @@ -export interface dataObj { +export interface DataObject { id: string; data: object; } diff --git a/typescript-practice/src/ts/helpers/helpers.ts b/typescript-practice/src/ts/helpers/helpers.ts index 49a02e3..26b62f5 100644 --- a/typescript-practice/src/ts/helpers/helpers.ts +++ b/typescript-practice/src/ts/helpers/helpers.ts @@ -1,7 +1,7 @@ import * as MESSAGE from '../constants/message'; import { TIME_OUT_SEC, REGEX } from '../constants/config'; import FirebaseService from '../services/firebaseService'; -import { dataObj } from './interface'; +import { DataObject } from '../global/types'; /** * Validate password @@ -72,13 +72,13 @@ export const redirectToLoginPage = (): void => { export const convertDataObjectToModel = (dataObj: { id: string; data: object; -}): dataObj => { +}): DataObject => { const { id } = dataObj; - return { id, ...dataObj.data } as dataObj; + return { id, ...dataObj.data } as DataObject; }; -export const convertModelToDataObject = (model: T): T => { +export const convertModelToDataObject = (model: T): T => { const { id, ...data } = model; return { id, data } as T; diff --git a/typescript-practice/src/ts/services/commonService.ts b/typescript-practice/src/ts/services/commonService.ts index a6ff96c..69c70c2 100644 --- a/typescript-practice/src/ts/services/commonService.ts +++ b/typescript-practice/src/ts/services/commonService.ts @@ -3,10 +3,10 @@ import { convertDataObjectToModel, convertModelToDataObject, } from '../helpers/helpers'; -import { dataObj } from '../helpers/interface'; +import { DataObject } from '../global/types'; import FirebaseService from './firebaseService'; -export default class CommonService { +export default class CommonService { private defaultPath: string = '/'; private firebaseService = FirebaseService; @@ -50,7 +50,7 @@ export default class CommonService { this.firebaseService.getDataFromId(id, path), ); - if (typeof data !== 'string') return data; + if (typeof data === 'object') return data; return null; } @@ -62,10 +62,10 @@ export default class CommonService { this.firebaseService.getAllDataFromPath(path), ); - if (typeof results !== 'string') { + if (typeof results === 'object') { // Convert format object return results.map((data) => { - const tempData: dataObj = data as dataObj; + const tempData = data as DataObject; return convertDataObjectToModel(tempData); }); @@ -85,11 +85,11 @@ export default class CommonService { this.firebaseService.getListDataFromProp(path, property, value), ); - if (results && typeof results !== 'string') { + if (results && typeof results === 'object') { // Convert format object return results.map((data) => { - const tempData: dataObj = data as dataObj; + const tempData = data as DataObject; return convertDataObjectToModel(tempData); }); diff --git a/typescript-practice/tsconfig.json b/typescript-practice/tsconfig.json index 828316c..3677e87 100644 --- a/typescript-practice/tsconfig.json +++ b/typescript-practice/tsconfig.json @@ -1,15 +1,5 @@ { "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - /* Language and Environment */ "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, "lib": [ @@ -18,97 +8,21 @@ "dom.iterable", "scripthost" ] /* Specify a set of bundled library declaration files that describe the target runtime environment. */, - // "jsx": "preserve", /* Specify what JSX code is generated. */ "experimentalDecorators": true /* Enable experimental support for legacy experimental decorators. */, - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - /* Modules */ "module": "commonjs" /* Specify what module code is generated. */, "rootDir": "./src" /* Specify the root folder within your source files. */, - // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - // "types": [], /* Specify type package names to be included without being referenced in a source file. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ - // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ - // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ - // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ "sourceMap": true /* Create source map files for emitted JavaScript files. */, - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./dist" /* Specify an output folder for all emitted files. */, "removeComments": true /* Disable emitting comments. */, - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ "noEmitOnError": true /* Disable emitting files if any type checking errors are reported. */, - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, /* Type Checking */ "strict": true /* Enable all strict type-checking options. */, - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ "noUnusedLocals": true /* Enable error reporting when local variables aren't read. */, "noUnusedParameters": true /* Raise an error when a function parameter isn't read. */, - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ "noImplicitReturns": true /* Enable error reporting for codepaths that do not explicitly return in a function. */, - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ "skipLibCheck": true /* Skip type checking all .d.ts files. */ } }