@azure-tools/typespec-java 0.18.3 → 0.18.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  import { ArraySchema, ObjectSchema, Property } from "@autorest/codemodel";
2
2
  import { KnownMediaType } from "@azure-tools/codegen";
3
- import { getJavaNamespace, getNamespace, pascalCase } from "./utils.js";
3
+ import { getNamespace, pascalCase } from "./utils.js";
4
4
  /*
5
5
  * These schema need to reflect
6
6
  * 1. wire schema via "serializedName"
@@ -81,7 +81,11 @@ export function createPollOperationDetailsSchema(schemas, stringSchema) {
81
81
  return pollOperationDetailsSchema;
82
82
  }
83
83
  const fileDetailsMap = new Map();
84
- function getFileSchemaName(baseName) {
84
+ function getFileSchemaName(baseName, sdkModelType) {
85
+ // If the TypeSpec Model exists and is not TypeSpec.Http.File, directly use its name
86
+ if (sdkModelType && sdkModelType.crossLanguageDefinitionId !== "TypeSpec.Http.File") {
87
+ return baseName;
88
+ }
85
89
  // make sure suffix "FileDetails"
86
90
  if (baseName.toLocaleLowerCase().endsWith("filedetails")) {
87
91
  return pascalCase(baseName);
@@ -93,14 +97,14 @@ function getFileSchemaName(baseName) {
93
97
  return pascalCase(baseName) + "FileDetails";
94
98
  }
95
99
  }
96
- function createFileDetailsSchema(schemaName, propertyName, namespace, schemas) {
100
+ function createFileDetailsSchema(schemaName, propertyName, namespace, javaNamespace, schemas) {
97
101
  const fileDetailsSchema = new ObjectSchema(schemaName, 'The file details for the "' + propertyName + '" field.', {
98
102
  language: {
99
103
  default: {
100
104
  namespace: namespace,
101
105
  },
102
106
  java: {
103
- namespace: getJavaNamespace(namespace),
107
+ namespace: javaNamespace,
104
108
  },
105
109
  },
106
110
  serializationFormats: [KnownMediaType.Multipart],
@@ -135,7 +139,7 @@ function addContentTypeProperty(fileDetailsSchema, stringSchema, contentTypeProp
135
139
  clientDefaultValue: (contentTypeProperty === null || contentTypeProperty === void 0 ? void 0 : contentTypeProperty.type.kind) === "constant" ? undefined : "application/octet-stream",
136
140
  }));
137
141
  }
138
- export function getFileDetailsSchema(property, namespace, schemas, binarySchema, stringSchema, processSchemaFunc) {
142
+ export function getFileDetailsSchema(property, namespace, javaNamespace, schemas, binarySchema, stringSchema, processSchemaFunc) {
139
143
  var _a;
140
144
  let fileSdkType;
141
145
  if (property.type.kind === "model") {
@@ -157,11 +161,11 @@ export function getFileDetailsSchema(property, namespace, schemas, binarySchema,
157
161
  */
158
162
  const filePropertyName = property.name;
159
163
  const fileSchemaName = fileSdkType.name;
160
- const schemaName = getFileSchemaName(fileSchemaName);
164
+ const schemaName = getFileSchemaName(fileSchemaName, fileSdkType);
161
165
  let fileDetailsSchema = fileDetailsMap.get(schemaName);
162
166
  if (!fileDetailsSchema) {
163
167
  const typeNamespace = (_a = getNamespace(property.type.__raw)) !== null && _a !== void 0 ? _a : namespace;
164
- fileDetailsSchema = createFileDetailsSchema(schemaName, filePropertyName, typeNamespace, schemas);
168
+ fileDetailsSchema = createFileDetailsSchema(schemaName, filePropertyName, typeNamespace, javaNamespace, schemas);
165
169
  // description if available
166
170
  if (fileSdkType.description) {
167
171
  fileDetailsSchema.summary = fileSdkType.description;
@@ -197,7 +201,7 @@ export function getFileDetailsSchema(property, namespace, schemas, binarySchema,
197
201
  const schemaName = getFileSchemaName(filePropertyName);
198
202
  let fileDetailsSchema = fileDetailsMap.get(schemaName);
199
203
  if (!fileDetailsSchema) {
200
- fileDetailsSchema = createFileDetailsSchema(schemaName, filePropertyName, namespace, schemas);
204
+ fileDetailsSchema = createFileDetailsSchema(schemaName, filePropertyName, namespace, javaNamespace, schemas);
201
205
  addContentProperty(fileDetailsSchema, binarySchema);
202
206
  addFilenameProperty(fileDetailsSchema, stringSchema);
203
207
  addContentTypeProperty(fileDetailsSchema, stringSchema);
@@ -1 +1 @@
1
- {"version":3,"file":"external-schemas.js","sourceRoot":"","sources":["../../src/external-schemas.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"external-schemas.js","sourceRoot":"","sources":["../../src/external-schemas.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,5 @@ export declare function logWarning(program: Program, msg: string): void;
3
3
  export declare function trace(program: Program, msg: string): void;
4
4
  export declare function pascalCase(name: string): string;
5
5
  export declare function getNamespace(type: Type | undefined): string | undefined;
6
- export declare function getJavaNamespace(namespace: string | undefined): string | undefined;
7
6
  export declare function stringArrayContainsIgnoreCase(stringList: string[], str: string): boolean;
8
7
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE7D,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,QAQvD;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,QAElD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM/C;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAYvE;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAElF;AAED,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAExF"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE7D,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,QAQvD;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,QAElD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM/C;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAYvE;AAED,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAExF"}
package/dist/src/utils.js CHANGED
@@ -33,9 +33,6 @@ export function getNamespace(type) {
33
33
  return undefined;
34
34
  }
35
35
  }
36
- export function getJavaNamespace(namespace) {
37
- return namespace ? "com." + namespace.toLowerCase() : undefined;
38
- }
39
36
  export function stringArrayContainsIgnoreCase(stringList, str) {
40
37
  return stringList && str ? stringList.findIndex((s) => s.toLowerCase() === str.toLowerCase()) != -1 : false;
41
38
  }
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,oBAAoB,CAAC;AAE7D,MAAM,UAAU,UAAU,CAAC,OAAgB,EAAE,GAAW;IACtD,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACpB,OAAO,CAAC,gBAAgB,CAAC;QACvB,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,GAAG;QACZ,MAAM,EAAE,QAAQ;KACjB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,OAAgB,EAAE,GAAW;IACjD,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAsB;IACjD,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;QAClH,IAAI,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC;QAClC,IAAI,YAAY,GAAuB,SAAS,CAAC;QACjD,OAAO,YAAY,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtD,YAAY,GAAG,YAAY,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5E,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC;QACxC,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAA6B;IAC5D,OAAO,SAAS,CAAC,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,UAAoB,EAAE,GAAW;IAC7E,OAAO,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC9G,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,oBAAoB,CAAC;AAE7D,MAAM,UAAU,UAAU,CAAC,OAAgB,EAAE,GAAW;IACtD,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACpB,OAAO,CAAC,gBAAgB,CAAC;QACvB,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,GAAG;QACZ,MAAM,EAAE,QAAQ;KACjB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,OAAgB,EAAE,GAAW;IACjD,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAsB;IACjD,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;QAClH,IAAI,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC;QAClC,IAAI,YAAY,GAAuB,SAAS,CAAC;QACjD,OAAO,YAAY,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtD,YAAY,GAAG,YAAY,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5E,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC;QACxC,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,UAAoB,EAAE,GAAW;IAC7E,OAAO,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC9G,CAAC"}