refactor: migrate to ts initial

package.json

@@ -28,6 +28,7 @@
     "husky": "^9.1.7",
     "netlify-cli": "^19.0.3",
     "prettier": "^3.5.3",
+    "tsup": "^8.4.0",
     "typescript": "^5.8.2",
     "vitest": "^3.0.9"
   },

packages/config/src/index.ts

@@ -1 +1 @@
-export { defineMcFlyConfig } from './define-mcfly-config.js'
+export { type McFlyConfig, defineMcFlyConfig } from './define-mcfly-config.js'

packages/core/package.json

@@ -54,7 +54,6 @@
     "@vitest/ui": "3.0.9",
     "esbuild": "^0.25.1",
     "hookable": "^5.5.3",
-    "unbuild": "^3.5.0",
     "unstorage": "^1.15.0",
     "vitest": "^3.0.9"
   }

packages/core/src/runtime/default-mcfly-config.ts

@@ -1,3 +1,3 @@
 export const defaultMcflyConfig = {
   components: 'js',
-}
+} as const

packages/core/src/runtime/evaluate-scripts.ts

@@ -1,6 +1,7 @@
 import { ELEMENT_NODE, parse, renderSync, walkSync } from 'ultrahtml'
 import { parseScript } from 'esprima'
 import { consola } from 'consola'
+import type { BaseNode as JsNode } from 'estree'
 
 /**
  * @typedef {import('estree').BaseNode} JsNode
@@ -8,10 +9,10 @@ import { consola } from 'consola'
 
 /**
  * McFly HTML Template parser
- * @param {*} _html
+ * @param {string} _html
  * @returns {string}
  */
-export function evaluateServerScripts(_html) {
+export function evaluateServerScripts(_html: string) {
   let html = evaluateServerScript(_html)
   html = deleteServerScripts(html)
   return html
@@ -22,9 +23,9 @@ export function evaluateServerScripts(_html) {
  * @param {string} html
  * @returns {string}
  */
-function evaluateServerScript(html) {
+function evaluateServerScript(html: string) {
   const ast = parse(html)
-  const serverScripts = []
+  const serverScripts: string[] = []
   walkSync(ast, (node) => {
     const { attributes } = node
     const attributeKeys = Object.keys(attributes ?? {})
@@ -45,7 +46,12 @@ function evaluateServerScript(html) {
     const { body } = parseScript(script)
     const keys = body
       .filter((n) => n.type === 'VariableDeclaration')
-      .map((n) => n['declarations'][0].id.name)
+      /**
+       * TODO - fix types or replace esprima w/ acorn
+       */
+      // @ts-ignore
+      .map((n) => n.declarations[0].id.name) //['declarations'][0].id.name)
+
     const constructor = `(function(){}.constructor)(\`${script}; return {${keys.join(
       ','
     )}}\`);`
@@ -62,7 +68,8 @@ function evaluateServerScript(html) {
     const value = rawValue.replace(/\s/g, '')
     const keys = value.split('.')
     let finalValue = ''
-    let setupCopy = setupMap
+    // TODO: remove any
+    let setupCopy: any = setupMap
 
     // if not in the server script, it could be a js expression
     if (!(keys[0] in setupMap)) {
@@ -93,7 +100,7 @@ function evaluateServerScript(html) {
  * @param {string} html
  * @returns {string}
  */
-function deleteServerScripts(html) {
+function deleteServerScripts(html: string) {
   const ast = parse(html)
   walkSync(ast, (node) => {
     const { attributes } = node
@@ -112,7 +119,7 @@ function deleteServerScripts(html) {
  * @param {Array<string>} scripts
  * @returns {string}
  */
-function cleanScript(scripts) {
+function cleanScript(scripts: string[]) {
   let script = scripts.map((s) => s.trim()).join(' ')
 
   script = removeComments(script)
@@ -125,8 +132,8 @@ function cleanScript(scripts) {
  * @param {string} script
  * @returns {string}
  */
-function removeComments(script) {
+function removeComments(script: string) {
-  const entries = []
+  const entries: any[] = []
   parseScript(script, { comment: true }, function (node, meta) {
     if (isComment(node)) {
       entries.push({
@@ -152,7 +159,7 @@ function removeComments(script) {
  * @param {JsNode} node
  * @returns {boolean}
  */
-function isComment(node) {
+function isComment(node: JsNode) {
   return (
     node.type === 'Line' ||
     node.type === 'Block' ||

packages/core/src/runtime/get-files.ts

@@ -1,10 +1,12 @@
+import type { Storage } from 'unstorage'
+
 /**
  * Get all files from the storage given a type
  * @param {string} type
  * @param {Storage} storage
  * @returns {Promise<string[]>}
  */
-export async function getFiles(type, storage) {
+export async function getFiles(type: string, storage: Storage) {
   return (await storage.getKeys('assets:components'))
     .map((key) => key.replace('assets:components:', ''))
     .filter((key) => key.includes(type))

packages/core/src/runtime/index.js

@@ -1,7 +0,0 @@
-export { defaultMcflyConfig } from './default-mcfly-config.mjs'
-export { evaluateServerScripts } from './evaluate-scripts.mjs'
-export { getFiles } from './get-files.mjs'
-export { hooks } from './hooks.mjs'
-export { injectCustomElements } from './inject-elements.mjs'
-export { injectHtmlFragments } from './inject-fragments.mjs'
-export { mcflyNitroConfig as nitroConfig } from '../mcfly-nitro-config.js'

packages/core/src/runtime/index.ts

@@ -0,0 +1,7 @@
+export { defaultMcflyConfig } from './default-mcfly-config.js'
+export { evaluateServerScripts } from './evaluate-scripts.js'
+export { getFiles } from './get-files.js'
+export { hooks } from './hooks.mjs'
+export { injectCustomElements } from './inject-elements.js'
+export { injectHtmlFragments } from './inject-fragments.mjs'
+export { mcflyNitroConfig as nitroConfig } from '../mcfly-nitro-config.js'

packages/core/src/runtime/inject-elements.js

@@ -1,14 +1,16 @@
 import { ELEMENT_NODE, parse, render, walkSync } from 'ultrahtml'
-import { getFiles } from './get-files.mjs'
+import { getFiles } from './get-files.js'
+// import type { Storage } from 'unstorage'
+// import type { McFlyConfig } from '../../../config/dist/index.js'
 
 /**
- * @typedef {import('../../config/index.js').McFlyConfig} Config
+ * @typedef {import('../../../config/dist/index.js').McFlyConfig} McFlyConfig
  */
 
 /**
  * Returns transformed HTML with custom elements registry in the head
  * @param {string} html
- * @param {Config['components']} type
+ * @param {McFlyConfig['components']} type
  * @param {Storage} storage
  * @returns {Promise<string>}
  */

packages/core/src/runtime/inject-fragments.mjs

@@ -1,5 +1,5 @@
 import { ELEMENT_NODE, parse, render, walkSync } from 'ultrahtml'
-import { getFiles } from './get-files.mjs'
+import { getFiles } from './get-files.js'
 
 /**
  * @typedef {import('ultrahtml').Node} HtmlNode

site/mcfly.config.mjs

@@ -1,11 +1,9 @@
+// @ts-check
 import { defineMcFlyConfig } from '@mcflyjs/config'
 import testPlugin from './test-plugin.mjs'
 
 export default defineMcFlyConfig({
   components: 'js',
-  server: {
-    logs: true,
-  },
   plugins: [testPlugin()],
   nitro: {
     preset: 'netlify',