@umami/shiso 0.16.0 → 0.17.0

package/dist/index.d.ts

@@ -5,6 +5,7 @@
 
 declare module '@umami/shiso' {
     import '@umami/react-zen/styles.css';
+    import 'highlight.js/styles/github-dark.css';
     import { Blog } from '@umami/shiso/Blog';
     import { Docs } from '@umami/shiso/Docs';
     import { Shiso } from '@umami/shiso/Shiso';

package/dist/index.js

@@ -37,6 +37,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_styles = require("@umami/react-zen/styles.css");
+var import_github_dark = require("highlight.js/styles/github-dark.css");
 
 // css-modules:/Users/mikecao/Development/umami-software/shiso/src/components/Blog.module.css
 var Blog_default = {};

package/dist/index.mjs

@@ -2,6 +2,7 @@
 
 // src/components/index.ts
 import "@umami/react-zen/styles.css";
+import "highlight.js/styles/github-dark.css";
 
 // css-modules:/Users/mikecao/Development/umami-software/shiso/src/components/Blog.module.css
 var Blog_default = {};

package/dist/server.d.ts

@@ -0,0 +1,34 @@
+// Generated by dts-bundle v0.7.3
+// Dependencies for this module:
+//   ../../react
+//   ../../@/lib/types
+
+declare module '@umami/shiso/server' {
+    import { ReactElement } from 'react';
+    import type { ShisoConfig } from '@/lib/types';
+    export const getContent: (name: string | undefined, folder: string) => Promise<any>;
+    export const getContentIds: (folder: string) => Promise<any>;
+    export function next(type: string, config: ShisoConfig): {
+        generateMetadata: ({ params }: {
+            params: Promise<{
+                id: string[];
+            }>;
+        }) => Promise<{
+            title: {
+                absolute: string;
+                default: string;
+            };
+        }>;
+        generateStaticParams: () => Promise<any>;
+        renderPage: (render: ({ type, content, config, }: {
+            type: string;
+            content: any;
+            config: ShisoConfig;
+        }) => ReactElement) => ({ params }: {
+            params: Promise<{
+                id: string[];
+            }>;
+        }) => Promise<ReactElement<unknown, string | import("react").JSXElementConstructor<any>>>;
+    };
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umami/shiso",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "A content layer for Next.js",
   "homepage": "https://umami.is/shiso",
   "repository": {

package/server/{server/index.d.ts → index.d.ts}

@@ -1,8 +1,9 @@
 import { ReactElement } from 'react';
-import type { ShisoConfig } from '@/lib/types';
 export declare const getContent: (name: string | undefined, folder: string) => Promise<any>;
 export declare const getContentIds: (folder: string) => Promise<any>;
-export declare function next(type: string, config: ShisoConfig): {
+export declare function next(type: string, config: {
+    [key: string]: any;
+}): {
     generateMetadata: ({ params }: {
         params: Promise<{
             id: string[];
@@ -17,7 +18,9 @@ export declare function next(type: string, config: ShisoConfig): {
     renderPage: (render: ({ type, content, config, }: {
         type: string;
         content: any;
-        config: ShisoConfig;
+        config: {
+            [key: string]: any;
+        };
     }) => ReactElement) => ({ params }: {
         params: Promise<{
             id: string[];

package/server/index.js

@@ -0,0 +1,183 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import { cache } from 'react';
+import { compile } from '@mdx-js/mdx';
+import remarkGfm from 'remark-gfm';
+import rehypeHighlight from 'rehype-highlight';
+import matter from 'gray-matter';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import recursive from 'recursive-readdir';
+function getId(name, folder) {
+    return name.replace('.mdx', '').replace(folder, '').replace(/\\/g, '/').replace(/^\//, '');
+}
+export var getContent = cache(function () {
+    var args_1 = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args_1[_i] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([], args_1, true), void 0, function (name, folder) {
+        var file, postContent, _a, frontmatter, mdxContent, id, anchors, modifiedContent, code, _b;
+        if (name === void 0) { name = 'index'; }
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    file = path.join(folder, "".concat(name, ".mdx"));
+                    return [4 /*yield*/, fs.readFile(file, 'utf8')];
+                case 1:
+                    postContent = _c.sent();
+                    _a = matter(postContent), frontmatter = _a.data, mdxContent = _a.content;
+                    id = getId(name, folder);
+                    anchors = [];
+                    modifiedContent = mdxContent
+                        .split('\n')
+                        .map(function (line) {
+                        var match = line.match(/^(#+)\s+(.*)/);
+                        if (match) {
+                            var num = match[1], name_1 = match[2];
+                            var id_1 = name_1.toLowerCase().replace(/\s+/g, '-');
+                            var size = num.length;
+                            anchors.push({ name: name_1, id: id_1, size: size });
+                            return "<h".concat(size, " id=\"").concat(id_1, "\">").concat(name_1.replace(/\{|\}/g, ''), "</h").concat(size, ">");
+                        }
+                        return line;
+                    })
+                        .join('\n');
+                    _b = String;
+                    return [4 /*yield*/, compile(modifiedContent, {
+                            outputFormat: 'function-body',
+                            remarkPlugins: [remarkGfm],
+                            rehypePlugins: [rehypeHighlight],
+                        })];
+                case 2:
+                    code = _b.apply(void 0, [_c.sent()]);
+                    return [2 /*return*/, {
+                            id: id,
+                            meta: frontmatter,
+                            content: postContent,
+                            code: code,
+                            anchors: anchors,
+                        }];
+            }
+        });
+    });
+});
+export var getContentIds = cache(function (folder) { return __awaiter(void 0, void 0, void 0, function () {
+    var dir, files;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                dir = path.resolve(folder);
+                return [4 /*yield*/, recursive(dir)];
+            case 1:
+                files = _a.sent();
+                return [2 /*return*/, files.map(function (file) {
+                        return getId(file, dir);
+                    })];
+        }
+    });
+}); });
+export function next(type, config) {
+    var dir = path.join(config.contentDir, type);
+    function generateMetadata(_a) {
+        return __awaiter(this, arguments, void 0, function (_b) {
+            var name, content;
+            var _c, _d, _e;
+            var params = _b.params;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
+                    case 0: return [4 /*yield*/, params];
+                    case 1:
+                        name = (_d = (_c = (_f.sent())) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.join('/');
+                        return [4 /*yield*/, getContent(name, dir)];
+                    case 2:
+                        content = _f.sent();
+                        return [2 /*return*/, {
+                                title: {
+                                    absolute: "".concat((_e = content === null || content === void 0 ? void 0 : content.meta) === null || _e === void 0 ? void 0 : _e.title, " \u2013 Shiso"),
+                                    default: 'Shiso',
+                                },
+                            }];
+                }
+            });
+        });
+    }
+    function generateStaticParams() {
+        return __awaiter(this, void 0, void 0, function () {
+            var ids;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, getContentIds(dir)];
+                    case 1:
+                        ids = _a.sent();
+                        return [2 /*return*/, ids.map(function (id) { return ({
+                                id: id.split('/'),
+                            }); })];
+                }
+            });
+        });
+    }
+    function renderPage(render) {
+        var _this = this;
+        return function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
+            var name, content;
+            var _c, _d;
+            var params = _b.params;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0: return [4 /*yield*/, params];
+                    case 1:
+                        name = (_d = (_c = (_e.sent())) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.join('/');
+                        return [4 /*yield*/, getContent(name, dir)];
+                    case 2:
+                        content = _e.sent();
+                        return [2 /*return*/, render({ type: type, content: content, config: config })];
+                }
+            });
+        }); };
+    }
+    return { generateMetadata: generateMetadata, generateStaticParams: generateStaticParams, renderPage: renderPage };
+}

package/server/lib/types.d.ts

@@ -1,14 +0,0 @@
-export interface ShisoDocsConfig {
-    tabs?: [];
-}
-export interface ShisoBlogConfig {
-}
-export interface ShisoConfig {
-    contentDir: string;
-    docs?: {
-        [key: string]: any;
-    };
-    blog?: {
-        [key: string]: any;
-    };
-}

package/server/lib/types.js

@@ -1 +0,0 @@
-export {};