add CI

specfy · Apr 28, 2023 · 541e8ba · 541e8ba
1 parent 59c7529
commit 541e8ba
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 57 deletions.
diff --git a/.github/worfkflows/ci.yaml b/.github/worfkflows/ci.yaml
@@ -0,0 +1,33 @@
+name: Main
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  ci:
+    container: node:18.13.0
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: .nvmrc
+          cache: 'npm'
+          cache-dependency-path: |
+            package-lock.json
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint
+
+      - name: Run Test API
+        run: npm run test
diff --git a/src/analyser/index.test.ts b/src/analyser/index.test.ts
@@ -15,6 +15,7 @@ describe('techAnalyser', () => {
       }),
     });
 
+    // console.log(res.toJson());
     expect(res.toJson()).toStrictEqual({
       id: expect.any(String),
       name: 'main',
@@ -24,17 +25,6 @@ describe('techAnalyser', () => {
       inComponent: null,
       edges: [],
       components: [
-        {
-          id: expect.any(String),
-          name: 'db',
-          group: 'component',
-          edges: [],
-          languages: {},
-          path: '/docker-compose.yml',
-          tech: 'postgresql',
-          techs: [],
-          inComponent: null,
-        },
         {
           id: expect.any(String),
           name: 'api',
@@ -52,17 +42,6 @@ describe('techAnalyser', () => {
           },
           techs: ['fastify', 'nodejs', 'prisma', 'typescript'],
         },
-        {
-          id: expect.any(String),
-          name: 'vercel',
-          group: 'hosting',
-          languages: {},
-          edges: [],
-          path: '',
-          tech: 'vercel',
-          inComponent: null,
-          techs: [],
-        },
         {
           id: expect.any(String),
           name: 'app',
@@ -89,32 +68,14 @@ describe('techAnalyser', () => {
         },
         {
           id: expect.any(String),
-          name: 'website',
-          edges: [],
+          name: 'db',
           group: 'component',
-          path: '/pkgs/website',
-          inComponent: expect.any(String),
-          tech: null,
-          languages: {
-            CSS: 1,
-            HTML: 1,
-            JSON: 3,
-            JavaScript: 2,
-            SCSS: 1,
-            TypeScript: 7,
-          },
-          techs: [
-            'css',
-            'html',
-            'javascript',
-            'nodejs',
-            'react',
-            'scss',
-            'tailwind',
-            'typescript',
-            'vercel',
-            'vite',
-          ],
+          edges: [],
+          languages: {},
+          path: '/docker-compose.yml',
+          tech: 'postgresql',
+          techs: [],
+          inComponent: null,
         },
         {
           id: expect.any(String),
@@ -161,6 +122,46 @@ describe('techAnalyser', () => {
             'vite',
           ],
         },
+        {
+          id: expect.any(String),
+          name: 'vercel',
+          group: 'hosting',
+          languages: {},
+          edges: [],
+          path: '/pkgs/app',
+          tech: 'vercel',
+          inComponent: null,
+          techs: [],
+        },
+        {
+          id: expect.any(String),
+          name: 'website',
+          edges: [],
+          group: 'component',
+          path: '/pkgs/website',
+          inComponent: expect.any(String),
+          tech: null,
+          languages: {
+            CSS: 1,
+            HTML: 1,
+            JSON: 3,
+            JavaScript: 2,
+            SCSS: 1,
+            TypeScript: 7,
+          },
+          techs: [
+            'css',
+            'html',
+            'javascript',
+            'nodejs',
+            'react',
+            'scss',
+            'tailwind',
+            'typescript',
+            'vercel',
+            'vite',
+          ],
+        },
       ],
       techs: [
         'css',

diff --git a/src/payload/helpers.ts b/src/payload/helpers.ts
@@ -26,15 +26,17 @@ export function findImplicitComponent(pl: Payload, tech: AllowedKeys) {
     group = 'thirdparty';
   }
 
-  pl.addComponent(
-    new Payload({
-      name: tech,
-      tech: tech,
-      folderPath: pl.path,
-      group,
-      parent: pl,
-    })
-  );
+  const comp = new Payload({
+    name: tech,
+    tech: tech,
+    folderPath: pl.path,
+    group,
+    parent: pl,
+  });
+  pl.addComponent(comp);
+  if (group !== 'hosting') {
+    pl.addEdges(comp.id);
+  }
 }
 
 /**

diff --git a/src/payload/index.ts b/src/payload/index.ts
@@ -168,7 +168,7 @@ export class Payload {
 
   merge(pl: Payload) {
     pl.components.forEach((component) => this.addComponent(component));
-    this.addTechs([...pl.techs]);
+    pl.techs.forEach((tech) => this.techs.add(tech));
 
     if (pl.name !== 'virtual') {
       this.addComponent(pl);