wip: changes

Author: ariesclark

.github/workflows/ci.yaml

@@ -1,57 +1,64 @@
 on:
   repository_dispatch:
     types: [release]
+  workflow_dispatch:
+    inputs:
+      url:
+        type: string
+        description: URL (openapi.json)
   push:
     branches:
       - main
 
 name: Build & release
 
 jobs:
-  build-and-release:
+  build_and_release:
     runs-on: ubuntu-latest
-    name: Release
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
+
+      - uses: actions/cache@v4
+        with:
+          key: pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: pnpm-
+          path: |
+            ~/.pnpm-store
+            ~/.cache/pnpm
+            **/node_modules
 
       - uses: pnpm/action-setup@v4
-        name: Install pnpm
         with:
           version: 10
           run_install: false
 
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'pnpm'
+      - run: pnpm install
 
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Download specification
-        run: curl -L -o openapi.yaml https://vrchat.community/openapi.yaml
+      - if: github.event_name == 'repository_dispatch'
+        run: |
+          curl -fo openapi.json ${{ github.event.client_payload.artifacts['openapi.json'] }}
+          echo "from=repository_dispatch" >> $GITHUB_ENV
 
-      - name: Update version
+      - if: github.event_name == 'workflow_dispatch' && github.event.inputs.url != ''
         run: |
-          version=$(yq '.info.version' openapi.yaml | tr -d '"')
-          # pnpm version "${VERSION}-next.$(date +%s)" --no-git-tag-version
+          curl -fo openapi.json ${{ github.event.inputs.url }}
+          echo "from=workflow_dispatch" >> $GITHUB_ENV
+      
+      - if: env.from == ''
+        run: curl -fo openapi.json https://github.com/vrchatapi/specification/releases/latest/download/openapi.json
 
-          major=$(echo $version | cut -d. -f1)
-          minor=$(echo $version | cut -d. -f2)
-          patch=$(echo $version | cut -d. -f3)
+      - run: |
+          version=$(jq -r '.info.version' ./openapi.json)
+          version_tag=$(node -p "require('semver').parse('$version')?.prerelease[0] || 'latest'")
 
-          version="$((major+1)).$minor.$patch"
+          echo "version=$version" >> $GITHUB_ENV
+          echo "version_tag=$version_tag" >> $GITHUB_ENV
 
           pnpm version $version --no-git-tag-version
 
-      - name: Build
-        run: pnpm build
+      - run: pnpm build
 
-      - name: Release
+      - if: github.ref == 'refs/heads/main'
         run: |
-          echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
-          pnpm publish --no-git-checks
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+          pnpm publish --no-git-checks --tag ${{ env.version_tag }}

.gitignore

@@ -1,4 +1,5 @@
 node_modules
 src/generated
 dist
+openapi.json
 openapi.yaml

example/package.json

@@ -1,6 +1,7 @@
 {
 	"name": "example",
 	"version": "1.0.0",
+	"private": true,
 	"description": "",
 	"author": "",
 	"license": "ISC",

openapi-ts.config.ts

@@ -3,16 +3,18 @@ import { defineConfig } from "@hey-api/openapi-ts";
 import { errorPlugin } from "./plugins/error";
 
 export default defineConfig({
-	input: "./openapi.yaml",
+	input: "./openapi.json",
 	output: "src/generated",
 	plugins: [
 		{
 			name: "@hey-api/typescript",
 			exportFromIndex: false,
 			requests: "{{name}}",
-			enums: {
-				case: "camelCase"
-			}
+			// todo: enable after generator doesn't create conflicting names.
+			// todo: see: https://discord.com/channels/@me/1414524675156869140/1446935685780209664
+			// enums: {
+			// 	case: "camelCase"
+			// }
 		},
 		{
 			name: "@hey-api/client-fetch",

package.json

@@ -49,8 +49,9 @@
     "@types/node": "^24.10.1",
     "bun-plugin-dts": "^0.3.0",
     "eslint": "^9.39.1",
+    "semver": "^7.7.3",
     "tsup": "^8.5.1",
     "typed-emitter": "^2.1.0",
     "typescript": "^5.9.3"
   }
-}
+}

plugins/error.ts

@@ -4,6 +4,7 @@ export const errorPlugin = definePluginConfig({
 	name: "vrchat/error",
 	config: {},
 	dependencies: ["@hey-api/typescript"],
+	// @ts-expect-error: we're using an experimental version of the generator.
 	handler: ({ plugin }) => {
 		const symbol = plugin.querySymbol({ resourceId: "#/components/schemas/Error" });