@neocompose/cli 0.2.2 → 0.2.3

package/dist/neo.mjs

@@ -1612,7 +1612,7 @@ var init_source_protocol = __esm({
     SCHEMA_SOURCE_MANIFEST_NAME = "neo-schema-manifest-v2";
     SCHEMA_COMPILER_PROTOCOL_VERSION = 3;
     SCHEMA_SDK_VERSION = "2.1.0";
-    SCHEMA_CLI_VERSION = "0.2.1";
+    SCHEMA_CLI_VERSION = "0.2.3";
     SCHEMA_API_TARGET = "netstandard2.1";
     SCHEMA_REFERENCE_ASSEMBLY_SET = "NETStandard.Library.Ref/2.1.0";
     SCHEMA_REQUIRED_TOOLING_FILES = [
@@ -10104,9 +10104,13 @@ function formatNeoScript(text, options = {}) {
     lines.join("\n"),
     options.kind ?? inferDocumentKind(text)
   );
-  const structuralTokens = syntax.lexed.tokens.filter(
-    (token) => token.kind === "punctuation" && (token.text === "{" || token.text === "}")
-  );
+  const delimiterTokensByLine = /* @__PURE__ */ new Map();
+  for (const token of syntax.lexed.tokens) {
+    if (token.kind !== "punctuation" || !isDelimiter(token.text)) continue;
+    const lineTokens = delimiterTokensByLine.get(token.range.start.line) ?? [];
+    lineTokens.push(token);
+    delimiterTokensByLine.set(token.range.start.line, lineTokens);
+  }
   const formatted = [];
   let depth = 0;
   for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
@@ -10118,22 +10122,16 @@ function formatNeoScript(text, options = {}) {
       continue;
     }
     const firstContentCharacter = trimmedEnd.length - content.length;
-    const lineTokens = structuralTokens.filter(
-      (token) => token.range.start.line === lineIndex
-    );
+    const lineTokens = delimiterTokensByLine.get(lineIndex) ?? [];
     const leadingClosers = countLeadingClosers(
       lineTokens,
       firstContentCharacter
     );
     const lineDepth = Math.max(0, depth - leadingClosers);
     formatted.push(`${indentUnit.repeat(lineDepth)}${content}`);
-    depth = Math.max(
-      0,
-      depth + lineTokens.reduce(
-        (delta, token) => delta + (token.text === "{" ? 1 : -1),
-        0
-      )
-    );
+    for (const token of lineTokens) {
+      depth = isOpeningDelimiter(token.text) ? depth + 1 : Math.max(0, depth - 1);
+    }
   }
   while (formatted.length > 1 && formatted[formatted.length - 1] === "") {
     formatted.pop();
@@ -10152,12 +10150,21 @@ function countLeadingClosers(lineTokens, firstContentCharacter) {
   let expectedCharacter = firstContentCharacter;
   for (const token of lineTokens) {
     if (token.range.start.character !== expectedCharacter) break;
-    if (token.text !== "}") break;
+    if (!isClosingDelimiter(token.text)) break;
     count++;
     expectedCharacter++;
   }
   return count;
 }
+function isDelimiter(value) {
+  return isOpeningDelimiter(value) || isClosingDelimiter(value);
+}
+function isOpeningDelimiter(value) {
+  return value === "{" || value === "(" || value === "[";
+}
+function isClosingDelimiter(value) {
+  return value === "}" || value === ")" || value === "]";
+}
 function inferDocumentKind(text) {
   return /(^|\n)\s*(get|set)\s*\{/.test(text) ? "property" : "function";
 }
@@ -43450,7 +43457,7 @@ import {
   readFileSync as readFileSync14
 } from "node:fs";
 import { dirname as dirname7, join as join16 } from "node:path";
-function assignPendingIds(changes, staticValueSeeds) {
+function assignPendingIds(changes, staticValueSeeds, reconstructed) {
   const assigned = /* @__PURE__ */ new Map();
   const assign = (pendingId2) => {
     const existing = assigned.get(pendingId2);
@@ -43501,6 +43508,42 @@ function assignPendingIds(changes, staticValueSeeds) {
       typeId: typeof rewrittenSeed.typeId === "string" ? rewrittenSeed.typeId : null
     });
   }
+  if (reconstructed !== void 0) {
+    const rewrittenRecords = /* @__PURE__ */ new Map();
+    for (const record2 of reconstructed.values()) {
+      const rewrittenRecordId = rewrite(record2.recordId);
+      if (typeof rewrittenRecordId !== "string") {
+        throw new Error(
+          `Reconstructed ${record2.recordKind} id ${JSON.stringify(record2.recordId)} did not rewrite to a string id.`
+        );
+      }
+      const rewrittenFileFields = rewrite(record2.fileFields);
+      if (!isObjectRecord3(rewrittenFileFields)) {
+        throw new Error(
+          `Reconstructed ${record2.recordKind} "${rewrittenRecordId}" file fields did not rewrite to an object.`
+        );
+      }
+      const rewrittenFullData = rewrite(record2.fullData);
+      if (!isObjectRecord3(rewrittenFullData)) {
+        throw new Error(
+          `Reconstructed ${record2.recordKind} "${rewrittenRecordId}" full data did not rewrite to an object.`
+        );
+      }
+      rewrittenRecords.set(
+        recordStateKey(record2.recordKind, rewrittenRecordId),
+        {
+          ...record2,
+          recordId: rewrittenRecordId,
+          fileFields: rewrittenFileFields,
+          fullData: rewrittenFullData
+        }
+      );
+    }
+    reconstructed.clear();
+    for (const [key, record2] of rewrittenRecords) {
+      reconstructed.set(key, record2);
+    }
+  }
   return { assigned, staticValueSeeds: rewrittenSeeds };
 }
 async function runPush(workspace, options) {
@@ -43524,7 +43567,8 @@ ${status.parseErrors.map((error) => `  ${error.message}`).join("\n")}`
   prepareNSFunctionBodyChanges(workspace, status);
   const pendingAssignment = assignPendingIds(
     status.changes,
-    status.staticValueSeeds
+    status.staticValueSeeds,
+    status.reconstructed
   );
   const needsNeoScriptCompilation = status.changes.some(
     (change) => change.recordKind === "attribute" || change.recordKind === "type" || change.recordKind === "enum" || change.recordKind === "interface" || change.nextData !== void 0 && change.recordKind === "migration" && typeof change.nextData.code === "string" && change.nextData.code.trim().length > 0

package/dist/tooling/schema-contract.json

@@ -4,7 +4,7 @@
   "manifestName": "neo-schema-manifest-v2",
   "protocolVersion": 3,
   "sdkVersion": "2.1.0",
-  "cliVersion": "0.2.1",
+  "cliVersion": "0.2.3",
   "apiTarget": "netstandard2.1",
   "referenceAssemblySet": "NETStandard.Library.Ref/2.1.0",
   "requiredToolingFiles": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Neo Compose schema-as-code CLI with compiler-backed C# authoring and bidirectional sync.",
   "license": "MIT",
   "type": "module",