refactor: move Import comonent to link.ts

Author: Je

link.ts

@@ -2,7 +2,7 @@ import React, { Children, cloneElement, CSSProperties, isValidElement, MouseEven
 import { redirect } from './aleph.ts'
 import events from './events.ts'
 import { useRouter } from './hooks.ts'
-import util from './util.ts'
+import util, { reModuleExt, reStyleModuleExt } from './util.ts'
 
 interface LinkProps {
     to: string
@@ -140,3 +140,13 @@ export function NavLink({
 
     return React.createElement(Link, { ...rest, to })
 }
+
+export function Import(props: { from: string, props?: Record<string, any> }) {
+    if (reStyleModuleExt.test(props.from)) {
+        return null
+    }
+    if (reModuleExt.test(props.from)) {
+        // todo: import component form props.__url
+        return null
+    }
+}

mod.ts

@@ -2,5 +2,5 @@ export { redirect } from './aleph.ts'
 export * from './context.ts'
 export { Head, SEO, Viewport } from './head.ts'
 export * from './hooks.ts'
-export { Link, NavLink } from './link.ts'
-export const Import = (_: { from: string }) => null
+export { Import, Link, NavLink } from './link.ts'
+

project.ts

@@ -1028,12 +1028,12 @@ export class Project {
                         path.dirname(url),
                         dep.url.replace(reModuleExt, '')
                     )
-                    mod.jsContent = mod.jsContent.replace(/(import|Import|export)([^'"]*)("|')([^'"]+)("|')(\)|;)?/g, (s, key, from, ql, importPath, qr, end) => {
+                    mod.jsContent = mod.jsContent.replace(/(import|Import|export)([\s\S]*?)(from\s*=?\s*|\()("|')([^'"]+)("|')(\)|;)?/g, (s, key, fields, from, ql, importPath, qr, end) => {
                         if (
                             reHashJs.test(importPath) &&
                             importPath.slice(0, importPath.length - (hashShort + 4)) === depImportPath
                         ) {
-                            return `${key}${from}${ql}${depImportPath}.${dep.hash.slice(0, hashShort)}.js${qr}${end || ''}`
+                            return `${key}${fields}${from}${ql}${depImportPath}.${dep.hash.slice(0, hashShort)}.js${qr}${end || ''}`
                         }
                         return s
                     })