feat: 文件类型为 mihomo 配置时, 来源可以为无

This commit is contained in:
xream 2025-03-01 08:45:17 +08:00
parent dd4e0cef68
commit ebc7173c95
No known key found for this signature in database
GPG Key ID: 1D2C5225471789F9
2 changed files with 19 additions and 16 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "sub-store", "name": "sub-store",
"version": "2.16.61", "version": "2.16.62",
"description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
"main": "src/main.js", "main": "src/main.js",
"scripts": { "scripts": {

View File

@ -379,19 +379,22 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
throw new Error('patch is not an object'); throw new Error('patch is not an object');
output.$content = ProxyUtils.yaml.safeDump( output.$content = ProxyUtils.yaml.safeDump(
deepMerge( deepMerge(
config || { config ||
proxies: await produceArtifact({ (output?.$file?.sourceType === 'none'
type: ? {}
output?.$file?.sourceType || : {
'collection', proxies: await produceArtifact({
name: output?.$file?.sourceName, type:
platform: 'mihomo', output?.$file?.sourceType ||
produceType: 'internal', 'collection',
produceOpts: { name: output?.$file?.sourceName,
'delete-underscore-fields': true, platform: 'mihomo',
}, produceType: 'internal',
}), produceOpts: {
}, 'delete-underscore-fields': true,
},
}),
}),
patch, patch,
), ),
); );
@ -430,7 +433,7 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
console.log(e.message ?? e); console.log(e.message ?? e);
} }
} }
$content = ProxyUtils.yaml.safeDump(await main(config || { $content = ProxyUtils.yaml.safeDump(await main(config || ($file.sourceType === 'none' ? {} : {
proxies: await produceArtifact({ proxies: await produceArtifact({
type: $file.sourceType || 'collection', type: $file.sourceType || 'collection',
name: $file.sourceName, name: $file.sourceName,
@ -440,7 +443,7 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
'delete-underscore-fields': true 'delete-underscore-fields': true
} }
}), }),
})) })))
} }
} else { } else {
${script} ${script}