md-hopper 1.0.7 → 1.1.1

package/dist/lib/_internal/types/md.d.ts

@@ -39,6 +39,7 @@ export interface EndLinksProperties {
 export declare const LINK_NAME_PREFIX = "md_hopper:";
 export declare const BEGIN_COMMENT = "<!--";
 export declare const END_COMMENT = "-->";
+export declare const END_COMMENT_PATTERN = "--!?>";
 export declare const PARAM_SEPARATOR = ":";
 export declare const MD_HOPPER_COMMENT_PREFIX = "MD_HOPPER";
 export declare const COMMENT_REG_EXP: RegExp;

package/dist/lib/_internal/types/md.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md.d.ts","sourceRoot":"","sources":["../../../../src/lib/_internal/types/md.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU;;;;;;;;CAQtB,CAAA;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC5C,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,MAAM,WAAW,MAAO,SAAQ,QAAQ,EAAE,iBAAiB;CAAG;AAE9D,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,IAAI,CAAA;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,OAAO,CAAA;IACd,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,eAAO,MAAM,gBAAgB,eAAe,CAAA;AAC5C,eAAO,MAAM,aAAa,SAAS,CAAA;AACnC,eAAO,MAAM,WAAW,QAAQ,CAAA;AAChC,eAAO,MAAM,eAAe,MAAM,CAAA;AAClC,eAAO,MAAM,wBAAwB,cAAc,CAAA;AACnD,eAAO,MAAM,eAAe,QAA4D,CAAA;AACxF,eAAO,MAAM,kBAAkB,QAA2B,CAAA;AAC1D,eAAO,MAAM,YAAY,QAAsD,CAAA;AAC/E,eAAO,MAAM,gCAAgC,QAE5C,CAAA;AACD,eAAO,MAAM,wBAAwB,QAGpC,CAAA;AACD,eAAO,MAAM,yBAAyB,QAGrC,CAAA;AACD,eAAO,MAAM,0BAA0B,QAAoE,CAAA;AAC3G,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,WAItC,CAAA"}
+{"version":3,"file":"md.d.ts","sourceRoot":"","sources":["../../../../src/lib/_internal/types/md.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU;;;;;;;;CAQtB,CAAA;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC5C,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,MAAM,WAAW,MAAO,SAAQ,QAAQ,EAAE,iBAAiB;CAAG;AAE9D,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,IAAI,CAAA;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,OAAO,CAAA;IACd,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,eAAO,MAAM,gBAAgB,eAAe,CAAA;AAC5C,eAAO,MAAM,aAAa,SAAS,CAAA;AACnC,eAAO,MAAM,WAAW,QAAQ,CAAA;AAEhC,eAAO,MAAM,mBAAmB,UAAU,CAAA;AAC1C,eAAO,MAAM,eAAe,MAAM,CAAA;AAClC,eAAO,MAAM,wBAAwB,cAAc,CAAA;AACnD,eAAO,MAAM,eAAe,QAAgE,CAAA;AAC5F,eAAO,MAAM,kBAAkB,QAA2B,CAAA;AAC1D,eAAO,MAAM,YAAY,QAAsD,CAAA;AAC/E,eAAO,MAAM,gCAAgC,QAE5C,CAAA;AACD,eAAO,MAAM,wBAAwB,QAGpC,CAAA;AACD,eAAO,MAAM,yBAAyB,QAGrC,CAAA;AACD,eAAO,MAAM,0BAA0B,QAAoE,CAAA;AAC3G,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,WAItC,CAAA"}

package/dist/lib/_internal/types/md.js

@@ -10,13 +10,15 @@ export const PROPERTIES = {
 export const LINK_NAME_PREFIX = 'md_hopper:';
 export const BEGIN_COMMENT = '<!--';
 export const END_COMMENT = '-->';
+// 正規表現に埋め込む終端パターン。HTML のコメントは `--!>` でも閉じるため、それも終端として扱う
+export const END_COMMENT_PATTERN = '--!?>';
 export const PARAM_SEPARATOR = ':';
 export const MD_HOPPER_COMMENT_PREFIX = 'MD_HOPPER';
-export const COMMENT_REG_EXP = new RegExp(`${BEGIN_COMMENT}\\s*.*?${END_COMMENT}`, 'gs');
+export const COMMENT_REG_EXP = new RegExp(`${BEGIN_COMMENT}.*?${END_COMMENT_PATTERN}`, 'gs');
 export const BRAKE_LINE_REG_EXP = new RegExp(/\r?\n/, 'g');
 export const LINK_REG_EXP = new RegExp('^(\\s*.*)\\[(.+)][(|\\[](.+)[)|\\]].*');
 export const MD_HOPPER_COMMENT_PREFIX_REG_EXP = new RegExp(`${BEGIN_COMMENT}\\s*${MD_HOPPER_COMMENT_PREFIX}${PARAM_SEPARATOR}\\s*`);
-export const MD_HOPPER_PARAMS_REG_EXP = new RegExp(`^[^${PARAM_SEPARATOR}]+${PARAM_SEPARATOR}(.*?)${END_COMMENT}.*`, 's');
-export const MD_HOPPER_CONTENT_REG_EXP = new RegExp(`^[^${PARAM_SEPARATOR}]+${PARAM_SEPARATOR}.*${END_COMMENT}(.*)`, 's');
+export const MD_HOPPER_PARAMS_REG_EXP = new RegExp(`^[^${PARAM_SEPARATOR}]+${PARAM_SEPARATOR}(.*?)${END_COMMENT_PATTERN}.*`, 's');
+export const MD_HOPPER_CONTENT_REG_EXP = new RegExp(`^[^${PARAM_SEPARATOR}]+${PARAM_SEPARATOR}.*?${END_COMMENT_PATTERN}(.*)`, 's');
 export const MD_HOPPER_PROPERTY_REG_EXP = new RegExp(`^([^${PARAM_SEPARATOR}]+?)${PARAM_SEPARATOR}.*`, 's');
-export const getParamExp = (param) => new RegExp(`${BEGIN_COMMENT}\\s*${MD_HOPPER_COMMENT_PREFIX}\\s*${PARAM_SEPARATOR}\\s*${param}\\s*${PARAM_SEPARATOR}.*?${END_COMMENT}\\n*`, 'gs');
+export const getParamExp = (param) => new RegExp(`${BEGIN_COMMENT}\\s*${MD_HOPPER_COMMENT_PREFIX}\\s*${PARAM_SEPARATOR}\\s*${param}\\s*${PARAM_SEPARATOR}.*?${END_COMMENT_PATTERN}\\n*`, 'gs');

package/dist/lib/_internal/utils/md/line.js

@@ -21,8 +21,8 @@ export const getElements = (txt) => {
 };
 export const getProperties = (txt) => {
     const { indent, token } = getElements(txt);
-    let symbol = '';
-    let text = '';
+    let symbol;
+    let text;
     switch (token.type) {
         case TOKEN_TYPES.list: {
             const symbolAndText = getSymbolAndText(token.items[0]);

package/dist/lib/_internal/utils/md.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md.d.ts","sourceRoot":"","sources":["../../../../src/lib/_internal/utils/md.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,MAAM,EAiBP,MAAM,cAAc,CAAA;AAMrB,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,WAOhD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,OAAO,MAAM,WACyD,CAAA;AACrH,eAAO,MAAM,YAAY,GAAI,WAAW,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,WAKhF,CAAA;AACD,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAA;AAC9D,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,aAAa,GAAG,aAAa,EAAE,WAAW,CAAC,WACsB,CAAA;AAC5G,eAAO,MAAM,WAAW,GAAI,IAAI,MAAM,EAAE,OAAO,MAAM,WAEpD,CAAA;AASD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WASnC,CAAA;AAgMD,eAAO,MAAM,OAAO,GAAI,QAAQ,MAAM,EAAE,SAAS,MAAM,EAAE,WAmDxD,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,IAAI,MAAM,KAAG,YAW9C,CAAA"}
+{"version":3,"file":"md.d.ts","sourceRoot":"","sources":["../../../../src/lib/_internal/utils/md.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,MAAM,EAkBP,MAAM,cAAc,CAAA;AAMrB,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,WAOhD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,OAAO,MAAM,WACyD,CAAA;AACrH,eAAO,MAAM,YAAY,GAAI,WAAW,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,WAKhF,CAAA;AACD,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAA;AAC9D,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,aAAa,GAAG,aAAa,EAAE,WAAW,CAAC,WACsB,CAAA;AAC5G,eAAO,MAAM,WAAW,GAAI,IAAI,MAAM,EAAE,OAAO,MAAM,WAEpD,CAAA;AASD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WASnC,CAAA;AAgMD,eAAO,MAAM,OAAO,GAAI,QAAQ,MAAM,EAAE,SAAS,MAAM,EAAE,WAoDxD,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,IAAI,MAAM,KAAG,YAW9C,CAAA"}

package/dist/lib/_internal/utils/md.js

@@ -1,11 +1,11 @@
 import { readFileSync } from 'fs';
-import { PROPERTIES, LINK_NAME_PREFIX, COMMENT_REG_EXP, PARAM_SEPARATOR, LINK_REG_EXP, MD_HOPPER_COMMENT_PREFIX, MD_HOPPER_COMMENT_PREFIX_REG_EXP, MD_HOPPER_PROPERTY_REG_EXP, MD_HOPPER_PARAMS_REG_EXP, BRAKE_LINE_REG_EXP, MD_HOPPER_CONTENT_REG_EXP, BEGIN_COMMENT, END_COMMENT, getParamExp, } from '../types/md.js';
+import { PROPERTIES, LINK_NAME_PREFIX, COMMENT_REG_EXP, PARAM_SEPARATOR, LINK_REG_EXP, MD_HOPPER_COMMENT_PREFIX, MD_HOPPER_COMMENT_PREFIX_REG_EXP, MD_HOPPER_PROPERTY_REG_EXP, MD_HOPPER_PARAMS_REG_EXP, BRAKE_LINE_REG_EXP, MD_HOPPER_CONTENT_REG_EXP, BEGIN_COMMENT, END_COMMENT, END_COMMENT_PATTERN, getParamExp, } from '../types/md.js';
 import { replaceLineToLink } from './md/line.js';
 import { getRelative } from './path.js';
 import { isBoolean } from './type-check.js';
 export const getParam = (txt, key) => {
     const PREFIX = `${BEGIN_COMMENT}\\s*${MD_HOPPER_COMMENT_PREFIX}:\\s*${key}:`;
-    const reg = new RegExp(`${PREFIX}(.*?)${END_COMMENT}`, 's');
+    const reg = new RegExp(`${PREFIX}(.*?)${END_COMMENT_PATTERN}`, 's');
     if (!reg.test(txt)) {
         return '';
     }
@@ -207,20 +207,21 @@ export const replace = (detail, details) => {
         }
         const property = _section.replace(MD_HOPPER_PROPERTY_REG_EXP, '$1');
         const { params, content: _content } = getSectionParams(_section);
-        let content = _content;
         let section = _section;
         switch (property) {
-            case PROPERTIES.LINK_NEXT_LINE:
-                content = getLinkContent(detail.path, _content, params, details);
+            case PROPERTIES.LINK_NEXT_LINE: {
+                const content = getLinkContent(detail.path, _content, params, details);
                 section = getSectionByContent(property, params, content);
                 break;
-            case PROPERTIES.BEGIN_LINKS:
-                content = getLinksContent(params, linksDetails, lineLinksDetails);
+            }
+            case PROPERTIES.BEGIN_LINKS: {
+                const content = getLinksContent(params, linksDetails, lineLinksDetails);
                 section = getSectionByContent(property, params, content);
                 if (!hasEndLinksSection) {
                     section += `\n${BEGIN_COMMENT} ${MD_HOPPER_COMMENT_PREFIX}${PARAM_SEPARATOR} ${PROPERTIES.END_LINKS}${PARAM_SEPARATOR} ${END_COMMENT}`;
                 }
                 break;
+            }
             case PROPERTIES.BEGIN_DEFINE_LINKS:
                 section = getSectionByContent(property, params, getDefineLinksContent(detail.dir, linksDetails, lineLinksDetails, hasEndDefineLinksSection));
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "md-hopper",
-  "version": "1.0.7",
+  "version": "1.1.1",
   "type": "module",
   "license": "MIT",
   "bin": {
@@ -22,31 +22,25 @@
     "md",
     "links"
   ],
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "@my-packages/source": "./src/index.ts",
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    }
+    "./package.json": "./package.json"
   },
   "files": [
     "dist",
     "!**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@inquirer/prompts": "^8.5.2",
-    "chalk": "^5.6.2",
+    "@inquirer/prompts": "^8.7.5",
+    "chalk": "^6.0.1",
     "commander": "^15.0.0",
     "inquirer-plugins": "^1.0.8",
-    "marked": "^18.0.6",
-    "minimatch": "^10.2.5",
+    "marked": "^18.1.2",
+    "minimatch": "^10.2.6",
     "my-gadgetry": "^1.3.11",
     "tslib": "^2.3.0",
     "uuid": "^14.0.1"
+  },
+  "engines": {
+    "node": "^22.13.0 || >=23.5.0"
   }
 }