Merge pull request #12 from aliyun/fix/windows-path

fix: fixed windows compatibility issues

Author: yini-chen

media/src/components/APIPage/TrySDK/TrySDK.tsx

@@ -90,7 +90,7 @@ export const TrySDK: React.FC<TrySDKProps> = (props) => {
           height={800}
           options={{
             readOnly: true,
-            tabCompletion: true,
+            tabCompletion: "on",
           }}
           // theme='vs-dark'
           language={getEditorLanguage(languageTab)}

media/src/components/common/MonacoEditor.tsx

@@ -49,7 +49,7 @@ export const MonacoEditor: React.FC<MonacoEditorProps> = (props) => {
           height={height}
           options={{
             readOnly: readOnly,
-            tabCompletion: true,
+            tabCompletion: "on",
             minimap: {
               enabled: false,
             },

media/src/components/main.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { API as APIPage } from "./APIPage/API";
 import { BaseClass as StructDocument } from "./APIPage/APIDocument/BaseClass";
-import { getVSCode } from "../utils/utils";
+import { getSpecInfoFromName, getVSCode } from "../utils/utils";
 import { parseAPIMetaDescription } from "../utils/parseAPIMetaDescription";
 import { ApiErrorCode } from "./APIPage/APIDocument/ApiErrorCode";
 import { PontUIService } from "../service/UIService";
@@ -37,7 +37,7 @@ export const App: React.FC<AppProps> = (props) => {
   const [appMeta, setAppMeta] = React.useState(props.routerMeta);
   const { pageType, schemaType, specName, modName, name, spec: metaSpec, remoteSpec } = appMeta || {};
 
-  const [popcode, version] = specName?.split("::") || ["", ""];
+  const {product:popcode,version} = getSpecInfoFromName(specName || "");
 
   const [itemMeta, setItemMeta] = React.useState(metaSpec);
   const [defs, setDefs] = React.useState({});

media/src/utils/utils.ts

@@ -31,4 +31,26 @@ export function useCurrentSpec() {
     currentSpec,
   };
 }
+export type SpecInfo = {
+  product: string;
+  version: string;
+};
+export const getSpecInfoFromName = (name: string): SpecInfo => {
+  if (name.includes("::")) {
+    return {
+      product: name.split("::")[0],
+      version: name.split("::")[1],
+    };
+  }
+  if (name.includes("__")) {
+    return {
+      product: name.split("__")[0],
+      version: name.split("__")[1],
+    };
+  }
+  return {
+    product: "Ecs",
+    version: "2014-05-26",
+  };
+};
 

package.json

@@ -238,10 +238,10 @@
     "moment": "^2.24.0",
     "ncc": "^0.3.6",
     "needle": "^2.5.0",
-    "pontx-manager": "^0.3.83",
-    "pontx-meta-fetch-plugin": "^0.3.83",
-    "pontx-spec": "^0.3.83",
-    "pontx-spec-diff": "^0.3.83",
+    "pontx-manager": "0.3.83-beta.0",
+    "pontx-meta-fetch-plugin": "0.3.83",
+    "pontx-spec": "0.3.83",
+    "pontx-spec-diff": "0.3.83",
     "qs": "^6.9.4",
     "querystring": "0.2.0",
     "styled-components": "^6.1.1",

src/Service.ts

@@ -11,6 +11,7 @@ import { request } from "./openApiService/request/request";
 import fs from "fs";
 import fsx from "fs/promises";
 import os from "os";
+import fetch from "node-fetch";
 
 export class AlicloudAPIService {
   pontManager: PontManager;
@@ -142,7 +143,7 @@ export class AlicloudAPIService {
 
   async requestEndpoints(product: string) {
     const resStr = await fetch(
-      `https://pre-api.aliyun.com/meta/v1/products/${product}/endpoints.json?language=zh-CN`,
+      `https://api.aliyun.com/meta/v1/products/${product}/endpoints.json?language=zh-CN`,
       {},
     ).then((res) => res.text());
     const res = JSON.parse(resStr);

src/commands.ts

@@ -1,7 +1,7 @@
 import { PontManager } from "pontx-manager";
 import * as _ from "lodash";
 import * as vscode from "vscode";
-import { findAlicloudAPIConfig, findInterface, plugins, showProgress, viewMetaFile, VSCodeLogger, wait } from "./utils";
+import { findAlicloudAPIConfig, findInterface, getSpecInfoFromName, plugins, showProgress, viewMetaFile, VSCodeLogger, wait } from "./utils";
 import { AlicloudAPIWebview } from "./webview";
 import { alicloudAPIMessageService } from "./Service";
 import { PontSpec } from "pontx-spec";
@@ -103,10 +103,11 @@ export class AlicloudApiCommands {
 
           Promise.resolve(service.pontManager.innerManagerConfig.plugins.generate?.instance).then(
             async (generatePlugin) => {
+              const {product, version} = getSpecInfoFromName(specName || "");
               const snippets = await codeSampleProvider({
                 language: vscode.window.activeTextEditor?.document.languageId || "typescript",
-                product: specName?.split("::")[0],
-                version: specName?.split("::")[1],
+                product: product,
+                version: version,
                 apiName: apiName,
                 simplify: true,
               });

src/explorer.ts

@@ -4,7 +4,7 @@ import { PontAPI, Mod, ObjectMap, PontJsonSchema, PontSpec, WithoutModsName } fr
 import * as vscode from "vscode";
 import { MetaType, PontSpecWithMods } from "./changes/utils";
 import { alicloudAPIMessageService } from "./Service";
-import { findAlicloudAPIConfig, plugins, VSCodeLogger } from "./utils";
+import { findAlicloudAPIConfig, getSpecInfoFromName, plugins, VSCodeLogger } from "./utils";
 import { AlicloudApiCommands } from "./commands";
 import { getProductRequestInstance } from "./productExplorer";
 import { Product } from "./types";
@@ -258,13 +258,13 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr
       const productExplorer = getProductRequestInstance();
 
       return this.pontManager.localPontSpecs.map((spec) => {
-        const [specName, version] = spec.name.split("::");
+        const {product, version} = getSpecInfoFromName(spec.name || "")
 
         return {
           specName: spec.name,
           contextValue: "Spec",
           resourceUri: vscode.Uri.parse(`pontx-manager://spec/${spec.name}`),
-          label: `${this.getCNNameOfProduct(productExplorer.products, specName)} v${version}`,
+          label: `${this.getCNNameOfProduct(productExplorer.products, product)} v${version}`,
           collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
         };
       });
@@ -337,13 +337,13 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr
 
   async subscribeProduct(product: string, version: string) {
     const pontxConfig = await findAlicloudAPIConfig(this.context);
-    if (pontxConfig.origins?.filter((item) => item.name === `${product}::${version}`)?.length) {
+    if (pontxConfig.origins?.filter((item) => getSpecInfoFromName(item.name || "").product === product && getSpecInfoFromName(item.name || "").version === version)?.length) {
       vscode.window.showInformationMessage("该产品及其版本号已订阅，您可以使用 cmd + ctrl + p 来搜索该产品下的API。");
     } else {
       pontxConfig.origins = [
         ...(pontxConfig.origins || []),
         {
-          name: `${product}::${version}`,
+          name: `${product}__${version}`,
           url: `https://api.aliyun.com/meta/v1/products/${product}/versions/${version}/api-docs.json`,
         },
       ];

src/plugins/generate.ts

@@ -3,6 +3,7 @@ import { createPontxGeneratePlugin, SnippetsProvider, PontxGeneratorPlugin, GetF
 import { PontSpec } from "pontx-spec";
 import { InnerOriginConfig, PontManager } from "pontx-manager";
 import { getRequiredParamsValue } from "../utils";
+import fetch from "node-fetch";
 
 const mySnippetsProvider: SnippetsProvider = (info) => {
   return [];

src/provider/autoCompletion.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import { alicloudAPIMessageService } from "../Service";
 import { AlicloudApiCommands } from "../commands";
 import _ from "lodash";
-import { fileSel } from "../utils";
+import { fileSel, getSpecInfoFromName } from "../utils";
 import { codeSampleProvider } from "../plugins/generate";
 
 class CompletionItemProvider {
@@ -69,7 +69,7 @@ class CompletionItemProvider {
     token: vscode.CancellationToken,
   ): vscode.ProviderResult<vscode.CompletionItem> {
     const language = vscode.window.activeTextEditor?.document.languageId;
-    const [product, versionAPI] = item?.detail?.split("::");
+    const {product, version:versionAPI} = getSpecInfoFromName(item?.detail);
     const [version, apiName] = versionAPI?.split("/");
     let asyncFetchedCode = "";
     if (product && apiName && version) {

src/provider/autofix.ts

@@ -2,7 +2,7 @@
  * @description: Quick fix need to be used with a Linter
  */
 import * as vscode from "vscode";
-import { containsAnySubstring, fileSel } from "../utils";
+import { containsAnySubstring, fileSel, getSpecInfoFromName } from "../utils";
 import { getDepsByLanguage } from "../common/generateImport";
 import { alicloudAPIMessageService } from "../Service";
 
@@ -23,7 +23,7 @@ class CodeActionProvider {
       const service = alicloudAPIMessageService;
       const products = service.pontManager.localPontSpecs
         .map((pontSpec) => {
-          return pontSpec?.name?.split("::")[0];
+          return getSpecInfoFromName(pontSpec?.name)[0];
         })
 
       if (getDepsByLanguage(errorText, item.range)?.includes(errorText) || containsAnySubstring(errorText, products)) {