@platformos/platformos-language-server-common 0.0.11 → 0.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformos/platformos-language-server-common",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "platformOS",
@@ -27,9 +27,9 @@
     "type-check": "tsc --noEmit -p ./tsconfig.json"
   },
   "dependencies": {
-    "@platformos/liquid-html-parser": "^0.0.10",
-    "@platformos/platformos-check-common": "0.0.11",
-    "@platformos/platformos-graph": "0.0.11",
+    "@platformos/liquid-html-parser": "^0.0.11",
+    "@platformos/platformos-check-common": "0.0.12",
+    "@platformos/platformos-graph": "0.0.12",
     "@vscode/web-custom-data": "^0.4.6",
     "vscode-json-languageservice": "^5.7.1",
     "vscode-languageserver": "^9.0.1",

package/src/TypeSystem.ts

@@ -868,12 +868,16 @@ async function buildSymbolsTable(
           }
         }
 
+        // For hash/array targets like function hash['key'] = 'partial', skip type tracking
+        const fnVarName = markup.name.name;
+        if (!fnVarName || markup.name.lookups.length > 0) return;
+
         // Track shape for potential hash_assign merging
         if (returnType && isShapeType(returnType)) {
-          if (!variableShapes.has(markup.name)) {
-            variableShapes.set(markup.name, []);
+          if (!variableShapes.has(fnVarName)) {
+            variableShapes.set(fnVarName, []);
           }
-          variableShapes.get(markup.name)!.push({
+          variableShapes.get(fnVarName)!.push({
             shape: returnType.shape,
             rangeEnd: node.position.end,
           });
@@ -881,7 +885,7 @@ async function buildSymbolsTable(
 
         // Always add function variable to symbolsTable, using Untyped as fallback
         return {
-          identifier: markup.name,
+          identifier: fnVarName,
           type: returnType ?? Untyped,
           range: [node.position.end],
         };
@@ -1568,7 +1572,11 @@ async function inferFunctionReturnType(
 
     await visit<SourceCodeType.LiquidHtml, void>(partialAst, {
       async LiquidTag(node) {
-        if (node.name === NamedTags.return && typeof node.markup !== 'string') {
+        if (
+          node.name === NamedTags.return &&
+          node.markup !== null &&
+          typeof node.markup !== 'string'
+        ) {
           // markup is LiquidVariable - infer its type
           const type = inferType(node.markup, partialSymbolsTable, objectMap, filtersMap);
           // Flatten union types into individual types

package/src/completions/params/LiquidCompletionParams.ts

@@ -228,7 +228,9 @@ function findCurrentNode(
           (isInLiquidLiquidTagContext(finder) && isCovered(cursor, current.blockStartPosition))
         ) {
           if (hasNonNullProperty(current, 'markup') && typeof current.markup !== 'string') {
-            finder.current = Array.isArray(current.markup) ? current.markup.at(-1) : current.markup;
+            finder.current = Array.isArray(current.markup)
+              ? current.markup.at(-1)
+              : (current.markup ?? undefined);
           } else {
             // Exits the loop and the node is the thing to complete
             // (presumably name or something else)
@@ -244,7 +246,9 @@ function findCurrentNode(
 
       case NodeTypes.LiquidBranch:
         if (isCovered(cursor, current.blockStartPosition) && typeof current.markup !== 'string') {
-          finder.current = Array.isArray(current.markup) ? current.markup.at(-1) : current.markup;
+          finder.current = Array.isArray(current.markup)
+            ? current.markup.at(-1)
+            : (current.markup ?? undefined);
         } else if (hasNonEmptyArrayProperty(current, 'children')) {
           finder.current = last(current.children);
         } else {
@@ -280,6 +284,7 @@ function findCurrentNode(
       case NodeTypes.YAMLFrontmatter:
       case NodeTypes.HtmlDoctype:
       case NodeTypes.HtmlComment:
+      case NodeTypes.HtmlProcessingInstruction:
       case NodeTypes.RawMarkup: {
         break;
       }

package/src/documents/DocumentManager.ts

@@ -201,10 +201,6 @@ export class DocumentManager {
           ...sourceCode,
           textDocument,
           /** Lazy and only computed once per file version */
-          getSchema: memo(async () => {
-            return undefined;
-          }),
-          /** Lazy and only computed once per file version */
           getLiquidDoc: memo(async () => {
             const ast = sourceCode.ast;
             if (isError(ast)) return undefined;

package/src/documents/types.ts

@@ -1,18 +1,5 @@
-import { SourceCodeType, SourceCode } from '@platformos/platformos-check-common';
-import { JSONNode } from '@platformos/platformos-check-common';
+import { SourceCodeType, SourceCode, DocDefinition } from '@platformos/platformos-check-common';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { DocDefinition } from '@platformos/platformos-check-common';
-
-/**
- * Reserved for future use. platformOS does not use `{% schema %}` blocks,
- * so `getSchema()` always returns `undefined`.
- */
-export interface SchemaObject {
-  parsed: any;
-  validSchema?: unknown;
-  ast: JSONNode | Error;
-  offset: number;
-}
 
 /** Util type to add the common `textDocument` property to the SourceCode. */
 type _AugmentedSourceCode<SCT extends SourceCodeType = SourceCodeType> = SourceCode<SCT> & {
@@ -24,14 +11,7 @@ export type AugmentedJsonSourceCode = _AugmentedSourceCode<SourceCodeType.JSON>;
 
 export type AugmentedGraphQLSourceCode = _AugmentedSourceCode<SourceCodeType.GraphQL>;
 
-/**
- * AugmentedLiquidSourceCode may hold the schema for the section or block.
- *
- * We'll use the SourceCode as the source of truth since we won't need to care
- * about cache invalidation and will mean we'll parse the schema at most once.
- */
 export type AugmentedLiquidSourceCode = _AugmentedSourceCode<SourceCodeType.LiquidHtml> & {
-  getSchema: () => Promise<SchemaObject | undefined>;
   getLiquidDoc: () => Promise<DocDefinition | undefined>;
 };