added undefined, null and boolean support

Andcool-Systems · Andcool-Systems · commit 70623e46ec3d · 2024-12-21T15:36:35.000+03:00
colors moved to config.ts
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ lerna-debug.log*
 # Tests
 /coverage
 /.nyc_output
+debug.json
 
 # IDEs and editors
 /.idea
diff --git a/src/apis/apis.service.ts b/src/apis/apis.service.ts
@@ -17,7 +17,7 @@ export class APIService {
             'https://api.github.com/graphql',
             {
                 query: "query GetUserDetails($username: String!) { user(login: $username)" +
-                    "{ name login followers { totalCount } repositories(first: 10, orderBy: {field: STARGAZERS, direction: DESC})" +
+                    "{ name login followers { totalCount } repositories(first: 3, orderBy: {field: STARGAZERS, direction: DESC})" +
                     "{ nodes { name stargazerCount } totalCount } } } }",
                 variables: {
                     username: username
diff --git a/src/config.ts b/src/config.ts
@@ -0,0 +1,29 @@
+type typeofTypes = 'string' | 'boolean' | 'function' | 'number' | 'object' | 'symbol' | 'undefined' | 'bigint';
+
+export const brackets_colors = ['#ffd700', '#da70d6', '#179fff'];
+
+export const typeColors = (type: typeofTypes) => {
+    switch (type) {
+        case 'bigint': return '#b5cea8';
+        case 'number': return '#b5cea8';
+        case 'object': return '#569cd6';
+        case 'undefined': return '#569cd6';
+        case 'boolean': return '#569cd6';
+        default: return '#ce9178';
+    }
+}
+
+export const typeQuotes = (type: typeofTypes) => {
+    const quotesNeeded: typeofTypes[] = ['string', 'symbol'];
+    return quotesNeeded.includes(type) ? '"' : '';
+}
+
+export const colors = {
+    main_text: '#ffffff',
+    background: '#1e1e1e',
+    header: '#252526',
+    icon_color: '#ffd700',
+    indent_lines: '#404040',
+    line_index: '#6e7681',
+    keys: '#9cdcfe'
+}
diff --git a/src/json_parser/parser.service.ts b/src/json_parser/parser.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
+import { brackets_colors, colors, typeColors, typeQuotes } from 'src/config';
 
 type AnyObject = Record<string, any>;
-const brackets_colors = ['#ffd700', '#da70d6', '#179fff'];
 
 export type ObjectStructureInfo = {
     key: string;
@@ -20,18 +20,20 @@ export class ParserService {
         const currentIndent = indent * depth;
         const nextIndent = indent * (depth + 1);
 
-        if (typeof obj !== "object" || obj === null) {
-            const quotes = typeof obj === 'number' ? '' : '"';
-            const color = typeof obj === 'number' ? '#b5cea8' : '#ce9178';
+        if (typeof obj !== "object" || obj === null || obj === undefined) {
+            const quotes = typeQuotes(typeof obj);
+            const color = typeColors(typeof obj);
             return `<tspan style="fill: ${color};">${quotes}${obj}${quotes}</tspan>`;
         }
 
         const entries = Object.entries(obj)
             .map(([key, value], index, array) => {
                 const formattedValue = this.parse(value, indent, depth + 1);
-                const comma = index < array.length - 1 ? "," : "";
+                const comma = index < array.length - 1 ? ',' : '';
 
-                return `<tspan x="${nextIndent}" dy="19"><tspan class="key">"${key}"</tspan>: ${formattedValue}${comma}</tspan>`;
+                return `<tspan x="${nextIndent}" dy="19">` +
+                    `<tspan style="fill: ${colors.keys};">"${key}"</tspan>: ${formattedValue}${comma}` +
+                    `</tspan>`;
             })
             .join(`\n`);
 
@@ -56,8 +58,8 @@ export class ParserService {
         );
     }
 
-    analyzeObjectStructureFlat(
-        obj: any,
+    parseObjectStructure(
+        obj: AnyObject,
         lineIndex: { current: number } = { current: 2 },
         depth: number = 0
     ): ObjectStructureInfo[] {
@@ -73,7 +75,7 @@ export class ParserService {
 
             if (typeof obj[key] === 'object' && obj[key] !== null) {
                 result.push({ key, startLine, endLine: 0, depth });
-                const children = this.analyzeObjectStructureFlat(obj[key], lineIndex, depth + 1);
+                const children = this.parseObjectStructure(obj[key], lineIndex, depth + 1);
                 result.push(...children);
                 const endLine = lineIndex.current++;
                 result.find(item => item.key === key && item.startLine === startLine)!.endLine = endLine;
diff --git a/src/widget/views/index.hbs b/src/widget/views/index.hbs
@@ -1,11 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="800" height="{{ height }}" viewBox="0 0 800 {{ height }}">
     <style>
-        .key {
-            fill: #9cdcfe;
-        }
-
         text {
-            fill: white;
             font-weight: normal;
             transform: translateX(5px);
         }
@@ -15,25 +10,24 @@
         }
 
         .indexes {
-            fill: #6e7681;
             transform: translateX(10px);
         }
 
         .main_text {
             transform: translateX(38px);
         }
     </style>
-    <rect width="800" height="{{ height_ }}" style="fill: #1e1e1e;" />
-    <rect width="693" height="40" x="107" style="fill: #252526;" />
-    <rect width="1" height="{{ height_main_line }}" x="40" y="65" style="fill: #404040;" />
+    <rect width="800" height="{{ height_ }}" style="fill: {{background_color}};" />
+    <rect width="693" height="40" x="107" style="fill: {{header_color}};" />
+    <rect width="1" height="{{ height_main_line }}" x="40" y="65" fill="{{indent_color}}" />
 
-    <text y="60" font-family="Consolas, monospace" class="indexes">
+    <text y="60" font-family="Consolas, monospace" class="indexes" fill="{{main_color}}">
         {{{indexes}}}
     </text>
-    <text y="25" class="filename" font-family="Segoe WPC, Segoe UI, sans-serif">
-        <tspan style="fill: #ffd700;" font-family="Consolas, monospace">{}</tspan> info.json
+    <text y="25" class="filename" font-family="Segoe WPC, Segoe UI, sans-serif" fill="{{main_color}}">
+        <tspan fill="{{icon_color}}" font-family="Consolas, monospace">{}</tspan> info.json
     </text>
-    <text y="60" font-family="Consolas, monospace" class="main_text">
+    <text y="60" font-family="Consolas, monospace" class="main_text" fill="{{main_color}}">
         {{{json}}}
     </text>
 
diff --git a/src/widget/widget.controller.ts b/src/widget/widget.controller.ts
@@ -1,11 +1,15 @@
 import { Get, Controller, Render, Header, Res, Query } from '@nestjs/common';
 import type { Response } from 'express';
 import { WidgetService } from './widget.service';
+import { ParserService } from 'src/json_parser/parser.service';
+import { colors } from 'src/config';
 
 
 @Controller()
 export class WidgetController {
-    constructor(private readonly widgetService: WidgetService) { }
+    constructor(private readonly widgetService: WidgetService,
+        private readonly parserService: ParserService
+    ) { }
 
     @Get('/')
     @Render('index')
@@ -14,65 +18,28 @@ export class WidgetController {
     async widget(
         @Res({ passthrough: true }) res: Response
     ) {
-        const content = await this.widgetService.generate();
+        const json = await this.widgetService.generate();
+        const content = this.parserService.parse(json, 30);
 
-        const lines_count = content.main.split('\n').length;
+        const indents = this.parserService.parseObjectStructure(json);
+
+        const lines_count = content.split('\n').length;
         const indexes = this.widgetService.generate_indexes(lines_count);
 
         res.header('Content-Type', 'image/svg+xml');
         return {
-            json: content.main,
+            json: content,
             indexes: indexes,
-            indents: content.indents,
+            indents: this.widgetService.generateIndentLines(indents, 30),
             height: 52 + (lines_count * 19),
             height_: 60 + (lines_count * 19),
-            height_main_line: (lines_count - 2) * 19
-        };
-    }
-
-    /*
-    @Get('/user')
-    @Render('index')
-    @Header('Cache-Control', 'no-cache')
-    @Header('Age', '0')
-    async widgetUser(
-        @Res({ passthrough: true }) res: Response,
-        @Query() query: { query: string }
-    ) {
-        let json = {};
-        let content = "";
-        let indexes = ""
-        let lines_count = 0;
+            height_main_line: (lines_count - 2) * 19,
 
-        try {
-            if (!query.query || query.query.length > 255) {
-                throw Error('Invalid request query');
-            }
-
-            json = JSON.parse(query.query);
-
-            content = await this.widgetService.generateUser(json);
-            lines_count = content.split('\n').length;
-            indexes = this.widgetService.generate_indexes(lines_count);
-        } catch (e) {
-            console.error(e)
-            json = {
-                status: 'error',
-                message: (e.message ?? "Unknown error. See server console.").slice(0, 60) + (!!e.message && e.message.length > 60 ? '...' : '')
-            }
-
-            content = await this.widgetService.generateUser(json);
-            lines_count = content.split('\n').length;
-            indexes = this.widgetService.generate_indexes(lines_count);
-        }
-
-        res.header('Content-Type', 'image/svg+xml');
-        return {
-            json: content,
-            indexes: indexes,
-            height: 52 + (lines_count * 19),
-            height_: 60 + (lines_count * 19)
+            background_color: colors.background,
+            header_color: colors.header,
+            icon_color: colors.icon_color,
+            indent_color: colors.indent_lines,
+            main_color: colors.main_text
         };
     }
-    */
 }
diff --git a/src/widget/widget.service.ts b/src/widget/widget.service.ts
@@ -1,11 +1,12 @@
 import { Injectable } from '@nestjs/common';
 import { APIService } from 'src/apis/apis.service';
-import { ObjectStructureInfo, ParserService } from 'src/json_parser/parser.service';
+import { colors } from 'src/config';
+import { ObjectStructureInfo } from 'src/json_parser/parser.service';
 
 
 @Injectable()
 export class WidgetService {
-    constructor(private readonly parserService: ParserService,
+    constructor(
         private readonly apiService: APIService,
     ) { }
 
@@ -66,7 +67,7 @@ export class WidgetService {
                 return acc;
             }, {});
 
-            const top_langs = wakatime_last.data?.slice(0, 3)?.reduce((acc, value) => {
+            const top_langs = wakatime_last?.data?.slice(0, 3)?.reduce((acc, value) => {
                 const el = { [value.name.toLowerCase().replaceAll('+', 'p')]: value.text };
                 acc = { ...acc, ...el };
                 return acc;
@@ -75,21 +76,21 @@ export class WidgetService {
             json = {
                 name: github_data.data.user?.name ?? 'n/a',
                 description: process.env.DESCRIPTION,
-                followers: github_data.data.user?.followers?.totalCount ?? 'n/a',
-                total_stars: github_data.data.user?.repositories?.totalCount ?? 'n/a',
-                top_repos: top_repos ?? 'n/a',
+                followers: github_data.data.user?.followers?.totalCount,
+                total_stars: github_data.data.user?.repositories?.totalCount,
+                top_repos: top_repos,
                 github_streak: streak ? {
                     current_streak: streak.streak,
                     longest_streak: streak.longest
-                } : 'n/a',
+                } : undefined,
                 wakatime: {
-                    all_time: wakatime_global.data.grand_total.human_readable_total_including_other_language ?? 'n/a',
-                    top_langs: top_langs ?? 'n/a'
+                    all_time: wakatime_global?.data?.grand_total?.human_readable_total_including_other_language,
+                    top_langs: top_langs
                 },
                 weather: weather ? {
                     temperature: weather.temp,
                     condition: weather.condition
-                } : 'n/a',
+                } : undefined,
                 datetime: {
                     time: this.getTime(),
                     tz: process.env.DATETIME_TIMEZONE,
@@ -109,22 +110,13 @@ export class WidgetService {
                 message: (e.message ?? "Unknown error. See server console.").slice(0, 60) + (!!e.message && e.message.length > 60 ? '...' : '')
             }
         }
-
-        const indents = this.parserService.analyzeObjectStructureFlat(json);
-        return {
-            main: this.parserService.parse(json, 30),
-            indents: this.generateIndentLines(indents, 30)
-        };
-    }
-
-    async generateUser(obj: any) {
-        return this.parserService.parse(obj, 30);
+        return json;
     }
 
     generate_indexes(count: number) {
         const array = [];
         for (let index = 1; index <= count; index++) {
-            array.push(`<tspan x="${index < 10 ? '9' : '0'}" dy="${index === 1 ? '0' : '19'}">${index}</tspan>`);
+            array.push(`<tspan x="${index < 10 ? '9' : '0'}" dy="${index === 1 ? '0' : '19'}" fill="${colors.line_index}">${index}</tspan>`);
         }
 
         return array.join('\n');
@@ -134,7 +126,7 @@ export class WidgetService {
         const array = [];
         for (const indent of indents) {
             array.push(
-                `<rect fill="#404040" x="${indent.depth * indent_width}" ` +
+                `<rect fill="${colors.indent_lines}" x="${indent.depth * indent_width}" ` +
                 `y="${indent.startLine * 19}" width="1" height="${((indent.endLine - indent.startLine) - 1) * 19}" />`
             );
         }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export class APIService {`
`17`	`17`	`'https://api.github.com/graphql',`
`18`	`18`	`{`
`19`	`19`	`query: "query GetUserDetails($username: String!) { user(login: $username)" +`
`20`		`- "{ name login followers { totalCount } repositories(first: 10, orderBy: {field: STARGAZERS, direction: DESC})" +`
	`20`	`+ "{ name login followers { totalCount } repositories(first: 3, orderBy: {field: STARGAZERS, direction: DESC})" +`
`21`	`21`	`"{ nodes { name stargazerCount } totalCount } } } }",`
`22`	`22`	`variables: {`
`23`	`23`	`username: username`