deeke-script-app 1.9.1 → 1.9.3

package/@deekeScript/@type/interface/System.d.ts

@@ -127,6 +127,16 @@ interface System {
      * @param keepOn 是否保持屏幕常亮
      */
     public setKeepScreenOn(keepOn: boolean): void;
+
+    /**
+     * 获取当前系统区域与语言信息（配置中的首个 Locale）
+     * @returns language 为语言码；country 为国家/地区码；tag 为 BCP 47 标签（如 zh-CN）
+     */
+    public getLocaleInfo(): {
+        language: string;
+        country: string;
+        tag: string;
+    };
 }
 
 export { };

package/jsconfig.json

@@ -1,12 +1,26 @@
 {
     "compilerOptions": {
         "target": "ES6",
-        "lib": ["es6"],  // 不包含 "dom"
-        "checkJs": true
+        "lib": [
+            "es2016",
+        ],
+        "checkJs": true,
+        "allowJs": true,
+        "module": "commonjs",
+        "moduleResolution": "node10",
+        "types": [
+            "node"
+        ],
+        "ignoreDeprecations": "6.0",
+        "baseUrl": ".",
+        "paths": {
+            "app/*": [
+                "app/*"
+            ]
+        },
     },
     "include": [
-        "src/**/*",
-        "test/**/*",
+        "**/*",
         "@deekeScript/**/*"
     ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deeke-script-app",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "description": "DeekeScript应用",
   "main": "src/index.ts",
   "scripts": {

package/update-types.js

@@ -1,12 +1,19 @@
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const { execSync } = require('child_process');
 
 const PROJECT_ROOT = __dirname;
 const TYPES_FOLDER = path.join(PROJECT_ROOT, '@deekeScript');
-const TEMP_DIR = path.join(PROJECT_ROOT, '.temp-update');
+/** 旧版脚本使用的临时目录，仅用于清理遗留 */
+const LEGACY_TEMP_DIR = path.join(PROJECT_ROOT, '.temp-update');
 const PACKAGE_NAME = 'deeke-script-app';
 
+const ROOT_FILES_FROM_PACKAGE = [
+  { name: 'deekeScript.schema.json', required: false },
+  { name: 'update-types.js', required: false }
+];
+
 // 颜色输出
 const colors = {
   reset: '\x1b[0m',
@@ -21,98 +28,110 @@ function log(message, color = 'reset') {
   console.log(`${colors[color]}${message}${colors.reset}`);
 }
 
-// 清理临时目录
-function cleanup() {
-  if (fs.existsSync(TEMP_DIR)) {
-    fs.rmSync(TEMP_DIR, { recursive: true, force: true });
+function cleanupLegacyTemp() {
+  if (fs.existsSync(LEGACY_TEMP_DIR)) {
+    fs.rmSync(LEGACY_TEMP_DIR, { recursive: true, force: true });
+  }
+}
+
+function removeDir(dir) {
+  if (dir && fs.existsSync(dir)) {
+    fs.rmSync(dir, { recursive: true, force: true });
   }
 }
 
-// 从npm更新
-async function updateFromNpm() {
-  log('\n📦 从npm更新类型定义文件...', 'cyan');
-  
+/**
+ * 使用 npm pack + 解压 tarball 获取包内容，避免在项目内 npm install
+ * 触发 deeke-script-app 的 postinstall（init），从而把文件写到错误目录。
+ */
+function updateFromNpm() {
+  log('\n📦 从 npm 拉取包并更新类型与相关文件...', 'cyan');
+
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'deeke-types-'));
+
   try {
-    // 检查npm包是否存在
-    log('检查npm包版本...', 'blue');
+    log('检查 npm 包版本...', 'blue');
     const latestVersion = execSync(`npm view ${PACKAGE_NAME} version`, { encoding: 'utf-8' }).trim();
     log(`最新版本: ${latestVersion}`, 'green');
-    
-    // 创建临时目录
-    if (!fs.existsSync(TEMP_DIR)) {
-      fs.mkdirSync(TEMP_DIR, { recursive: true });
+
+    log('下载包（npm pack，不执行安装脚本）...', 'blue');
+    const packOutput = execSync(`npm pack ${PACKAGE_NAME}@${latestVersion}`, {
+      cwd: tempDir,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe']
+    }).trim();
+    const tgzLine = packOutput.split(/\r?\n/).filter(Boolean).pop();
+    if (!tgzLine) {
+      throw new Error('npm pack 未返回 tarball 文件名');
     }
-    
-    const tempPackageDir = path.join(TEMP_DIR, 'node_modules', PACKAGE_NAME);
-    
-    // 在临时目录安装npm包
-    log('下载并安装npm包...', 'blue');
-    const packageJsonPath = path.join(TEMP_DIR, 'package.json');
-    fs.writeFileSync(packageJsonPath, JSON.stringify({
-      name: 'temp-update',
-      version: '1.0.0',
-      dependencies: {
-        [PACKAGE_NAME]: 'latest'
-      }
-    }, null, 2));
-    
-    execSync('npm install', { 
-      cwd: TEMP_DIR, 
-      stdio: 'pipe',
-      env: { ...process.env, npm_config_progress: 'false' }
+    const tgzName = path.basename(tgzLine.trim());
+    const tgzPath = path.join(tempDir, tgzName);
+    if (!fs.existsSync(tgzPath)) {
+      throw new Error(`未找到 tarball: ${tgzPath}`);
+    }
+
+    execSync(`tar -xzf ${JSON.stringify(tgzName)}`, {
+      cwd: tempDir,
+      stdio: 'pipe'
     });
-    
-    // 检查@deekeScript文件夹是否存在
-    const sourceTypesFolder = path.join(tempPackageDir, '@deekeScript');
+
+    const packRoot = path.join(tempDir, 'package');
+    if (!fs.existsSync(packRoot)) {
+      throw new Error('解压后未找到 package 目录（npm 包结构异常）');
+    }
+
+    const sourceTypesFolder = path.join(packRoot, '@deekeScript');
     if (!fs.existsSync(sourceTypesFolder)) {
-      throw new Error('npm包中未找到@deekeScript文件夹');
+      throw new Error('npm 包中未找到 @deekeScript 文件夹');
     }
-    
-    // 备份现有文件夹
+
     if (fs.existsSync(TYPES_FOLDER)) {
-      log('备份现有类型定义文件...', 'yellow');
+      log('备份现有类型定义...', 'yellow');
       const backupFolder = path.join(PROJECT_ROOT, '@deekeScript.backup');
-      if (fs.existsSync(backupFolder)) {
-        fs.rmSync(backupFolder, { recursive: true, force: true });
-      }
+      removeDir(backupFolder);
       fs.cpSync(TYPES_FOLDER, backupFolder, { recursive: true });
     }
-    
-    // 删除旧文件夹并复制新文件夹
+
     if (fs.existsSync(TYPES_FOLDER)) {
       fs.rmSync(TYPES_FOLDER, { recursive: true, force: true });
     }
     fs.cpSync(sourceTypesFolder, TYPES_FOLDER, { recursive: true });
-    
-    log('✅ 类型定义文件更新成功！', 'green');
-    log(`已更新到版本: ${latestVersion}`, 'green');
-    
-  } catch (error) {
-    log(`❌ 从npm更新失败: ${error.message}`, 'red');
-    throw error;
+    log('✅ 已更新 @deekeScript', 'green');
+
+    for (const { name, required } of ROOT_FILES_FROM_PACKAGE) {
+      const src = path.join(packRoot, name);
+      const dest = path.join(PROJECT_ROOT, name);
+      if (fs.existsSync(src)) {
+        fs.copyFileSync(src, dest);
+        log(`✅ 已更新 ${name}`, 'green');
+      } else if (required) {
+        throw new Error(`npm 包中未找到必需文件: ${name}`);
+      } else {
+        log(`⚠️ 包中暂无 ${name}，跳过（发布包含该文件后即可同步）`, 'yellow');
+      }
+    }
+
+    log(`已同步自 registry 版本: ${latestVersion}`, 'green');
+  } finally {
+    removeDir(tempDir);
   }
 }
 
-// 主函数
-async function main() {
-  log('🚀 开始更新@deekeScript类型定义文件...', 'cyan');
-  
+function main() {
+  log('🚀 开始从远程包更新 @deekeScript 等文件...', 'cyan');
+
   try {
-    // 确保在项目根目录
     if (!fs.existsSync(path.join(PROJECT_ROOT, 'package.json'))) {
       throw new Error('请在项目根目录运行此脚本');
     }
-    
-    await updateFromNpm();
-    
+
+    updateFromNpm();
   } catch (error) {
     log(`\n❌ 更新失败: ${error.message}`, 'red');
     process.exit(1);
   } finally {
-    // 清理临时文件
-    cleanup();
+    cleanupLegacyTemp();
   }
 }
 
-// 运行主函数
 main();