ng-openapi 0.1.8-pr-14-bugfix-working-directory-ee4104d.0 → 0.1.8

package/cli.cjs

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/lib/cli.ts
 var import_commander = require("commander");
-var path10 = __toESM(require("path"));
+var path11 = __toESM(require("path"));
 var fs4 = __toESM(require("fs"));
 
 // src/lib/core/generator.ts
@@ -212,12 +212,12 @@ function extractPaths(swaggerPaths = {}, methods = [
   "head"
 ]) {
   const paths = [];
-  Object.entries(swaggerPaths).forEach(([path11, pathItem]) => {
+  Object.entries(swaggerPaths).forEach(([path12, pathItem]) => {
     methods.forEach((method) => {
       if (pathItem[method]) {
         const operation = pathItem[method];
         paths.push({
-          path: path11,
+          path: path12,
           method: method.toUpperCase(),
           operationId: operation.operationId,
           summary: operation.summary,
@@ -426,6 +426,22 @@ var BASE_INTERCEPTOR_HEADER_COMMENT = /* @__PURE__ */ __name((clientName) => def
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var yaml = __toESM(require("js-yaml"));
+
+// ../shared/src/utils/functions/is-url.ts
+function isUrl(input) {
+  try {
+    const url = new URL(input);
+    return [
+      "http:",
+      "https:"
+    ].includes(url.protocol);
+  } catch {
+    return false;
+  }
+}
+__name(isUrl, "isUrl");
+
+// ../shared/src/core/swagger-parser.ts
 var SwaggerParser = class _SwaggerParser {
   static {
     __name(this, "SwaggerParser");
@@ -444,20 +460,12 @@ var SwaggerParser = class _SwaggerParser {
     return new _SwaggerParser(spec, config);
   }
   static async loadContent(pathOrUrl) {
-    if (_SwaggerParser.isUrl(pathOrUrl)) {
+    if (isUrl(pathOrUrl)) {
       return await _SwaggerParser.fetchUrlContent(pathOrUrl);
     } else {
       return fs.readFileSync(pathOrUrl, "utf8");
     }
   }
-  static isUrl(input) {
-    try {
-      new URL(input);
-      return true;
-    } catch {
-      return false;
-    }
-  }
   static async fetchUrlContent(url) {
     try {
       const response = await fetch(url, {
@@ -489,7 +497,7 @@ var SwaggerParser = class _SwaggerParser {
   }
   static parseSpecContent(content, pathOrUrl) {
     let format;
-    if (_SwaggerParser.isUrl(pathOrUrl)) {
+    if (isUrl(pathOrUrl)) {
       const urlPath = new URL(pathOrUrl).pathname.toLowerCase();
       if (urlPath.endsWith(".json")) {
         format = "json";
@@ -2168,12 +2176,12 @@ var ServiceGenerator = class _ServiceGenerator {
   }
   groupPathsByController(paths) {
     const groups = {};
-    paths.forEach((path11) => {
+    paths.forEach((path12) => {
       let controllerName = "Default";
-      if (path11.tags && path11.tags.length > 0) {
-        controllerName = path11.tags[0];
+      if (path12.tags && path12.tags.length > 0) {
+        controllerName = path12.tags[0];
       } else {
-        const pathParts = path11.path.split("/").filter((p) => p && !p.startsWith("{"));
+        const pathParts = path12.path.split("/").filter((p) => p && !p.startsWith("{"));
         if (pathParts.length > 1) {
           controllerName = pascalCase(pathParts[1]);
         }
@@ -2182,7 +2190,7 @@ var ServiceGenerator = class _ServiceGenerator {
       if (!groups[controllerName]) {
         groups[controllerName] = [];
       }
-      groups[controllerName].push(path11);
+      groups[controllerName].push(path12);
     });
     return groups;
   }
@@ -2337,28 +2345,22 @@ var ServiceIndexGenerator = class {
 
 // src/lib/core/generator.ts
 var fs3 = __toESM(require("fs"));
-function isUrl(input) {
-  try {
-    new URL(input);
-    return true;
-  } catch {
-    return false;
+var path10 = __toESM(require("path"));
+function validateInput(inputPath) {
+  if (isUrl(inputPath)) {
+    return;
   }
-}
-__name(isUrl, "isUrl");
-function validateInput(input) {
-  if (isUrl(input)) {
-    const url = new URL(input);
-    if (![
-      "http:",
-      "https:"
-    ].includes(url.protocol)) {
-      throw new Error(`Unsupported URL protocol: ${url.protocol}. Only HTTP and HTTPS are supported.`);
-    }
-  } else {
-    if (!fs3.existsSync(input)) {
-      throw new Error(`Input file not found: ${input}`);
-    }
+  if (!fs3.existsSync(inputPath)) {
+    throw new Error(`Input file not found: ${inputPath}`);
+  }
+  const extension = path10.extname(inputPath).toLowerCase();
+  const supportedExtensions = [
+    ".json",
+    ".yaml",
+    ".yml"
+  ];
+  if (!supportedExtensions.includes(extension)) {
+    throw new Error(`Failed to parse ${extension || "specification"}. Supported formats are .json, .yaml, and .yml.`);
   }
 }
 __name(validateInput, "validateInput");
@@ -2442,7 +2444,7 @@ var version = "0.1.7";
 // src/lib/cli.ts
 var program = new import_commander.Command();
 async function loadConfigFile(configPath) {
-  const resolvedPath = path10.resolve(configPath);
+  const resolvedPath = path11.resolve(configPath);
   if (!fs4.existsSync(resolvedPath)) {
     throw new Error(`Configuration file not found: ${resolvedPath}`);
   }
@@ -2456,12 +2458,12 @@ async function loadConfigFile(configPath) {
     if (!config.input || !config.output) {
       throw new Error('Configuration must include "input" and "output" properties');
     }
-    const configDir = path10.dirname(resolvedPath);
-    if (!isUrl2(config.input) && !path10.isAbsolute(config.input)) {
-      config.input = path10.resolve(configDir, config.input);
+    const configDir = path11.dirname(resolvedPath);
+    if (!isUrl(config.input) && !path11.isAbsolute(config.input)) {
+      config.input = path11.resolve(configDir, config.input);
     }
-    if (!path10.isAbsolute(config.output)) {
-      config.output = path10.resolve(configDir, config.output);
+    if (!path11.isAbsolute(config.output)) {
+      config.output = path11.resolve(configDir, config.output);
     }
     return config;
   } catch (error) {
@@ -2469,65 +2471,12 @@ async function loadConfigFile(configPath) {
   }
 }
 __name(loadConfigFile, "loadConfigFile");
-function validateInputExtension(inputPath) {
-  const extension = path10.extname(inputPath).toLowerCase();
-  const supportedExtensions = [
-    ".json",
-    ".yaml",
-    ".yml"
-  ];
-  if (!supportedExtensions.includes(extension)) {
-    throw new Error(`Failed to parse ${extension || "specification"}. Supported formats are .json, .yaml, and .yml.`);
-  }
-}
-__name(validateInputExtension, "validateInputExtension");
-function isUrl2(input) {
-  try {
-    new URL(input);
-    return true;
-  } catch {
-    return false;
-  }
-}
-__name(isUrl2, "isUrl");
-function validateInput2(inputPath) {
-  if (isUrl2(inputPath)) {
-    const url = new URL(inputPath);
-    if (![
-      "http:",
-      "https:"
-    ].includes(url.protocol)) {
-      throw new Error(`Unsupported URL protocol: ${url.protocol}. Only HTTP and HTTPS are supported.`);
-    }
-    return;
-  }
-  if (!fs4.existsSync(inputPath)) {
-    throw new Error(`Input file not found: ${inputPath}`);
-  }
-  const extension = path10.extname(inputPath).toLowerCase();
-  const supportedExtensions = [
-    ".json",
-    ".yaml",
-    ".yml"
-  ];
-  if (!supportedExtensions.includes(extension)) {
-    throw new Error(`Failed to parse ${extension || "specification"}. Supported formats are .json, .yaml, and .yml.`);
-  }
-}
-__name(validateInput2, "validateInput");
 async function generateFromOptions(options) {
   try {
     if (options.config) {
       const config = await loadConfigFile(options.config);
-      if (!isUrl2(config.input)) {
-        if (!fs4.existsSync(config.input)) {
-          throw new Error(`Input file not found: ${config.input}`);
-        }
-        validateInputExtension(config.input);
-      }
       await generateFromConfig(config);
     } else if (options.input) {
-      validateInput2(options.input);
       const config = {
         input: options.input,
         output: options.output || "./src/generated",

package/index.d.ts

@@ -149,7 +149,6 @@ declare class SwaggerParser {
     private constructor();
     static create(swaggerPathOrUrl: string, config: GeneratorConfig): Promise<SwaggerParser>;
     private static loadContent;
-    private static isUrl;
     private static fetchUrlContent;
     private static parseSpecContent;
     private static detectFormat;
@@ -270,9 +269,13 @@ declare const PROVIDER_GENERATOR_HEADER_COMMENT: string;
 declare const BASE_INTERCEPTOR_HEADER_COMMENT: (clientName: string) => string;
 declare const HTTP_RESOURCE_GENERATOR_HEADER_COMMENT: (resourceName: string) => string;
 
+/**
+ * Validates input (file or URL)
+ */
+declare function validateInput(inputPath: string): void;
 /**
  * Generates Angular services and types from a configuration object
  */
 declare function generateFromConfig(config: GeneratorConfig): Promise<void>;
 
-export { BASE_INTERCEPTOR_HEADER_COMMENT, type EnumValueObject, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type IPluginGenerator, type IPluginGeneratorClass, type IPluginGeneratorConstructor, MAIN_INDEX_GENERATOR_HEADER_COMMENT, type MethodGenerationContext, type NgOpenapiClientConfig, PROVIDER_GENERATOR_HEADER_COMMENT, type Parameter, type PathInfo, type RequestBody, SERVICE_GENERATOR_HEADER_COMMENT, SERVICE_INDEX_GENERATOR_HEADER_COMMENT, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, TYPE_GENERATOR_HEADER_COMMENT, type TypeSchema, camelCase, collectUsedTypes, escapeString, extractPaths, generateFromConfig, getBasePathTokenName, getClientContextTokenName, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isPrimitiveType, kebabCase, nullableType, pascalCase, type placeHolder };
+export { BASE_INTERCEPTOR_HEADER_COMMENT, type EnumValueObject, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type IPluginGenerator, type IPluginGeneratorClass, type IPluginGeneratorConstructor, MAIN_INDEX_GENERATOR_HEADER_COMMENT, type MethodGenerationContext, type NgOpenapiClientConfig, PROVIDER_GENERATOR_HEADER_COMMENT, type Parameter, type PathInfo, type RequestBody, SERVICE_GENERATOR_HEADER_COMMENT, SERVICE_INDEX_GENERATOR_HEADER_COMMENT, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, TYPE_GENERATOR_HEADER_COMMENT, type TypeSchema, camelCase, collectUsedTypes, escapeString, extractPaths, generateFromConfig, getBasePathTokenName, getClientContextTokenName, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isPrimitiveType, kebabCase, nullableType, pascalCase, type placeHolder, validateInput };

package/index.js

@@ -96,7 +96,8 @@ __export(index_exports, {
   isPrimitiveType: () => isPrimitiveType,
   kebabCase: () => kebabCase,
   nullableType: () => nullableType,
-  pascalCase: () => pascalCase
+  pascalCase: () => pascalCase,
+  validateInput: () => validateInput
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -288,12 +289,12 @@ function extractPaths(swaggerPaths = {}, methods = [
   "head"
 ]) {
   const paths = [];
-  Object.entries(swaggerPaths).forEach(([path10, pathItem]) => {
+  Object.entries(swaggerPaths).forEach(([path11, pathItem]) => {
     methods.forEach((method) => {
       if (pathItem[method]) {
         const operation = pathItem[method];
         paths.push({
-          path: path10,
+          path: path11,
           method: method.toUpperCase(),
           operationId: operation.operationId,
           summary: operation.summary,
@@ -508,6 +509,22 @@ var HTTP_RESOURCE_GENERATOR_HEADER_COMMENT = /* @__PURE__ */ __name((resourceNam
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var yaml = __toESM(require("js-yaml"));
+
+// ../shared/src/utils/functions/is-url.ts
+function isUrl(input) {
+  try {
+    const url = new URL(input);
+    return [
+      "http:",
+      "https:"
+    ].includes(url.protocol);
+  } catch (e) {
+    return false;
+  }
+}
+__name(isUrl, "isUrl");
+
+// ../shared/src/core/swagger-parser.ts
 var _SwaggerParser = class _SwaggerParser {
   constructor(spec, config) {
     __publicField(this, "spec");
@@ -527,21 +544,13 @@ var _SwaggerParser = class _SwaggerParser {
   }
   static loadContent(pathOrUrl) {
     return __async(this, null, function* () {
-      if (_SwaggerParser.isUrl(pathOrUrl)) {
+      if (isUrl(pathOrUrl)) {
         return yield _SwaggerParser.fetchUrlContent(pathOrUrl);
       } else {
         return fs.readFileSync(pathOrUrl, "utf8");
       }
     });
   }
-  static isUrl(input) {
-    try {
-      new URL(input);
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
   static fetchUrlContent(url) {
     return __async(this, null, function* () {
       try {
@@ -575,7 +584,7 @@ var _SwaggerParser = class _SwaggerParser {
   }
   static parseSpecContent(content, pathOrUrl) {
     let format;
-    if (_SwaggerParser.isUrl(pathOrUrl)) {
+    if (isUrl(pathOrUrl)) {
       const urlPath = new URL(pathOrUrl).pathname.toLowerCase();
       if (urlPath.endsWith(".json")) {
         format = "json";
@@ -2261,12 +2270,12 @@ var _ServiceGenerator = class _ServiceGenerator {
   }
   groupPathsByController(paths) {
     const groups = {};
-    paths.forEach((path10) => {
+    paths.forEach((path11) => {
       let controllerName = "Default";
-      if (path10.tags && path10.tags.length > 0) {
-        controllerName = path10.tags[0];
+      if (path11.tags && path11.tags.length > 0) {
+        controllerName = path11.tags[0];
       } else {
-        const pathParts = path10.path.split("/").filter((p) => p && !p.startsWith("{"));
+        const pathParts = path11.path.split("/").filter((p) => p && !p.startsWith("{"));
         if (pathParts.length > 1) {
           controllerName = pascalCase(pathParts[1]);
         }
@@ -2275,7 +2284,7 @@ var _ServiceGenerator = class _ServiceGenerator {
       if (!groups[controllerName]) {
         groups[controllerName] = [];
       }
-      groups[controllerName].push(path10);
+      groups[controllerName].push(path11);
     });
     return groups;
   }
@@ -2431,28 +2440,22 @@ var ServiceIndexGenerator = _ServiceIndexGenerator;
 
 // src/lib/core/generator.ts
 var fs3 = __toESM(require("fs"));
-function isUrl(input) {
-  try {
-    new URL(input);
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-__name(isUrl, "isUrl");
-function validateInput(input) {
-  if (isUrl(input)) {
-    const url = new URL(input);
-    if (![
-      "http:",
-      "https:"
-    ].includes(url.protocol)) {
-      throw new Error(`Unsupported URL protocol: ${url.protocol}. Only HTTP and HTTPS are supported.`);
-    }
-  } else {
-    if (!fs3.existsSync(input)) {
-      throw new Error(`Input file not found: ${input}`);
-    }
+var path10 = __toESM(require("path"));
+function validateInput(inputPath) {
+  if (isUrl(inputPath)) {
+    return;
+  }
+  if (!fs3.existsSync(inputPath)) {
+    throw new Error(`Input file not found: ${inputPath}`);
+  }
+  const extension = path10.extname(inputPath).toLowerCase();
+  const supportedExtensions = [
+    ".json",
+    ".yaml",
+    ".yml"
+  ];
+  if (!supportedExtensions.includes(extension)) {
+    throw new Error(`Failed to parse ${extension || "specification"}. Supported formats are .json, .yaml, and .yml.`);
   }
 }
 __name(validateInput, "validateInput");
@@ -2556,6 +2559,7 @@ __name(generateFromConfig, "generateFromConfig");
   isPrimitiveType,
   kebabCase,
   nullableType,
-  pascalCase
+  pascalCase,
+  validateInput
 });
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-openapi",
-  "version": "0.1.8-pr-14-bugfix-working-directory-ee4104d.0",
+  "version": "0.1.8",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "ng-openapi",