@profcomff/api-uilib 2024.7.25 → 2024.7.27-1

package/.github/workflows/autogen.yaml

@@ -1,3 +1,38 @@
 # Каждые 24 часа запускать кодогенерацию
 # Если есть изменения в репозитории – создавать пулл реквест
 # Если уже существует пулл реквест на обновление версии, закрыть его
+name: Autogen API bindings
+
+on:
+  workflow_dispatch:
+
+jobs:
+  generate:
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9.6.0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          registry-url: https://registry.npmjs.org/
+          cache: pnpm
+
+      - run: pnpm install
+
+      - run: pnpm generate
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v6
+        with:
+          branch: autogen
+          title: Automated API update
+          body: |
+            Автоматика заметила изменения в API, которые нужно прокинуть на фронтенд
+
+            Проверь кодогенерацию, если все ок – вмержи изменения
+          commit-message: API codegen update

package/.github/workflows/publish.yaml

@@ -2,7 +2,8 @@ name: Publish package to npm
 
 on:
   push:
-    branches: ["main"]
+    tags:
+      - 'v*'
 
 jobs:
   publish-npm:
@@ -22,6 +23,10 @@ jobs:
 
       - run: pnpm install
 
-      - run: pnpm publish
+      - run: |
+          VERSION=${{ github.ref_name }}
+          pnpm setVersion -v ${VERSION:1}
+
+      - run: pnpm publish --no-git-checks
         env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+          NODE_AUTH_TOKEN: ${{ secrets.npm_token }}

package/README.md

@@ -8,11 +8,22 @@
 ## Использование
 
 ```ts
-import { client } from @profcomff/api-uilib;
+import { createClient } from '@profcomff/api-uilib';
 
-const me = await client.GET('/auth/me', {
-  params: {
-    info: ["groups", "indirect_groups", "session_scopes", "user_scopes", "auth_methods"],
-  },
+// Setup client with base API path
+// You can use environment `import.meta.env.VITE_API_URL` for example
+const apiClient = createClient("https://api.test.profcomff.com");
+
+// Setup token for requests to API
+// It is optional, only for routes with authention
+setupAuth("myApiTokenHere");
+
+// Make request
+const me_with_scopes = await apiClient.GET("/auth/me", {
+    params: {
+        query: {
+            info: ["session_scopes"]
+        }
+    }
 });
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@profcomff/api-uilib",
-  "version": "2024.07.25",
+  "version": "2024.07.27-1",
   "description": "API wrappers, autogenerated from openapi.json files",
   "main": "./src/index.ts",
   "types": "./src/index.d.ts",
@@ -11,13 +11,17 @@
   "author": "Roman Dyakov <roman@dyakov.space>",
   "license": "BSD 3-Clause",
   "devDependencies": {
+    "@npmcli/package-json": "^5.2.0",
     "openapi-typescript": "^7.1.0",
-    "typescript": "^5.5.4"
+    "simple-git": "^3.25.0",
+    "typescript": "^5.5.4",
+    "yargs-parser": "^21.1.1"
   },
   "dependencies": {
     "openapi-fetch": "^0.10.2"
   },
   "scripts": {
-    "generate": "openapi-typescript -c --alphabetize --path-params-as-types"
+    "setVersion": "node ./scripts/setversion.js",
+    "generate": "node ./scripts/generate.js"
   }
 }

package/scripts/generate.js

@@ -0,0 +1,80 @@
+const fs = require("node:fs");
+const openapiTS = require("openapi-typescript").default;
+const astToString = require("openapi-typescript").astToString;
+const simpleGit = require("simple-git");
+const PackageJson = require("@npmcli/package-json");
+
+const apis = {
+  auth: "https://api.profcomff.com/auth/openapi.json",
+  marketing: "https://api.profcomff.com/marketing/openapi.json",
+  timetable: "https://api.profcomff.com/timetable/openapi.json",
+  services: "https://api.profcomff.com/services/openapi.json",
+  print: "https://api.profcomff.com/print/openapi.json",
+  social: "https://api.profcomff.com/social/openapi.json",
+  userdata: "https://api.profcomff.com/userdata/openapi.json",
+  achievement: "https://api.profcomff.com/achievement/openapi.json",
+};
+
+const header = `/**
+ * This file was auto-generated by openapi-typescript.
+ * Do not make direct changes to the file.
+ */`.trim();
+
+/**
+ * Добавляет к путям префикс, соответствующий пути к корню API
+ */
+const updatePathsWithPrefix = (prefix, ast) => {
+  for (const i in ast) {
+    for (const j in ast[i]["members"]) {
+      if (ast[i]["members"][j]["name"]) {
+        if (ast[i]["members"][j]["name"]["text"].startsWith("/")) {
+          ast[i]["members"][j]["name"]["text"] =
+            prefix + ast[i]["members"][j]["name"]["text"];
+        }
+      }
+    }
+  }
+};
+
+/**
+ * Генерирует список путей и интерфейсов
+ */
+const generate = async () => {
+  for (const file in apis) {
+    const spec = apis[file];
+    const prefix = "/" + file;
+    console.log(`Generating ${file} from ${spec}`);
+
+    const ast = await openapiTS(spec, {
+      alphabetize: true,
+      excludeDeprecated: true,
+    });
+
+    updatePathsWithPrefix(prefix, ast);
+
+    const contents = astToString(ast);
+
+    fs.writeFileSync(`./src/openapi/${file}.ts`, header + "\n\n" + contents);
+  }
+};
+
+/**
+ * Проверяет есть ли изменения в репозитории, меняет версию в package-json если да
+ */
+const updateRepo = async () => {
+  const git = simpleGit();
+
+  // Ensure status
+  let status = await git.status();
+  if (Object.keys(status.modified).length === 0) {
+    console.log("Nothing changed");
+    return;
+  }
+  console.log(`${Object.keys(status.modified).length} files changed`);
+};
+
+generate().then(() => {
+  updateRepo().then(() => {
+    console.log("Completed");
+  });
+});

package/scripts/setversion.js

@@ -0,0 +1,22 @@
+const parser = require("yargs-parser");
+const PackageJson = require("@npmcli/package-json");
+
+const updateRepo = async (version) => {
+  // Change version in package.json file
+  const pkgJson = await PackageJson.load(".");
+  pkgJson.update({
+    version: version,
+  });
+  pkgJson.save();
+  console.log(`package.json version updated to ${version}`);
+};
+
+const [, , ...args] = process.argv;
+const flags = parser(args, {
+  string: ["version"],
+  alias: {
+    version: ["v"],
+  },
+});
+
+updateRepo(flags.version);

package/src/index.d.ts

@@ -2,7 +2,6 @@ import Client from "openapi-fetch";
 import type { paths as achievementPaths } from "./openapi/achievement.ts";
 import type { paths as authPaths } from "./openapi/auth.ts";
 import type { paths as marketingPaths } from "./openapi/marketing.ts";
-import type { paths as pingerPaths } from "./openapi/pinger.ts";
 import type { paths as printPaths } from "./openapi/print.ts";
 import type { paths as servicesPaths } from "./openapi/services.ts";
 import type { paths as socialPaths } from "./openapi/social.ts";
@@ -13,12 +12,11 @@ export type paths = (
     achievementPaths &
     authPaths &
     marketingPaths &
-    pingerPaths &
     printPaths &
     servicesPaths &
     socialPaths &
     timetablePaths &
     userdataPaths
 );
-export function createClient(baseUrl: string): ReturnType<typeof Client>;
+export function createClient(baseUrl: string): ReturnType<typeof Client<paths>>;
 export function setupAuth(newToken: string | null): void;

package/src/index.ts

@@ -4,7 +4,6 @@ import { Middleware } from "openapi-fetch";
 import type { paths as achievementPaths } from "./openapi/achievement.ts";
 import type { paths as authPaths } from "./openapi/auth.ts";
 import type { paths as marketingPaths } from "./openapi/marketing.ts";
-import type { paths as pingerPaths } from "./openapi/pinger.ts";
 import type { paths as printPaths } from "./openapi/print.ts";
 import type { paths as servicesPaths } from "./openapi/services.ts";
 import type { paths as socialPaths } from "./openapi/social.ts";
@@ -12,14 +11,10 @@ import type { paths as timetablePaths } from "./openapi/timetable.ts";
 import type { paths as userdataPaths } from "./openapi/userdata.ts";
 
 
-let currentClient: ReturnType<typeof Client> | undefined = undefined;
-let currentToken: string | undefined = undefined;
-
 export type paths = (
     achievementPaths &
     authPaths &
     marketingPaths &
-    pingerPaths &
     printPaths &
     servicesPaths &
     socialPaths &
@@ -27,6 +22,9 @@ export type paths = (
     userdataPaths
 );
 
+let currentClient: ReturnType<typeof Client<paths>> | undefined = undefined;
+let currentToken: string | undefined = undefined;
+
 const authMiddleware: Middleware = {
     async onRequest({ request, options }) {
         request.headers.set("Authorization", currentToken);
@@ -56,4 +54,3 @@ export const setupAuth = (newToken: string | null) => {
         }
     }
 }
-

package/src/openapi/achievement.ts

@@ -4,7 +4,7 @@
  */
 
 export interface paths {
-    "/achievement": {
+    "/achievement/achievement": {
         parameters: {
             query?: never;
             header?: never;
@@ -25,7 +25,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    [path: `/achievement/${integer}/reciever`]: {
+    "/achievement/achievement/{achievement_id}/reciever": {
         parameters: {
             query?: never;
             header?: never;
@@ -42,7 +42,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    [path: `/achievement/${integer}/reciever/${integer}`]: {
+    "/achievement/achievement/{achievement_id}/reciever/{user_id}": {
         parameters: {
             query?: never;
             header?: never;
@@ -66,7 +66,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    [path: `/achievement/${integer}`]: {
+    "/achievement/achievement/{id}": {
         parameters: {
             query?: never;
             header?: never;
@@ -77,7 +77,11 @@ export interface paths {
         get: operations["get_achievement_achievement__id__get"];
         put?: never;
         post?: never;
-        delete?: never;
+        /**
+         * Delete Achievement
+         * @description Нужны права на: `achievements.achievement.delete`
+         */
+        delete: operations["delete_achievement_achievement__id__delete"];
         options?: never;
         head?: never;
         /**
@@ -87,7 +91,7 @@ export interface paths {
         patch: operations["edit_achievement_achievement__id__patch"];
         trace?: never;
     };
-    [path: `/achievement/${integer}/picture`]: {
+    "/achievement/achievement/{id}/picture": {
         parameters: {
             query?: never;
             header?: never;
@@ -104,7 +108,7 @@ export interface paths {
         patch: operations["upload_picture_achievement__id__picture_patch"];
         trace?: never;
     };
-    [path: `/user/${integer}`]: {
+    "/achievement/user/{user_id}": {
         parameters: {
             query?: never;
             header?: never;
@@ -198,6 +202,15 @@ export interface components {
             /** User Id */
             user_id: number;
         };
+        /** StatusResponseModel */
+        StatusResponseModel: {
+            /** Message */
+            message: string;
+            /** Ru */
+            ru: string;
+            /** Status */
+            status: string;
+        };
         /** UserGet */
         UserGet: {
             /** Achievement */
@@ -402,6 +415,37 @@ export interface operations {
             };
         };
     };
+    delete_achievement_achievement__id__delete: {
+        parameters: {
+            query?: never;
+            header?: never;
+            path: {
+                id: number;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Successful Response */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["StatusResponseModel"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     edit_achievement_achievement__id__patch: {
         parameters: {
             query?: never;