Rename naming functions for consistency

- canonicalToName → tsNameFromCanonical
- safeCamelCase → tsCamelCase
- tsFhirPackageDir → tsPackageDir

Author: ryukzak

src/api/writer-generator/typescript/name.ts

@@ -20,14 +20,14 @@ const normalizeTsName = (n: string): string => {
     return n.replace(/\[x\]/g, "_x_").replace(/[- :.]/g, "_");
 };
 
-export const safeCamelCase = (name: string): string => {
+export const tsCamelCase = (name: string): string => {
     if (!name) return "";
     // Remove [x] suffix and normalize special characters before camelCase
     const normalized = name.replace(/\[x\]/g, "").replace(/:/g, "_");
     return camelCase(normalized);
 };
 
-export const tsFhirPackageDir = (name: string): string => {
+export const tsPackageDir = (name: string): string => {
     return kebabCase(name);
 };
 
@@ -45,10 +45,10 @@ export const tsModuleFileName = (id: Identifier): string => {
 };
 
 export const tsModulePath = (id: Identifier): string => {
-    return `${tsFhirPackageDir(id.package)}/${tsModuleName(id)}`;
+    return `${tsPackageDir(id.package)}/${tsModuleName(id)}`;
 };
 
-export const canonicalToName = (canonical: string | undefined, dropFragment = true) => {
+export const tsNameFromCanonical = (canonical: string | undefined, dropFragment = true) => {
     if (!canonical) return undefined;
     const localName = extractNameFromCanonical(canonical as CanonicalUrl, dropFragment);
     if (!localName) return undefined;
@@ -97,12 +97,12 @@ export const tsExtensionInputTypeName = (profileName: string, extensionName: str
 };
 
 export const tsSliceMethodName = (sliceName: string): string => {
-    const normalized = safeCamelCase(sliceName);
+    const normalized = tsCamelCase(sliceName);
     return `set${uppercaseFirstLetter(normalized || "Slice")}`;
 };
 
 export const tsExtensionMethodName = (name: string): string => {
-    const normalized = safeCamelCase(name);
+    const normalized = tsCamelCase(name);
     return `set${uppercaseFirstLetter(normalized || "Extension")}`;
 };
 
@@ -112,13 +112,13 @@ export const tsQualifiedExtensionMethodName = (name: string, path?: string): str
             ?.split(".")
             .filter((p) => p && p !== "extension")
             .join("_") ?? "";
-    const pathPart = rawPath ? uppercaseFirstLetter(safeCamelCase(rawPath)) : "";
-    const normalized = safeCamelCase(name);
+    const pathPart = rawPath ? uppercaseFirstLetter(tsCamelCase(rawPath)) : "";
+    const normalized = tsCamelCase(name);
     return `setExtension${pathPart}${uppercaseFirstLetter(normalized || "Extension")}`;
 };
 
 export const tsQualifiedSliceMethodName = (fieldName: string, sliceName: string): string => {
-    const fieldPart = uppercaseFirstLetter(safeCamelCase(fieldName) || "Field");
-    const slicePart = uppercaseFirstLetter(safeCamelCase(sliceName) || "Slice");
+    const fieldPart = uppercaseFirstLetter(tsCamelCase(fieldName) || "Field");
+    const slicePart = uppercaseFirstLetter(tsCamelCase(sliceName) || "Slice");
     return `setSlice${fieldPart}${slicePart}`;
 };

src/api/writer-generator/typescript/profile.ts

@@ -17,13 +17,13 @@ import {
 } from "@root/typeschema/types";
 import type { TypeSchemaIndex } from "@root/typeschema/utils";
 import {
-    canonicalToName,
-    safeCamelCase,
+    tsCamelCase,
     tsExtensionInputTypeName,
     tsExtensionMethodName,
-    tsFhirPackageDir,
     tsFieldName,
     tsModulePath,
+    tsNameFromCanonical,
+    tsPackageDir,
     tsProfileClassName,
     tsProfileModuleName,
     tsQualifiedExtensionMethodName,
@@ -447,8 +447,8 @@ export const generateProfileImports = (
 
     const getModulePath = (typeId: Identifier): string => {
         if (isNestedIdentifier(typeId)) {
-            const path = canonicalToName(typeId.url, true);
-            if (path) return `../../${tsFhirPackageDir(typeId.package)}/${pascalCase(path)}`;
+            const path = tsNameFromCanonical(typeId.url, true);
+            if (path) return `../../${tsPackageDir(typeId.package)}/${pascalCase(path)}`;
         }
         return `../../${tsModulePath(typeId)}`;
     };
@@ -759,7 +759,7 @@ export const generateProfileClass = (
 
         for (const ext of extensions) {
             if (!ext.url) continue;
-            const baseName = uppercaseFirstLetter(safeCamelCase(ext.name));
+            const baseName = uppercaseFirstLetter(tsCamelCase(ext.name));
             const getMethodName = `get${baseName}`;
             const getExtensionMethodName = `get${baseName}Extension`;
             if (generatedGetMethods.has(getMethodName)) continue;
@@ -843,7 +843,7 @@ export const generateProfileClass = (
         // 1. get{SliceName}() - returns simplified (without discriminator fields)
         // 2. get{SliceName}Raw() - returns full FHIR type with all fields
         for (const sliceDef of sliceDefs) {
-            const baseName = uppercaseFirstLetter(safeCamelCase(sliceDef.sliceName));
+            const baseName = uppercaseFirstLetter(tsCamelCase(sliceDef.sliceName));
             const getMethodName = `get${baseName}`;
             const getRawMethodName = `get${baseName}Raw`;
             if (generatedGetMethods.has(getMethodName)) continue;

src/api/writer-generator/typescript/writer.ts

@@ -18,12 +18,12 @@ import {
 } from "@root/typeschema/types";
 import { groupByPackages, type TypeSchemaIndex } from "@root/typeschema/utils";
 import {
-    canonicalToName,
-    tsFhirPackageDir,
     tsFieldName,
     tsModuleFileName,
     tsModuleName,
     tsModulePath,
+    tsNameFromCanonical,
+    tsPackageDir,
     tsProfileModuleFileName,
     tsResourceName,
 } from "./name";
@@ -114,7 +114,7 @@ export class TypeScript extends Writer<TypeScriptOptions> {
                     });
                 } else if (isNestedIdentifier(dep)) {
                     const ndep = { ...dep };
-                    ndep.name = canonicalToName(dep.url) as Name;
+                    ndep.name = tsNameFromCanonical(dep.url) as Name;
                     imports.push({
                         tsPackage: `${importPrefix}${tsModulePath(ndep)}`,
                         name: tsResourceName(dep),
@@ -179,7 +179,7 @@ export class TypeScript extends Writer<TypeScriptOptions> {
         }
 
         let extendsClause: string | undefined;
-        if (schema.base) extendsClause = `extends ${canonicalToName(schema.base.url)}`;
+        if (schema.base) extendsClause = `extends ${tsNameFromCanonical(schema.base.url)}`;
 
         this.debugComment(schema.identifier);
         if (!schema.fields && !extendsClause && !isResourceTypeSchema(schema)) {
@@ -303,8 +303,8 @@ export class TypeScript extends Writer<TypeScriptOptions> {
             }
 
             for (const [packageName, packageSchemas] of Object.entries(grouped)) {
-                const tsPackageDir = tsFhirPackageDir(packageName);
-                this.cd(tsPackageDir, () => {
+                const packageDir = tsPackageDir(packageName);
+                this.cd(packageDir, () => {
                     for (const schema of packageSchemas) {
                         this.generateResourceModule(tsIndex, schema);
                     }