@azure-tools/typespec-ts 0.56.0-dev.0 → 0.56.0-dev.10

package/README.md

@@ -1,6 +1,6 @@
 # @azure-tools/typespec-ts
 
-An experimental TypeSpec emitter for TypeScript
+A TypeSpec emitter for TypeScript
 
 ## Install
 
@@ -126,12 +126,6 @@ other cases:
 
 Whether to generate sample files, for basic samples of your generated sdks. Defaults to `undefined`. Management packages' default to `true`.
 
-### `is-typespec-test`
-
-**Type:** `boolean`
-
-Internal option for test
-
 ### `azure-arm`
 
 **Type:** `boolean`
@@ -192,12 +186,6 @@ The emitter will use camel case to normalize the property name, to ignore this n
 
 The emitter has a normalization logic for enum member key, to ignore this normalization, you can set this option to true
 
-### `compatibility-query-multi-format`
-
-**Type:** `boolean`
-
-Whether to generate the backward-compatible code for query parameter serialization for array types in RLC. Defaults to `false`
-
 ### `typespec-title-map`
 
 **Type:** `object`

package/dist/src/context-manager.d.ts

@@ -4,7 +4,7 @@ import { Project, SourceFile } from "ts-morph";
 import { ExternalDependencies } from "./framework/dependency.js";
 import { Binder } from "./framework/hooks/binder.js";
 import { SdkTypeContext } from "./framework/hooks/sdk-types.js";
-import { RlcMetaTree } from "./meta-tree.js";
+import { ClientTypeMetaTree } from "./meta-tree.js";
 /**
  * Contexts Object Guidelines
  * --------------------------
@@ -19,7 +19,7 @@ import { RlcMetaTree } from "./meta-tree.js";
  * Remember, adding too many contexts can lead to complex dependencies and harder-to-maintain code. Always evaluate if the context is truly necessary or if there are better alternatives such as localized state management or passing props for simpler scenarios.
  */
 type Contexts = {
-    rlcMetaTree: RlcMetaTree;
+    clientTypeMetaTree: ClientTypeMetaTree;
     outputProject: Project;
     symbolMap: Map<string, SourceFile>;
     sdkTypes: SdkTypeContext;

package/dist/src/context-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-manager.d.ts","sourceRoot":"","sources":["../../src/context-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;;;;;GAYG;AACH,KAAK,QAAQ,GAAG;IACd,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACnC,QAAQ,EAAE,cAAc,CAAC;IACzB,WAAW,EAAE;QACX,eAAe,EAAE,WAAW,CAAC;QAC7B,WAAW,EAAE,UAAU,CAAC;KACzB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF,KAAK,UAAU,GAAG,MAAM,QAAQ,CAAC;AAEjC;;;GAGG;AACH,cAAM,cAAc;IAClB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAmC;IAEnD,OAAO;IAEP;;;OAGG;WACW,WAAW,IAAI,cAAc;IAO3C;;;;OAIG;IACI,UAAU,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI;IAIzE;;;;OAIG;IACI,UAAU,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS;CAGzE;AAGD,eAAO,MAAM,cAAc,gBAA+B,CAAC;AAE3D;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAMpE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAErF"}
+{"version":3,"file":"context-manager.d.ts","sourceRoot":"","sources":["../../src/context-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD;;;;;;;;;;;;GAYG;AACH,KAAK,QAAQ,GAAG;IACd,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACnC,QAAQ,EAAE,cAAc,CAAC;IACzB,WAAW,EAAE;QACX,eAAe,EAAE,WAAW,CAAC;QAC7B,WAAW,EAAE,UAAU,CAAC;KACzB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF,KAAK,UAAU,GAAG,MAAM,QAAQ,CAAC;AAEjC;;;GAGG;AACH,cAAM,cAAc;IAClB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAmC;IAEnD,OAAO;IAEP;;;OAGG;WACW,WAAW,IAAI,cAAc;IAO3C;;;;OAIG;IACI,UAAU,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI;IAIzE;;;;OAIG;IACI,UAAU,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS;CAGzE;AAGD,eAAO,MAAM,cAAc,gBAA+B,CAAC;AAE3D;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAMpE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAErF"}

package/dist/src/framework/declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../src/framework/declaration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,eAAe,EACf,wBAAwB,EACxB,mBAAmB,EACnB,4BAA4B,EAC5B,oBAAoB,EACpB,6BAA6B,EAC7B,UAAU,EAEV,oBAAoB,EACpB,6BAA6B,EAC9B,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,qBAAqB,GAC7B,yBAAyB,GACzB,wBAAwB,GACxB,4BAA4B,GAC5B,6BAA6B,GAC7B,6BAA6B,CAAC;AAElC,MAAM,MAAM,YAAY,GACpB,gBAAgB,GAChB,eAAe,GACf,mBAAmB,GACnB,oBAAoB,GACpB,oBAAoB,CAAC;AAEzB,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,yBAAyB,EACtC,MAAM,EAAE,OAAO,GACd,IAAI,CAAC;AAER,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,wBAAwB,EACrC,MAAM,EAAE,OAAO,GACd,IAAI,CAAC;AAER,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,4BAA4B,EACzC,MAAM,EAAE,OAAO,GACd,IAAI,CAAC;AAER,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,6BAA6B,EAC1C,MAAM,EAAE,OAAO,GACd,IAAI,CAAC;AAER,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,6BAA6B,EAC1C,MAAM,EAAE,OAAO,GACd,IAAI,CAAC;AACR,wBAAgB,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC"}
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../src/framework/declaration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,eAAe,EACf,wBAAwB,EACxB,mBAAmB,EACnB,4BAA4B,EAC5B,oBAAoB,EACpB,6BAA6B,EAC7B,UAAU,EAGV,oBAAoB,EACpB,6BAA6B,EAC9B,MAAM,UAAU,CAAC;AAIlB,MAAM,MAAM,qBAAqB,GAC7B,yBAAyB,GACzB,wBAAwB,GACxB,4BAA4B,GAC5B,6BAA6B,GAC7B,6BAA6B,CAAC;AAElC,MAAM,MAAM,YAAY,GACpB,gBAAgB,GAChB,eAAe,GACf,mBAAmB,GACnB,oBAAoB,GACpB,oBAAoB,CAAC;AAEzB,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,yBAAyB,EACtC,MAAM,EAAE,OAAO,GACd,IAAI,CAAC;AAER,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,wBAAwB,EACrC,MAAM,EAAE,OAAO,GACd,IAAI,CAAC;AAER,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,4BAA4B,EACzC,MAAM,EAAE,OAAO,GACd,IAAI,CAAC;AAER,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,6BAA6B,EAC1C,MAAM,EAAE,OAAO,GACd,IAAI,CAAC;AAER,wBAAgB,cAAc,CAC5B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,6BAA6B,EAC1C,MAAM,EAAE,OAAO,GACd,IAAI,CAAC;AACR,wBAAgB,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC"}

package/dist/src/framework/declaration.js

@@ -1,6 +1,7 @@
 import { StructureKind, } from "ts-morph";
 import { useBinder } from "./hooks/binder.js";
 import { refkey as getRefKey } from "./refkey.js";
+import { enqueueStatement } from "./source-file-batch.js";
 export function addDeclaration(sourceFile, input, refkey) {
     const binder = useBinder();
     const declaration = typeof input === "string" ? { name: input, kind: StructureKind.TypeAlias } : input;
@@ -11,26 +12,11 @@ export function addDeclaration(sourceFile, input, refkey) {
     const trackedDeclarationName = binder.trackDeclaration(stringRefkey, declaration.name, sourceFile);
     // Update the declaration name to be unique
     const trackedDeclaration = { ...declaration, name: trackedDeclarationName };
-    switch (trackedDeclaration.kind) {
-        case StructureKind.Class:
-            sourceFile.addClass(trackedDeclaration);
-            break;
-        case StructureKind.Enum:
-            sourceFile.addEnum(trackedDeclaration);
-            break;
-        case StructureKind.Function:
-            sourceFile.addFunction(trackedDeclaration);
-            break;
-        case StructureKind.Interface:
-            sourceFile.addInterface(trackedDeclaration);
-            break;
-        case StructureKind.TypeAlias:
-            if (trackedDeclaration.type) {
-                sourceFile.addTypeAlias(trackedDeclaration);
-            }
-            break;
-        default:
-            throw new Error(`Unsupported declaration kind ${trackedDeclaration.kind}`);
+    // Skip empty type aliases (they have no body to emit). Done before
+    // dispatching so behaviour is identical whether batching or not.
+    if (trackedDeclaration.kind === StructureKind.TypeAlias && !trackedDeclaration.type) {
+        return;
     }
+    enqueueStatement(sourceFile, trackedDeclaration);
 }
 //# sourceMappingURL=declaration.js.map

package/dist/src/framework/declaration.js.map

@@ -1 +1 @@
-{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../../src/framework/declaration.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,aAAa,GAGd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AA6ClD,MAAM,UAAU,cAAc,CAC5B,UAAsB,EACtB,KAAqC,EACrC,MAAe;IAEf,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,WAAW,GACf,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,CAAC,SAAS,EAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9F,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,YAAY,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC7E,MAAM,sBAAsB,GAAG,MAAM,CAAC,gBAAgB,CACpD,YAAY,EACZ,WAAW,CAAC,IAAI,EAChB,UAAU,CACX,CAAC;IAEF,2CAA2C;IAC3C,MAAM,kBAAkB,GAAG,EAAE,GAAG,WAAW,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;IAE5E,QAAQ,kBAAkB,CAAC,IAAI,EAAE,CAAC;QAChC,KAAK,aAAa,CAAC,KAAK;YACtB,UAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;YACxC,MAAM;QACR,KAAK,aAAa,CAAC,IAAI;YACrB,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YACvC,MAAM;QACR,KAAK,aAAa,CAAC,QAAQ;YACzB,UAAU,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;YAC3C,MAAM;QACR,KAAK,aAAa,CAAC,SAAS;YAC1B,UAAU,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;YAC5C,MAAM;QACR,KAAK,aAAa,CAAC,SAAS;YAC1B,IAAI,kBAAkB,CAAC,IAAI,EAAE,CAAC;gBAC5B,UAAU,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;YAC9C,CAAC;YACD,MAAM;QACR;YACE,MAAM,IAAI,KAAK,CAAC,gCAAiC,kBAA0B,CAAC,IAAI,EAAE,CAAC,CAAC;IACxF,CAAC;AACH,CAAC"}
+{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../../src/framework/declaration.ts"],"names":[],"mappings":"AAAA,OAAO,EAWL,aAAa,GAGd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AA6C1D,MAAM,UAAU,cAAc,CAC5B,UAAsB,EACtB,KAAqC,EACrC,MAAe;IAEf,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,WAAW,GACf,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,CAAC,SAAS,EAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9F,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,YAAY,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC7E,MAAM,sBAAsB,GAAG,MAAM,CAAC,gBAAgB,CACpD,YAAY,EACZ,WAAW,CAAC,IAAI,EAChB,UAAU,CACX,CAAC;IAEF,2CAA2C;IAC3C,MAAM,kBAAkB,GAAG,EAAE,GAAG,WAAW,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;IAE5E,mEAAmE;IACnE,iEAAiE;IACjE,IAAI,kBAAkB,CAAC,IAAI,KAAK,aAAa,CAAC,SAAS,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC;QACpF,OAAO;IACT,CAAC;IAED,gBAAgB,CAAC,UAAU,EAAE,kBAAyC,CAAC,CAAC;AAC1E,CAAC"}

package/dist/src/framework/hooks/sdk-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-types.d.ts","sourceRoot":"","sources":["../../../../src/framework/hooks/sdk-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACZ,gBAAgB,EAChB,OAAO,EAER,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAwB,MAAM,oBAAoB,CAAC;AAQ3E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,eAAO,MAAM,SAAS,EAAE,GAAG,CAAC,OAAO,CAAsB,CAAC;AAC1D,eAAO,MAAM,uBAAuB,EAAE,GAAG,CAAC,oBAAoB,EAAE,YAAY,CAGzE,CAAC;AACJ;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,cAAqB,CAAC;AAExD,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC1D,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1B,iBAAiB,EAAE,GAAG,CAAC,oBAAoB,EAAE,yBAAyB,CAAC,CAAC;CACzE;AAED,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,YAAY,CAAC;IACxB,WAAW,CAAC,EAAE,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;CACjD;AAED,wBAAgB,WAAW;WAIC,SAAS,GAAG,gBAAgB,CAAC,gBAAgB,CAAC;WAC9C,IAAI,GAAG,OAAO;EAwBzC;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,UAAU,QAkElD;AAmED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,aAAa,CAAC,gBAAgB,CAAC,wCAYjF"}
+{"version":3,"file":"sdk-types.d.ts","sourceRoot":"","sources":["../../../../src/framework/hooks/sdk-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACZ,gBAAgB,EAChB,OAAO,EAER,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAwB,MAAM,oBAAoB,CAAC;AAO3E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,eAAO,MAAM,SAAS,EAAE,GAAG,CAAC,OAAO,CAAsB,CAAC;AAC1D,eAAO,MAAM,uBAAuB,EAAE,GAAG,CAAC,oBAAoB,EAAE,YAAY,CAGzE,CAAC;AACJ;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,cAAqB,CAAC;AAExD,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC1D,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1B,iBAAiB,EAAE,GAAG,CAAC,oBAAoB,EAAE,yBAAyB,CAAC,CAAC;CACzE;AAED,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,YAAY,CAAC;IACxB,WAAW,CAAC,EAAE,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;CACjD;AAED,wBAAgB,WAAW;WAIC,SAAS,GAAG,gBAAgB,CAAC,gBAAgB,CAAC;WAC9C,IAAI,GAAG,OAAO;EAwBzC;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,UAAU,QAkElD;AAmED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,aAAa,CAAC,gBAAgB,CAAC,wCAYjF"}

package/dist/src/framework/hooks/sdk-types.js

@@ -5,7 +5,7 @@ import { reportDiagnostic } from "../../lib.js";
 import { visitPackageTypes } from "../../modular/emit-models.js";
 import { getAllAncestors, getAllProperties } from "../../modular/helpers/operation-helpers.js";
 import { normalizeModelPropertyName } from "../../modular/type-expressions/get-type-expression.js";
-import { NameType, normalizeName } from "../../rlc-common/index.js";
+import { NameType, normalizeName } from "../../utils/name-utils.js";
 export const emitQueue = new Set();
 export const flattenPropertyModelMap = new Map();
 /**

package/dist/src/framework/hooks/sdk-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-types.js","sourceRoot":"","sources":["../../../../src/framework/hooks/sdk-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sdk-types.js","sourceRoot":"","sources":["../../../../src/framework/hooks/sdk-types.ts"],"names":[],"mappings":"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"}

package/dist/src/framework/source-file-batch.d.ts

@@ -0,0 +1,35 @@
+import { SourceFile, StatementStructures } from "ts-morph";
+/**
+ * Opens a batching scope. Subsequent `enqueueStatement` calls queue rather
+ * than mutate the AST until the matching `flushSourceFileBatch` is called.
+ */
+export declare function beginSourceFileBatch(): void;
+/**
+ * Closes the most recent batching scope. When the outermost scope closes,
+ * all pending structures are written to their source files in bulk.
+ */
+export declare function flushSourceFileBatch(): void;
+/**
+ * Queues a statement structure for bulk-add on flush, or writes it
+ * immediately when no batch is open.
+ * @param sourceFile - Target source file.
+ * @param structure - The statement structure to add.
+ */
+export declare function enqueueStatement(sourceFile: SourceFile, structure: StatementStructures): void;
+/**
+ * Returns the set of names exported from `sourceFile` considering both the
+ * declarations already present in its AST and any export declarations queued
+ * by the current batch. Use this in place of reading `getExportDeclarations`
+ * directly when callers dedup against existing exports inside a batch.
+ * @param sourceFile - The file to inspect.
+ */
+export declare function getEffectiveExportedNames(sourceFile: SourceFile): Set<string>;
+/**
+ * Returns the set of named exports queued in the current batch for
+ * `sourceFile`. Use this to union with any AST-based view of exports
+ * (e.g. `getExportedDeclarations`) when deduplicating against still-pending
+ * writes inside a batch.
+ * @param sourceFile - The file to inspect.
+ */
+export declare function getQueuedExportNames(sourceFile: SourceFile): Set<string>;
+//# sourceMappingURL=source-file-batch.d.ts.map

package/dist/src/framework/source-file-batch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-file-batch.d.ts","sourceRoot":"","sources":["../../../src/framework/source-file-batch.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,mBAAmB,EAEpB,MAAM,UAAU,CAAC;AAkBlB;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAkB3C;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,GAAG,IAAI,CAW7F;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,CAiB7E;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,CAaxE"}

package/dist/src/framework/source-file-batch.js

@@ -0,0 +1,128 @@
+import { StructureKind, } from "ts-morph";
+/**
+ * Generic per-source-file batch for ts-morph `add*` mutations.
+ *
+ * Each individual `sourceFile.addInterface/addFunction/addExportDeclaration/...`
+ * call re-parses the entire source file in ts-morph. Calling them in a loop
+ * therefore grows as O(N × file_size). This module collects structures while
+ * a batch is open and, on flush, issues a single `addStatements` call per file,
+ * collapsing N re-parses into 1.
+ *
+ * The batch is reference-counted so nested begin/flush pairs compose safely.
+ * Statements flush in insertion order and produce byte-identical output.
+ */
+let batchDepth = 0;
+const pendingByFile = new Map();
+/**
+ * Opens a batching scope. Subsequent `enqueueStatement` calls queue rather
+ * than mutate the AST until the matching `flushSourceFileBatch` is called.
+ */
+export function beginSourceFileBatch() {
+    batchDepth++;
+}
+/**
+ * Closes the most recent batching scope. When the outermost scope closes,
+ * all pending structures are written to their source files in bulk.
+ */
+export function flushSourceFileBatch() {
+    if (batchDepth === 0) {
+        return;
+    }
+    batchDepth--;
+    if (batchDepth > 0) {
+        return;
+    }
+    try {
+        for (const [sourceFile, statements] of pendingByFile) {
+            if (statements.length === 0) {
+                continue;
+            }
+            sourceFile.addStatements(statements);
+        }
+    }
+    finally {
+        pendingByFile.clear();
+    }
+}
+/**
+ * Queues a statement structure for bulk-add on flush, or writes it
+ * immediately when no batch is open.
+ * @param sourceFile - Target source file.
+ * @param structure - The statement structure to add.
+ */
+export function enqueueStatement(sourceFile, structure) {
+    if (batchDepth > 0) {
+        let pending = pendingByFile.get(sourceFile);
+        if (!pending) {
+            pending = [];
+            pendingByFile.set(sourceFile, pending);
+        }
+        pending.push(structure);
+        return;
+    }
+    sourceFile.addStatements([structure]);
+}
+/**
+ * Returns the set of names exported from `sourceFile` considering both the
+ * declarations already present in its AST and any export declarations queued
+ * by the current batch. Use this in place of reading `getExportDeclarations`
+ * directly when callers dedup against existing exports inside a batch.
+ * @param sourceFile - The file to inspect.
+ */
+export function getEffectiveExportedNames(sourceFile) {
+    const names = new Set();
+    for (const decl of sourceFile.getExportDeclarations()) {
+        for (const named of decl.getNamedExports()) {
+            names.add(named.getAliasNode()?.getText() ?? named.getName());
+        }
+    }
+    const pending = pendingByFile.get(sourceFile);
+    if (pending) {
+        for (const structure of pending) {
+            if (structure.kind !== StructureKind.ExportDeclaration) {
+                continue;
+            }
+            collectNamedExportNames(structure.namedExports, names);
+        }
+    }
+    return names;
+}
+/**
+ * Returns the set of named exports queued in the current batch for
+ * `sourceFile`. Use this to union with any AST-based view of exports
+ * (e.g. `getExportedDeclarations`) when deduplicating against still-pending
+ * writes inside a batch.
+ * @param sourceFile - The file to inspect.
+ */
+export function getQueuedExportNames(sourceFile) {
+    const names = new Set();
+    const pending = pendingByFile.get(sourceFile);
+    if (!pending) {
+        return names;
+    }
+    for (const structure of pending) {
+        if (structure.kind !== StructureKind.ExportDeclaration) {
+            continue;
+        }
+        collectNamedExportNames(structure.namedExports, names);
+    }
+    return names;
+}
+function collectNamedExportNames(named, into) {
+    if (!named || typeof named === "function") {
+        // WriterFunction form is opaque to us; callers can't dedup by name.
+        return;
+    }
+    for (const item of named) {
+        if (typeof item === "string") {
+            into.add(item);
+        }
+        else if (typeof item === "function") {
+            continue;
+        }
+        else if (item) {
+            into.add(item.alias ?? item.name);
+        }
+    }
+}
+//# sourceMappingURL=source-file-batch.js.map

package/dist/src/framework/source-file-batch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-file-batch.js","sourceRoot":"","sources":["../../../src/framework/source-file-batch.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,WAAW,EAOZ,MAAM,oBAAoB,CAAC;AAuD5B,OAAO,EAAuB,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExE,OAAO,EACL,aAAa,EACb,mBAAmB,EAGpB,MAAM,6CAA6C,CAAC;AAoBrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAWhE,cAAc,UAAU,CAAC;AAEzB,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,iBA8ejD;AAED,wBAAsB,+BAA+B,CACnD,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GACxC,OAAO,CAAC,UAAU,CAAC,CA2BrB;AAQD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,iBAQtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,WAAW,EAOZ,MAAM,oBAAoB,CAAC;AAwB5B,OAAO,EAAuB,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExE,OAAO,EACL,aAAa,EACb,mBAAmB,EAGpB,MAAM,6CAA6C,CAAC;AAgDrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAOhE,cAAc,UAAU,CAAC;AAEzB,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,iBAiejD;AAED,wBAAsB,+BAA+B,CACnD,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GACxC,OAAO,CAAC,UAAU,CAAC,CA2BrB;AAQD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,iBAQtC"}

package/dist/src/index.js

@@ -5,7 +5,6 @@ import { provideContext, useContext } from "./context-manager.js";
 import { buildRootIndex, buildSubClientIndexFile } from "./modular/build-root-index.js";
 import { AzureCoreDependencies, AzureIdentityDependencies, AzurePollingDependencies, AzureTestDependencies, } from "./modular/external-dependencies.js";
 import { CloudSettingHelpers, CreateRecorderHelpers, MultipartHelpers, PagingHelpers, PlatformTypeHelpers, PollingHelpers, SerializationHelpers, SimplePollerHelpers, StorageCompatHelpers, UrlTemplateHelpers, XmlHelpers, } from "./modular/static-helpers-metadata.js";
-import { buildApiExtractorConfig, buildChangelogFile, buildEsLintConfig, buildLicenseFile, buildPackageFile, buildReadmeFile, buildRecordedClientFile, buildSampleEnvFile, buildSampleTest, buildSnippets, buildTestBrowserTsConfig, buildTestNodeTsConfig, buildTsConfig, buildTsLintConfig, buildTsSampleConfig, buildTsSnippetsConfig, buildTsSrcBrowserConfig, buildTsSrcCjsConfig, buildTsSrcEsmConfig, buildTsSrcReactNativeConfig, buildVitestConfig, buildWarpConfig, getClientName, hasClientNameChanged, hasUnexpectedHelper, updatePackageFile, updateReadmeFile, } from "./rlc-common/index.js";
 import { emitContentByBuilder } from "./utils/emit-util.js";
 import { clearDirectory, emptyDir, pathExists } from "./utils/file-system-utils.js";
 import { createSdkContext, listAllServiceNamespaces, } from "@azure-tools/typespec-client-generator-core";
@@ -13,6 +12,20 @@ import { Project } from "ts-morph";
 import { provideBinder } from "./framework/hooks/binder.js";
 import { provideSdkTypes } from "./framework/hooks/sdk-types.js";
 import { loadStaticHelpers } from "./framework/load-static-helpers.js";
+import { buildApiExtractorConfig } from "./metadata/build-api-extractor-config.js";
+import { buildChangelogFile } from "./metadata/build-changelog-file.js";
+import { buildEsLintConfig } from "./metadata/build-es-lint-config.js";
+import { buildLicenseFile } from "./metadata/build-license-file.js";
+import { buildPackageFile, updatePackageFile } from "./metadata/build-package-file.js";
+import { buildReadmeFile, hasClientNameChanged, updateReadmeFile, } from "./metadata/build-readme-file.js";
+import { buildSampleEnvFile } from "./metadata/build-sample-env-file.js";
+import { buildTestBrowserTsConfig, buildTestNodeTsConfig } from "./metadata/build-test-config.js";
+import { buildTsConfig, buildTsLintConfig, buildTsSampleConfig, buildTsSnippetsConfig, buildTsSrcBrowserConfig, buildTsSrcCjsConfig, buildTsSrcEsmConfig, buildTsSrcReactNativeConfig, } from "./metadata/build-ts-config.js";
+import { buildVitestConfig } from "./metadata/build-vitest-config.js";
+import { buildWarpConfig } from "./metadata/build-warp-config.js";
+import { buildRecordedClientFile } from "./metadata/test/build-recorded-client.js";
+import { buildSampleTest } from "./metadata/test/build-sample-test.js";
+import { buildSnippets } from "./metadata/test/build-snippets.js";
 import { buildClassicalClient } from "./modular/build-classical-client.js";
 import { buildClassicOperationFiles } from "./modular/build-classical-operation-groups.js";
 import { buildClientContext, getClientContextPath } from "./modular/build-client-context.js";
@@ -28,9 +41,9 @@ import { emitSamples } from "./modular/emit-samples.js";
 import { emitTests } from "./modular/emit-tests.js";
 import { getClassicalClientName } from "./modular/helpers/naming-helpers.js";
 import { packageUsesXmlSerialization } from "./modular/serialization/build-xml-serializer-function.js";
-import { transformRLCModel } from "./transform/transform.js";
-import { transformRLCOptions } from "./transform/transfrom-rlc-options.js";
-import { getClientHierarchyMap, getModularClientOptions, getRLCClients, } from "./utils/client-utils.js";
+import { transformClientOptions } from "./transform/transform-client-options.js";
+import { transformClientModel } from "./transform/transform.js";
+import { getClientHierarchyMap, getClientModuleInfo, getClients } from "./utils/client-utils.js";
 import { generateCrossLanguageDefinitionFile } from "./utils/cross-language-def.js";
 export * from "./lib.js";
 export async function $onEmit(context) {
@@ -55,10 +68,8 @@ export async function $onEmit(context) {
     }
     // Enrich the dpg context with path detail and common options
     await enrichDpgContext();
-    const rlcOptions = dpgContext.rlcOptions ?? {};
-    const needUnexpectedHelper = new Map();
-    const serviceNameToRlcModelsMap = new Map();
-    provideContext("rlcMetaTree", new Map());
+    const resolvedEmitterOptions = dpgContext.emitterOptions ?? {};
+    provideContext("clientTypeMetaTree", new Map());
     provideContext("symbolMap", new Map());
     provideContext("outputProject", outputProject);
     provideContext("emitContext", {
@@ -75,12 +86,12 @@ export async function $onEmit(context) {
         ...PlatformTypeHelpers,
         ...CloudSettingHelpers,
         ...XmlHelpers,
-        ...(rlcOptions.generateTest ? CreateRecorderHelpers : {}),
-        ...(rlcOptions.enableStorageCompat ? StorageCompatHelpers : {}),
+        ...(resolvedEmitterOptions.generateTest ? CreateRecorderHelpers : {}),
+        ...(resolvedEmitterOptions.enableStorageCompat ? StorageCompatHelpers : {}),
     }, {
-        sourcesDir: dpgContext.generationPathDetail?.modularSourcesDir,
+        sourcesDir: dpgContext.generationPathDetail?.sourcesDir,
         rootDir: dpgContext.generationPathDetail?.rootDir,
-        options: rlcOptions,
+        options: resolvedEmitterOptions,
         program,
         host,
         packageRoot: emitterPackageRoot,
@@ -99,18 +110,14 @@ export async function $onEmit(context) {
         useSubpathImports: true,
     });
     provideSdkTypes(dpgContext);
-    const rlcCodeModels = [];
     let modularEmitterOptions;
     // 1. Clear sources folder
     await clearSrcFolder();
-    // 2. Generate RLC code model
-    // TODO: skip this step in modular once modular generator is sufficiently decoupled
-    await buildRLCCodeModels();
-    // 3. Clear samples-dev folder if generateSample is true
+    // 2. Clear samples-dev folder if generateSample is true
     await clearSamplesDevFolder();
-    // 4. Generate sources
-    await generateModularSources();
-    // 5. Generate metadata and test files
+    // 3. Generate sources
+    await generateSources();
+    // 4. Generate metadata and test files
     function getTypespecTsVersion(context) {
         const emitterMetadata = context.program.emitters.find((emitter) => emitter.metadata.name === "@azure-tools/typespec-ts");
         return emitterMetadata?.metadata.version;
@@ -120,7 +127,7 @@ export async function $onEmit(context) {
         const generationPathDetail = await calculateGenerationDir();
         dpgContext.generationPathDetail = generationPathDetail;
         dpgContext.allServiceNamespaces = listAllServiceNamespaces(dpgContext);
-        const options = transformRLCOptions(emitterOptions, dpgContext);
+        const options = transformClientOptions(emitterOptions, dpgContext);
         emitterOptions["generate-sample"] = options.generateSample;
         // clear output folder if needed
         if (options.clearOutputFolder) {
@@ -131,7 +138,7 @@ export async function $onEmit(context) {
         options.generateTest =
             options.generateTest === true ||
                 (options.generateTest === undefined && (!hasTestFolder || options.azureArm));
-        dpgContext.rlcOptions = options;
+        dpgContext.emitterOptions = options;
     }
     async function calculateGenerationDir() {
         const projectRoot = context.emitterOutputDir ?? "";
@@ -147,14 +154,11 @@ export async function $onEmit(context) {
         return {
             rootDir: projectRoot,
             metadataDir: projectRoot,
-            rlcSourcesDir: sourcesRoot,
-            modularSourcesDir: sourcesRoot,
+            sourcesDir: sourcesRoot,
         };
     }
     async function clearSrcFolder() {
-        await emptyDir(host, dpgContext.generationPathDetail?.modularSourcesDir ??
-            dpgContext.generationPathDetail?.rlcSourcesDir ??
-            "");
+        await emptyDir(host, dpgContext.generationPathDetail?.sourcesDir ?? "");
     }
     async function clearSamplesDevFolder() {
         if (emitterOptions["generate-sample"] === true) {
@@ -164,28 +168,26 @@ export async function $onEmit(context) {
             }
         }
     }
-    async function buildRLCCodeModels() {
-        const clients = getRLCClients(dpgContext);
+    async function buildClientCodeModels() {
+        const models = [];
+        const clients = getClients(dpgContext);
         for (const client of clients) {
-            const rlcModels = await transformRLCModel(client, dpgContext);
-            rlcCodeModels.push(rlcModels);
-            const serviceName = client.services[0]?.name ?? "Unknown";
-            serviceNameToRlcModelsMap.set(serviceName, rlcModels);
-            needUnexpectedHelper.set(getClientName(rlcModels), hasUnexpectedHelper(rlcModels));
+            models.push(await transformClientModel(client, dpgContext));
         }
+        return models;
     }
-    async function generateModularSources() {
-        const modularSourcesRoot = dpgContext.generationPathDetail?.modularSourcesDir ?? "src";
+    async function generateSources() {
+        const sourcesRoot = dpgContext.generationPathDetail?.sourcesDir ?? "src";
         const project = useContext("outputProject");
-        modularEmitterOptions = transformModularEmitterOptions(dpgContext, modularSourcesRoot, {
+        modularEmitterOptions = transformModularEmitterOptions(dpgContext, sourcesRoot, {
             casing: "camel",
         });
-        emitLoggerFile(modularEmitterOptions, modularSourcesRoot);
-        const rootIndexFile = project.createSourceFile(`${modularSourcesRoot}/index.ts`, "", {
+        emitLoggerFile(modularEmitterOptions, sourcesRoot);
+        const rootIndexFile = project.createSourceFile(`${sourcesRoot}/index.ts`, "", {
             overwrite: true,
         });
-        emitTypes(dpgContext, { sourceRoot: modularSourcesRoot });
-        emitNonModelResponseTypes(dpgContext, { sourceRoot: modularSourcesRoot });
+        emitTypes(dpgContext, { sourceRoot: sourcesRoot });
+        emitNonModelResponseTypes(dpgContext, { sourceRoot: sourcesRoot });
         buildSubpathIndexFile(modularEmitterOptions, "models", undefined, {
             recursive: true,
         });
@@ -200,7 +202,7 @@ export async function $onEmit(context) {
             buildOperationFiles(dpgContext, subClient, modularEmitterOptions);
             buildClientContext(dpgContext, subClient, modularEmitterOptions);
             buildRestorePoller(dpgContext, subClient, modularEmitterOptions);
-            if (dpgContext.rlcOptions?.hierarchyClient) {
+            if (dpgContext.emitterOptions?.hierarchyClient) {
                 buildSubpathIndexFile(modularEmitterOptions, "api", subClient, {
                     exportIndex: false,
                     recursive: true,
@@ -218,23 +220,23 @@ export async function $onEmit(context) {
                 exportIndex: true,
                 interfaceOnly: true,
             });
-            const { subfolder } = getModularClientOptions(subClient);
+            const { subfolder } = getClientModuleInfo(subClient);
             // Generate index file for clients with subfolders (multi-client scenarios and nested clients)
             if (subfolder) {
                 buildSubClientIndexFile(dpgContext, subClient, modularEmitterOptions);
             }
             buildRootIndex(dpgContext, modularEmitterOptions, rootIndexFile, subClient);
         }
-        // Enable modular sample generation when explicitly set to true or MPG
+        // Sample generation is enabled only when the modular generator actually emits
+        // samples. Reset the baseline here, then re-enable it below if any are emitted.
+        dpgContext.emitterOptions.generateSample = false;
         if (emitterOptions["generate-sample"] === true) {
             const samples = emitSamples(dpgContext);
-            // Refine the rlc sample generation logic
-            // TODO: remember to remove this out when RLC is splitted from Modular
             if (samples.length > 0) {
-                dpgContext.rlcOptions.generateSample = true;
+                dpgContext.emitterOptions.generateSample = true;
             }
         }
-        binder.resolveAllReferences(modularSourcesRoot, dpgContext.generationPathDetail?.rootDir);
+        binder.resolveAllReferences(sourcesRoot, dpgContext.generationPathDetail?.rootDir);
         if (program.compilerOptions.noEmit || program.hasError()) {
             return;
         }
@@ -263,17 +265,18 @@ export async function $onEmit(context) {
     }
     async function generateMetadataAndTest(context) {
         const project = useContext("outputProject");
-        if (rlcCodeModels.length === 0 || !rlcCodeModels[0]) {
+        const clientCodeModels = await buildClientCodeModels();
+        if (clientCodeModels.length === 0 || !clientCodeModels[0]) {
             return;
         }
-        const rlcClient = rlcCodeModels[0];
-        const option = dpgContext.rlcOptions;
+        const clientModel = clientCodeModels[0];
+        const option = dpgContext.emitterOptions;
         // When generateMetadata is explicitly false and the sources are generated
         // into a path ending with "generated" (e.g. src/generated), this package
         // has a manual convenience layer. Skip all metadata/test file generation
         // to avoid unexpected modifications to files like package.json, README.md,
         // warp.config.yml, and snippets.spec.ts. metadata.json is still updated.
-        const sourcesDir = dpgContext.generationPathDetail?.modularSourcesDir ?? "";
+        const sourcesDir = dpgContext.generationPathDetail?.sourcesDir ?? "";
         const hasManualConvenienceLayer = getBaseFileName(sourcesDir) === "generated";
         // Generate metadata
         const existingPackageFilePath = joinPaths(dpgContext.generationPathDetail?.metadataDir ?? "", "package.json");
@@ -295,7 +298,7 @@ export async function $onEmit(context) {
         }
         //TODO Need consider multi-client cases
         for (const subClient of dpgContext.sdkPackage.clients) {
-            rlcClient.libraryName = subClient.name;
+            clientModel.libraryName = subClient.name;
         }
         if (shouldGenerateMetadata) {
             const commonBuilders = [
@@ -357,7 +360,7 @@ export async function $onEmit(context) {
                 commonBuilders.push(buildTsSnippetsConfig);
             }
             // build metadata relevant files
-            await emitContentByBuilder(program, commonBuilders, rlcClient, dpgContext.generationPathDetail?.metadataDir);
+            await emitContentByBuilder(program, commonBuilders, clientModel, dpgContext.generationPathDetail?.metadataDir);
             for (const file of project.getSourceFiles()) {
                 await emitContentByBuilder(program, () => ({ content: file.getFullText(), path: file.getFilePath() }), modularEmitterOptions);
             }
@@ -378,8 +381,8 @@ export async function $onEmit(context) {
                     dependencies: additionalDependencies,
                 }),
             };
-            // Always update package.json (adds #platform/* imports) and, for modular
-            // packages, exports, clientContextPaths and LRO deps.
+            // Always update package.json (adds #platform/* imports) along with
+            // exports, clientContextPaths and LRO deps.
             {
                 // Read package.json content via host and pass parsed object
                 const pkgSourceFile = await host.readFile(existingPackageFilePath);
@@ -399,7 +402,7 @@ export async function $onEmit(context) {
             if (hasReadmeFile) {
                 const readmeSourceFile = await host.readFile(existingReadmeFilePath);
                 const existingReadmeContent = readmeSourceFile.text;
-                const clientNameChanged = hasClientNameChanged(rlcClient, existingReadmeContent);
+                const clientNameChanged = hasClientNameChanged(clientModel, existingReadmeContent);
                 updateBuilders.push(clientNameChanged
                     ? buildReadmeFile
                     : (model) => updateReadmeFile(model, existingReadmeContent));
@@ -411,12 +414,12 @@ export async function $onEmit(context) {
                 }
             }
             // update metadata relevant files
-            await emitContentByBuilder(program, updateBuilders, rlcClient, dpgContext.generationPathDetail?.metadataDir);
+            await emitContentByBuilder(program, updateBuilders, clientModel, dpgContext.generationPathDetail?.metadataDir);
         }
-        await emitContentByBuilder(program, buildMetadataJson, rlcClient, dpgContext.generationPathDetail?.metadataDir);
+        await emitContentByBuilder(program, buildMetadataJson, clientModel, dpgContext.generationPathDetail?.metadataDir);
         // Generate test relevant files
         if (option.generateTest && !hasTestFolder) {
-            await emitContentByBuilder(program, [buildRecordedClientFile, buildSampleTest], rlcClient, dpgContext.generationPathDetail?.metadataDir);
+            await emitContentByBuilder(program, [buildRecordedClientFile, buildSampleTest], clientModel, dpgContext.generationPathDetail?.metadataDir);
         }
     }
     function getRelativeContextPaths(context, options) {