support additional properties in RLC

packages/rlc-common/src/buildIndexFile.ts

@@ -311,7 +311,7 @@ function generateRLCIndex(file: SourceFile, model: RLCModel) {
     hasMultiCollection(model) ||
     hasSsvCollection(model) ||
     hasPipeCollection(model) ||
-    hasTsvCollection(model) || 
+    hasTsvCollection(model) ||
     hasCsvCollection(model)
   ) {
     file.addExportDeclarations([

packages/rlc-common/src/buildObjectTypes.ts

@@ -363,24 +363,32 @@ function getImmediateParentsNames(
 
   const extendFrom: string[] = [];
 
-  // If an immediate parent is a DictionarySchema, that means that the object has been marked
+  // If an immediate parent is an empty DictionarySchema, that means that the object has been marked
   // with additional properties. We need to add Record<string, unknown> to the extend list and
-  if (objectSchema.parents.immediate.find(isDictionarySchema)) {
+  if (
+    objectSchema.parents.immediate.find((im) => isDictionarySchema(im, {filterEmpty: true}))
+  ) {
     extendFrom.push("Record<string, unknown>");
   }
 
   // Get the rest of the parents excluding any DictionarySchemas
   const parents = objectSchema.parents.immediate
-    .filter((p) => !isDictionarySchema(p))
+    .filter((p) => !isDictionarySchema(p, {filterEmpty: true}))
     .map((parent) => {
       const nameSuffix = schemaUsage.includes(SchemaContext.Output)
         ? "Output"
         : "";
-      const name = `${normalizeName(
-        parent.name,
-        NameType.Interface,
-        true /** shouldGuard */
-      )}${nameSuffix}`;
+      const name = isDictionarySchema(parent)
+        ? `${
+            (schemaUsage.includes(SchemaContext.Output)
+              ? parent.outputTypeName
+              : parent.typeName) ?? parent.name
+          }`
+        : `${normalizeName(
+            parent.name,
+            NameType.Interface,
+            true /** shouldGuard */
+          )}${nameSuffix}`;
 
       return isObjectSchema(parent) && isPolymorphicParent(parent)
         ? `${name}Parent`

packages/rlc-common/src/helpers/schemaHelpers.ts

@@ -3,9 +3,18 @@
 
 import { Schema } from "../interfaces.js";
 
-export function isDictionarySchema(schema: Schema) {
+export interface IsDictionaryOptions {
+  filterEmpty?: boolean;
+}
+
+export function isDictionarySchema(
+  schema: Schema,
+  options: IsDictionaryOptions = {}
+) {
   if (schema.type === "dictionary") {
-    return true;
+    if (!options.filterEmpty || (options.filterEmpty && !schema.typeName)) {
+      return true;
+    }
   }
   return false;
 }

packages/typespec-ts/src/modular/emitModels.ts

@@ -139,7 +139,11 @@ export function buildModelsOptions(
   client: Client
 ) {
   const modelOptionsFile = codeModel.project.createSourceFile(
-    `${codeModel.modularOptions.sourceRoot}/${client.subfolder}/models/options.ts`,
+    path.join(
+      codeModel.modularOptions.sourceRoot,
+      client.subfolder ?? "",
+      `models/options.ts`
+    ),
     undefined,
     {
       overwrite: true

packages/typespec-ts/src/modular/helpers/typeHelpers.ts

@@ -38,7 +38,7 @@ export function getType(type: Type, format?: string): TypeMetadata {
     case "boolean":
       return { name: getNullableType(type.type, type) };
     case "constant": {
-      let typeName: string = type.value ?? "undefined";
+      let typeName: string = type.value?.toString() ?? "undefined";
       if (type.valueType?.type === "string") {
         typeName = type.value ? `"${type.value}"` : "undefined";
       }

packages/typespec-ts/src/transform/transformSchemas.ts

@@ -122,8 +122,12 @@ export function transformSchemas(
 
       setModelMap(model, context);
       const indexer = (model as Model).indexer;
-      if (indexer?.value && !program.stateMap(modelKey).get(indexer?.value)) {
-        setModelMap(indexer.value, context);
+      if (
+        indexer?.value &&
+        (!program.stateMap(modelKey).get(indexer?.value) ||
+          !program.stateMap(modelKey).get(indexer?.value)?.includes(context))
+      ) {
+        getGeneratedModels(indexer.value, context);
       }
       for (const prop of model.properties) {
         if (