@grandlinex/swagger-mate 1.3.4 → 1.3.6

package/dist/cjs/Swagger/Client/SwaggerClient.d.ts

@@ -1,5 +1,4 @@
 import { SwaggerConfig } from '../Meta/SwaggerTypes.js';
-type Excludes = ('NodeCon' | 'FetchCon' | 'AxiosCon')[];
 export default class SwaggerClient {
     static genAPICConnector(options: {
         conf: SwaggerConfig;
@@ -7,7 +6,5 @@ export default class SwaggerClient {
         version?: string;
         writeMeta?: boolean;
         module?: boolean;
-        exclude?: Excludes;
     }): void;
 }
-export {};

package/dist/cjs/Swagger/Client/SwaggerClient.js

@@ -136,37 +136,13 @@ function interfaceHandler(conf) {
     }
     return interfaceList.join('\n');
 }
-function indexHelper(template, exclude) {
-    const exportList = [
-        'ApiCon',
-        'BaseCon',
-        'CApiCon',
-        'IApiCon',
-        'FormData',
-    ];
-    const lines = [...template.split('\n')];
-    if (!exclude || !exclude.includes('NodeCon')) {
-        lines.push(`import NodeCon from './NodeCon.js';`);
-        exportList.push('NodeCon');
-    }
-    if (!exclude || !exclude.includes('FetchCon')) {
-        lines.push(`import FetchCon from './FetchCon.js';`);
-        exportList.push('FetchCon');
-    }
-    if (!exclude || !exclude.includes('AxiosCon')) {
-        lines.push(`import AxiosCon from './AxiosCon.js';`);
-        exportList.push('AxiosCon');
-    }
-    lines.push(`export { ${exportList.join(', ')} };`);
-    return lines.join('\n');
-}
-function buildCon(conf, exclude) {
+function buildCon(conf) {
     const template = (0, PathHelp_js_1.default)((0, PathHelp_js_1.getBaseFolder)(), '..', 'res', 'templates');
     const funcTemo = fs.readFileSync(Path.join(template, 'class', 'ApiCon.ts'), 'utf-8');
     const indexTemp = fs.readFileSync(Path.join(template, 'class', 'index.ts'), 'utf-8');
     const ifTemp = fs.readFileSync(Path.join(template, 'class', 'IApiCon.ts'), 'utf-8');
     const cTemp = fs.readFileSync(Path.join(template, 'class', 'CApiCon.ts'), 'utf-8');
-    fs.writeFileSync(Path.join(baseGen, 'index.ts'), indexHelper(indexTemp, exclude));
+    fs.writeFileSync(Path.join(baseGen, 'index.ts'), indexTemp);
     fs.writeFileSync(Path.join(baseGen, 'ApiTypes.ts'), interfaceHandler(conf));
     const [con, iCon, cCon] = insertHandler(conf, [funcTemo, ifTemp, cTemp]);
     fs.writeFileSync(Path.join(baseGen, 'ApiCon.ts'), con);
@@ -186,6 +162,7 @@ function createPackage(name, version, module) {
             typescript: '5.9.2',
         },
         peerDependencies: {
+            '@grandlinex/base-con': '1.0.0',
             axios: '>=1.13.2',
             'form-data': '>=4.0.5',
         },
@@ -219,21 +196,11 @@ function createPackage(name, version, module) {
 }
 class SwaggerClient {
     static genAPICConnector(options) {
-        const { name, version, writeMeta, module, exclude, conf } = options;
+        const { name, version, writeMeta, module, conf } = options;
         const template = (0, PathHelp_js_1.default)((0, PathHelp_js_1.getBaseFolder)(), '..', 'res', 'templates');
         core_1.XUtil.createFolderBulk(baseR, baseGen);
-        cp(Path.join(template, 'class'), 'BaseCon.ts');
-        if (!exclude || !exclude.includes('FetchCon')) {
-            cp(Path.join(template, 'class'), 'FetchCon.ts');
-        }
-        if (!exclude || !exclude.includes('NodeCon')) {
-            cp(Path.join(template, 'class'), 'NodeCon.ts');
-        }
-        if (!exclude || !exclude.includes('AxiosCon')) {
-            cp(Path.join(template, 'class'), 'AxiosCon.ts');
-        }
         cp(Path.join(template, 'class'), 'index.ts');
-        buildCon(conf, exclude);
+        buildCon(conf);
         createPackage(name, version, module);
         if (writeMeta || writeMeta === undefined) {
             SwaggerUtil_js_1.default.writeMeta(conf, 'JSON', baseR);

package/dist/cjs/index.d.ts

@@ -2,9 +2,9 @@ import SwaggerUtil from './Swagger/SwaggerUtil.js';
 import SPathUtil from './Swagger/Path/SPathUtil.js';
 import SwaggerClient from './Swagger/Client/SwaggerClient.js';
 export * from './Swagger/Path/ESchemaEditor.js';
-export * from './Swagger/debug/index.js';
 export * from './Swagger/annotation/index.js';
 export * from './Swagger/Meta/Swagger.js';
 export * from './Swagger/Meta/SwaggerTypes.js';
 export * from './Swagger/Meta/SwaggerTypesStatic.js';
+export * from '@grandlinex/base-con';
 export { SwaggerUtil, SPathUtil, SwaggerClient };

package/dist/cjs/index.js

@@ -25,8 +25,8 @@ exports.SPathUtil = SPathUtil_js_1.default;
 const SwaggerClient_js_1 = __importDefault(require("./Swagger/Client/SwaggerClient.js"));
 exports.SwaggerClient = SwaggerClient_js_1.default;
 __exportStar(require("./Swagger/Path/ESchemaEditor.js"), exports);
-__exportStar(require("./Swagger/debug/index.js"), exports);
 __exportStar(require("./Swagger/annotation/index.js"), exports);
 __exportStar(require("./Swagger/Meta/Swagger.js"), exports);
 __exportStar(require("./Swagger/Meta/SwaggerTypes.js"), exports);
 __exportStar(require("./Swagger/Meta/SwaggerTypesStatic.js"), exports);
+__exportStar(require("@grandlinex/base-con"), exports);

package/dist/mjs/Swagger/Client/SwaggerClient.d.ts

@@ -1,5 +1,4 @@
 import { SwaggerConfig } from '../Meta/SwaggerTypes.js';
-type Excludes = ('NodeCon' | 'FetchCon' | 'AxiosCon')[];
 export default class SwaggerClient {
     static genAPICConnector(options: {
         conf: SwaggerConfig;
@@ -7,7 +6,5 @@ export default class SwaggerClient {
         version?: string;
         writeMeta?: boolean;
         module?: boolean;
-        exclude?: Excludes;
     }): void;
 }
-export {};

package/dist/mjs/Swagger/Client/SwaggerClient.js

@@ -98,37 +98,13 @@ function interfaceHandler(conf) {
     }
     return interfaceList.join('\n');
 }
-function indexHelper(template, exclude) {
-    const exportList = [
-        'ApiCon',
-        'BaseCon',
-        'CApiCon',
-        'IApiCon',
-        'FormData',
-    ];
-    const lines = [...template.split('\n')];
-    if (!exclude || !exclude.includes('NodeCon')) {
-        lines.push(`import NodeCon from './NodeCon.js';`);
-        exportList.push('NodeCon');
-    }
-    if (!exclude || !exclude.includes('FetchCon')) {
-        lines.push(`import FetchCon from './FetchCon.js';`);
-        exportList.push('FetchCon');
-    }
-    if (!exclude || !exclude.includes('AxiosCon')) {
-        lines.push(`import AxiosCon from './AxiosCon.js';`);
-        exportList.push('AxiosCon');
-    }
-    lines.push(`export { ${exportList.join(', ')} };`);
-    return lines.join('\n');
-}
-function buildCon(conf, exclude) {
+function buildCon(conf) {
     const template = PathHelp(getBaseFolder(), '..', 'res', 'templates');
     const funcTemo = fs.readFileSync(Path.join(template, 'class', 'ApiCon.ts'), 'utf-8');
     const indexTemp = fs.readFileSync(Path.join(template, 'class', 'index.ts'), 'utf-8');
     const ifTemp = fs.readFileSync(Path.join(template, 'class', 'IApiCon.ts'), 'utf-8');
     const cTemp = fs.readFileSync(Path.join(template, 'class', 'CApiCon.ts'), 'utf-8');
-    fs.writeFileSync(Path.join(baseGen, 'index.ts'), indexHelper(indexTemp, exclude));
+    fs.writeFileSync(Path.join(baseGen, 'index.ts'), indexTemp);
     fs.writeFileSync(Path.join(baseGen, 'ApiTypes.ts'), interfaceHandler(conf));
     const [con, iCon, cCon] = insertHandler(conf, [funcTemo, ifTemp, cTemp]);
     fs.writeFileSync(Path.join(baseGen, 'ApiCon.ts'), con);
@@ -148,6 +124,7 @@ function createPackage(name, version, module) {
             typescript: '5.9.2',
         },
         peerDependencies: {
+            '@grandlinex/base-con': '1.0.0',
             axios: '>=1.13.2',
             'form-data': '>=4.0.5',
         },
@@ -181,21 +158,11 @@ function createPackage(name, version, module) {
 }
 export default class SwaggerClient {
     static genAPICConnector(options) {
-        const { name, version, writeMeta, module, exclude, conf } = options;
+        const { name, version, writeMeta, module, conf } = options;
         const template = PathHelp(getBaseFolder(), '..', 'res', 'templates');
         XUtil.createFolderBulk(baseR, baseGen);
-        cp(Path.join(template, 'class'), 'BaseCon.ts');
-        if (!exclude || !exclude.includes('FetchCon')) {
-            cp(Path.join(template, 'class'), 'FetchCon.ts');
-        }
-        if (!exclude || !exclude.includes('NodeCon')) {
-            cp(Path.join(template, 'class'), 'NodeCon.ts');
-        }
-        if (!exclude || !exclude.includes('AxiosCon')) {
-            cp(Path.join(template, 'class'), 'AxiosCon.ts');
-        }
         cp(Path.join(template, 'class'), 'index.ts');
-        buildCon(conf, exclude);
+        buildCon(conf);
         createPackage(name, version, module);
         if (writeMeta || writeMeta === undefined) {
             SwaggerUtil.writeMeta(conf, 'JSON', baseR);

package/dist/mjs/index.d.ts

@@ -2,9 +2,9 @@ import SwaggerUtil from './Swagger/SwaggerUtil.js';
 import SPathUtil from './Swagger/Path/SPathUtil.js';
 import SwaggerClient from './Swagger/Client/SwaggerClient.js';
 export * from './Swagger/Path/ESchemaEditor.js';
-export * from './Swagger/debug/index.js';
 export * from './Swagger/annotation/index.js';
 export * from './Swagger/Meta/Swagger.js';
 export * from './Swagger/Meta/SwaggerTypes.js';
 export * from './Swagger/Meta/SwaggerTypesStatic.js';
+export * from '@grandlinex/base-con';
 export { SwaggerUtil, SPathUtil, SwaggerClient };

package/dist/mjs/index.js

@@ -2,9 +2,9 @@ import SwaggerUtil from './Swagger/SwaggerUtil.js';
 import SPathUtil from './Swagger/Path/SPathUtil.js';
 import SwaggerClient from './Swagger/Client/SwaggerClient.js';
 export * from './Swagger/Path/ESchemaEditor.js';
-export * from './Swagger/debug/index.js';
 export * from './Swagger/annotation/index.js';
 export * from './Swagger/Meta/Swagger.js';
 export * from './Swagger/Meta/SwaggerTypes.js';
 export * from './Swagger/Meta/SwaggerTypesStatic.js';
+export * from '@grandlinex/base-con';
 export { SwaggerUtil, SPathUtil, SwaggerClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grandlinex/swagger-mate",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "type": "module",
   "exports": {
     ".": {
@@ -19,18 +19,17 @@
   "module": "dist/mjs/index.js",
   "description": "GrandLineX Swagger-Mate Project",
   "scripts": {
-    "pre-build": "node ./preBuild.js",
-    "buildprep": "npm run pre-build && npm run build-mjs && npm run build-cjs && npm run build-fix",
+    "buildprep": "npm run build-mjs && npm run build-cjs && npm run build-fix",
     "build-mjs": "tsc",
     "build-cjs": "tsc -p tsconfig-cjs.json",
     "build-fix": "node ./node_modules/@grandlinex/core/fix.js",
     "pack": "npm run buildprep && npm pack",
     "start": "node dist/cjs/run.js",
-    "start-dev": "npm run pre-build && cross-env dev=true  ts-node src/run.ts",
-    "run-dev": "npm run pre-build && cross-env dev=true node --no-warnings=ExperimentalWarning --loader ts-node/esm  src/tests/run.ts",
+    "start-dev": "cross-env dev=true  ts-node src/run.ts",
+    "run-dev": "cross-env dev=true node --no-warnings=ExperimentalWarning --loader ts-node/esm  src/tests/run.ts",
     "lint": "eslint src",
-    "test": "npm run pre-build && cross-env dev=true jest --runInBand ",
-    "test-coverage": "npm run pre-build && cross-env dev=true jest --runInBand --ci --collectCoverage   --coverageDirectory=\"./coverage\"  --reporters=default --reporters=jest-junit",
+    "test": "cross-env dev=true jest --runInBand ",
+    "test-coverage": "cross-env dev=true jest --runInBand --ci --collectCoverage   --coverageDirectory=\"./coverage\"  --reporters=default --reporters=jest-junit",
     "makeDocs": "typedoc"
   },
   "bin": {
@@ -39,6 +38,7 @@
   },
   "dependencies": {
     "@grandlinex/core": "1.3.1",
+    "@grandlinex/base-con": "1.0.0",
     "js-yaml": "4.1.1",
     "reflect-metadata": "0.2.2"
   },

package/res/templates/class/ApiCon.ts

@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE
  */
 import * as TX from './ApiTypes.js';
-import BaseCon,{ HandleRes } from './BaseCon.js';
+import { BaseCon, HandleRes } from '@grandlinex/base-con';
 import IApiCon from './IApiCon.js';
 
 export default class ApiCon extends BaseCon implements IApiCon{

package/res/templates/class/CApiCon.ts

@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE
  */
 import * as TX from './ApiTypes.js';
-import { HandleRes } from './BaseCon.js';
+import { HandleRes } from '@grandlinex/base-con';
 import IApiCon from './IApiCon.js';
 
 export default abstract class CApiCon implements IApiCon{

package/res/templates/class/IApiCon.ts

@@ -3,7 +3,7 @@
  * DO NOT EDIT THIS FILE
  */
 import * as TX from './ApiTypes.js';
-import { HandleRes } from './BaseCon.js';
+import { HandleRes } from '@grandlinex/base-con';
 
 export default interface IApiCon {
   /* REPLACE_ME */

package/res/templates/class/index.ts

@@ -4,12 +4,11 @@
  */
 import FormData from 'form-data';
 import ApiCon from './ApiCon.js';
-import BaseCon from './BaseCon.js';
 import CApiCon from './CApiCon.js';
 import IApiCon from './IApiCon.js';
 
-
-export * from './BaseCon.js';
+export * from '@grandlinex/base-con';
 export * from './ApiTypes.js';
 
 export default ApiCon;
+export {FormData, ApiCon, CApiCon, IApiCon};

package/dist/cjs/Swagger/debug/BaseCon.d.ts

@@ -1,202 +0,0 @@
-/**
- * THIS FILE IS AUTOMATICALLY GENERATED
- * DO NOT EDIT THIS FILE
- */
-export type ErrorType = {
-    type: string;
-    global?: string[];
-    field?: {
-        key: string;
-        message: string;
-    }[];
-};
-export type HeaderType = string | string[] | number | undefined;
-export type HandleRes<T> = {
-    success: boolean;
-    data: T | null;
-    code?: number;
-    error?: ErrorType;
-    headers?: Record<string, HeaderType>;
-};
-export type PathParam = {
-    [key: string]: string | number | undefined;
-};
-export declare function isErrorType(x: any): x is ErrorType;
-export interface ConHandleConfig {
-    headers?: Record<string, string>;
-    param?: PathParam;
-    query?: PathParam;
-}
-export interface ConHandleResponse<T> {
-    code: number;
-    data: T | null;
-    headers: Record<string, HeaderType>;
-}
-export interface ConHandle {
-    get<T>(url: string, config?: ConHandleConfig): Promise<ConHandleResponse<T>>;
-    post<T, J>(url: string, body?: J, config?: ConHandleConfig): Promise<ConHandleResponse<T>>;
-    patch<T, J>(url: string, body?: J, config?: ConHandleConfig): Promise<ConHandleResponse<T>>;
-    delete<T>(url: string, config?: ConHandleConfig): Promise<ConHandleResponse<T>>;
-}
-/**
- * BaseCon provides a minimal client for interacting with an HTTP backend.
- * It manages connection state, authentication tokens, and reconnection
- * logic while delegating actual HTTP requests to a supplied {@link ConHandle}.
- *
- * @class
- */
-export default class BaseCon {
-    private api;
-    private permanentHeader;
-    private authorization;
-    private noAuth;
-    private disconnected;
-    private readonly logger;
-    con: ConHandle;
-    reconnect: () => Promise<boolean>;
-    onReconnect: (con: BaseCon) => Promise<boolean>;
-    /**
-     * Initializes a new instance of the client.
-     *
-     * @param {Object} conf Configuration object.
-     * @param {ConHandle} conf.con - Connection handle.
-     * @param {string} conf.endpoint - API endpoint URL.
-     * @param {(arg: any) => void} [conf.logger] - Optional logger function; defaults to console.log.
-     * @param {Record<string, string>} [conf.permanentHeader] - Optional permanent headers to include in requests.
-     * @return {void}
-     */
-    constructor(conf: {
-        con: ConHandle;
-        endpoint: string;
-        logger?: (arg: any) => void;
-        permanentHeader?: Record<string, string>;
-    });
-    /**
-     * Retrieves the API endpoint.
-     *
-     * @return {string} The API endpoint string.
-     */
-    getApiEndpoint(): string;
-    /**
-     * Sets the API endpoint URL used by the client.
-     *
-     * @param {string} endpoint - The full URL of the API endpoint.
-     * @returns {void}
-     */
-    setApiEndpoint(endpoint: string): void;
-    /**
-     * Indicates whether the instance is considered connected.
-     *
-     * The instance is regarded as connected when it either does not require authentication
-     * (`noAuth` is true) or it has an authorization token set (`authorization` is not null),
-     * and it is not currently marked as disconnected.
-     *
-     * @return {boolean} `true` if the instance is connected, `false` otherwise.
-     */
-    isConnected(): boolean;
-    /**
-     * Retrieves the current authorization token.
-     *
-     * @return {string|null} The token string used for authorization, or {@code null} if no token is set.
-     */
-    token(): string | null;
-    /**
-     * Returns the bearer token string if an authorization value has been set.
-     *
-     * @return {string|null} The bearer token prefixed with "Bearer ", or {@code null} when no authorization is present.
-     */
-    getBearer(): string | null;
-    private p;
-    /**
-     * Sends a ping request to the API to verify connectivity and version availability.
-     *
-     * @return {boolean} `true` if the API responded with a 200 status code and a valid version object; `false` otherwise.
-     */
-    ping(): Promise<boolean>;
-    /**
-     * Builds the Authorization header for HTTP requests.
-     *
-     * If the instance has an authorization token, this method returns an object
-     * containing a single `Authorization` header with the Bearer token value.
-     * When no token is available, an empty header object is returned.
-     *
-     * @return {Record<string, string>} The headers object containing the
-     * `Authorization` header when applicable, otherwise an empty object.
-     */
-    private tokenHeader;
-    setPermanentHeader(header: Record<string, string>): void;
-    /**
-     * Validates the current authentication token by performing a ping and a test request
-     * to the backend. The method first ensures connectivity via {@link ping}. If the ping
-     * succeeds, it attempts to retrieve a token from the `/test/auth` endpoint using the
-     * current token in the `Authorization` header. The operation is considered successful
-     * if the response status code is 200 or 201.
-     *
-     * If any step fails, an error is logged and the method returns {@code false}. On
-     * success, it returns {@code true}.
-     *
-     * @return {Promise<boolean>} A promise that resolves to {@code true} if the token
-     * test succeeds, otherwise {@code false}.
-     */
-    testToken(): Promise<boolean>;
-    /**
-     * Attempts to establish a connection to the backend without authentication.
-     *
-     * This method sends a ping request.  If the ping succeeds, it clears any
-     * existing authorization data, marks the instance as connected,
-     * enables the no‑authentication mode, and returns `true`.  If the ping
-     * fails, it logs a warning, clears authorization, marks the instance
-     * as disconnected, and returns `false`.
-     *
-     * @return {Promise<boolean>} `true` when a connection is successfully
-     * established without authentication, otherwise `false`.
-     */
-    connectNoAuth(): Promise<boolean>;
-    /**
-     * Forces a connection using the provided bearer token.
-     *
-     * @param {string|null} token The token to be used for authentication.
-     * @returns {void}
-     */
-    forceConnect(token: string | null): void;
-    coppyFrom(con: BaseCon): void;
-    /**
-     * Establishes a connection to the backend using the supplied credentials.
-     * Performs a health‑check ping first; if successful, it requests an authentication
-     * token from the `/token` endpoint.  When the token is obtained, the method
-     * updates internal state (authorization header, connection flags) and, unless
-     * a dry run is requested, sets up a reconnection routine.  Any errors are
-     * logged and the method resolves to `false`.
-     *
-     * @param {string} email - The user's email address for authentication.
-     * @param {string} pw - The password (or token) for the specified user.
-     * @param {boolean} [dry=false] - If `true`, the method performs a dry run
-     *   without persisting credentials or configuring reconnection logic.
-     *
-     * @returns  Promise<boolean>  `true` if the connection was successfully
-     *   established, otherwise `false`.
-     */
-    connect(email: string, pw: string, dry?: boolean): Promise<boolean>;
-    /**
-     * Performs an HTTP request using the client’s internal connection.
-     *
-     * The method verifies that the client is connected before attempting a request.
-     * It automatically injects the authorization token, permanent headers, and any
-     * headers supplied in `config`. If the request body is a `FormData` instance
-     * (or provides a `getHeaders` method), the appropriate form headers are added.
-     *
-     * Response handling:
-     * - `200` or `201`: returns `success: true` with the received data.
-     * - `498`: attempts to reconnect and retries the request once.
-     * - `401`: logs an authentication error, marks the client as disconnected.
-     * - `403` and other status codes: return `success: false` with the status code.
-     *
-     * @param {'POST'|'GET'|'PATCH'|'DELETE'} type The HTTP method to use.
-     * @param {string} path The endpoint path relative to the base URL.
-     * @param {J} [body] Optional request payload. May be `FormData` or a plain object.
-     * @param {ConHandleConfig} [config] Optional Axios-like configuration for the request.
-     * @returns {Promise<HandleRes<T>>} A promise that resolves to a `HandleRes` object
-     * containing the response data, status code, any error information, and headers.
-     */
-    handle<T, J>(type: 'POST' | 'GET' | 'PATCH' | 'DELETE', path: string, body?: J, config?: ConHandleConfig): Promise<HandleRes<T>>;
-}