@neocompose/cli 0.71.0 → 0.71.2

package/dist/test-worker.mjs

@@ -33573,6 +33573,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
   tryMutationContexts = [];
   functionControlBoundaries = [];
   debugSource;
+  inferredExpressionReturnType;
   initialScope() {
     const scope = new Scope(null, this.options.onFlowScope !== void 0);
     scope.define(
@@ -33777,6 +33778,23 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
         this.context.kind === "action" || this.context.kind === "setter" || this.context.kind === "constructor" || isVoid(this.context.returnType),
         describeUnitKind(this.context.kind)
       );
+      if (this.options.inferExpressionReturnType) {
+        if (this.context.kind !== "getter")
+          throw new CompileError(
+            "Expression inference requires a getter.",
+            body.pos
+          );
+        if (statements.length !== 1)
+          throw new CompileError(
+            "Expression inference requires one return expression.",
+            body.pos
+          );
+        if (statements[0]?.kind !== "return" || statements[0].expr === null)
+          throw new CompileError(
+            "Expression inference requires a returned value.",
+            body.pos
+          );
+      }
       const instructions = this.resolveStatements(statements, scope);
       if ((this.context.kind === "function" || this.context.kind === "getter" || this.context.kind === "condition" || this.context.kind === "initializer") && !isVoid(this.context.returnType) && !instructionsTerminate(instructions)) {
         throw new CompileError(
@@ -33793,7 +33811,10 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
         source: this.debugSource,
         parameters,
         instructions,
-        typeInfo: toWireType(returnType, this.project)
+        typeInfo: toWireType(
+          this.inferredExpressionReturnType ?? returnType,
+          this.project
+        )
       };
     } finally {
       this.expectedReturnStack.pop();
@@ -34595,10 +34616,11 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
         }
         const inference = this.lambdaReturnInference.at(-1);
         const inferring = inference?.depth === this.lambdaDepth;
+        const inferExpression = this.options.inferExpressionReturnType && this.lambdaDepth === 0;
         const value = this.resolveExpression(
           statement.expr,
           scope,
-          inferring ? void 0 : expected
+          inferring || inferExpression ? void 0 : expected
         );
         if (inferring) {
           inference.returns.push({
@@ -34618,12 +34640,21 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
             statement.pos
           );
         }
-        this.requireAssignable(
-          value.type,
-          expected,
-          statement.expr.pos,
-          "return"
-        );
+        if (inferExpression) {
+          if (isVoid(value.type))
+            throw new CompileError(
+              "A text expression must return a value, not void.",
+              statement.expr.pos
+            );
+          this.inferredExpressionReturnType = value.type;
+        } else {
+          this.requireAssignable(
+            value.type,
+            expected,
+            statement.expr.pos,
+            "return"
+          );
+        }
         return {
           type: "return" /* Return */,
           pointer: value.pointer
@@ -42677,7 +42708,8 @@ function compileNeoScriptStrict(document2, context, options = {}) {
       {
         source: options.source,
         onFlowScope: options.onFlowScope,
-        sourceUri: document2.uri
+        sourceUri: document2.uri,
+        inferExpressionReturnType: options.inferExpressionReturnType
       }
     ).compile(ast);
     const ir = attachDependencyManifest(
@@ -46261,6 +46293,20 @@ function compileNSGetter(code, ctx) {
     ctx.source
   );
 }
+function compileNSInferredExpressionGetter(code, ctx) {
+  const compiled = compileStrict(
+    code,
+    createContext(ctx, {
+      scriptKind: "getter",
+      dialogueContext: ctx.dialogueContext
+    }),
+    ctx.source,
+    true
+  );
+  if (!isNSGetter(compiled))
+    throw new Error("Expression compiler did not produce a getter.");
+  return compiled;
+}
 function compileNSVoidBody(code, ctx) {
   const context = createContext(ctx, {
     scriptKind: "action",
@@ -46359,9 +46405,10 @@ function withInitializerSourcePosition(error) {
     error.unit
   );
 }
-function compileStrict(code, context, sourceInfo) {
+function compileStrict(code, context, sourceInfo, inferExpressionReturnType = false) {
   const source = sourceInfo?.code === code ? sourceInfo.source : void 0;
   const cacheKey = JSON.stringify({
+    inferExpressionReturnType,
     code,
     source,
     projectIdentity: compilationProjectIdentity(context.project),
@@ -46394,7 +46441,11 @@ function compileStrict(code, context, sourceInfo) {
       text: code
     },
     context,
-    { projectIndex: compilationProjectIndex(context.project), source }
+    {
+      projectIndex: compilationProjectIndex(context.project),
+      source,
+      inferExpressionReturnType
+    }
   );
   if (result.diagnostics.length) {
     const error = result.diagnostics[0];
@@ -46513,6 +46564,7 @@ __export(compiler_adapter_exports, {
   compileNSConstructor: () => compileNSConstructor,
   compileNSFunction: () => compileNSFunction,
   compileNSGetter: () => compileNSGetter,
+  compileNSInferredExpressionGetter: () => compileNSInferredExpressionGetter,
   compileNSInitializer: () => compileNSInitializer,
   compileNSSetter: () => compileNSSetter,
   compileNSVoidBody: () => compileNSVoidBody,
@@ -52912,61 +52964,6 @@ function invalidDocument(record4, path, message) {
   );
 }
 
-// src/project-source/structured-leaf-source.ts
-var STRUCTURED_LEAF_SOURCE_FORMS = {
-  sprite: { kind: 11 /* Sprite */, typeName: "SpriteInfo" },
-  vector2: { kind: 14 /* Vector2 */, typeName: "Vector2" },
-  vector2Int: { kind: 15 /* Vector2Int */, typeName: "Vector2Int" },
-  vector3: { kind: 16 /* Vector3 */, typeName: "Vector3" },
-  vector3Int: { kind: 17 /* Vector3Int */, typeName: "Vector3Int" },
-  color: { kind: 19 /* Color */, typeName: "Color" }
-};
-var STRUCTURED_LEAF_SOURCE_ENTRIES = Object.entries(STRUCTURED_LEAF_SOURCE_FORMS);
-
-// src/project-source/member-kind-type-names.ts
-var MEMBER_KIND_SOURCE_TYPE_NAMES = {
-  null: "null",
-  bool: "bool",
-  int: "int",
-  string: "string",
-  float: "float",
-  decimal: "decimal",
-  sprite: "SpriteInfo",
-  audio: "AudioClipInfo",
-  vector2: "Vector2",
-  vector2Int: "Vector2Int",
-  vector3: "Vector3",
-  vector3Int: "Vector3Int",
-  color: "Color"
-};
-var MEMBER_KIND_NUMBERS = {
-  null: 0 /* Null */,
-  bool: 1 /* Bool */,
-  int: 2 /* Int */,
-  string: 3 /* String */,
-  float: 4 /* Float */,
-  decimal: 20 /* Decimal */,
-  sprite: 11 /* Sprite */,
-  audio: 12 /* Audio */,
-  vector2: 14 /* Vector2 */,
-  vector2Int: 15 /* Vector2Int */,
-  vector3: 16 /* Vector3 */,
-  vector3Int: 17 /* Vector3Int */,
-  color: 19 /* Color */
-};
-var SOURCE_TYPE_NAME_BY_MEMBER_KIND_NUMBER = new Map(
-  Object.entries(MEMBER_KIND_NUMBERS).map(([slug, kind]) => [
-    kind,
-    MEMBER_KIND_SOURCE_TYPE_NAMES[slug]
-  ])
-);
-
-// src/project-source/value-sources.ts
-var INITIALIZER_KEY_PLACEHOLDER = new RegExp(
-  `${PENDING_ID_PREFIX}reference-key:init:\\d+`,
-  "g"
-);
-
 // src/project-manifest/record-adapters/enum.ts
 var ENUM_SCHEMA_RECORD_ADAPTER = {
   recordKind: "enum",
@@ -54021,6 +54018,61 @@ var SCHEMA_RECORD_ADAPTERS = [
   SCHEMA_RECORD_ADAPTER_REGISTRY["internal-record-relation"]
 ];
 
+// src/project-source/structured-leaf-source.ts
+var STRUCTURED_LEAF_SOURCE_FORMS = {
+  sprite: { kind: 11 /* Sprite */, typeName: "SpriteInfo" },
+  vector2: { kind: 14 /* Vector2 */, typeName: "Vector2" },
+  vector2Int: { kind: 15 /* Vector2Int */, typeName: "Vector2Int" },
+  vector3: { kind: 16 /* Vector3 */, typeName: "Vector3" },
+  vector3Int: { kind: 17 /* Vector3Int */, typeName: "Vector3Int" },
+  color: { kind: 19 /* Color */, typeName: "Color" }
+};
+var STRUCTURED_LEAF_SOURCE_ENTRIES = Object.entries(STRUCTURED_LEAF_SOURCE_FORMS);
+
+// src/project-source/member-kind-type-names.ts
+var MEMBER_KIND_SOURCE_TYPE_NAMES = {
+  null: "null",
+  bool: "bool",
+  int: "int",
+  string: "string",
+  float: "float",
+  decimal: "decimal",
+  sprite: "SpriteInfo",
+  audio: "AudioClipInfo",
+  vector2: "Vector2",
+  vector2Int: "Vector2Int",
+  vector3: "Vector3",
+  vector3Int: "Vector3Int",
+  color: "Color"
+};
+var MEMBER_KIND_NUMBERS = {
+  null: 0 /* Null */,
+  bool: 1 /* Bool */,
+  int: 2 /* Int */,
+  string: 3 /* String */,
+  float: 4 /* Float */,
+  decimal: 20 /* Decimal */,
+  sprite: 11 /* Sprite */,
+  audio: 12 /* Audio */,
+  vector2: 14 /* Vector2 */,
+  vector2Int: 15 /* Vector2Int */,
+  vector3: 16 /* Vector3 */,
+  vector3Int: 17 /* Vector3Int */,
+  color: 19 /* Color */
+};
+var SOURCE_TYPE_NAME_BY_MEMBER_KIND_NUMBER = new Map(
+  Object.entries(MEMBER_KIND_NUMBERS).map(([slug, kind]) => [
+    kind,
+    MEMBER_KIND_SOURCE_TYPE_NAMES[slug]
+  ])
+);
+
+// src/project-source/value-sources.ts
+var INITIALIZER_KEY_PLACEHOLDER = new RegExp(
+  `${PENDING_ID_PREFIX}reference-key:init:\\d+`,
+  "g"
+);
+
 // ../packages/neoscript-language/src/project-schema-contract.generated.ts
 var PROJECT_FILE_UPLOAD_BATCH_SIZE = 32;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.71.0",
+  "version": "0.71.2",
   "description": "Neo Compose native project-source CLI with bidirectional sync.",
   "license": "MIT",
   "type": "module",

package/skills/neocompose-cli/SKILL.md

@@ -9,7 +9,7 @@ description: >-
   `@neocompose/cli` or `node cli/bin/neo.mjs` in the neo-compose repository.
 ---
 
-<!-- reviewed-through-cli: 0.71.0 -->
+<!-- reviewed-through-cli: 0.71.2 -->
 
 # Neo Compose CLI
 

package/skills/neocompose-cli/references/cli-development.md

@@ -71,7 +71,7 @@ live in `packages/manifest`. Contract generation and its registry live in
 
 The CLI uses plain document snapshots and shared runtime functions. Keep Retree and web view models out of its imports. The headless architecture check follows CLI imports, and `cli/build.mjs` rejects UI modules and packages in the actual bundle metadata.
 
-Keep parsing, strict resolution, formatting, diagnostics, symbols, and
+Keep parsing, strict resolution, formatting, diagnostics with authored file and expression ranges, symbols, and
 NeoScript compilation in the browser-safe `@neocompose/neoscript-language`
 service. Monaco, VS Code, CLI, trusted server, and corpus tooling must consume
 that shared implementation. Do not add language intelligence to one adapter.
@@ -95,7 +95,10 @@ bases. A modified CLI can therefore write bad rows to a project its user may
 already write; keep preparation in shared `src/database` code rather than
 forking it in the CLI. The server still verifies a push's uploaded
 project-file bytes, and web editor commits use the shared client preparation protocol.
-Unrelated source files are not uploaded or recompiled on every push. A CLI lowering mismatch on a normal push is exposed by the next
+Unrelated source files are not uploaded or recompiled on every push.
+Optional source maps missing from valid stored bodies do not request a backfill.
+Existing map changes still refresh locations on push; authored edits, dependency
+changes, and explicit forced recompilation retain their normal compile scope. A CLI lowering mismatch on a normal push is exposed by the next
 canonical pull; `neo push --dry-run` remains the complete source-to-record
 rehearsal.
 
@@ -115,7 +118,7 @@ wrappers.
 The marker near the top of `SKILL.md` must exactly match the package version:
 
 ```html
-<!-- reviewed-through-cli: 0.71.0 -->
+<!-- reviewed-through-cli: 0.71.2 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale

package/skills/neocompose-cli/references/commands-and-sync.md

@@ -301,7 +301,9 @@ changed, skips codegen when only values changed since the last export into
 that Unity project, and writes `Library/NeoCompose/export.json` last for
 Unity to ingest.
 
-- A clean working copy exports the last pull. Local edits, `Files/` bytes
+- A clean working copy exports the pulled head. Diagnostic location differences
+  alone, including line shifts after push inserts ids, do not make it local.
+  Local edits, `Files/` bytes
   included, make the export local: `project.json` gets
   `metadata.localExport`, Unity fails player builds and keeps saves under
   `NeoCompose/LocalExport`, and a push or a clean export ends it.