@fern-api/fern-api-dev 4.58.0-6-g45e929c505d → 4.59.0-1-g6c7d34bd76f

package/cli.cjs

@@ -499925,14 +499925,18 @@ __export(serialization_exports4, {
   AsyncApiSettingsSchema: () => AsyncApiSettingsSchema,
   AsyncApiSpecSchema: () => AsyncApiSpecSchema,
   BaseApiSettingsSchema: () => BaseApiSettingsSchema,
+  BaseGeneratorInvocationSchema: () => BaseGeneratorInvocationSchema,
   CoerceConstsTo: () => CoerceConstsTo2,
   ConjureSchema: () => ConjureSchema,
   CratesOutputLocationSchema: () => CratesOutputLocationSchema,
+  CustomGeneratorInvocationSchema: () => CustomGeneratorInvocationSchema,
+  DefaultGeneratorInvocationSchema: () => DefaultGeneratorInvocationSchema,
   DefaultIntegerFormat: () => DefaultIntegerFormat2,
   ExampleStyle: () => ExampleStyle4,
   FormParameterEncoding: () => FormParameterEncoding2,
   GeneratorApiSettingsSchema: () => GeneratorApiSettingsSchema,
   GeneratorGroupSchema: () => GeneratorGroupSchema,
+  GeneratorImageObjectSchema: () => GeneratorImageObjectSchema,
   GeneratorInvocationSchema: () => GeneratorInvocationSchema,
   GeneratorOutputSchema: () => GeneratorOutputSchema,
   GeneratorPublishMetadataSchema: () => GeneratorPublishMetadataSchema,
@@ -501908,6 +501912,7 @@ __export(generators_exports2, {
   DefaultIntegerFormat: () => DefaultIntegerFormat2,
   ExampleStyle: () => ExampleStyle4,
   FormParameterEncoding: () => FormParameterEncoding2,
+  GeneratorImageObjectSchema: () => GeneratorImageObjectSchema,
   GeneratorsConfigurationSchema: () => GeneratorsConfigurationSchema,
   GeneratorsOpenApiObjectSchema: () => GeneratorsOpenApiObjectSchema,
   GeneratorsOpenApiSchema: () => GeneratorsOpenApiSchema,
@@ -502179,6 +502184,12 @@ var ApiConfigurationSchema = schemas_exports8.undiscriminatedUnion([
 // ../configuration/lib/generators-yml/schemas/serialization/resources/generators/types/ExampleStyle.js
 var ExampleStyle4 = schemas_exports8.enum_(["minimal", "comprehensive"]);
 
+// ../configuration/lib/generators-yml/schemas/serialization/resources/generators/types/GeneratorImageObjectSchema.js
+var GeneratorImageObjectSchema = schemas_exports8.object({
+  name: schemas_exports8.string(),
+  registry: schemas_exports8.string()
+});
+
 // ../configuration/lib/generators-yml/schemas/serialization/resources/generators/types/OutputMetadataAuthor.js
 var OutputMetadataAuthor2 = schemas_exports8.object({
   name: schemas_exports8.string(),
@@ -502371,9 +502382,8 @@ var GithubConfigurationSchema = schemas_exports8.undiscriminatedUnion([
   GithubPushSchema
 ]);
 
-// ../configuration/lib/generators-yml/schemas/serialization/resources/group/types/GeneratorInvocationSchema.js
-var GeneratorInvocationSchema = schemas_exports8.object({
-  name: schemas_exports8.string(),
+// ../configuration/lib/generators-yml/schemas/serialization/resources/group/types/BaseGeneratorInvocationSchema.js
+var BaseGeneratorInvocationSchema = schemas_exports8.object({
   version: schemas_exports8.string(),
   output: GeneratorOutputSchema.optional(),
   github: GithubConfigurationSchema.optional(),
@@ -502389,6 +502399,19 @@ var GeneratorInvocationSchema = schemas_exports8.object({
   autorelease: schemas_exports8.boolean().optional()
 });
 
+// ../configuration/lib/generators-yml/schemas/serialization/resources/group/types/CustomGeneratorInvocationSchema.js
+var CustomGeneratorInvocationSchema = schemas_exports8.object({
+  image: GeneratorImageObjectSchema
+}).extend(BaseGeneratorInvocationSchema);
+
+// ../configuration/lib/generators-yml/schemas/serialization/resources/group/types/DefaultGeneratorInvocationSchema.js
+var DefaultGeneratorInvocationSchema = schemas_exports8.object({
+  name: schemas_exports8.string()
+}).extend(BaseGeneratorInvocationSchema);
+
+// ../configuration/lib/generators-yml/schemas/serialization/resources/group/types/GeneratorInvocationSchema.js
+var GeneratorInvocationSchema = schemas_exports8.undiscriminatedUnion([DefaultGeneratorInvocationSchema, CustomGeneratorInvocationSchema]);
+
 // ../configuration/lib/generators-yml/schemas/serialization/resources/group/types/GeneratorGroupSchema.js
 var GeneratorGroupSchema = schemas_exports8.object({
   audiences: schemas_exports8.list(schemas_exports8.string()).optional(),
@@ -502483,7 +502506,10 @@ var GeneratorsConfigurationSchema = schemas_exports8.object({
 // ../configuration/lib/generators-yml/schemas/serialization/resources/group/index.js
 var group_exports2 = {};
 __export(group_exports2, {
+  BaseGeneratorInvocationSchema: () => BaseGeneratorInvocationSchema,
   CratesOutputLocationSchema: () => CratesOutputLocationSchema,
+  CustomGeneratorInvocationSchema: () => CustomGeneratorInvocationSchema,
+  DefaultGeneratorInvocationSchema: () => DefaultGeneratorInvocationSchema,
   GeneratorApiSettingsSchema: () => GeneratorApiSettingsSchema,
   GeneratorGroupSchema: () => GeneratorGroupSchema,
   GeneratorInvocationSchema: () => GeneratorInvocationSchema,
@@ -535240,7 +535266,7 @@ async function addGenerator({ generatorName, generatorsConfiguration, groupName
     groupName,
     context: context3,
     update: async (group) => {
-      if (group.generators.some((generator) => addDefaultDockerOrgIfNotPresent(generator.name) === normalizedGeneratorName)) {
+      if (group.generators.some((generator) => addDefaultDockerOrgIfNotPresent("image" in generator ? generator.image.name : generator.name) === normalizedGeneratorName)) {
         context3.failAndThrow(`${generatorName} is already installed in group ${groupName}.`);
       }
       const latestVersion2 = await getLatestGeneratorVersion({
@@ -535702,12 +535728,28 @@ async function convertGroup({ absolutePathToGeneratorsConfiguration, groupName,
     })))
   };
 }
-async function convertGenerator({ absolutePathToGeneratorsConfiguration, generator, maybeGroupLevelMetadata, maybeTopLevelMetadata, maybeGroupLevelReviewers, maybeTopLevelReviewers, readme, context: context3 }) {
+function getGeneratorNameAndImage(generator, context3) {
+  if ("image" in generator) {
+    const correctedImageName = correctIncorrectDockerOrgWithWarning(generator.image.name, context3);
+    const normalizedImageName = addDefaultDockerOrgIfNotPresent(correctedImageName);
+    return {
+      normalizedName: normalizedImageName,
+      containerImage: `${generator.image.registry}/${correctedImageName}`
+    };
+  }
   const correctedName = correctIncorrectDockerOrgWithWarning(generator.name, context3);
   const normalizedName = addDefaultDockerOrgIfNotPresent(correctedName);
+  return {
+    normalizedName,
+    containerImage: void 0
+  };
+}
+async function convertGenerator({ absolutePathToGeneratorsConfiguration, generator, maybeGroupLevelMetadata, maybeTopLevelMetadata, maybeGroupLevelReviewers, maybeTopLevelReviewers, readme, context: context3 }) {
+  const { normalizedName, containerImage } = getGeneratorNameAndImage(generator, context3);
   return {
     raw: generator,
     name: normalizedName,
+    containerImage,
     version: generator.version,
     config: generator.config,
     outputMode: await convertOutputMode({
@@ -595524,6 +595566,8 @@ __export(schemas_exports12, {
   FolderConfigurationSchema: () => FolderConfigurationSchema,
   FooterLinksConfigSchema: () => FooterLinksConfigSchema,
   FormParameterEncodingSchema: () => FormParameterEncodingSchema,
+  GeneratorImageObjectSchema: () => GeneratorImageObjectSchema2,
+  GeneratorImageSchema: () => GeneratorImageSchema,
   GitHubOutputModeSchema: () => GitHubOutputModeSchema,
   GitHubRepositoryOutputModeSchema: () => GitHubRepositoryOutputModeSchema,
   GitHubRepositoryOutputSchema: () => GitHubRepositoryOutputSchema,
@@ -596012,6 +596056,13 @@ var ReadmeSchema2 = external_exports.object({
   exampleStyle: ExampleStyleSchema.optional()
 });
 
+// ../config/lib/schemas/GeneratorImageSchema.js
+var GeneratorImageObjectSchema2 = external_exports.object({
+  name: external_exports.string(),
+  registry: external_exports.string()
+});
+var GeneratorImageSchema = external_exports.union([external_exports.string(), GeneratorImageObjectSchema2]);
+
 // ../config/lib/schemas/MetadataSchema.js
 var AuthorSchema = external_exports.object({
   name: external_exports.string(),
@@ -596141,7 +596192,7 @@ var PublishSchema = external_exports.object({
 var SdkTargetSchema = external_exports.object({
   api: external_exports.string().optional(),
   lang: SdkTargetLanguageSchema.optional(),
-  image: external_exports.string().optional(),
+  image: GeneratorImageSchema.optional(),
   version: external_exports.string().optional(),
   config: external_exports.record(external_exports.string(), external_exports.unknown()).optional(),
   publish: PublishSchema.optional(),
@@ -602681,7 +602732,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.58.0-6-g45e929c505d",
+          version: "4.59.0-1-g6c7d34bd76f",
           usingAccessToken: true
         }
       });
@@ -602732,7 +602783,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.58.0-6-g45e929c505d",
+        version: "4.59.0-1-g6c7d34bd76f",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -627403,6 +627454,7 @@ var SdkConfigConverter = class {
       name: name2,
       lang: generatorInfo.lang,
       image: generatorInfo.image,
+      registry: generatorInfo.registry,
       version: generatorInfo.version,
       api: this.resolveApi({ api: target.api }),
       sourceLocation: sourced.$loc,
@@ -627438,11 +627490,28 @@ var SdkConfigConverter = class {
     if (lang == null) {
       return void 0;
     }
+    if (target.image != null) {
+      if (typeof target.image === "string") {
+        return {
+          lang,
+          image: addDefaultDockerOrgIfNotPresent(target.image),
+          version: target.version ?? "latest",
+          registry: void 0
+        };
+      }
+      return {
+        lang,
+        image: addDefaultDockerOrgIfNotPresent(target.image.name),
+        version: target.version ?? "latest",
+        registry: target.image.registry
+      };
+    }
     const resolvedDockerImage = getImageReferenceFromLanguage({ lang, version: target.version });
     return {
       lang,
       image: resolvedDockerImage.image,
-      version: resolvedDockerImage.tag
+      version: resolvedDockerImage.tag,
+      registry: void 0
     };
   }
   convertConfig(config5) {
@@ -627453,7 +627522,8 @@ var SdkConfigConverter = class {
       return target.lang;
     }
     if (target.image != null) {
-      return getLanguageFromImage({ image: target.image });
+      const imageName = typeof target.image === "string" ? target.image : target.image.name;
+      return getLanguageFromImage({ image: addDefaultDockerOrgIfNotPresent(imageName) });
     }
     const lang = name2;
     if (LANGUAGES.includes(lang)) {
@@ -837241,18 +837311,19 @@ function convertSdkTargetsFromRaw(options2) {
 }
 function convertRawGeneratorToTarget(options2) {
   const { generator, groupName, languageCounts, apiName, warnings } = options2;
-  if (generator.name == null) {
+  const generatorName = generator.name ?? generator.image?.name;
+  if (generatorName == null) {
     warnings.push({
       type: "conflict",
-      message: "Generator missing 'name' field"
+      message: "Generator missing 'name' or 'image.name' field"
     });
     return void 0;
   }
-  const language = getLanguageFromGeneratorName2(generator.name);
+  const language = getLanguageFromGeneratorName2(generatorName);
   if (language == null) {
     warnings.push({
       type: "unsupported",
-      message: `Unknown generator: ${generator.name}`,
+      message: `Unknown generator: ${generatorName}`,
       suggestion: "Manually add this generator to your fern.yml"
     });
     return void 0;
@@ -837264,6 +837335,12 @@ function convertRawGeneratorToTarget(options2) {
   const target = {
     output: {}
   };
+  if (generator.image != null) {
+    target.image = {
+      name: generator.image.name,
+      registry: generator.image.registry
+    };
+  }
   target.lang = language;
   if (apiName != null) {
     target.api = apiName;
@@ -839962,7 +840039,7 @@ var import_path54 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version7 = "4.58.0-6-g45e929c505d";
+  const version7 = "4.59.0-1-g6c7d34bd76f";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -842259,7 +842336,7 @@ async function visitGeneratorGroup({ group, visitor, nodePath, cliVersion }) {
     ...nodePath,
     "generators",
     idx.toString(),
-    generator.name
+    "image" in generator ? generator.image.name : generator.name
   ])));
 }
 
@@ -842345,13 +842422,14 @@ var CompatibleIrVersionsRule = {
             return [];
           }
           const cliIrVersion = cliRelease.body.irVersion;
+          const invocationName = "image" in invocation ? invocation.image.name : invocation.name;
           let invocationIrVersion;
           if (invocation["ir-version"] != null) {
             invocationIrVersion = getOverriddenIrVersion(invocation["ir-version"]);
           } else {
             const normalizedInvocation = {
               ...invocation,
-              name: addDefaultDockerOrgIfNotPresent(invocation.name)
+              name: addDefaultDockerOrgIfNotPresent(invocationName)
             };
             const maybeIrVersion = await getIrVersionForGenerator(normalizedInvocation);
             if (maybeIrVersion == null) {
@@ -842364,7 +842442,7 @@ var CompatibleIrVersionsRule = {
           }
           const minCliVersion = await fdr.generators.cli.getMinCliForIr(invocationIrVersion);
           if (minCliVersion.ok) {
-            return getMaybeBadVersionMessage(invocation.name, minCliVersion.body.version, cliVersion) ?? [];
+            return getMaybeBadVersionMessage(invocationName, minCliVersion.body.version, cliVersion) ?? [];
           } else {
             return [];
           }
@@ -851063,7 +851141,7 @@ var LegacyDocsPublisher = class {
         previewId: void 0,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.58.0-6-g45e929c505d"
+        cliVersion: "4.59.0-1-g6c7d34bd76f"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -902578,7 +902656,7 @@ async function writeFilesToDiskAndRunGenerator({ organization, absolutePathToFer
     context3.logger.debug("Will write snippet-templates.json to: " + absolutePathToTmpSnippetTemplatesJSON);
   }
   const environment2 = executionEnvironment ?? new ContainerExecutionEnvironment({
-    containerImage: `${generatorInvocation.name}:${generatorInvocation.version}`,
+    containerImage: generatorInvocation.containerImage ? `${generatorInvocation.containerImage}:${generatorInvocation.version}` : `${generatorInvocation.name}:${generatorInvocation.version}`,
     keepContainer: keepDocker
   });
   const paths = environment2.usesContainerPaths ? {
@@ -903234,6 +903312,7 @@ var LegacyGeneratorInvocationAdapter = class {
     return {
       raw: this.buildRaw(target),
       name: target.image,
+      containerImage: target.registry ? `${target.registry}/${removeDefaultDockerOrgIfPresent(target.image)}` : void 0,
       version: target.version,
       config: target.config,
       language: this.mapLanguage(target.lang),
@@ -903656,7 +903735,8 @@ var LegacyLocalGenerationRunner = class {
     };
   }
   async runLocalGeneration({ args, taskContext, fernWorkspace, generatorGroup, generatorInvocation }) {
-    const containerImage = `${args.target.image}:${args.target.version}`;
+    const imageRef = args.target.registry ? `${args.target.registry}/${removeDefaultDockerOrgIfPresent(args.target.image)}` : args.target.image;
+    const containerImage = `${imageRef}:${args.target.version}`;
     const executionEnvironment = new ContainerExecutionEnvironment({
       containerImage,
       keepContainer: args.keepContainer ?? false,
@@ -903849,6 +903929,11 @@ var GeneratorPipeline = class {
       if (this.isLocalGeneration(args)) {
         return await this.runLocalGeneration(args);
       }
+      if (args.target.registry != null) {
+        throw new CliError({
+          message: `Custom image configurations are only supported with local generation (--local). Target "${args.target.name}" uses a custom image registry.`
+        });
+      }
       return await this.runRemoteGeneration(args);
     } catch (error50) {
       const message = extractErrorMessage(error50);
@@ -904075,6 +904160,7 @@ var WorkspaceBuilder = class {
       name: lang,
       api: DEFAULT_API_NAME,
       image: imageRef.image,
+      registry: void 0,
       lang,
       version: imageRef.tag,
       sourceLocation,
@@ -904686,11 +904772,12 @@ var GeneratorMigrator = class _GeneratorMigrator {
    * migration system expects.
    */
   toGeneratorInvocationSchema(target) {
-    return {
+    const invocation = {
       name: target.image,
       version: target.version,
       config: target.config
     };
+    return invocation;
   }
   /**
    * Applies the migrated `config` field back to the YAML document via
@@ -924220,7 +924307,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.58.0-6-g45e929c505d";
+    return "4.59.0-1-g6c7d34bd76f";
   }
   getCliName() {
     if (false) {
@@ -925029,7 +925116,12 @@ Please report this issue at: https://github.com/fern-api/fern/issues`
   };
 }
 function isValidGeneratorConfig(config5) {
-  return typeof config5 === "object" && config5 != null && "name" in config5 && typeof config5.name === "string";
+  if (typeof config5 !== "object" || config5 == null) {
+    return false;
+  }
+  const hasValidName = "name" in config5 && typeof config5.name === "string";
+  const hasValidImage = "image" in config5 && config5.image != null && typeof config5.image === "object";
+  return hasValidName || hasValidImage;
 }
 async function loadAndRunMigrations(params2) {
   const { generatorName, from: from4, to: to8, config: config5, logger: logger4 } = params2;
@@ -925037,7 +925129,7 @@ async function loadAndRunMigrations(params2) {
     throw new Error(
       `Invalid generator configuration for ${generatorName}.
 
-The generator configuration must be an object with a 'name' property, but the current configuration does not match this structure. This may indicate a malformed generators.yml file.
+The generator configuration must be an object with either a 'name' property or an 'image' property, but the current configuration does not match this structure. This may indicate a malformed generators.yml file.
 
 Please check your generators.yml file and ensure the generator is properly configured.`
     );
@@ -925146,6 +925238,14 @@ async function loadAndUpdateGenerators({
           `Expected generator in group ${groupName} to be a map in ${import_path79.default.relative(process.cwd(), filepath)}`
         );
       }
+      if (generator.get("image") != null) {
+        const imageNode = generator.get("image");
+        const imageName = import_yaml6.default.isMap(imageNode) ? imageNode.get("name") : "unknown";
+        context3.logger.warn(
+          `Skipping custom image generator "${imageName}" in group ${groupName}: generators using a custom image cannot be auto-upgraded.`
+        );
+        continue;
+      }
       const generatorName = generator.get("name");
       const normalizedGeneratorName = normalizeGeneratorName(generatorName);
       if (normalizedGeneratorName == null) {
@@ -933518,6 +933618,13 @@ async function generateWorkspace({
           skipFernignore
         });
       } else if (token != null) {
+        const customImageGenerators = group.generators.filter((g19) => g19.containerImage != null);
+        if (customImageGenerators.length > 0) {
+          const names2 = customImageGenerators.map((g19) => g19.name).join(", ");
+          return context3.failAndThrow(
+            `Custom image configurations are only supported with local generation (--local). The following generators use custom images: ${names2}`
+          );
+        }
         await runRemoteGenerationForAPIWorkspace({
           projectConfig,
           organization,
@@ -937302,7 +937409,7 @@ async function getFernDirectory9() {
 }
 
 // ../cli-migrations/lib/migrations/0.0.241/add-generator-groups/old-generators-configuration/BaseGeneratorInvocationSchema.js
-var BaseGeneratorInvocationSchema = external_exports2.strictObject({
+var BaseGeneratorInvocationSchema2 = external_exports2.strictObject({
   name: external_exports2.string(),
   version: external_exports2.string(),
   config: external_exports2.unknown(),
@@ -937310,7 +937417,7 @@ var BaseGeneratorInvocationSchema = external_exports2.strictObject({
 });
 
 // ../cli-migrations/lib/migrations/0.0.241/add-generator-groups/old-generators-configuration/DraftGeneratorInvocationSchema.js
-var DraftGeneratorInvocationSchema = BaseGeneratorInvocationSchema.extend({
+var DraftGeneratorInvocationSchema = BaseGeneratorInvocationSchema2.extend({
   mode: external_exports2.union([external_exports2.literal("publish"), external_exports2.literal("download-files")]),
   "output-path": external_exports2.optional(external_exports2.string())
 });
@@ -937357,7 +937464,7 @@ var GithubRepositoryOutputSchema = external_exports2.strictObject({
 });
 
 // ../cli-migrations/lib/migrations/0.0.241/add-generator-groups/old-generators-configuration/ReleaseGeneratorInvocationSchema.js
-var ReleaseGeneratorInvocationSchema = BaseGeneratorInvocationSchema.extend({
+var ReleaseGeneratorInvocationSchema = BaseGeneratorInvocationSchema2.extend({
   publishing: external_exports2.optional(GeneratorPublishingSchema),
   github: external_exports2.optional(GithubRepositoryOutputSchema)
 });

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.58.0-6-g45e929c505d",
+  "version": "4.59.0-1-g6c7d34bd76f",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",