refact project

Author: AllyW

src/typespec-aaz/src/emitter.ts

@@ -23,7 +23,10 @@ import {
 import { HttpService, getAllHttpServices, reportIfNoRoutes, getHttpOperation, HttpOperation } from "@typespec/http";
 // import { SdkContext, createSdkContext } from "@azure-tools/typespec-client-generator-core";
 import {getResourcePath, swaggerResourcePathToResourceId, } from "./utils.js";
-import { AAZResourceEmitterSchema, AAZTspPathItem, MutabilityEnum, AAZTspHttpOperation } from "./types.js";
+import { AAZResourceEmitterSchema } from "./types.js";
+import { TypeSpecPathItem } from "./model/path_item.js"
+import { MutabilityEnum } from "./model/_fields.js"
+import { CMDHttpOperation } from "./model/operation.js"
 import { AAZEmitterOptions, getTracer } from "./lib.js";
 
 export async function $onEmit(context: EmitContext<AAZEmitterOptions>) {
@@ -34,14 +37,9 @@ export async function $onEmit(context: EmitContext<AAZEmitterOptions>) {
       path: resolvePath(context.emitterOutputDir, "resources.json"),
       content: JSON.stringify(resources, null, 2),
     });
-  } else if (context.options.operation === "retrieve-operation") {
-    // TODO:
-    // const sdkContext = createSdkContext(context, "@client-tools/typespec-aaz");
-    // const emitter = createRetrieveOperationsEmitter(sdkContext);
-    // await emitter.retrieveOperations();
   } else if (context.options.operation === "get-resources-operations") {
     const emitter = createGetResourceOperationEmitter(context);
-    const res = await emitter.getResourcesOperation();
+    const res = await emitter.getResourcesOperations();
     await emitFile(context.program, {
       path: resolvePath(context.emitterOutputDir, "resources_operations.json"),
       content: JSON.stringify(res, null, 2),
@@ -123,9 +121,9 @@ function createGetResourceOperationEmitter(context: EmitContext<AAZEmitterOption
       version: context.options.apiVersion,
     }
   }) || [];
-  let schema: AAZTspPathItem = {};
+  let schema: TypeSpecPathItem = {};
 
-  async function getResourcesOperation() {
+  async function getResourcesOperations() {
     tracer.trace("options for createGetResourceOperationEmitter", JSON.stringify(context.options, null, 2));
     const services = listServices(context.program);
     for (const service of services) {
@@ -149,7 +147,7 @@ function createGetResourceOperationEmitter(context: EmitContext<AAZEmitterOption
     return result;
   }
 
-  return { getResourcesOperation };
+  return { getResourcesOperations };
 
   function emitResourcesOperations(program: Program, operations: HttpOperation[]) {
     for (let rt of result) {
@@ -167,7 +165,7 @@ function createGetResourceOperationEmitter(context: EmitContext<AAZEmitterOption
     }
   }
 
-  function emitResourceOperation(program: Program, httpOperation: HttpOperation, resourceObj: AAZResourceEmitterSchema, schema:AAZTspPathItem){
+  function emitResourceOperation(program: Program, httpOperation: HttpOperation, resourceObj: AAZResourceEmitterSchema, schema:TypeSpecPathItem){
     let { path: fullPath, operation: op, verb, parameters } = httpOperation;
     let selected_path = getPathWithoutArg(fullPath).toLocaleLowerCase();
     if (selected_path != resourceObj.id) {
@@ -193,7 +191,7 @@ function createGetResourceOperationEmitter(context: EmitContext<AAZEmitterOption
     } else{
       console.log(" verb not expected: ", verb)
     }
-    let operationOnMutability: AAZTspHttpOperation;
+    let operationOnMutability: CMDHttpOperation;
     for (let mut of mutability){
       operationOnMutability = {
         operationId: opId,
@@ -244,7 +242,7 @@ function createGetResourceOperationEmitter(context: EmitContext<AAZEmitterOption
     return false;
   }
 
-  function populateOperationOnMutability(program: Program, httpOperation: HttpOperation, operationOnMutability:AAZTspHttpOperation) {
+  function populateOperationOnMutability(program: Program, httpOperation: HttpOperation, operationOnMutability: CMDHttpOperation) {
     operationOnMutability.description = getDoc(program, httpOperation.operation);
 
     const lroMetadata = getLroMetadata(program, httpOperation.operation);
@@ -260,8 +258,6 @@ function createGetResourceOperationEmitter(context: EmitContext<AAZEmitterOption
       request: {} as any,
       response: [],
     }
-
-
   }
 
 }

src/typespec-aaz/src/lib.ts

@@ -1,7 +1,7 @@
 import { JSONSchemaType, createTypeSpecLibrary } from "@typespec/compiler";
 
 export interface AAZEmitterOptions {
-  "operation": "list-resources" | "retrieve-operation" | "get-resources-operations";
+  "operation": "list-resources" | "get-resources-operations";
   "apiVersion"?: string;
   "resources"?: string[];
 }
@@ -12,7 +12,7 @@ const EmitterOptionsSchema: JSONSchemaType<AAZEmitterOptions> = {
   properties: {
     operation: {
       type: "string",
-      enum: ["list-resources", "retrieve-operation", "get-resources-operations"],
+      enum: ["list-resources", "get-resources-operations"],
     },
     "apiVersion": {
       type: "string",

src/typespec-aaz/src/model/_content.ts

@@ -0,0 +1,12 @@
+import { CMDSchema } from "./_schema.js"
+import { CMDVariantField } from "./_fields.js";
+
+export type CMDRequestJson = {
+  ref?: string;
+  schema?: CMDSchema;
+}
+
+export type CMDResponseJson = {
+  var?: CMDVariantField;
+  schema: CMDSchema;
+}

src/typespec-aaz/src/model/_fields.ts

@@ -0,0 +1,11 @@
+
+export type CMDVariantField = {
+  value: string;
+  format: '[$@][a-zA-Z0-9_\[\]\{\}\.]+'
+}
+
+export enum MutabilityEnum {
+  Create = "create",
+  Read = "read",
+  Update = "update",
+}

src/typespec-aaz/src/model/_http.ts

@@ -0,0 +1,44 @@
+import { CMDSchema } from "./_schema.js";
+import { CMDHttpRequestBody } from "./_http_request_body.js";
+import { CMDHttpResponseBody } from "./_http_response_body.js";
+import { CMDVariantField } from "./_fields.js";
+
+export type CMDHttpAction = {
+  path: string;
+  request?: CMDHttpRequest;
+  response?: CMDHttpResponse[];
+}
+
+export type CMDHttpRequest = {
+  method: "get" | "put" | "post" | "delete" | "options" | "head" | "patch";
+  path: CMDHttpRequestArgs;
+  query: CMDHttpRequestArgs;
+  header: CMDHttpRequestHeader;
+  body: CMDHttpRequestBody;
+}
+
+export type CMDHttpResponse = {
+  statusCode?: number[];
+  isError?: boolean;
+  description?: string;
+  header?: CMDHttpResponseHeader;
+  body?: CMDHttpResponseBody;
+}
+
+export interface CMDHttpRequestArgs {
+  params: CMDSchema[];
+  consts: CMDSchema[];
+}
+
+export interface CMDHttpRequestHeader extends CMDHttpRequestArgs {
+  clientRequestId?: string;
+}
+
+export type CMDHttpResponseHeader = {
+  items: CMDHttpResponseHeaderItem[]
+}
+
+export type CMDHttpResponseHeaderItem = {
+  name: string;
+  var?: CMDVariantField;
+}

src/typespec-aaz/src/model/_http_request_body.ts

@@ -0,0 +1,5 @@
+import { CMDRequestJson } from "./_content.js"
+
+export type CMDHttpRequestBody = {
+  json?: CMDRequestJson;
+}

src/typespec-aaz/src/model/_http_response_body.ts

@@ -0,0 +1,5 @@
+import { CMDResponseJson } from "./_content.js"
+
+export type CMDHttpResponseBody = {
+  json?: CMDResponseJson;
+}

src/typespec-aaz/src/model/_schema.ts

@@ -0,0 +1,18 @@
+import { CMDVariantField } from "./_fields.js"
+
+export interface CMDSchemaBase {
+  readOnly?: boolean;
+  frozen?: boolean;   // python set?
+  const?: boolean;
+  default?: "string" | "number" | "integer" | "boolean" | "array" | "object";
+  nullable?: boolean;
+}
+
+export interface CMDSchema extends CMDSchemaBase {
+  name: string;
+  arg?: CMDVariantField;
+  required?: boolean;
+  description?: string;
+  skipUrlEncoding?: boolean;
+  secret?: boolean;
+}

src/typespec-aaz/src/model/_utils.ts

@@ -0,0 +1,7 @@
+
+export enum CMDBuildInVariants {
+  Instance = "$Instance",
+  EndpointInstance = "$EndpointInstance",
+  Subresource = "$Subresource",
+  Endpoint = "$Endpoint",
+}

src/typespec-aaz/src/model/operation.ts

@@ -0,0 +1,26 @@
+import { CMDVariantField } from "./_fields.js"
+import { CMDHttpAction } from "./_http.js"
+
+export type TypeSpecOperation = {
+  operationId?: string;
+  isPageable?: boolean;
+  read?: CMDHttpOperation;
+  create?: CMDHttpOperation;
+  update?: CMDHttpOperation;
+};
+
+export interface CMDHttpOperation {
+  when?: CMDVariantField[];
+  longRunning?:CMDHttpOperationLongRunning;
+  // required
+  operationId: string;
+  description?: string;
+  // required
+  http: CMDHttpAction;
+}
+
+
+export type CMDHttpOperationLongRunning = {
+  // "azure-async-operation" | "location" | "original-uri"
+  finalStateVia?: string;
+}