@brillout/docpress 0.15.10-commit-b6b1605 → 0.15.10-commit-e9efbd3

package/detypePlugin.ts

@@ -2,7 +2,6 @@ export { detypePlugin }
 
 import type { PluginOption } from 'vite'
 import module from 'node:module'
-import { createContentMap, contentMapKeyRE, type ContentMap } from './utils/contentMap.js'
 
 // Cannot use `import { transform } from 'detype'` as it results in errors,
 // and the package has no default export. Using `module.createRequire` instead.
@@ -16,17 +15,9 @@ function detypePlugin(): PluginOption {
       if (!id.endsWith('+Page.mdx')) {
         return
       }
-      const contentMap = createContentMap()
-      const codeNew = await transformCode(code, contentMap)
-      const replaced = replaceContent(codeNew, contentMapKeyRE, (match) => {
-        const content = contentMap.get(match[0])
-        if (!content) {
-          throw new Error('Content not found')
-        }
-        return content
-      })
+      const codeNew = await transformCode(code)
 
-      return replaced
+      return codeNew
     },
   }
 }
@@ -35,16 +26,16 @@ const codeBlockRE = /^([ \t]{0,3}>?[ \t]?)```(tsx?|vue)[^\n]*\n([\s\S]*?)```/gm
 const prettierOptions = {
   semi: false,
   singleQuote: true,
-  printWidth: 120,
+  printWidth: 100,
 }
 
-async function transformCode(code: string, contentMap: ContentMap) {
+async function transformCode(code: string) {
   const matches = Array.from(code.matchAll(codeBlockRE))
   if (matches.length === 0) {
     return code
   }
 
-  let codeNew = `import { CodeSnippets, CodeSnippet } from '@brillout/docpress';\n`
+  let codeNew = `import { CodeSnippets, CodeSnippet } from '@brillout/docpress';\n\n`
   let lastIndex = 0
 
   for (const match of matches) {
@@ -61,8 +52,7 @@ async function transformCode(code: string, contentMap: ContentMap) {
     }
 
     if (tsOpeningCode.includes('ts-only')) {
-      const key = contentMap.add('ts-code-snippet', fullMatch.length, fullMatch)
-      codeNew += `${startsWith}<CodeSnippet language={'ts'} tsOnly={'true'}>\n${key}\n${startsWith}</CodeSnippet>`
+      codeNew += `${startsWith}<CodeSnippet language={'ts'} tsOnly={'true'}>\n${fullMatch}\n${startsWith}</CodeSnippet>`
     } else {
       const jsCode = await transform(tsCode.replaceAll('.ts', '.js'), `tsCode.${lang}`, {
         removeTsComments: true,
@@ -74,10 +64,12 @@ async function transformCode(code: string, contentMap: ContentMap) {
 
       const jsCodeSnippet = `<CodeSnippet language={'js'}>\n${jsOpeningCode}\n${jsCode}${closing}\n</CodeSnippet>`
       const tsCodeSnippet = `<CodeSnippet language={'ts'}>\n${tsOpeningCode}\n${tsCode}${closing}\n</CodeSnippet>`
-      const codeSnippets = putBackStarts(`${tsCodeSnippet}\n${jsCodeSnippet}`, startsWith)
+      const codeSnippets = putBackStarts(
+        `<CodeSnippets>\n${tsCodeSnippet}\n${jsCodeSnippet}\n</CodeSnippets>`,
+        startsWith,
+      )
 
-      const key = contentMap.add(`ts-js-code-snippets`, codeSnippets.length, codeSnippets)
-      codeNew += `${startsWith}<CodeSnippets>\n${key}\n${startsWith}</CodeSnippets>`
+      codeNew += codeSnippets
     }
 
     lastIndex = blockEnd
@@ -103,10 +95,3 @@ function putBackStarts(code: string, startsWith: string) {
     .map((line) => `${startsWith}${line}`)
     .join('\n')
 }
-
-function replaceContent(input: string, re: RegExp, replacer: (match: RegExpMatchArray) => string): string {
-  const replacements = Array.from(input.matchAll(re), replacer)
-  let i = 0
-
-  return input.replace(re, () => replacements[i++])
-}

package/dist/detypePlugin.js

@@ -36,7 +36,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 export { detypePlugin };
 import module from 'node:module';
-import { createContentMap, contentMapKeyRE } from './utils/contentMap.js';
 // Cannot use `import { transform } from 'detype'` as it results in errors,
 // and the package has no default export. Using `module.createRequire` instead.
 var transform = module.createRequire(import.meta.url)('detype').transform;
@@ -46,25 +45,17 @@ function detypePlugin() {
         name: '@brillout/docpress:detypePlugin',
         enforce: 'pre',
         transform: function (code, id) { return __awaiter(_this, void 0, void 0, function () {
-            var contentMap, codeNew, replaced;
+            var codeNew;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!id.endsWith('+Page.mdx')) {
                             return [2 /*return*/];
                         }
-                        contentMap = createContentMap();
-                        return [4 /*yield*/, transformCode(code, contentMap)];
+                        return [4 /*yield*/, transformCode(code)];
                     case 1:
                         codeNew = _a.sent();
-                        replaced = replaceContent(codeNew, contentMapKeyRE, function (match) {
-                            var content = contentMap.get(match[0]);
-                            if (!content) {
-                                throw new Error('Content not found');
-                            }
-                            return content;
-                        });
-                        return [2 /*return*/, replaced];
+                        return [2 /*return*/, codeNew];
                 }
             });
         }); },
@@ -74,11 +65,11 @@ var codeBlockRE = /^([ \t]{0,3}>?[ \t]?)```(tsx?|vue)[^\n]*\n([\s\S]*?)```/gm;
 var prettierOptions = {
     semi: false,
     singleQuote: true,
-    printWidth: 120,
+    printWidth: 100,
 };
-function transformCode(code, contentMap) {
+function transformCode(code) {
     return __awaiter(this, void 0, void 0, function () {
-        var matches, codeNew, lastIndex, _i, matches_1, match, fullMatch, startsWith, lang, tsCode, tsOpeningCode, blockStart, blockEnd, key, jsCode, jsLang, jsOpeningCode, closing, jsCodeSnippet, tsCodeSnippet, codeSnippets, key;
+        var matches, codeNew, lastIndex, _i, matches_1, match, fullMatch, startsWith, lang, tsCode, tsOpeningCode, blockStart, blockEnd, jsCode, jsLang, jsOpeningCode, closing, jsCodeSnippet, tsCodeSnippet, codeSnippets;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -86,7 +77,7 @@ function transformCode(code, contentMap) {
                     if (matches.length === 0) {
                         return [2 /*return*/, code];
                     }
-                    codeNew = "import { CodeSnippets, CodeSnippet } from '@brillout/docpress';\n";
+                    codeNew = "import { CodeSnippets, CodeSnippet } from '@brillout/docpress';\n\n";
                     lastIndex = 0;
                     _i = 0, matches_1 = matches;
                     _a.label = 1;
@@ -102,8 +93,7 @@ function transformCode(code, contentMap) {
                         tsCode = stripStarts(tsCode, startsWith);
                     }
                     if (!tsOpeningCode.includes('ts-only')) return [3 /*break*/, 2];
-                    key = contentMap.add('ts-code-snippet', fullMatch.length, fullMatch);
-                    codeNew += "".concat(startsWith, "<CodeSnippet language={'ts'} tsOnly={'true'}>\n").concat(key, "\n").concat(startsWith, "</CodeSnippet>");
+                    codeNew += "".concat(startsWith, "<CodeSnippet language={'ts'} tsOnly={'true'}>\n").concat(fullMatch, "\n").concat(startsWith, "</CodeSnippet>");
                     return [3 /*break*/, 4];
                 case 2: return [4 /*yield*/, transform(tsCode.replaceAll('.ts', '.js'), "tsCode.".concat(lang), {
                         removeTsComments: true,
@@ -117,9 +107,8 @@ function transformCode(code, contentMap) {
                     closing = "```";
                     jsCodeSnippet = "<CodeSnippet language={'js'}>\n".concat(jsOpeningCode, "\n").concat(jsCode).concat(closing, "\n</CodeSnippet>");
                     tsCodeSnippet = "<CodeSnippet language={'ts'}>\n".concat(tsOpeningCode, "\n").concat(tsCode).concat(closing, "\n</CodeSnippet>");
-                    codeSnippets = putBackStarts("".concat(tsCodeSnippet, "\n").concat(jsCodeSnippet), startsWith);
-                    key = contentMap.add("ts-js-code-snippets", codeSnippets.length, codeSnippets);
-                    codeNew += "".concat(startsWith, "<CodeSnippets>\n").concat(key, "\n").concat(startsWith, "</CodeSnippets>");
+                    codeSnippets = putBackStarts("<CodeSnippets>\n".concat(tsCodeSnippet, "\n").concat(jsCodeSnippet, "\n</CodeSnippets>"), startsWith);
+                    codeNew += codeSnippets;
                     _a.label = 4;
                 case 4:
                     lastIndex = blockEnd;
@@ -149,8 +138,3 @@ function putBackStarts(code, startsWith) {
         .map(function (line) { return "".concat(startsWith).concat(line); })
         .join('\n');
 }
-function replaceContent(input, re, replacer) {
-    var replacements = Array.from(input.matchAll(re), replacer);
-    var i = 0;
-    return input.replace(re, function () { return replacements[i++]; });
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.15.10-commit-b6b1605",
+  "version": "0.15.10-commit-e9efbd3",
   "type": "module",
   "dependencies": {
     "@brillout/picocolors": "^1.0.10",

package/dist/utils/contentMap.d.ts

@@ -1,9 +0,0 @@
-export type ContentMap = {
-    /**
-     * @returns key
-     */
-    add(title: string, sourceLength: number, content: string): string;
-    get(key: string): string | undefined;
-};
-export declare const createContentMap: () => ContentMap;
-export declare const contentMapKeyRE: RegExp;

package/dist/utils/contentMap.js

@@ -1,22 +0,0 @@
-import { createHash } from 'node:crypto';
-export var createContentMap = function () {
-    var map = new Map();
-    return {
-        add: function (title, length, content) {
-            var key = generateKey("".concat(title, "_").concat(length));
-            if (!map.has(key)) {
-                map.set(key, content);
-            }
-            return key;
-        },
-        get: function (key) {
-            var val = map.get(key);
-            return val;
-        },
-    };
-};
-var generateKey = function (value) {
-    var hash = createHash('md5').update(value).digest('hex');
-    return "#_#_".concat(hash, "_#_#");
-};
-export var contentMapKeyRE = /#_#_[0-9a-fA-F]{32}_#_#/g;

package/utils/contentMap.ts

@@ -1,34 +0,0 @@
-import { createHash } from 'node:crypto'
-
-export type ContentMap = {
-  /**
-   * @returns key
-   */
-  add(title: string, sourceLength: number, content: string): string
-  get(key: string): string | undefined
-}
-
-export const createContentMap = (): ContentMap => {
-  const map = new Map<string, string>()
-
-  return {
-    add(title, length, content) {
-      const key = generateKey(`${title}_${length}`)
-      if (!map.has(key)) {
-        map.set(key, content)
-      }
-      return key
-    },
-    get(key) {
-      const val = map.get(key)
-      return val
-    },
-  }
-}
-
-const generateKey = (value: string) => {
-  const hash = createHash('md5').update(value).digest('hex')
-  return `#_#_${hash}_#_#`
-}
-
-export const contentMapKeyRE = /#_#_[0-9a-fA-F]{32}_#_#/g