@profcomff/api-uilib 2024.7.27 → 2024.7.28

package/.github/workflows/autogen.yaml

@@ -4,8 +4,7 @@
 name: Autogen API bindings
 
 on:
-  schedule:
-    - cron: "30 00 * * *"
+  workflow_dispatch:
 
 jobs:
   generate:
@@ -30,7 +29,6 @@ jobs:
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v6
         with:
-          commit-message:
           branch: autogen
           title: Automated API update
           body: |

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@profcomff/api-uilib",
-  "version": "2024.7.27",
+  "version": "2024.07.28",
   "description": "API wrappers, autogenerated from openapi.json files",
   "main": "./src/index.ts",
   "types": "./src/index.d.ts",
@@ -14,12 +14,14 @@
     "@npmcli/package-json": "^5.2.0",
     "openapi-typescript": "^7.1.0",
     "simple-git": "^3.25.0",
-    "typescript": "^5.5.4"
+    "typescript": "^5.5.4",
+    "yargs-parser": "^21.1.1"
   },
   "dependencies": {
     "openapi-fetch": "^0.10.2"
   },
   "scripts": {
-    "generate": "node ./generate.js"
+    "setVersion": "node ./scripts/setversion.js",
+    "generate": "node ./scripts/generate.js"
   }
 }

package/{generate.js → scripts/generate.js}

@@ -63,7 +63,6 @@ const generate = async () => {
  */
 const updateRepo = async () => {
   const git = simpleGit();
-  const date = new Date();
 
   // Ensure status
   let status = await git.status();
@@ -72,16 +71,6 @@ const updateRepo = async () => {
     return;
   }
   console.log(`${Object.keys(status.modified).length} files changed`);
-
-  // Change version in package.json file
-  const pkgJson = await PackageJson.load(".");
-  pkgJson.update({
-    version: `${date.getUTCFullYear()}.${date.getUTCMonth()+1}.${date.getUTCDate()}`,
-  });
-  pkgJson.save();
-  console.log(
-    `package.json version updated to ${date.getUTCFullYear()}.${date.getUTCMonth()+1}.${date.getUTCDate()}`
-  );
 };
 
 generate().then(() => {

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.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);
@@ -34,7 +32,7 @@ const authMiddleware: Middleware = {
     },
 };
 
-export const createClient = (baseUrl: string) => {
+export const createClient = (baseUrl: string): ReturnType<typeof Client<paths>> => {
     if (currentClient) {
         throw new Error("Client already initialized");
     }
@@ -46,6 +44,10 @@ export const createClient = (baseUrl: string) => {
     return currentClient;
 }
 
+export const createTestClient = (baseUrl: string): ReturnType<typeof Client<paths>> => {
+    return Client<paths>({ baseUrl });
+}
+
 export const setupAuth = (newToken: string | null) => {
     currentToken = newToken;
     if (currentClient !== undefined) {
@@ -56,4 +58,3 @@ export const setupAuth = (newToken: string | null) => {
         }
     }
 }
-

package/src/index.d.ts

@@ -1,24 +0,0 @@
-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";
-import type { paths as timetablePaths } from "./openapi/timetable.ts";
-import type { paths as userdataPaths } from "./openapi/userdata.ts";
-
-export type paths = (
-    achievementPaths &
-    authPaths &
-    marketingPaths &
-    pingerPaths &
-    printPaths &
-    servicesPaths &
-    socialPaths &
-    timetablePaths &
-    userdataPaths
-);
-export function createClient(baseUrl: string): ReturnType<typeof Client<paths>>;
-export function setupAuth(newToken: string | null): void;