@grandlinex/swagger-mate 0.32.1 → 1.0.1

package/dist/cjs/PathHelp.js

@@ -26,7 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBaseFolder = void 0;
+exports.getBaseFolder = getBaseFolder;
+exports.default = PathHelp;
 const path_1 = __importDefault(require("path"));
 const process = __importStar(require("process"));
 function getBaseFolder() {
@@ -36,7 +37,6 @@ function getBaseFolder() {
     }
     return dir;
 }
-exports.getBaseFolder = getBaseFolder;
 function PathHelp(base, ...inp) {
     const { env } = process;
     if (env.dev) {
@@ -44,4 +44,3 @@ function PathHelp(base, ...inp) {
     }
     return path_1.default.join(base, '..', ...inp);
 }
-exports.default = PathHelp;

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

@@ -56,4 +56,4 @@ export declare function transformInterface(operation: string, tag: IFTag | strin
  * @param tag
  * @param schema
  */
-export declare function transformFormInterface(operation: string, tag: IFTag | string, schema: SSchemaEl): IfMappingType[];
+export declare function transformFormInterface(operation: string, tag: IFTag | string): IfMappingType[];

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

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformFormInterface = exports.transformInterface = exports.typeByRef = exports.ifName = exports.saveName = exports.IFTag = exports.S = exports.fuc = exports.sK = exports.rq = exports.eS = void 0;
+exports.IFTag = void 0;
+exports.eS = eS;
+exports.rq = rq;
+exports.sK = sK;
+exports.fuc = fuc;
+exports.S = S;
+exports.saveName = saveName;
+exports.ifName = ifName;
+exports.typeByRef = typeByRef;
+exports.transformInterface = transformInterface;
+exports.transformFormInterface = transformFormInterface;
 const SwaggerTypes_js_1 = require("../Meta/SwaggerTypes.js");
 /**
  * Save string from unknown
@@ -9,7 +19,6 @@ const SwaggerTypes_js_1 = require("../Meta/SwaggerTypes.js");
 function eS(e) {
     return e || '';
 }
-exports.eS = eS;
 /**
  * Optional field
  * @param required
@@ -20,14 +29,12 @@ function rq(required) {
     }
     return ':';
 }
-exports.rq = rq;
 function sK(e) {
     if (e.indexOf(':') >= 0) {
         return `'${e}'`;
     }
     return e;
 }
-exports.sK = sK;
 /**
  * Cast first letter to uppercase
  * @param e
@@ -38,7 +45,6 @@ function fuc(e) {
     }
     return e.charAt(0).toUpperCase() + e.substring(1);
 }
-exports.fuc = fuc;
 /**
  * Spacing function
  * @param c number of spaces
@@ -50,7 +56,6 @@ function S(c) {
     }
     return o;
 }
-exports.S = S;
 var IFTag;
 (function (IFTag) {
     IFTag["RequestBody"] = "RequestBody";
@@ -62,18 +67,15 @@ var IFTag;
 function saveName(inp) {
     return inp.replace(/[^a-zA-Z0-9[\]]/g, 'X');
 }
-exports.saveName = saveName;
 /**
  * InterfaceName Helper function
  */
 function ifName(operation, tag, use) {
     return `${use ? 'TX.' : ''}${saveName(fuc(operation))}${saveName(fuc(tag))}`;
 }
-exports.ifName = ifName;
 function typeByRef(ref, use) {
     return `${use ? 'TX.' : ''}${fuc(ref.substring(1 + ref.lastIndexOf('/')))}`;
 }
-exports.typeByRef = typeByRef;
 /**
  * Map schema to typescript interface
  * @param operation
@@ -177,6 +179,28 @@ function transformInterface(operation, tag, schema) {
                     }
                 }
                 break;
+            case 'string':
+                out.push({
+                    keys: [],
+                    name: cur.name,
+                    rawType: `string`,
+                });
+                break;
+            case 'integer':
+            case 'number':
+                out.push({
+                    keys: [],
+                    name: cur.name,
+                    rawType: `number`,
+                });
+                break;
+            case 'boolean':
+                out.push({
+                    keys: [],
+                    name: cur.name,
+                    rawType: `boolean`,
+                });
+                break;
             default:
                 break;
         }
@@ -187,22 +211,20 @@ function transformInterface(operation, tag, schema) {
     }
     return out;
 }
-exports.transformInterface = transformInterface;
 /**
  * Map schema to typescript interface
  * @param operation
  * @param tag
  * @param schema
  */
-function transformFormInterface(operation, tag, schema) {
+function transformFormInterface(operation, tag) {
     const out = [];
     const cur = {
         name: ifName(operation, tag),
         keys: [],
     };
-    const keys = null;
+    // const keys: null | string[] = null;
     cur.rawType = `FormData`;
     out.push(cur);
     return out;
 }
-exports.transformFormInterface = transformFormInterface;

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

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.abstractInterfaceTemplate = exports.functionInterfaceTemplate = exports.reqBody = exports.functionTemplate = void 0;
+exports.functionTemplate = functionTemplate;
+exports.reqBody = reqBody;
+exports.functionInterfaceTemplate = functionInterfaceTemplate;
+exports.abstractInterfaceTemplate = abstractInterfaceTemplate;
 const ClientUtil_js_1 = require("./ClientUtil.js");
 function docTemplate(inp, doc) {
     const dDoc = [];
@@ -18,17 +21,14 @@ function functionTemplate(FC_NAME, props) {
 ${(0, ClientUtil_js_1.S)(4)}${(0, ClientUtil_js_1.eS)(FC_BODY)}
 ${(0, ClientUtil_js_1.S)(2)}}`, props.FC_DOC);
 }
-exports.functionTemplate = functionTemplate;
 function functionInterfaceTemplate(FC_NAME, props) {
     const { FC_PROPS, FC_RETURN, FC_GEN, FC_DOC } = props;
     return docTemplate(`${(0, ClientUtil_js_1.S)(2)}${(0, ClientUtil_js_1.eS)(FC_NAME)}${(0, ClientUtil_js_1.eS)(FC_GEN)}(${(0, ClientUtil_js_1.eS)(FC_PROPS)})${(0, ClientUtil_js_1.eS)(FC_RETURN)}`, FC_DOC);
 }
-exports.functionInterfaceTemplate = functionInterfaceTemplate;
 function abstractInterfaceTemplate(FC_NAME, props) {
     const { FC_PROPS, FC_RETURN, FC_GEN, FC_DOC } = props;
     return docTemplate(`${(0, ClientUtil_js_1.S)(2)}abstract ${(0, ClientUtil_js_1.eS)(FC_NAME)}${(0, ClientUtil_js_1.eS)(FC_GEN)}(${(0, ClientUtil_js_1.eS)(FC_PROPS)})${(0, ClientUtil_js_1.eS)(FC_RETURN)};`, FC_DOC);
 }
-exports.abstractInterfaceTemplate = abstractInterfaceTemplate;
 function reqBody(rType, path, paramKey, hasBody, type, bodyType, queryKey) {
     let q = 'undefined';
     if (queryKey.length > 0 || paramKey.length > 0) {
@@ -43,4 +43,3 @@ function reqBody(rType, path, paramKey, hasBody, type, bodyType, queryKey) {
     }
     return `return this.handle<${type}, ${bodyType}>('${rType}','${path}',${hasBody ? 'body' : 'undefined'}, ${q});`;
 }
-exports.reqBody = reqBody;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.interfaceTemplate = void 0;
+exports.interfaceTemplate = interfaceTemplate;
 /* eslint-disable prettier/prettier */
 const ClientUtil_js_1 = require("./ClientUtil.js");
 function interfaceTemplate(IF_NAME, types, rawType) {
@@ -11,4 +11,3 @@ function interfaceTemplate(IF_NAME, types, rawType) {
 ${types.map(({ key, type, required }) => `${(0, ClientUtil_js_1.S)(2)}${(0, ClientUtil_js_1.sK)(key)}${(0, ClientUtil_js_1.rq)(required)} ${type};`).join('\n')}
 }`;
 }
-exports.interfaceTemplate = interfaceTemplate;

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

@@ -90,7 +90,7 @@ function interfaceHandler(conf) {
                     interfaceList.push(...(0, ClientUtil_js_1.transformInterface)(cur.operationId, ClientUtil_js_1.IFTag.RequestBody, cur.requestBody.content['application/json'].schema).map((val) => (0, InterfaceTemplate_js_1.interfaceTemplate)(val.name, val.keys, val.rawType)));
                 }
                 if (cur.requestBody?.content?.['multipart/form-data']) {
-                    interfaceList.push(...(0, ClientUtil_js_1.transformFormInterface)(cur.operationId, ClientUtil_js_1.IFTag.RequestBody, cur.requestBody.content['multipart/form-data'].schema).map((val) => (0, InterfaceTemplate_js_1.interfaceTemplate)(val.name, val.keys, val.rawType)));
+                    interfaceList.push(...(0, ClientUtil_js_1.transformFormInterface)(cur.operationId, ClientUtil_js_1.IFTag.RequestBody).map((val) => (0, InterfaceTemplate_js_1.interfaceTemplate)(val.name, val.keys, val.rawType)));
                 }
                 const active = cur.responses?.['200'] || cur.responses?.['201'];
                 if (active &&

package/dist/cjs/Swagger/Meta/Swagger.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSComponent = exports.SComponent = exports.getSPath = exports.getSwaggerMeta = exports.SPath = exports.Swagger = void 0;
+exports.SComponent = exports.SPath = exports.Swagger = void 0;
+exports.getSwaggerMeta = getSwaggerMeta;
+exports.getSPath = getSPath;
+exports.getSComponent = getSComponent;
 require("reflect-metadata");
 const swaggerKey = Symbol('swagger');
 const pathKey = Symbol('sPath');
@@ -14,7 +17,6 @@ exports.Swagger = Swagger;
 function getSwaggerMeta(target) {
     return Reflect.getMetadata(swaggerKey, target.constructor.prototype);
 }
-exports.getSwaggerMeta = getSwaggerMeta;
 const SPath = (path, prefix) => {
     return (target) => {
         Reflect.defineMetadata(pathKey, {
@@ -27,7 +29,6 @@ exports.SPath = SPath;
 function getSPath(target) {
     return Reflect.getMetadata(pathKey, target.constructor.prototype);
 }
-exports.getSPath = getSPath;
 const SComponent = (comp) => {
     return (target) => {
         Reflect.defineMetadata(compKey, comp, target.prototype);
@@ -37,4 +38,3 @@ exports.SComponent = SComponent;
 function getSComponent(target) {
     return Reflect.getMetadata(compKey, target.constructor.prototype);
 }
-exports.getSComponent = getSComponent;

package/dist/cjs/Swagger/Meta/SwaggerTypes.js

@@ -1,9 +1,8 @@
 "use strict";
 /* eslint-disable @typescript-eslint/ban-types */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSwaggerRef = void 0;
+exports.isSwaggerRef = isSwaggerRef;
 function isSwaggerRef(o) {
     const a = o;
     return typeof a === 'object' && !!a?.$ref;
 }
-exports.isSwaggerRef = isSwaggerRef;

package/dist/cjs/Swagger/SwaggerUtil.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ObjectLike } from '@grandlinex/core';
 import { Server } from 'net';
 import { MergeInputType, SwaggerConfig } from './Meta/SwaggerTypes.js';

package/dist/cjs/Swagger/debug/BaseCon.js

@@ -7,12 +7,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isErrorType = void 0;
+exports.isErrorType = isErrorType;
 const form_data_1 = __importDefault(require("form-data"));
 function isErrorType(x) {
     return x && typeof x === 'object' && x.type === 'error';
 }
-exports.isErrorType = isErrorType;
 class BaseCon {
     constructor(conf) {
         this.api = conf.endpoint;

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

@@ -56,4 +56,4 @@ export declare function transformInterface(operation: string, tag: IFTag | strin
  * @param tag
  * @param schema
  */
-export declare function transformFormInterface(operation: string, tag: IFTag | string, schema: SSchemaEl): IfMappingType[];
+export declare function transformFormInterface(operation: string, tag: IFTag | string): IfMappingType[];

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

@@ -166,6 +166,28 @@ export function transformInterface(operation, tag, schema) {
                     }
                 }
                 break;
+            case 'string':
+                out.push({
+                    keys: [],
+                    name: cur.name,
+                    rawType: `string`,
+                });
+                break;
+            case 'integer':
+            case 'number':
+                out.push({
+                    keys: [],
+                    name: cur.name,
+                    rawType: `number`,
+                });
+                break;
+            case 'boolean':
+                out.push({
+                    keys: [],
+                    name: cur.name,
+                    rawType: `boolean`,
+                });
+                break;
             default:
                 break;
         }
@@ -182,13 +204,13 @@ export function transformInterface(operation, tag, schema) {
  * @param tag
  * @param schema
  */
-export function transformFormInterface(operation, tag, schema) {
+export function transformFormInterface(operation, tag) {
     const out = [];
     const cur = {
         name: ifName(operation, tag),
         keys: [],
     };
-    const keys = null;
+    // const keys: null | string[] = null;
     cur.rawType = `FormData`;
     out.push(cur);
     return out;

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

@@ -62,7 +62,7 @@ function interfaceHandler(conf) {
                     interfaceList.push(...transformInterface(cur.operationId, IFTag.RequestBody, cur.requestBody.content['application/json'].schema).map((val) => interfaceTemplate(val.name, val.keys, val.rawType)));
                 }
                 if (cur.requestBody?.content?.['multipart/form-data']) {
-                    interfaceList.push(...transformFormInterface(cur.operationId, IFTag.RequestBody, cur.requestBody.content['multipart/form-data'].schema).map((val) => interfaceTemplate(val.name, val.keys, val.rawType)));
+                    interfaceList.push(...transformFormInterface(cur.operationId, IFTag.RequestBody).map((val) => interfaceTemplate(val.name, val.keys, val.rawType)));
                 }
                 const active = cur.responses?.['200'] || cur.responses?.['201'];
                 if (active &&

package/dist/mjs/Swagger/SwaggerUtil.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import { ObjectLike } from '@grandlinex/core';
 import { Server } from 'net';
 import { MergeInputType, SwaggerConfig } from './Meta/SwaggerTypes.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grandlinex/swagger-mate",
-  "version": "0.32.1",
+  "version": "1.0.1",
   "type": "module",
   "exports": {
     ".": {
@@ -27,52 +27,51 @@
     "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 ts-node  src/tests/run.ts",
+    "run-dev": "npm run pre-build && 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",
-    "makeDocs": "typedoc",
-    "debug": "ts-node ./src/ArgReader.ts -i --debug -abc -d 5"
+    "makeDocs": "typedoc"
   },
   "bin": {
     "swagger-mate": "./dist/cjs/cli.js",
     "swagger-mate-esm": "./dist/mjs/cli.js"
   },
   "dependencies": {
-    "@grandlinex/core": "0.32.0",
-    "express": "4.18.2",
-    "form-data": "^4.0.0",
+    "@grandlinex/core": "1.0.1",
+    "express": "4.19.2",
+    "form-data": "4.0.0",
     "js-yaml": "4.1.0",
-    "reflect-metadata": "0.1.13"
+    "reflect-metadata": "0.2.2"
   },
   "devDependencies": {
-    "@types/express": "^4.17.17",
-    "@types/jest": "^29.5.2",
-    "@types/js-yaml": "^4.0.5",
-    "@types/node": "^20.3.0",
-    "@types/node-fetch": "^2.6.4",
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "@typescript-eslint/parser": "^5.59.11",
-    "axios": "1.4.0",
-    "cross-env": "^7.0.3",
-    "eslint": "^8.42.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "html-webpack-plugin": "^5.5.3",
-    "http-server": "^14.1.1",
-    "jest": "^29.5.0",
-    "jest-junit": "^16.0.0",
-    "node-fetch": "3.3.1",
-    "prettier": "^2.8.8",
-    "ts-jest": "^29.1.0",
-    "ts-loader": "^9.4.3",
-    "ts-node": "^10.9.1",
-    "typedoc": "^0.24.8",
-    "typescript": "^5.1.3"
+    "@types/express": "4.17.21",
+    "@types/jest": "29.5.12",
+    "@types/js-yaml": "4.0.9",
+    "@types/node": "22.0.0",
+    "@types/node-fetch": "2.6.11",
+    "@typescript-eslint/eslint-plugin": "7.18.0",
+    "@typescript-eslint/parser": "7.18.0",
+    "axios": "1.7.2",
+    "cross-env": "7.0.3",
+    "eslint": "8.57.0",
+    "eslint-config-airbnb": "19.0.4",
+    "eslint-config-airbnb-typescript": "18.0.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-jest": "28.6.0",
+    "eslint-plugin-jsx-a11y": "6.9.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "html-webpack-plugin": "5.6.0",
+    "http-server": "14.1.1",
+    "jest": "29.7.0",
+    "jest-junit": "16.0.0",
+    "node-fetch": "3.3.2",
+    "prettier": "3.3.3",
+    "ts-jest": "29.1.5",
+    "ts-loader": "9.5.1",
+    "ts-node": "10.9.2",
+    "typedoc": "0.26.5",
+    "typescript": "5.5.4"
   }
 }