@zalkera/cli 0.28.1 → 0.29.1

package/README.md

@@ -103,9 +103,9 @@ zalkera logout
     `y`/`버립니다` 를 그대로 이어 붙인다 — 크레딧이 안 걸렸으니 다시 묻지 않는다.
   - 다만 확인하시는 사이 사이트 쪽 편집이 달라졌으면 **아무것도 안 버리고** 멈춘다.
     보여 드린 것과 버리는 것이 갈리면 안 되기 때문이다.
-- ⚠ **되돌리기는 원장을 되감지 않는다.** 되돌릴 대상이 마지막 버전이 아니면 사이트는 그 내용으로
-  **새 버전을 세워** 켠다 — 그래서 「5판으로 되돌렸습니다」 뒤에 켜진 번호가 10일 수 있다. 그때
-  그 사실을 함께 말한다.
+- ⚠ **되돌리기는 버전 목록을 되감지 않는다.** 되돌릴 대상이 마지막 버전이 아니면 사이트는 그
+  내용으로 **새 버전을 세워** 켠다 — 그래서 「버전 5로 되돌렸습니다」 뒤에 켜진 번호가 10일 수
+  있다. 그때 그 사실을 함께 말한다.
 - ⚠ **편집이 걸려 있으면 되돌리기가 막힌다.** 사이트가 그것을 거절한다 — 먼저 `zalkera publish`
   로 새 버전을 만들거나 `zalkera discard` 로 버려야 한다.
   - 그 편집이 **옛 버전 위**에 있으면(그 사이 라이브가 옮겨진 경우) `publish` 쪽도 막힌다.

package/dist/main.js

@@ -25,7 +25,7 @@ function plainNotice(text, limit = 300) {
     return "";
   const cap = Math.min(limit, MAX_CAP);
   const head = text.length > cap * 4 ? text.slice(0, cap * 4) : text;
-  const stripped = head.replace(/[\u0000-\u001f\u007f-\u009f\u200b-\u200f\u202a-\u202e\u2066-\u2069\u2028\u2029]+/g, " ");
+  const stripped = head.replace(new RegExp("[\\u0000-\\u001f\\u007f-\\u009f\\u2028\\u2029]|\\p{Cf}", "gu"), " ");
   const tidy = defang(stripped).replace(/\s+/g, " ").trim();
   return tidy.length > cap ? `${tidy.slice(0, cap)}\u2026` : tidy;
 }
@@ -1131,7 +1131,7 @@ async function ensureEnvIgnored(dir) {
     return "created";
   }
   const content = await readFile2(path, "utf8");
-  const ignored = content.split("\n").map((line) => line.trim()).some((line) => line === ".env.local" || line === ".env*" || line === ".env*.local");
+  const ignored = content.split("\n").map((line) => line.trim()).some((line) => line === ".env.local" || line === ".env*" || line === ".env.*" || line === ".env*.local");
   if (ignored)
     return "already";
   const suffix = content.endsWith("\n") || content.length === 0 ? "" : "\n";
@@ -1363,8 +1363,12 @@ async function createSink(targetDir, options) {
       if (options.rejectVendored === true)
         assertNotVendored(segments, name);
       if (entry.type === "5") {
-        if (options.decide)
-          return;
+        if (options.decide) {
+          if (options.emptyDirs !== true)
+            return;
+          if (options.decide(`${segments.join("/")}/`) === "skip")
+            return;
+        }
         await descend(root, segments, verified);
         return;
       }
@@ -1940,7 +1944,39 @@ function serializeSyncLedger(ledger) {
 }
 
 // ../core/dist/localMark.js
+import { join as join10 } from "node:path";
+
+// ../core/dist/gitExclude.js
+import { chmod as chmod3, lstat as lstat3, readFile as readFile5 } from "node:fs/promises";
 import { join as join9 } from "node:path";
+async function excludeFromGit(root, path) {
+  try {
+    const info = await lstat3(join9(root, ".git")).catch(() => null);
+    if (!info || !info.isDirectory())
+      return "no-git";
+    const dir = await ensureOwnDir(root, ".git", "info");
+    const file = join9(dir, "exclude");
+    const leaf = await lstat3(file).catch((error) => {
+      if (error?.code === "ENOENT")
+        return null;
+      throw error;
+    });
+    if (leaf !== null && !leaf.isFile())
+      return "failed";
+    const current = leaf === null ? "" : await readFile5(file, "utf8");
+    if (current.split(/\r?\n/).some((line) => line.trim() === path))
+      return "already";
+    const prefix = current === "" || current.endsWith("\n") ? "" : "\n";
+    const mode = leaf === null ? 420 : leaf.mode & 511;
+    await writeOwnFile(file, `${current}${prefix}${path}
+`, mode);
+    if (leaf !== null)
+      await chmod3(file, mode);
+    return "written";
+  } catch {
+    return "failed";
+  }
+}
 
 // ../core/dist/sourceVersion.js
 var VERSION_DIGEST_PATTERN = /^[0-9a-f]{64}$/;
@@ -2027,11 +2063,12 @@ async function writeSourceMarkTo(root, mark) {
 async function writeMarkText(root, text) {
   try {
     await ensureOwnDir(root, ".zalkera");
-    await writeOwnFile(join9(root, SOURCE_MARK_PATH), text);
-    return { ok: true, text: "" };
+    await writeOwnFile(join10(root, SOURCE_MARK_PATH), text);
   } catch (error) {
     return { ok: false, reason: error instanceof Error ? error.message : String(error) };
   }
+  await excludeFromGit(root, SOURCE_MARK_PATH);
+  return { ok: true, text: "" };
 }
 
 // ../core/dist/provenance.js
@@ -2039,7 +2076,7 @@ var PROVENANCE_PATH = ".zalkera/provenance.json";
 
 // ../core/dist/zip.js
 init_errors();
-import { join as join10, relative as relative3, sep as sep3 } from "node:path";
+import { join as join11, relative as relative3, sep as sep3 } from "node:path";
 import { deflateRaw } from "node:zlib";
 import { promisify } from "node:util";
 var deflate = promisify(deflateRaw);
@@ -2184,8 +2221,9 @@ var SECRET_NAMES = /* @__PURE__ */ new Set([
 var SECRET_SUFFIXES = [".pem", ".key", ".p12", ".pfx", ".p8"];
 var EXCLUDED_PATHS = /* @__PURE__ */ new Set([".zalkera/source.json", SYNC_LEDGER_PATH, PROVENANCE_PATH]);
 var EXCLUDED_PREFIXES = [".zalkera/saved/"];
+var OWN_TMP = /\.zalkera-[0-9a-f]{12}\.tmp$/;
 function isExcludedPath(path) {
-  return EXCLUDED_PATHS.has(path) || EXCLUDED_PREFIXES.some((prefix) => path.startsWith(prefix));
+  return EXCLUDED_PATHS.has(path) || EXCLUDED_PREFIXES.some((prefix) => path.startsWith(prefix)) || OWN_TMP.test(path);
 }
 function isExcludedEntry(entryPath) {
   const path = entryPath.split(sep3).join("/").toLowerCase();
@@ -2268,8 +2306,8 @@ var SERVER_NORMALIZATION_SETS = {
 init_errors();
 import { createReadStream as createReadStream2 } from "node:fs";
 import { createHash as createHash5 } from "node:crypto";
-import { lstat as lstat3, readdir as readdir3 } from "node:fs/promises";
-import { join as join11, sep as sep4 } from "node:path";
+import { lstat as lstat4, readdir as readdir3 } from "node:fs/promises";
+import { join as join12, sep as sep4 } from "node:path";
 async function hashWorkdir(root, options = {}) {
   const manifest = {};
   const cap = Math.min(options.maxEntries ?? MAX_ENTRIES, MAX_ENTRIES);
@@ -2287,7 +2325,7 @@ async function hashWorkdir(root, options = {}) {
       if (item.isSymbolicLink())
         continue;
       if (item.isDirectory()) {
-        await walk(join11(dir, item.name), relative5);
+        await walk(join12(dir, item.name), relative5);
         continue;
       }
       if (!item.isFile())
@@ -2296,7 +2334,7 @@ async function hashWorkdir(root, options = {}) {
       if (seen > cap) {
         throw new DevtoolsError("LOCAL_TOO_LARGE", `\uC774 \uD3F4\uB354\uC758 \uD30C\uC77C\uC774 \uB108\uBB34 \uB9CE\uC2B5\uB2C8\uB2E4(${cap}\uAC1C \uCD08\uACFC).`, "\uC0AC\uC774\uD2B8 \uD3F4\uB354\uAC00 \uC544\uB2CC \uACF3\uC744 \uAC00\uB9AC\uD0A4\uACE0 \uC788\uC9C0 \uC54A\uC740\uC9C0 \uD655\uC778\uD574 \uC8FC\uC138\uC694.");
       }
-      manifest[relative5] = { sha256: await hashFile(join11(dir, item.name)) };
+      manifest[relative5] = { sha256: await hashFile(join12(dir, item.name)) };
     }
   }
   await walk(root, "");
@@ -2318,8 +2356,8 @@ async function resolveExisting(root, path) {
     return null;
   let current = root;
   for (const part of segments) {
-    const next = join11(current, part);
-    const info = await lstat3(next).catch(() => null);
+    const next = join12(current, part);
+    const info = await lstat4(next).catch(() => null);
     if (!info || info.isSymbolicLink())
       return null;
     current = next;
@@ -2496,10 +2534,13 @@ var DEFAULT_TIMEOUT_MS2 = 10 * 60 * 1e3;
 // ../core/dist/tenantScope.js
 init_notice();
 
+// ../core/dist/git.js
+init_notice();
+
 // ../core/dist/npmChoice.js
 import { execFileSync } from "node:child_process";
 import { existsSync as existsSync7, realpathSync } from "node:fs";
-import { delimiter as delimiter2, isAbsolute as isAbsolute2, join as join12, normalize as normalize3, sep as sep5 } from "node:path";
+import { delimiter as delimiter2, isAbsolute as isAbsolute2, join as join13, normalize as normalize3, sep as sep5 } from "node:path";
 var MIN_SYSTEM_NPM_MAJOR = 9;
 function majorOf(version2) {
   const m = /^(\d+)\./.exec((version2 ?? "").trim());
@@ -2562,7 +2603,7 @@ function npmArgvOf(choice, nodePath) {
       return null;
   }
 }
-var PATH_OPS = { join: join12, isAbsolute: isAbsolute2, normalize: normalize3, sep: sep5 };
+var PATH_OPS = { join: join13, isAbsolute: isAbsolute2, normalize: normalize3, sep: sep5 };
 function probeSystemNpm(nodePath, excludeUnder = [], env = process.env) {
   const entries = (env.PATH ?? "").split(delimiter2);
   for (const step of systemNpmSearchSteps(entries, PATH_OPS, excludeUnder)) {
@@ -2641,12 +2682,12 @@ var UPGRADE_NOTICE_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 
 // ../core/dist/tokenPath.js
 import { homedir as homedir2 } from "node:os";
-import { isAbsolute as isAbsolute3, join as join13, resolve as resolve5, sep as sep6 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join14, resolve as resolve5, sep as sep6 } from "node:path";
 function tokenPath(env = process.env, home = homedir2()) {
-  const fallback = join13(home, ".config");
+  const fallback = join14(home, ".config");
   const base = env.XDG_CONFIG_HOME;
   const inside = base !== void 0 && isAbsolute3(base) && (resolve5(base) === resolve5(home) || resolve5(base).startsWith(resolve5(home) + sep6));
-  return join13(inside ? resolve5(base) : fallback, "zalkera", "auth.json");
+  return join14(inside ? resolve5(base) : fallback, "zalkera", "auth.json");
 }
 
 // ../core/dist/index.js
@@ -2766,9 +2807,9 @@ function trimPaths(paths, cap = PATH_LIST_CAP, all = false) {
 }
 
 // ../core/dist/pull.js
-import { lstat as lstat4, mkdir as mkdir5, readFile as readFile5, realpath as realpath2, rename as rename2, rmdir, stat as stat3, unlink, writeFile as writeFile7 } from "node:fs/promises";
+import { lstat as lstat5, mkdir as mkdir5, readFile as readFile6, realpath as realpath2, rename as rename2, rmdir, unlink } from "node:fs/promises";
 init_errors();
-import { basename as basename2, dirname as dirname2, join as join14, relative as relative4, resolve as resolve6, sep as sep7 } from "node:path";
+import { basename as basename2, dirname as dirname2, join as join15, relative as relative4, resolve as resolve6, sep as sep7 } from "node:path";
 var SAVED_SUFFIX = ".zalkera-saved";
 async function pullSiteSource(options) {
   const report = options.onProgress ?? (() => {
@@ -2867,11 +2908,11 @@ async function requireNoLinkedTargets(root, paths) {
     const segments = path.split("/").filter((s) => s !== "");
     let current = root;
     for (const part of segments) {
-      current = join14(current, part);
+      current = join15(current, part);
       if (checked.has(current))
         continue;
       checked.add(current);
-      const info = await lstat4(current).catch(() => null);
+      const info = await lstat5(current).catch(() => null);
       if (!info?.isSymbolicLink())
         continue;
       throw new DevtoolsError("PULL_WOULD_OVERWRITE", `\uC774 \uD3F4\uB354\uC758 ${relative4(root, current).split(sep7).join("/")} \uAC00 \uB2E4\uB978 \uACF3\uC744 \uAC00\uB9AC\uD0A4\uB294 \uBC14\uB85C\uAC00\uAE30\uC785\uB2C8\uB2E4. \uC544\uBB34\uAC83\uB3C4 \uBC1B\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.`, "\uADF8 \uBC14\uB85C\uAC00\uAE30\uB97C \uC9C0\uC6B0\uACE0 \uB2E4\uC2DC \uC2E4\uD589\uD574 \uC8FC\uC138\uC694. \uADF8\uB300\uB85C \uB450\uBA74 \uC774 \uD3F4\uB354 \uBC16\uC758 \uAC83\uC744 \uB36E\uC5B4\uC4F0\uAC8C \uB429\uB2C8\uB2E4.");
@@ -2890,13 +2931,13 @@ function withoutExcluded(declared) {
   return { incoming, dropped: dropped.sort() };
 }
 async function readLedger(root) {
-  const text = await readFile5(join14(root, SYNC_LEDGER_PATH), "utf8").catch(() => null);
+  const text = await readFile6(join15(root, SYNC_LEDGER_PATH), "utf8").catch(() => null);
   return text === null ? null : parseSyncLedger(text);
 }
 async function writeLedger(root, ledger) {
   try {
     const dir = await ensureOwnDir(root, ...SYNC_LEDGER_PATH.split("/").slice(0, -1));
-    await writeOwnFile(join14(dir, basename2(SYNC_LEDGER_PATH)), serializeSyncLedger(ledger));
+    await writeOwnFile(join15(dir, basename2(SYNC_LEDGER_PATH)), serializeSyncLedger(ledger));
   } catch {
     return false;
   }
@@ -2905,18 +2946,7 @@ async function writeLedger(root, ledger) {
   return true;
 }
 async function ignoreLedger(root) {
-  const info = join14(root, ".git", "info");
-  const exists = await stat3(join14(root, ".git")).then((s) => s.isDirectory()).catch(() => false);
-  if (!exists)
-    return;
-  const path = join14(info, "exclude");
-  const current = await readFile5(path, "utf8").catch(() => "");
-  if (current.split(/\r?\n/).some((line) => line.trim() === SYNC_LEDGER_PATH))
-    return;
-  await mkdir5(info, { recursive: true });
-  const prefix = current === "" || current.endsWith("\n") ? "" : "\n";
-  await writeFile7(path, `${current}${prefix}${SYNC_LEDGER_PATH}
-`);
+  await excludeFromGit(root, SYNC_LEDGER_PATH);
 }
 async function currentGeneration(api) {
   return await api.draftFiles().then((state) => state.generation ?? null).catch(() => null);
@@ -2946,13 +2976,13 @@ async function applyDeletes(root, paths) {
 async function setAside(root, plan) {
   const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
   const real = await realpath2(root).catch(() => root);
-  const saved = join14(dirname2(real), `${basename2(real)}${SAVED_SUFFIX}`, stamp);
+  const saved = join15(dirname2(real), `${basename2(real)}${SAVED_SUFFIX}`, stamp);
   const moved = [];
   for (const conflict of plan.conflicts) {
     const from = await resolveExisting(root, conflict.path);
     if (!from)
       continue;
-    const to = join14(saved, conflict.path);
+    const to = join15(saved, conflict.path);
     await mkdir5(dirname2(to), { recursive: true });
     await rename2(from, to);
     moved.push(conflict.path);
@@ -2974,13 +3004,13 @@ ${list}`,
 
 // ../core/dist/baseline.js
 init_errors();
-import { readFile as readFile6 } from "node:fs/promises";
-import { join as join15, resolve as resolve7 } from "node:path";
+import { readFile as readFile7 } from "node:fs/promises";
+import { join as join16, resolve as resolve7 } from "node:path";
 async function rebuildBaseline(options) {
   const report = options.onProgress ?? (() => {
   });
   const root = resolve7(options.folder);
-  const previousText = await readFile6(join15(root, SYNC_LEDGER_PATH), "utf8").catch(() => null);
+  const previousText = await readFile7(join16(root, SYNC_LEDGER_PATH), "utf8").catch(() => null);
   const previous = previousText === null ? null : parseSyncLedger(previousText);
   report("\uD310\uC758 \uD30C\uC77C \uBAA9\uB85D\uC744 \uB2E4\uC2DC \uC77D\uB294 \uC911\uC785\uB2C8\uB2E4\u2026");
   const tar = await fetchVerifiedSourceTar({
@@ -3080,8 +3110,8 @@ function ledgerCorrection(ledger, draft) {
 // ../core/dist/push.js
 init_errors();
 init_notice();
-import { readFile as readFile7, stat as stat4 } from "node:fs/promises";
-import { basename as basename3, join as join16, resolve as resolve8 } from "node:path";
+import { readFile as readFile8, stat as stat3 } from "node:fs/promises";
+import { basename as basename3, join as join17, resolve as resolve8 } from "node:path";
 
 // ../core/dist/pushPlan.js
 function effectiveSha(base, draft, path) {
@@ -3358,13 +3388,13 @@ async function bodyOf(root, edits) {
       body.push({ path: edit.path, remove: true, ...edit.baseSha256 === null ? {} : { baseSha256: edit.baseSha256 } });
       continue;
     }
-    const size = (await stat4(join16(root, edit.path))).size;
+    const size = (await stat3(join17(root, edit.path))).size;
     if (size > MAX_PUSH_FILE_BYTES) {
       throw new DevtoolsError("PUSH_TOO_LARGE", `\uD30C\uC77C \uD558\uB098\uAC00 \uB108\uBB34 \uD07D\uB2C8\uB2E4: ${edit.path} (${Math.round(size / 1024)}KB \xB7 \uC0C1\uD55C ${MAX_PUSH_FILE_BYTES / 1024}KB).`, "\uB3D9\uC601\uC0C1\xB7\uC6D0\uBCF8 \uC774\uBBF8\uC9C0\xB7\uBE4C\uB4DC \uC0B0\uCD9C\uBB3C\uC774 \uC18C\uC2A4 \uD3F4\uB354\uC5D0 \uB4E4\uC5B4 \uC788\uC9C0 \uC54A\uC740\uC9C0 \uD655\uC778\uD574 \uC8FC\uC138\uC694.");
     }
     if (total + size > MAX_PUSH_BYTES)
       throw tooLarge();
-    const raw = await readFile7(join16(root, edit.path));
+    const raw = await readFile8(join17(root, edit.path));
     const breach = templateBreach(basename3(edit.path), raw);
     if (breach !== null) {
       throw new DevtoolsError("PUSH_SECRET_TEMPLATE", `${edit.path} \uC5D0 \uC2E4\uC81C \uAC12\uC774 \uB4E4\uC5B4 \uC788\uC5B4 \uC62C\uB9AC\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4(${breach}).`, "`.env.example` \uAC19\uC740 \uC11C\uC2DD \uD30C\uC77C\uC740 \uAC12\uC744 \uBE44\uC6CC \uB450\uC5B4\uC57C \uC62C\uB77C\uAC11\uB2C8\uB2E4. \uC2E4\uC81C \uAC12\uC740 \uCF58\uC194\uC758 \uD658\uACBD\uBCC0\uC218 \uD654\uBA74\uC5D0\uC11C \uAD00\uB9AC\uD574 \uC8FC\uC138\uC694.");
@@ -3631,12 +3661,12 @@ function flagValue(flags, name) {
 
 // src/context.ts
 import { readFileSync } from "node:fs";
-import { readFile as readFile9 } from "node:fs/promises";
+import { readFile as readFile10 } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
-import { join as join18, resolve as resolve11 } from "node:path";
+import { join as join19, resolve as resolve11 } from "node:path";
 
 // src/tokenStore.ts
-import { chmod as chmod3, readFile as readFile8, rm as rm6 } from "node:fs/promises";
+import { chmod as chmod4, readFile as readFile9, rm as rm6 } from "node:fs/promises";
 import { basename as basename4, dirname as dirname3 } from "node:path";
 var FileTokenStore = class {
   // ⚠ 매개변수 프로퍼티(`constructor(private path)`)를 안 쓴다 — Node 의 타입 제거 실행기가
@@ -3646,7 +3676,7 @@ var FileTokenStore = class {
     this.path = path;
   }
   async read() {
-    const text = await readFile8(this.path, "utf8").catch(() => null);
+    const text = await readFile9(this.path, "utf8").catch(() => null);
     if (text === null) return null;
     try {
       const raw = JSON.parse(text);
@@ -3667,10 +3697,10 @@ var FileTokenStore = class {
   }
   async write(tokens) {
     const dir = await ensureOwnDir(dirname3(dirname3(this.path)), basename4(dirname3(this.path)));
-    await chmod3(dir, 448).catch(() => {
+    await chmod4(dir, 448).catch(() => {
     });
     await writeOwnFile(this.path, JSON.stringify(tokens), 384);
-    await chmod3(this.path, 384);
+    await chmod4(this.path, 384);
   }
   async clear() {
     await rm6(this.path, { force: true });
@@ -3693,9 +3723,9 @@ function serverUrlOf(env = process.env) {
 }
 async function tenantOf(folder, explicit) {
   if (explicit) return TENANT_CODE.test(explicit) ? explicit : null;
-  const mark = parseSourceMark(await readFile9(join18(folder, SOURCE_MARK_PATH), "utf8").catch(() => null));
+  const mark = parseSourceMark(await readFile10(join19(folder, SOURCE_MARK_PATH), "utf8").catch(() => null));
   if (mark) return mark.tenant;
-  const text = await readFile9(join18(folder, SYNC_LEDGER_PATH), "utf8").catch(() => null);
+  const text = await readFile10(join19(folder, SYNC_LEDGER_PATH), "utf8").catch(() => null);
   return text === null ? null : parseSyncLedger(text)?.tenant ?? null;
 }
 async function openAuth(options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zalkera/cli",
-    "version": "0.28.1",
+    "version": "0.29.1",
     "description": "잘커라 사이트 소스를 터미널에서 받고·올리고·발행합니다. 편집기 없이, 스크립트에서도.",
     "license": "MIT",
     "type": "module",