@wcstack/typescript 2.0.0 → 2.1.1

package/README.md

@@ -20,13 +20,13 @@ Zero runtime dependencies. `typescript` is a peer dependency — the project's o
 
 ### `wcs-schema emit <state.ts|state.js> [options]`
 
-Generates `states[<name>].stateSchema` from the file's `export default` (a `defineState(...)` call is unwrapped syntactically, so the package does not even need to resolve `@wcstack/state`). The result is run through the validator core's own manifest check before anything is written.
+Generates the manifest's single `stateSchema` (`schemaVersion` 2) from the file's `export default` (a `defineState(...)` call is unwrapped syntactically, so the package does not even need to resolve `@wcstack/state`). The result is run through the validator core's own manifest check before anything is written.
 
 | Option | Description |
 |---|---|
-| `--state=<name>` | State name (default `default`) |
+| `--mount=<path>` | Emit only the subtree at this mount path — the type file of a `<wcs-state mount="…">` volume merges as a subtree of the single tree. Omit for the root state file |
 | `--out=<path>` | Output manifest, relative to the working directory (default `wcstack.manifest.json`). `--out=-` prints to stdout |
-| `--merge` | Keep everything else in an existing manifest (other states, `filters`, `listContexts`) and replace only this state's `stateSchema`. A hand-written schema for the same state is replaced, not merged |
+| `--merge` | Keep everything else in an existing manifest (`filters`, `listContexts`, other subtrees) and replace only the slot being written — the whole `stateSchema`, or the subtree at `--mount`. A hand-written schema in that slot is replaced, not merged |
 | `--tsconfig=<path>` | `tsconfig.json` to compile with (default: the nearest one above the state file, else built-in defaults) |
 | `--max-depth=<n>` | Object nesting depth at which the schema stops with a bare `{}` (default `5`, the validator's own budget) |
 

package/dist/index.esm.js

@@ -566,7 +566,7 @@ function loadSchemaCore() {
     return cached;
 }
 
-var version = "2.0.0";
+var version = "2.1.1";
 var pkg = {
 	version: version};
 

package/dist/schema-core.cjs

@@ -1382,6 +1382,7 @@ function analyzeStatePaths(scriptContent) {
   for (const listKeyEntry of pendingListKeys) {
     pushListKeyPaths(listKeyEntry, paths);
   }
+  collectRowShapesFromAssignments(scriptContent, paths);
   return paths;
 }
 function analyzeWatchEntries(scriptContent) {
@@ -1527,6 +1528,95 @@ function extractStringLiteralValue(value) {
   const match = value.trim().match(/^["']([^"'\\]*)["']$/);
   return match && match[1].length > 0 ? match[1] : null;
 }
+var ROW_ASSIGN = new RegExp(
+  String.raw`\bthis\s*(?:\.\s*([$\w]+)|\[\s*["']([^"']+)["']\s*\])\s*=(?![=>])\s*(?:(\[)|(?:[^;={}]|=>)*?\.\s*(?:concat|toSpliced|with)\s*(\())`,
+  "gd"
+);
+function collectRowShapesFromAssignments(script, paths) {
+  const scan = maskCommentsAndStrings(script);
+  ROW_ASSIGN.lastIndex = 0;
+  let match;
+  while ((match = ROW_ASSIGN.exec(scan)) !== null) {
+    const span = match.indices[1] ?? match.indices[2];
+    const listPath = script.slice(span[0], span[1]);
+    if (listPath.startsWith("$") || listPath.includes("*") || !hasPath(paths, `${listPath}.*`)) continue;
+    const openIndex = match.index + match[0].length - 1;
+    const isArrayLiteral2 = scan[openIndex] === "[";
+    const inner = extractDelimitedContent(script, scan, openIndex, scan[openIndex], isArrayLiteral2 ? "]" : ")");
+    for (const literal of collectRowLiterals(inner, isArrayLiteral2 ? 0 : 1)) {
+      for (const field of extractRowLiteralFields(literal)) {
+        pushRowFieldPaths(`${listPath}.*.${field.name}`, field, paths, 1);
+      }
+    }
+  }
+}
+function collectRowLiterals(elementList, arrayDepth) {
+  const out = [];
+  for (const element of splitTopLevelElements(elementList)) {
+    if (element.startsWith("{")) {
+      out.push(element);
+    } else if (element.startsWith("[") && arrayDepth > 0) {
+      const scan = maskCommentsAndStrings(element);
+      out.push(...collectRowLiterals(extractDelimitedContent(element, scan, 0, "[", "]"), arrayDepth - 1));
+    }
+  }
+  return out;
+}
+function extractRowLiteralFields(literal) {
+  const content = extractObjectContent(literal);
+  const fields = parseTopLevelProperties(content).filter((p) => p.kind === "data");
+  for (const element of splitTopLevelElements(content)) {
+    const shorthand = /^([$\w]+)$/.exec(element);
+    if (shorthand && !fields.some((f) => f.name === shorthand[1])) {
+      fields.push({ name: shorthand[1], kind: "data" });
+    }
+  }
+  return fields;
+}
+function pushRowFieldPaths(path, prop, paths, depth) {
+  if (!hasPath(paths, path)) paths.push(withHint({ path, kind: "data" }, prop.typeHint));
+  if (!prop.value) return;
+  if (isArrayLiteral(prop.value)) {
+    if (!hasPath(paths, `${path}.*`)) paths.push({ path: `${path}.*`, kind: "list" });
+    if (!hasPath(paths, `${path}.length`)) {
+      paths.push({ path: `${path}.length`, kind: "data", typeHint: "number" });
+    }
+    if (depth >= MAX_OBJECT_NEST_DEPTH) return;
+    for (const child of extractArrayElementDataProperties(prop.value)) {
+      pushRowFieldPaths(`${path}.*.${child.name}`, child, paths, depth + 1);
+    }
+    return;
+  }
+  if (isObjectLiteral(prop.value)) {
+    if (depth >= MAX_OBJECT_NEST_DEPTH) return;
+    for (const child of parseTopLevelProperties(extractObjectContent(prop.value))) {
+      if (child.kind !== "data") continue;
+      pushRowFieldPaths(`${path}.${child.name}`, child, paths, depth + 1);
+    }
+  }
+}
+function hasPath(paths, path) {
+  return paths.some((p) => p.path === path);
+}
+function splitTopLevelElements(text) {
+  const scan = maskCommentsAndStrings(text);
+  const out = [];
+  let depth = 0;
+  let start = 0;
+  for (let i = 0; i < scan.length; i++) {
+    const ch = scan[i];
+    if (ch === "{" || ch === "[" || ch === "(") {
+      depth++;
+    } else if (ch === "}" || ch === "]" || ch === ")") {
+      depth--;
+    } else if (ch === "," && depth === 0) {
+      out.push(text.slice(start, i));
+      start = i + 1;
+    }
+  }
+  out.push(text.slice(start));
+  return out.map((e) => e.trim()).filter((e) => e.length > 0);
+}
 function findStreamInitialProperty(entryValue) {
   const defProps = parseTopLevelProperties(extractObjectContent(entryValue));
   return defProps.find((p) => p.kind === "data" && p.name === "initial");
@@ -1748,9 +1838,12 @@ function extractFullValue(content, scan, startIndex) {
   return content.slice(startIndex, i).trim();
 }
 function extractBracedContent(text, scan, openBraceIndex) {
+  return extractDelimitedContent(text, scan, openBraceIndex, "{", "}");
+}
+function extractDelimitedContent(text, scan, openIndex, open, close) {
   let depth = 0;
   let inString = null;
-  for (let i = openBraceIndex; i < scan.length; i++) {
+  for (let i = openIndex; i < scan.length; i++) {
     const ch = scan[i];
     if (inString) {
       if (ch === inString && !isEscaped(scan, i)) {
@@ -1760,16 +1853,16 @@ function extractBracedContent(text, scan, openBraceIndex) {
     }
     if (ch === '"' || ch === "'" || ch === "`") {
       inString = ch;
-    } else if (ch === "{") {
+    } else if (ch === open) {
       depth++;
-    } else if (ch === "}") {
+    } else if (ch === close) {
       depth--;
       if (depth === 0) {
-        return text.slice(openBraceIndex + 1, i);
+        return text.slice(openIndex + 1, i);
       }
     }
   }
-  return text.slice(openBraceIndex + 1);
+  return text.slice(openIndex + 1);
 }
 function isArrayLiteral(value) {
   return value.trimStart().startsWith("[");

package/dist/wcs-schema.mjs

@@ -567,7 +567,7 @@ function loadSchemaCore() {
     return cached;
 }
 
-var version = "2.0.0";
+var version = "2.1.1";
 var pkg = {
 	version: version};
 

package/dist/wcs-tsc.mjs

@@ -5,7 +5,7 @@ import { tmpdir } from 'node:os';
 import { dirname, join, isAbsolute, resolve, basename } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-var version = "2.0.0";
+var version = "2.1.1";
 var pkg = {
 	version: version};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wcstack/typescript",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "TypeScript tooling for wcstack apps: wcs-schema generates the sidecar stateSchema from a typed state file, so wcs-validate checks data-wcs paths against real types in CI and every editor.",
   "type": "module",
   "main": "./dist/index.esm.js",