@platformos/prettier-plugin-liquid 0.0.7 → 0.0.9

package/dist/printer/print/liquid.js

@@ -93,7 +93,10 @@ function printNamedLiquidBlockStart(path, _options, print, args, whitespaceStart
             return tag(trailingWhitespace);
         }
         case liquid_html_parser_1.NamedTags.assign: {
-            const trailingWhitespace = node.markup.value.filters.length > 0 ? line : ' ';
+            const valueFilters = node.markup.value.type === liquid_html_parser_1.NodeTypes.AssignPushRhs
+                ? node.markup.value.pushValue.filters
+                : node.markup.value.filters;
+            const trailingWhitespace = valueFilters.length > 0 ? line : ' ';
             return tag(trailingWhitespace);
         }
         case liquid_html_parser_1.NamedTags.hash_assign: {
@@ -112,9 +115,7 @@ function printNamedLiquidBlockStart(path, _options, print, args, whitespaceStart
             ]);
         }
         case liquid_html_parser_1.NamedTags.content_for: {
-            const markup = node.markup;
-            const trailingWhitespace = markup.args.length > 0 ? line : ' ';
-            return tag(trailingWhitespace);
+            return tag(' ');
         }
         case liquid_html_parser_1.NamedTags.include:
         case liquid_html_parser_1.NamedTags.render: {
@@ -135,11 +136,7 @@ function printNamedLiquidBlockStart(path, _options, print, args, whitespaceStart
         case liquid_html_parser_1.NamedTags.capture:
         case liquid_html_parser_1.NamedTags.increment:
         case liquid_html_parser_1.NamedTags.decrement:
-        case liquid_html_parser_1.NamedTags.layout:
-        case liquid_html_parser_1.NamedTags.section: {
-            return tag(' ');
-        }
-        case liquid_html_parser_1.NamedTags.sections: {
+        case liquid_html_parser_1.NamedTags.layout: {
             return tag(' ');
         }
         case liquid_html_parser_1.NamedTags.form: {
@@ -151,9 +148,6 @@ function printNamedLiquidBlockStart(path, _options, print, args, whitespaceStart
             const trailingWhitespace = node.markup.reversed || node.markup.args.length > 0 ? line : ' ';
             return tag(trailingWhitespace);
         }
-        case liquid_html_parser_1.NamedTags.paginate: {
-            return tag(line);
-        }
         case liquid_html_parser_1.NamedTags.if:
         case liquid_html_parser_1.NamedTags.elsif:
         case liquid_html_parser_1.NamedTags.unless: {

package/dist/printer/printer-liquid-html.js

@@ -154,12 +154,7 @@ function printNode(path, options, print, args = {}) {
             if (isRawMarkupIdentationSensitive()) {
                 return [node.value.trimEnd(), hardline];
             }
-            const parentNode = node.parentNode;
-            const shouldNotIndentBody = parentNode &&
-                parentNode.type === liquid_html_parser_1.NodeTypes.LiquidRawTag &&
-                parentNode.name === 'schema' &&
-                !options.indentSchema;
-            const shouldIndentBody = node.kind !== liquid_html_parser_1.RawMarkupKinds.markdown && !shouldNotIndentBody;
+            const shouldIndentBody = node.kind !== liquid_html_parser_1.RawMarkupKinds.markdown;
             const lines = (0, utils_2.bodyLines)(node.value);
             const rawFirstLineIsntIndented = !!node.value.split(/\r?\n/)[0]?.match(/\S/);
             const shouldSkipFirstLine = rawFirstLineIsntIndented;
@@ -220,7 +215,21 @@ function printNode(path, options, print, args = {}) {
             ];
         }
         case liquid_html_parser_1.NodeTypes.AssignMarkup: {
-            return [node.name, ' = ', path.call((p) => print(p), 'value')];
+            const doc = [node.name];
+            if (node.lookups.length > 0) {
+                const lookups = path.map((lookupPath) => {
+                    const lookup = lookupPath.getValue();
+                    if (lookup.type === liquid_html_parser_1.NodeTypes.String &&
+                        /^\D/.test(lookup.value) &&
+                        /^[a-z0-9_]+\??$/i.test(lookup.value)) {
+                        return ['.', print(lookupPath)];
+                    }
+                    return ['[', print(lookupPath), ']'];
+                }, 'lookups');
+                doc.push(...lookups);
+            }
+            doc.push(` ${node.operator} `, path.call((p) => print(p), 'value'));
+            return doc;
         }
         case liquid_html_parser_1.NodeTypes.HashAssignMarkup: {
             return [
@@ -251,29 +260,8 @@ function printNode(path, options, print, args = {}) {
             }
             return doc;
         }
-        case liquid_html_parser_1.NodeTypes.PaginateMarkup: {
-            const doc = [
-                path.call((p) => print(p), 'collection'),
-                line,
-                'by ',
-                path.call((p) => print(p), 'pageSize'),
-            ];
-            if (node.args.length > 0) {
-                doc.push([
-                    ',',
-                    line,
-                    join([',', line], path.map((p) => print(p), 'args')),
-                ]);
-            }
-            return doc;
-        }
         case liquid_html_parser_1.NodeTypes.ContentForMarkup: {
-            const contentForType = path.call((p) => print(p), 'contentForType');
-            const doc = [contentForType];
-            if (node.args.length > 0) {
-                doc.push(',', line, join([',', line], path.map((p) => print(p), 'args')));
-            }
-            return doc;
+            return path.call((p) => print(p), 'contentForType');
         }
         case liquid_html_parser_1.NodeTypes.RenderMarkup: {
             const snippet = path.call((p) => print(p), 'snippet');
@@ -508,6 +496,46 @@ function printNode(path, options, print, args = {}) {
         case liquid_html_parser_1.NodeTypes.LiquidDocPromptNode: {
             return (0, liquid_1.printLiquidDocPrompt)(path, options, print, args);
         }
+        case liquid_html_parser_1.NodeTypes.JsonHashLiteral: {
+            if (node.entries.length === 0)
+                return '{}';
+            return group([
+                '{',
+                indent([
+                    line,
+                    join([',', line], path.map((p) => print(p), 'entries')),
+                ]),
+                line,
+                '}',
+            ]);
+        }
+        case liquid_html_parser_1.NodeTypes.JsonKeyValuePair: {
+            return [
+                path.call((p) => print(p), 'key'),
+                ': ',
+                path.call((p) => print(p), 'value'),
+            ];
+        }
+        case liquid_html_parser_1.NodeTypes.JsonArrayLiteral: {
+            if (node.elements.length === 0)
+                return '[]';
+            return group([
+                '[',
+                indent([
+                    line,
+                    join([',', line], path.map((p) => print(p), 'elements')),
+                ]),
+                line,
+                ']',
+            ]);
+        }
+        case liquid_html_parser_1.NodeTypes.AssignPushRhs: {
+            return [
+                path.call((p) => print(p), 'pushSource'),
+                ' << ',
+                path.call((p) => print(p), 'pushValue'),
+            ];
+        }
         default: {
             return (0, utils_1.assertNever)(node);
         }

package/dist/types.d.ts

@@ -12,7 +12,6 @@ export type LiquidParserOptions = ParserOptions<LiquidHtmlNode> & {
     singleLineLinkTags: boolean;
     liquidSingleQuote: boolean;
     embeddedSingleQuote: boolean;
-    indentSchema: boolean;
     captureWhitespaceSensitivity: 'strict' | 'ignore';
     liquidDocParamDash: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformos/prettier-plugin-liquid",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Prettier Liquid/HTML plugin for platformOS",
   "author": "platformOS",
   "homepage": "https://github.com/Platform-OS/platformos-tools/tree/master/packages/prettier-plugin-liquid#readme",
@@ -60,7 +60,7 @@
     "tsconfig-paths": "^4.2.0"
   },
   "dependencies": {
-    "@platformos/liquid-html-parser": "^0.0.7",
+    "@platformos/liquid-html-parser": "^0.0.9",
     "html-styles": "^1.0.0"
   }
 }