-
-
+
+
+
+ svelte-markdoc-preprocess
+ {@render children?.()} +-
+
- + Get started + +
- + GitHub + +
- {a} + {b} = {Number(a) + Number(b)} + {a} + {b} = {Number(a) + Number(b)}
diff --git a/apps/demo/src/lib/tags/CTA.svelte b/apps/demo/src/lib/tags/CTA.svelte index 674f890..bca2e9b 100644 --- a/apps/demo/src/lib/tags/CTA.svelte +++ b/apps/demo/src/lib/tags/CTA.svelte @@ -1,21 +1,27 @@ + +- {a} * {b} = {a * b} + {a} * {b} = {a * b}
diff --git a/apps/demo/src/lib/tags/Types.svelte b/apps/demo/src/lib/tags/Types.svelte index 63664b3..507fb62 100644 --- a/apps/demo/src/lib/tags/Types.svelte +++ b/apps/demo/src/lib/tags/Types.svelte @@ -1,7 +1,11 @@ Types diff --git a/apps/demo/src/routes/+layout.svelte b/apps/demo/src/routes/+layout.svelte index 912838d..2499a4f 100644 --- a/apps/demo/src/routes/+layout.svelte +++ b/apps/demo/src/routes/+layout.svelte @@ -1,69 +1,73 @@{a} * {b} = {a * b}
diff --git a/apps/demo/src/routes/playground/+layout.svelte b/apps/demo/src/routes/playground/+layout.svelte index 8b2855f..d0c2b9d 100644 --- a/apps/demo/src/routes/playground/+layout.svelte +++ b/apps/demo/src/routes/playground/+layout.svelte @@ -1,9 +1,17 @@ + + -{JSON.stringify(file.frontmatter)}
- {/if} -{JSON.stringify(file.frontmatter)}
+ {/if} +{a} * {b} = {a * b}
diff --git a/apps/documentation/package.json b/apps/documentation/package.json index b774447..950c4d2 100644 --- a/apps/documentation/package.json +++ b/apps/documentation/package.json @@ -8,9 +8,9 @@ "preview": "rspress preview" }, "dependencies": { - "rspress": "^1.28.0" + "rspress": "^1.43.9" }, "devDependencies": { - "@types/node": "^16" + "@types/node": "^22.13.14" } } diff --git a/package.json b/package.json index c823b09..b305d37 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,10 @@ "lint": "pnpm run -r lint", "format": "pnpm run -r format" }, - "devDependencies": { - "@typescript-eslint/parser": "catalog:default", - "svelte": "catalog:default", - "typescript": "catalog:default" - }, - "packageManager": "pnpm@10.6.5+sha512.cdf928fca20832cd59ec53826492b7dc25dc524d4370b6b4adbf65803d32efaa6c1c88147c0ae4e8d579a6c9eec715757b50d4fa35eea179d868eada4ed043af" + "packageManager": "pnpm@10.6.5+sha512.cdf928fca20832cd59ec53826492b7dc25dc524d4370b6b4adbf65803d32efaa6c1c88147c0ae4e8d579a6c9eec715757b50d4fa35eea179d868eada4ed043af", + "pnpm": { + "onlyBuiltDependencies": [ + "esbuild" + ] + } } diff --git a/packages/process/package.json b/packages/process/package.json index dd89157..b5825e6 100644 --- a/packages/process/package.json +++ b/packages/process/package.json @@ -1,8 +1,8 @@ { "name": "svelte-markdoc-preprocess", - "version": "2.2.0", + "version": "3.0.0-rc.3", "description": "A Svelte preprocessor that allows you to use Markdoc.", - "type": "commonjs", + "type": "module", "keywords": [ "svelte", "preprocessor", @@ -18,17 +18,22 @@ "dev": "tsc --watch", "build": "tsc" }, - "source": "src/module.ts", - "main": "dist/module.js", - "types": "dist/module.d.ts", + "exports": { + ".": { + "types": "./dist/module.d.ts", + "import": "./dist/module.js", + "require": "./dist/module.js" + } + }, "author": "Torsten Dittmann", "license": "MIT", "dependencies": { "@markdoc/markdoc": "^0.5.1", + "estree-walker": "^3.0.3", "html-escaper": "^3.0.3", "js-yaml": "^4.1.0", - "lovely-logs": "^1.2.2", - "svelte": "^4.2.19", + "lovely-logs": "^2.6.0", + "svelte": "^5.25.5", "typescript": "^5.8.2" }, "repository": { @@ -39,7 +44,7 @@ "devDependencies": { "@types/html-escaper": "^3.0.4", "@types/js-yaml": "^4.0.9", - "@types/node": "^20.17.24", + "@types/node": "^22.13.14", "fast-glob": "^3.3.3", "prettier": "^3.5.3", "publint": "^0.3.9" diff --git a/packages/process/src/log.ts b/packages/process/src/log.ts index 96d1b51..6c55c76 100644 --- a/packages/process/src/log.ts +++ b/packages/process/src/log.ts @@ -1,8 +1,7 @@ -import { createLogger, Logger } from 'lovely-logs'; +import { createLogger } from 'lovely-logs'; import type { ValidateError } from '@markdoc/markdoc'; -import { th } from './default_schema'; -createLogger({ +const logger = createLogger({ platform: 'console', timestampEnabled: false, }); @@ -21,21 +20,21 @@ export function log_validation_error( switch (error.level) { case 'debug': case 'info': - return Logger.info(prefix, error.message); + return logger.info(prefix, error.message); case 'warning': - return Logger.warn(prefix, error.message); + return logger.warn(prefix, error.message); case 'error': case 'critical': - Logger.error(prefix, error.message); + logger.error(prefix, error.message); } } export function log_error(message: string) { - Logger.error(`${NAMESPACE} ${message}`); + logger.error(`${NAMESPACE} ${message}`); } export function log_warning(message: string) { - Logger.warn(`${NAMESPACE} ${message}`); + logger.warn(`${NAMESPACE} ${message}`); } export function log_info(message: string) { - Logger.info(`${NAMESPACE} ${message}`); + logger.info(`${NAMESPACE} ${message}`); } diff --git a/packages/process/src/module.ts b/packages/process/src/module.ts index 04bade7..33ce16a 100644 --- a/packages/process/src/module.ts +++ b/packages/process/src/module.ts @@ -1 +1 @@ -export { default as markdoc } from './processor'; +export { default as markdoc } from './processor.js'; diff --git a/packages/process/src/processor.ts b/packages/process/src/processor.ts index 86a3755..7681fb6 100644 --- a/packages/process/src/processor.ts +++ b/packages/process/src/processor.ts @@ -1,5 +1,5 @@ -import { Config } from './config'; -import { transformer } from './transformer'; +import { Config } from './config.js'; +import { transformer } from './transformer.js'; import type { PreprocessorGroup } from 'svelte/compiler'; const default_config: Config = { diff --git a/packages/process/src/renderer.ts b/packages/process/src/renderer.ts index 79e4054..dfd8350 100644 --- a/packages/process/src/renderer.ts +++ b/packages/process/src/renderer.ts @@ -1,9 +1,11 @@ -import { RenderableTreeNodes, Tag } from '@markdoc/markdoc'; -import { sanitize_for_svelte } from './transformer'; +import type { RenderableTreeNodes } from '@markdoc/markdoc'; +import { sanitize_for_svelte } from './transformer.js'; import { escape } from 'html-escaper'; -import { IMAGE_PREFIX, IMPORT_PREFIX, NODES_IMPORT } from './constants'; -import { is_relative_path } from './utils'; -import { Config } from './config'; +import { IMAGE_PREFIX, IMPORT_PREFIX, NODES_IMPORT } from './constants.js'; +import { is_relative_path } from './utils.js'; +import { Config } from './config.js'; +import md from '@markdoc/markdoc'; +const { Tag } = md; export async function render_html( node: RenderableTreeNodes, diff --git a/packages/process/src/transformer.ts b/packages/process/src/transformer.ts index 63f973f..d7092d1 100644 --- a/packages/process/src/transformer.ts +++ b/packages/process/src/transformer.ts @@ -1,38 +1,27 @@ -import { +import type { Schema, SchemaAttribute, - parse as markdocParse, - transform, NodeType, - Tag, ConfigType, - validate, - Tokenizer, } from '@markdoc/markdoc'; -import { - ScriptTarget, - SyntaxKind, - VariableDeclaration, - createSourceFile, - getJSDocType, - getNameOfDeclaration, - isVariableStatement, -} from 'typescript'; import { dirname, join } from 'path'; import { load as loadYaml } from 'js-yaml'; -import { parse as svelteParse, walk } from 'svelte/compiler'; -import { render_html } from './renderer'; +import { parse as svelteParse } from 'svelte/compiler'; +import { render_html } from './renderer.js'; import { get_all_files, path_exists, read_file, relative_posix_path, write_to_file, -} from './utils'; -import * as default_schema from './default_schema'; -import type { Config } from './config'; -import { LAYOUT_IMPORT, NODES_IMPORT, TAGS_IMPORT } from './constants'; -import { log_error, log_validation_error } from './log'; +} from './utils.js'; +import * as default_schema from './default_schema.js'; +import type { Config } from './config.js'; +import { LAYOUT_IMPORT, NODES_IMPORT, TAGS_IMPORT } from './constants.js'; +import { log_error, log_validation_error } from './log.js'; +import { walk } from 'estree-walker'; +import md from '@markdoc/markdoc'; +const { parse: markdocParse, transform, Tag, validate, Tokenizer } = md; type Var = { name: string; @@ -238,58 +227,72 @@ export function create_module_context( ); } -const script_tags_regular_expression = new RegExp( - '