server is striped

open-api/bin/generate-open-api.sh

@@ -1,47 +1,44 @@
 #!/usr/bin/env bash
-OPENAPI_GENERATOR_VERSION=v7.12.0
-
-# usage: ./bin/generate-open-api.sh
+set -euo pipefail
 
 function dart {
   rm -rf ../mobile/openapi
   cd ./templates/mobile/serialization/native
-  wget -O native_class.mustache https://raw.githubusercontent.com/OpenAPITools/openapi-generator/$OPENAPI_GENERATOR_VERSION/modules/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache
+  wget -O native_class.mustache https://raw.githubusercontent.com/OpenAPITools/openapi-generator/v7.12.0/modules/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache
   patch --no-backup-if-mismatch -u native_class.mustache <native_class.mustache.patch
   patch --no-backup-if-mismatch -u native_class.mustache <native_class_nullable_items_in_arrays.patch
 
   cd ../../
-  wget -O api.mustache https://raw.githubusercontent.com/OpenAPITools/openapi-generator/$OPENAPI_GENERATOR_VERSION/modules/openapi-generator/src/main/resources/dart2/api.mustache
+  wget -O api.mustache https://raw.githubusercontent.com/OpenAPITools/openapi-generator/v7.12.0/modules/openapi-generator/src/main/resources/dart2/api.mustache
   patch --no-backup-if-mismatch -u api.mustache <api.mustache.patch
 
   cd ../../
-  pnpm dlx @openapitools/openapi-generator-cli generate -g dart -i ./immich-openapi-specs.json -o ../mobile/openapi -t ./templates/mobile
+  pnpm dlx @openapitools/openapi-generator-cli generate -g dart -i ./server-openapi-specs.json -o ../mobile/openapi -t ./templates/mobile
 
   # Post generate patches
   patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api_client.dart <./patch/api_client.dart.patch
   patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api.dart <./patch/api.dart.patch
   patch --no-backup-if-mismatch -u ../mobile/openapi/pubspec.yaml <./patch/pubspec_immich_mobile.yaml.patch
-  # Don't include analysis_options.yaml for the generated openapi files
-  # so that language servers can properly exclude the mobile/openapi directory
-  rm ../mobile/openapi/analysis_options.yaml
+  rm -f ../mobile/openapi/analysis_options.yaml
 }
 
 function typescript {
-  pnpm dlx oazapfts --optimistic --argumentStyle=object --useEnumType --allSchemas immich-openapi-specs.json typescript-sdk/src/fetch-client.ts
-  pnpm --filter @immich/sdk install --frozen-lockfile
-  pnpm --filter @immich/sdk build
+  pnpm dlx oazapfts --optimistic --argumentStyle=object --useEnumType --allSchemas server-openapi-specs.json typescript-sdk/src/fetch-client.ts
+  pnpm --filter @server/sdk install --frozen-lockfile
+  pnpm --filter @server/sdk build
 }
 
-# requires server to be built
+# Generate OpenAPI spec from server
 (
   cd ..
-  SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich build
+  pnpm --filter immich build
   pnpm --filter immich sync:open-api
+  cp server/server-openapi-specs.json open-api/server-openapi-specs.json
 )
 
-if [[ $1 == 'dart' ]]; then
+if [[ "${1:-}" == 'dart' ]]; then
   dart
-elif [[ $1 == 'typescript' ]]; then
+elif [[ "${1:-}" == 'typescript' ]]; then
   typescript
 else
   dart

open-api/typescript-sdk/README.md

@@ -1,11 +1,11 @@
-# @immich/sdk
+# @server/sdk
 
 A TypeScript SDK for interfacing with the [Immich](https://immich.app/) API.
 
 ## Install
 
 ```bash
-npm i --save @immich/sdk
+npm i --save @server/sdk
 ```
 
 ## Usage
@@ -13,7 +13,7 @@ npm i --save @immich/sdk
 For a more detailed example, check out the [`@immich/cli`](https://github.com/immich-app/immich/tree/main/cli).
 
 ```typescript
-import { getAllAlbums, getMyUser, init } from "@immich/sdk";
+import { getAllAlbums, getMyUser, init } from "@server/sdk";
 
 const API_KEY = "<API_KEY>"; // process.env.IMMICH_API_KEY
 

open-api/typescript-sdk/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@immich/sdk",
-  "version": "2.5.5",
-  "description": "Auto-generated TypeScript SDK for the Immich API",
+  "name": "@server/sdk",
+  "version": "0.1.0",
+  "description": "Auto-generated TypeScript SDK for the Server API",
   "type": "module",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

open-api/typescript-sdk/src/index.ts

@@ -48,15 +48,5 @@ const assertNoApiKey = (headerKey: string) => {
   }
 };
 
-export const getAssetOriginalPath = (id: string) => `/assets/${id}/original`;
-
-export const getAssetThumbnailPath = (id: string) => `/assets/${id}/thumbnail`;
-
-export const getAssetPlaybackPath = (id: string) =>
-  `/assets/${id}/video/playback`;
-
 export const getUserProfileImagePath = (userId: string) =>
   `/users/${userId}/profile-image`;
-
-export const getPeopleThumbnailPath = (personId: string) =>
-  `/people/${personId}/thumbnail`;