npm - @platformos/platformos-language-server-common - Versions diffs - 0.0.11 → 0.0.13 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (98) hide show

package/dist/hover/providers/GraphQLFieldHoverProvider.js ADDED Viewed

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphQLFieldHoverProvider = void 0;
+/**
+ * graphql-language-service and graphql must be loaded dynamically to avoid
+ * the "Cannot use GraphQLList from another module or realm" error that occurs
+ * when vitest transforms the graphql ESM module into separate instances.
+ * By requiring at runtime, we ensure a single shared module instance.
+ */
+let _glsMod;
+function getGLS() {
+    if (!_glsMod)
+        _glsMod = require('graphql-language-service');
+    return _glsMod;
+}
+let _graphqlMod;
+function getGraphQL() {
+    if (!_graphqlMod)
+        _graphqlMod = require('graphql');
+    return _graphqlMod;
+}
+class GraphQLFieldHoverProvider {
+    constructor(platformosDocset, documentManager) {
+        this.platformosDocset = platformosDocset;
+        this.documentManager = documentManager;
+        this.schemaLoaded = false;
+    }
+    async getSchema() {
+        if (!this.schemaLoaded) {
+            const sdl = await this.platformosDocset.graphQL();
+            if (sdl) {
+                try {
+                    this.schemaCache = getGraphQL().buildSchema(sdl);
+                }
+                catch {
+                    // Invalid schema SDL
+                }
+            }
+            this.schemaLoaded = true;
+        }
+        return this.schemaCache;
+    }
+    async hover(params) {
+        const uri = params.textDocument.uri;
+        const document = this.documentManager.get(uri);
+        if (!document)
+            return null;
+        const schema = await this.getSchema();
+        if (!schema)
+            return null;
+        const content = document.textDocument.getText();
+        const gls = getGLS();
+        // graphql-language-service's getHoverInformation uses the character *before* the cursor
+        // position to identify the token. We try offset +1 first, then the original position,
+        // to handle the case where the cursor is at the start of a token.
+        const positions = [
+            new gls.Position(params.position.line, params.position.character + 1),
+            new gls.Position(params.position.line, params.position.character),
+        ];
+        try {
+            let hoverInfo;
+            for (const position of positions) {
+                const info = gls.getHoverInformation(schema, content, position);
+                if (info && info !== '' && info !== 'null') {
+                    hoverInfo = typeof info === 'string' ? info : String(info);
+                    break;
+                }
+            }
+            if (!hoverInfo) {
+                return null;
+            }
+            return {
+                contents: {
+                    kind: 'markdown',
+                    value: hoverInfo,
+                },
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+}
+exports.GraphQLFieldHoverProvider = GraphQLFieldHoverProvider;
+//# sourceMappingURL=GraphQLFieldHoverProvider.js.map

package/dist/hover/providers/GraphQLFieldHoverProvider.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"GraphQLFieldHoverProvider.js","sourceRoot":"","sources":["../../../src/hover/providers/GraphQLFieldHoverProvider.ts"],"names":[],"mappings":"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"}

package/dist/json/completions/providers/BlockTypeCompletionProvider.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { AppBlockSchema, SectionSchema, ThemeBlockSchema } from '@platformos/platformos-check-common';
 import { JSONPath } from 'vscode-json-languageservice';
 import { JSONCompletionItem } from 'vscode-json-languageservice/lib/umd/jsonContributions';
 import { RequestContext } from '../../RequestContext';
@@ -29,6 +30,6 @@ export declare function createBlockNameCompletionItems(blockNames: string[]): {
 export declare function isBlockDefinitionPath(path: JSONPath): boolean;
 export declare function isPresetBlockPath(path: JSONPath): boolean;
 export declare function isBlockTypePath(path: JSONPath): boolean;
-export declare function hasLocalBlockDefinitions(schema: any): boolean;
-export declare function isLocalBlockDefinition(schema: any, blockTypePath: JSONPath): boolean;
-export declare function isSectionOrBlockSchema(schema: unknown): boolean;
+export declare function hasLocalBlockDefinitions(schema: SectionSchema | ThemeBlockSchema): boolean;
+export declare function isLocalBlockDefinition(schema: ThemeBlockSchema | SectionSchema, blockTypePath: JSONPath): boolean;
+export declare function isSectionOrBlockSchema(schema: SectionSchema | ThemeBlockSchema | AppBlockSchema): schema is SectionSchema | ThemeBlockSchema;

package/dist/json/completions/providers/BlockTypeCompletionProvider.js CHANGED Viewed

@@ -38,11 +38,7 @@ class BlockTypeCompletionProvider {
         const { doc } = context;
         const schema = await doc.getSchema();
         // Can't complete if we can't parse the schema
-        if (!schema || !isSectionOrBlockSchema(schema)) {
-            return [];
-        }
-        const schemaCasted = schema;
-        if ((0, platformos_check_common_1.isError)(schemaCasted.parsed)) {
+        if (!schema || (0, platformos_check_common_1.isError)(schema.parsed) || !isSectionOrBlockSchema(schema)) {
             return [];
         }
         // Local blocks have their type defined in the schema, there's nothing to complete
@@ -80,7 +76,7 @@ function isBlockTypePath(path) {
     return shouldBeBlocks === 'blocks' && shouldBeType === 'type';
 }
 function hasLocalBlockDefinitions(schema) {
-    if (!schema || (0, platformos_check_common_1.isError)(schema.parsed))
+    if (schema.type !== platformos_check_common_1.ThemeSchemaType.Section || (0, platformos_check_common_1.isError)(schema.parsed))
         return false;
     const blocks = (0, platformos_check_common_1.deepGet)(schema.parsed, ['blocks']);
     if (!blocks || !Array.isArray(blocks))
@@ -88,15 +84,14 @@ function hasLocalBlockDefinitions(schema) {
     return blocks.some((block) => block && block.name !== undefined);
 }
 function isLocalBlockDefinition(schema, blockTypePath) {
-    if (!schema)
+    if (schema.type !== platformos_check_common_1.ThemeSchemaType.Section)
         return false;
     const blockNamePath = [...blockTypePath.slice(0, -1), 'name'];
     const name = (0, platformos_check_common_1.deepGet)(schema.parsed, blockNamePath);
     return name !== undefined;
 }
+const SectionOrBlockSchemaTypes = [platformos_check_common_1.ThemeSchemaType.Section, platformos_check_common_1.ThemeSchemaType.Block];
 function isSectionOrBlockSchema(schema) {
-    if (!schema || typeof schema !== 'object')
-        return false;
-    return true;
+    return SectionOrBlockSchemaTypes.includes(schema.type);
 }
 //# sourceMappingURL=BlockTypeCompletionProvider.js.map

package/dist/json/completions/providers/BlockTypeCompletionProvider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"BlockTypeCompletionProvider.js","sourceRoot":"","sources":["../../../../src/json/completions/providers/BlockTypeCompletionProvider.ts"],"names":[],"mappings":";;;~~AAsDA~~,wEAMC;AAED,sDAEC;AAED,8CAEC;AAED,0CAUC;AAED,4DAKC;AAED,~~wDAKC~~;~~AAED~~,~~wDAGC~~;~~AAnGD~~,~~iFAAuE~~;~~AAGvE~~,mFAAoE;AACpE,yDAA8E;AAC9E,uCAAmD;AAInD;;;;;;;;;;;;GAYG;AACH,MAAa,2BAA2B;IACtC,YAAoB,kBAAsC;QAAtC,uBAAkB,GAAlB,kBAAkB,CAAoB;IAAG,CAAC;IAE9D,KAAK,CAAC,aAAa,CAAC,OAAuB,EAAE,IAAc;QACzD,IACE,CAAC,IAAA,4BAAoB,EAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;YACtC,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC;YAChC,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAC5B,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACxB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;QAErC,8CAA8C;QAC9C,IAAI,CAAC,MAAM,IAAI,~~CAAC~~,~~sBAAsB~~,~~CAAC~~,MAAM,CAAC,~~EAAE,CAAC;YAC/C,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,~~MAAM,~~YAAY,GAAG,MAAa,~~CAAC~~;QACnC~~,IAAI,~~IAAA~~,~~iCAAO~~,~~EAAC,YAAY,~~CAAC,MAAM,CAAC,EAAE,CAAC;~~YACjC~~,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,kFAAkF;QAClF,IAAI,wBAAwB,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,CAAC;QAEhD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAEhE,OAAO,8BAA8B,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC;CACF;~~AA9BD~~,~~kEA8BC~~;AAED,SAAgB,8BAA8B,CAAC,UAAoB;IACjE,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/B,IAAI,EAAE,mDAAkB,CAAC,KAAK;QAC9B,KAAK,EAAE,IAAI,IAAI,GAAG;QAClB,UAAU,EAAE,IAAI,IAAI,GAAG;KACxB,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAgB,qBAAqB,CAAC,IAAc;IAClD,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;AACjC,CAAC;AAED,SAAgB,iBAAiB,CAAC,IAAc;IAC9C,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;AAClC,CAAC;AAED,SAAgB,eAAe,CAAC,IAAc;IAC5C,kCAAkC;IAClC,6BAA6B;IAC7B,0CAA0C;IAC1C,0CAA0C;IAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAClE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC,CAAC,sBAAsB;IACzD,MAAM,CAAC,cAAc,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,OAAO,cAAc,KAAK,QAAQ,IAAI,YAAY,KAAK,MAAM,CAAC;AAChE,CAAC;AAED,SAAgB,wBAAwB,CAAC,~~MAAW~~;~~IAClD~~,IAAI,CAAC,~~MAAM~~,IAAI,IAAA,iCAAO,EAAC,MAAM,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;~~IACpD~~,MAAM,MAAM,GAAG,IAAA,iCAAO,EAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClD,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IACpD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,~~KAAU~~,EAAE,EAAE,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;~~AACxE~~,CAAC;AAED,SAAgB,sBAAsB,~~CAAC~~,~~MAAW~~,~~EAAE~~,aAAuB;~~IACzE~~,IAAI,CAAC,~~MAAM~~;QAAE,OAAO,KAAK,CAAC;~~IAC1B~~,MAAM,aAAa,GAAG,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,IAAA,iCAAO,EAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACnD,OAAO,IAAI,KAAK,SAAS,CAAC;AAC5B,CAAC;AAED,~~SAAgB~~,~~sBAAsB~~,CAAC,~~MAAe;IACpD~~,~~IAAI,~~CAAC,~~MAAM~~,~~IAAI~~,~~OAAO~~,~~MAAM~~,KAAK,~~QAAQ~~;~~QAAE~~,~~OAAO~~,~~KAAK~~,~~CAAC~~;~~IACxD~~,OAAO,IAAI,CAAC;~~AACd~~,CAAC"}
1	+ {"version":3,"file":"BlockTypeCompletionProvider.js","sourceRoot":"","sources":["../../../../src/json/completions/providers/BlockTypeCompletionProvider.ts"],"names":[],"mappings":";;;AAyDA,wEAMC;AAED,sDAEC;AAED,8CAEC;AAED,0CAUC;AAED,4DAKC;AAED,wDAQC;AAGD,wDAIC;AA3GD,iFAO6C;AAG7C,mFAAoE;AACpE,yDAA8E;AAC9E,uCAAmD;AAInD;;;;;;;;;;;;GAYG;AACH,MAAa,2BAA2B;IACtC,YAAoB,kBAAsC;QAAtC,uBAAkB,GAAlB,kBAAkB,CAAoB;IAAG,CAAC;IAE9D,KAAK,CAAC,aAAa,CAAC,OAAuB,EAAE,IAAc;QACzD,IACE,CAAC,IAAA,4BAAoB,EAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;YACtC,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC;YAChC,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAC5B,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACxB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;QAErC,8CAA8C;QAC9C,IAAI,CAAC,MAAM,IAAI,IAAA,iCAAO,EAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC;YACzE,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,kFAAkF;QAClF,IAAI,wBAAwB,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,CAAC;QAEhD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAEhE,OAAO,8BAA8B,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC;CACF;AA1BD,kEA0BC;AAED,SAAgB,8BAA8B,CAAC,UAAoB;IACjE,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/B,IAAI,EAAE,mDAAkB,CAAC,KAAK;QAC9B,KAAK,EAAE,IAAI,IAAI,GAAG;QAClB,UAAU,EAAE,IAAI,IAAI,GAAG;KACxB,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAgB,qBAAqB,CAAC,IAAc;IAClD,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;AACjC,CAAC;AAED,SAAgB,iBAAiB,CAAC,IAAc;IAC9C,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;AAClC,CAAC;AAED,SAAgB,eAAe,CAAC,IAAc;IAC5C,kCAAkC;IAClC,6BAA6B;IAC7B,0CAA0C;IAC1C,0CAA0C;IAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAClE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC,CAAC,sBAAsB;IACzD,MAAM,CAAC,cAAc,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,OAAO,cAAc,KAAK,QAAQ,IAAI,YAAY,KAAK,MAAM,CAAC;AAChE,CAAC;AAED,SAAgB,wBAAwB,CAAC,MAAwC;IAC/E,IAAI,MAAM,CAAC,IAAI,KAAK,yCAAe,CAAC,OAAO,IAAI,IAAA,iCAAO,EAAC,MAAM,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IACpF,MAAM,MAAM,GAAG,IAAA,iCAAO,EAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClD,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IACpD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;AACnE,CAAC;AAED,SAAgB,sBAAsB,CACpC,MAAwC,EACxC,aAAuB;IAEvB,IAAI,MAAM,CAAC,IAAI,KAAK,yCAAe,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC1D,MAAM,aAAa,GAAG,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,IAAA,iCAAO,EAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACnD,OAAO,IAAI,KAAK,SAAS,CAAC;AAC5B,CAAC;AAED,MAAM,yBAAyB,GAAG,CAAC,yCAAe,CAAC,OAAO,EAAE,yCAAe,CAAC,KAAK,CAAC,CAAC;AACnF,SAAgB,sBAAsB,CACpC,MAAyD;IAEzD,OAAO,yBAAyB,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACzD,CAAC"}

package/dist/json/hover/providers/BlockSettingsHoverProvider.js CHANGED Viewed

@@ -25,11 +25,10 @@ class BlockSettingsHoverProvider {
         const schema = await doc.getSchema();
         if (!isValidSchema(schema))
             return [];
-        const schemaCasted = schema;
-        const blockType = (0, platformos_check_common_1.deepGet)(schemaCasted.parsed, [...path.slice(0, -2), 'type']);
+        const blockType = (0, platformos_check_common_1.deepGet)(schema.parsed, [...path.slice(0, -2), 'type']);
         if (!blockType)
             return [];
-        const sectionBlock = (0, schemaSettings_1.getSectionBlockByName)(schemaCasted.parsed, blockType);
+        const sectionBlock = (0, schemaSettings_1.getSectionBlockByName)(schema.parsed, blockType);
         let label;
         if (sectionBlock) {
             if (!hasValidSettings(sectionBlock.settings))
@@ -40,10 +39,9 @@ class BlockSettingsHoverProvider {
             const themeBlockSchema = await this.getThemeBlockSchema(doc.uri, blockType);
             if (!isValidSchema(themeBlockSchema))
                 return [];
-            const themeBlockSchemaCasted = themeBlockSchema;
-            if (!hasValidSettings(themeBlockSchemaCasted.parsed.settings))
+            if (!hasValidSettings(themeBlockSchema.parsed.settings))
                 return [];
-            label = getSettingLabelById(themeBlockSchemaCasted.parsed.settings, path.at(-1));
+            label = getSettingLabelById(themeBlockSchema.parsed.settings, path.at(-1));
         }
         if (!label)
             return [];
@@ -66,10 +64,7 @@ function isBlocksSettingsPath(path) {
         typeof path.at(-1) === 'string');
 }
 function isValidSchema(schema) {
-    if (!schema || typeof schema !== 'object')
-        return false;
-    const s = schema;
-    return !(0, platformos_check_common_1.isError)(s.parsed) && (0, BlockTypeCompletionProvider_1.isSectionOrBlockSchema)(schema);
+    return !!schema && !(0, platformos_check_common_1.isError)(schema.parsed) && (0, BlockTypeCompletionProvider_1.isSectionOrBlockSchema)(schema);
 }
 function hasValidSettings(settings) {
     return settings !== undefined && Array.isArray(settings);

package/dist/json/hover/providers/BlockSettingsHoverProvider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"BlockSettingsHoverProvider.js","sourceRoot":"","sources":["../../../../src/json/hover/providers/BlockSettingsHoverProvider.ts"],"names":[],"mappings":";;;AAAA,~~iFAAuE~~;~~AAEvE~~,wDAAmG;AACnG,yDAAoG;AACpG,uCAAmD;AAEnD,yGAAiG;AAEjG,yDAA6D;AAE7D,MAAa,0BAA0B;IACrC,YACU,4BAAmD,EACnD,mBAAwC;QADxC,iCAA4B,GAA5B,4BAA4B,CAAuB;QACnD,wBAAmB,GAAnB,mBAAmB,CAAqB;IAC/C,CAAC;IAEJ,QAAQ,CAAC,OAAuB,EAAE,IAAc;QAC9C,OAAO,CACL,IAAA,4BAAoB,EAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;YACrC,IAAA,uCAAsB,EAAC,OAAO,CAAC;YAC/B,IAAI,CAAC,MAAM,KAAK,CAAC;YACjB,oBAAoB,CAAC,IAAI,CAAC,CAC3B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAuB,EAAE,IAAc;QACjD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QAE7C,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACxB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;QAErC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,CAAC;QAEtC,MAAM,~~YAAY,GAAG,MAAa,CAAC;QACnC,MAAM,~~SAAS,GAAG,IAAA,iCAAO,EAAC,~~YAAY~~,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;~~QAE/E~~,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,CAAC;QAE1B,MAAM,YAAY,GAAG,IAAA,sCAAqB,EAAC,~~YAAY~~,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;~~QAE3E~~,IAAI,KAAyB,CAAC;QAE9B,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC;gBAAE,OAAO,EAAE,CAAC;YAExD,KAAK,GAAG,mBAAmB,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAW,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACN,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAE5E,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC;gBAAE,OAAO,EAAE,CAAC;YAChD,~~MAAM,sBAAsB,GAAG,gBAAuB,CAAC;YACvD,~~IAAI,CAAC,gBAAgB,CAAC,~~sBAAsB~~,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAAE,OAAO,EAAE,CAAC;~~YAEzE~~,KAAK,GAAG,mBAAmB,CAAC,~~sBAAsB~~,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAW,CAAC,CAAC;~~QAC7F~~,CAAC;QAED,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC;QAEtB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,IAAA,+BAAgB,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC;QAEtB,OAAO,CAAC,IAAA,gCAAiB,EAAC,KAAK,CAAC,CAAC,CAAC;IACpC,CAAC;CACF;~~AA3DD~~,~~gEA2DC~~;AAED,SAAS,oBAAoB,CAAC,IAAc;IAC1C,OAAO,CACL,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;QACtD,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ;QACxB,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU;QAC1B,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS;QACzB,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ,CAChC,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,~~CAAC~~,~~MAAe~~;~~IACpC~~,~~IAAI~~,CAAC,~~MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,KAAK,~~CAAC~~;IACxD~~,MAAM,~~CAAC~~,~~GAAG,MAAa,~~CAAC~~;IACxB~~,~~OAAO,CAAC,~~IAAA,iCAAO,EAAC,~~CAAC~~,CAAC,MAAM,CAAC,IAAI,IAAA,oDAAsB,EAAC,MAAM,CAAC,CAAC;~~AAC9D~~,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAa;IACrC,OAAO,QAAQ,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,mBAAmB,CAAC,~~QAAe~~,EAAE,EAAU;~~IACtD~~,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,~~OAAY~~,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC;~~AACnE~~,CAAC"}
1	+ {"version":3,"file":"BlockSettingsHoverProvider.js","sourceRoot":"","sources":["../../../../src/json/hover/providers/BlockSettingsHoverProvider.ts"],"names":[],"mappings":"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"}

package/dist/json/schemaSettings.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Translations } from '@platformos/platformos-check-common';
+import { Section, Setting, Translations } from '@platformos/platformos-check-common';
 import { JSONCompletionItem } from './completions/JSONCompletionProvider';
-export declare function schemaSettingsPropertyCompletionItems(parsedSettings: any[], translations: Translations): JSONCompletionItem[];
-export declare function getSectionBlockByName(parsedSchema: any | undefined, blockName: string): any;
+export declare function schemaSettingsPropertyCompletionItems(parsedSettings: Partial<Setting.Any>[], translations: Translations): JSONCompletionItem[];
+export declare function getSectionBlockByName(parsedSchema: any | undefined, blockName: string): Partial<Section.LocalBlock> | undefined;

package/dist/json/schemaSettings.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schemaSettings.js","sourceRoot":"","sources":["../../src/json/schemaSettings.ts"],"names":[],"mappings":";;AAKA,sFAiCC;AAOD,~~sDAIC~~;~~AAjDD~~,6EAA6E;AAC7E,kDAAsE;AAItE,SAAgB,qCAAqC,CACnD,~~cAAqB~~,~~EACrB~~,YAA0B;IAE1B,OAAO,cAAc;SAClB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC/B,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,IAAI,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,MAAM,WAAW,GAAG,IAAA,+BAAgB,EAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;gBAE/E,IAAI,WAAW,EAAE,CAAC;oBAChB,QAAQ,GAAG,IAAA,gCAAiB,EAAC,WAAW,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,MAAM,cAAc,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAE3D,OAAO;YACL,IAAI,EAAE,gDAAkB,CAAC,QAAQ;YACjC,KAAK,EAAE,cAAc;YACrB,UAAU,EAAE,cAAc;YAC1B,aAAa,EAAE;gBACb,IAAI,EAAE,wCAAU,CAAC,QAAQ;gBACzB,KAAK,EAAE,QAAQ;aAChB;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,~~CAAC~~,eAAoB,EAAE,~~EAAE~~,SAAiB;~~IAC7E~~,OAAO,YAAY,CAAC,MAAM;QACxB,EAAE,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,MAAM,IAAI,KAAK,CAAC;QACzC,EAAE,IAAI,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;AACrD,CAAC"}
1	+ {"version":3,"file":"schemaSettings.js","sourceRoot":"","sources":["../../src/json/schemaSettings.ts"],"names":[],"mappings":";;AAKA,sFAiCC;AAOD,sDAOC;AApDD,6EAA6E;AAC7E,kDAAsE;AAItE,SAAgB,qCAAqC,CACnD,cAAsC,EACtC,YAA0B;IAE1B,OAAO,cAAc;SAClB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC/B,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,IAAI,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,MAAM,WAAW,GAAG,IAAA,+BAAgB,EAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;gBAE/E,IAAI,WAAW,EAAE,CAAC;oBAChB,QAAQ,GAAG,IAAA,gCAAiB,EAAC,WAAW,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,MAAM,cAAc,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAE3D,OAAO;YACL,IAAI,EAAE,gDAAkB,CAAC,QAAQ;YACjC,KAAK,EAAE,cAAc;YACrB,UAAU,EAAE,cAAc;YAC1B,aAAa,EAAE;gBACb,IAAI,EAAE,wCAAU,CAAC,QAAQ;gBACzB,KAAK,EAAE,QAAQ;aAChB;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,eAAoB,EAAE,EACtB,SAAiB;IAEjB,OAAO,YAAY,CAAC,MAAM;QACxB,EAAE,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,MAAM,IAAI,KAAK,CAAC;QACzC,EAAE,IAAI,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;AACrD,CAAC"}

package/dist/renamed/handlers/BlockRenameHandler.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { RenameFilesParams } from 'vscode-languageserver-protocol';
 import { ClientCapabilities } from '../../ClientCapabilities';
 import { DocumentManager } from '../../documents';
 import { BaseRenameHandler } from '../BaseRenameHandler';
-import { FindAppRootURI } from '../../internal-types';
+import { FindThemeRootURI } from '../../internal-types';
 /**
  * The BlockRenameHandler will handle block renames.
  *
@@ -31,8 +31,8 @@ export declare class BlockRenameHandler implements BaseRenameHandler {
     private documentManager;
     private connection;
     private capabilities;
-    private findAppRootURI;
-    constructor(documentManager: DocumentManager, connection: Connection, capabilities: ClientCapabilities, findAppRootURI: FindAppRootURI);
+    private findThemeRootURI;
+    constructor(documentManager: DocumentManager, connection: Connection, capabilities: ClientCapabilities, findThemeRootURI: FindThemeRootURI);
     onDidRenameFiles(params: RenameFilesParams): Promise<void>;
     private getSchemaChanges;
     private getTemplateChanges;

package/dist/renamed/handlers/BlockRenameHandler.js CHANGED Viewed

@@ -32,11 +32,11 @@ const annotationId = 'renameBlock';
  *      This stuff is complicated enough as it is 😅.
  */
 class BlockRenameHandler {
-    constructor(documentManager, connection, capabilities, findAppRootURI) {
+    constructor(documentManager, connection, capabilities, findThemeRootURI) {
         this.documentManager = documentManager;
         this.connection = connection;
         this.capabilities = capabilities;
-        this.findAppRootURI = findAppRootURI;
+        this.findThemeRootURI = findThemeRootURI;
     }
     async onDidRenameFiles(params) {
         if (!this.capabilities.hasApplyEditSupport)
@@ -46,7 +46,7 @@ class BlockRenameHandler {
         if (relevantRenames.length !== 1)
             return;
         const rename = relevantRenames[0];
-        const rootUri = await this.findAppRootURI(platformos_check_common_1.path.dirname(params.files[0].oldUri));
+        const rootUri = await this.findThemeRootURI(platformos_check_common_1.path.dirname(params.files[0].oldUri));
         if (!rootUri)
             return;
         await this.documentManager.preload(rootUri);
@@ -111,10 +111,80 @@ class BlockRenameHandler {
             edit: workspaceEdit,
         });
     }
-    getSchemaChanges(_sectionsWithLocalBlocks, _oldBlockName, _newBlockName) {
-        return async (_sourceCode) => {
-            // Schema-based block renaming is not supported in platformOS
-            return null;
+    getSchemaChanges(sectionsWithLocalBlocks, oldBlockName, newBlockName) {
+        return async (sourceCode) => {
+            if (sourceCode.ast instanceof Error)
+                return null;
+            const textDocument = sourceCode.textDocument;
+            const schema = await sourceCode.getSchema();
+            if (!(0, platformos_check_common_1.isBlockSchema)(schema) && !(0, platformos_check_common_1.isSectionSchema)(schema))
+                return null;
+            if ((0, platformos_check_common_1.isError)(schema.validSchema) || (0, platformos_check_common_1.isError)(schema.ast))
+                return null;
+            const { validSchema, ast, offset } = schema;
+            const edits = [];
+            if (validSchema.blocks) {
+                for (let i = 0; i < validSchema.blocks.length; i++) {
+                    const blockDef = validSchema.blocks[i];
+                    if (isLocalBlock(blockDef)) {
+                        // If the section has a local blocks, we shouldn't rename
+                        // anything in this file.
+                        if ((0, platformos_check_common_1.isSectionSchema)(schema)) {
+                            sectionsWithLocalBlocks.add(schema.name);
+                        }
+                        return null;
+                    }
+                    if (blockDef.type !== oldBlockName)
+                        continue;
+                    const node = (0, platformos_check_common_1.nodeAtPath)(ast, ['blocks', i, 'type']);
+                    edits.push({
+                        annotationId,
+                        newText: newBlockName,
+                        range: vscode_languageserver_protocol_1.Range.create(textDocument.positionAt(offset + node.loc.start.offset + 1), textDocument.positionAt(offset + node.loc.end.offset - 1)),
+                    });
+                }
+            }
+            const presetEdits = (presetBlock, path) => {
+                if (!presetBlock || !('blocks' in presetBlock))
+                    return [];
+                if (Array.isArray(presetBlock.blocks)) {
+                    return presetBlock.blocks.flatMap((block, index) => {
+                        const edits = presetEdits(block, [...path, 'blocks', index]);
+                        if (block.type === oldBlockName) {
+                            const node = (0, platformos_check_common_1.nodeAtPath)(ast, [...path, 'blocks', index, 'type']);
+                            edits.push({
+                                annotationId,
+                                newText: newBlockName,
+                                range: vscode_languageserver_protocol_1.Range.create(textDocument.positionAt(offset + node.loc.start.offset + 1), textDocument.positionAt(offset + node.loc.end.offset - 1)),
+                            });
+                        }
+                        return edits;
+                    });
+                }
+                else if (typeof presetBlock.blocks === 'object') {
+                    return Object.entries(presetBlock.blocks).flatMap(([key, block]) => {
+                        const edits = presetEdits(block, [...path, 'blocks', key]);
+                        if (block.type === oldBlockName) {
+                            const node = (0, platformos_check_common_1.nodeAtPath)(ast, [...path, 'blocks', key, 'type']);
+                            edits.push({
+                                annotationId,
+                                newText: newBlockName,
+                                range: vscode_languageserver_protocol_1.Range.create(textDocument.positionAt(offset + node.loc.start.offset + 1), textDocument.positionAt(offset + node.loc.end.offset - 1)),
+                            });
+                        }
+                        return edits;
+                    });
+                }
+                else {
+                    return [];
+                }
+            };
+            if (validSchema.presets) {
+                edits.push(...validSchema.presets.flatMap((preset, i) => presetEdits(preset, ['presets', i])));
+            }
+            if (edits.length === 0)
+                return null;
+            return documentChanges(sourceCode, edits);
         };
     }
     getTemplateChanges(oldBlockName, newBlockName, sectionsWithLocalBlocks) {
@@ -128,12 +198,11 @@ class BlockRenameHandler {
             const edits = !(0, utils_1.isValidTemplate)(parsed)
                 ? []
                 : Object.entries(parsed.sections).flatMap(([key, section]) => {
-                    const sec = section;
                     if ('blocks' in section &&
-                        !!sec.blocks &&
-                        !sectionsWithLocalBlocks.has(sec.type) // don't rename local blocks
+                        !!section.blocks &&
+                        !sectionsWithLocalBlocks.has(section.type) // don't rename local blocks
                     ) {
-                        return getBlocksEdits(sec.blocks, ['sections', key, 'blocks']);
+                        return getBlocksEdits(section.blocks, ['sections', key, 'blocks']);
                     }
                     else {
                         return [];
@@ -154,12 +223,11 @@ class BlockRenameHandler {
             const edits = !(0, utils_1.isValidSectionGroup)(parsed)
                 ? []
                 : Object.entries(parsed.sections).flatMap(([key, section]) => {
-                    const sec = section;
                     if ('blocks' in section &&
-                        !!sec.blocks &&
-                        !sectionsWithLocalBlocks.has(sec.type) // don't rename local blocks
+                        !!section.blocks &&
+                        !sectionsWithLocalBlocks.has(section.type) // don't rename local blocks
                     ) {
-                        return getBlocksEdits(sec.blocks, ['sections', key, 'blocks']);
+                        return getBlocksEdits(section.blocks, ['sections', key, 'blocks']);
                     }
                     else {
                         return [];
@@ -203,6 +271,9 @@ class BlockRenameHandler {
     }
 }
 exports.BlockRenameHandler = BlockRenameHandler;
+function isLocalBlock(blockDef) {
+    return 'name' in blockDef && typeof blockDef.name === 'string';
+}
 function getBlocksEditsFactory(oldBlockName, newBlockName, textDocument, ast) {
     return function getBlocksEdits(blocks, path) {
         if (!blocks)

package/dist/renamed/handlers/BlockRenameHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"BlockRenameHandler.js","sourceRoot":"","sources":["../../../src/renamed/handlers/BlockRenameHandler.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"BlockRenameHandler.js","sourceRoot":"","sources":["../../../src/renamed/handlers/BlockRenameHandler.ts"],"names":[],"mappings":"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"}

package/dist/renamed/handlers/SectionRenameHandler.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { Connection } from 'vscode-languageserver';
 import { RenameFilesParams } from 'vscode-languageserver-protocol';
 import { ClientCapabilities } from '../../ClientCapabilities';
 import { DocumentManager } from '../../documents';
-import { FindAppRootURI } from '../../internal-types';
+import { FindThemeRootURI } from '../../internal-types';
 import { BaseRenameHandler } from '../BaseRenameHandler';
 /**
  * The SectionRenameHandler will handle section renames
@@ -16,8 +16,8 @@ export declare class SectionRenameHandler implements BaseRenameHandler {
     private documentManager;
     private connection;
     private capabilities;
-    private findAppRootURI;
-    constructor(documentManager: DocumentManager, connection: Connection, capabilities: ClientCapabilities, findAppRootURI: FindAppRootURI);
+    private findThemeRootURI;
+    constructor(documentManager: DocumentManager, connection: Connection, capabilities: ClientCapabilities, findThemeRootURI: FindThemeRootURI);
     onDidRenameFiles(params: RenameFilesParams): Promise<void>;
     private getTemplateChanges;
     private getSectionGroupChanges;

package/dist/renamed/handlers/SectionRenameHandler.js CHANGED Viewed

@@ -16,11 +16,11 @@ const annotationId = 'renameSection';
  *   4. References like {% section "oldName" %} must be changed
  */
 class SectionRenameHandler {
-    constructor(documentManager, connection, capabilities, findAppRootURI) {
+    constructor(documentManager, connection, capabilities, findThemeRootURI) {
         this.documentManager = documentManager;
         this.connection = connection;
         this.capabilities = capabilities;
-        this.findAppRootURI = findAppRootURI;
+        this.findThemeRootURI = findThemeRootURI;
     }
     async onDidRenameFiles(params) {
         if (!this.capabilities.hasApplyEditSupport)
@@ -30,7 +30,7 @@ class SectionRenameHandler {
         if (relevantRenames.length !== 1)
             return;
         const rename = relevantRenames[0];
-        const rootUri = await this.findAppRootURI(platformos_check_common_1.path.dirname(params.files[0].oldUri));
+        const rootUri = await this.findThemeRootURI(platformos_check_common_1.path.dirname(params.files[0].oldUri));
         if (!rootUri)
             return;
         await this.documentManager.preload(rootUri);

package/dist/renamed/handlers/SectionRenameHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SectionRenameHandler.js","sourceRoot":"","sources":["../../../src/renamed/handlers/SectionRenameHandler.ts"],"names":[],"mappings":";;;AACA,iFAQ6C;AAE7C,mFAQwC;AAExC,+CAOyB;AAEzB,yCAAqF;AAErF,mCAA+D;AAI/D,MAAM,YAAY,GAAG,eAAe,CAAC;AAErC;;;;;;;GAOG;AACH,MAAa,oBAAoB;IAC/B,YACU,eAAgC,EAChC,UAAsB,EACtB,YAAgC,EAChC,~~cAA8B~~;~~QAH9B~~,oBAAe,GAAf,eAAe,CAAiB;QAChC,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAoB;QAChC,~~mBAAc~~,~~GAAd~~,~~cAAc~~,~~CAAgB~~;~~IACrC~~,CAAC;IAEJ,KAAK,CAAC,gBAAgB,CAAC,MAAyB;QAC9C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB;YAAE,OAAO;QAEnD,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CACzC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAS,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAA,eAAS,EAAC,IAAI,CAAC,MAAM,CAAC,CAC3D,CAAC;QAEF,+EAA+E;QAC/E,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,~~cAAc~~,CAAC,8BAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;~~QAChF~~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~~CAAE~~,~~OAAe~~,CAAC,IAAI,KAAK,cAAc,CAAC;~~qBACrE~~,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE;oBACb,MAAM,IAAI,GAAG,IAAA,oCAAU,EAAC,GAAG,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,CAAC,CAAgB,CAAC;oBACvE,OAAO;wBACL,YAAY;wBACZ,OAAO,EAAE,cAAc;wBACvB,KAAK,EAAE,sCAAK,CAAC,MAAM,CACjB,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAClD,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CACjD;qBACmB,CAAC;gBACzB,CAAC,CAAC,CAAC;YAET,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAEpC,OAAO,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC,CAAC;IACJ,CAAC;IAED,yFAAyF;IACzF,gGAAgG;IACxF,sBAAsB,CAAC,cAAsB,EAAE,cAAsB;QAC3E,OAAO,KAAK,EAAE,UAAmC,EAAE,EAAE;YACnD,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;YACjD,MAAM,MAAM,GAAG,IAAA,mCAAS,EAAC,MAAM,CAAC,CAAC;YACjC,IAAI,CAAC,MAAM,IAAI,IAAA,iCAAO,EAAC,MAAM,CAAC,IAAI,IAAA,iCAAO,EAAC,GAAG,CAAC;gBAAE,OAAO,IAAI,CAAC;YAC5D,MAAM,KAAK,GAAe,CAAC,IAAA,2BAAmB,EAAC,MAAM,CAAC;gBACpD,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;qBAC5B,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,~~CAAE~~,~~OAAe~~,CAAC,IAAI,KAAK,cAAc,CAAC;~~qBACrE~~,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE;oBACb,MAAM,IAAI,GAAG,IAAA,oCAAU,EAAC,GAAG,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,CAAC,CAAgB,CAAC;oBACvE,OAAO;wBACL,YAAY;wBACZ,OAAO,EAAE,cAAc;wBACvB,KAAK,EAAE,sCAAK,CAAC,MAAM,CACjB,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAClD,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CACjD;qBACmB,CAAC;gBACzB,CAAC,CAAC,CAAC;YAET,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAEpC,OAAO,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC,CAAC;IACJ,CAAC;IAEO,oBAAoB,CAAC,cAAsB,EAAE,cAAsB;QACzE,OAAO,KAAK,EAAE,UAAqC,EAAE,EAAE;YACrD,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;YACzC,IAAI,IAAA,iCAAO,EAAC,GAAG,CAAC;gBAAE,OAAO,IAAI,CAAC;YAE9B,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAK,EAAsC,GAAG,EAAE;gBAClE,KAAK,CAAC,SAAS,CAAC,IAAI;oBAClB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;wBAAE,OAAO;oBACpC,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ;wBAAE,OAAO;oBAE5C,wDAAwD;oBACxD,4DAA4D;oBAC5D,gEAAgE;oBAChE,MAAM,QAAQ,GAAiB,IAAI,CAAC,MAAM,CAAC;oBAC3C,IAAI,QAAQ,CAAC,KAAK,KAAK,cAAc;wBAAE,OAAO;oBAE9C,OAAO;wBACL,YAAY;wBACZ,OAAO,EAAE,cAAc;wBACvB,KAAK,EAAE,sCAAK,CAAC,MAAM,CACjB,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,EACpD,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,CAAC,CACnD;qBACF,CAAC;gBACJ,CAAC;aACF,CAAC,CAAC;YAEH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAEpC,OAAO,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC,CAAC;IACJ,CAAC;CACF;AAvKD,oDAuKC;AAED,SAAS,eAAe,CAAC,UAA+B,EAAE,KAAiB;IACzE,OAAO;QACL,YAAY,EAAE;YACZ,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,IAAI,CAAC,2CAA2C;SAChF;QACD,KAAK;KACN,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"SectionRenameHandler.js","sourceRoot":"","sources":["../../../src/renamed/handlers/SectionRenameHandler.ts"],"names":[],"mappings":"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"}

package/dist/server/AppGraphManager.js CHANGED Viewed

@@ -22,9 +22,7 @@ class AppGraphManager {
             const rootUri = await this.findAppRootURI(anyUri);
             if (!rootUri)
                 return;
-            const graph = await this.graphs.get(rootUri);
-            if (!graph)
-                return;
+            // Delete existing graph to force rebuild
             this.graphs.delete(rootUri);
             await this.getAppGraphForURI(rootUri);
             this.connection.sendNotification(types_1.AppGraphDidUpdateNotification.type, { uri: rootUri });
@@ -33,7 +31,8 @@ class AppGraphManager {
             const { documentManager } = this;
             await documentManager.preload(rootUri);
             const dependencies = await this.graphDependencies(rootUri);
-            return (0, platformos_graph_1.buildAppGraph)(rootUri, dependencies, entryPoints);
+            const graph = await (0, platformos_graph_1.buildAppGraph)(rootUri, dependencies, entryPoints);
+            return graph;
         };
         this.getSourceCode = async (uri) => {
             const doc = this.documentManager.get(uri);

package/dist/server/AppGraphManager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AppGraphManager.js","sourceRoot":"","sources":["../../src/server/AppGraphManager.ts"],"names":[],"mappings":";;;AAEA,mEAOsC;AACtC,6EAAoD;AAEpD,2FAAkE;AAElE,oCAKkB;AAClB,oCAAoC;AAGpC,MAAa,eAAe;~~IAG1B~~,YACU,UAAsB,EACtB,eAAgC,EAChC,EAAsB,EACtB,cAA8B;QAH9B,eAAU,GAAV,UAAU,CAAY;QACtB,oBAAe,GAAf,eAAe,CAAiB;QAChC,OAAE,GAAF,EAAE,CAAoB;QACtB,mBAAc,GAAd,cAAc,CAAgB;~~QANxC~~,WAAM,GAAkD,IAAI,GAAG,EAAE,CAAC;~~QAoG3D~~,mBAAc,GAAa,EAAE,CAAC;QAuB7B,iBAAY,GAAG,IAAA,gBAAQ,EAAC,KAAK,IAAI,EAAE;YACzC,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC3F,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAEpC,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAClD,IAAI,CAAC,OAAO;gBAAE,OAAO;YAErB,~~MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC~~;~~YAC7C~~,IAAI,CAAC,~~KAAK;gBAAE,OAAO;YAEnB,IAAI,CAAC,~~MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC5B,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACtC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,qCAA6B,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QACzF,CAAC,EAAE,GAAG,CAAC,CAAC;QAEA,kBAAa,GAAG,KAAK,EAAE,OAAe,EAAE,WAAsB,EAAE,EAAE;YACxE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;YACjC,MAAM,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAEvC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC3D,~~OAAO~~,IAAA,gCAAa,EAAC,OAAO,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;~~QAC3D~~,CAAC,CAAC;QAEM,kBAAa,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;YAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,GAAG;gBAAE,OAAO,GAAG,CAAC;YAEpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC3C,OAAO,IAAA,+BAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC,CAAC;~~IAlJC~~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~~IAkCO~~,kBAAkB,CAAC,OAAe;QACxC,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QACnC,OAAO,IAAA,qCAAkB,EAAC,OAAO,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;IAC5D,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,OAAe;QAC7C,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QACnC,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAChE,OAAO;YACL,EAAE,EAAE,EAAE;YACN,aAAa,EAAE,aAAa;YAC5B,kCAAkC,CAAC,iBAAyB;gBAC1D,OAAO,gBAAgB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACjD,CAAC;SACF,CAAC;IACJ,CAAC;CACF;~~AA5KD~~,~~0CA4KC~~"}
1	+ {"version":3,"file":"AppGraphManager.js","sourceRoot":"","sources":["../../src/server/AppGraphManager.ts"],"names":[],"mappings":"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"}

package/dist/server/CachedFileSystem.js CHANGED Viewed

@@ -3,15 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CachedFileSystem = void 0;
 class CachedFileSystem {
     constructor(fs) {
-        this.readFile = cachedByUri(fs.readFile.bind(fs));
+        this.readFile = cachedByUri(fs.readFile.bind(fs),
+        // app/config.yml can change externally (e.g. vim) without a file watcher
+        // notification. Always read it fresh — it's small and rarely accessed.
+        (uri) => uri.endsWith('/app/config.yml'));
         this.readDirectory = cachedByUri(fs.readDirectory.bind(fs));
         this.stat = cachedByUri(fs.stat.bind(fs));
     }
 }
 exports.CachedFileSystem = CachedFileSystem;
-function cachedByUri(fn) {
+function cachedByUri(fn, skipCache) {
     const cache = new Map();
     function cached(uri) {
+        if (skipCache?.(uri))
+            return fn(uri);
         if (!cache.has(uri)) {
             // I'm intentionally leaving this comment here for debugging purposes :)
             // console.error('cache miss', fn.name, uri);

package/dist/server/CachedFileSystem.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CachedFileSystem.js","sourceRoot":"","sources":["../../src/server/CachedFileSystem.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAK3B,YAAY,EAAsB;QAChC,IAAI,CAAC,QAAQ,GAAG,WAAW,~~CAAC~~,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;~~QAClD~~,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,CAAC;CACF;~~AAVD~~,~~4CAUC~~;AAOD,SAAS,WAAW,~~CAAI~~,EAA+B;~~IACrD~~,MAAM,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IAE5C,SAAS,MAAM,CAAC,GAAW;QACzB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACpB,wEAAwE;YACxE,6CAA6C;YAC7C,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE;QAClC,wEAAwE;QACxE,mDAAmD;QACnD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}
1	+ {"version":3,"file":"CachedFileSystem.js","sourceRoot":"","sources":["../../src/server/CachedFileSystem.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAK3B,YAAY,EAAsB;QAChC,IAAI,CAAC,QAAQ,GAAG,WAAW,CACzB,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACpB,yEAAyE;QACzE,uEAAuE;QACvE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CACzC,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,CAAC;CACF;AAfD,4CAeC;AAOD,SAAS,WAAW,CAClB,EAA+B,EAC/B,SAAoC;IAEpC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IAE5C,SAAS,MAAM,CAAC,GAAW;QACzB,IAAI,SAAS,EAAE,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACpB,wEAAwE;YACxE,6CAA6C;YAC7C,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE;QAClC,wEAAwE;QACxE,mDAAmD;QACnD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}