Update api.nswag

.editorconfig

@@ -1,15 +1,17 @@
 root = true
 
 [*]
-end_of_line = lf
-indent_style = space
-indent_size = 4
 charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
+indent_size = 4
+indent_style = space
 insert_final_newline = true
+max_line_length = 120
+trim_trailing_whitespace = true
 
 [*.md]
+indent_size = 1
 trim_trailing_whitespace = false
 
-[*.env*]
+[.env*]
 insert_final_newline = false

examples/api.js

@@ -7,8 +7,8 @@ import { TribufuApi } from "../build/index.mjs";
 dotenv.config();
 
 async function main() {
-    const api = TribufuApi.fromEnv("TRIBUFU");
+    const tribufu = TribufuApi.fromEnv();
-    console.log(await api.authGetUserInfo());
+    console.log(await tribufu.getUserInfo());
 }
 
 main();

package.json

@@ -1,6 +1,6 @@
 {
     "name": "tribufu",
-    "version": "0.1.20",
+    "version": "1.0.2",
     "description": "Tribufu JS SDK",
     "repository": "https://github.com/Tribufu/TribufuJs",
     "author": "Tribufu <contact@Tribufu.com>",
@@ -9,7 +9,15 @@
     "types": "./build/index.d.ts",
     "exports": {
         "import": "./build/index.mjs",
-        "require": "./build/index.cjs"
+        "require": "./build/index.cjs",
+        "types": "./build/index.d.ts"
+    },
+    "typesVersions": {
+        "*": {
+            "*": [
+                "./build/*"
+            ]
+        }
     },
     "scripts": {
         "clean": "rimraf build",
@@ -19,8 +27,8 @@
     "devDependencies": {
         "@types/node": "^20.10.6",
         "dotenv": "^16.3.1",
-        "esbuild-node-externals": "^1.12.0",
         "esbuild": "^0.19.10",
+        "esbuild-node-externals": "^1.12.0",
         "eslint": "9.11.1",
         "prettier": "3.3.3",
         "rimraf": "^5.0.5",

scripts/esbuild.js

@@ -22,12 +22,26 @@ const moduleConfig = {
     format: "esm",
 };
 
+const moduleMinConfig = {
+    ...moduleConfig,
+    outfile: "build/index.min.mjs",
+    minify: true,
+    sourcemap: true,
+};
+
 const legacyConfig = {
     ...baseConfig,
     outfile: "build/index.cjs",
     format: "cjs",
 };
 
+const legacyMinConfig = {
+    ...legacyConfig,
+    outfile: "build/index.min.cjs",
+    minify: true,
+    sourcemap: true,
+};
+
 async function addCopyrightHeader(filename) {
     const header = `// Copyright (c) Tribufu. All Rights Reserved.\n// SPDX-License-Identifier: MIT\n\n`;
     const content = await fs.readFile(filename, 'utf-8');
@@ -44,5 +58,8 @@ async function buildAndAddHeader(config) {
     }
 };
 
-await buildAndAddHeader(moduleConfig);
 await buildAndAddHeader(legacyConfig);
+await buildAndAddHeader(moduleConfig);
+
+//await buildAndAddHeader(legacyMinConfig);
+//await buildAndAddHeader(moduleMinConfig);

src/api/api.include.ts

@@ -1 +0,0 @@
-import { TribufuApiBase } from "./api.base";

src/api/api.nswag

@@ -4,7 +4,7 @@
     "documentGenerator": {
         "fromDocument": {
             "json": "",
-            "url": "http://localhost:5000/v1/openapi.json",
+            "url": "http://localhost:5000/openapi.json",
             "output": null,
             "newLineBehavior": "Auto"
         }
@@ -26,7 +26,7 @@
             "nullValue": "Null",
             "generateClientClasses": true,
             "generateClientInterfaces": false,
-            "generateOptionalParameters": false,
+            "generateOptionalParameters": true,
             "exportTypes": true,
             "wrapDtoExceptions": false,
             "exceptionClass": "TribufuApiError",
@@ -41,14 +41,14 @@
             "useTransformResultMethod": false,
             "generateDtoTypes": true,
             "operationGenerationMode": "SingleClientFromOperationId",
-            "markOptionalProperties": true,
+            "markOptionalProperties": false,
             "generateCloneMethod": false,
             "typeStyle": "Interface",
             "enumStyle": "Enum",
             "useLeafType": false,
             "classTypes": [],
             "extendedClasses": [],
-            "extensionCode": "api.include.ts",
+            "extensionCode": "include.ts",
             "generateDefaultValues": true,
             "excludedTypeNames": [],
             "excludedParameterNames": [],
@@ -67,7 +67,7 @@
             "templateDirectory": null,
             "serviceHost": null,
             "serviceSchemes": null,
-            "output": "api.generated.ts",
+            "output": "generated.ts",
             "newLineBehavior": "LF"
         }
     }

src/api/base.ts

@@ -18,11 +18,11 @@ export abstract class TribufuApiBase {
      * @returns boolean
      */
     public static debugEnabled(): boolean {
-        if (!process) {
+        if (typeof process !== "undefined") {
-            return false;
+            return process.env.NODE_ENV === "development";
         }
 
-        return process.env.NODE_ENV === "development";
+        return false;
     }
 
     /**
@@ -66,7 +66,7 @@ export abstract class TribufuApiBase {
      */
     protected static defaultHeaders(): HttpHeaders {
         const headers = {};
-        headers["X-Tribufu-Language"] = "javascript";
+        headers["X-Tribufu-Library"] = "javascript";
         headers["X-Tribufu-Version"] = TRIBUFU_VERSION;
         return headers;
     }
@@ -92,12 +92,10 @@ export abstract class TribufuApiBase {
      * @returns
      */
     protected transformOptions(options: RequestInit) {
-        if (this.apiKey) {
+        options.headers = {
-            options.headers = {
+            ...options.headers,
-                ...options.headers,
+            ...this.getHeaders(),
-                ...this.getHeaders(),
+        };
-            };
-        }
 
         return Promise.resolve(options);
     }

src/api/include.ts

@@ -0,0 +1 @@
+import { TribufuApiBase } from "./base";

src/api/index.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 import { TRIBUFU_API_URL } from "..";
-import { TribufuApiBase } from "./api.base";
+import { TribufuApiBase } from "./base";
-import { TribufuApiGenerated } from "./api.generated";
+import { TribufuApiGenerated } from "./generated";
 import { TribufuApiOptions } from "../options";
 
 /**
@@ -44,22 +44,20 @@ export class TribufuApi extends TribufuApiGenerated {
      *
      * - This will only work if the environment variables are set.
      *
-     * @param prefix A prefix for the environment variables.
+     * @param prefix A prefix for the environment variables. Default is `TRIBUFU`.
      * @returns TribufuApi | null
      * @example
      * ```ts
      * // process.env.TRIBUFU_API_KEY
-     * const api = TribufuApi.fromEnv("TRIBUFU");
+     * const api = TribufuApi.fromEnv();
      * ```
      */
     public static fromEnv(prefix?: string | null): TribufuApi | null {
-        const envPrefix = prefix ? `${prefix}_` : "";
+        if (typeof process === "undefined") {
-
-        if (!process) {
             return null;
         }
 
-        const apiKey = process.env[`${envPrefix}API_KEY`];
+        const apiKey = process.env[`${prefix || "TRIBUFU"}_API_KEY`];
 
         if (apiKey) {
             return TribufuApi.withApiKey(apiKey);
@@ -73,12 +71,12 @@ export class TribufuApi extends TribufuApiGenerated {
      *
      * - This will fallback to the default api if the environment variables are not set.
      *
-     * @param prefix A prefix for the environment variables.
+     * @param prefix A prefix for the environment variables. Default is `TRIBUFU`.
      * @returns TribufuApi | null
      * @example
      * ```ts
      * // process.env.TRIBUFU_API_KEY = null
-     * const api = TribufuApi.fromEnvOrDefault("TRIBUFU_");
+     * const api = TribufuApi.fromEnvOrDefault();
      * ```
      */
     public static fromEnvOrDefault(prefix: string = ""): TribufuApi {
@@ -95,13 +93,11 @@ export class TribufuApi extends TribufuApiGenerated {
      * @returns string
      */
     protected static getBaseUrl(): string {
-        if (!process) {
+        if (typeof process === "undefined") {
             return TRIBUFU_API_URL;
         }
 
         const baseUrl = process.env[`TRIBUFU_API_URL`] || null;
-        return TribufuApiBase.debugEnabled() && baseUrl
+        return TribufuApiBase.debugEnabled() && baseUrl ? baseUrl : TRIBUFU_API_URL;
-            ? baseUrl
-            : TRIBUFU_API_URL;
     }
 }

src/api/singletion.ts

@@ -0,0 +1,23 @@
+// Copyright (c) Tribufu. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+import { TribufuApi } from "./index";
+
+/**
+ * **Tribufu API**
+ *
+ * Helper class to get a singleton instance of the Tribufu API.
+ */
+export class TribufuApiSingleton {
+    private static INSTANCE: TribufuApi | null = null;
+
+    private constructor() {}
+
+    public static getInstance(): TribufuApi {
+        if (!TribufuApiSingleton.INSTANCE) {
+            TribufuApiSingleton.INSTANCE = TribufuApi.fromEnvOrDefault();
+        }
+
+        return TribufuApiSingleton.INSTANCE;
+    }
+}

src/index.ts

@@ -8,9 +8,24 @@ import {
     TRIBUFU_WEB_URL,
 } from "./constants";
 
-export { TRIBUFU_API_URL, TRIBUFU_CDN_URL, TRIBUFU_VERSION, TRIBUFU_WEB_URL };
-
 import { TribufuApi } from "./api";
 import { TribufuApiOptions } from "./options";
+import { TribufuApiSingleton } from "./api/singletion";
 
-export { TribufuApi, TribufuApiOptions };
+export {
+    TRIBUFU_API_URL,
+    TRIBUFU_CDN_URL,
+    TRIBUFU_VERSION,
+    TRIBUFU_WEB_URL,
+    TribufuApi,
+    TribufuApiOptions,
+    TribufuApiSingleton,
+};
+
+export * from "./api/base";
+export * from "./api/generated";
+export * from "./api/include";
+export * from "./api/index";
+export * from "./api/singletion";
+export * from "./http/headers";
+export * from "./node";

tsconfig.json

@@ -1,12 +1,13 @@
 {
     "compilerOptions": {
         "strict": true,
-        "target": "ESNext",
+        "target": "esnext",
         "declaration": true,
         "emitDeclarationOnly": true,
         "noImplicitAny": false,
         "moduleResolution": "Node",
         "esModuleInterop": true,
+        "module": "esnext",
         "allowImportingTsExtensions": true,
         "resolveJsonModule": true,
         "rootDir": "src",