fern-api 0.16.22 → 0.16.24

package/bundle.cjs

@@ -733501,6 +733501,9 @@ function getLanguageFromGeneratorName(generatorName) {
 // pnp:/home/circleci/project/packages/cli/config-management/generators-configuration/lib/loadGeneratorsConfiguration.js
 async function loadRawGeneratorsConfiguration({ absolutePathToWorkspace, context }) {
   const filepath = getPathToGeneratorsConfiguration({ absolutePathToWorkspace });
+  if (!await doesPathExist(filepath)) {
+    return void 0;
+  }
   const contentsStr = await (0, import_promises8.readFile)(filepath);
   const contentsParsed = js_yaml_default.load(contentsStr.toString());
   return validateSchema({
@@ -733512,6 +733515,9 @@ async function loadRawGeneratorsConfiguration({ absolutePathToWorkspace, context
 }
 async function loadGeneratorsConfiguration({ absolutePathToWorkspace, context }) {
   const rawGeneratorsConfiguration = await loadRawGeneratorsConfiguration({ absolutePathToWorkspace, context });
+  if (rawGeneratorsConfiguration == null) {
+    return void 0;
+  }
   return convertGeneratorsConfiguration({
     absolutePathToGeneratorsConfiguration: getPathToGeneratorsConfiguration({ absolutePathToWorkspace }),
     rawGeneratorsConfiguration
@@ -736945,7 +736951,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.16.22",
+          version: "0.16.24",
           usingAccessToken: true
         }
       });
@@ -737007,7 +737013,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.16.22",
+        version: "0.16.24",
         ...event,
         ...event.properties
       }
@@ -749753,6 +749759,22 @@ function getQueryParameterTypeReference({ schema: schema2, context, fileContaini
         allowMultiple: true
       };
     } else if (resolvedSchema.type === "oneOf" && resolvedSchema.oneOf.type === "undisciminated") {
+      const literalValues = [];
+      for (const [_4, schema3] of Object.entries(resolvedSchema.oneOf.schemas)) {
+        if (schema3.type === "literal" && schema3.value.type === "string") {
+          literalValues.push(schema3.value.string);
+        }
+      }
+      if (literalValues.length > 0) {
+        context.builder.addType(fileContainingReference, {
+          name: schema2.generatedName,
+          schema: { enum: literalValues }
+        });
+        return {
+          value: schema2.generatedName,
+          allowMultiple: false
+        };
+      }
       for (const [_4, schema3] of Object.entries(resolvedSchema.oneOf.schemas)) {
         return getQueryParameterTypeReference({
           schema: schema3,
@@ -749796,6 +749818,22 @@ function getQueryParameterTypeReference({ schema: schema2, context, fileContaini
         allowMultiple: true
       };
     } else if (schema2.value.type === "oneOf" && schema2.value.oneOf.type === "undisciminated") {
+      const literalValues = [];
+      for (const [_4, oneOfSchema] of Object.entries(schema2.value.oneOf.schemas)) {
+        if (oneOfSchema.type === "literal" && oneOfSchema.value.type === "string") {
+          literalValues.push(oneOfSchema.value.string);
+        }
+      }
+      if (literalValues.length > 0) {
+        context.builder.addType(fileContainingReference, {
+          name: schema2.value.oneOf.generatedName,
+          schema: { enum: literalValues }
+        });
+        return {
+          value: `optional<${schema2.value.oneOf.generatedName}>`,
+          allowMultiple: false
+        };
+      }
       for (const [_4, oneOfSchema] of Object.entries(schema2.value.oneOf.schemas)) {
         return getQueryParameterTypeReference({
           schema: import_finalIr3.Schema.optional({ value: oneOfSchema, description: void 0, groupName: void 0 }),
@@ -751643,8 +751681,20 @@ function getAllProperties2({ schema: schema2, context, breadcrumbs }) {
 var import_parseIr9 = __toESM(require_parseIr());
 function convertUndiscriminatedOneOf({ nameOverride, generatedName, breadcrumbs, description, wrapAsNullable, context, subtypes, groupName }) {
   const subtypePrefixes = getUniqueSubTypeNames({ schemas: subtypes });
-  const convertedSubtypes = subtypes.map((schema2, index2) => {
-    return convertSchema(schema2, false, context, [...breadcrumbs, subtypePrefixes[index2] ?? `${index2}`]);
+  const convertedSubtypes = subtypes.flatMap((schema2, index2) => {
+    if (!isReferenceObject(schema2) && schema2.enum != null) {
+      return schema2.enum.map((enumValue) => {
+        return import_parseIr9.SchemaWithExample.literal({
+          value: {
+            type: "string",
+            string: enumValue
+          },
+          groupName: void 0,
+          description: void 0
+        });
+      });
+    }
+    return [convertSchema(schema2, false, context, [...breadcrumbs, subtypePrefixes[index2] ?? `${index2}`])];
   });
   const uniqueSubtypes = [];
   for (let i2 = 0; i2 < convertedSubtypes.length; ++i2) {
@@ -754715,12 +754765,16 @@ function validateStructureOfYamlFiles({ files, absolutePathToDefinition }) {
 
 // pnp:/home/circleci/project/packages/cli/workspace-loader/lib/loadAPIWorkspace.js
 async function loadAPIWorkspace({ absolutePathToWorkspace, context, cliVersion, workspaceName }) {
-  const generatorsConfiguration = await loadGeneratorsConfiguration({ absolutePathToWorkspace, context });
+  let generatorsConfiguration = void 0;
+  try {
+    generatorsConfiguration = await loadGeneratorsConfiguration({ absolutePathToWorkspace, context });
+  } catch (err) {
+  }
   const absolutePathToOpenAPIFolder = join(absolutePathToWorkspace, RelativeFilePath.of(OPENAPI_DIRECTORY));
   const openApiDirectoryExists = await doesPathExist(absolutePathToOpenAPIFolder);
   const absolutePathToAsyncAPIFolder = join(absolutePathToWorkspace, RelativeFilePath.of(ASYNCAPI_DIRECTORY));
   const asyncApiDirectoryExists = await doesPathExist(absolutePathToAsyncAPIFolder);
-  if (generatorsConfiguration.absolutePathToOpenAPI != null) {
+  if ((generatorsConfiguration == null ? void 0 : generatorsConfiguration.absolutePathToOpenAPI) != null) {
     const absolutePathToAsyncAPI = generatorsConfiguration.absolutePathToAsyncAPI != null ? await getValidAbsolutePathToAsyncAPI(context, generatorsConfiguration.absolutePathToAsyncAPI) : void 0;
     const absolutePathToOpenAPI = await getValidAbsolutePathToOpenAPI(context, generatorsConfiguration.absolutePathToOpenAPI);
     return {
@@ -761566,10 +761620,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.16.22" == null) {
+    if ("0.16.24" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.16.22";
+    return "0.16.24";
   }
   getCliName() {
     if ("fern" == null) {
@@ -761889,13 +761943,14 @@ async function addGeneratorToWorkspaces({
   await Promise.all(
     apiWorkspaces.map(async (workspace) => {
       await cliContext.runTaskForWorkspace(workspace, async (context) => {
+        var _a2;
         const generatorsConfiguration = await loadRawGeneratorsConfiguration({
           absolutePathToWorkspace: workspace.absoluteFilepath,
           context
-        });
+        }) ?? {};
         const newConfiguration = addGenerator({ generatorName, generatorsConfiguration, groupName, context });
         await (0, import_promises28.writeFile)(
-          workspace.generatorsConfiguration.absolutePathToConfiguration,
+          ((_a2 = workspace.generatorsConfiguration) == null ? void 0 : _a2.absolutePathToConfiguration) ?? getPathToGeneratorsConfiguration({ absolutePathToWorkspace: workspace.absoluteFilepath }),
           js_yaml_default.dump(newConfiguration)
         );
         context.logger.info(source_default.green(`Added ${generatorName} generator`));
@@ -777024,6 +777079,10 @@ async function generateWorkspace({
   useLocalDocker,
   keepDocker
 }) {
+  if (workspace.generatorsConfiguration == null) {
+    context.logger.warn("This workspaces has no generators.yml");
+    return;
+  }
   if (workspace.generatorsConfiguration.groups.length === 0) {
     context.logger.warn(`This workspaces has no groups specified in ${GENERATORS_CONFIGURATION_FILENAME}`);
     return;
@@ -777089,10 +777148,11 @@ async function generateAPIWorkspaces({
     command: "fern generate",
     properties: {
       workspaces: project.apiWorkspaces.map((workspace) => {
+        var _a2;
         return {
           name: workspace.name,
           group: groupName,
-          generators: workspace.generatorsConfiguration.groups.filter((group) => groupName == null ? true : group.groupName === groupName).map((group) => {
+          generators: (_a2 = workspace.generatorsConfiguration) == null ? void 0 : _a2.groups.filter((group) => groupName == null ? true : group.groupName === groupName).map((group) => {
             return group.generators.map((generator) => {
               return {
                 name: generator.name,

package/package.json

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