@azure-tools/typespec-java 0.34.1 → 0.35.0

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

@@ -1 +1 @@
-{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gDA8GN,CAAC;AAEZ,eAAO,MAAc,OAAO,UAAE,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAE,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sDAAE,SAAS,wFAAS,CAAC"}
+{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gDAoHN,CAAC;AAEZ,eAAO,MAAc,OAAO,UAAE,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAE,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sDAAE,SAAS,wFAAS,CAAC"}

package/dist/src/lib.js

@@ -102,6 +102,12 @@ export const $lib = createTypeSpecLibrary({
                 default: paramMessage `Namespace '${"namespace"}' contains reserved Java keywords, replaced it with '${"processedNamespace"}'.`,
             },
         },
+        "nested-page-items-not-supported": {
+            severity: "warning",
+            messages: {
+                default: "Nested pageItems is not supported in Azure V1.",
+            },
+        },
     },
     emitter: {
         options: EmitterOptionsSchema,

package/dist/src/lib.js.map

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

package/dist/src/versioning-utils.d.ts

@@ -1,5 +1,6 @@
 import { SdkClientType, SdkHttpOperation } from "@azure-tools/typespec-client-generator-core";
 import { Program } from "@typespec/compiler";
+import { Version } from "@typespec/versioning";
 /**
  * Gets the array of api-version on the TypeSpec service that contains this SDK client.
  * `undefined` if the service is not versioned.
@@ -8,15 +9,17 @@ import { Program } from "@typespec/compiler";
  * @param client the SDK client
  * @returns the array of api-version on the TypeSpec service that contains this SDK client
  */
-export declare function getServiceApiVersions(program: Program, client: SdkClientType<SdkHttpOperation>): string[] | undefined;
+export declare function getServiceApiVersions(program: Program, client: SdkClientType<SdkHttpOperation>): Version[] | undefined;
 /**
  * Filter api-versions for "ServiceVersion".
  * TODO(xiaofei) pending TCGC design: https://github.com/Azure/typespec-azure/issues/965
+ * We still cannot move to TCGC, due to it only recognizes api-versions from 1 service.
  *
  * @param pinnedApiVersion the api-version to use as filter base
  * @param versions api-versions to filter
+ * @param excludePreview whether to exclude preview api-versions when pinnedApiVersion is stable, default is `true`
  * @returns filtered api-versions
  */
-export declare function getFilteredApiVersions(pinnedApiVersion: string | undefined, versions: string[], excludePreview?: boolean): string[];
-export declare function isStableApiVersion(version: string): boolean;
+export declare function getFilteredApiVersions(program: Program, pinnedApiVersion: string | undefined, versions: Version[], excludePreview?: boolean): Version[];
+export declare function isStableApiVersionString(version: string): boolean;
 //# sourceMappingURL=versioning-utils.d.ts.map

package/dist/src/versioning-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versioning-utils.d.ts","sourceRoot":"","sources":["../../src/versioning-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC9F,OAAO,EAAa,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGxD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,aAAa,CAAC,gBAAgB,CAAC,GACtC,MAAM,EAAE,GAAG,SAAS,CActB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,GAAE,OAAe,GAC9B,MAAM,EAAE,CAUV;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE3D"}
+{"version":3,"file":"versioning-utils.d.ts","sourceRoot":"","sources":["../../src/versioning-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC9F,OAAO,EAAa,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAuC,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpF;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,aAAa,CAAC,gBAAgB,CAAC,GACtC,OAAO,EAAE,GAAG,SAAS,CAYvB;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,QAAQ,EAAE,OAAO,EAAE,EACnB,cAAc,GAAE,OAAc,GAC7B,OAAO,EAAE,CAQX;AAMD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEjE"}

package/dist/src/versioning-utils.js

@@ -1,3 +1,4 @@
+import { isPreviewVersion } from "@azure-tools/typespec-azure-core";
 import { findVersionedNamespace, getVersions } from "@typespec/versioning";
 /**
  * Gets the array of api-version on the TypeSpec service that contains this SDK client.
@@ -13,29 +14,33 @@ export function getServiceApiVersions(program, client) {
     let apiVersions;
     const versionedNamespace = findVersionedNamespace(program, client.__raw.service);
     if (versionedNamespace) {
-        apiVersions = getVersions(program, versionedNamespace)[1]
-            ?.getVersions()
-            .map((version) => version.value);
+        apiVersions = getVersions(program, versionedNamespace)[1]?.getVersions();
     }
     return apiVersions;
 }
 /**
  * Filter api-versions for "ServiceVersion".
  * TODO(xiaofei) pending TCGC design: https://github.com/Azure/typespec-azure/issues/965
+ * We still cannot move to TCGC, due to it only recognizes api-versions from 1 service.
  *
  * @param pinnedApiVersion the api-version to use as filter base
  * @param versions api-versions to filter
+ * @param excludePreview whether to exclude preview api-versions when pinnedApiVersion is stable, default is `true`
  * @returns filtered api-versions
  */
-export function getFilteredApiVersions(pinnedApiVersion, versions, excludePreview = false) {
+export function getFilteredApiVersions(program, pinnedApiVersion, versions, excludePreview = true) {
     if (!pinnedApiVersion) {
         return versions;
     }
+    const filterPreviewApiVersions = excludePreview && isStableApiVersionString(pinnedApiVersion);
     return versions
-        .slice(0, versions.indexOf(pinnedApiVersion) + 1)
-        .filter((version) => !excludePreview || !isStableApiVersion(pinnedApiVersion) || isStableApiVersion(version));
+        .slice(0, versions.findIndex((it) => it.value === pinnedApiVersion) + 1)
+        .filter((version) => !filterPreviewApiVersions || isStableApiVersion(program, version));
 }
-export function isStableApiVersion(version) {
-    return !version.toLowerCase().includes("preview");
+function isStableApiVersion(program, version) {
+    return !isPreviewVersion(program, version.enumMember) && isStableApiVersionString(version.value);
+}
+export function isStableApiVersionString(version) {
+    return !version.toLowerCase().endsWith("-preview");
 }
 //# sourceMappingURL=versioning-utils.js.map

package/dist/src/versioning-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"versioning-utils.js","sourceRoot":"","sources":["../../src/versioning-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE3E;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CACnC,OAAgB,EAChB,MAAuC;IAEvC,oEAAoE;IACpE,qHAAqH;IACrH,IAAI,WAAiC,CAAC;IACtC,MAAM,kBAAkB,GAA0B,sBAAsB,CACtE,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,CAAC;IACF,IAAI,kBAAkB,EAAE,CAAC;QACvB,WAAW,GAAG,WAAW,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC;YACvD,EAAE,WAAW,EAAE;aACd,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,sBAAsB,CACpC,gBAAoC,EACpC,QAAkB,EAClB,iBAA0B,KAAK;IAE/B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,OAAO,QAAQ;SACZ,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;SAChD,MAAM,CACL,CAAC,OAAO,EAAE,EAAE,CACV,CAAC,cAAc,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAC1F,CAAC;AACN,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"versioning-utils.js","sourceRoot":"","sources":["../../src/versioning-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAW,MAAM,sBAAsB,CAAC;AAEpF;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CACnC,OAAgB,EAChB,MAAuC;IAEvC,oEAAoE;IACpE,qHAAqH;IACrH,IAAI,WAAkC,CAAC;IACvC,MAAM,kBAAkB,GAA0B,sBAAsB,CACtE,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,CAAC;IACF,IAAI,kBAAkB,EAAE,CAAC;QACvB,WAAW,GAAG,WAAW,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;IAC3E,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CACpC,OAAgB,EAChB,gBAAoC,EACpC,QAAmB,EACnB,iBAA0B,IAAI;IAE9B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,wBAAwB,GAAG,cAAc,IAAI,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;IAC9F,OAAO,QAAQ;SACZ,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,KAAK,gBAAgB,CAAC,GAAG,CAAC,CAAC;SACvE,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,wBAAwB,IAAI,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAgB,EAAE,OAAgB;IAC5D,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,wBAAwB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACnG,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAe;IACtD,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AACrD,CAAC"}