fern-api 0.34.0 → 0.35.0-rc0

package/bundle.cjs

@@ -1189910,7 +1189910,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.34.0",
+          version: "0.35.0-rc0",
           usingAccessToken: true
         }
       });
@@ -1189972,7 +1189972,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.34.0",
+        version: "0.35.0-rc0",
         ...event,
         ...event.properties
       }
@@ -1191569,6 +1191569,7 @@ async function parseYamlFiles(files) {
   function parseFilePath(file) {
     try {
       parsedFiles[file.relativeFilepath] = {
+        defaultUrl: void 0,
         contents: js_yaml_default.load(file.fileContents, {
           schema: js_yaml_default.CORE_SCHEMA
         }),
@@ -1192728,7 +1192729,7 @@ async function visitPackageMarkerYamlAst(contents, visitor) {
     channel: noop,
     export: async (export_) => {
       var _a5;
-      await ((_a5 = visitor.export) == null ? void 0 : _a5.call(visitor, export_, ["export"]));
+      await ((_a5 = visitor.export) == null ? void 0 : _a5.call(visitor, typeof export_ === "string" ? export_ : export_ == null ? void 0 : export_.dependency, ["export"]));
     },
     navigation: async (navigation) => {
       var _a5;
@@ -1192744,6 +1192745,7 @@ async function visitRootApiFileYamlAst(contents, visitor) {
   await visitObject(contents, {
     version: noop,
     name: noop,
+    "default-url": noop,
     "display-name": noop,
     imports: noop,
     auth: noop,
@@ -1203290,8 +1203292,12 @@ var DefinitionFileSchema = z.strictObject({
 });
 
 // pnp:/home/runner/work/fern/fern/packages/cli/yaml/yaml-schema/lib/schemas/file-schemas/PackageMarkerFileSchema.js
+var ExportSchema = z.object({
+  dependency: z.string(),
+  url: z.optional(z.string())
+});
 var PackageMarkerFileSchema = DefinitionFileSchema.extend({
-  export: z.optional(z.string()),
+  export: z.optional(z.union([z.string(), ExportSchema])),
   navigation: z.optional(z.union([z.string(), z.array(z.string())]))
 });
 
@@ -1203323,6 +1203329,7 @@ var RootApiFileSchema = z.strictObject({
   auth: z.optional(ApiAuthSchema),
   "auth-schemes": z.optional(z.record(AuthSchemeDeclarationSchema)),
   headers: z.optional(z.record(z.string(), HttpHeaderSchema)),
+  "default-url": z.optional(z.string()),
   "default-environment": z.optional(z.string().or(z.null())),
   environments: z.optional(z.record(z.string(), EnvironmentSchema)),
   "error-discrimination": z.optional(ErrorDiscriminationSchema),
@@ -1203923,14 +1203930,17 @@ async function processPackageMarkers({ dependenciesConfiguration, structuralVali
           };
         } else {
           const loadDependencyResult = await loadDependency({
-            dependencyName: packageMarker.contents.export,
+            dependencyName: typeof packageMarker.contents.export === "string" ? packageMarker.contents.export : packageMarker.contents.export.dependency,
             dependenciesConfiguration,
             context,
             rootApiFile: structuralValidationResult.rootApiFile.contents,
             cliVersion
           });
           if (loadDependencyResult.didSucceed) {
-            importedDefinitions[dirname(pathOfPackageMarker)] = loadDependencyResult.definition;
+            importedDefinitions[dirname(pathOfPackageMarker)] = {
+              definition: loadDependencyResult.definition,
+              url: typeof packageMarker.contents.export === "object" ? packageMarker.contents.export.url : void 0
+            };
           } else {
             failures[pathOfPackageMarker] = loadDependencyResult.failure;
           }
@@ -1203971,6 +1203981,7 @@ function validateStructureOfYamlFiles({ files, absolutePathToDefinition }) {
       const maybeValidFileContents = RootApiFileSchema.safeParse(parsedFileContents);
       if (maybeValidFileContents.success) {
         rootApiFile = {
+          defaultUrl: maybeValidFileContents.data["default-url"],
           contents: maybeValidFileContents.data,
           rawContents: file.rawContents
         };
@@ -1203981,6 +1203992,7 @@ function validateStructureOfYamlFiles({ files, absolutePathToDefinition }) {
       const maybeValidFileContents = PackageMarkerFileSchema.safeParse(parsedFileContents);
       if (maybeValidFileContents.success) {
         packageMarkers[relativeFilepath] = {
+          defaultUrl: typeof maybeValidFileContents.data.export === "object" ? maybeValidFileContents.data.export.url : void 0,
           contents: maybeValidFileContents.data,
           rawContents: file.rawContents
         };
@@ -1203991,6 +1204003,7 @@ function validateStructureOfYamlFiles({ files, absolutePathToDefinition }) {
       const maybeValidFileContents = DefinitionFileSchema.safeParse(parsedFileContents);
       if (maybeValidFileContents.success) {
         namesDefinitionFiles[relativeFilepath] = {
+          defaultUrl: void 0,
           contents: maybeValidFileContents.data,
           rawContents: file.rawContents,
           absoluteFilepath: join(absolutePathToDefinition, relativeFilepath)
@@ -1214291,6 +1214304,7 @@ var OSSWorkspace = class extends AbstractAPIWorkspace {
     return {
       absoluteFilepath: AbsoluteFilePath.of("/DUMMY_PATH"),
       rootApiFile: {
+        defaultUrl: definition3.rootApiFile["default-url"],
         contents: definition3.rootApiFile,
         rawContents: js_yaml_default.dump(definition3.rootApiFile)
       },
@@ -1214554,26 +1214568,30 @@ async function validateSchema2({ value, context, filepathBeingParsed }) {
 }
 
 // pnp:/home/runner/work/fern/fern/packages/cli/workspace-loader/lib/utils/getAllNamedDefinitionFiles.js
-function getAllNamedDefinitionFiles(definition3) {
+function getAllNamedDefinitionFiles(definition3, opts = {}) {
   return {
-    ...definition3.namedDefinitionFiles,
+    ...Object.fromEntries(entries(definition3.namedDefinitionFiles).map(([path44, file]) => {
+      return [path44, { ...file, defaultUrl: opts.defaultURL }];
+    })),
     ...entries(definition3.importedDefinitions).reduce((acc, [pathToImportedDefinition, definition4]) => {
       return {
         ...acc,
-        ...mapKeys_default(getAllNamedDefinitionFiles(definition4), (_file, path44) => join(pathToImportedDefinition, RelativeFilePath.of(path44)))
+        ...mapKeys_default(getAllNamedDefinitionFiles(definition4.definition, { defaultURL: definition4.url }), (_file, path44) => join(pathToImportedDefinition, RelativeFilePath.of(path44)))
       };
     }, {})
   };
 }
 
 // pnp:/home/runner/work/fern/fern/packages/cli/workspace-loader/lib/utils/getAllPackageMarkers.js
-function getAllPackageMarkers(definition3) {
+function getAllPackageMarkers(definition3, opts = {}) {
   return {
-    ...definition3.packageMarkers,
+    ...Object.fromEntries(entries(definition3.packageMarkers).map(([path44, file]) => {
+      return [path44, { ...file, defaultUrl: opts.defaultURL }];
+    })),
     ...entries(definition3.importedDefinitions).reduce((acc, [pathToImportedDefinition, definition4]) => {
       return {
         ...acc,
-        ...mapKeys_default(getAllPackageMarkers(definition4), (_file, path44) => join(pathToImportedDefinition, RelativeFilePath.of(path44)))
+        ...mapKeys_default(getAllPackageMarkers(definition4.definition, { defaultURL: definition4.url }), (_file, path44) => join(pathToImportedDefinition, RelativeFilePath.of(path44)))
       };
     }, {})
   };
@@ -1214598,7 +1214616,8 @@ var import_path22 = __toESM(require("path"));
 async function visitAllDefinitionFiles(workspace, visitor) {
   for (const [relativeFilepath, file] of entries(getAllDefinitionFiles(workspace.definition))) {
     await visitor(relativeFilepath, file.contents, {
-      isPackageMarker: import_path22.default.basename(relativeFilepath) === FERN_PACKAGE_MARKER_FILENAME
+      isPackageMarker: import_path22.default.basename(relativeFilepath) === FERN_PACKAGE_MARKER_FILENAME,
+      defaultUrl: file.defaultUrl
     });
   }
 }
@@ -1218195,10 +1218214,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.34.0" == null) {
+    if ("0.35.0-rc0" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.34.0";
+    return "0.35.0-rc0";
   }
   getCliName() {
     if ("fern" == null) {
@@ -1219736,8 +1219755,9 @@ function constructRootApiFileContext({ casingsGenerator, rootApiFile }) {
     rootApiFile
   });
 }
-function constructFernFileContext({ relativeFilepath, definitionFile, casingsGenerator, rootApiFile }) {
+function constructFernFileContext({ defaultUrl, relativeFilepath, definitionFile, casingsGenerator, rootApiFile }) {
   const file = {
+    defaultUrl,
     relativeFilepath,
     fernFilepath: convertToFernFilepath({ relativeFilepath, casingsGenerator }),
     imports: mapValues_default2(definitionFile.imports ?? {}, RelativeFilePath.of),
@@ -1221727,7 +1221747,7 @@ function convertResponseErrors({ errors, file }) {
 }
 
 // pnp:/home/runner/work/fern/fern/packages/cli/generation/ir-generator/lib/converters/services/convertHttpService.js
-async function convertHttpService({ rootPathParameters, serviceDefinition, file, errorResolver, typeResolver, propertyResolver, exampleResolver, variableResolver, globalErrors, workspace }) {
+async function convertHttpService({ rootDefaultUrl, rootPathParameters, serviceDefinition, file, errorResolver, typeResolver, propertyResolver, exampleResolver, variableResolver, globalErrors, workspace }) {
   const servicePathParameters = await convertPathParameters2({
     pathParameters: serviceDefinition["path-parameters"],
     location: PathParameterLocation.Service,
@@ -1221757,7 +1221777,7 @@ async function convertHttpService({ rootPathParameters, serviceDefinition, file,
         displayName: endpoint["display-name"],
         auth: endpoint.auth ?? serviceDefinition.auth,
         idempotent: endpoint.idempotent ?? serviceDefinition.idempotent ?? false,
-        baseUrl: endpoint.url ?? serviceDefinition.url,
+        baseUrl: endpoint.url ?? serviceDefinition.url ?? rootDefaultUrl,
         method: endpoint.method != null ? convertHttpMethod(endpoint.method) : HttpMethod4.Post,
         path: constructHttpPath(endpoint.path),
         fullPath: constructHttpPath(file.rootApiFile["base-path"] != null ? urlJoin(file.rootApiFile["base-path"], serviceDefinition["base-path"], endpoint.path) : urlJoin(serviceDefinition["base-path"], endpoint.path)),
@@ -1225587,6 +1225607,7 @@ async function generateIntermediateRepresentation({ workspace, generationLanguag
           return;
         }
         const convertedHttpService = await convertHttpService({
+          rootDefaultUrl: file.defaultUrl ?? workspace.definition.rootApiFile.contents["default-url"],
           rootPathParameters: intermediateRepresentation.pathParameters,
           serviceDefinition: service,
           file,
@@ -1225669,12 +1225690,13 @@ async function generateIntermediateRepresentation({ workspace, generationLanguag
       }
     });
   };
-  await visitAllDefinitionFiles(workspace, async (relativeFilepath, file) => {
+  await visitAllDefinitionFiles(workspace, async (relativeFilepath, file, metadata) => {
     await visitDefinitionFile(constructFernFileContext({
       relativeFilepath,
       definitionFile: file,
       casingsGenerator,
-      rootApiFile: workspace.definition.rootApiFile.contents
+      rootApiFile: workspace.definition.rootApiFile.contents,
+      defaultUrl: metadata.defaultUrl
     }));
   });
   await visitAllPackageMarkers(workspace, async (relativeFilepath, packageMarker) => {
@@ -1259132,9 +1259154,13 @@ var ValidServiceUrlsRule = {
   create: ({ workspace }) => {
     const urlIds = getAllEnvironmentUrlIds(workspace);
     const validateBaseUrl = (url) => {
+      var _a5;
       if (urlIds.includes(url)) {
         return [];
       }
+      if (urlIds.length === 0 && ((_a5 = workspace.definition.rootApiFile.contents) == null ? void 0 : _a5["default-url"]) != null) {
+        return [];
+      }
       if (urlIds.length === 0) {
         return [
           {
@@ -1259162,6 +1259188,10 @@ var ValidServiceUrlsRule = {
           return validateBaseUrl(url);
         },
         endpointBaseUrl: ({ baseUrl, service }) => {
+          var _a5;
+          if ((_a5 = workspace.definition.rootApiFile.contents) == null ? void 0 : _a5["default-url"]) {
+            return [];
+          }
           if (baseUrl == null) {
             if (urlIds.length === 0 || service.url != null) {
               return [];
@@ -1259176,14 +1259206,6 @@ var ValidServiceUrlsRule = {
               }
             ];
           }
-          if (service.url != null) {
-            return [
-              {
-                severity: "error",
-                message: '"url" cannot be specified on both the service and endpoint'
-              }
-            ];
-          }
           return validateBaseUrl(baseUrl);
         }
       }
@@ -1270429,7 +1270451,7 @@ async function writeFernDefinition({ absolutePathToDefinitionDirectory, definiti
   for (const [relativePath, importedDefinition] of Object.entries(definition3.importedDefinitions)) {
     await writeFernDefinition({
       absolutePathToDefinitionDirectory: join(absolutePathToDefinitionDirectory, RelativeFilePath.of(relativePath)),
-      definition: importedDefinition
+      definition: importedDefinition.definition
     });
   }
 }
@@ -1274444,7 +1274466,7 @@ async function writeDefinitionForFernWorkspace({
   workspace,
   context
 }) {
-  for (const [relativePath, definition3] of Object.entries(workspace.definition.importedDefinitions)) {
+  for (const [relativePath, importedDefinition] of Object.entries(workspace.definition.importedDefinitions)) {
     const absolutePathToOutputDirectory = join(
       workspace.absoluteFilepath,
       RelativeFilePath.of(DEFINITION_DIRECTORY),
@@ -1274452,7 +1274474,7 @@ async function writeDefinitionForFernWorkspace({
       RelativeFilePath.of(`.${DEFINITION_DIRECTORY}`)
     );
     await writeFernDefinition2({
-      definition: definition3,
+      definition: importedDefinition.definition,
       absolutePathToOutputDirectory
     });
     context.logger.info(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fern-api",
-  "version": "0.34.0",
+  "version": "0.35.0-rc0",
   "repository": {
     "type": "git",
     "url": "https://github.com/fern-api/fern.git",