From f6f9af986b990f186139ab61efea9e6b3d86d306 Mon Sep 17 00:00:00 2001 From: denis <7tX694CMVsdiGcu> Date: Sun, 7 Jan 2024 04:17:23 +0300 Subject: [PATCH] 123 --- domain.d.ts | 94 +++++++++++++++++++++++++++ package-lock.json | 16 ++--- package.json | 2 +- src/DataBase.ts | 100 ++++++++++++++++++++++++++++ src/graph/WeightedGraph.ts | 0 src/index.ts | 116 ++++++--------------------------- tsconfig.json | 130 +++++++------------------------------ 7 files changed, 244 insertions(+), 214 deletions(-) create mode 100644 domain.d.ts create mode 100644 src/DataBase.ts create mode 100644 src/graph/WeightedGraph.ts diff --git a/domain.d.ts b/domain.d.ts new file mode 100644 index 0000000..d7f6d68 --- /dev/null +++ b/domain.d.ts @@ -0,0 +1,94 @@ + + +type NodeValueType = { + Number: "number", + String: "string", + Map: "map", + Expression: "expression" +}; + +type ExpressionType = { + Count: "count", + Filter: "filter", +}; + +type Filter = + { + value: number, + predicate: "greatThat" + | "greatThatEqual" + | "lessThat" + | "lessThatEqual" + | "equal" + } + | { + value: string, + predicate: "include" + | "equal" + } + +type CountWithExpression = { + type: ExpressionType["Count"], + expression: BaseNode["uuid"], +}; + +type CountWithSet = { + type: ExpressionType["Count"], + set: string, +}; + +type FilterWithExpression = { + type: ExpressionType["Filter"], + expression: BaseNode["uuid"], + filter: Filter, +}; + +type FilterWithSet = { + type: ExpressionType["Filter"], + set: string, + filter: Filter, +}; + +type Expression = + CountWithExpression + | CountWithSet + | FilterWithExpression + | FilterWithSet; + +type NumberNode = BaseNode & { + valueType: NodeValueType["Number"]; + value: number; +}; + +type StringNode = BaseNode & { + valueType: NodeValueType["String"]; + value: string; +}; + +type MapString = BaseNode & { + valueType: NodeValueType["Map"]; + value: { [key: string]: Node["uuid"]; }; +}; + +type ExpressionNode = BaseNode & { + valueType: NodeValueType["Expression"]; + value: Expression; + id: string; +}; + +type BaseNode = { + uuid: string; + set: string; +}; + +type PrimitiveValue = string | number; + +type MapValue = { + [key: string]: PrimitiveValue | MapValue; +} + +type ExpressionResult = PrimitiveValue | MapValue | Array | null; + +type AddNodeParams = Omit; + +type AnyNode = NumberNode | StringNode | MapNode | ExpressionNode; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2e270a4..f5a462c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "devDependencies": { "@types/node": "^20.10.6", - "typescript": "^5.3.3" + "typescript": "4.9.3" } }, "node_modules/@types/node": { @@ -23,16 +23,16 @@ } }, "node_modules/typescript": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "version": "4.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz", + "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=14.17" + "node": ">=4.2.0" } }, "node_modules/undici-types": { @@ -53,9 +53,9 @@ } }, "typescript": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "version": "4.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz", + "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==", "dev": true }, "undici-types": { diff --git a/package.json b/package.json index 38efb14..0ed77c6 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,6 @@ "license": "ISC", "devDependencies": { "@types/node": "^20.10.6", - "typescript": "^5.3.3" + "typescript": "4.9.3" } } diff --git a/src/DataBase.ts b/src/DataBase.ts new file mode 100644 index 0000000..8000fab --- /dev/null +++ b/src/DataBase.ts @@ -0,0 +1,100 @@ +import * as crypto from 'node:crypto'; + + +const NOT_DEFINED_SET = "NOT_DEFINED"; + + +export class DataBase { + + nodeMap = new Map(); + + setMap = new Map>(); + + expressionMap = new Map(); + + expressionCacheMap = new Map(); + + addNode(nodeParams: AddNodeParams): AnyNode { + const uuid = crypto.randomUUID(); + const newNode = { ...nodeParams, uuid } as AnyNode; + this.nodeMap.set(uuid, newNode); + if (!nodeParams.set) { + nodeParams.set = NOT_DEFINED_SET; + } + if (!this.setMap.has(nodeParams.set)) { + this.setMap.set(nodeParams.set, new Set()); + } + this.setMap.get(nodeParams.set)?.add(uuid); + switch (nodeParams.valueType) { + case "expression": { + this.expressionMap.set(nodeParams.id, uuid); + break; + } + } + return newNode; + } + + get(uuid: BaseNode["uuid"]): PrimitiveValue | MapValue | undefined { + const node = this.nodeMap.get(uuid); + if (node == null) { + return node as undefined; + } + switch (node.valueType) { + case "number": + case "string": { + return node.value; + } + case "map": { + const result = {}; + for (const key of Object.keys(node.value)) { + const value = this.get(node.value[key]); + result[key] = value; + } + return result; + } + } + } + + getSet(set: string) { + const uuids = this.setMap.get(set) || new Set(); + return Array.from(uuids).map(u => this.get(u)); + } + + getExpression(id: string): ExpressionResult { + const uuid = this.expressionMap.get(id); + if (uuid == null) { + return null; + } + const node = this.nodeMap.get(uuid); + if (node == null) { + return null; + } + const cache = this.expressionCacheMap.get(uuid); + if (cache != null) { + return cache; + } + } + + private calculateExpression(node: ExpressionNode) { + switch (node.value.type) { + case "count": { + if (node.value.hasOwnProperty("set")) { + const set = this.getSet((node.value as CountWithSet).set); + return set.length; + } + if (node.value.hasOwnProperty("expression")) { + const exprNode: ExpressionNode = this.nodeMap.get((node.value as CountWithExpression).expression); + const expressionValue = this.getExpression(exprNode.id); + if (expressionValue instanceof Array) { + return expressionValue.length; + } + } + break; + } + case "filter": { + + } + } + } + +} diff --git a/src/graph/WeightedGraph.ts b/src/graph/WeightedGraph.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/index.ts b/src/index.ts index 27cd098..84d75b9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,98 +1,7 @@ -import * as crypto from 'node:crypto'; +import { DataBase } from "./DataBase"; -enum DBObjType { - Number = "number", - String = "string", - Map = "map", - Expression = "expression", -} - -enum DBExpressionType { - Count = "count", - Filter = "filter", -} - -type DBObjExpression = { - type: DBExpressionType.Count, - set: string, -} - | { - type: DBExpressionType.Count, - expressionUuid: DBObj["uuid"], - } - | ( - { - type: DBExpressionType.Filter, - } - ); - -type DBObj = { - uuid: string; - set: string | null; -} & ( - { - valueType: DBObjType.Number; - value: number; - } - | { - valueType: DBObjType.String; - value: string; - } - | { - valueType: DBObjType.Map; - value: { [key: string]: DBObj["uuid"]; }; - } - | { - valueType: DBObjType.Expression; - value: DBObjExpression; - } - ); - -type DBObjResultValue = { - [key: string]: string | number | DBObjResultValue; -}; - -type DBObjResult = DBObj & { - valueType: DBObjType.Map, - value: DBObjResultValue; -}; - -class DataBase { - - objMap = new Map(); - - setMap = new Map>(); - - addObj(objProps: Omit): DBObj { - const uuid = crypto.randomUUID(); - const newObj: DBObj = { ...objProps, uuid } as DBObj; - this.objMap.set(uuid, newObj); - if (!this.setMap.has(objProps.set as string)) { - this.setMap.set(objProps.set as string, new Set()); - } - this.setMap.get(objProps.set as string)?.add(uuid); - return newObj; - } - - getObj(uuid: DBObj["uuid"]): DBObjResult { - const obj = this.objMap.get(uuid) as DBObjResultValue; - if (obj.valueType === "map") { - for (const key of Object.keys(obj.value)) { - const value = this.getObj(obj.value[key]).value as DBObjResultValue; - obj.value[key] = value; - } - } - return obj as DBObjResult; - } - - getSet(set: string): DBObj[] { - const uuids = this.setMap.get(set) || new Set(); - return Array.from(uuids).map(u => this.getObj(u)); - } - -} const db = new DataBase(); @@ -104,13 +13,13 @@ const users = [ const usersUuids: string[] = []; for (const user of users) { - const name = db.addObj({ set: "user_name", valueType: DBObjType.String, value: user.name }); - const age = db.addObj({ set: "user_age", valueType: DBObjType.Number, value: user.age }); - const gender = db.addObj({ set: "user_gender", valueType: DBObjType.String, value: user.gender }); + const name = db.addNode({ set: "user_name", valueType: "string", value: user.name }); + const age = db.addNode({ set: "user_age", valueType: "number", value: user.age }); + const gender = db.addNode({ set: "user_gender", valueType: "string", value: user.gender }); - const map = db.addObj({ + const map = db.addNode({ set: "user", - valueType: DBObjType.Map, + valueType: "map", value: { name: name.uuid, age: age.uuid, @@ -120,4 +29,17 @@ for (const user of users) { usersUuids.push(map.uuid); } +const ageExp = db.addNode({ + set: "users_exp", + valueType: "expression", + value: { + type: "filter", + set: "user", + filter: { + predicate: "greatThat", + value: 13 + } + } +}); + console.log(db.getSet("user")); \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 64bb161..d1115d3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,111 +1,25 @@ { "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": ["es6"], /* 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": false, /* 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. */ + "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + "lib": [ + "es6" + ], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + "module": "commonjs", /* Specify what module code is generated. */ + "rootDir": "./src", /* Specify the root folder within your source files. */ + "resolveJsonModule": true, /* Enable importing .json files. */ + "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + "outDir": "./dist", /* Specify an output folder for all emitted files. */ + "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + "strict": false, /* Enable all strict type-checking options. */ + "noImplicitAny": false, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ }, - "include": ["./src/**.ts"], - "exclude": ["node_modules"], -} + "include": [ + "./src/**.ts", + "./domain.d.ts" + ], + "exclude": [ + "node_modules" + ], +} \ No newline at end of file