From e4251af5641f55fa4f0e8a727116d6f943e75676 Mon Sep 17 00:00:00 2001
From: zzz701 <lihaima1@huawei.com>
Date: Wed, 13 Aug 2025 18:34:26 +0800
Subject: [PATCH] =?UTF-8?q?dynamic=20=E6=9B=BF=E6=8D=A2ets1.1=E5=92=8Cets1?=
 =?UTF-8?q?.2=20=E7=9B=AE=E5=BD=95=E4=B8=BA=20dynamic=20/=20static=20Signe?=
 =?UTF-8?q?d-off-by:=20zzz701=20<lihaima1@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tsc.js              | 8 ++++----
 lib/tsserver.js         | 8 ++++----
 lib/tsserverlibrary.js  | 8 ++++----
 lib/typescript.js       | 8 ++++----
 lib/typingsInstaller.js | 6 +++---
 src/compiler/checker.ts | 2 +-
 src/compiler/ohApi.ts   | 6 +++---
 7 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/tsc.js b/lib/tsc.js
index 74488a7967..ffeb2136c8 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -39581,8 +39581,8 @@ function getKitJsonObject(name, sdkPath, compilerOptions) {
   if (kitJsonCache == null ? void 0 : kitJsonCache.has(name)) {
     return kitJsonCache.get(name);
   }
-  const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./openharmony/ets/ets1.1/build-tools/ets-loader/kit_configs" : "./openharmony/ets/build-tools/ets-loader/kit_configs";
-  const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./hms/ets/ets1.1/build-tools/ets-loader/kit_configs" : "./hms/ets/build-tools/ets-loader/kit_configs";
+  const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./openharmony/ets/dynamic/build-tools/ets-loader/kit_configs" : "./openharmony/ets/build-tools/ets-loader/kit_configs";
+  const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./hms/ets/dynamic/build-tools/ets-loader/kit_configs" : "./hms/ets/build-tools/ets-loader/kit_configs";
   const ohosJsonPath = resolvePath(sdkPath, OHOS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
   const hmsJsonPath = resolvePath(sdkPath, HMS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
   let fileInfo = sys.fileExists(ohosJsonPath) ? sys.readFile(ohosJsonPath, "utf-8") : sys.fileExists(hmsJsonPath) ? sys.readFile(hmsJsonPath, "utf-8") : void 0;
@@ -39598,7 +39598,7 @@ function isMixedCompilerSDKPath(compilerOptions) {
   if (!compilerOptions.etsLoaderPath) {
     return false;
   }
-  if (normalizePath(compilerOptions.etsLoaderPath).endsWith("ets1.1/build-tools/ets-loader")) {
+  if (normalizePath(compilerOptions.etsLoaderPath).endsWith("dynamic/build-tools/ets-loader")) {
     return true;
   }
   return false;
@@ -48864,7 +48864,7 @@ function createTypeChecker(host, isTypeCheckerForLinter = false) {
             }
           }
         }
-        if (specifier.endsWith("/ets/api/global/resource") || specifier.endsWith("/ets/ets1.1/api/global/resource")) {
+        if (specifier.endsWith("/openharmony/ets/dynamic/api/global/resource")) {
           const lastSymbol = chain[chain.length - 1];
           if (lastSymbol.escapedName === "Resource") {
             const entityName2 = createAccessFromSymbolChain([lastSymbol], 0, 0);
diff --git a/lib/tsserver.js b/lib/tsserver.js
index 7c26db87da..68314f4027 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -42278,8 +42278,8 @@ function getKitJsonObject(name, sdkPath, compilerOptions) {
   if (kitJsonCache == null ? void 0 : kitJsonCache.has(name)) {
     return kitJsonCache.get(name);
   }
-  const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./openharmony/ets/ets1.1/build-tools/ets-loader/kit_configs" : "./openharmony/ets/build-tools/ets-loader/kit_configs";
-  const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./hms/ets/ets1.1/build-tools/ets-loader/kit_configs" : "./hms/ets/build-tools/ets-loader/kit_configs";
+  const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./openharmony/ets/dynamic/build-tools/ets-loader/kit_configs" : "./openharmony/ets/build-tools/ets-loader/kit_configs";
+  const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./hms/ets/dynamic/build-tools/ets-loader/kit_configs" : "./hms/ets/build-tools/ets-loader/kit_configs";
   const ohosJsonPath = resolvePath(sdkPath, OHOS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
   const hmsJsonPath = resolvePath(sdkPath, HMS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
   let fileInfo = sys.fileExists(ohosJsonPath) ? sys.readFile(ohosJsonPath, "utf-8") : sys.fileExists(hmsJsonPath) ? sys.readFile(hmsJsonPath, "utf-8") : void 0;
@@ -42295,7 +42295,7 @@ function isMixedCompilerSDKPath(compilerOptions) {
   if (!compilerOptions.etsLoaderPath) {
     return false;
   }
-  if (normalizePath(compilerOptions.etsLoaderPath).endsWith("ets1.1/build-tools/ets-loader")) {
+  if (normalizePath(compilerOptions.etsLoaderPath).endsWith("dynamic/build-tools/ets-loader")) {
     return true;
   }
   return false;
@@ -51418,7 +51418,7 @@ function createTypeChecker(host, isTypeCheckerForLinter = false) {
             }
           }
         }
-        if (specifier.endsWith("/ets/api/global/resource") || specifier.endsWith("/ets/ets1.1/api/global/resource")) {
+        if (specifier.endsWith("/ets/api/global/resource") || specifier.endsWith("/ets/dynamic/api/global/resource")) {
           const lastSymbol = chain[chain.length - 1];
           if (lastSymbol.escapedName === "Resource") {
             const entityName2 = createAccessFromSymbolChain([lastSymbol], 0, 0);
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
index 3d8a7b5f64..2b643ffcc9 100644
--- a/lib/tsserverlibrary.js
+++ b/lib/tsserverlibrary.js
@@ -42180,8 +42180,8 @@ function getKitJsonObject(name, sdkPath, compilerOptions) {
   if (kitJsonCache == null ? void 0 : kitJsonCache.has(name)) {
     return kitJsonCache.get(name);
   }
-  const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./openharmony/ets/ets1.1/build-tools/ets-loader/kit_configs" : "./openharmony/ets/build-tools/ets-loader/kit_configs";
-  const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./hms/ets/ets1.1/build-tools/ets-loader/kit_configs" : "./hms/ets/build-tools/ets-loader/kit_configs";
+  const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./openharmony/ets/dynamic/build-tools/ets-loader/kit_configs" : "./openharmony/ets/build-tools/ets-loader/kit_configs";
+  const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./hms/ets/dynamic/build-tools/ets-loader/kit_configs" : "./hms/ets/build-tools/ets-loader/kit_configs";
   const ohosJsonPath = resolvePath(sdkPath, OHOS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
   const hmsJsonPath = resolvePath(sdkPath, HMS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
   let fileInfo = sys.fileExists(ohosJsonPath) ? sys.readFile(ohosJsonPath, "utf-8") : sys.fileExists(hmsJsonPath) ? sys.readFile(hmsJsonPath, "utf-8") : void 0;
@@ -42197,7 +42197,7 @@ function isMixedCompilerSDKPath(compilerOptions) {
   if (!compilerOptions.etsLoaderPath) {
     return false;
   }
-  if (normalizePath(compilerOptions.etsLoaderPath).endsWith("ets1.1/build-tools/ets-loader")) {
+  if (normalizePath(compilerOptions.etsLoaderPath).endsWith("dynamic/build-tools/ets-loader")) {
     return true;
   }
   return false;
@@ -51320,7 +51320,7 @@ function createTypeChecker(host, isTypeCheckerForLinter = false) {
             }
           }
         }
-        if (specifier.endsWith("/ets/api/global/resource") || specifier.endsWith("/ets/ets1.1/api/global/resource")) {
+        if (specifier.endsWith("/ets/api/global/resource") || specifier.endsWith("/ets/dynamic/api/global/resource")) {
           const lastSymbol = chain[chain.length - 1];
           if (lastSymbol.escapedName === "Resource") {
             const entityName2 = createAccessFromSymbolChain([lastSymbol], 0, 0);
diff --git a/lib/typescript.js b/lib/typescript.js
index baaa5fb2b5..b08bda2184 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -42195,8 +42195,8 @@ function getKitJsonObject(name, sdkPath, compilerOptions) {
   if (kitJsonCache == null ? void 0 : kitJsonCache.has(name)) {
     return kitJsonCache.get(name);
   }
-  const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./openharmony/ets/ets1.1/build-tools/ets-loader/kit_configs" : "./openharmony/ets/build-tools/ets-loader/kit_configs";
-  const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./hms/ets/ets1.1/build-tools/ets-loader/kit_configs" : "./hms/ets/build-tools/ets-loader/kit_configs";
+  const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./openharmony/ets/dynamic/build-tools/ets-loader/kit_configs" : "./openharmony/ets/build-tools/ets-loader/kit_configs";
+  const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./hms/ets/dynamic/build-tools/ets-loader/kit_configs" : "./hms/ets/build-tools/ets-loader/kit_configs";
   const ohosJsonPath = resolvePath(sdkPath, OHOS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
   const hmsJsonPath = resolvePath(sdkPath, HMS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
   let fileInfo = sys.fileExists(ohosJsonPath) ? sys.readFile(ohosJsonPath, "utf-8") : sys.fileExists(hmsJsonPath) ? sys.readFile(hmsJsonPath, "utf-8") : void 0;
@@ -42212,7 +42212,7 @@ function isMixedCompilerSDKPath(compilerOptions) {
   if (!compilerOptions.etsLoaderPath) {
     return false;
   }
-  if (normalizePath(compilerOptions.etsLoaderPath).endsWith("ets1.1/build-tools/ets-loader")) {
+  if (normalizePath(compilerOptions.etsLoaderPath).endsWith("dynamic/build-tools/ets-loader")) {
     return true;
   }
   return false;
@@ -51478,7 +51478,7 @@ function createTypeChecker(host, isTypeCheckerForLinter = false) {
             }
           }
         }
-        if (specifier.endsWith("/ets/api/global/resource") || specifier.endsWith("/ets/ets1.1/api/global/resource")) {
+        if (specifier.endsWith("/ets/api/global/resource") || specifier.endsWith("/ets/dynamic/api/global/resource")) {
           const lastSymbol = chain[chain.length - 1];
           if (lastSymbol.escapedName === "Resource") {
             const entityName2 = createAccessFromSymbolChain([lastSymbol], 0, 0);
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
index 33eba1f310..2c9f580c3b 100644
--- a/lib/typingsInstaller.js
+++ b/lib/typingsInstaller.js
@@ -29394,8 +29394,8 @@ function getKitJsonObject(name, sdkPath, compilerOptions) {
   if (kitJsonCache == null ? void 0 : kitJsonCache.has(name)) {
     return kitJsonCache.get(name);
   }
-  const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./openharmony/ets/ets1.1/build-tools/ets-loader/kit_configs" : "./openharmony/ets/build-tools/ets-loader/kit_configs";
-  const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./hms/ets/ets1.1/build-tools/ets-loader/kit_configs" : "./hms/ets/build-tools/ets-loader/kit_configs";
+  const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./openharmony/ets/dynamic/build-tools/ets-loader/kit_configs" : "./openharmony/ets/build-tools/ets-loader/kit_configs";
+  const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ? "./hms/ets/dynamic/build-tools/ets-loader/kit_configs" : "./hms/ets/build-tools/ets-loader/kit_configs";
   const ohosJsonPath = resolvePath(sdkPath, OHOS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
   const hmsJsonPath = resolvePath(sdkPath, HMS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
   let fileInfo = sys.fileExists(ohosJsonPath) ? sys.readFile(ohosJsonPath, "utf-8") : sys.fileExists(hmsJsonPath) ? sys.readFile(hmsJsonPath, "utf-8") : void 0;
@@ -29411,7 +29411,7 @@ function isMixedCompilerSDKPath(compilerOptions) {
   if (!compilerOptions.etsLoaderPath) {
     return false;
   }
-  if (normalizePath(compilerOptions.etsLoaderPath).endsWith("ets1.1/build-tools/ets-loader")) {
+  if (normalizePath(compilerOptions.etsLoaderPath).endsWith("dynamic/build-tools/ets-loader")) {
     return true;
   }
   return false;
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index facaca20fa..88a5eddd7b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8087,7 +8087,7 @@ export function createTypeChecker(host: TypeCheckerHost, isTypeCheckerForLinter:
                 }
                 // Only for Resource type in openharmony SDK
                 if (specifier.endsWith('/ets/api/global/resource') || 
-                    specifier.endsWith('/ets/ets1.1/api/global/resource')
+                    specifier.endsWith('/ets/dynamic/api/global/resource')
                 ) {
                     const lastSymbol = chain[chain.length - 1];
                     // Create typeReferenceNode if is Resource type
diff --git a/src/compiler/ohApi.ts b/src/compiler/ohApi.ts
index 7f0c87b11c..b9a23b16c3 100644
--- a/src/compiler/ohApi.ts
+++ b/src/compiler/ohApi.ts
@@ -1181,10 +1181,10 @@ function getKitJsonObject(name: string, sdkPath: string, compilerOptions: Compil
         return kitJsonCache.get(name);
     }
     const OHOS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ?
-        './openharmony/ets/ets1.1/build-tools/ets-loader/kit_configs' :
+        './openharmony/ets/dynamic/build-tools/ets-loader/kit_configs' :
         './openharmony/ets/build-tools/ets-loader/kit_configs';
     const HMS_KIT_CONFIG_PATH = isMixedCompilerSDKPath(compilerOptions) ?
-        './hms/ets/ets1.1/build-tools/ets-loader/kit_configs' :
+        './hms/ets/dynamic/build-tools/ets-loader/kit_configs' :
         './hms/ets/build-tools/ets-loader/kit_configs';
     const ohosJsonPath = resolvePath(sdkPath, OHOS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
     const hmsJsonPath = resolvePath(sdkPath, HMS_KIT_CONFIG_PATH, `./${name}${JSON_SUFFIX}`);
@@ -1209,7 +1209,7 @@ export function isMixedCompilerSDKPath(compilerOptions: CompilerOptions): boolea
     if (!compilerOptions.etsLoaderPath) {
         return false;
     }
-    if (normalizePath(compilerOptions.etsLoaderPath).endsWith('ets1.1/build-tools/ets-loader')) {
+    if (normalizePath(compilerOptions.etsLoaderPath).endsWith('dynamic/build-tools/ets-loader')) {
         return true;
     }
     return false;
-- 
Gitee