fix(packages): install missing packages, restore @jsamr packages

stibel · 5ZYSZ3K · commit 7d973dcf1f96 · 2025-11-24T18:05:14.000+01:00
diff --git a/apps/benchmarking/package.json b/apps/benchmarking/package.json
@@ -9,6 +9,9 @@
     "eject": "expo eject"
   },
   "dependencies": {
+    "@jsamr/counter-style": "^2.0.2",
+    "@jsamr/react-native-li": "^2.3.1",
+    "css-to-react-native": "^3.2.0",
     "expo": "^54.0.15",
     "expo-keep-awake": "~15.0.7",
     "expo-status-bar": "~3.0.8",
@@ -20,7 +23,8 @@
     "react-native-render-html-v5": "npm:react-native-render-html@^5.0.0",
     "react-native-safe-area-context": "^5.6.1",
     "react-native-web": "^0.21.2",
-    "react-states": "^5.0.0"
+    "react-states": "^5.0.0",
+    "urijs": "^1.19.11"
   },
   "devDependencies": {
     "@babel/core": "^7.28.4"
diff --git a/apps/benchmarking/profiles.js b/apps/benchmarking/profiles.js
@@ -1,13 +1,7 @@
-// import ProfileSimple from './profiles/ProfileSimple';
 import ProfileV5 from './profiles/ProfileV5';
 import ProfileV6Source from './profiles/ProfileV6Source';
 
 const profiles = [
-  // Disabled because of htmlparser resolution
-  // {
-  //   name: 'Simple implementation',
-  //   component: ProfileSimple
-  // },
   {
     name: 'V5',
     component: ProfileV5,
diff --git a/apps/benchmarking/profiles/ProfileSimple.js b/apps/benchmarking/profiles/ProfileSimple.js
diff --git a/apps/benchmarking/profiles/RenderHtmlSimple.js b/apps/benchmarking/profiles/RenderHtmlSimple.js
diff --git a/apps/discovery/package.json b/apps/discovery/package.json
@@ -23,6 +23,7 @@
     "@expo-google-fonts/space-mono": "^0.4.2",
     "@expo/vector-icons": "^15.0.3",
     "@gorhom/bottom-sheet": "^5.2.6",
+    "@jsamr/counter-style": "^2.0.2",
     "@jsamr/react-native-li": "^2.3.1",
     "@mobily/stacks": "^2.2.2",
     "@react-native-community/masked-view": "0.1.11",
@@ -34,6 +35,7 @@
     "@react-navigation/stack": "^7.4.10",
     "change-case": "^5.4.4",
     "color": "^5.0.2",
+    "css-to-react-native": "^3.2.0",
     "deepmerge": "^4.3.1",
     "expo": "^54.0.15",
     "expo-asset": "~12.0.9",
diff --git a/apps/discovery/src/providers/PageToolkitProvider.tsx b/apps/discovery/src/providers/PageToolkitProvider.tsx
@@ -26,7 +26,6 @@ import CardColorRolesProvider from '../components/croles/CardColorRolesProvider'
 import { Linking, StyleSheet } from 'react-native';
 import BoxNucleon from '../components/nucleons/BoxNucleon';
 import { WEBSITE_URL } from '@doc/constants';
-import URI from 'urijs';
 import TNodeTransformDisplayOrganism from '../components/TNodeTransformDisplayOrganism';
 import UICardContainer from '../components/UICardContainer';
 import { BODY_PARAGRAPH_SPACING } from '../constants';
@@ -82,7 +81,7 @@ function RefAPI({
   const fullName =
     (member && full ? `${name}.${member}` : member ? member : name) +
     pluralMark;
-  const fullUrl = new URI(WEBSITE_URL + url).normalizePath().href();
+  const fullUrl = new URL(url, WEBSITE_URL).href;
   return (
     <UIHyperlinkAtom
       role="bodyAPIRef"
diff --git a/packages/css-processor/src/CSSInlineParseRun.ts b/packages/css-processor/src/CSSInlineParseRun.ts
@@ -1,11 +1,4 @@
-// TEMPORARY: Commented out for benchmarking app compatibility
-// import { getPropertyName } from 'css-to-react-native';
-
-// TEMPORARY: Simple stub to convert CSS property names to camelCase
-function getPropertyName(cssProperty: string): string {
-  return cssProperty.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
-}
-
+import { getPropertyName } from 'css-to-react-native';
 import { CSSParseRun } from './CSSParseRun';
 import { MixedStyleDeclaration } from './CSSProcessor';
 import { CSSPropertiesValidationRegistry } from './CSSPropertiesValidationRegistry';
diff --git a/packages/css-processor/src/validators/expandCSSToRN.ts b/packages/css-processor/src/validators/expandCSSToRN.ts
@@ -1,13 +1,4 @@
-// TEMPORARY: Commented out for benchmarking app compatibility
-// import { getStylesForProperty } from 'css-to-react-native';
-
-// TEMPORARY: Simple stub that returns null (skips shorthand expansion)
-// In production, this would use css-to-react-native to expand shorthand properties
-function getStylesForProperty(propertyName: string, value: string): any {
-  // Return a simple object with the property - not a full expansion but sufficient for benchmarking
-  const camelCaseName = propertyName.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
-  return { [camelCaseName]: value };
-}
+import { getStylesForProperty } from 'css-to-react-native';
 
 export default function expandCSSToRN(propertyName: string, value: string) {
   try {
diff --git a/packages/render-html/src/elements/ListElement.tsx b/packages/render-html/src/elements/ListElement.tsx
@@ -1,18 +1,7 @@
 import { DimensionValue, StyleSheet, View } from 'react-native';
 import React from 'react';
 import { TBlock, TNode } from '@native-html/transient-render-engine';
-// TEMPORARY: Commented out for benchmarking app compatibility
-// import { MarkedListItem, useMarkedList } from '@jsamr/react-native-li';
-
-// TEMPORARY: Simple stubs for benchmarking
-const MarkedListItem = ({ children, style }: any) => <View style={style}>{children}</View>;
-const useMarkedList = (config: any) => ({
-  markerTextStyle: config.markerTextStyle || {},
-  markerBoxStyle: config.markerBoxStyle || {},
-  markerTextWidth: false as const,
-  style: {},
-});
-
+import { MarkedListItem, useMarkedList } from '@jsamr/react-native-li';
 import type {
   DefaultSupportedListStyleType,
   InternalRendererProps,
diff --git a/packages/render-html/src/elements/defaultListStyleSpecs.ts b/packages/render-html/src/elements/defaultListStyleSpecs.ts
@@ -1,12 +1,11 @@
-// TEMPORARY: Commented out for benchmarking app compatibility
-// import CounterStyle from '@jsamr/counter-style';
-// import decimal from '@jsamr/counter-style/presets/decimal';
-// import decimalLeadingZero from '@jsamr/counter-style/presets/decimalLeadingZero';
-// import lowerRoman from '@jsamr/counter-style/presets/lowerRoman';
-// import lowerAlpha from '@jsamr/counter-style/presets/lowerAlpha';
-// import lowerGreek from '@jsamr/counter-style/presets/lowerGreek';
-// import upperAlpha from '@jsamr/counter-style/presets/upperAlpha';
-// import upperRoman from '@jsamr/counter-style/presets/upperRoman';
+import CounterStyle from '@jsamr/counter-style';
+import decimal from '@jsamr/counter-style/presets/decimal';
+import decimalLeadingZero from '@jsamr/counter-style/presets/decimalLeadingZero';
+import lowerRoman from '@jsamr/counter-style/presets/lowerRoman';
+import lowerAlpha from '@jsamr/counter-style/presets/lowerAlpha';
+import lowerGreek from '@jsamr/counter-style/presets/lowerGreek';
+import upperAlpha from '@jsamr/counter-style/presets/upperAlpha';
+import upperRoman from '@jsamr/counter-style/presets/upperRoman';
 import DisclosureClosedSymbolRenderer from './symbolic/DisclosureClosedSymbolRenderer';
 import DisclosureOpenSymbolRenderer from './symbolic/DisclosureOpenSymbolRenderer';
 import CircleSymbolRenderer from './symbolic/CircleSymbolRenderer';
@@ -17,25 +16,16 @@ import type {
   ListStyleSpec
 } from '../shared-types';
 
-// TEMPORARY: Simple stub renderer
-const stubRenderer = {
-  renderCounter: (index: number) => `${index}`,
-  renderPrefix: () => '',
-  renderSuffix: () => '. ',
-  withSuffix: (suffix: string | null) => stubRenderer,
-  format: (index: number) => `${index}.`
-} as any;
-
-const unitaryRenderer = stubRenderer; // CounterStyle.cyclic('*').withSuffix(' ');
+const unitaryRenderer = CounterStyle.cyclic('*').withSuffix(' ');
 
 const lowerAlphaSpec = {
   type: 'textual',
-  counterStyleRenderer: stubRenderer // lowerAlpha
+  counterStyleRenderer: lowerAlpha
 } as const;
 
 const upperAlphaSpec = {
   type: 'textual',
-  counterStyleRenderer: stubRenderer // upperAlpha
+  counterStyleRenderer: upperAlpha
 } as const;
 
 /**
@@ -49,7 +39,7 @@ const defaultListStyleSpecs: Record<
 > = {
   'decimal-leading-zero': {
     type: 'textual',
-    counterStyleRenderer: stubRenderer // decimalLeadingZero
+    counterStyleRenderer: decimalLeadingZero
   },
   'disclosure-closed': {
     counterStyleRenderer: unitaryRenderer,
@@ -64,18 +54,18 @@ const defaultListStyleSpecs: Record<
   'lower-alpha': lowerAlphaSpec,
   'lower-greek': {
     type: 'textual',
-    counterStyleRenderer: stubRenderer // lowerGreek
+    counterStyleRenderer: lowerGreek
   },
   'lower-latin': lowerAlphaSpec,
   'lower-roman': {
     type: 'textual',
-    counterStyleRenderer: stubRenderer // lowerRoman
+    counterStyleRenderer: lowerRoman
   },
   'upper-alpha': upperAlphaSpec,
   'upper-latin': upperAlphaSpec,
   'upper-roman': {
     type: 'textual',
-    counterStyleRenderer: stubRenderer // upperRoman
+    counterStyleRenderer: upperRoman
   },
   circle: {
     counterStyleRenderer: unitaryRenderer,
@@ -84,15 +74,15 @@ const defaultListStyleSpecs: Record<
   },
   decimal: {
     type: 'textual',
-    counterStyleRenderer: stubRenderer // decimal
+    counterStyleRenderer: decimal
   },
   disc: {
     counterStyleRenderer: unitaryRenderer,
     type: 'unitary',
     Component: DiscSymbolRenderer
   },
   none: {
-    counterStyleRenderer: stubRenderer, // CounterStyle.symbolic('').withSuffix(null),
+    counterStyleRenderer: CounterStyle.symbolic('').withSuffix(null),
     type: 'unitary',
     Component: () => null
   },
diff --git a/packages/render-html/src/helpers/normalizeResourceLocator.ts b/packages/render-html/src/helpers/normalizeResourceLocator.ts
@@ -1,6 +1,3 @@
-// TEMPORARY: Commented out for benchmarking app compatibility
-// import URI from 'urijs';
-
 /**
  * This function normalize relative and protocol-relative URLs to absolute
  * URLs as per {@link https://tools.ietf.org/html/rfc1808 | RFC1808}.
@@ -12,25 +9,15 @@ export default function normalizeResourceLocator(
   url: string,
   baseUrl?: string
 ) {
-  // TEMPORARY: Simple stub for benchmarking
-  // In a real app, this would use urijs to properly normalize URLs
   try {
-    if (!baseUrl) return url;
-    // Very basic URL resolution - not RFC1808 compliant but sufficient for benchmarking
-    if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) {
-      return url;
+    if (!baseUrl) {
+      // Try to parse as absolute URL
+      return new URL(url).href;
     }
-    const base = baseUrl.endsWith('/') ? baseUrl : baseUrl + '/';
-    const path = url.startsWith('/') ? url.slice(1) : url;
-    return base + path;
+    // Resolve relative URL against base URL
+    return new URL(url, baseUrl).href;
   } catch {
+    // If URL parsing fails, return original URL
     return url;
   }
-  
-  // Original implementation:
-  // try {
-  //   return baseUrl ? URI(url).absoluteTo(URI(baseUrl)).href() : URI(url).href();
-  // } catch {
-  //   return url;
-  // }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -9185,6 +9185,9 @@ __metadata:
   resolution: "benchmarking@workspace:apps/benchmarking"
   dependencies:
     "@babel/core": "npm:^7.28.4"
+    "@jsamr/counter-style": "npm:^2.0.2"
+    "@jsamr/react-native-li": "npm:^2.3.1"
+    css-to-react-native: "npm:^3.2.0"
     expo: "npm:^54.0.15"
     expo-keep-awake: "npm:~15.0.7"
     expo-status-bar: "npm:~3.0.8"
@@ -9197,6 +9200,7 @@ __metadata:
     react-native-safe-area-context: "npm:^5.6.1"
     react-native-web: "npm:^0.21.2"
     react-states: "npm:^5.0.0"
+    urijs: "npm:^1.19.11"
   languageName: unknown
   linkType: soft
 
@@ -11800,6 +11804,7 @@ __metadata:
     "@expo-google-fonts/space-mono": "npm:^0.4.2"
     "@expo/vector-icons": "npm:^15.0.3"
     "@gorhom/bottom-sheet": "npm:^5.2.6"
+    "@jsamr/counter-style": "npm:^2.0.2"
     "@jsamr/react-native-li": "npm:^2.3.1"
     "@mobily/stacks": "npm:^2.2.2"
     "@react-native-community/masked-view": "npm:0.1.11"
@@ -11817,6 +11822,7 @@ __metadata:
     babel-preset-expo: "npm:^54.0.5"
     change-case: "npm:^5.4.4"
     color: "npm:^5.0.2"
+    css-to-react-native: "npm:^3.2.0"
     deepmerge: "npm:^4.3.1"
     expo: "npm:^54.0.15"
     expo-asset: "npm:~12.0.9"
