From b913e11e10162678279397e4682b29aedb4e0047 Mon Sep 17 00:00:00 2001
From: Ayo <ramon.aycojr@gmail.com>
Date: Sat, 21 Oct 2023 16:34:34 +0200
Subject: [PATCH] refactor: publish .mjs files

---
 app/mcfly.config.ts                           |   2 +-
 app/routes/[...index].ts                      |   2 +-
 package-lock.json                             |  21 +++-
 packages/config/{index.ts => index.js}        |   0
 packages/core/define-config.mjs               |   3 +
 packages/core/define-config.ts                |   9 --
 packages/core/{index.ts => event-handler.mjs} | 100 +++++++++++++-----
 packages/core/package.json                    |   6 +-
 templates/basic/mcfly.config.ts               |   2 +-
 templates/basic/package.json                  |   6 +-
 templates/basic/routes/[...index].ts          |   2 +-
 11 files changed, 105 insertions(+), 48 deletions(-)
 rename packages/config/{index.ts => index.js} (100%)
 create mode 100644 packages/core/define-config.mjs
 delete mode 100644 packages/core/define-config.ts
 rename packages/core/{index.ts => event-handler.mjs} (81%)

diff --git a/app/mcfly.config.ts b/app/mcfly.config.ts
index 45b89fb..ea86ebd 100644
--- a/app/mcfly.config.ts
+++ b/app/mcfly.config.ts
@@ -1,4 +1,4 @@
-import defineConfig from "@mcflyjs/core/define-config";
+import defineConfig from "@mcflyjs/core/define-config.mjs";
 
 export default defineConfig({
   components: "js",
diff --git a/app/routes/[...index].ts b/app/routes/[...index].ts
index 64393bf..8973d04 100644
--- a/app/routes/[...index].ts
+++ b/app/routes/[...index].ts
@@ -1,6 +1,6 @@
 /**
  * McFly SSR logic
  */
-import McFly from "@mcflyjs/core";
+import McFly from "@mcflyjs/core/event-handler.mjs";
 import config from "../mcfly.config";
 export default McFly(config, useStorage());
diff --git a/package-lock.json b/package-lock.json
index 617e93c..f020f35 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4002,12 +4002,29 @@
       "version": "0.0.1",
       "license": "MIT",
       "dependencies": {
-        "@mcflyjs/config": "^0.0.1",
-        "@mcflyjs/core": "^0.1.0",
+        "@mcflyjs/config": "latest",
+        "@mcflyjs/core": "latest",
         "esprima": "^4.0.1",
         "nitropack": "latest",
         "ultrahtml": "^1.5.2"
       }
+    },
+    "templates/basic/node_modules/@mcflyjs/config": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/@mcflyjs/config/-/config-0.0.1.tgz",
+      "integrity": "sha512-rcP21TqHNdvEZGxckpwQk6nfSdCSi52jHjMWfeyu37iPUhwZvRWzCqfGpRVW/396sN8j+674JRbZw0mHLq03DQ=="
+    },
+    "templates/basic/node_modules/@mcflyjs/core": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@mcflyjs/core/-/core-0.1.1.tgz",
+      "integrity": "sha512-JsqChhe1+MhxFUT6vUbf7/4J6Phtt2pmSenUfjrywsG0ckMzxRSF9ei9yIThmmxhAEMUkIme/axXFZ3HpM1AKQ==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "h3": "^1.8.2",
+        "nitropack": "^2.7.0",
+        "ultrahtml": "^1.5.2",
+        "unstorage": "^1.9.0"
+      }
     }
   }
 }
diff --git a/packages/config/index.ts b/packages/config/index.js
similarity index 100%
rename from packages/config/index.ts
rename to packages/config/index.js
diff --git a/packages/core/define-config.mjs b/packages/core/define-config.mjs
new file mode 100644
index 0000000..27a7775
--- /dev/null
+++ b/packages/core/define-config.mjs
@@ -0,0 +1,3 @@
+export default function defineConfig(config) {
+  return () => config;
+}
diff --git a/packages/core/define-config.ts b/packages/core/define-config.ts
deleted file mode 100644
index a09ac00..0000000
--- a/packages/core/define-config.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { NitroApp } from "nitropack";
-
-export type McFlyConfig = {
-  onBuild?: Array<(event: NitroApp) => void>;
-  components: "js" | "ts";
-};
-export default function defineConfig(config: McFlyConfig) {
-  return () => config;
-}
diff --git a/packages/core/index.ts b/packages/core/event-handler.mjs
similarity index 81%
rename from packages/core/index.ts
rename to packages/core/event-handler.mjs
index 618e00b..bdf5df4 100644
--- a/packages/core/index.ts
+++ b/packages/core/event-handler.mjs
@@ -1,9 +1,10 @@
+// @ts-check
+
 import { eventHandler } from "h3";
-import { Storage as NitroStorage } from "unstorage";
 import { ELEMENT_NODE, parse, render, renderSync, walkSync } from "ultrahtml";
 import { parseScript } from "esprima";
 
-export default (config: Function, storage: NitroStorage) => {
+export default (config, storage) => {
   return eventHandler(async (event) => {
     const { path } = event;
     const { components: componentType } = config();
@@ -26,7 +27,7 @@ export default (config: Function, storage: NitroStorage) => {
   });
 };
 
-const getHtml = async (path: string, storage) => {
+const getHtml = async (path, storage) => {
   const rawPath = path[path.length - 1] === "/" ? path.slice(0, -1) : path;
   const filename = rawPath === "" ? "/index.html" : `${rawPath}.html`;
   const fallback = getPath(rawPath + "/index.html");
@@ -38,15 +39,22 @@ const getHtml = async (path: string, storage) => {
   return html;
 };
 
-function getPath(filename: string) {
+/**
+ *
+ * @param {string} filename
+ * @returns string
+ */
+function getPath(filename) {
   return `assets/pages${filename}`;
 }
 
-async function insertRegistry(
-  html: string,
-  type: "js" | "ts",
-  storage: NitroStorage
-): Promise<string> {
+/**
+ *
+ * @param {string} html
+ * @param {"js" | "ts"} type
+ * @returns Promise<string>
+ */
+async function insertRegistry(html, type, storage) {
   const ast = parse(html);
   const componentFiles = await getFiles(type, storage);
   const availableComponents = componentFiles.map((key) =>
@@ -80,17 +88,20 @@ async function insertRegistry(
   return render(ast);
 }
 
-async function buildRegistry(
-  usedCustomElements: string[],
-  type: "js" | "ts",
-  storage: NitroStorage
-) {
+/**
+ *
+ * @param {Array<string>} usedCustomElements
+ * @param {"js" | "ts"} type
+ * @returns
+ */
+async function buildRegistry(usedCustomElements, type, storage) {
   let registryScript = `<script type='module'>`;
   let isBaseClassImported = false;
   let classesImported = [];
 
   for (const name of usedCustomElements) {
     const content = await storage.getItem(`assets:components:${name}.${type}`);
+    if (!content) continue;
     const evalStore = eval(
       `class WebComponent {}; class HTMLElement {}; (${content.toString()})`
     );
@@ -119,7 +130,12 @@ async function buildRegistry(
   return registryScript;
 }
 
-function doSetUp(html: string) {
+/**
+ *
+ * @param {string} html
+ * @returns string
+ */
+function doSetUp(html) {
   const ast = parse(html);
   const serverScripts = [];
   walkSync(ast, (node) => {
@@ -138,11 +154,11 @@ function doSetUp(html: string) {
   });
 
   const setupMap = {};
-  serverScripts.forEach((script: string) => {
+  serverScripts.forEach((script) => {
     const { body } = parseScript(script);
     const keys = body
-      .filter((node) => node.type === "VariableDeclaration")
-      .map((node) => node.declarations[0].id.name);
+      .filter((n) => n.type === "VariableDeclaration")
+      .map((n) => n["declarations"][0].id.name);
     const constructor = `(function(){}.constructor)(\`${script}; return {${keys.join(
       ","
     )}}\`);`;
@@ -162,13 +178,18 @@ function doSetUp(html: string) {
   return html;
 }
 
-function deleteServerScripts(html: string): string {
+/**
+ *
+ * @param {string} html
+ * @returns string
+ */
+function deleteServerScripts(html) {
   const ast = parse(html);
   walkSync(ast, (node) => {
     const { attributes } = node;
     const attributeKeys = Object.keys(attributes ?? {});
     const isServerScript = attributeKeys.some((key) => key.includes("server:"));
-    if (isServerScript) {
+    if (isServerScript && !!node.parent) {
       node.parent.children.splice(node.parent.children.indexOf(node), 1);
     }
   });
@@ -176,7 +197,12 @@ function deleteServerScripts(html: string): string {
   return renderSync(ast);
 }
 
-function cleanScript(scripts: string[]): string {
+/**
+ *
+ * @param {Array<string>} scripts
+ * @returns string
+ */
+function cleanScript(scripts) {
   let script = scripts.map((s) => s.trim()).join(" ");
 
   script = removeComments(script);
@@ -184,6 +210,10 @@ function cleanScript(scripts: string[]): string {
   return script.replace(/\n/g, "").replace(/\s+/g, " ");
 }
 
+/**
+ *
+ * @returns boolean
+ */
 function isComment(node) {
   return (
     node.type === "Line" ||
@@ -193,7 +223,12 @@ function isComment(node) {
   );
 }
 
-function removeComments(script: string) {
+/**
+ *
+ * @param {string} script
+ * @returns string
+ */
+function removeComments(script) {
   const entries = [];
   parseScript(script, { comment: true }, function (node, meta) {
     if (isComment(node)) {
@@ -214,7 +249,12 @@ function removeComments(script: string) {
   return script;
 }
 
-async function useFragments(html: string, storage: NitroStorage) {
+/**
+ *
+ * @param {string} html
+ * @returns Promise<string>
+ */
+async function useFragments(html, storage) {
   const fragmentFiles = await getFiles("html", storage);
 
   const availableFragments = fragmentFiles.reduce((acc, key) => {
@@ -226,9 +266,11 @@ async function useFragments(html: string, storage: NitroStorage) {
   const ast = parse(html);
 
   for (const key in availableFragments) {
-    let text: string = await storage.getItem(
-      "assets:components:" + key + ".html"
-    );
+    /**
+     * @type string | null
+     */
+    let text = await storage.getItem("assets:components:" + key + ".html");
+    if (!text) continue;
     availableFragments[key] = text.replace(/\n/g, "").replace(/\s+/g, " ");
   }
 
@@ -259,7 +301,11 @@ function replaceSlots(fragmentNode, node) {
   });
 }
 
-async function getFiles(type: string, storage: NitroStorage) {
+/**
+ *
+ * @param {string} type
+ */
+async function getFiles(type, storage) {
   return (await storage.getKeys("assets:components"))
     .map((key) => key.replace("assets:components:", ""))
     .filter((key) => key.includes(type));
diff --git a/packages/core/package.json b/packages/core/package.json
index 955cb58..ec8602e 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -2,10 +2,10 @@
   "name": "@mcflyjs/core",
   "version": "0.1.1",
   "description": "McFly core package",
-  "main": "index.ts",
+  "main": "event-handler.mjs",
   "files": [
-    "index.ts",
-    "define-config.ts"
+    "event-handler.mjs",
+    "define-config.mjs"
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/templates/basic/mcfly.config.ts b/templates/basic/mcfly.config.ts
index 45b89fb..ea86ebd 100644
--- a/templates/basic/mcfly.config.ts
+++ b/templates/basic/mcfly.config.ts
@@ -1,4 +1,4 @@
-import defineConfig from "@mcflyjs/core/define-config";
+import defineConfig from "@mcflyjs/core/define-config.mjs";
 
 export default defineConfig({
   components: "js",
diff --git a/templates/basic/package.json b/templates/basic/package.json
index c8904d8..748696f 100644
--- a/templates/basic/package.json
+++ b/templates/basic/package.json
@@ -8,10 +8,10 @@
     "preview": "node .output/server/index.mjs"
   },
   "dependencies": {
-    "@mcflyjs/config": "^0.0.1",
-    "@mcflyjs/core": "^0.1.0",
-    "esprima": "^4.0.1",
+    "@mcflyjs/config": "latest",
+    "@mcflyjs/core": "latest",
     "nitropack": "latest",
+    "esprima": "^4.0.1",
     "ultrahtml": "^1.5.2"
   },
   "name": "@templates/basic",
diff --git a/templates/basic/routes/[...index].ts b/templates/basic/routes/[...index].ts
index 64393bf..8973d04 100644
--- a/templates/basic/routes/[...index].ts
+++ b/templates/basic/routes/[...index].ts
@@ -1,6 +1,6 @@
 /**
  * McFly SSR logic
  */
-import McFly from "@mcflyjs/core";
+import McFly from "@mcflyjs/core/event-handler.mjs";
 import config from "../mcfly.config";
 export default McFly(config, useStorage());