fix: type cleanup

jakobrosenberg · jakobrosenberg · commit 29fa2123d791 · 2025-08-22T16:42:07.000+02:00
diff --git a/lib/buildtime/plugins/exporter/exporter.js b/lib/buildtime/plugins/exporter/exporter.js
@@ -14,7 +14,7 @@ export const exporter = ({ instance }) => {
     const createRelativePath = path => relativeUnix(instance.options.routifyDir, path)
 
     const relativePaths = {
-        routesDir: createRelativePath(instance.options.routesDir.default),
+        routesDir: createRelativePath(instance.options.routesDir['default']),
         mainEntryPoint: createRelativePath(instance.options.mainEntryPoint),
         rootComponent: createRelativePath(instance.options.rootComponent),
     }
diff --git a/lib/buildtime/plugins/filemapper/lib/utils/misc.js b/lib/buildtime/plugins/filemapper/lib/utils/misc.js
@@ -1,6 +1,6 @@
 /**
- * @param {string | (Object.<string, string>)} input
- * @returns {Object.<string, string>}
+ * @param {string | ({default: string} & Object.<string, string>)} input
+ * @returns {{default: string} & Object.<string, string>}
  */
 export const normalizeRoutesDir = input =>
     typeof input === 'string' ? { default: input } : input
diff --git a/lib/buildtime/plugins/themes/themes.js b/lib/buildtime/plugins/themes/themes.js
@@ -45,7 +45,7 @@ export const createThemedRootNode = (
     const rootNode = instance.rootNodes[rootNodeName].deepClone()
     rootNode.name = name
     rootNode.id = '_' + name
-    rootNode.rootName = rootNodeName + '-theme-' + name
+    rootNode['rootName'] = rootNodeName + '-theme-' + name
     instance.rootNodes[rootNodeName + '-theme-' + name] = rootNode
     ;[...themePreferenceGroups].reverse().forEach(themePreferenceGroup => {
         themePreferenceGroup = coerceArray(themePreferenceGroup)
diff --git a/lib/buildtime/plugins/themes/utils.js b/lib/buildtime/plugins/themes/utils.js
@@ -83,15 +83,15 @@ export const normalizeConfig = (config, rootNodes) => {
 
     const defaultPreset = {
         preferences: [],
-        namespaces: _config.defaults.namespaces,
+        namespaces: _config.defaults['namespaces'],
         rootNodes,
     }
 
     Object.keys(_config.presets).forEach(
         key =>
             (_config.presets[key] = normalizePreset(_config.presets[key], defaultPreset)),
     )
-    return _config
+    return /** @type {ThemeConfig} */ (_config)
 }
 
 export const coerceArray = value => (Array.isArray(value) ? value : [value])
diff --git a/lib/common/RNode.js b/lib/common/RNode.js
@@ -163,7 +163,7 @@ export class RNode {
         const isNamed = !path.startsWith('/') && !path.startsWith('.')
         return isNamed
             ? this.root.instance.nodeIndex.find(node => node.meta.name === path)
-            : this.getChainTo(path, options)?.pop().node
+            : /** @type {this} */ (this.getChainTo(path, options)?.pop().node)
     }
 
     /**
diff --git a/lib/common/utils.js b/lib/common/utils.js
@@ -160,7 +160,7 @@ export const mockRoutes = (instance, routes) => {
  * Adds props to a Svelte component
  * @example
  * const MyCompWithProps = addPropsToComp(MyComp, {msg: 'hello world'})
- * @template {typeof import('svelte/internal').SvelteComponentDev} Component
+ * @template {typeof import('svelte').SvelteComponent} Component
  * @param {Component} Comp
  * @param {Object<string, any>} props
  * @returns {Component}
diff --git a/lib/extra/tools/ssr4.js b/lib/extra/tools/ssr4.js
@@ -30,9 +30,9 @@ const polyfillFetch = async () => {
  */
 export const renderModule = async (module, urlOrOptions) => {
     await polyfillFetch()
-    const render = module.default?.render || module['render']
+    const render = module['default']?.render || module['render']
 
-    const url = urlOrOptions.url || urlOrOptions
+    const url = urlOrOptions['url'] || urlOrOptions
     const load = module.load ? await module.load(url) : {}
 
     const preloadUrlLoad = await preloadUrl(urlOrOptions)
diff --git a/lib/extra/tools/ssr5.js b/lib/extra/tools/ssr5.js
@@ -1,3 +1,4 @@
+/** @ts-ignore */
 import { render } from 'svelte/server'
 import { preloadUrl } from '../../runtime/index.js'
 
@@ -33,14 +34,14 @@ export const renderModule = async (module, urlOrOptions) => {
     await polyfillFetch()
     // const render = module.default?.render || module['render']
 
-    const url = urlOrOptions.url || urlOrOptions
+    const url = urlOrOptions['url'] || urlOrOptions
     const load = module.load ? await module.load(url) : {}
 
     const preloadUrlLoad = await preloadUrl(urlOrOptions)
 
     return {
         status: 200,
-        ...(await render(module.default)),
+        ...(await render(module['default'])),
         ...load,
         ...preloadUrlLoad?.flat()[0],
     }
diff --git a/lib/runtime/Router/Router.js b/lib/runtime/Router/Router.js
@@ -239,9 +239,9 @@ export class Router {
             this._setUrl(this.url.getActive(), 'pushState', true)
         }
 
+        const C = Array.isArray(urlReflector) ? urlReflector[0] : urlReflector
         const shouldInstallUrlReflector =
-            !this.urlReflector ||
-            (urlReflector && !(this.urlReflector instanceof urlReflector))
+            !this.urlReflector || (urlReflector && !(this.urlReflector instanceof C))
 
         if (shouldInstallUrlReflector) {
             urlReflector =
@@ -313,7 +313,7 @@ export class Router {
 
         const stackedRoute = this.history.get(state.id)
 
-        if (stackedRoute?.meta.history) {
+        if (stackedRoute?.meta['history']) {
             stackedRoute.mode = 'popState'
             stackedRoute.state.cached = true
             this.setActiveRoute(stackedRoute, null)
@@ -400,7 +400,7 @@ export class Router {
             const warnTimeout = setTimeout(() => {
                 if (!route.isActive) return // don't warn if the route is no longer active
                 const index = renderPromises.findIndex(p => !p.isResolved)
-                const warning = `Failed to render ${route.fragments[index].node.name} (${route.fragments[index].node.file?.path}) within 5s. Ensure the parent component renders a <slot />`
+                const warning = `Failed to render ${route.fragments[index].node.name} (${route.fragments[index].node['file']?.path}) within 5s. Ensure the parent component renders a <slot />`
                 console.warn(warning)
             }, 5000)
 
diff --git a/lib/runtime/helpers/preload.js b/lib/runtime/helpers/preload.js
@@ -81,7 +81,7 @@ export const preloadUrlFromUrlPairs = async (urlPairs, routesMap) => {
     const routers = await Promise.all(routerPromises)
 
     await Promise.all(routers.map(router => router && router.ready()))
-    return routers.map(router => router.activeRoute?.get().load)
+    return routers.map(router => router['activeRoute']?.get().load)
 }
 
 /**
diff --git a/lib/runtime/renderer/RenderContext.js b/lib/runtime/renderer/RenderContext.js
@@ -35,7 +35,7 @@ export class RouterContext {
     /** @type {RenderContext} */
     lastActiveChildContext = null
 
-    /** @type {Decorator[]} */
+    /** @type {Decorator<any>[]} */
     decorators = []
 
     /** @type {import('../decorators/AnchorDecorator').Location}*/
@@ -58,7 +58,7 @@ export class RouterContext {
     }
 
     /**
-     * @param {Partial<{inline: InlineInput, decorator:DecoratorInput, props, options, anchor: AnchorLocation, scrollLock: scrollLock}>} options
+     * @param {Partial<{inline: InlineInput, decorator:DecoratorInput<any>, props, options, anchor: AnchorLocation, scrollLock: scrollLock}>} options
      *
      * */
     buildChildContexts(options, newDecorators) {
@@ -100,6 +100,8 @@ export class RouterContext {
                     parentContext: this,
                     newDecorators,
                     contextOptions,
+                    // todo fix type
+                    // @ts-ignore
                     scrollLock,
                     anchorLocation,
                     props,
@@ -149,7 +151,7 @@ export class RenderContext extends RouterContext {
      *   paramsPool: Object.<string, string[]>
      *   rawInlineInputFromSlot: InlineInput
      *   parentContext: RenderContext | RouterContext
-     *   newDecorators: Decorator[]
+     *   newDecorators: Decorator<any>[]
      *   contextOptions: RenderContextOptions
      *   scrollLock: scrollLock
      *   anchorLocation: AnchorLocation
diff --git a/lib/runtime/renderer/utils/index.js b/lib/runtime/renderer/utils/index.js
@@ -5,7 +5,7 @@
  * @example
  * import MyComponent from './MyComponent.svelte'
  * const MyComponentWithProps = attachProps(MyComponent, {msg: 'hello world'})
- * @template {typeof import('svelte/internal').SvelteComponentDev} C
+ * @template {typeof import('svelte').SvelteComponent} C
  * @param {C} Component
  * @param {Object.<string, any>} props
  * @returns {C}
diff --git a/lib/runtime/renderer/utils/normalizeDecorator.js b/lib/runtime/renderer/utils/normalizeDecorator.js
@@ -9,11 +9,14 @@ const wrapperDefaults = {
 }
 
 /**
- * @param {DecoratorInput} decorator
- * @returns {Decorator}
+ * @template T
+ * @param {DecoratorInput<T>} decorator
+ * @returns {Decorator<T>}
  */
 export const normalizeDecorator = decorator => {
+    // @ts-ignore
     if ('component' in decorator) return { ...decoratorDefaults, ...decorator }
+    // @ts-ignore
     else return { ...decoratorDefaults, component: decorator }
 }
 
diff --git a/lib/runtime/utils/index.js b/lib/runtime/utils/index.js
@@ -220,6 +220,8 @@ const getGlobalContext = () => {
     const router = appInstance.routers[0]
     const route = router.activeRoute.get() || router.pendingRoute.get()
 
+    // todo fix ts
+    // @ts-ignore
     return {
         elem: null,
         anchorLocation: null,
@@ -301,6 +303,8 @@ export const isAnonFn = input => typeof input === 'function' && !input.prototype
  * @returns {T}
  */
 export const resolveIfAnonFn = (subject, params) =>
+    // todo investigate ts
+    // @ts-ignore
     isAnonFn(subject) ? /** @type {any} */ (subject)(...params) : subject
 
 export const resolveIfHasCallback = (subject, params, field = 'callback') =>
diff --git a/lib/runtime/utils/logger.js b/lib/runtime/utils/logger.js
@@ -6,9 +6,9 @@ log.levels.verbose = 5
 export const createRootLogger = () => {
     Object.assign(log, loadState())
     return new Proxy(log, {
-        get: (target, prop) => target[prop],
+        get: (target, prop) => target[prop.toString()],
         set: (target, prop, value) => {
-            target[prop] = value
+            target[prop.toString()] = value
             saveState(log)
             return true
         },
diff --git a/tsconfig.json b/tsconfig.json
@@ -9,22 +9,26 @@
         "target": "ES2017",
         "declarationDir": "typings",
         "emitDeclarationOnly": true,
-        "allowSyntheticDefaultImports": true
+        "allowSyntheticDefaultImports": true,
+        "skipLibCheck": true,
+        "types": ["probs"]
     },
     "include": [
         "types/**/*.js",
          "lib/**/*.js",
-         "plugins/**/*.js",
-         "node_modules/probs"
+         "plugins/**/*.js"
         ],
     "exclude": [
         "**/tmp/*",
         "**/.history/*",
-        "test",
         "examples",
         "site",
         "jest.config.js",
         "lib/extra/vite-plugin/assets",
-        "typings"
+        "typings",
+        "**/test/**",
+        "**/spec/**",
+        "**/*.spec.*",
+        "**/*.test.*"
     ]
 }
diff --git a/types/typedef.js b/types/typedef.js
@@ -3,7 +3,7 @@
  * @typedef {import('../lib/common/RNode').RNode} RNode
  * @typedef {import('../lib/common/Routify').Routify} Routify
  * @typedef {{Node: RNode}} RoutifyBaseOptions
- * @typedef {typeof import('svelte/internal').SvelteComponentDev } SvelteComponentDev
+ * @typedef {typeof import('svelte').SvelteComponent} SvelteComponentDev
  */
 /**
  * @template T
@@ -58,7 +58,7 @@
  * @prop {boolean} clearRoutifyDir
  * @prop {string} mainEntryPoint defaults to 'src/main.js'
  * @prop {string} rootComponent defaults to 'src/App.svelte'
- * @prop {string|Object<string,string>} routesDir defaults to { default: 'src/routes' }
+ * @prop {string|({default: string} & Object<string,string>)} routesDir defaults to { default: 'src/routes' }
  * @prop {string[]|boolean} ignoreMetaConflictWarnings
  * @prop {object} filemapper
  * @prop {1|2|3|4|5} logLevel defaults to 3
diff --git a/typings/lib/buildtime/plugins/filemapper/lib/utils/misc.d.ts b/typings/lib/buildtime/plugins/filemapper/lib/utils/misc.d.ts
@@ -1,5 +1,9 @@
 export function normalizeRoutesDir(input: string | ({
+    default: string;
+} & {
     [x: string]: string;
 })): {
+    default: string;
+} & {
     [x: string]: string;
 };
diff --git a/typings/lib/buildtime/plugins/themes/utils.d.ts b/typings/lib/buildtime/plugins/themes/utils.d.ts
@@ -1,23 +1,7 @@
 export function normalizePreset(preset: any, defaultPreset: any): any;
 export function normalizeConfig(config: ThemeUserConfig, rootNodes: {
     [x: string]: any;
-}): {
-    /**
-     * - The user-defined theme presets.
-     */
-    presets: {
-        [x: string]: ThemeUserPreset;
-    };
-    /**
-     * - Optional. Additional themes to merge with presets.
-     */
-    defaults: Partial<ThemeConfigDefaults> | {
-        file: string;
-        app: string;
-        namespaces: RegExp[];
-        rootNodes: any[];
-    };
-};
+}): ThemeConfig;
 export function coerceArray(value: any): any[];
 export function arraysAreEqual(a: any, b: any): any;
 /**
diff --git a/typings/lib/common/utils.d.ts b/typings/lib/common/utils.d.ts
@@ -16,7 +16,7 @@ export function normalizePlugins(plugins: RoutifyBuildtimePlugin[]): RoutifyBuil
 export function mockRoutes<T extends RoutifyBuildtime | RoutifyRuntime>(instance: T, routes: {
     [x: string]: any;
 }): import("../buildtime/RNodeBuildtime").RNodeBuildtime | import("../runtime/Instance/RNodeRuntime").RNodeRuntime;
-export function addPropsToComp<Component extends typeof import("svelte/internal").SvelteComponentDev>(Comp: Component, props: {
+export function addPropsToComp<Component extends typeof import("svelte").SvelteComponent>(Comp: Component, props: {
     [x: string]: any;
 }): Component;
 export function next<T extends import("svelte/store").Readable<V>, V>(store: T, wanted?: (((wanted: V) => boolean) | V) | undefined, strict?: boolean | undefined): Promise<V>;
diff --git a/typings/lib/runtime/helpers/dedicated/RouteOnScroll/index.d.ts b/typings/lib/runtime/helpers/dedicated/RouteOnScroll/index.d.ts
@@ -45,11 +45,11 @@ export class RouteOnScroll extends BaseRouteOnScroll {
     constructor(options?: Partial<BaseRouteOnScrollOptions & RouteOnScrollOptions>);
     threshold: number;
     direction: "both" | "vertical" | "horizontal";
-    strategy: "closest" | "lowestAboveThreshold" | "withinThreshold";
-    boundaryAnchorX: "center" | "left" | "right";
-    boundaryAnchorY: "center" | "top" | "bottom";
-    targetAnchorX: "center" | "left" | "right";
-    targetAnchorY: "center" | "top" | "bottom";
+    strategy: "lowestAboveThreshold" | "withinThreshold" | "closest";
+    boundaryAnchorX: "left" | "center" | "right";
+    boundaryAnchorY: "top" | "center" | "bottom";
+    targetAnchorX: "left" | "center" | "right";
+    targetAnchorY: "top" | "center" | "bottom";
     /**
      * @param {HTMLElement} element
      */
diff --git a/typings/lib/runtime/renderer/RenderContext.d.ts b/typings/lib/runtime/renderer/RenderContext.d.ts
@@ -13,20 +13,20 @@ export class RouterContext {
     activeChildContext: import("svelte/store").Writable<RenderContext>;
     /** @type {RenderContext} */
     lastActiveChildContext: RenderContext;
-    /** @type {Decorator[]} */
-    decorators: Decorator[];
+    /** @type {Decorator<any>[]} */
+    decorators: Decorator<any>[];
     /** @type {import('../decorators/AnchorDecorator').Location}*/
     anchorLocation: import("../decorators/AnchorDecorator").Location;
     get descendants(): any;
     router: import("../index.js").RouterClass;
     route: import("../Route/Route.js").Route;
     /**
-     * @param {Partial<{inline: InlineInput, decorator:DecoratorInput, props, options, anchor: AnchorLocation, scrollLock: scrollLock}>} options
+     * @param {Partial<{inline: InlineInput, decorator:DecoratorInput<any>, props, options, anchor: AnchorLocation, scrollLock: scrollLock}>} options
      *
      * */
     buildChildContexts(options: Partial<{
         inline: InlineInput;
-        decorator: DecoratorInput;
+        decorator: DecoratorInput<any>;
         props: any;
         options: any;
         anchor: AnchorLocation;
@@ -42,7 +42,7 @@ export class RenderContext extends RouterContext {
      *   paramsPool: Object.<string, string[]>
      *   rawInlineInputFromSlot: InlineInput
      *   parentContext: RenderContext | RouterContext
-     *   newDecorators: Decorator[]
+     *   newDecorators: Decorator<any>[]
      *   contextOptions: RenderContextOptions
      *   scrollLock: scrollLock
      *   anchorLocation: AnchorLocation
@@ -57,7 +57,7 @@ export class RenderContext extends RouterContext {
         };
         rawInlineInputFromSlot: InlineInput;
         parentContext: RenderContext | RouterContext;
-        newDecorators: Decorator[];
+        newDecorators: Decorator<any>[];
         contextOptions: RenderContextOptions;
         scrollLock: scrollLock;
         anchorLocation: AnchorLocation;
diff --git a/typings/lib/runtime/renderer/utils/index.d.ts b/typings/lib/runtime/renderer/utils/index.d.ts
@@ -1,4 +1,4 @@
-export function attachProps<C extends typeof import("svelte/internal").SvelteComponentDev>(Component: C, props: {
+export function attachProps<C extends typeof import("svelte").SvelteComponent>(Component: C, props: {
     [x: string]: any;
 }, defaults: any): C;
 export function getLineage(context: RenderContext): import("../RenderContext").RenderContext[];
diff --git a/typings/lib/runtime/renderer/utils/normalizeDecorator.d.ts b/typings/lib/runtime/renderer/utils/normalizeDecorator.d.ts
@@ -1,3 +1,3 @@
-export function normalizeDecorator(decorator: DecoratorInput): Decorator;
+export function normalizeDecorator<T>(decorator: DecoratorInput<T>): Decorator<T>;
 export function normalizeWrapper(wrapper: any): any;
 export * from "./normalizeInline.js";
diff --git a/typings/types/typedef.d.ts b/typings/types/typedef.d.ts

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export const exporter = ({ instance }) => {`
`14`	`14`	`const createRelativePath = path => relativeUnix(instance.options.routifyDir, path)`
`15`	`15`
`16`	`16`	`const relativePaths = {`
`17`		`- routesDir: createRelativePath(instance.options.routesDir.default),`
	`17`	`+ routesDir: createRelativePath(instance.options.routesDir['default']),`
`18`	`18`	`mainEntryPoint: createRelativePath(instance.options.mainEntryPoint),`
`19`	`19`	`rootComponent: createRelativePath(instance.options.rootComponent),`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,15 +83,15 @@ export const normalizeConfig = (config, rootNodes) => {`
`83`	`83`
`84`	`84`	`const defaultPreset = {`
`85`	`85`	`preferences: [],`
`86`		`- namespaces: _config.defaults.namespaces,`
	`86`	`+ namespaces: _config.defaults['namespaces'],`
`87`	`87`	`rootNodes,`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`Object.keys(_config.presets).forEach(`
`91`	`91`	`key =>`
`92`	`92`	`(_config.presets[key] = normalizePreset(_config.presets[key], defaultPreset)),`
`93`	`93`	`)`
`94`		`- return _config`
	`94`	`+ return /** @type {ThemeConfig} */ (_config)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`export const coerceArray = value => (Array.isArray(value) ? value : [value])`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ export class RNode {`
`163`	`163`	`const isNamed = !path.startsWith('/') && !path.startsWith('.')`
`164`	`164`	`return isNamed`
`165`	`165`	`? this.root.instance.nodeIndex.find(node => node.meta.name === path)`
`166`		`- : this.getChainTo(path, options)?.pop().node`
	`166`	`+ : /** @type {this} */ (this.getChainTo(path, options)?.pop().node)`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ export const preloadUrlFromUrlPairs = async (urlPairs, routesMap) => {`
`81`	`81`	`const routers = await Promise.all(routerPromises)`
`82`	`82`
`83`	`83`	`await Promise.all(routers.map(router => router && router.ready()))`
`84`		`- return routers.map(router => router.activeRoute?.get().load)`
	`84`	`+ return routers.map(router => router['activeRoute']?.get().load)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`