v4.1.0

extension/data/liquid.ts

@@ -1,6 +1,6 @@
-import slash, { entries, isArray, isBoolean, isNumber, isObject, isString, keys } from 'utils';
+import slash, { entries, keys } from 'utils';
 import { basename, join, dirname } from 'node:path';
-import { Filter, Tags, IObject, Type, Types, liquid, IProperty, $, p, Engine } from '@liquify/specs';
+import { Filter, Tags, IObject, Type, Types, liquid, IProperty, $, p, Engine, Properties, TypeBasic } from '@liquify/specs';
 import { mdString, settingsType } from 'parse/helpers';
 import { has, path } from 'rambdax';
 import { Complete, SettingsSchema } from 'types';
@@ -249,66 +249,31 @@ export function getSettingsCompletions (uri: string, data: SettingsSchema[]) {
   return liquid.shopify.objects;
 };
 
+/**
+ * Get Eleventy Data File Completions
+ *
+ * Generates components for the 11ty data cascade. Completions will be created
+ * and types will be assumed in accordance with the structures. This can potentially
+ * be a rather heavy operation depending on the cascade itself.
+ */
 export function getEleventyDataComponents (uri: string) {
 
-  const objects:{ [prop: string]: IProperty } = { data: { type: Type.any } };
-
-  const build = (function traverse (data, spec?: IProperty) {
-
-    if (spec) {
-      if (spec.type === Type.object) {
-
-        for (const prop in data) {
-
-          if (isString(data[prop])) {
-            spec.properties[prop] = { type: Type.string };
-          } else if (isBoolean(data[prop])) {
-            spec.properties[prop] = { type: Type.boolean };
-          } else if (isObject(data[prop])) {
-            spec.properties[prop] = { type: Type.object };
-            traverse(data[prop], spec.properties[prop]);
-          } else if (isNumber(data[prop])) {
-            spec.properties[prop] = { type: Type.number };
-          } else if (isArray(data[prop])) {
-            spec.properties[prop] = { type: Type.array };
-            traverse(data[prop], spec.properties[prop]);
-          }
-
-        }
-      }
-    } else {
-
-      if (isObject(data)) {
-
-        for (const item in data) {
-
-          if (isObject(data[item])) {
-            objects[item] = { type: Type.object, properties: {} };
-            traverse(data[item], objects[item]);
-          } else if (isArray(data[item])) {
-            objects[item] = { type: Type.array };
-          }
-        }
-
-      }
-
-      if (isArray(data)) {
-        for (const item of data) {
-          objects[item] = { type: Type.array };
-          for (const value of data[item]) {
-            traverse(value, objects[item]);
-          }
-        }
+  const properties = liquid.generate<Properties>($.liquid.files.get(uri));
+  const reference = `[${basename(uri)}](${uri})`;
+  const propName: string = basename(uri, '.json');
+
+  liquid.extend(Engine.eleventy, {
+    objects: {
+      [propName]: {
+        description: `11ty data file\n\n${reference}`,
+        global: true,
+        properties
       }
     }
-
-    return objects;
-
-  })($.liquid.files.get(uri));
-
-  liquid.extend(Engine.standard, { objects: build });
+  });
 
 }
+
 /**
  * Get Locale Completions
  *
@@ -375,6 +340,17 @@ export function getObjectCompletions (fsPath: string, items: Complete.Items) {
 
   const dirn = dirname(fsPath);
   const base = basename(fsPath, '.liquid');
+  const keys = <Complete.ItemKeys[]>[
+    'objects',
+    'object:template',
+    `object:${Type.any}`,
+    `object:${Type.array}`,
+    `object:${Type.string}`,
+    `object:${Type.constant}`,
+    `object:${Type.boolean}`,
+    `object:${Type.number}`,
+    `object:${Type.object}`
+  ];
 
   if (base === 'gift_card' || base === 'robots.txt') {
     template = base + '.liquid';
@@ -384,19 +360,11 @@ export function getObjectCompletions (fsPath: string, items: Complete.Items) {
     template = base;
   }
 
-  items.delete('objects');
-  items.delete('object:template');
-  items.delete(`object:${Type.any}`);
-  items.delete(`object:${Type.array}`);
-  items.delete(`object:${Type.string}`);
-  items.delete(`object:${Type.constant}`);
-  items.delete(`object:${Type.boolean}`);
-  items.delete(`object:${Type.number}`);
-  items.delete(`object:${Type.object}`);
+  for (const key of keys) items.delete(key);
 
   const group = p.ObjectGroups(template, (object: IObject, item: CompletionItem): CompletionItem => {
 
-    if (object.type === Type.object) item.kind = CompletionItemKind.Module;
+    if (object.type === TypeBasic.object) item.kind = CompletionItemKind.Module;
     if (object.const) item.kind = CompletionItemKind.Constant;
 
     item.tags = object.deprecated ? [ CompletionItemTag.Deprecated ] : [];

extension/events.ts

@@ -9,10 +9,10 @@ import {
 } from 'vscode';
 import { ConfigMethod } from 'types';
 import { FormatEvent, FormatEventType } from 'providers/FormattingProvider';
-import { Engine } from '@liquify/specs';
+import { $, Engine, liquid } from '@liquify/specs';
 import { dirty, isFunction, isObject, setEndRange } from 'utils';
 import { CommandPalette } from 'workspace/CommandPalette';
-import { parseSchema, parseDocument } from 'parse/document';
+import { parseSchema, parseDocument, parseFrontmatter } from 'parse/document';
 import { getObjectCompletions } from 'data/liquid';
 
 /**
@@ -98,6 +98,9 @@ export class Events extends CommandPalette {
         if (this.engine === 'shopify') {
           await this.getFileCompletions([ 'snippets', 'sections' ]);
           this.resetFeatures();
+        } else if (this.engine === '11ty') {
+          await this.getFileCompletions([ 'includes' ]);
+          this.resetFeatures();
         }
       }
     }
@@ -120,6 +123,9 @@ export class Events extends CommandPalette {
         if (this.engine === 'shopify') {
           await this.getFileCompletions([ 'snippets', 'sections' ]);
           this.resetFeatures();
+        } else if (this.engine === '11ty') {
+          await this.getFileCompletions([ 'includes' ]);
+          this.resetFeatures();
         }
       }
     }
@@ -162,12 +168,37 @@ export class Events extends CommandPalette {
 
     const change = contentChanges[contentChanges.length - 1];
 
-    if (isObject(change?.range) && this.completion.enable.variables) {
-      const range = setEndRange(document, change.range.end);
-      parseDocument(document.getText(range), this.completion.vars);
+    if (isObject(change?.range)) {
+
+      let content = document.getText(setEndRange(document, change.range.end));
+
+      if (this.completion.enable.frontmatter) {
+
+        const fm = this.completion.frontmatter;
+
+        if (fm.offset > 0 && document.offsetAt(change.range.end) < fm.offset) {
+
+          liquid.purge($.liquid.engine, { objects: this.completion.frontmatter.keys });
+
+          this.completion.frontmatter = parseFrontmatter(content);
+
+          if (this.completion.frontmatter.offset > 0) {
+            content = content.slice(this.completion.frontmatter.offset + 3);
+          }
+
+        }
+      }
+
+      if (this.completion.enable.variables) {
+        parseDocument(content, this.completion.vars);
+      }
+
+      if (this.completion.enable.objects && (this.engine === 'shopify' || this.engine === '11ty')) {
+        getObjectCompletions(document.uri.fsPath, this.completion.items);
+      }
     }
 
-    if (this.completion.enable.schema && this.json.config.validate) {
+    if (this.engine === 'shopify' && this.completion.enable.schema && this.json.config.validate) {
 
       const schema = await parseSchema(document);
 
@@ -227,6 +258,16 @@ export class Events extends CommandPalette {
 
         this.status.show();
 
+        if (this.completion.enable.frontmatter && this.engine === '11ty') {
+
+          if (this.completion.frontmatter.offset > 0) {
+            liquid.purge($.liquid.engine, { objects: this.completion.frontmatter.keys });
+          }
+
+          this.completion.frontmatter = parseFrontmatter(textDocument.document.getText());
+
+        }
+
         const schema = await parseSchema(textDocument.document);
 
         if (schema !== false) {
@@ -240,7 +281,7 @@ export class Events extends CommandPalette {
 
         }
 
-        if (this.completion.enable.objects && this.engine === 'shopify') {
+        if (this.completion.enable.objects && (this.engine === 'shopify' || this.engine === '11ty')) {
           getObjectCompletions(uri.fsPath, this.completion.items);
         }
 

extension/extension.ts

@@ -4,28 +4,29 @@ import { Engines } from '@liquify/specs';
 import { Config, URI, Meta, Files } from './typings/store';
 import { Liquidrc, PackageJSON } from './typings/files';
 import { Selectors, LanguageIds } from './typings/document';
-import { ConfigurationTarget, Extension as IExtension, Uri, workspace, EventEmitter } from 'vscode';
+import * as vscode from 'vscode';
 import { ConfigMethod } from './typings/enums';
 import { Service } from './services';
 import { FormatEvent } from 'providers/FormattingProvider';
+import { Replace } from 'type-fest';
 
 /**
  * Extension State - Localized store for the extension
  */
 export class Extension extends Service {
 
-  constructor ({ packageJSON, isActive }: IExtension<PackageJSON>) {
+  constructor ({ packageJSON, isActive }: vscode.Extension<PackageJSON>) {
 
     super();
 
     this.isActive = isActive;
-    this.uri.root = workspace.workspaceFolders[0].uri;
+    this.uri.root = vscode.workspace.workspaceFolders[0].uri;
     this.uri.base = this.uri.root;
-    this.uri.workspace = Uri.joinPath(this.uri.root, '.vscode', 'settings.json');
+    this.uri.workspace = vscode.Uri.joinPath(this.uri.root, '.vscode', 'settings.json');
     this.meta.version = packageJSON.version;
     this.meta.displayName = packageJSON.displayName;
     this.meta.estheticVersion = packageJSON.dependencies.esthetic;
-    this.meta.releaseNotes = Uri.parse(`${this.meta.repository}/releases/tag/v${this.meta.version}`);
+    this.meta.releaseNotes = vscode.Uri.parse(`${this.meta.repository}/releases/tag/v${this.meta.version}`);
 
   }
 
@@ -47,7 +48,7 @@ export class Extension extends Service {
   /**
    * Error event
    */
-  listen: EventEmitter<FormatEvent> = new EventEmitter();
+  listen: vscode.EventEmitter<FormatEvent> = new vscode.EventEmitter();
 
   /**
    * Meta Information
@@ -79,7 +80,7 @@ export class Extension extends Service {
    *
    * @default 'shopify'
    */
-  engine: '11ty' | Engines = 'shopify';
+  engine: Replace<Engines, 'eleventy', '11ty'> = 'shopify';
 
   /**
    * Copy of the parsed `.liquidrc` file
@@ -98,16 +99,12 @@ export class Extension extends Service {
     liquidrc: null,
     workspace: null,
     files: {
-      jekyll: {
-        collectons: null,
-        data: null,
-        includes: null,
-        layouts: null
-      },
       '11ty': {
         data: new Set(),
         includes: new Set(),
-        layouts: new Set()
+        layouts: new Set(),
+        collections: new Set(),
+        frontmatter: new Set()
       },
       shopify: {
         locales: null,
@@ -117,6 +114,12 @@ export class Extension extends Service {
         snippets: new Set(),
         sections: new Set(),
         sectionGroups: new Set()
+      },
+      jekyll: {
+        collectons: null,
+        data: null,
+        includes: null,
+        layouts: null
       }
     }
   };
@@ -127,7 +130,7 @@ export class Extension extends Service {
    * @default ConfigurationTarget.Global
    */
   config: Config = {
-    target: ConfigurationTarget.Global,
+    target: vscode.ConfigurationTarget.Global,
     inspect: 'globalValue',
     method: ConfigMethod.Liquidrc,
     sources: {