Merge pull request #666 from lukecotter/feat-dir-organisation

feat: reorganises the log-viewer folder

Author: lcottercertinia

jest.config.js

@@ -14,10 +14,6 @@ const defaultConfig = {
       },
     ],
   },
-  transformIgnorePatterns: [
-    // allow lit/@lit transformation
-    '<rootDir>/node_modules/(?!@?lit)',
-  ],
   testPathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/out/'],
   extensionsToTreatAsEsm: ['.ts', '.tsx'],
 };
@@ -34,6 +30,10 @@ export default {
       ...defaultConfig,
       displayName: 'lana',
       rootDir: '<rootDir>/lana',
+      transformIgnorePatterns: [
+        // allow lit/@lit transformation
+        '<rootDir>/node_modules/(?!@?lit)',
+      ],
     },
   ],
 };

log-viewer/modules/Main.ts renamed to log-viewer/src/Main.ts

@@ -3,7 +3,8 @@
  */
 import { html, render } from 'lit';
 
-import './components/LogViewer';
+// web components
+import './features/app/LogViewer';
 
 function onInit(): void {
   render(html`<log-viewer></log-viewer>`, document.body);

log-viewer/modules/__tests__/ApexLogParser.test.ts renamed to log-viewer/src/__tests__/ApexLogParser.test.ts

@@ -11,10 +11,10 @@ import {
   parseObjectNamespace,
   parseRows,
   parseVfNamespace,
-} from '../parsers/LogEvents.js';
-import { lineTypeMap } from '../parsers/LogLineMapping.js';
+} from '../core/log-parser/LogEvents.js';
+import { lineTypeMap } from '../core/log-parser/LogLineMapping.js';
 
-import { ApexLogParser, parse } from '../parsers/ApexLogParser.js';
+import { ApexLogParser, parse } from '../core/log-parser/ApexLogParser.js';
 
 class DummyLine extends LogEvent {
   constructor(parser: ApexLogParser, parts: string[]) {

log-viewer/modules/__tests__/Database.test.ts renamed to log-viewer/src/__tests__/Database.test.ts

@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 2020 Certinia Inc. All rights reserved.
  */
-import { DatabaseAccess } from '../Database.js';
-import { parse } from '../parsers/ApexLogParser.js';
+import { parse } from '../core/log-parser/ApexLogParser.js';
+import { DatabaseAccess } from '../features/database/services/Database.js';
 
 describe('Analyse database tests', () => {
   it('Only DML and SOQL are collected', async () => {

log-viewer/modules/__tests__/SOQLParser.test.ts renamed to log-viewer/src/__tests__/SOQLParser.test.ts

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2020 Certinia Inc. All rights reserved.
  */
-import { SOQLParser, SyntaxException } from '../soql/SOQLParser.js';
+import { SOQLParser, SyntaxException } from '../features/soql/services/SOQLParser.js';
 
 describe('Analyse database tests', () => {
   it('throws on unparsable query', async () => {

log-viewer/modules/__tests__/Util.test.ts renamed to log-viewer/src/__tests__/Util.test.ts

@@ -2,7 +2,7 @@
  * Copyright (c) 2020 Certinia Inc. All rights reserved.
  * @jest-environment jsdom
  */
-import formatDuration from '../Util.js';
+import formatDuration from '../core/utility/Util.js';
 
 describe('Format duration tests', () => {
   it('Value converted from nanoseconds to milliseconds', () => {

log-viewer/modules/__tests__/soql/SOQLLinter.test.ts renamed to log-viewer/src/__tests__/soql/SOQLLinter.test.ts

@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2021 Certinia Inc. All rights reserved.
  */
-import { ApexLogParser } from '../../parsers/ApexLogParser.js';
-import { LogEvent } from '../../parsers/LogEvents.js';
-import { SOQLLinter } from '../../soql/SOQLLinter.js';
+import { ApexLogParser } from '../../core/log-parser/ApexLogParser.js';
+import { LogEvent } from '../../core/log-parser/LogEvents.js';
+import { SOQLLinter } from '../../features/soql/services/SOQLLinter.js';
 
 class DummySOQLLine extends LogEvent {
   constructor(parser: ApexLogParser, parts: string[]) {

log-viewer/modules/components/BadgeBase.ts renamed to log-viewer/src/components/BadgeBase.ts

@@ -5,8 +5,9 @@ import { provideVSCodeDesignSystem, vsCodeTag } from '@vscode/webview-ui-toolkit
 import { LitElement, css, html } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 
+// styles
 import { globalStyles } from '../styles/global.styles.js';
-import { skeletonStyles } from './skeleton/skeleton.styles.js';
+import { skeletonStyles } from '../styles/skeleton.styles.js';
 
 provideVSCodeDesignSystem().register(vsCodeTag());
 

log-viewer/modules/components/CallStack.ts renamed to log-viewer/src/components/CallStack.ts

@@ -4,10 +4,12 @@
 import { LitElement, css, html } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 
-import { DatabaseAccess } from '../Database.js';
-import type { LogEvent } from '../parsers/LogEvents.js';
+import type { LogEvent } from '../core/log-parser/LogEvents.js';
+import { goToRow } from '../features/call-tree/components/CalltreeView.js';
+import { DatabaseAccess } from '../features/database/services/Database.js';
+
+// styles
 import { globalStyles } from '../styles/global.styles.js';
-import { goToRow } from './calltree-view/CalltreeView.js';
 
 @customElement('call-stack')
 export class CallStack extends LitElement {

log-viewer/modules/components/skeleton/GridSkeleton.ts renamed to log-viewer/src/components/GridSkeleton.ts

@@ -1,8 +1,9 @@
 import { LitElement, css, html } from 'lit';
 import { customElement } from 'lit/decorators.js';
 
-import { globalStyles } from '../../styles/global.styles.js';
-import { skeletonStyles } from './skeleton.styles.js';
+// styles
+import { globalStyles } from '../styles/global.styles.js';
+import { skeletonStyles } from '../styles/skeleton.styles.js';
 
 @customElement('grid-skeleton')
 export class GridSkeleton extends LitElement {