ts-openapi-codegen 1.0.0-beta.6 → 1.0.0-beta.8

package/dist/core/utils/registerHandlebarTemplates.js

@@ -39,85 +39,90 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerHandlebarTemplates = registerHandlebarTemplates;
 /* eslint-disable simple-import-sort/imports */
 const Handlebars = __importStar(require("handlebars/runtime"));
-const ApiError_1 = __importDefault(require("../../templatesCompiled/core/ApiError"));
-const ApiRequestOptions_1 = __importDefault(require("../../templatesCompiled/core/ApiRequestOptions"));
-const ApiResult_1 = __importDefault(require("../../templatesCompiled/core/ApiResult"));
-const HttpStatusCode_1 = __importDefault(require("../../templatesCompiled/core/HttpStatusCode"));
+const ApiError_1 = __importDefault(require("../../templatesCompiled/client/core/ApiError"));
+const ApiRequestOptions_1 = __importDefault(require("../../templatesCompiled/client/core/ApiRequestOptions"));
+const ApiResult_1 = __importDefault(require("../../templatesCompiled/client/core/ApiResult"));
+const HttpStatusCode_1 = __importDefault(require("../../templatesCompiled/client/core/HttpStatusCode"));
 // axios START
-const getHeaders_1 = __importDefault(require("../../templatesCompiled/core/axios/getHeaders"));
-const getRequestBody_1 = __importDefault(require("../../templatesCompiled/core/axios/getRequestBody"));
-const getResponseBody_1 = __importDefault(require("../../templatesCompiled/core/axios/getResponseBody"));
-const getResponseHeader_1 = __importDefault(require("../../templatesCompiled/core/axios/getResponseHeader"));
-const request_1 = __importDefault(require("../../templatesCompiled/core/axios/request"));
-const sendRequest_1 = __importDefault(require("../../templatesCompiled/core/axios/sendRequest"));
+const getHeaders_1 = __importDefault(require("../../templatesCompiled/client/core/axios/getHeaders"));
+const getRequestBody_1 = __importDefault(require("../../templatesCompiled/client/core/axios/getRequestBody"));
+const getResponseBody_1 = __importDefault(require("../../templatesCompiled/client/core/axios/getResponseBody"));
+const getResponseHeader_1 = __importDefault(require("../../templatesCompiled/client/core/axios/getResponseHeader"));
+const request_1 = __importDefault(require("../../templatesCompiled/client/core/axios/request"));
+const sendRequest_1 = __importDefault(require("../../templatesCompiled/client/core/axios/sendRequest"));
 // axios END
-const getHeaders_2 = __importDefault(require("../../templatesCompiled/core/fetch/getHeaders"));
-const getRequestBody_2 = __importDefault(require("../../templatesCompiled/core/fetch/getRequestBody"));
-const getResponseBody_2 = __importDefault(require("../../templatesCompiled/core/fetch/getResponseBody"));
-const getResponseHeader_2 = __importDefault(require("../../templatesCompiled/core/fetch/getResponseHeader"));
-const request_2 = __importDefault(require("../../templatesCompiled/core/fetch/request"));
-const sendRequest_2 = __importDefault(require("../../templatesCompiled/core/fetch/sendRequest"));
-const catchErrors_1 = __importDefault(require("../../templatesCompiled/core/functions/catchErrors"));
-const getFormData_1 = __importDefault(require("../../templatesCompiled/core/functions/getFormData"));
-const getQueryString_1 = __importDefault(require("../../templatesCompiled/core/functions/getQueryString"));
-const getUrl_1 = __importDefault(require("../../templatesCompiled/core/functions/getUrl"));
-const isBinary_1 = __importDefault(require("../../templatesCompiled/core/functions/isBinary"));
-const isBlob_1 = __importDefault(require("../../templatesCompiled/core/functions/isBlob"));
-const isDefined_1 = __importDefault(require("../../templatesCompiled/core/functions/isDefined"));
-const isString_1 = __importDefault(require("../../templatesCompiled/core/functions/isString"));
-const isStringWithValue_1 = __importDefault(require("../../templatesCompiled/core/functions/isStringWithValue"));
-const isSuccess_1 = __importDefault(require("../../templatesCompiled/core/functions/isSuccess"));
-const resolve_1 = __importDefault(require("../../templatesCompiled/core/functions/resolve"));
-const getHeaders_3 = __importDefault(require("../../templatesCompiled/core/node/getHeaders"));
-const getRequestBody_3 = __importDefault(require("../../templatesCompiled/core/node/getRequestBody"));
-const getResponseBody_3 = __importDefault(require("../../templatesCompiled/core/node/getResponseBody"));
-const getResponseHeader_3 = __importDefault(require("../../templatesCompiled/core/node/getResponseHeader"));
-const request_3 = __importDefault(require("../../templatesCompiled/core/node/request"));
-const sendRequest_3 = __importDefault(require("../../templatesCompiled/core/node/sendRequest"));
-const OpenAPI_1 = __importDefault(require("../../templatesCompiled/core/OpenAPI"));
-const CancelablePromise_1 = __importDefault(require("../../templatesCompiled/core/CancelablePromise"));
-const request_4 = __importDefault(require("../../templatesCompiled/core/request"));
-const getHeaders_4 = __importDefault(require("../../templatesCompiled/core/xhr/getHeaders"));
-const getRequestBody_4 = __importDefault(require("../../templatesCompiled/core/xhr/getRequestBody"));
-const getResponseBody_4 = __importDefault(require("../../templatesCompiled/core/xhr/getResponseBody"));
-const getResponseHeader_4 = __importDefault(require("../../templatesCompiled/core/xhr/getResponseHeader"));
-const request_5 = __importDefault(require("../../templatesCompiled/core/xhr/request"));
-const sendRequest_4 = __importDefault(require("../../templatesCompiled/core/xhr/sendRequest"));
-const exportModel_1 = __importDefault(require("../../templatesCompiled/exportModel"));
-const exportSchema_1 = __importDefault(require("../../templatesCompiled/exportSchema"));
-const exportService_1 = __importDefault(require("../../templatesCompiled/exportService"));
-const templatesCompiled_1 = __importDefault(require("../../templatesCompiled"));
-const base_1 = __importDefault(require("../../templatesCompiled/partials/base"));
-const exportComposition_1 = __importDefault(require("../../templatesCompiled/partials/exportComposition"));
-const exportEnum_1 = __importDefault(require("../../templatesCompiled/partials/exportEnum"));
-const exportInterface_1 = __importDefault(require("../../templatesCompiled/partials/exportInterface"));
-const exportType_1 = __importDefault(require("../../templatesCompiled/partials/exportType"));
-const header_1 = __importDefault(require("../../templatesCompiled/partials/header"));
-const isNullable_1 = __importDefault(require("../../templatesCompiled/partials/isNullable"));
-const isReadOnly_1 = __importDefault(require("../../templatesCompiled/partials/isReadOnly"));
-const isRequired_1 = __importDefault(require("../../templatesCompiled/partials/isRequired"));
-const isRequiredDefinition_1 = __importDefault(require("../../templatesCompiled/partials/isRequiredDefinition"));
-const parameters_1 = __importDefault(require("../../templatesCompiled/partials/parameters"));
-const parametersDefinition_1 = __importDefault(require("../../templatesCompiled/partials/parametersDefinition"));
-const parameterValues_1 = __importDefault(require("../../templatesCompiled/partials/parameterValues"));
-const result_1 = __importDefault(require("../../templatesCompiled/partials/result"));
-const schema_1 = __importDefault(require("../../templatesCompiled/partials/schema"));
-const schemaArray_1 = __importDefault(require("../../templatesCompiled/partials/schemaArray"));
-const schemaComposition_1 = __importDefault(require("../../templatesCompiled/partials/schemaComposition"));
-const schemaDictionary_1 = __importDefault(require("../../templatesCompiled/partials/schemaDictionary"));
-const schemaEnum_1 = __importDefault(require("../../templatesCompiled/partials/schemaEnum"));
-const schemaGeneric_1 = __importDefault(require("../../templatesCompiled/partials/schemaGeneric"));
-const schemaInterface_1 = __importDefault(require("../../templatesCompiled/partials/schemaInterface"));
-const serviceOption_1 = __importDefault(require("../../templatesCompiled/partials/serviceOption"));
-const type_1 = __importDefault(require("../../templatesCompiled/partials/type"));
-const typeArray_1 = __importDefault(require("../../templatesCompiled/partials/typeArray"));
-const typeDictionary_1 = __importDefault(require("../../templatesCompiled/partials/typeDictionary"));
-const typeEnum_1 = __importDefault(require("../../templatesCompiled/partials/typeEnum"));
-const typeGeneric_1 = __importDefault(require("../../templatesCompiled/partials/typeGeneric"));
-const typeInterface_1 = __importDefault(require("../../templatesCompiled/partials/typeInterface"));
-const typeIntersection_1 = __importDefault(require("../../templatesCompiled/partials/typeIntersection"));
-const typeReference_1 = __importDefault(require("../../templatesCompiled/partials/typeReference"));
-const typeUnion_1 = __importDefault(require("../../templatesCompiled/partials/typeUnion"));
+const getHeaders_2 = __importDefault(require("../../templatesCompiled/client/core/fetch/getHeaders"));
+const getRequestBody_2 = __importDefault(require("../../templatesCompiled/client/core/fetch/getRequestBody"));
+const getResponseBody_2 = __importDefault(require("../../templatesCompiled/client/core/fetch/getResponseBody"));
+const getResponseHeader_2 = __importDefault(require("../../templatesCompiled/client/core/fetch/getResponseHeader"));
+const request_2 = __importDefault(require("../../templatesCompiled/client/core/fetch/request"));
+const sendRequest_2 = __importDefault(require("../../templatesCompiled/client/core/fetch/sendRequest"));
+const catchErrors_1 = __importDefault(require("../../templatesCompiled/client/core/functions/catchErrors"));
+const getFormData_1 = __importDefault(require("../../templatesCompiled/client/core/functions/getFormData"));
+const getQueryString_1 = __importDefault(require("../../templatesCompiled/client/core/functions/getQueryString"));
+const getUrl_1 = __importDefault(require("../../templatesCompiled/client/core/functions/getUrl"));
+const isBinary_1 = __importDefault(require("../../templatesCompiled/client/core/functions/isBinary"));
+const isBlob_1 = __importDefault(require("../../templatesCompiled/client/core/functions/isBlob"));
+const isDefined_1 = __importDefault(require("../../templatesCompiled/client/core/functions/isDefined"));
+const isString_1 = __importDefault(require("../../templatesCompiled/client/core/functions/isString"));
+const isStringWithValue_1 = __importDefault(require("../../templatesCompiled/client/core/functions/isStringWithValue"));
+const isSuccess_1 = __importDefault(require("../../templatesCompiled/client/core/functions/isSuccess"));
+const resolve_1 = __importDefault(require("../../templatesCompiled/client/core/functions/resolve"));
+const getHeaders_3 = __importDefault(require("../../templatesCompiled/client/core/node/getHeaders"));
+const getRequestBody_3 = __importDefault(require("../../templatesCompiled/client/core/node/getRequestBody"));
+const getResponseBody_3 = __importDefault(require("../../templatesCompiled/client/core/node/getResponseBody"));
+const getResponseHeader_3 = __importDefault(require("../../templatesCompiled/client/core/node/getResponseHeader"));
+const request_3 = __importDefault(require("../../templatesCompiled/client/core/node/request"));
+const sendRequest_3 = __importDefault(require("../../templatesCompiled/client/core/node/sendRequest"));
+const OpenAPI_1 = __importDefault(require("../../templatesCompiled/client/core/OpenAPI"));
+const CancelablePromise_1 = __importDefault(require("../../templatesCompiled/client/core/CancelablePromise"));
+const request_4 = __importDefault(require("../../templatesCompiled/client/core/request"));
+const getHeaders_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getHeaders"));
+const getRequestBody_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getRequestBody"));
+const getResponseBody_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getResponseBody"));
+const getResponseHeader_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getResponseHeader"));
+const request_5 = __importDefault(require("../../templatesCompiled/client/core/xhr/request"));
+const sendRequest_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/sendRequest"));
+const exportModel_1 = __importDefault(require("../../templatesCompiled/client/exportModel"));
+const exportSchema_1 = __importDefault(require("../../templatesCompiled/client/exportSchema"));
+const exportService_1 = __importDefault(require("../../templatesCompiled/client/exportService"));
+const indexFull_1 = __importDefault(require("../../templatesCompiled/client/indexFull"));
+const indexSimple_1 = __importDefault(require("../../templatesCompiled/client/indexSimple"));
+const indexCore_1 = __importDefault(require("../../templatesCompiled/client/indexCore"));
+const indexModels_1 = __importDefault(require("../../templatesCompiled/client/indexModels"));
+const indexShemas_1 = __importDefault(require("../../templatesCompiled/client/indexShemas"));
+const indexServices_1 = __importDefault(require("../../templatesCompiled/client/indexServices"));
+const base_1 = __importDefault(require("../../templatesCompiled/client/partials/base"));
+const exportComposition_1 = __importDefault(require("../../templatesCompiled/client/partials/exportComposition"));
+const exportEnum_1 = __importDefault(require("../../templatesCompiled/client/partials/exportEnum"));
+const exportInterface_1 = __importDefault(require("../../templatesCompiled/client/partials/exportInterface"));
+const exportType_1 = __importDefault(require("../../templatesCompiled/client/partials/exportType"));
+const header_1 = __importDefault(require("../../templatesCompiled/client/partials/header"));
+const isNullable_1 = __importDefault(require("../../templatesCompiled/client/partials/isNullable"));
+const isReadOnly_1 = __importDefault(require("../../templatesCompiled/client/partials/isReadOnly"));
+const isRequired_1 = __importDefault(require("../../templatesCompiled/client/partials/isRequired"));
+const isRequiredDefinition_1 = __importDefault(require("../../templatesCompiled/client/partials/isRequiredDefinition"));
+const parameters_1 = __importDefault(require("../../templatesCompiled/client/partials/parameters"));
+const parametersDefinition_1 = __importDefault(require("../../templatesCompiled/client/partials/parametersDefinition"));
+const parameterValues_1 = __importDefault(require("../../templatesCompiled/client/partials/parameterValues"));
+const result_1 = __importDefault(require("../../templatesCompiled/client/partials/result"));
+const schema_1 = __importDefault(require("../../templatesCompiled/client/partials/schema"));
+const schemaArray_1 = __importDefault(require("../../templatesCompiled/client/partials/schemaArray"));
+const schemaComposition_1 = __importDefault(require("../../templatesCompiled/client/partials/schemaComposition"));
+const schemaDictionary_1 = __importDefault(require("../../templatesCompiled/client/partials/schemaDictionary"));
+const schemaEnum_1 = __importDefault(require("../../templatesCompiled/client/partials/schemaEnum"));
+const schemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/partials/schemaGeneric"));
+const schemaInterface_1 = __importDefault(require("../../templatesCompiled/client/partials/schemaInterface"));
+const serviceOption_1 = __importDefault(require("../../templatesCompiled/client/partials/serviceOption"));
+const type_1 = __importDefault(require("../../templatesCompiled/client/partials/type"));
+const typeArray_1 = __importDefault(require("../../templatesCompiled/client/partials/typeArray"));
+const typeDictionary_1 = __importDefault(require("../../templatesCompiled/client/partials/typeDictionary"));
+const typeEnum_1 = __importDefault(require("../../templatesCompiled/client/partials/typeEnum"));
+const typeGeneric_1 = __importDefault(require("../../templatesCompiled/client/partials/typeGeneric"));
+const typeInterface_1 = __importDefault(require("../../templatesCompiled/client/partials/typeInterface"));
+const typeIntersection_1 = __importDefault(require("../../templatesCompiled/client/partials/typeIntersection"));
+const typeReference_1 = __importDefault(require("../../templatesCompiled/client/partials/typeReference"));
+const typeUnion_1 = __importDefault(require("../../templatesCompiled/client/partials/typeUnion"));
 const registerHandlebarHelpers_1 = require("./registerHandlebarHelpers");
 /**
  * Read all the Handlebar templates that we need and return on wrapper object
@@ -127,7 +132,14 @@ function registerHandlebarTemplates(root) {
     (0, registerHandlebarHelpers_1.registerHandlebarHelpers)(root);
     // Main templates (entry points for the files we write to disk)
     const templates = {
-        index: Handlebars.template(templatesCompiled_1.default),
+        indexes: {
+            full: Handlebars.template(indexFull_1.default),
+            simple: Handlebars.template(indexSimple_1.default),
+            core: Handlebars.template(indexCore_1.default),
+            models: Handlebars.template(indexModels_1.default),
+            schemas: Handlebars.template(indexShemas_1.default),
+            services: Handlebars.template(indexServices_1.default),
+        },
         exports: {
             model: Handlebars.template(exportModel_1.default),
             schema: Handlebars.template(exportSchema_1.default),

package/dist/core/utils/resolveRefPath.d.ts

@@ -0,0 +1,7 @@
+import { ParsedRef } from './parseRef';
+/**
+ * Resolve a parsed reference to an absolute path (when applicable).
+ * parentFilePath is expected to be a file path (absolute or relative).
+ */
+export declare function resolveRefPath(parsedRef: ParsedRef, parentFilePath: string): string;
+//# sourceMappingURL=resolveRefPath.d.ts.map

package/dist/core/utils/resolveRefPath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveRefPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefPath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAGhD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CA4BnF"}

package/dist/core/utils/resolveRefPath.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveRefPath = resolveRefPath;
+const advancedDeduplicatePath_1 = require("./advancedDeduplicatePath");
+const parseRef_1 = require("./parseRef");
+const pathHelpers_1 = require("./pathHelpers");
+/**
+ * Resolve a parsed reference to an absolute path (when applicable).
+ * parentFilePath is expected to be a file path (absolute or relative).
+ */
+function resolveRefPath(parsedRef, parentFilePath) {
+    // For correct operation, parentDir must be the path to the directory, not the file.
+    const parentDir = (0, pathHelpers_1.dirName)(parentFilePath.split('#')[0]);
+    switch (parsedRef.type) {
+        case parseRef_1.RefType.LOCAL_FRAGMENT:
+            // For local fragments, use the parent file path
+            return parentFilePath.split('#')[0];
+        case parseRef_1.RefType.EXTERNAL_FILE:
+        case parseRef_1.RefType.EXTERNAL_FILE_FRAGMENT:
+            // Resolve relative to parent file directory
+            if (parsedRef.filePath) {
+                const resolvedPath = (0, pathHelpers_1.resolve)(parentDir, parsedRef.filePath);
+                // Clean any duplicate path segments
+                return (0, advancedDeduplicatePath_1.advancedDeduplicatePath)(resolvedPath);
+            }
+            return parentFilePath;
+        case parseRef_1.RefType.ABSOLUTE_PATH:
+            return parsedRef.filePath || parentFilePath;
+        case parseRef_1.RefType.HTTP_URL:
+            return parsedRef.originalRef;
+        default:
+            return parentFilePath;
+    }
+}

package/dist/core/utils/resolveRefToImportPath.d.ts

@@ -0,0 +1,7 @@
+export declare function resolveRefToImportPath({ mainSpecPath, parentFilePath, refValuePath, outputModelsPath, }: {
+    mainSpecPath: string;
+    parentFilePath: string;
+    refValuePath: string;
+    outputModelsPath: string;
+}): string;
+//# sourceMappingURL=resolveRefToImportPath.d.ts.map

package/dist/core/utils/resolveRefToImportPath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveRefToImportPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefToImportPath.ts"],"names":[],"mappings":"AASA,wBAAgB,sBAAsB,CAAC,EACnC,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,gBAAgB,GACnB,EAAE;IACC,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC5B,UA+CA"}

package/dist/core/utils/resolveRefToImportPath.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveRefToImportPath = resolveRefToImportPath;
+const path_1 = require("path");
+const isDirectory_1 = require("./isDirectory");
+const isFileName_1 = require("./isFileName");
+const mapPathToTargetDirSafe_1 = require("./mapPathToTargetDirSafe");
+const parseRef_1 = require("./parseRef");
+const pathHelpers_1 = require("./pathHelpers");
+const stripNamespace_1 = require("./stripNamespace");
+function resolveRefToImportPath({ mainSpecPath, parentFilePath, refValuePath, outputModelsPath, }) {
+    const absOutputModelsPath = (0, path_1.resolve)(outputModelsPath);
+    const sourceRoot = (0, isDirectory_1.isDirectory)(mainSpecPath) ? mainSpecPath : (0, path_1.dirname)(mainSpecPath);
+    const parsed = (0, parseRef_1.parseRef)(refValuePath);
+    // KEY CASE: internal link (#/components/schemas/Xxx)
+    if (parsed.type === parseRef_1.RefType.LOCAL_FRAGMENT) {
+        // stripNamespace transform "#/components/schemas/AccountField" → "AccountField"
+        const modelName = (0, stripNamespace_1.stripNamespace)(refValuePath);
+        // Determinarea de unde provine legătura (pentru o cale relativă)
+        const cleanParent = (0, stripNamespace_1.stripNamespace)(parentFilePath || mainSpecPath);
+        const parentDirInSource = (0, path_1.dirname)(cleanParent);
+        const parentDirInOutput = (0, mapPathToTargetDirSafe_1.mapPathToTargetDirSafe)(parentDirInSource, sourceRoot, outputModelsPath);
+        // Crearea căii către fișierul model
+        const modelFilePathInOutput = (0, path_1.resolve)(parentDirInOutput, modelName);
+        const absModelPath = (0, path_1.resolve)(modelFilePathInOutput);
+        if (!absModelPath.startsWith(absOutputModelsPath + '/') && absModelPath !== absOutputModelsPath) {
+            return `./${modelName}`;
+        }
+        const relativePath = (0, path_1.relative)(absOutputModelsPath, absModelPath);
+        return `./${relativePath.replace(/\\/g, '/')}`;
+    }
+    // Restul cazurilor sunt legături externe (funcționează ca înainte)
+    const parentClean = (0, stripNamespace_1.stripNamespace)(parentFilePath || '') || '';
+    const refValueClean = (0, stripNamespace_1.stripNamespace)(refValuePath || '') || refValuePath;
+    const parentDirForResolve = parentClean ? (0, path_1.dirname)(parentClean) : sourceRoot;
+    const targetFileAbs = (0, isFileName_1.isFileName)(refValueClean) ? (0, pathHelpers_1.joinToDir)(parentDirForResolve, refValueClean) : (0, path_1.resolve)(parentDirForResolve, refValueClean);
+    const targetPathInOutput = (0, mapPathToTargetDirSafe_1.mapPathToTargetDirSafe)(targetFileAbs, sourceRoot, outputModelsPath);
+    const absTargetPath = (0, path_1.resolve)(targetPathInOutput);
+    if (!absTargetPath.startsWith(absOutputModelsPath + '/') && absTargetPath !== absOutputModelsPath) {
+        const fallbackName = (0, stripNamespace_1.stripNamespace)((0, path_1.basename)(targetFileAbs));
+        return `./${fallbackName}`;
+    }
+    const relativePath = (0, path_1.relative)(absOutputModelsPath, absTargetPath);
+    return `./${relativePath.replace(/\\/g, '/')}`;
+}

package/dist/core/utils/serviceHelpers.d.ts

@@ -0,0 +1,41 @@
+import type { Service } from '../types/shared/Service.model';
+/**
+ * Iterate over supported HTTP methods in a path object and call callback for each found operation.
+ *
+ * @param pathObj - OpenAPI Path object (may contain methods like get, post, etc.)
+ * @param cb - callback invoked as cb(method, operation)
+ */
+export declare function forEachOperationInPath(pathObj: Record<string, any>, cb: (method: string, op: any) => void): void;
+/**
+ * Ensure service exists in the services map or create a new one.
+ *
+ * @param services - Map of services
+ * @param name - service name
+ * @param originName - originName (optional) used when creating a new service
+ * @returns existing or newly created Service
+ */
+export declare function ensureService(services: Map<string, Service>, name: string, originName?: string): Service;
+/**
+ * Merge operation.imports into service.imports.
+ * - Reuse existing import objects in service.imports by matching path.
+ * - Replace operation.imports entries with the reused ones when found.
+ *
+ * This preserves identity of import objects so alias assignment is consistent.
+ *
+ * @param service - service to merge into
+ * @param operation - operation whose imports should be merged
+ */
+export declare function mergeOperationImportsIntoService(service: Service, operation: any): void;
+/**
+ * Finalize imports for a service:
+ * - Deduplicate and sort imports
+ * - Assign aliases for duplicate import names (name, name$1, name$2, ...)
+ * - Propagate assigned aliases to models referenced in operations (results, parameters)
+ *
+ * Modifies service in-place and returns it.
+ *
+ * @param service - Service to finalize
+ * @returns service
+ */
+export declare function finalizeServiceImports(service: Service): Service;
+//# sourceMappingURL=serviceHelpers.d.ts.map

package/dist/core/utils/serviceHelpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serviceHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/serviceHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAK7D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAOhH;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAWxG;AAED;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,CAMvF;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAiChE"}

package/dist/core/utils/serviceHelpers.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.forEachOperationInPath = forEachOperationInPath;
+exports.ensureService = ensureService;
+exports.mergeOperationImportsIntoService = mergeOperationImportsIntoService;
+exports.finalizeServiceImports = finalizeServiceImports;
+const unique_1 = require("./unique");
+const SUPPORTED_METHODS = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch'];
+/**
+ * Iterate over supported HTTP methods in a path object and call callback for each found operation.
+ *
+ * @param pathObj - OpenAPI Path object (may contain methods like get, post, etc.)
+ * @param cb - callback invoked as cb(method, operation)
+ */
+function forEachOperationInPath(pathObj, cb) {
+    for (const method in pathObj) {
+        if (!Object.prototype.hasOwnProperty.call(pathObj, method))
+            continue;
+        if (SUPPORTED_METHODS.includes(method) && pathObj[method]) {
+            cb(method, pathObj[method]);
+        }
+    }
+}
+/**
+ * Ensure service exists in the services map or create a new one.
+ *
+ * @param services - Map of services
+ * @param name - service name
+ * @param originName - originName (optional) used when creating a new service
+ * @returns existing or newly created Service
+ */
+function ensureService(services, name, originName) {
+    const existing = services.get(name);
+    if (existing)
+        return existing;
+    const s = {
+        name,
+        originName: originName ?? name,
+        operations: [],
+        imports: [],
+    };
+    services.set(name, s);
+    return s;
+}
+/**
+ * Merge operation.imports into service.imports.
+ * - Reuse existing import objects in service.imports by matching path.
+ * - Replace operation.imports entries with the reused ones when found.
+ *
+ * This preserves identity of import objects so alias assignment is consistent.
+ *
+ * @param service - service to merge into
+ * @param operation - operation whose imports should be merged
+ */
+function mergeOperationImportsIntoService(service, operation) {
+    operation.imports = operation.imports.map((item) => {
+        const existing = service.imports.find(si => si.path === item.path);
+        return existing ?? item;
+    });
+    service.imports.push(...operation.imports);
+}
+/**
+ * Internal helper: apply alias value to models that reference the import.
+ */
+function fillModelsByAlias(items = [], value) {
+    items
+        .filter(result => result.path === value.path && result.type === value.name && value.alias)
+        .forEach(result => {
+        result.alias = value.alias;
+        result.base = value.alias;
+    });
+}
+/**
+ * Finalize imports for a service:
+ * - Deduplicate and sort imports
+ * - Assign aliases for duplicate import names (name, name$1, name$2, ...)
+ * - Propagate assigned aliases to models referenced in operations (results, parameters)
+ *
+ * Modifies service in-place and returns it.
+ *
+ * @param service - Service to finalize
+ * @returns service
+ */
+function finalizeServiceImports(service) {
+    service.imports = service.imports.filter(unique_1.unique).sort((a, b) => {
+        const nameA = a.name.toLowerCase();
+        const nameB = b.name.toLowerCase();
+        return nameA.localeCompare(nameB, 'en');
+    });
+    let previous;
+    let index = 1;
+    service.imports = service.imports.map(value => {
+        if (previous && previous.name === value.name) {
+            if (index === 1) {
+                previous.alias = `${value.name}$${index}`;
+                index++;
+            }
+            value.alias = `${value.name}$${index}`;
+            index++;
+        }
+        else {
+            value.alias = '';
+            index = 1;
+        }
+        previous = value;
+        return value;
+    });
+    for (const item of service.imports) {
+        for (const operation of service.operations) {
+            fillModelsByAlias(operation.results, item);
+            fillModelsByAlias(operation.parameters, item);
+        }
+    }
+    return service;
+}

package/dist/core/utils/sortModelByName.d.ts

@@ -1,3 +1,3 @@
-import { IModel } from "./writeClientIndex";
-export declare function sortModelByName(a: IModel, b: IModel): number;
+import { ExportedModel } from "../types/base/ExportedModel.model";
+export declare function sortModelByName(a: ExportedModel, b: ExportedModel): number;
 //# sourceMappingURL=sortModelByName.d.ts.map

package/dist/core/utils/sortModelByName.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sortModelByName.d.ts","sourceRoot":"","sources":["../../../src/core/utils/sortModelByName.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ5D"}
+{"version":3,"file":"sortModelByName.d.ts","sourceRoot":"","sources":["../../../src/core/utils/sortModelByName.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,wBAAgB,eAAe,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,MAAM,CAQ1E"}

package/dist/core/utils/writeClientCore.d.ts

@@ -1,5 +1,6 @@
-import { HttpClient } from '../types/Enums';
+import { HttpClient } from '../types/enums/HttpClient.enum';
 import type { Client } from '../types/shared/Client.model';
+import { WriteClient } from '../WriteClient';
 import { Templates } from './registerHandlebarTemplates';
 /**
  * @param client Client object, containing, models, schemas and services
@@ -16,6 +17,7 @@ interface IWriteClientCore {
     httpClient: HttpClient;
     request?: string;
     useCancelableRequest?: boolean;
+    useSeparatedIndexes?: boolean;
 }
 /**
  * Generate OpenAPI core files, this includes the basic boilerplate code to handle requests.
@@ -26,6 +28,6 @@ interface IWriteClientCore {
  * @param request: Path to custom request file
  * @param useCancelableRequest Use cancelable request type
  */
-export declare function writeClientCore(options: IWriteClientCore): Promise<void>;
+export declare function writeClientCore(this: WriteClient, options: IWriteClientCore): Promise<void>;
 export {};
 //# sourceMappingURL=writeClientCore.d.ts.map

package/dist/core/utils/writeClientCore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeClientCore.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD;;;;;;;GAOG;AACH,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B9E"}
+{"version":3,"file":"writeClientCore.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD;;;;;;;GAOG;AACH,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgCjG"}

package/dist/core/utils/writeClientCore.js

@@ -13,13 +13,15 @@ const fileSystem_1 = require("./fileSystem");
  * @param useCancelableRequest Use cancelable request type
  */
 async function writeClientCore(options) {
-    const { client, templates, outputCorePath, httpClient, request, useCancelableRequest } = options;
+    const { client, templates, outputCorePath, httpClient, request, useCancelableRequest, useSeparatedIndexes } = options;
     const context = {
         httpClient,
         server: client.server,
         version: client.version,
         useCancelableRequest,
+        useSeparatedIndexes,
     };
+    this.logger.info("The recording of the kernel files begins");
     await fileSystem_1.fileSystem.writeFile((0, path_1.resolve)(outputCorePath, 'OpenAPI.ts'), templates.core.settings(context));
     await fileSystem_1.fileSystem.writeFile((0, path_1.resolve)(outputCorePath, 'ApiError.ts'), templates.core.apiError({}));
     await fileSystem_1.fileSystem.writeFile((0, path_1.resolve)(outputCorePath, 'ApiRequestOptions.ts'), templates.core.apiRequestOptions({}));
@@ -37,4 +39,5 @@ async function writeClientCore(options) {
         }
         await fileSystem_1.fileSystem.copyFile(requestFile, (0, path_1.resolve)(outputCorePath, 'request.ts'));
     }
+    this.logger.info("The writing of the kernel files has been completed successfully");
 }

package/dist/core/utils/writeClientCoreIndex.d.ts

@@ -0,0 +1,11 @@
+import { WriteClient } from '../WriteClient';
+import { Templates } from './registerHandlebarTemplates';
+interface IOptionsProps {
+    templates: Templates;
+    outputCorePath: string;
+    useCancelableRequest?: boolean;
+    useSeparatedIndexes?: boolean;
+}
+export declare function writeClientCoreIndex(this: WriteClient, options: IOptionsProps): Promise<void>;
+export {};
+//# sourceMappingURL=writeClientCoreIndex.d.ts.map

package/dist/core/utils/writeClientCoreIndex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"writeClientCoreIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCoreIndex.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,UAAU,aAAa;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAcnF"}

package/dist/core/utils/writeClientCoreIndex.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeClientCoreIndex = writeClientCoreIndex;
+const path_1 = require("path");
+const appendUniqueLinesToFile_1 = require("./appendUniqueLinesToFile");
+async function writeClientCoreIndex(options) {
+    const { templates, outputCorePath, useCancelableRequest, useSeparatedIndexes } = options;
+    if (!useSeparatedIndexes) {
+        return;
+    }
+    const filePath = (0, path_1.resolve)(outputCorePath, 'index.ts');
+    this.logger.info(`Data has been written to a file: ${filePath}`);
+    const content = templates.indexes.core({ useCancelableRequest });
+    await (0, appendUniqueLinesToFile_1.appendUniqueLinesToFile)(filePath, content);
+    this.logger.info(`Writing to the file is completed: ${filePath}`);
+}

package/dist/core/utils/writeClientFullIndex.d.ts

@@ -0,0 +1,9 @@
+import { ClientArtifacts } from '../types/base/ClientArtifacts.model';
+import { WriteClient } from '../WriteClient';
+/**
+ * Generate the OpenAPI client index file using the Handlebar template and write it to disk.
+ * The index file just contains all the exports you need to use the client as a standalone
+ * library. But yuo can also import individual models and services directly.
+ */
+export declare function writeClientFullIndex(this: WriteClient, options: ClientArtifacts): Promise<void>;
+//# sourceMappingURL=writeClientFullIndex.d.ts.map

package/dist/core/utils/writeClientFullIndex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"writeClientFullIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientFullIndex.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBrG"}

package/dist/core/utils/writeClientFullIndex.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeClientFullIndex = writeClientFullIndex;
+const path_1 = require("path");
+const fileSystem_1 = require("./fileSystem");
+/**
+ * Generate the OpenAPI client index file using the Handlebar template and write it to disk.
+ * The index file just contains all the exports you need to use the client as a standalone
+ * library. But yuo can also import individual models and services directly.
+ */
+async function writeClientFullIndex(options) {
+    const { templates, outputPath, core, models, schemas, services } = options;
+    const resolvePathIndex = (0, path_1.resolve)(outputPath, 'index.ts');
+    this.logger.info(`Data has been written to a file: ${resolvePathIndex}`);
+    await fileSystem_1.fileSystem.writeFile(resolvePathIndex, templates.indexes.full({
+        core,
+        models,
+        schemas,
+        services,
+    }));
+    this.logger.info(`Writing to the file is completed: ${resolvePathIndex}`);
+}