npm - rn-shiki - Versions diffs - 0.0.16 → 0.0.18 - Mend

	@@ -1 +1 @@
1	- {"version":3,"file":"SyntaxHighlighter.d.ts","sourceRoot":"","sources":["../../../../src/components/syntax/SyntaxHighlighter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACtD,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,aAAa,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,iBAAS,iBAAiB,CAAC,EACzB,IAAI,EACJ,IAAiB,EACjB,QAAuB,EACvB,KAAkB,EAClB,SAAyB,EACzB,QAAQ,GACT,EAAE,sBAAsB,~~qBA4CxB~~;AAED,eAAe,iBAAiB,CAAA"}
1	+ {"version":3,"file":"SyntaxHighlighter.d.ts","sourceRoot":"","sources":["../../../../src/components/syntax/SyntaxHighlighter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACtD,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,aAAa,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,iBAAS,iBAAiB,CAAC,EACzB,IAAI,EACJ,IAAiB,EACjB,QAAuB,EACvB,KAAkB,EAClB,SAAyB,EACzB,QAAQ,GACT,EAAE,sBAAsB,qBA6CxB;AAED,eAAe,iBAAiB,CAAA"}

package/lib/typescript/index.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
 export { SyntaxHighlighter, SyntaxLine } from './components/syntax';
+export * from './types/shiki';
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACnE,cAAc,eAAe,CAAA"}

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "rn-shiki",
   "type": "module",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "Shiki syntax highlighter for React Native.",
   "author": "Ryan Skinner <hello@ryanskinner.com>",
   "license": "MIT",
@@ -13,8 +13,8 @@
     "android",
     "web"
   ],
-  "main": "lib/commonjs/index",
-  "module": "lib/module/index",
+  "main": "lib/commonjs/index.js",
+  "module": "lib/module/index.js",
   "types": "lib/typescript/index.d.ts",
   "react-native": "src/index",
   "source": "src/index",
@@ -38,14 +38,12 @@
     "@antfu/eslint-config": "^3.8.0",
     "@babel/core": "^7.24.0",
     "@babel/preset-env": "^7.26.0",
-    "@babel/preset-typescript": "^7.26.0",
     "@eslint-react/eslint-plugin": "^1.15.0",
     "@types/react": "^18.2.0",
     "@types/react-native": "^0.73.0",
     "eslint": "^9.13.0",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.13",
-    "metro-react-native-babel-preset": "^0.77.0",
     "react": "^18.2.0",
     "react-native": "^0.73.0",
     "react-native-builder-bob": "^0.30.2",

package/scripts/build.js CHANGED Viewed

@@ -10,43 +10,32 @@ function createDeclarationFile(outputPath, name) {
   // Handle core types differently
   if (outputPath.includes('/core/')) {
     const dtsPath = outputPath.replace('.js', '.d.ts')
-    const modulePath = outputPath.split('src/')[1].replace('.js', '')
     if (outputPath.includes('core.js')) {
-      fs.writeFileSync(
-        dtsPath,
-        `\
+      fs.writeFileSync(dtsPath, `\
 import type { LanguageInput, ThemeInput } from 'shiki'
-declare module '${modulePath}' {
-  export interface HighlighterCoreOptions {
-    engine: any
-    langs: LanguageInput[]
-    themes: ThemeInput[]
-  }
-  export function createHighlighterCore(options: HighlighterCoreOptions): Promise<{
-    codeToTokens: (code: string, options: { lang: string; theme: string }) => any
-  }>
+export interface HighlighterCoreOptions {
+  engine: any
+  langs: LanguageInput[]
+  themes: ThemeInput[]
 }
-`,
-      )
+export function createHighlighterCore(options: HighlighterCoreOptions): Promise<{
+  codeToTokens: (code: string, options: { lang: string; theme: string }) => any
+}>
+`)
       return
     }
     if (outputPath.includes('engine-javascript.js')) {
-      fs.writeFileSync(
-        dtsPath,
-        `\
-declare module '${modulePath}' {
-  export function createJavaScriptRegexEngine(): {
-    grammar: any
-    getRuleStack: (line: string) => any
-    tokenizeLine: (line: string, stack: any) => any
-  }
+      fs.writeFileSync(dtsPath, `\
+export function createJavaScriptRegexEngine(): {
+  grammar: any
+  getRuleStack: (line: string) => any
+  tokenizeLine: (line: string, stack: any) => any
 }
-`,
-      )
+`)
       return
     }
   }
@@ -60,23 +49,19 @@ declare module '${modulePath}' {
   const jsPath = outputPath.replace(/\\/g, '/')
   const dtsPath = jsPath.replace('.js', '.d.ts')
-  // Get the path starting from 'vendor/shiki'
-  const modulePath = jsPath.split('src/')[1].replace('.js', '')
+  // Replace hyphens in name to create a valid TypeScript identifier
+  const safeName = name.replace(/-/g, '_')
-  // Determine correct type annotation
-  const typeAnnotation = outputPath.includes('/themes/') ? 'ThemeInput' : 'LanguageInput'
-  // List of reserved words
+  // If it's a reserved word, prefix with underscore
   const reservedWords = ['for', 'switch', 'case', 'break', 'default', 'else', 'var', 'const', 'let', 'function', 'class']
+  const finalName = reservedWords.includes(safeName) ? `_${safeName}` : safeName
-  // Always prefix with underscore if it's a reserved word
-  const varName = reservedWords.includes(name) ? `_${name}` : name.replace(/-/g, '_')
+  // Create direct export declaration
   const dtsContent = `\
-declare module '${modulePath}' {
-  const ${varName}: import('shiki').${typeAnnotation};
-  export default ${varName};
-}
+import type { ${outputPath.includes('/themes/') ? 'ThemeInput' : 'LanguageInput'} } from 'shiki';
+declare const ${finalName}: ${outputPath.includes('/themes/') ? 'ThemeInput' : 'LanguageInput'};
+export default ${finalName};
 `
   fs.writeFileSync(dtsPath, dtsContent)
 }

package/src/components/syntax/SyntaxHighlighter.tsx CHANGED Viewed

@@ -1,9 +1,9 @@
 import type { LanguageInput, ThemeInput } from 'shiki'
 import React from 'react'
 import { Text, View } from 'react-native'
-import typescript from 'vendor/shiki/langs/typescript'
-import githubDark from 'vendor/shiki/themes/github-dark'
 import { useSyntaxHighlighter } from '../../hooks/useSyntaxHighlighter'
+import typescript from '../../vendor/shiki/langs/typescript'
+import githubDark from '../../vendor/shiki/themes/github-dark'
 interface SyntaxHighlighterProps {
   text: string
@@ -34,6 +34,7 @@ function SyntaxHighlighter({
     return (
       <Text style={{ color: '#ff6b6b', fontFamily: 'monospace', fontSize }}>
         Error:
+        {' '}
         {error}
       </Text>
     )

package/src/index.ts CHANGED Viewed

	@@ -1 +1,2 @@
1 1	export { SyntaxHighlighter, SyntaxLine } from './components/syntax'
2	+ export * from './types/shiki'

package/src/vendor/shiki/core/core.d.ts CHANGED Viewed

@@ -1,13 +1,11 @@
 import type { LanguageInput, ThemeInput } from 'shiki'
-declare module 'vendor/shiki/core/core' {
-  export interface HighlighterCoreOptions {
-    engine: any
-    langs: LanguageInput[]
-    themes: ThemeInput[]
-  }
-  export function createHighlighterCore(options: HighlighterCoreOptions): Promise<{
-    codeToTokens: (code: string, options: { lang: string; theme: string }) => any
-  }>
+export interface HighlighterCoreOptions {
+  engine: any
+  langs: LanguageInput[]
+  themes: ThemeInput[]
 }
+export function createHighlighterCore(options: HighlighterCoreOptions): Promise<{
+  codeToTokens: (code: string, options: { lang: string; theme: string }) => any
+}>

package/src/vendor/shiki/core/engine-javascript.d.ts CHANGED Viewed

@@ -1,7 +1,5 @@
-declare module 'vendor/shiki/core/engine-javascript' {
-  export function createJavaScriptRegexEngine(): {
-    grammar: any
-    getRuleStack: (line: string) => any
-    tokenizeLine: (line: string, stack: any) => any
-  }
+export function createJavaScriptRegexEngine(): {
+  grammar: any
+  getRuleStack: (line: string) => any
+  tokenizeLine: (line: string, stack: any) => any
 }

package/src/vendor/shiki/langs/abap.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/abap' {
-  const abap: import('shiki').LanguageInput;
-  export default abap;
-}
+import type { LanguageInput } from 'shiki';
+declare const abap: LanguageInput;
+export default abap;

package/src/vendor/shiki/langs/actionscript-3.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/actionscript-3' {
-  const actionscript_3: import('shiki').LanguageInput;
-  export default actionscript_3;
-}
+import type { LanguageInput } from 'shiki';
+declare const actionscript_3: LanguageInput;
+export default actionscript_3;

package/src/vendor/shiki/langs/ada.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/ada' {
-  const ada: import('shiki').LanguageInput;
-  export default ada;
-}
+import type { LanguageInput } from 'shiki';
+declare const ada: LanguageInput;
+export default ada;

package/src/vendor/shiki/langs/adoc.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/adoc' {
-  const adoc: import('shiki').LanguageInput;
-  export default adoc;
-}
+import type { LanguageInput } from 'shiki';
+declare const adoc: LanguageInput;
+export default adoc;

package/src/vendor/shiki/langs/angular-expression.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/angular-expression' {
-  const angular_expression: import('shiki').LanguageInput;
-  export default angular_expression;
-}
+import type { LanguageInput } from 'shiki';
+declare const angular_expression: LanguageInput;
+export default angular_expression;

package/src/vendor/shiki/langs/angular-html.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/angular-html' {
-  const angular_html: import('shiki').LanguageInput;
-  export default angular_html;
-}
+import type { LanguageInput } from 'shiki';
+declare const angular_html: LanguageInput;
+export default angular_html;

package/src/vendor/shiki/langs/angular-inline-style.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/angular-inline-style' {
-  const angular_inline_style: import('shiki').LanguageInput;
-  export default angular_inline_style;
-}
+import type { LanguageInput } from 'shiki';
+declare const angular_inline_style: LanguageInput;
+export default angular_inline_style;

package/src/vendor/shiki/langs/angular-inline-template.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/angular-inline-template' {
-  const angular_inline_template: import('shiki').LanguageInput;
-  export default angular_inline_template;
-}
+import type { LanguageInput } from 'shiki';
+declare const angular_inline_template: LanguageInput;
+export default angular_inline_template;

package/src/vendor/shiki/langs/angular-let-declaration.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/angular-let-declaration' {
-  const angular_let_declaration: import('shiki').LanguageInput;
-  export default angular_let_declaration;
-}
+import type { LanguageInput } from 'shiki';
+declare const angular_let_declaration: LanguageInput;
+export default angular_let_declaration;

package/src/vendor/shiki/langs/angular-template-blocks.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/angular-template-blocks' {
-  const angular_template_blocks: import('shiki').LanguageInput;
-  export default angular_template_blocks;
-}
+import type { LanguageInput } from 'shiki';
+declare const angular_template_blocks: LanguageInput;
+export default angular_template_blocks;

package/src/vendor/shiki/langs/angular-template.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/angular-template' {
-  const angular_template: import('shiki').LanguageInput;
-  export default angular_template;
-}
+import type { LanguageInput } from 'shiki';
+declare const angular_template: LanguageInput;
+export default angular_template;

package/src/vendor/shiki/langs/angular-ts.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare module 'vendor/shiki/langs/angular-ts' {
-  const angular_ts: import('shiki').LanguageInput;
-  export default angular_ts;
-}
+import type { LanguageInput } from 'shiki';
+declare const angular_ts: LanguageInput;
+export default angular_ts;