imdone-core 1.54.10 → 2.0.1

package/lib/adapters/parsers/content-transformer.js

@@ -1,35 +1,30 @@
-const template = require('lodash.template')
-const uniqid = require('uniqid');
-
-module.exports = {
-  format,
-  encodeMarkdownLinks
-}
+import { Eta } from "eta"
+import uniqid from 'uniqid';
 
 function removeDisplayComments(description) {
-  return description.replace(/<!--\s*\[([\s\S]*?)\]\s*-->/g, '$1')
+  return description.replace(/<!--\s*\[([\s\S]*?)\]\s*-->/g, '$1');
 }
 
 function escapeCodeBlocks(content) {
-  const codeBlockRegex = /(```[\s\S]*?```|`[^`]*`)/g
-  let codeBlocks = []
-  
+  const codeBlockRegex = /(```[\s\S]*?```|`[^`]*`)/g;
+  let codeBlocks = [];
+
   // Replace code blocks with unique keys
   content = content.replace(codeBlockRegex, (match) => {
-    const key = `__CODE_BLOCK_${codeBlocks.length}__`
-    codeBlocks.push(match) // Maintain order
-    return key
-  })
+    const key = `__CODE_BLOCK_${codeBlocks.length}__`;
+    codeBlocks.push(match); // Maintain order
+    return key;
+  });
 
-  return { content, codeBlocks }
+  return { content, codeBlocks };
 }
 
 function restoreCodeBlocks(content, codeBlocks) {
   // Restore code blocks in order using stored array
   codeBlocks.forEach((code, index) => {
-    content = content.replace(`__CODE_BLOCK_${index}__`, code)
-  })
-  return content
+    content = content.replace(`__CODE_BLOCK_${index}__`, code);
+  });
+  return content;
 }
 
 /**
@@ -39,39 +34,50 @@ function restoreCodeBlocks(content, codeBlocks) {
  * @param {object} opts - The options for interpolation.
  * @returns {object} - The interpolated content, whether there was interpolation, and error tokens.
  */
-function interpolate(content, data, opts) {
+export function interpolate(content, data, opts = { tags: ['${', '}'] }) {
   const errorTokens = {};
+  const { tags } = opts;
+  // /(?<![`\\])\${([\s\S]+?)}/g
+  const regex = new RegExp(`(?<![\`\\\\])\\${tags[0]}([\\s\\S]+?)${tags[1]}`, 'g');
   let hasInterpolation = false;
 
-  content = content.replace(opts.interpolate, (match, p1) => {
+  content = content.replace(regex, (match, p1) => {
     try {
-      const result = template(match, opts)(data);
+      const eta = new Eta({ tags, useWith: true, autoEscape: false });
+      const [startTag, endTag] = opts.tags;
+      const template = `${startTag}= ${p1} ${endTag}`;
+      const result = eta.renderString(template, data);
       if (result !== match) {
         hasInterpolation = true;
       }
-      return result;
+      return result || '';
     } catch (e) {
       const token = `__ERROR_TOKEN_${uniqid()}__`;
       errorTokens[token] = match;
-      return token;
+      return token || '';
     }
   });
 
   return { content, hasInterpolation, errorTokens };
 }
 
-function encodeMarkdownLinks(content) {
+export function encodeMarkdownLinks(content) {
   return content.replace(/(?<!!)\[(.*?)\]\((.*?)( ".*?")?\)/g, (match, p1, p2, p3) => {
     // URI encode file links
     const title = p3 || '';
     const encodedUrl = p2.replace(/\s/g, '%20').replace(/\)/g, '%29').replace(/\(/g, '%28');
     const link = `[${p1}](${encodedUrl}${title})`;
+
+    // If there is more than one space in the URL, assume there's no title
+    if ((p2.match(/\s/g) || []).length > 1) {
+      return `[${p1}](${encodedUrl})`;
+    }
+
     return link.replace(/%20(".*?"\))$/, ' $1');
   });
 }
 
-function format(content, data, mustache) {
-  const opts = { interpolate: /(?<![`\\])\${([\s\S]+?)}/g };
+export function format(content, data, mustache) {
   const errorTokens = {};
 
   if (mustache) content = removeDisplayComments(content);
@@ -83,17 +89,16 @@ function format(content, data, mustache) {
   let hasInterpolation = true;
 
   while (hasInterpolation) {
-    const interpolationResult = interpolate(result, data, opts);
+    const interpolationResult = interpolate(result, data, { tags: ['${', '}'] });
     result = interpolationResult.content;
     hasInterpolation = interpolationResult.hasInterpolation;
     Object.assign(errorTokens, interpolationResult.errorTokens);
   }
 
   if (mustache) {
-    const mustacheOpts = { interpolate: /(?<!`){{([\s\S]+?)}}/g };
     hasInterpolation = true;
     while (hasInterpolation) {
-      const interpolationResult = interpolate(result, data, mustacheOpts);
+      const interpolationResult = interpolate(result, data, { tags: ['{{', '}}'] });
       result = interpolationResult.content;
       hasInterpolation = interpolationResult.hasInterpolation;
       Object.assign(errorTokens, interpolationResult.errorTokens);

package/lib/adapters/parsers/file/LocalFileParserFactory.js

@@ -1,23 +1,22 @@
-const { createReadStream } = require('fs')
-const ReadStreamMarkdownParser = require('./ReadStreamMarkdownParser')
-const path = require('path')
-const languages = require('../../../languages')
-const ReadStreamCodeParser = require('./ReadStreamCodeParser')
+import { createReadStream } from 'node:fs'
+import { ReadStreamMarkdownParser } from './ReadStreamMarkdownParser.js'
+import path from 'node:path'
+import { languages } from '../../../languages.js'
+import { ReadStreamCodeParser } from './ReadStreamCodeParser.js'
 
 
-function getLang(config, filePath) {
+export function getLang(config, filePath) {
   const languages = getLanguages(config)
   var lang = languages[path.extname(filePath)]
   return lang || { name: 'text', symbol: '' }
 }
 
-function getLanguages(config) {
+export function getLanguages(config) {
   const configLanguages = config.languages || {}
   return { ...languages, ...configLanguages }
 }
 
-module.exports.getLang = getLang
-module.exports.getFileParser = async function getFileParser (filePath, config, readStream) {
+export async function getFileParser (filePath, config, readStream) {
   if (!readStream) {
     readStream = createReadStream(filePath)
   }

package/lib/adapters/parsers/file/ReadStreamCodeParser.js

@@ -1,10 +1,10 @@
-const path = require('path')
-const ReadStreamTaskParser = require('./ReadStreamTaskParser')
-const CodeStyleTaskParser = require('../task/CodeStyleTaskParser')
-const languages = require('../../../languages')
-const extractComments = require('multilang-extract-comments')
-const eol = require('eol')
-const { Readable } = require('stream')
+import path from 'node:path'
+import { ReadStreamTaskParser } from './ReadStreamTaskParser.js'
+import { CodeStyleTaskParser } from '../task/CodeStyleTaskParser.js'
+import { languages } from '../../../languages.js'
+import extractComments from 'multilang-extract-comments'
+import eol from 'eol'
+import { Readable } from 'node:stream'
 
 // TODO Move to readstream parsing for code to improve performance
 // <!--
@@ -12,7 +12,7 @@ const { Readable } = require('stream')
 // #imdone-1.55.0
 // order:-205
 // -->
-module.exports = class ReadStreamCodeParser extends ReadStreamTaskParser {
+export class ReadStreamCodeParser extends ReadStreamTaskParser {
   constructor(readStream, filePath, lang, lists) {
     super(readStream)
     this.lists = lists

package/lib/adapters/parsers/file/ReadStreamMarkdownParser.js

@@ -1,9 +1,9 @@
-const ReadStreamTaskParser = require('./ReadStreamTaskParser')
-const HashStyleTaskParser = require('../task/HashStyleTaskParser')
-const MarkdownStyleTaskParser = require('../task/MarkdownStyleTaskParser')
+import { ReadStreamTaskParser } from './ReadStreamTaskParser.js'
+import { HashStyleTaskParser } from '../task/HashStyleTaskParser.js'
+import { MarkdownStyleTaskParser } from '../task/MarkdownStyleTaskParser.js'
 // const CheckStyleTaskParser = require('../task/CheckStyleTaskParser')
 
-module.exports = class ReadStreamMarkdownParser extends ReadStreamTaskParser {
+export class ReadStreamMarkdownParser extends ReadStreamTaskParser {
   constructor(readStream, config) {
     super(readStream, config)
     this.taskParsers = [

package/lib/adapters/parsers/file/ReadStreamTaskParser.js

@@ -1,7 +1,9 @@
-const ReadLine = require('readline')
+import * as ReadLine from 'node:readline/promises';
+import { logger } from '../../logger.js';
+
 const blankLinesToEndTask = 2
 
-module.exports = class ReadStreamTaskParser {
+export class ReadStreamTaskParser {
   constructor(readStream) {
     this.readStream = readStream
     this.task = null
@@ -40,7 +42,7 @@ module.exports = class ReadStreamTaskParser {
         }
       }
     } catch (error) {
-      console.log('Error reading line')
+      logger.log('Error reading line')
       throw error
     }
 

package/lib/adapters/parsers/file/index.js

@@ -0,0 +1,4 @@
+export * from './LocalFileParserFactory.js';
+export * from './ReadStreamCodeParser.js';
+export * from './ReadStreamMarkdownParser.js';
+export * from './ReadStreamTaskParser.js';

package/lib/adapters/parsers/function-parser.js

@@ -1,8 +1,4 @@
-module.exports = {
-  getFunctionSignature
-};
-
-function getFunctionSignature(fn) {
+export function getFunctionSignature(fn) {
   if (typeof fn !== "function") {
     throw new TypeError("Expected a function");
   }

package/lib/adapters/parsers/index.js

@@ -0,0 +1,5 @@
+export * from './DateLanguageParser.js';
+export * from './content-transformer.js';
+export * from './function-parser.js';
+export * as file from './file/index.js';
+export * as task from './task/index.js';

package/lib/adapters/parsers/task/CardContentParser.js

@@ -1,11 +1,11 @@
-const eol = require('eol')
-const XRegExp = require('xregexp')
+import eol from 'eol'
+import XRegExp from 'xregexp'
 
-const FILE_TYPES = {
+export const FILE_TYPES = {
   MARKDOWN: 'markdown',
   CODE: 'code',
 }
-const TASK_TYPES = {
+export const TASK_TYPES = {
   CODE: 'CODE',
   HASHTAG: 'HASHTAG',
   MARKDOWN: 'MARKDOWN',
@@ -15,15 +15,16 @@ const DEFAULT_TOKEN_PREFIX = '#'
 const START_TAG = '<card>'
 const END_TAG = '</card>'
 const CODE_STYLE_PATTERN = '([A-Z]+[A-Z-_]+?)((:)(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$'
-const LIST_NAME_PATTERN = '[\\p{L}0-9-_]{2,}' // [a-zA-Z-_]+?
-const LINK_STYLE_REGEX = new XRegExp(
+
+export const LIST_NAME_PATTERN = '[\\p{L}0-9-_]{2,}' // [a-zA-Z-_]+?
+export const LINK_STYLE_REGEX = new XRegExp(
   `(\\[.*\\]\\s?)?(\\[(.+)\\]\\(#(${LIST_NAME_PATTERN})(:)(-?[\\d.]+(?:e-?\\d+)?)?\\))`,
   'gm'
 )
 
-const CHECK_REGEX = /^(\s*- )\[([x ])\]/
+export const CHECK_REGEX = /^(\s*- )\[([x ])\]/
 
-function getHashStyleRegex(tokenPrefix = DEFAULT_TOKEN_PREFIX, orderMeta = false) {
+export function getHashStyleRegex(tokenPrefix = DEFAULT_TOKEN_PREFIX, orderMeta = false) {
   return orderMeta ?
     new XRegExp(
       `${tokenPrefix}(${LIST_NAME_PATTERN})[ \\t]+(.+)$`, 'gm'
@@ -34,7 +35,7 @@ function getHashStyleRegex(tokenPrefix = DEFAULT_TOKEN_PREFIX, orderMeta = false
     )
 }
 
-function getCheckedData(content) {
+export function getCheckedData(content) {
   const taskRegex = new RegExp(CHECK_REGEX)
   const result = taskRegex.exec(content)
   return result
@@ -73,7 +74,7 @@ function isCheckBoxTask (config, line, beforeText) {
   return lineCheckData.pad <= beforeTextCheckData.pad
 }
 
-function hasTaskInText(config, text, isCodeFile) {
+export function hasTaskInText(config, text, isCodeFile) {
   const hashStyleRegex = new XRegExp(getHashStyleRegex(config.tokenPrefix));
   const linkStyleRegex = new XRegExp(LINK_STYLE_REGEX);
 
@@ -97,18 +98,18 @@ function hasTaskInText(config, text, isCodeFile) {
   // Check for hash style tasks
   let result;
   if ((result = hashStyleRegex.exec(text)) !== null && !isWithinInlineCode(result.index)) {
-    return config.lists.find((list) => text.includes(`${config.tokenPrefix}${list.name}`));
+    return !!config.lists.find((list) => text.includes(`${config.tokenPrefix}${list.name}`));
   }
 
   // Check for link style tasks
   if ((result = linkStyleRegex.exec(text)) !== null && !isWithinInlineCode(result.index)) {
-    return config.lists.find((list) => text.includes(`${config.tokenPrefix}${list.name}`));
+    return !!config.lists.find((list) => text.includes(`${config.tokenPrefix}${list.name}`));
   }
 
   return false;
 }
 
-function isBeforeTextMarkdownList(beforeText) {
+export function isBeforeTextMarkdownList(beforeText) {
   return /^\s*(\*|-|- \[[x| ]\]|\d+\.|[a-zA-Z]\.)\s$/.test(beforeText)
 }
 
@@ -116,7 +117,7 @@ function isMarkdownListItem(line) {
   return /^\s*(\*|-|- \[[x| ]\]|\d+\.|[a-zA-Z]\.)\s/.test(line)
 }
 
-function padDescription(description = [], beforeText = '') {
+export function padDescription(description = [], beforeText = '') {
   if (!isBeforeTextMarkdownList(beforeText)) return description
   return description.map((line) => {
     return line.padStart(line.length + beforeText.length)
@@ -320,7 +321,7 @@ function getTextFileTaskContent ({
   }
 }
 
-function getTaskContent ({
+export function getTaskContent ({
   config,
   content,
   inBlockComment,
@@ -333,7 +334,7 @@ function getTaskContent ({
     getTextFileTaskContent({ config, content, beforeText, fileType })
 }
 
-function getRawTask ({
+export function getRawTask ({
   tokenPrefix = DEFAULT_TOKEN_PREFIX,
   orderMeta = true,
   beforeText = '',
@@ -355,22 +356,12 @@ function getRawTask ({
   } 
 }
 
-function isNumber (value) {
-  return !isNaN(parseFloat(value)) && isFinite(value)
+export function isNumber(value) {
+  return !isNaN(value) && isFinite(Number(value));
 }
 
-module.exports = {
-  FILE_TYPES,
-  TASK_TYPES,
-  getTaskContent,
-  getRawTask,
-  isBeforeTextMarkdownList,
-  padDescription,
-  getCheckedData,
-  hasTaskInText,
-  isNumber,
-  getHashStyleRegex,
-  CHECK_REGEX,
-  LIST_NAME_PATTERN,
-  LINK_STYLE_REGEX
+export function toNumber(value) {
+  if (value == null || value == undefined) return undefined; // Convert null or undefined to undefined
+  const num = Number(value);
+  return isNaN(num) ? undefined : num; // Return 0 if conversion fails, otherwise return the number
 }

package/lib/adapters/parsers/task/CheckStyleTaskParser.js

@@ -1,6 +1,6 @@
-const TaskParser = require('./TaskParser')
+import { TaskParser } from "./TaskParser.js"
 
-module.exports = class CheckStyleTaskParser extends TaskParser {
+export class CheckStyleTaskParser extends TaskParser {
   constructor() {
     super()
   }

package/lib/adapters/parsers/task/CodeStyleTaskParser.js

@@ -1,6 +1,6 @@
-const TaskParser = require('./TaskParser')
+import { TaskParser } from './TaskParser.js'
 
-module.exports = class CodeStyleTaskParser extends TaskParser {
+export class CodeStyleTaskParser extends TaskParser {
   constructor(config) {
     super('CODE', config)
   }

package/lib/adapters/parsers/task/HashStyleTaskParser.js

@@ -1,7 +1,7 @@
-const TaskParser = require('./TaskParser')
-const { getHashStyleRegex } = require('./CardContentParser')
+import { TaskParser } from './TaskParser.js'
+import { getHashStyleRegex } from './CardContentParser.js'
 
-module.exports = class HashStyleTaskParser extends TaskParser {
+export class HashStyleTaskParser extends TaskParser {
   constructor(config) {
     super('HASHTAG', config)
   }

package/lib/adapters/parsers/task/MarkdownStyleTaskParser.js

@@ -1,6 +1,6 @@
-const TaskParser = require('./TaskParser')
+import { TaskParser } from './TaskParser.js'
 
-module.exports = class MarkdownStyleTaskParser extends TaskParser {
+export class MarkdownStyleTaskParser extends TaskParser {
   constructor(config) {
     super('MARKDOWN', config)
   }

package/lib/adapters/parsers/task/TaskParser.js

@@ -14,7 +14,7 @@ class Task {
   }
 }
 
-module.exports = class TaskParser {
+export class TaskParser {
   constructor(type, config) {
     this.config = config
     this.type = type

package/lib/adapters/parsers/task/index.js

@@ -0,0 +1,6 @@
+export * from './CardContentParser.js';
+export * from './CheckStyleTaskParser.js';
+export * from './CodeStyleTaskParser.js';
+export * from './HashStyleTaskParser.js';
+export * from './MarkdownStyleTaskParser.js';
+export * from './TaskParser.js';

package/lib/adapters/storage/config.js

@@ -1,33 +1,28 @@
-const { readFile, writeFile, exists } = require('../file-gateway')
-const { CONFIG_DIR, CONFIG_FILE_YML } = require('../../constants')
-const { loadYAML, dumpYAML } = require('../yaml')
-const findUp = require('find-up')
-const _path = require('path')
-const Config = require('../../config')
-
-module.exports = {
-  load,
-  save,
-  loadForFilePath,
-  findImdonePath
-}
-
-async function load(projectPath, configPath = _path.join(projectPath, CONFIG_FILE_YML)) {
+import { readFile, writeFile, exists } from '../file-gateway.js'
+import { constants } from '../../constants.js'
+import { loadYAML, dumpYAML } from '../yaml.js'
+import { findUp } from 'find-up-simple'
+import _path from 'path'
+import { Config } from '../../config.js'
+import { logger } from '../logger.js'
+
+const { CONFIG_DIR, CONFIG_FILE_YML } = constants
+export async function load(projectPath, configPath = _path.join(projectPath, CONFIG_FILE_YML)) {
   const configLike = await loadYamlConfig(configPath)
   return configLike && new Config(configLike)
 }
 
-async function save(config, projectPath) {
+export async function save(config, projectPath) {
   const configPath = _path.join(projectPath, CONFIG_FILE_YML)
   await writeFile(configPath, dumpYAML(config))
 }
 
-async function loadForFilePath(filePath) {
+export async function loadForFilePath(filePath) {
   const projectPath = await findImdonePath(filePath)
   return load(projectPath)
 }
 
-async function loadYamlConfig(filePath) {
+export async function loadYamlConfig(filePath) {
   if (!(await exists(filePath))) return
   const configData = await readFile(filePath, 'utf-8')
   let configLike = {}
@@ -37,12 +32,12 @@ async function loadYamlConfig(filePath) {
     if (configLike.watcher) delete configLike.watcher
 
   } catch (e) {
-    console.error(`Error parsing config file: ${filePath}`)
+    logger.error(`Error parsing config file: ${filePath}`)
   }
   return configLike
 }
 
-async function findImdonePath(cwd) {
+export async function findImdonePath(cwd) {
   const configDir = await findUp(CONFIG_DIR, { cwd, type: 'directory' })
   return _path.dirname(configDir)
 }

package/lib/adapters/storage/index.js

@@ -0,0 +1,2 @@
+export * from './config.js';
+export * from './tags.js';

package/lib/adapters/storage/tags.js

@@ -1,14 +1,13 @@
-const { readFile, writeFile, exists } = require('../file-gateway')
-const { CONFIG_DIR } = require('../../constants')
-const { loadYAML, dumpYAML } = require('../yaml')
-const _path = require('path')
+import { readFile, writeFile, exists } from '../file-gateway.js'
+import { constants } from '../../constants.js'
+const { CONFIG_DIR } = constants
+import { loadYAML, dumpYAML } from '../yaml.js'
+import _path from 'path'
+import { logger } from '../logger.js'
 
-module.exports = {
-  load,
-  save
-}
+export const TAGS_FILE_PATH = _path.join(CONFIG_DIR, 'tags.yml')
 
-async function load(projectPath) {
+export async function load(projectPath) {
   const tagsPath = getTagsPath(projectPath)
   if (!(await exists(tagsPath))) return
   const tagsData = await readFile(tagsPath, 'utf-8')
@@ -16,15 +15,15 @@ async function load(projectPath) {
     const { tags } = loadYAML(tagsData)
     return tags
   } catch (e) {
-    console.error(e)
+    logger.error(e)
     return
   }
 }
 
-async function save(tags, projectPath) {
+export async function save(tags, projectPath) {
   await writeFile(getTagsPath(projectPath), dumpYAML({ tags }))
 }
 
 function getTagsPath(projectPath) {
-  return _path.join(projectPath, CONFIG_DIR, 'tags.yml')
+  return _path.join(projectPath, TAGS_FILE_PATH)
 }

package/lib/adapters/yaml.js

@@ -1,6 +1,9 @@
-const YAML = require('js-yaml')
+import YAML from 'js-yaml'
 
-module.exports = {
-  dumpYAML: YAML.dump,
-  loadYAML: YAML.load,
-}
+export function dumpYAML(obj, opts) {
+  return YAML.dump(obj, opts)
+}
+
+export function loadYAML(str, opts) {
+  return YAML.load(str, opts)
+}