@d1vij/jassm 0.1.18-beta.1 → 0.1.18

package/dist/index.d.ts

@@ -55,37 +55,24 @@ type GlobResult<T> = Record<string, T>;
 /**
 * Removes `.mdx` extension from a path
 */
-type StripExtension<T extends string> = T extends `${infer P}.mdx` ? P : T;
+type StripExtension<T extends string> = T extends `${infer Rest}.mdx` ? Rest : T;
 /**
-* Replace filesystem root with a virtual route prefix
+* Derives the route keys produced by the registry and
+* replace filesystem root with a virtual route prefix
 *
 * Example:
 *
 * `/src/content/foo.mdx`
 * root = `/src/content`
 * virtual = `/blog`
-*
 * Result:
 * `/blog/foo`
 */
-type ReplaceRoot<
-	P extends string,
-	Root extends string,
-	Virtual extends string
-> = P extends `${Root}${infer Rest}` ? `${Virtual}${StripExtension<Rest>}` : never;
-/**
-* Derives the route keys produced by the registry
-*
-* Example:
-*
-* `/src/blog/foo.mdx`
-* → `/blog/foo`
-*/
 type RouteKey<
 	Modules extends Record<string, unknown>,
 	Root extends string,
 	Virtual extends string
-> = ReplaceRoot<Extract<keyof Modules, string>, Root, Virtual>;
+> = keyof { [K in keyof Modules as K extends `${string}${Root}/${infer Rest}.mdx` ? `${Virtual}/${Rest}` : never] : true } & string;
 /**
 * Options passed to {@link generateRegistry}
 */
@@ -102,7 +89,7 @@ type RegistryOptions<
 	/**
 	* Metadata extracted from each MDX file
 	*/
-	metadataGlob: { [K in keyof Modules] : MetaType };
+	metadataGlob: { [K in keyof Modules as `${StripExtension<Extract<K, string>>}.meta.ts`] : MetaType };
 	/**
 	* Filesystem root path
 	*/
@@ -123,7 +110,7 @@ type RegistryOptions<
 */
 declare function generateRegistry<
 	MetaType,
-	Modules extends GlobResult<WrappedUnknownPromise>,
+	Modules extends Record<string, WrappedUnknownPromise>,
 	Root extends string,
 	Virtual extends string
 >({ modulesGlob, metadataGlob, root, virtual }: RegistryOptions<MetaType, Modules, Root, Virtual>): {
@@ -153,15 +140,15 @@ declare function generateRegistry<
 * - metadata
 */
 declare abstract class AbstractRegistry<
-	Keys extends string,
-	Components extends Record<Keys, React.LazyExoticComponent<React.ComponentType>>,
-	Exports extends Record<Keys, unknown>,
-	Metadata extends Record<Keys, unknown>
+	Key extends string,
+	Components extends Record<Key, React.LazyExoticComponent<React.ComponentType>>,
+	Exports extends Record<Key, unknown>,
+	Metadata extends Record<Key, unknown>
 > {
 	/**
 	* List of registry keys
 	*/
-	abstract readonly keys: readonly Keys[];
+	abstract readonly keys: readonly Key[];
 	/**
 	* Lazy component registry
 	*/
@@ -174,18 +161,19 @@ declare abstract class AbstractRegistry<
 	* Metadata registry
 	*/
 	abstract readonly metadata: Metadata;
+	private get;
 	/**
 	* Retrieve a React component by route key
 	*/
-	getComponent<Key extends Keys>(key: Key): Components[Key];
+	getComponent(key: string): Components[keyof Components];
 	/**
 	* Retrieve raw module exports for a route
 	*/
-	getExport<Key extends Keys>(key: Key): Exports[Key];
+	getExport(key: string): Exports[keyof Exports];
 	/**
 	* Retrieve metadata for a route
 	*/
-	getMetadata<Key extends Keys>(key: Key): Metadata[Key];
+	getMetadata(key: string): Metadata[keyof Metadata];
 }
 /**
 * Primary registry implementation.
@@ -195,7 +183,7 @@ declare abstract class AbstractRegistry<
 */
 declare class Registry<
 	MetaType,
-	Modules extends GlobResult<WrappedUnknownPromise>,
+	Modules extends Record<`${Root}/${string}.mdx`, WrappedUnknownPromise>,
 	Root extends string,
 	Virtual extends string
 > extends AbstractRegistry<RouteKey<Modules, Root, Virtual>, Record<RouteKey<Modules, Root, Virtual>, React.LazyExoticComponent<React.ComponentType>>, Record<RouteKey<Modules, Root, Virtual>, unknown>, Record<RouteKey<Modules, Root, Virtual>, MetaType>> {
@@ -232,7 +220,7 @@ declare class CoalescedRegistry<Registries extends AbstractRegistry<any, any, an
 */
 declare const StyleClassesList: readonly ["header", "header_button", "header_1", "header_2", "header_3", "header_4", "header_5", "header_6", "header_icon", "anchor", "button", "bold", "italic", "span", "striked", "paragraph", "code", "preformatted", "blockquote", "horizontal_line", "image", "list", "unordered_list", "ordered_list", "list_item", "table", "table_head", "table_head_cell", "table_body", "table_row", "table_data", "table_container", "table_action_buttons_details", "table_action_buttons_summary", "table_action_button", "table_action_button_html", "table_action_button_csv", "table_action_button_json", "table_action_button_markdown"];
 type StyleClasses = (typeof StyleClassesList)[number];
-type StyleClassesMap = { [K in StyleClasses] : string };
+type StyleClassesMap = Partial<{ [K in StyleClasses] : string }>;
 /**
 * Context which defines styles for the loaded component(s)
 */
@@ -244,7 +232,7 @@ declare const StyleContext: React.Context<StyleClassesMap | null>;
 declare function useStyles(): StyleClassesMap;
 type MDXFromComponentProps = {
 	source: React.ComponentType<MDXProps>;
-	styles: StyleClassesMap;
+	styles: Partial<StyleClassesMap>;
 	elements?: MDXComponents2;
 	fallback?: React.ReactNode;
 };

package/dist/index.js

@@ -512,17 +512,20 @@ function generateRegistry({
   virtual
 }) {
   const paths = Object.keys(modulesGlob);
-  const keys = new Array(paths.length);
+  const keys = [];
   const _components = [];
   const _exports = [];
   const _metadata = [];
-  for (const [idx, path] of paths.entries()) {
+  console.log(metadataGlob);
+  for (const path of paths) {
     const route = path.replace(root, virtual).replace(".mdx", "");
     const loader = modulesGlob[path];
-    keys[idx] = route;
+    keys.push(route);
     _components.push([route, lazy(loader)]);
     _exports.push([route, loader()]);
-    _metadata.push([route, metadataGlob[path]]);
+    const metaLoader = metadataGlob[path.replace(".mdx", ".meta.ts")];
+    console.log(typeof metaLoader);
+    _metadata.push([route, metaLoader]);
   }
   return {
     keys,
@@ -533,14 +536,21 @@ function generateRegistry({
 }
 
 class AbstractRegistry {
+  get(_from, key) {
+    const value = _from[key];
+    if (!value) {
+      throw new Error(`Invalid key passed ${key.toString()} to access whatever the fuck we were extractign`);
+    }
+    return value;
+  }
   getComponent(key) {
-    return this.components[key];
+    return this.get(this.components, key);
   }
   getExport(key) {
-    return this.exports[key];
+    return this.get(this.exports, key);
   }
   getMetadata(key) {
-    return this.metadata[key];
+    return this.get(this.metadata, key);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@d1vij/jassm",
-    "version": "0.1.18-beta.1",
+    "version": "0.1.18",
     "description": "Just another static site maker. Create simple content driven sites using MDX and React along with Typescript safety.",
     "homepage": "https://github.com/d1vij/jassm",
     "license": "MIT",
@@ -33,7 +33,7 @@
     "scripts": {
         "build": "bunup",
         "dev:ui": "cd test/ui && vite",
-        "dev": "bunup --watch",
+        "dev": "vite",
         "prepare": "bun simple-git-hooks",
         "type-check": "tsc --noEmit",
         "prepack": "bun run build",
@@ -41,9 +41,7 @@
         "lint": "biome check --fix --unsafe && tsc -b",
         "format": "biome format --write"
     },
-    "dependencies": {
-        "@d1vij/shit-i-always-use": "^0.1.3"
-    },
+    "dependencies": {},
     "devDependencies": {
         "@biomejs/biome": "^2.4.6",
         "@types/bun": "^1.3.9",
@@ -60,12 +58,11 @@
         "react": "^19.2.4",
         "react-dom": "^19.2.4",
         "remark-gfm": "^4.0.1",
-        "typescript": ">=4.5.0",
-        "vite": "^7.3.1"
+        "@d1vij/shit-i-always-use": "^0.1.9"
     },
     "peerDependenciesMeta": {
         "typescript": {
-            "optional": true
+            "optional": false
         }
     },
     "simple-git-hooks": {