@zwa73/utils 1.0.148 → 1.0.150
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.
- package/dist/UtilInterfaces.d.ts +2 -2
- package/package.json +1 -1
- package/scripts/postinstall.js +4 -14
- package/src/UtilInterfaces.ts +2 -2
package/dist/UtilInterfaces.d.ts
CHANGED
|
@@ -208,9 +208,9 @@ export type AnyRecord = Record<Keyable, any>;
|
|
|
208
208
|
/**注释元组
|
|
209
209
|
* @template T - 提供注释的类型, 索引需从0开始
|
|
210
210
|
*/
|
|
211
|
-
export type
|
|
211
|
+
export type CmtTuple<T extends {
|
|
212
212
|
[K: number]: unknown;
|
|
213
|
-
}, Tuple extends unknown[] = []> = unknown extends T[Tuple['length']] ? T & Tuple :
|
|
213
|
+
}, Tuple extends unknown[] = []> = unknown extends T[Tuple['length']] ? T & Tuple : CmtTuple<T, [...Tuple, T[Tuple['length']]]>;
|
|
214
214
|
/**非严格模式下将会判断为false的值, 不包含NaN */
|
|
215
215
|
export type Flasy = false | 0 | -0 | "" | null | undefined;
|
|
216
216
|
export {};
|
package/package.json
CHANGED
package/scripts/postinstall.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
const path = require('path');
|
|
2
2
|
const { UtilFT } = require("../index");
|
|
3
|
-
const readline = require('readline');
|
|
4
3
|
|
|
5
4
|
const PACKAGE_PATH = path.join(__dirname,'..','package.json');
|
|
6
5
|
const VERSION_PATH = path.join(__dirname,"..","..","version.json");
|
|
@@ -33,11 +32,10 @@ function showUpgradeMessages(prevVersion, currentVersion) {
|
|
|
33
32
|
// 遍历infoTable中的所有版本
|
|
34
33
|
for (const version in INFO_TABLE) {
|
|
35
34
|
const versionNumber = versionToNumber(version);
|
|
36
|
-
//console.log(versionNumber,prevVersionNumber,currentVersionNumber)
|
|
37
35
|
// 如果用户的上一个版本低于这个版本,而当前版本高于或等于这个版本
|
|
38
36
|
if (versionNumber > prevVersionNumber && versionNumber <= currentVersionNumber) {
|
|
39
37
|
// 显示这个版本的提示信息
|
|
40
|
-
|
|
38
|
+
process.stdout.write(INFO_TABLE[version]);
|
|
41
39
|
hasOut=true;
|
|
42
40
|
}
|
|
43
41
|
}
|
|
@@ -50,21 +48,13 @@ async function main(){
|
|
|
50
48
|
const currentVersion = packageTable.version;
|
|
51
49
|
await UtilFT.ensurePathExists(VERSION_PATH);
|
|
52
50
|
const versionTable = await UtilFT.loadJSONFile(VERSION_PATH,{default:{}});
|
|
53
|
-
const prevVersion = versionTable[PKG_NAME]?.version ?? "
|
|
51
|
+
const prevVersion = versionTable[PKG_NAME]?.version ?? "10000.0.0";
|
|
52
|
+
|
|
53
|
+
process.stdout.write(`${currentVersion} 版本已安装`);
|
|
54
54
|
|
|
55
|
-
console.log(`${currentVersion} 版本已安装`);
|
|
56
|
-
// 使用这个函数来显示升级信息
|
|
57
55
|
const hasOut = showUpgradeMessages(prevVersion, currentVersion);
|
|
58
56
|
|
|
59
57
|
const ntable = Object.assign({},versionTable,{[PKG_NAME]:{version:currentVersion}});
|
|
60
58
|
await UtilFT.writeJSONFile(VERSION_PATH, ntable);
|
|
61
|
-
|
|
62
|
-
if(!hasOut) return;
|
|
63
|
-
const rl = readline.createInterface({
|
|
64
|
-
input: process.stdin,
|
|
65
|
-
output: process.stdout
|
|
66
|
-
});
|
|
67
|
-
setTimeout(()=>rl.close(),5000);
|
|
68
|
-
rl.question('按任意键继续...', () => rl.close());
|
|
69
59
|
}
|
|
70
60
|
main()
|
package/src/UtilInterfaces.ts
CHANGED
|
@@ -300,10 +300,10 @@ export type AnyRecord = Record<Keyable,any>;
|
|
|
300
300
|
/**注释元组
|
|
301
301
|
* @template T - 提供注释的类型, 索引需从0开始
|
|
302
302
|
*/
|
|
303
|
-
export type
|
|
303
|
+
export type CmtTuple<T extends {[K:number]:unknown},Tuple extends unknown[]=[]> =
|
|
304
304
|
unknown extends T[Tuple['length']]
|
|
305
305
|
? T & Tuple
|
|
306
|
-
:
|
|
306
|
+
: CmtTuple<T,[...Tuple,T[Tuple['length']]]>;
|
|
307
307
|
|
|
308
308
|
/**非严格模式下将会判断为false的值, 不包含NaN */
|
|
309
309
|
export type Flasy = false | 0 | -0 | "" | null | undefined;
|