Merge pull request #101 from klerick/split-json-api-package

Split package in json-api-nestjs

Author: klerick

.env

@@ -1,19 +1,17 @@
 DB_HOST=localhost
 DB_LOGGING=1
+DB_NAME="json-api-db"
 
 DB_USERNAME="postgres"
 DB_PASSWORD="postgres"
-#DB_NAME="json-api-db"
-DB_NAME="postgres"
 DB_PORT=5432
 DB_TYPE=postgres
 
 #DB_USERNAME="root"
-#DB_PASSWORD="password"
-#DB_NAME="example_new"
+#DB_PASSWORD="mysql"
 #DB_PORT=3306
 #DB_TYPE=mysql
 
 
-ORM_TYPE=microorm
-#ORM_TYPE=typeorm
+#ORM_TYPE=microorm
+ORM_TYPE=typeorm

.eslintrc.json

@@ -19,6 +19,12 @@
         ]
       }
     },
+    {
+      "files": ["*.test-d.ts"],
+      "rules": {
+        "@typescript-eslint/ban-ts-comment": "off"
+      }
+    },
     {
       "files": ["*.ts", "*.tsx"],
       "rules": {}

.github/actions/action.yml

@@ -1,34 +1,36 @@
-name: 'My composite action'
-description: 'Checks out the repository and install'
+name: Main action for Node.js
+description: Setup Node.js
+
+inputs:
+  node-version:
+    description: Node.js version
+    required: false
+    default: 20.x
+
 runs:
-  using: 'composite'
+  using: composite
   steps:
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
+    - name: Use Node.js ${{ inputs.node-version }}
+      uses: actions/setup-node@v3
       with:
-        node-version: 20
+        node-version: ${{ inputs.node-version }}
         registry-url: 'https://registry.npmjs.org'
-    - name: Restore cached npm dependencies
-      id: cache-dependencies-restore
-      uses: actions/cache/restore@v4
+        cache: npm
+
+    - name: Get npm cache directory
+      id: npm-cache-dir
+      shell: pwsh
+      run: echo "dir=$(npm config get cache)" >> ${env:GITHUB_OUTPUT}
+
+    - name: Cache NPM dependencies
+      uses: actions/cache@v4
+      id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
       with:
-        path: |
-          node_modules
-          ~/.cache/Cypress # needed for the Cypress binary
-        key: ${{ runner.os }}-npm-dependencies-${{ hashFiles('package-lock.json') }}
-    - name: Npm install
-      if: steps.cache-dependencies-restore.outputs.cache-hit != 'true'
-      run: npm ci
+        path: ${{ steps.npm-cache-dir.outputs.dir }}
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+
+    - name: Install Dependencies
       shell: bash
-    - name: Cache npm dependencies
-      id: cache-dependencies-save
-      uses: actions/cache/save@v4
-      with:
-        path: |
-          node_modules
-          ~/.cache/Cypress # needed for the Cypress binary
-        key: ${{ steps.cache-dependencies-restore.outputs.cache-primary-key }}
-    - name: Derive appropriate SHAs for base and head for `nx affected` commands
-      uses: nrwl/nx-set-shas@v4
-      with:
-        main-branch-name: "master"
+      run: npm ci

.github/workflows/build.yml

@@ -0,0 +1,52 @@
+name: ⚙️ Build
+
+on:
+  workflow_call:
+    inputs:
+      mainBranch:
+        description: Type for main nx affect
+        required: false
+        default: "master"
+        type: string
+    secrets:
+      NX_CLOUD_ACCESS_TOKEN:
+        required: true
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v4
+        with:
+          main-branch-name: "master"
+
+      - name: Setup Node.js
+        uses: ./.github/actions
+
+      - name: Determine base for NX affected (if not master)
+        if: ${{ inputs.mainBranch != 'master' }}
+        shell: bash
+        run: |
+          LAST_TAG=$(git describe --tags --abbrev=0)
+          LAST_TAG_HASH=$(git rev-parse "$LAST_TAG")
+          CURRENT_COMMIT=$(git rev-parse HEAD)
+          echo "Using last tag hash as NX_BASE: $LAST_TAG_HASH"
+          echo "Using current commit as NX_HEAD: $CURRENT_COMMIT"
+          echo "NX_BASE=$LAST_TAG_HASH" >> $GITHUB_ENV
+          echo "NX_HEAD=$CURRENT_COMMIT" >> $GITHUB_ENV
+
+      - name: Determine base for NX affected (if master)
+        if: ${{ inputs.mainBranch == 'master' }}
+        uses: nrwl/nx-set-shas@v4
+        with:
+          main-branch-name: ${{ inputs.mainBranch }}
+
+      - name: Build Libraries
+        run: npx nx affected --target=build --parallel=3  --exclude='*,!tag:type:publish'

.github/workflows/ci.yml renamed to .github/workflows/bump-version-save.yml

@@ -1,32 +1,49 @@
-name: CI
+name: Create Releases
 on:
-  pull_request:
-    branches:
-      - master
-    types:
-      - opened
-      - synchronize
+  workflow_dispatch:
+    inputs:
+      projects:
+        description: 'Package Bump'
+        required: true
+        default: 'json-api-nestjs,json-api-nestjs-sdk,nestjs-json-rpc,nestjs-json-rpc-sdk'
+      first-release:
+        description: 'Is first release?'
+        required: false
+        type: boolean
+        default: false
+      dry-run:
+        description: 'Is dry run?'
+        required: false
+        type: boolean
+        default: false
 jobs:
-  run-test:
-    name: Try build and run unit test
+  build-and-test:
+    name: "Build and test"
     runs-on: ubuntu-latest
+    permissions:
+      contents: "read"
+      actions: "read"
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Npm install
         uses: ./.github/actions
-      - name: Get branch names.
-        id: branch-names
-        uses: tj-actions/branch-names@v8
+      - name: Get git hash
+        run: |
+          COMMIT=$(git show-ref --tags --hash | tail -n 1)
+          echo "NX_BASE=$(echo ${COMMIT})" >> $GITHUB_ENV
+      - name: Set GIST_SECRET to env
+        run: |
+          echo "GIST_SECRET=${{ secrets.GIST_SECRET }}" >> $GITHUB_ENV
+          echo "GIST_ID=${{ secrets.GIST_ID }}" >> $GITHUB_ENV
       - name: Restore cached .nx
         id: cache-nx-restore
         uses: actions/cache/restore@v4
         with:
           path: |
             .nx
-          key: ${{ runner.os }}-nx-${{ steps.branch-names.outputs.current_branch }}
-      - run: git branch --track main origin/master
+          key: ${{ runner.os }}-nx-master
       - name: Test
         env:
           NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
@@ -35,6 +52,8 @@ jobs:
         env:
           NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
         run: npx nx affected -t build --exclude='json-api-front,json-api-server,json-api-server-e2e,json-shared-type,microorm-database,typeorm-database,@nestjs-json-api/source,type-for-rpc'
+      - name: Upload test coverage badge
+        run: npx nx affected -t upload-badge --exclude='json-api-front,json-api-server,shared-utils,json-api-server-e2e,json-shared-type,microorm-database,typeorm-database,@nestjs-json-api/source,type-for-rpc'
       - name: Save cached .nx
         id: cache-dependencies-save
         uses: actions/cache/save@v4
@@ -46,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Try run e2e test
     needs:
-      - run-test
+      - build-and-test
     services:
       # Label used to access the service container
       postgres:
@@ -71,25 +90,49 @@ jobs:
           fetch-depth: 0
       - name: Npm install
         uses: ./.github/actions
-      - name: Get branch names.
-        id: branch-names
-        uses: tj-actions/branch-names@v8
       - name: Restore cached .nx
         id: cache-nx-restore
         uses: actions/cache/restore@v4
         with:
           path: |
             .nx
-          key: ${{ runner.os }}-nx-${{ steps.branch-names.outputs.current_branch }}
+          key: ${{ runner.os }}-nx-master
       - run: git branch --track main origin/master
       - run: npm run typeorm migration:run
       - run: npm run seed:run
       - run: npx nx affected -t e2e --parallel=1
-      - run: npx nx affected -t e2e-micro --parallel=1
       - name: Save cached .nx
         id: cache-dependencies-save
         uses: actions/cache/save@v4
         with:
           path: |
             .nx
           key: ${{ steps.cache-nx-restore.outputs.cache-primary-key }}
+  bump-version:
+    name: "Bump version"
+    needs:
+      - run-e2e-test
+    runs-on: ubuntu-latest
+    permissions:
+      contents: "write"
+      actions: "read"
+      id-token: "write"
+    timeout-minutes: 10
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PAT }}
+      - name: Npm install
+        uses: ./.github/actions
+      - name: Bump version
+        run: |
+          git config --global user.email "actions@github.com"
+          git config --global user.name "GitHub Actions"
+          npx nx release --skip-publish --first-release=${{ github.event.inputs.first-release }} --projects=${{ github.event.inputs.projects }} --dry-run=${{ github.event.inputs.dry-run }}
+        shell: bash
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_CONFIG_PROVENANCE: true