api-core-lib 12.0.56 → 12.0.58

package/dist/cli.cjs

@@ -25,269 +25,41 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/cli.ts
 var import_commander = require("commander");
-var import_path3 = __toESM(require("path"), 1);
-
-// src/generator/index.ts
-var import_path2 = __toESM(require("path"), 1);
-var import_axios = __toESM(require("axios"), 1);
-var import_chalk2 = __toESM(require("chalk"), 1);
-var import_dotenv = __toESM(require("dotenv"), 1);
-var import_json_schema_ref_parser = __toESM(require("@apidevtools/json-schema-ref-parser"), 1);
-
-// src/generator/spec-parser.ts
-function parseSpecToModules(spec) {
-  const modules = {};
-  for (const apiPath in spec.paths) {
-    for (const method in spec.paths[apiPath]) {
-      const endpoint = spec.paths[apiPath][method];
-      if (!endpoint.tags || endpoint.tags.length === 0) continue;
-      const tagName = endpoint.tags[0];
-      const moduleName = sanitizeTagName(tagName) + "Api";
-      if (!modules[moduleName]) {
-        const commonPath = apiPath.substring(0, apiPath.lastIndexOf("/"));
-        modules[moduleName] = { baseEndpoint: commonPath || "/", actions: {}, types: /* @__PURE__ */ new Set() };
-      }
-      const { inputType, outputType } = getInputOutputTypes(endpoint);
-      [inputType, outputType].forEach((t) => {
-        if (t && !["unknown", "undefined", "any", "QueryOptions", "Promise"].includes(t)) {
-          modules[moduleName].types.add(t.replace("[]", ""));
-        }
-      });
-      const actionName = sanitizeActionName(endpoint.operationId);
-      const relativePath = apiPath.replace(modules[moduleName].baseEndpoint, "") || "/";
-      modules[moduleName].actions[actionName] = {
-        method: method.toUpperCase(),
-        path: relativePath,
-        description: endpoint.summary || "No description available.",
-        hasQuery: (endpoint.parameters || []).some((p) => p.in === "query"),
-        autoFetch: method.toUpperCase() === "GET" && !apiPath.includes("{"),
-        invalidates: [],
-        _inputType: inputType,
-        _outputType: outputType
-      };
-    }
-  }
-  return modules;
-}
-function getInputOutputTypes(endpoint) {
-  const requestBodySchema = endpoint.requestBody?.content?.["application/json"]?.schema;
-  const successResponseSchema = endpoint.responses?.["200"]?.content?.["application/json"]?.schema || endpoint.responses?.["201"]?.content?.["application/json"]?.schema;
-  let outputType = "unknown";
-  if (successResponseSchema) {
-    if (successResponseSchema.$ref) {
-      outputType = refToTypeName(successResponseSchema.$ref);
-    } else if (successResponseSchema.type === "array" && successResponseSchema.items?.$ref) {
-      outputType = `${refToTypeName(successResponseSchema.items.$ref)}[]`;
-    }
-  }
-  let inputType = "undefined";
-  if (requestBodySchema) {
-    if (requestBodySchema.$ref) {
-      inputType = refToTypeName(requestBodySchema.$ref);
-    } else if (requestBodySchema.type === "object") {
-      inputType = "any";
-    }
-  } else if ((endpoint.parameters || []).some((p) => p.in === "query")) {
-    inputType = "QueryOptions";
-  }
-  return { inputType, outputType };
-}
-function sanitizeTagName(tagName) {
-  return tagName.replace(/[^a-zA-Z0-9]/g, "").replace(/Central|Tenant/g, "");
-}
-function sanitizeActionName(operationId) {
-  if (!operationId) return `unnamedAction_${Date.now()}`;
-  const name = operationId.split("_").slice(1).join("_");
-  return name.charAt(0).toLowerCase() + name.slice(1).replace(/_v\d+$/, "");
-}
-function refToTypeName(ref) {
-  if (!ref) return "unknown";
-  return ref.split("/").pop() || "unknown";
-}
-
-// src/generator/file-generator.ts
-var import_fs = __toESM(require("fs"), 1);
 var import_path = __toESM(require("path"), 1);
-var import_chalk = __toESM(require("chalk"), 1);
-var import_json_schema_to_typescript = require("json-schema-to-typescript");
-async function generateModuleFiles(moduleName, moduleData, spec, outputDir) {
-  console.log(import_chalk.default.cyan(`
-Generating module: ${moduleName}`));
-  const moduleFolderPath = import_path.default.join(outputDir, moduleName);
-  if (!import_fs.default.existsSync(moduleFolderPath)) {
-    import_fs.default.mkdirSync(moduleFolderPath, { recursive: true });
-  }
-  await generateTypesFile(moduleFolderPath, moduleName, moduleData.types, spec);
-  await generateConfigFile(moduleFolderPath, moduleName, moduleData);
-}
-async function generateTypesFile(moduleFolderPath, moduleName, typeNames, spec) {
-  const typesCount = typeNames.size;
-  if (typesCount === 0) {
-    console.log(import_chalk.default.yellow(`  - No types found for this module. types.ts will be empty.`));
-  } else {
-    console.log(import_chalk.default.gray(`  - Found ${typesCount} types to generate for types.ts...`));
-  }
-  let typesContent = `// This file is auto-generated by the API generator. Do not edit.
-
-`;
-  const allSchemas = spec.components?.schemas || {};
-  for (const typeName of typeNames) {
-    const schema = allSchemas[typeName];
-    if (schema) {
-      try {
-        const tsType = await (0, import_json_schema_to_typescript.compile)(schema, typeName, {
-          bannerComment: "",
-          additionalProperties: false,
-          style: {
-            bracketSpacing: true,
-            printWidth: 120,
-            semi: true,
-            singleQuote: true,
-            tabWidth: 2,
-            trailingComma: "es5",
-            useTabs: false
-          }
-        });
-        typesContent += tsType + "\n";
-      } catch (compileError) {
-        console.error(import_chalk.default.red(`  - Error compiling type "${typeName}" for module "${moduleName}":`));
-        console.error(import_chalk.default.red(`    ${compileError.message}`));
-      }
-    } else {
-      console.log(import_chalk.default.yellow(`  - Warning: Schema for type "${typeName}" not found in dereferenced spec, skipping.`));
-    }
-  }
-  const typesFilePath = import_path.default.join(moduleFolderPath, "types.ts");
-  import_fs.default.writeFileSync(typesFilePath, typesContent);
-}
-async function generateConfigFile(moduleFolderPath, moduleName, moduleData) {
-  const typeNamesArray = [...moduleData.types];
-  const actionsCount = Object.keys(moduleData.actions).length;
-  console.log(import_chalk.default.gray(`  - Found ${actionsCount} actions to generate for config.ts...`));
-  const typesImportStatement = typeNamesArray.length > 0 ? `import type { ${typeNamesArray.join(", ")} } from './types';` : ``;
-  const actionsTypeParts = Object.entries(moduleData.actions).map(
-    ([actionName, actionData]) => `  ${actionName}: ActionConfigModule<${actionData._inputType}, ${actionData._outputType}>;`
-  );
-  const actionsTypeDefinition = `{
-${actionsTypeParts.join("\n")}
-}`;
-  const actionsValueParts = Object.entries(moduleData.actions).map(
-    ([actionName, actionData]) => {
-      const { _inputType, _outputType, ...config } = actionData;
-      return `    ${actionName}: ${JSON.stringify(config, null, 2).replace(/\n/g, "\n    ")}`;
-    }
-  );
-  const actionsValueDefinition = `{
-${actionsValueParts.join(",\n")}
-  }`;
-  const configContent = `
-import type { ApiModuleConfig, ActionConfigModule, QueryOptions } from 'api-core-lib';
-${typesImportStatement}
-
-export const ${moduleName}Module: ApiModuleConfig<${actionsTypeDefinition}> = {
-  baseEndpoint: '${moduleData.baseEndpoint}',
-  actions: ${actionsValueDefinition},
-};
-`;
-  const configFilePath = import_path.default.join(moduleFolderPath, "config.ts");
-  import_fs.default.writeFileSync(configFilePath, configContent);
-}
-
-// src/generator/spec-preprocessor.ts
-function toPascalCase(str) {
-  return str.replace(/_v\d+$/, "").split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
-}
-function normalizeSchema(schema, schemas, baseName, suffix) {
-  if (!schema) return schema;
-  if (schema.$ref) return schema;
-  if (schema.type === "object" && schema.properties) {
-    const typeName = `${toPascalCase(baseName)}${suffix}Dto`;
-    if (!schemas[typeName]) {
-      schemas[typeName] = schema;
-    }
-    return { $ref: `#/components/schemas/${typeName}` };
-  }
-  if (schema.type === "array" && schema.items) {
-    schema.items = normalizeSchema(schema.items, schemas, baseName, suffix.replace("[]", ""));
-    return schema;
-  }
-  return schema;
-}
-function preprocessSpec(spec) {
-  if (!spec.components) spec.components = {};
-  if (!spec.components.schemas) spec.components.schemas = {};
-  for (const apiPath in spec.paths) {
-    for (const method in spec.paths[apiPath]) {
-      const endpoint = spec.paths[apiPath][method];
-      const operationId = endpoint.operationId;
-      if (!operationId) continue;
-      const requestBodySchema = endpoint.requestBody?.content?.["application/json"]?.schema;
-      if (requestBodySchema) {
-        endpoint.requestBody.content["application/json"].schema = normalizeSchema(
-          requestBodySchema,
-          spec.components.schemas,
-          operationId,
-          "Request"
-        );
-      }
-      if (endpoint.responses) {
-        for (const statusCode in endpoint.responses) {
-          const responseSchema = endpoint.responses[statusCode]?.content?.["application/json"]?.schema;
-          if (responseSchema) {
-            endpoint.responses[statusCode].content["application/json"].schema = normalizeSchema(
-              responseSchema,
-              spec.components.schemas,
-              operationId,
-              "Response"
-            );
-          }
-        }
-      }
-    }
-  }
-  return spec;
-}
 
 // src/generator/index.ts
+var import_chalk = __toESM(require("chalk"), 1);
+var import_dotenv = __toESM(require("dotenv"), 1);
+var import_openapi_typescript_codegen = require("openapi-typescript-codegen");
 async function runGenerator(options) {
-  console.log(import_chalk2.default.cyan.bold("\u{1F680} Starting API Core Lib Code Generator..."));
-  console.log(import_chalk2.default.gray(`Output directory: ${options.output}`));
-  console.log(import_chalk2.default.gray(`.env path: ${options.envPath}`));
-  console.log("\n" + import_chalk2.default.blue("Step 1: Loading environment variables..."));
+  console.log(import_chalk.default.cyan.bold("\u{1F680} Starting API Client Generation..."));
+  console.log(import_chalk.default.gray(`Output directory: ${options.output}`));
+  console.log(import_chalk.default.gray(`.env path: ${options.envPath}`));
+  console.log("\n" + import_chalk.default.blue("Step 1: Loading environment variables..."));
   import_dotenv.default.config({ path: options.envPath });
   const specUrl = getSpecUrl();
-  console.log(import_chalk2.default.green("\u2713 Environment variables loaded."));
+  console.log(import_chalk.default.green("\u2713 Environment variables loaded successfully."));
+  console.log(import_chalk.default.gray(`Fetching spec from: ${specUrl}`));
   try {
-    console.log("\n" + import_chalk2.default.blue(`Step 2: Fetching OpenAPI spec from ${specUrl}...`));
-    const response = await import_axios.default.get(specUrl, { timeout: 15e3 });
-    const originalSpec = response.data;
-    if (!originalSpec.openapi || !originalSpec.paths) {
-      throw new Error('Invalid OpenAPI specification file. "openapi" or "paths" property is missing.');
-    }
-    console.log(import_chalk2.default.green("\u2713 OpenAPI spec fetched successfully."));
-    console.log(import_chalk2.default.blue("Step 2.2: Preprocessing spec to normalize schemas..."));
-    const normalizedSpec = preprocessSpec(originalSpec);
-    console.log(import_chalk2.default.green("\u2713 Spec has been normalized successfully."));
-    console.log(import_chalk2.default.blue("Step 2.5: Dereferencing all $refs in the spec..."));
-    const dereferencedSpec = await import_json_schema_ref_parser.default.dereference(normalizedSpec);
-    console.log(import_chalk2.default.green("\u2713 Spec dereferenced successfully."));
-    console.log("\n" + import_chalk2.default.blue("Step 3: Parsing spec and generating API modules..."));
-    const modules = parseSpecToModules(normalizedSpec);
-    const modulesCount = Object.keys(modules).length;
-    console.log(import_chalk2.default.gray(`Found ${modulesCount} modules to generate...`));
-    if (modulesCount === 0) {
-      console.log(import_chalk2.default.yellow("Warning: No modules found."));
-    }
-    const modulesOutputPath = import_path2.default.join(options.output, "modules");
-    for (const moduleName in modules) {
-      const moduleData = modules[moduleName];
-      await generateModuleFiles(moduleName, moduleData, dereferencedSpec, modulesOutputPath);
-    }
-    if (modulesCount > 0) {
-      console.log(import_chalk2.default.green("\u2713 All custom modules generated."));
-    }
-    console.log(import_chalk2.default.bold.green("\n\u{1F389} API generation complete! All files are located in:"));
-    console.log(import_chalk2.default.bold.cyan(options.output));
+    console.log("\n" + import_chalk.default.blue("Step 2: Generating API client from OpenAPI spec..."));
+    await (0, import_openapi_typescript_codegen.generate)({
+      input: specUrl,
+      // مسار ملف المواصفات أو الرابط المباشر
+      output: options.output,
+      // مجلد المخرجات الرئيسي
+      clientName: "ApiClient",
+      // يمكنك تسمية العميل الرئيسي (اختياري)
+      useOptions: true,
+      // يضيف خيارات إضافية للدوال (مثل الفلاتر والترتيب)
+      useUnionTypes: false,
+      // استخدم الواجهات (interfaces) بدلاً من أنواع الاتحاد (union types)
+      exportSchemas: true,
+      // يقوم بتصدير جميع الـ schemas في ملف models.ts
+      exportServices: true
+      // يقوم بتوليد services بناءً على الـ tags
+    });
+    console.log(import_chalk.default.bold.green("\n\u{1F389} API client generation complete!"));
+    console.log(import_chalk.default.bold.cyan(`All files are located in: ${options.output}`));
   } catch (error) {
     handleGenerationError(error);
   }
@@ -295,24 +67,25 @@ async function runGenerator(options) {
 function getSpecUrl() {
   const specUrl = process.env.OPENAPI_SPEC_URL || (process.env.API_URL ? `${process.env.API_URL}/docs-json` : null) || (process.env.NEXT_PUBLIC_API_URL ? `${process.env.NEXT_PUBLIC_API_URL}/docs-json` : null);
   if (!specUrl) {
-    console.error(import_chalk2.default.red.bold("\n\u274C Error: API specification URL not found."));
+    console.error(import_chalk.default.red.bold("\n\u274C Error: API specification URL not found."));
+    console.log(import_chalk.default.yellow("Please set OPENAPI_SPEC_URL, API_URL, or NEXT_PUBLIC_API_URL in your .env file."));
     process.exit(1);
   }
   return specUrl;
 }
 function handleGenerationError(error) {
-  console.error(import_chalk2.default.red.bold("\n\u274C An error occurred during generation:"));
-  console.error(import_chalk2.default.red(`Error Message: ${error.message}`));
+  console.error(import_chalk.default.red.bold("\n\u274C An error occurred during generation:"));
+  console.error(import_chalk.default.red(error.message || "An unknown error occurred."));
   if (error.stack) {
-    console.error(import_chalk2.default.gray(error.stack));
+    console.error(import_chalk.default.gray(error.stack));
   }
   process.exit(1);
 }
 
 // src/cli.ts
 console.log("API Core Lib - Code Generator");
-import_commander.program.option("-o, --output <path>", "Output directory for generated files", "src/lib/api-generated").option("--env-path <path>", ".env file path", import_path3.default.resolve(process.cwd(), ".env")).action((options) => {
-  const absoluteOutputPath = import_path3.default.resolve(process.cwd(), options.output);
+import_commander.program.option("-o, --output <path>", "Output directory for generated files", "src/lib/api-generated").option("--env-path <path>", ".env file path", import_path.default.resolve(process.cwd(), ".env")).action((options) => {
+  const absoluteOutputPath = import_path.default.resolve(process.cwd(), options.output);
   runGenerator({ ...options, output: absoluteOutputPath });
 });
 import_commander.program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-core-lib",
-  "version": "12.0.56",
+  "version": "12.0.58",
   "description": "A flexible and powerful API client library for modern web applications.",
   "type": "module",
   "exports": {
@@ -46,6 +46,7 @@
     "fs-extra": "^11.3.1",
     "json-schema-to-typescript": "^15.0.4",
     "openapi-typescript": "^6.2.4",
+    "openapi-typescript-codegen": "^0.29.0",
     "path": "^0.12.7",
     "uuid": "^9.0.1"
   },