proschi 0.13.0 → 0.14.0

package/dist/server.cjs

@@ -25478,6 +25478,19 @@ var BracketCounter = class {
     return this.depth;
   }
 };
+function qualify(tokens) {
+  let out;
+  for (let i = 0; i < tokens.length; i++) {
+    const [t, next] = [tokens[i], tokens[i + 1]];
+    const joined = t.kind === "ident" && next?.kind === "tag" && next.col === t.col + t.length;
+    if (joined && (tokens[i + 2]?.kind === "arrow" || tokens[i - 1]?.kind === "arrow")) {
+      out ??= tokens.slice(0, i);
+      out.push({ ...t, value: `${t.value}.${next.value}`, length: t.length + next.length });
+      i++;
+    } else out?.push(t);
+  }
+  return out ?? tokens;
+}
 
 // ../frontend/src/dsl/format.ts
 function format(source2) {
@@ -25514,7 +25527,8 @@ function classify(lines) {
       entries2.push({ kind: "blank", depth, text: "" });
       continue;
     }
-    const { tokens, diagnostics } = tokenizeLine(raw, i + 1);
+    const { tokens: lexed, diagnostics } = tokenizeLine(raw, i + 1);
+    const tokens = qualify(lexed);
     if (diagnostics.some((d) => d.severity === "error") || tokens.length === 0) {
       entries2.push({ kind: "line", depth, text: original });
       continue;
@@ -25669,7 +25683,8 @@ function join(raw, tokens) {
   return out;
 }
 function sameTokens(text, tokens) {
-  const { tokens: again, diagnostics } = tokenizeLine(text, 1);
+  const { tokens: lexed, diagnostics } = tokenizeLine(text, 1);
+  const again = qualify(lexed);
   return diagnostics.length === 0 && again.length === tokens.length && again.every((t, i) => t.kind === tokens[i].kind && t.value === tokens[i].value);
 }
 function reindent(line, delta) {
@@ -28013,19 +28028,6 @@ function expand(items) {
   }
   return paths;
 }
-function qualify(tokens) {
-  let out;
-  for (let i = 0; i < tokens.length; i++) {
-    const [t, next] = [tokens[i], tokens[i + 1]];
-    const joined = t.kind === "ident" && next?.kind === "tag" && next.col === t.col + t.length;
-    if (joined && (tokens[i + 2]?.kind === "arrow" || tokens[i - 1]?.kind === "arrow")) {
-      out ??= tokens.slice(0, i);
-      out.push({ ...t, value: `${t.value}.${next.value}`, length: t.length + next.length });
-      i++;
-    } else out?.push(t);
-  }
-  return out ?? tokens;
-}
 function findUseCaseIn(diagram, name) {
   const lower = name.toLowerCase();
   return diagram.useCases.find((u) => u.name === name) ?? diagram.useCases.find((u) => u.name.toLowerCase() === lower) ?? diagram.useCases.find((u) => u.id === name);
@@ -30155,6 +30157,10 @@ var import_node_path5 = require("node:path");
 var ImportError = class extends Error {
   name = "ImportError";
 };
+var LATEST_TAG = "latest";
+var VERSION_TAG = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
+var CLOUD_NAME_SEGMENT = /^[A-Za-z0-9_][A-Za-z0-9._+-]*$/;
+var MAX_CLOUD_NAME = 200;
 var MAX_SPEC_LENGTH = 1024;
 var SEGMENT = /^[A-Za-z0-9_][A-Za-z0-9._ +-]*$/;
 var HOST = /^[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?(?:\.[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?)*(?::\d{1,5})?$/;
@@ -30202,8 +30208,9 @@ function parseRemoteSpec(spec) {
     checkRef(ref, spec);
     return { kind: "git", repo, path, ref };
   }
+  if (scheme === "cloud") return parseCloudSpec(spec);
   if (scheme === "http") throw new ImportError(`'${spec}' uses http://; only https:// imports are allowed`);
-  if (scheme !== "https") throw new ImportError(`'${spec}' is not a supported import source; use a relative path, git: or https://`);
+  if (scheme !== "https") throw new ImportError(`'${spec}' is not a supported import source; use a relative path, git:, https:// or cloud:`);
   let url;
   try {
     url = new URL(spec);
@@ -30215,15 +30222,48 @@ function parseRemoteSpec(spec) {
   if (!HOST.test(url.host)) throw new ImportError(`'${spec}' has an invalid host`);
   return { kind: "https", url: url.href };
 }
+function parseCloudSpec(spec) {
+  const body = spec.slice("cloud:".length);
+  const split2 = body.indexOf("//");
+  const head = split2 === -1 ? body : body.slice(0, split2);
+  const parts = head.split(":");
+  if (parts.length > 2) throw new ImportError(`'${spec}' is not a cloud source; write cloud:<name> or cloud:<name>:<tag>`);
+  const name = parts[0].endsWith(".proschi") ? parts[0].slice(0, -".proschi".length) : parts[0];
+  if (!name || name.length > MAX_CLOUD_NAME || name.split("/").some((p) => !CLOUD_NAME_SEGMENT.test(p) || p === "." || p === "..")) {
+    throw new ImportError(
+      `'${spec}' names an invalid diagram '${parts[0]}'; use the diagram's file name (letters, digits, '.', '_', '+', '-' and '/', no spaces), with or without .proschi`
+    );
+  }
+  const tag = parts.length === 2 ? parts[1] : LATEST_TAG;
+  if (!VERSION_TAG.test(tag)) {
+    throw new ImportError(`'${spec}' has an invalid version tag '${tag}'; use up to 64 letters, digits, '.', '_' and '-', starting with a letter or digit, e.g. 2026-11-01`);
+  }
+  if (split2 === -1) return { kind: "cloud", name, tag };
+  return { kind: "cloud", name, tag, path: repoPathSegments(body.slice(split2 + 2), spec).join("/") };
+}
 function formatRemoteSpec(spec) {
+  if (spec.kind === "cloud") return `cloud:${spec.name}:${spec.tag}${spec.path ? `//${spec.path}` : ""}`;
   return spec.kind === "git" ? `git:${spec.repo}//${spec.path}@${spec.ref}` : spec.url;
 }
 function resolveImportPath(fromPath, importPath) {
   if (importPath.includes("\0")) throw new ImportError(`'${importPath.replace(/\0/g, "")}' contains a NUL character`);
   const remote = parseRemoteSpec(importPath);
+  if (remote?.kind === "cloud" && fromPath && isRemoteSpec(fromPath) && parseRemoteSpec(fromPath)?.kind !== "cloud") {
+    throw new ImportError(`'${importPath}' is a cloud import inside ${fromPath}; cloud: sources only work from your own diagrams`);
+  }
   if (remote) return formatRemoteSpec(remote);
   if (isAbsolutePath(importPath)) throw new ImportError(`'${importPath}' is an absolute path; imports must be relative to the importing file`);
   const from = fromPath && isRemoteSpec(fromPath) ? parseRemoteSpec(fromPath) : void 0;
+  if (from?.kind === "cloud") {
+    const parts2 = (from.path ?? "").split("/").slice(0, -1);
+    for (const part of importPath.split("/")) {
+      if (part === "" || part === ".") continue;
+      if (part !== "..") parts2.push(part);
+      else if (parts2.length > 0) parts2.pop();
+      else throw new ImportError(`'${importPath}' leaves the files saved with cloud:${from.name}:${from.tag}`);
+    }
+    return formatRemoteSpec({ ...from, path: repoPathSegments(parts2.join("/"), importPath).join("/") });
+  }
   if (from?.kind === "git") {
     const parts2 = from.path.split("/").slice(0, -1);
     for (const part of importPath.split("/")) {
@@ -30260,11 +30300,14 @@ var LOCK_FILE = "proschi.lock";
 var CACHE_DIR = ".proschi/cache";
 var HASH = /^[0-9a-f]{64}$/;
 var COMMIT = /^[0-9a-f]{40}([0-9a-f]{24})?$/;
-var emptyLock = () => ({ version: 1, git: {}, https: {} });
+var emptyLock = () => ({ version: 1, git: {}, https: {}, cloud: {} });
 var gitKey = (repo, ref) => `${repo}@${ref}`;
+var cloudKey = (name, tag) => `${name}:${tag}`;
 var remoteError = {
   noLock: (spec) => new ImportError(`'${spec}' is a remote import and there is no ${LOCK_FILE}; run proschi imports sync`),
-  notLocked: (spec) => new ImportError(`'${spec}' is not in ${LOCK_FILE}; run proschi imports sync`),
+  notLocked: (spec) => spec.startsWith("cloud:") ? remoteError.cloud(spec) : new ImportError(`'${spec}' is not in ${LOCK_FILE}; run proschi imports sync`),
+  /** A cloud version that is not pinned yet (docs/design/versions-and-cloud.md). */
+  cloud: (spec) => new ImportError(`'${spec}' is a version in your Proschi account; run proschi imports sync to pin it (cloud sources need proschi login)`),
   notCached: (spec) => new ImportError(`'${spec}' is not in the import cache (${CACHE_DIR}); run proschi imports sync`),
   altered: (spec) => new ImportError(`The cached copy of '${spec}' does not match its hash in ${LOCK_FILE}; run proschi imports sync`)
 };
@@ -30281,7 +30324,8 @@ function parseLock(text) {
   const lock = emptyLock();
   const git = json.git ?? {};
   const https = json.https ?? {};
-  if (!isRecord(git) || !isRecord(https)) throw invalid('"git" and "https" must be objects');
+  const cloud = json.cloud ?? {};
+  if (!isRecord(git) || !isRecord(https) || !isRecord(cloud)) throw invalid('"git", "https" and "cloud" must be objects');
   for (const [key, entry] of Object.entries(git)) {
     const at = key.lastIndexOf("@");
     const valid = at > 0 && isRecord(entry) && typeof entry.commit === "string" && COMMIT.test(entry.commit) && isRecord(entry.files) && Object.entries(entry.files).every(([path, hash]) => typeof hash === "string" && HASH.test(hash) && isGitSpec(`git:${key.slice(0, at)}//${path}@${key.slice(at + 1)}`));
@@ -30292,8 +30336,28 @@ function parseLock(text) {
     if (typeof hash !== "string" || !HASH.test(hash) || parseRemoteSpec(url)?.kind !== "https") throw invalid(`bad https entry '${url}'`);
     lock.https[url] = hash;
   }
+  for (const [key, entry] of Object.entries(cloud)) {
+    const hash = (v) => typeof v === "string" && HASH.test(v);
+    const valid = isCanonicalSpec(`cloud:${key}`, "cloud") && isRecord(entry) && typeof entry.tag === "string" && VERSION_TAG.test(entry.tag) && entry.tag !== LATEST_TAG && Number.isSafeInteger(entry.seq) && entry.seq > 0 && hash(entry.sha256) && (entry.source === void 0 || hash(entry.source)) && isRecord(entry.files) && Object.entries(entry.files).every(([path, h]) => hash(h) && isCanonicalSpec(`cloud:${key}//${path}`, "cloud"));
+    if (!valid) throw invalid(`bad cloud entry '${key}'`);
+    lock.cloud[key] = {
+      tag: entry.tag,
+      seq: entry.seq,
+      sha256: entry.sha256,
+      ...entry.source === void 0 ? {} : { source: entry.source },
+      files: { ...entry.files }
+    };
+  }
   return lock;
 }
+function isCanonicalSpec(spec, kind) {
+  try {
+    const remote = parseRemoteSpec(spec);
+    return remote?.kind === kind && formatRemoteSpec(remote) === spec;
+  } catch {
+    return false;
+  }
+}
 function isGitSpec(spec) {
   try {
     return parseRemoteSpec(spec)?.kind === "git";
@@ -30305,6 +30369,10 @@ function lockedHash(lock, spec) {
   const remote = parseRemoteSpec(spec);
   if (remote?.kind === "git") return lock.git[gitKey(remote.repo, remote.ref)]?.files[remote.path];
   if (remote?.kind === "https") return lock.https[remote.url];
+  if (remote?.kind === "cloud") {
+    const entry = lock.cloud[cloudKey(remote.name, remote.tag)];
+    return remote.path === void 0 ? entry?.source : entry?.files[remote.path];
+  }
   return void 0;
 }
 
@@ -30757,7 +30825,7 @@ function positionAt(text, offset) {
 
 // src/server.ts
 if (process.argv.includes("--version")) {
-  console.log(true ? "0.13.0" : "dev");
+  console.log(true ? "0.14.0" : "dev");
   process.exit(0);
 }
 var connection = (0, import_node.createConnection)(import_node.ProposedFeatures.all);
@@ -30803,7 +30871,7 @@ connection.onInitialize(() => ({
     codeActionProvider: { codeActionKinds: [import_node.CodeActionKind.QuickFix] },
     semanticTokensProvider: { legend: { tokenTypes: TOKEN_TYPES, tokenModifiers: [] }, full: true }
   },
-  serverInfo: { name: "proschi-language-server", version: true ? "0.13.0" : "dev" }
+  serverInfo: { name: "proschi-language-server", version: true ? "0.14.0" : "dev" }
 }));
 function validate(document) {
   const analysis = analysisOf(document);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proschi",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Command-line checker and language server for Proschi architecture diagrams",
   "license": "MIT",
   "repository": {