eve-esi-client-ts 1.0.29 → 1.1.1

package/.github/workflows/generate.yml

@@ -1,71 +1,120 @@
 name: Generate Client
 
 on:
-  push:
   schedule:
-    - cron: '5 11 * * *' # Runs at 11:05 UTC daily
+    - cron: "15 11 * * *" # Runs at 11:15 UTC daily
   workflow_dispatch:
 permissions:
   contents: write
   id-token: write
 jobs:
-  generate-client:
-    name: Generate TypeScript Client
+  check-update:
+    name: Check ESI endpoint updates
     runs-on: ubuntu-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+    outputs:
+      esi_endpoint: ${{ steps.esi_url.outputs.esi_endpoint }}
+      remote_version: ${{ steps.fetch_spec.outputs.remote_version }}
+      changed: ${{ steps.check_version.outputs.changed }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Get version
-        id: version
+      - name: Generate ESI endpoint URL
+        id: esi_url
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          VERSION=$(node -p "require('./package.json').version.replace(/^v/, '')")
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-      - name: Download spec
+          ESI_BASE="https://esi.evetech.net/meta/openapi.json"
+          DATE=$(date -u -d "yesterday" '+%Y-%m-%d')
+          FULL_URL="${ESI_BASE}?compatibility_date=${DATE}"
+          echo "esi_endpoint=$FULL_URL" >> $GITHUB_OUTPUT
+      - name: Fetch version
+        id: fetch_spec
         run: |
-          curl -L https://esi.evetech.net/latest/swagger.json -o swagger.json
-      - name: Generate old Client
-        uses: openapi-generators/openapitools-generator-action@v1
-        with:
-          generator: typescript-axios
-          openapi-file: swagger.json
-          command-args: --minimal-update --additional-properties=supportsES6=true,npmName=eve-esi-client-ts,npmVersion=${{ steps.version.outputs.version }},licenseName=MIT --git-user-id=${{ github.repository_owner }} --git-repo-id=${{ github.event.repository.name }} --git-host=github.com
-      - name: Process output
-        id: check
+          # Fetch the OpenAPI spec and extract info.version
+          REMOTE_VERSION=$(curl -s "${{ steps.esi_url.outputs.esi_endpoint }}" | jq -r '.info.version')
+          echo "Remote version: $REMOTE_VERSION"
+          echo "remote_version=$REMOTE_VERSION" >> $GITHUB_OUTPUT
+      - name: Check version
+        id: check_version
         run: |
-          rsync -a --remove-source-files typescript-axios-client/ .
-          rm -rf typescript-axios-client
-          git add .
-          git reset -- swagger.json
-          git diff --cached
-          if git diff --cached --quiet; then
-            echo "No changes after client generation. Exiting."
+          REMOTE_VERSION="${{ steps.fetch_spec.outputs.remote_version }}"
+          if [ ! -f ESI_VERSION ]; then
+            echo "No local ESI_VERSION found."
+            echo "changed=true" >> $GITHUB_OUTPUT
+          elif [ "$(cat ESI_VERSION)" != "$REMOTE_VERSION" ]; then
+            echo "Version changed: $(cat ESI_VERSION) -> $REMOTE_VERSION"
+            echo "changed=true" >> $GITHUB_OUTPUT
+          else
+            echo "Version unchanged: $REMOTE_VERSION"
             echo "changed=false" >> $GITHUB_OUTPUT
-            exit 0
           fi
-          echo "changed=true" >> $GITHUB_OUTPUT
+
+  update-dependencies:
+    name: Update dependencies
+    runs-on: ubuntu-latest
+    needs: check-update
+    if: needs.check-update.outputs.changed == 'false'
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Update dependencies
+        run: |
+          git reset --hard
+          npm update --save
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git add package.json package-lock.json
+          git commit -m "Update dependencies"
+          git push
+
+  generate-client:
+    name: Generate TypeScript Client
+    runs-on: ubuntu-latest
+    needs: check-update
+    if: needs.check-update.outputs.changed == 'true'
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Bump version
         id: bump
-        if: steps.check.outputs.changed == 'true'
         run: |
-          git reset --hard
-          VERSION=$(npm version patch --tag-version-prefix='' --git-tag-version false)
+          CURRENT=$(jq -r .version package.json)
+          if [[ "$CURRENT" < "1.1.0" ]]; then
+            VERSION=$(npm version minor --tag-version-prefix='' --git-tag-version false)
+          else
+            VERSION=$(npm version patch --tag-version-prefix='' --git-tag-version false)
+          fi
+          echo "${{ needs.check-update.outputs.remote_version }}" > ESI_VERSION
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-      - name: Generate new Client
+      - name: Generate TypeScript Client
         uses: openapi-generators/openapitools-generator-action@v1
-        if: steps.check.outputs.changed == 'true'
         with:
           generator: typescript-axios
-          openapi-file: swagger.json
+          openapi-url: "${{ needs.check-update.outputs.esi_endpoint }}"
           command-args: --minimal-update --additional-properties=supportsES6=true,npmName=eve-esi-client-ts,npmVersion=${{ steps.bump.outputs.version }},licenseName=MIT --git-user-id=${{ github.repository_owner }} --git-repo-id=${{ github.event.repository.name }} --git-host=github.com
-      - name: Process new output
-        if: steps.check.outputs.changed == 'true'
+      - name: Add custom info
         run: |
+          jq ".description = \"OpenAPI client for EVE Spring Inebriation(ESI) - tranquility\" | .author = \"Archangel's Echo\"" typescript-axios-client/package.json > tmp.json && mv tmp.json typescript-axios-client/package.json
+      - name: Commit changes
+        run: |
+          git reset --hard
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
           rsync -a --remove-source-files typescript-axios-client/ .
-          rm -rf typescript-axios-client swagger.json
+          rm -rf typescript-axios-client
+          npm update --save
           git add .
-          git commit -m "Auto generate: ${{ steps.bump.outputs.version }}"
+          git commit -m "Auto generate: ${{ steps.bump.outputs.version }} (ESI-${{ needs.check-update.outputs.remote_version }})"
           git push
-      # Publishing is now handled in a separate workflow (.github/workflows/publish.yml)
+
+  publish:
+    name: Publish to NPM
+    needs: generate-client
+    uses: ./.github/workflows/publish.yml

package/.github/workflows/publish.yml

@@ -1,11 +1,7 @@
 name: Publish
 
 on:
-  workflow_run:
-    workflows:
-      - "Generate Client"
-    types:
-      - completed
+  workflow_call:
   workflow_dispatch:
 
 permissions:
@@ -16,72 +12,25 @@ jobs:
   publish:
     name: Publish to NPM
     runs-on: ubuntu-latest
-    if: ${{ (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || github.event_name == 'workflow_dispatch' }}
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Set up Node.js (needed to read package.json and query NPM)
+          ref: ${{ github.ref }}
+      - name: Pull latest
+        run: |
+          git fetch origin
+          git log --oneline -3
+      - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: lts/*
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Check last commit for generation
-        id: check_commit
-        run: |
-          git fetch --prune --unshallow || true
-
-          # If this run was started manually, always attempt to publish
-          if [ "$GITHUB_EVENT_NAME" = "workflow_dispatch" ]; then
-            echo "changed=true" >> $GITHUB_OUTPUT
-            LAST_COMMIT_MSG="(manual run)"
-            echo "last_msg<<EOF" >> $GITHUB_OUTPUT
-            echo "$LAST_COMMIT_MSG" >> $GITHUB_OUTPUT
-            echo "EOF" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          LAST_COMMIT_MSG="$(git log -1 --pretty=%B)"
-          echo "last_msg<<EOF" >> $GITHUB_OUTPUT
-          echo "$LAST_COMMIT_MSG" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-          if [[ "$LAST_COMMIT_MSG" == Auto\ generate:* ]]; then
-            # Read package name & version
-            PACKAGE_NAME="$(node -p "require('./package.json').name")"
-            NEW_VERSION="$(node -p "require('./package.json').version")"
-
-            # Get published version from npm (fallback to 0.0.0 if not found)
-            PUBLISHED_VERSION="$(npm view "$PACKAGE_NAME" version --registry https://registry.npmjs.org 2>/dev/null || echo "0.0.0")"
-
-            echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
-            echo "published_version=$PUBLISHED_VERSION" >> $GITHUB_OUTPUT
-
-            # Compare semver: if NEW_VERSION > PUBLISHED_VERSION then publish.
-            # Use sort -V to perform version-aware comparison.
-            greatest=$(printf "%s\n" "$PUBLISHED_VERSION" "$NEW_VERSION" | sort -V | tail -n1)
-            if [ "$greatest" = "$NEW_VERSION" ] && [ "$NEW_VERSION" != "$PUBLISHED_VERSION" ]; then
-              echo "changed=true" >> $GITHUB_OUTPUT
-            else
-              echo "changed=false" >> $GITHUB_OUTPUT
-            fi
-          else
-            echo "changed=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: No generated changes
-        if: steps.check_commit.outputs.changed == 'false'
-        run: |
-          echo "No generated changes to publish."
-
+          registry-url: "https://registry.npmjs.org"
       - name: Install dependencies
-        if: steps.check_commit.outputs.changed == 'true'
         run: |
           rm -rf node_modules package-lock.json
           npm install
-
       - name: Publish to NPM
-        if: steps.check_commit.outputs.changed == 'true'
         run: npm publish --provenance --access public