fern-api 0.30.0-rc0 → 0.30.0

package/bundle.cjs

@@ -1032732,12 +1032732,13 @@ var GeneratorInvocationSchema = z.strictObject({
   output: z.optional(GeneratorOutputSchema),
   github: z.optional(GithubConfigurationSchema),
   config: z.unknown(),
+  metadata: z.optional(GeneratorPublishMetadataSchema),
+  keywords: z.optional(z.array(z.string())),
+  snippets: z.optional(GeneratorSnippetsSchema),
   "ir-version": z.optional(z.string()),
   "smart-casing": z.optional(z.boolean()),
   "disable-examples": z.optional(z.boolean()),
-  snippets: z.optional(GeneratorSnippetsSchema),
-  "publish-metadata": z.optional(GeneratorPublishMetadataSchema),
-  metadata: z.optional(GeneratorPublishMetadataSchema)
+  "publish-metadata": z.optional(GeneratorPublishMetadataSchema)
 });
 
 // pnp:/home/circleci/project/packages/cli/configuration/lib/generators-yml/schemas/GeneratorGroupSchema.js
@@ -1032934,6 +1032935,7 @@ async function convertGenerator({ absolutePathToGeneratorsConfiguration, generat
       maybeGroupLevelMetadata,
       maybeTopLevelMetadata
     }),
+    keywords: generator.keywords,
     smartCasing: generator["smart-casing"] ?? false,
     disableExamples: generator["disable-examples"] ?? false,
     absolutePathToLocalOutput: ((_a5 = generator.output) == null ? void 0 : _a5.location) === "local-file-system" ? resolve(dirname(absolutePathToGeneratorsConfiguration), generator.output.path) : void 0,
@@ -1036166,7 +1036168,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.30.0-rc0",
+          version: "0.30.0",
           usingAccessToken: true
         }
       });
@@ -1036228,7 +1036230,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.30.0-rc0",
+        version: "0.30.0",
         ...event,
         ...event.properties
       }
@@ -1053898,10 +1053900,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.30.0-rc0" == null) {
+    if ("0.30.0" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.30.0-rc0";
+    return "0.30.0";
   }
   getCliName() {
     if ("fern" == null) {
@@ -1054492,13 +1054494,16 @@ var RESERVED_KEYWORDS = {
 
 // pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/casings/CasingsGenerator.js
 var CAPITALIZE_INITIALISM = ["go", "ruby"];
-function constructCasingsGenerator({ generationLanguage, smartCasing }) {
+function constructCasingsGenerator({ generationLanguage, keywords: keywords3, smartCasing }) {
   const casingsGenerator = {
     generateName: (name2, opts) => {
       var _a5, _b4, _c4, _d2;
       const generateSafeAndUnsafeString = (unsafeString) => ({
         unsafeName: unsafeString,
-        safeName: sanitizeNameForLanguage(unsafeString, generationLanguage)
+        safeName: sanitizeName({
+          name: unsafeString,
+          keywords: getKeywords({ generationLanguage, keywords: keywords3 })
+        })
       });
       let camelCaseName = camelCase_default(name2);
       let pascalCaseName = upperFirst_default(camelCaseName);
@@ -1054549,12 +1054554,11 @@ function constructCasingsGenerator({ generationLanguage, smartCasing }) {
   };
   return casingsGenerator;
 }
-function sanitizeNameForLanguage(name2, generationLanguage) {
-  if (generationLanguage == null) {
+function sanitizeName({ name: name2, keywords: keywords3 }) {
+  if (keywords3 == null) {
     return name2;
   }
-  const reservedKeywords = RESERVED_KEYWORDS[generationLanguage];
-  if (reservedKeywords.has(name2)) {
+  if (keywords3.has(name2)) {
     return name2 + "_";
   } else if (startsWithNumber2(name2)) {
     return "_" + name2;
@@ -1054562,6 +1054566,15 @@ function sanitizeNameForLanguage(name2, generationLanguage) {
     return name2;
   }
 }
+function getKeywords({ generationLanguage, keywords: keywords3 }) {
+  if (keywords3 != null) {
+    return new Set(keywords3);
+  }
+  if (generationLanguage != null) {
+    return RESERVED_KEYWORDS[generationLanguage];
+  }
+  return void 0;
+}
 var STARTS_WITH_NUMBER2 = /^[0-9]/;
 function startsWithNumber2(str3) {
   return STARTS_WITH_NUMBER2.test(str3);
@@ -1055232,6 +1055245,7 @@ function constructFernFileContext({ relativeFilepath, definitionFile, casingsGen
 // pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/utils/getAllPropertiesForObject.js
 var CASINGS_GENERATOR = constructCasingsGenerator({
   generationLanguage: void 0,
+  keywords: void 0,
   smartCasing: false
 });
 function getAllPropertiesForObject({
@@ -1055257,6 +1055271,7 @@ function getAllPropertiesForObject({
   if (smartCasing) {
     casingsGenerator = constructCasingsGenerator({
       generationLanguage: void 0,
+      keywords: void 0,
       smartCasing
     });
   }
@@ -1060658,8 +1060673,8 @@ var VariableResolverImpl = _VariableResolverImpl;
 __publicField(VariableResolverImpl, "VARIABLE_PREFIX", "$");
 
 // pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/generateIntermediateRepresentation.js
-async function generateIntermediateRepresentation({ workspace, generationLanguage, smartCasing, disableExamples, audiences }) {
-  const casingsGenerator = constructCasingsGenerator({ generationLanguage, smartCasing });
+async function generateIntermediateRepresentation({ workspace, generationLanguage, keywords: keywords3, smartCasing, disableExamples, audiences }) {
+  const casingsGenerator = constructCasingsGenerator({ generationLanguage, keywords: keywords3, smartCasing });
   const irGraph = new IrGraph(audiences);
   const rootApiFileContext = constructRootApiFileContext({
     casingsGenerator,
@@ -1068612,6 +1068627,7 @@ var DocsDefinitionResolver = class {
           workspace,
           audiences: item.audiences,
           generationLanguage: void 0,
+          keywords: void 0,
           smartCasing: false,
           disableExamples: false
         });
@@ -1071511,6 +1071527,7 @@ async function registerApi({ organization, workspace, context, token, audiences,
     workspace,
     audiences,
     generationLanguage: void 0,
+    keywords: void 0,
     smartCasing: false,
     disableExamples: false
   });
@@ -1095666,6 +1095683,7 @@ function minimumString(strings) {
 // pnp:/home/circleci/project/packages/cli/yaml/validator/lib/utils/casingsGenerator.js
 var CASINGS_GENERATOR2 = constructCasingsGenerator({
   generationLanguage: void 0,
+  keywords: void 0,
   smartCasing: false
 });
 
@@ -1099313,6 +1099331,7 @@ async function generateIrForFernWorkspace({
   workspace,
   context,
   generationLanguage,
+  keywords: keywords3,
   smartCasing,
   disableExamples,
   audiences
@@ -1099321,6 +1099340,7 @@ async function generateIrForFernWorkspace({
   return generateIntermediateRepresentation({
     workspace,
     generationLanguage,
+    keywords: keywords3,
     smartCasing,
     disableExamples,
     audiences
@@ -1099343,6 +1099363,7 @@ async function generateFdrApiDefinitionForWorkspaces({
           context,
           generationLanguage: void 0,
           audiences,
+          keywords: void 0,
           smartCasing: false,
           disableExamples: false
         });
@@ -1106914,6 +1106935,7 @@ async function generateIrForWorkspaces({
   generationLanguage,
   audiences,
   version: version3,
+  keywords: keywords3,
   smartCasing
 }) {
   await Promise.all(
@@ -1106947,6 +1106969,7 @@ async function generateIrForWorkspaces({
           workspace: fernWorkspace,
           context,
           generationLanguage,
+          keywords: keywords3,
           smartCasing,
           disableExamples: false,
           audiences,
@@ -1106967,6 +1106990,7 @@ async function getIntermediateRepresentation({
   context,
   generationLanguage,
   audiences,
+  keywords: keywords3,
   smartCasing,
   disableExamples,
   version: version3
@@ -1106976,6 +1107000,7 @@ async function getIntermediateRepresentation({
     context,
     generationLanguage,
     audiences,
+    keywords: keywords3,
     smartCasing,
     disableExamples
   });
@@ -1107364,6 +1107389,7 @@ async function getIntermediateRepresentation2({ workspace, audiences, generatorI
     workspace,
     audiences,
     generationLanguage: generatorInvocation.language,
+    keywords: generatorInvocation.keywords,
     smartCasing: generatorInvocation.smartCasing,
     disableExamples: generatorInvocation.disableExamples
   });
@@ -1108200,6 +1108226,7 @@ async function runRemoteGenerationForGenerator({ projectConfig, organization, wo
   const intermediateRepresentation = await generateIntermediateRepresentation({
     workspace,
     generationLanguage: generatorInvocation.language,
+    keywords: generatorInvocation.keywords,
     smartCasing: generatorInvocation.smartCasing,
     disableExamples: generatorInvocation.disableExamples,
     audiences
@@ -1108987,6 +1109014,7 @@ async function mockServer({
       workspace: fernWorkspace,
       audiences: { type: "all" },
       generationLanguage: void 0,
+      keywords: void 0,
       smartCasing: false,
       disableExamples: false
     });
@@ -1109117,6 +1109145,7 @@ async function testOutput({
       workspace: fernWorkspace,
       audiences: { type: "all" },
       generationLanguage: void 0,
+      keywords: void 0,
       smartCasing: false,
       disableExamples: false
     });
@@ -1112283,6 +1112312,7 @@ function addIrCommand(cli, cliContext) {
         generationLanguage: argv.language,
         audiences: argv.audience.length > 0 ? { type: "select", audiences: argv.audience } : { type: "all" },
         version: argv.version,
+        keywords: void 0,
         smartCasing: false
       });
     }

package/package.json

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