@fern-api/fern-api-dev 3.35.0 → 3.35.1-1-gaf5a5a0d49

package/cli.cjs

@@ -1401583,7 +1401583,8 @@ function parseDeprecatedApiDefinitionSettingsSchema(settings) {
     onlyIncludeReferencedSchemas: settings?.["only-include-referenced-schemas"],
     inlinePathParameters: settings?.["inline-path-parameters"],
     shouldUseIdiomaticRequestNames: settings?.["idiomatic-request-names"],
-    removeDiscriminantsFromSchemas: parseRemoveDiscriminantsFromSchemas(settings?.["remove-discriminants-from-schemas"])
+    removeDiscriminantsFromSchemas: parseRemoveDiscriminantsFromSchemas(settings?.["remove-discriminants-from-schemas"]),
+    pathParameterOrder: settings?.["path-parameter-order"]
   };
 }
 function parseOpenApiDefinitionSettingsSchema(settings) {
@@ -1401606,7 +1401607,8 @@ function parseOpenApiDefinitionSettingsSchema(settings) {
     resolveAliases: settings?.["resolve-aliases"],
     groupMultiApiEnvironments: settings?.["group-multi-api-environments"],
     groupEnvironmentsByHost: settings?.["group-environments-by-host"],
-    defaultIntegerFormat: settings?.["default-integer-format"]
+    defaultIntegerFormat: settings?.["default-integer-format"],
+    pathParameterOrder: settings?.["path-parameter-order"]
   };
 }
 function parseAsyncApiDefinitionSettingsSchema(settings) {
@@ -1413765,7 +1413767,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "3.35.0",
+          version: "3.35.1-1-gaf5a5a0d49",
           usingAccessToken: true
         }
       });
@@ -1413864,7 +1413866,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "3.35.0",
+        version: "3.35.1-1-gaf5a5a0d49",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -1493968,7 +1493970,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "3.35.0";
+    return "3.35.1-1-gaf5a5a0d49";
   }
   getCliName() {
     if (false) {
@@ -1511055,6 +1511057,7 @@ var BaseOpenAPIWorkspace = class extends AbstractAPIWorkspace {
   groupEnvironmentsByHost;
   removeDiscriminantsFromSchemas;
   defaultIntegerFormat;
+  pathParameterOrder;
   converter;
   constructor(args) {
     super(args);
@@ -1511074,6 +1511077,7 @@ var BaseOpenAPIWorkspace = class extends AbstractAPIWorkspace {
     this.groupEnvironmentsByHost = args.groupEnvironmentsByHost;
     this.removeDiscriminantsFromSchemas = args.removeDiscriminantsFromSchemas;
     this.defaultIntegerFormat = args.defaultIntegerFormat;
+    this.pathParameterOrder = args.pathParameterOrder;
     this.converter = new FernDefinitionConverter(args);
   }
   async getDefinition({ context: context2, absoluteFilePath, relativePathToDependency }, settings) {
@@ -1511616,7 +1511620,8 @@ var DEFAULT_PARSE_OPENAPI_SETTINGS = {
   wrapReferencesToNullableInOptional: false,
   coerceOptionalSchemasToNullable: false,
   removeDiscriminantsFromSchemas: generators_yml_exports.RemoveDiscriminantsFromSchemas.Always,
-  defaultIntegerFormat: generators_yml_exports.DefaultIntegerFormat.Int32
+  defaultIntegerFormat: generators_yml_exports.DefaultIntegerFormat.Int32,
+  pathParameterOrder: generators_yml_exports.PathParameterOrder.UrlOrder
 };
 function mergeOptions2(params2) {
   const { defaults: defaults3, options: options2, overrides, overrideOnly = /* @__PURE__ */ new Set(), undefinedIfAbsent = /* @__PURE__ */ new Set() } = params2;
@@ -1519638,50 +1519643,94 @@ function convertHttpOperation({ operationContext, context: context2, responseSta
   });
   const PATH_PARAM_REGEX2 = /{([^}]+)}/g;
   const paramNamesInUrlOrder = [...path68.matchAll(PATH_PARAM_REGEX2)].map((match3) => match3[1]).filter((paramName) => paramName !== void 0);
-  if (paramNamesInUrlOrder.length > 0) {
-    const urlParams = new Map(convertedParameters.pathParameters.map((param) => [param.name, param]));
-    const reorderedPathParameters = [];
-    const usedParams = /* @__PURE__ */ new Set();
-    for (const paramName of paramNamesInUrlOrder) {
-      const urlParam = urlParams.get(paramName);
-      usedParams.add(paramName);
-      if (urlParam) {
-        reorderedPathParameters.push(urlParam);
-      } else {
-        reorderedPathParameters.push({
-          name: paramName,
-          variableReference: void 0,
-          parameterNameOverride: void 0,
-          availability: void 0,
-          source: source2,
-          schema: SchemaWithExample.primitive({
-            schema: PrimitiveSchemaValueWithExample.string({
-              default: void 0,
-              example: void 0,
-              format: void 0,
-              maxLength: void 0,
-              minLength: void 0,
-              pattern: void 0
-            }),
-            description: void 0,
-            generatedName: "",
-            nameOverride: void 0,
-            namespace: void 0,
-            groupName: void 0,
-            availability: void 0,
-            title: void 0
-          }),
-          description: void 0,
-          explode: void 0
-        });
+  const pathParams = [...path68.matchAll(PATH_PARAM_REGEX2)].map((match3) => match3[1]);
+  switch (context2.options.pathParameterOrder) {
+    case generators_yml_exports.PathParameterOrder.SpecOrder:
+      {
+        const missingPathParams = pathParams.filter((param) => !convertedParameters.pathParameters.some((p9) => p9.name === param));
+        if (missingPathParams.length > 0) {
+          for (const param of missingPathParams) {
+            convertedParameters.pathParameters.push({
+              name: param ?? "",
+              variableReference: void 0,
+              parameterNameOverride: void 0,
+              availability: void 0,
+              source: source2,
+              schema: SchemaWithExample.primitive({
+                schema: PrimitiveSchemaValueWithExample.string({
+                  default: void 0,
+                  example: void 0,
+                  format: void 0,
+                  maxLength: void 0,
+                  minLength: void 0,
+                  pattern: void 0
+                }),
+                description: void 0,
+                generatedName: "",
+                nameOverride: void 0,
+                namespace: void 0,
+                groupName: void 0,
+                availability: void 0,
+                title: void 0
+              }),
+              description: void 0,
+              explode: void 0
+            });
+          }
+        }
       }
-    }
-    for (const param of convertedParameters.pathParameters) {
-      if (!usedParams.has(param.name)) {
-        reorderedPathParameters.push(param);
+      break;
+    case generators_yml_exports.PathParameterOrder.UrlOrder:
+      {
+        if (paramNamesInUrlOrder.length > 0) {
+          const urlParams = new Map(convertedParameters.pathParameters.map((param) => [param.name, param]));
+          const reorderedPathParameters = [];
+          const usedParams = /* @__PURE__ */ new Set();
+          for (const paramName of paramNamesInUrlOrder) {
+            const urlParam = urlParams.get(paramName);
+            usedParams.add(paramName);
+            if (urlParam) {
+              reorderedPathParameters.push(urlParam);
+            } else {
+              reorderedPathParameters.push({
+                name: paramName,
+                variableReference: void 0,
+                parameterNameOverride: void 0,
+                availability: void 0,
+                source: source2,
+                schema: SchemaWithExample.primitive({
+                  schema: PrimitiveSchemaValueWithExample.string({
+                    default: void 0,
+                    example: void 0,
+                    format: void 0,
+                    maxLength: void 0,
+                    minLength: void 0,
+                    pattern: void 0
+                  }),
+                  description: void 0,
+                  generatedName: "",
+                  nameOverride: void 0,
+                  namespace: void 0,
+                  groupName: void 0,
+                  availability: void 0,
+                  title: void 0
+                }),
+                description: void 0,
+                explode: void 0
+              });
+            }
+          }
+          for (const param of convertedParameters.pathParameters) {
+            if (!usedParams.has(param.name)) {
+              reorderedPathParameters.push(param);
+            }
+          }
+          convertedParameters.pathParameters = reorderedPathParameters;
+        }
       }
-    }
-    convertedParameters.pathParameters = reorderedPathParameters;
+      break;
+    default:
+      assertNever(context2.options.pathParameterOrder);
   }
   let convertedRequests = (() => {
     if (operationContext.method === "GET") {
@@ -1521659,7 +1521708,8 @@ var FIELD_MAPPINGS = {
   wrapReferencesToNullableInOptional: "wrapReferencesToNullableInOptional",
   coerceOptionalSchemasToNullable: "coerceOptionalSchemasToNullable",
   removeDiscriminantsFromSchemas: "removeDiscriminantsFromSchemas",
-  defaultIntegerFormat: "defaultIntegerFormat"
+  defaultIntegerFormat: "defaultIntegerFormat",
+  pathParameterOrder: "pathParameterOrder"
 };
 function setIfDefined(target, key, value) {
   if (value !== void 0) {
@@ -1539387,7 +1539437,8 @@ var OSSWorkspace = class _OSSWorkspace extends BaseOpenAPIWorkspace {
       })(),
       exampleGeneration: specs[0]?.settings?.exampleGeneration,
       groupEnvironmentsByHost: specs.some((spec) => spec.settings?.groupEnvironmentsByHost),
-      defaultIntegerFormat: specs[0]?.settings?.defaultIntegerFormat
+      defaultIntegerFormat: specs[0]?.settings?.defaultIntegerFormat,
+      pathParameterOrder: specs[0]?.settings?.pathParameterOrder
     });
     this.specs = specs;
     this.allSpecs = allSpecs;
@@ -1539411,7 +1539462,8 @@ var OSSWorkspace = class _OSSWorkspace extends BaseOpenAPIWorkspace {
       removeDiscriminantsFromSchemas: this.removeDiscriminantsFromSchemas,
       groupMultiApiEnvironments: this.groupMultiApiEnvironments,
       groupEnvironmentsByHost: this.groupEnvironmentsByHost,
-      defaultIntegerFormat: this.defaultIntegerFormat
+      defaultIntegerFormat: this.defaultIntegerFormat,
+      pathParameterOrder: this.pathParameterOrder
     };
   }
   async getOpenAPIIr({ context: context2, relativePathToDependency }, settings) {
@@ -1563912,12 +1563964,12 @@ async function replaceReferencedCode({
         title5 = filepath.split("/").pop();
       }
       const allProps = /* @__PURE__ */ new Map();
-      const propsRegex = /(\w+)=(?:{([^}]+)}|"([^"]+)")/g;
+      const propsRegex = /(\w+)=(?:{([^}]+)}|"([^"]+)"|(\d+)(?=\s|\/|>|$))/g;
       const beforeSrcProps = matchString?.split("src=")[0]?.trim() ?? "";
       let propMatch;
       while ((propMatch = propsRegex.exec(beforeSrcProps)) !== null) {
         const propName = propMatch[1];
-        const propValue = propMatch[2] || propMatch[3];
+        const propValue = propMatch[2] || propMatch[3] || propMatch[4];
         const fromCurlyBraces = propMatch[2] !== void 0;
         if (propName && propValue) {
           allProps.set(propName, { value: propValue, fromCurlyBraces });
@@ -1563927,7 +1563979,7 @@ async function replaceReferencedCode({
       propsRegex.lastIndex = 0;
       while ((propMatch = propsRegex.exec(afterSrcProps)) !== null) {
         const propName = propMatch[1];
-        const propValue = propMatch[2] || propMatch[3];
+        const propValue = propMatch[2] || propMatch[3] || propMatch[4];
         const fromCurlyBraces = propMatch[2] !== void 0;
         if (propName && propValue) {
           allProps.set(propName, { value: propValue, fromCurlyBraces });
@@ -1588866,7 +1588918,7 @@ var import_path35 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version6 = "3.35.0";
+  const version6 = "3.35.1-1-gaf5a5a0d49";
   return `cli@${version6}`;
 }
 var DebugLogger = class {
@@ -1590299,12 +1590351,12 @@ async function replaceReferencedCode2({
         title5 = filepath.split("/").pop();
       }
       const allProps = /* @__PURE__ */ new Map();
-      const propsRegex = /(\w+)=(?:{([^}]+)}|"([^"]+)")/g;
+      const propsRegex = /(\w+)=(?:{([^}]+)}|"([^"]+)"|(\d+)(?=\s|\/|>|$))/g;
       const beforeSrcProps = matchString?.split("src=")[0]?.trim() ?? "";
       let propMatch;
       while ((propMatch = propsRegex.exec(beforeSrcProps)) !== null) {
         const propName = propMatch[1];
-        const propValue = propMatch[2] || propMatch[3];
+        const propValue = propMatch[2] || propMatch[3] || propMatch[4];
         const fromCurlyBraces = propMatch[2] !== void 0;
         if (propName && propValue) {
           allProps.set(propName, { value: propValue, fromCurlyBraces });
@@ -1590314,7 +1590366,7 @@ async function replaceReferencedCode2({
       propsRegex.lastIndex = 0;
       while ((propMatch = propsRegex.exec(afterSrcProps)) !== null) {
         const propName = propMatch[1];
-        const propValue = propMatch[2] || propMatch[3];
+        const propValue = propMatch[2] || propMatch[3] || propMatch[4];
         const fromCurlyBraces = propMatch[2] !== void 0;
         if (propName && propValue) {
           allProps.set(propName, { value: propValue, fromCurlyBraces });

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.35.0",
+  "version": "3.35.1-1-gaf5a5a0d49",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",