swpp-backends 3.1.1 → 3.1.3

package/dist/swpp/BasicActions.js

@@ -168,8 +168,9 @@ class BasicActions {
                 throw new untils_1.RuntimeException(untils_1.exceptionNames.fileDuplicate, `指定文件[${item.path.absPath}]已存在`);
             }
         }
-        await Promise.all(fileList.map(it => {
-            it.path.mkdirs().then(() => untils_1.utils.writeFile(it.path.absPath, it.content));
+        await Promise.all(fileList.map(async (it) => {
+            await it.path.mkdirs();
+            await untils_1.utils.writeFile(it.path.absPath, it.content);
         }));
     }
 }

package/dist/swpp/cli.d.ts

@@ -1,7 +1,7 @@
 export interface SwppCliConfig {
-    /** 网站根目录，可以是绝对路径也可以是相对路径，swpp 根据系统规则进行判断 */
+    /** 网站根目录，可以是绝对路径也可以是相对路径（相对于 swpp.cli.json 所在目录） */
     webRoot: string;
-    /** 配置文件所在的相对路径（越靠前优先级越高） */
+    /** 配置文件所在的相对路径（相对于 swpp.cli.json 所在目录，越靠前优先级越高） */
     configFiles: string[] | string;
     /** dom js 的相对路径（相对于网站根目录，`.js` 结尾） */
     domJsPath?: string;

package/dist/swpp/cli.js

@@ -39,10 +39,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initCommand = initCommand;
 const commander_1 = require("commander");
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const index_1 = require("../index");
 const BasicActions_1 = require("./BasicActions");
 const untils_1 = require("./untils");
 const HTMLParser = __importStar(require("node-html-parser"));
+function resolveCliConfigFiles(configFiles, cliJsonPath) {
+    const cliDir = path_1.default.dirname(cliJsonPath);
+    const resolveItem = (item) => path_1.default.isAbsolute(item) ? item : path_1.default.resolve(cliDir, item);
+    return typeof configFiles === 'string' ? resolveItem(configFiles) : configFiles.map(resolveItem);
+}
+function resolveCliConfigDirPath(filePath, cliJsonPath) {
+    return path_1.default.isAbsolute(filePath) ? filePath : path_1.default.resolve(path_1.default.dirname(cliJsonPath), filePath);
+}
 async function initCommand() {
     commander_1.program.version(index_1.swppVersion, '-v, --version', '查看当前 swpp backends 的版本号');
     commander_1.program.addHelpText('after', '  每行显示一条指令信息，指令后跟方括号表示可选参数，尖括号表示必填参数');
@@ -88,13 +97,16 @@ async function runBuild(cliJsonPath = './swpp.cli.json', context) {
     if (!cliJsonPath.endsWith('.json')) {
         throw new untils_1.RuntimeException(untils_1.exceptionNames.unsupportedFileType, 'CLI 配置文件仅支持 JSON 格式', { yourPath: cliJsonPath });
     }
+    cliJsonPath = path_1.default.resolve(cliJsonPath);
     const cliConfig = JSON.parse(await untils_1.utils.readFileUtf8(cliJsonPath));
+    cliConfig.webRoot = resolveCliConfigDirPath(cliConfig.webRoot, cliJsonPath);
+    cliConfig.configFiles = resolveCliConfigFiles(cliConfig.configFiles, cliJsonPath);
     await checkAndInitConfig(cliConfig);
     const actions = await BasicActions_1.BasicActions.build({
         context,
         publicPath: cliConfig.webRoot,
         isServiceWorker: cliConfig.serviceWorker ?? true,
-        domJsPath: cliConfig.gen_dom ? undefined : cliConfig.domJsPath,
+        domJsPath: cliConfig.gen_dom ? (cliConfig.domJsPath ?? '/sw-dom.js') : undefined,
         diffJsonPath: cliConfig.diffJsonPath
     });
     await actions.loadConfigs(Array.isArray(cliConfig.configFiles) ? cliConfig.configFiles : [cliConfig.configFiles]);

package/dist/swpp/database/KeyValueDatabase.js

@@ -52,12 +52,12 @@ class KeyValueDatabase {
         let value = item.manual ?? item.default;
         let isNoCache = false;
         if (SpecialConfig_1.SpecialConfig.isRuntimeSpecialConfig(value)) {
-            this.runtime.debugCallChain.push(this.namespace, key);
-            value = value.get(this.runtime, this.compilation);
-            this.runtime.debugCallChain.pop(this.namespace, key);
             if (SpecialConfig_1.SpecialConfig.isNoCacheConfig(value)) {
                 isNoCache = true;
             }
+            this.runtime.debugCallChain.push(this.namespace, key);
+            value = value.get(this.runtime, this.compilation);
+            this.runtime.debugCallChain.pop(this.namespace, key);
         }
         // 进行类型预检
         if (!(item.default === null || item.default === undefined || value === null || value === undefined) && typeof value != typeof item.default) {

package/package.json

@@ -1,35 +1,37 @@
-{
-  "name": "swpp-backends",
-  "version": "3.1.1",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
-  "description": "Generate a powerful ServiceWorker for your website.",
-  "author": "kmar",
-  "license": "AGPL-3.0",
-  "files": [
-    "dist",
-    "types"
-  ],
-  "bin": {
-    "swpp-cli": "dist/cli-index.js"
-  },
-  "devDependencies": {
-    "@types/node": "^22.9.3",
-    "typescript": "^5.7.2"
-  },
-  "dependencies": {
-    "commander": "^12.1.0",
-    "jiti": "^2.4.2",
-    "node-html-parser": "^7.0.1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/EmptyDreams/swpp-backends.git"
-  },
-  "homepage": "https://swpp.kmar.top/",
-  "keywords": [
-    "ServiceWorker",
-    "sw"
-  ],
-  "scripts": {}
+{
+  "name": "swpp-backends",
+  "version": "3.1.3",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
+  "scripts": {
+    "prepublishOnly": "tsc"
+  },
+  "description": "Generate a powerful ServiceWorker for your website.",
+  "author": "kmar",
+  "license": "AGPL-3.0",
+  "files": [
+    "dist",
+    "types"
+  ],
+  "bin": {
+    "swpp-cli": "dist/cli-index.js"
+  },
+  "devDependencies": {
+    "@types/node": "^22.9.3",
+    "typescript": "^5.7.2"
+  },
+  "dependencies": {
+    "commander": "^12.1.0",
+    "jiti": "^2.4.2",
+    "node-html-parser": "^7.0.1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/EmptyDreams/swpp-backends.git"
+  },
+  "homepage": "https://swpp.kmar.top/",
+  "keywords": [
+    "ServiceWorker",
+    "sw"
+  ]
 }