@knapsack/renderer-html 4.69.9--canary.4745.99a87d9.0 → 4.69.9--canary.4739.3a8c6f1.0

package/CHANGELOG.md

@@ -1,15 +1,3 @@
-# v4.69.8 (Thu Sep 12 2024)
-
-#### 🐛 Bug Fix
-
-- refactor Renderers for cleaner types [#4746](https://github.com/knapsack-labs/app-monorepo/pull/4746) ([@EvanLovely](https://github.com/EvanLovely))
-
-#### Authors: 1
-
-- Evan Lovely ([@EvanLovely](https://github.com/EvanLovely))
-
----
-
 # v4.69.7 (Wed Sep 11 2024)
 
 #### 🐛 Bug Fix

package/dist/index.d.ts

@@ -1,9 +1,10 @@
-import { Renderable, Renderer, RendererBase } from '@knapsack/app/renderers';
-export declare class KnapsackHtmlRenderer extends RendererBase implements Renderable {
+import { KnapsackRendererBase } from '@knapsack/app';
+import type { KnapsackRenderParams, KnapsackTemplateRenderer, KnapsackTemplateRendererResults, KnapsackTemplateRendererBase } from '@knapsack/app/types';
+export declare class KnapsackHtmlRenderer extends KnapsackRendererBase implements KnapsackTemplateRenderer {
     constructor();
-    render: Renderer['render'];
-    getUsage: Renderer['getUsage'];
-    getTemplateSuggestions: Renderer['getTemplateSuggestions'];
-    getMeta: Renderer['getMeta'];
+    render(opt: KnapsackRenderParams): Promise<KnapsackTemplateRendererResults>;
+    getUsage({ pattern, template, demo, patternManifest, }: KnapsackRenderParams): Promise<string>;
+    getTemplateSuggestions(): ReturnType<KnapsackTemplateRendererBase['getTemplateSuggestions']>;
+    getMeta: KnapsackTemplateRenderer['getMeta'];
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAkB7E,qBAAa,oBAAqB,SAAQ,YAAa,YAAW,UAAU;;IAS1E,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAkBxB;IAEF,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,CAS5B;IAEF,sBAAsB,EAAE,QAAQ,CAAC,wBAAwB,CAAC,CASxD;IAEF,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,CAWzB;CACJ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAO,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EACV,oBAAoB,EACpB,wBAAwB,EACxB,+BAA+B,EAC/B,4BAA4B,EAC7B,MAAM,qBAAqB,CAAC;AAiB7B,qBAAa,oBACX,SAAQ,oBACR,YAAW,wBAAwB;;IAU7B,MAAM,CACV,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,+BAA+B,CAAC;IAoBrC,QAAQ,CAAC,EACb,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,eAAe,GAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBnC,sBAAsB,IAAI,UAAU,CACxC,4BAA4B,CAAC,wBAAwB,CAAC,CACvD;IAWD,OAAO,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAWzC;CACJ"}

package/dist/index.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KnapsackHtmlRenderer = void 0;
 const app_1 = require("@knapsack/app");
-const renderers_1 = require("@knapsack/app/renderers");
 const types_1 = require("@knapsack/types");
 const file_utils_1 = require("@knapsack/file-utils");
 const path_1 = require("path");
@@ -12,52 +11,13 @@ app_1.log.setupUpdateNotifier({
     version: pkg.version,
 });
 const gitRoot = (0, file_utils_1.findGitRoot)();
-class KnapsackHtmlRenderer extends renderers_1.RendererBase {
+class KnapsackHtmlRenderer extends app_1.KnapsackRendererBase {
     constructor() {
         super({
             id: types_1.rendererIds.html,
             extension: '.html',
             language: 'html',
         });
-        this.render = async (opt) => {
-            try {
-                const usage = await this.getUsage(opt);
-                return {
-                    ok: true,
-                    html: await (0, file_utils_1.formatCode)({
-                        contents: usage,
-                        path: 'x.html',
-                    }),
-                };
-            }
-            catch (e) {
-                return {
-                    ok: false,
-                    html: `<p>${e.message}</p>`,
-                    message: e.message,
-                };
-            }
-        };
-        this.getUsage = async ({ template, demo }) => {
-            const { absolutePath, exists } = await (0, file_utils_1.resolvePath)({
-                path: demo.type === 'template' ? demo.templateInfo.path : template.path,
-                resolveFromDir: this.dataDir,
-            });
-            if (!exists) {
-                throw new Error(`File does not exist: ${absolutePath}`);
-            }
-            return (0, file_utils_1.readFile)(absolutePath);
-        };
-        this.getTemplateSuggestions = async () => {
-            const { unusedPaths } = await this.getUnusedTemplatePaths({
-                globPaths: [(0, path_1.join)(gitRoot, '**/*.html')],
-            });
-            return {
-                suggestions: unusedPaths.map((path) => ({
-                    path,
-                })),
-            };
-        };
         this.getMeta = () => ({
             id: this.id,
             title: 'HTML',
@@ -71,6 +31,58 @@ class KnapsackHtmlRenderer extends renderers_1.RendererBase {
             hasTemplateSuggestionsSupport: true,
         });
     }
+    async render(opt) {
+        try {
+            const usage = await this.getUsage(opt);
+            return {
+                ok: true,
+                html: await (0, file_utils_1.formatCode)({
+                    contents: usage,
+                    path: 'x.html',
+                }),
+            };
+        }
+        catch (e) {
+            return {
+                ok: false,
+                html: `<p>${e.message}</p>`,
+                message: e.message,
+            };
+        }
+    }
+    async getUsage({ pattern, template, demo, patternManifest, }) {
+        if (app_1.KnapsackRendererBase.isTemplateDemo(demo)) {
+            const templateDemoPath = patternManifest.getTemplateDemoAbsolutePath({
+                patternId: pattern.id,
+                templateId: template.id,
+                demoId: demo.id,
+            });
+            return (0, file_utils_1.readFile)(templateDemoPath);
+        }
+        try {
+            const templatePath = patternManifest.getTemplateAbsolutePath({
+                patternId: pattern.id,
+                templateId: template.id,
+            });
+            return (0, file_utils_1.readFile)(templatePath);
+        }
+        catch (e) {
+            console.log(e);
+            const msg = `Error getting pattern "${pattern.id}" template "${template.id}": ${e.message}`;
+            app_1.log.error(msg);
+            throw new Error(msg);
+        }
+    }
+    async getTemplateSuggestions() {
+        const { unusedPaths } = await this.getUnusedTemplatePaths({
+            globPaths: [(0, path_1.join)(gitRoot, '**/*.html')],
+        });
+        return {
+            suggestions: unusedPaths.map((path) => ({
+                path,
+            })),
+        };
+    }
 }
 exports.KnapsackHtmlRenderer = KnapsackHtmlRenderer;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AACpC,uDAA6E;AAC7E,2CAA8C;AAC9C,qDAM8B;AAC9B,+BAA4B;AAE5B,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,0BAAa,EAAC,SAAS,CAAC,CAAC;AACzC,SAAG,CAAC,mBAAmB,CAAC;IACtB,IAAI,EAAE,GAAG,CAAC,IAAI;IACd,OAAO,EAAE,GAAG,CAAC,OAAO;CACrB,CAAC,CAAC;AACH,MAAM,OAAO,GAAG,IAAA,wBAAW,GAAE,CAAC;AAE9B,MAAa,oBAAqB,SAAQ,wBAAY;IACpD;QACE,KAAK,CAAC;YACJ,EAAE,EAAE,mBAAW,CAAC,IAAI;YACpB,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAC;QAGL,WAAM,GAAuB,KAAK,EAAE,GAAG,EAAE,EAAE;YACzC,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAEvC,OAAO;oBACL,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,MAAM,IAAA,uBAAU,EAAC;wBACrB,QAAQ,EAAE,KAAK;wBACf,IAAI,EAAE,QAAQ;qBACf,CAAC;iBACH,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,MAAM;oBAC3B,OAAO,EAAE,CAAC,CAAC,OAAO;iBACnB,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QAEF,aAAQ,GAAyB,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE;YAC5D,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,wBAAW,EAAC;gBACjD,IAAI,EAAE,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI;gBACvE,cAAc,EAAE,IAAI,CAAC,OAAO;aAC7B,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,wBAAwB,YAAY,EAAE,CAAC,CAAC;YAC1D,CAAC;YACD,OAAO,IAAA,qBAAQ,EAAC,YAAY,CAAC,CAAC;QAChC,CAAC,CAAC;QAEF,2BAAsB,GAAuC,KAAK,IAAI,EAAE;YACtE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC;gBACxD,SAAS,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;aACxC,CAAC,CAAC;YACH,OAAO;gBACL,WAAW,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBACtC,IAAI;iBACL,CAAC,CAAC;aACJ,CAAC;QACJ,CAAC,CAAC;QAEF,YAAO,GAAwB,GAAG,EAAE,CAAC,CAAC;YACpC,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,MAAM;YACb,0BAA0B,EAAE,MAAM;YAClC,QAAQ,EAAE,KAAK;YACf,eAAe,EAAE,KAAK;YACtB,mBAAmB,EAAE,IAAI;YACzB,eAAe,EAAE,KAAK;YACtB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,mBAAmB,EAAE,KAAK;YAC1B,6BAA6B,EAAE,IAAI;SACpC,CAAC,CAAC;IAvDH,CAAC;CAwDF;AA/DD,oDA+DC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@knapsack/renderer-html",
   "description": "Render HTML",
-  "version": "4.69.9--canary.4745.99a87d9.0",
+  "version": "4.69.9--canary.4739.3a8c6f1.0",
   "main": "index.js",
   "types": "index.d.ts",
   "exports": {
@@ -22,13 +22,13 @@
   },
   "author": "Knapsack (https://www.knapsack.cloud)",
   "dependencies": {
-    "@knapsack/app": "4.69.9--canary.4745.99a87d9.0",
-    "@knapsack/file-utils": "4.69.9--canary.4745.99a87d9.0",
-    "@knapsack/types": "4.69.9--canary.4745.99a87d9.0"
+    "@knapsack/app": "4.69.9--canary.4739.3a8c6f1.0",
+    "@knapsack/file-utils": "4.69.9--canary.4739.3a8c6f1.0",
+    "@knapsack/types": "4.69.9--canary.4739.3a8c6f1.0"
   },
   "devDependencies": {
-    "@knapsack/eslint-config-starter": "4.69.9--canary.4745.99a87d9.0",
-    "@knapsack/typescript-config-starter": "4.69.9--canary.4745.99a87d9.0",
+    "@knapsack/eslint-config-starter": "4.69.9--canary.4739.3a8c6f1.0",
+    "@knapsack/typescript-config-starter": "4.69.9--canary.4739.3a8c6f1.0",
     "eslint": "^8.57.0",
     "typescript": "^5.5.4"
   },
@@ -40,5 +40,5 @@
     "directory": "apps/client/renderers/renderer-html",
     "type": "git"
   },
-  "gitHead": "99a87d9b9f321739fe99bf3642c0b42e4f152676"
+  "gitHead": "3a8c6f18de1986c14fe426336bcefb1ca8c8ca21"
 }