feat: re-export definitions from css-processor

fix #503
meliorence · Jul 1, 2021 · 966f01a · 966f01a
1 parent a96e719
commit 966f01a
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 34 deletions.
diff --git a/packages/render-html/package.json b/packages/render-html/package.json
@@ -89,7 +89,7 @@
   "dependencies": {
     "@jsamr/counter-style": "^2.0.1",
     "@jsamr/react-native-li": "^2.2.1",
-    "@native-html/transient-render-engine": "^9.1.0",
+    "@native-html/transient-render-engine": "^9.2.0",
     "@types/ramda": "^0.27.40",
     "@types/urijs": "^1.19.15",
     "prop-types": "^15.5.7",

diff --git a/packages/render-html/src/index.ts b/packages/render-html/src/index.ts
@@ -12,25 +12,81 @@ export {
   HTMLElementModel,
   TRenderEngine
 } from '@native-html/transient-render-engine';
-export type { MixedStyleDeclaration } from '@native-html/css-processor';
 export type {
   AnchorTagName,
   AttribTagNames,
+  CSSAbsoluteHardcodedFontSize,
+  CSSAbsoluteLengthUnit,
+  CSSAbsoluteLengthUnitsMultiplicators,
+  CSSDisplayRegistry,
+  CSSFlattenProcessedTypes,
+  CSSFlowedPropKey,
+  CSSHardcodedBorderWidth,
+  CSSLengthUnit,
+  CSSListStyleTypePropertyBase,
+  CSSLongNativeBlockPropKey,
+  CSSLongNativeTextPropKey,
+  CSSLongNativeTranslatableBlockFlowedPropKey,
+  CSSLongNativeTranslatableBlockPropKey,
+  CSSLongNativeTranslatableBlockRetainedPropKey,
+  CSSLongNativeTranslatableTextFlowedPropKey,
+  CSSLongNativeTranslatableTextPropKey,
+  CSSLongNativeTranslatableTextRetainedPropKey,
+  CSSLongNativeUntranslatableBlockFlowedPropKey,
+  CSSLongNativeUntranslatableBlockPropKey,
+  CSSLongNativeUntranslatableBlockRetainedPropKey,
+  CSSLongNativeUntranslatableTextFlowedPropKey,
+  CSSLongNativeUntranslatableTextPropKey,
+  CSSLongNativeUntranslatableTextRetainedPropKey,
+  CSSLongWebTextFlowedPropKey,
+  CSSLongWebTextRetainedPropKey,
+  CSSNativePropKey,
+  CSSProcessorConfig,
+  CSSPropagationRegistry,
+  CSSProperties,
+  CSSPropertyCompatCategory,
+  CSSPropertyDisplayCategory,
+  CSSPropertyNameList,
+  CSSPropertyPropagationCategory,
+  CSSPropertySpecs,
+  CSSRelativeHarcodedFontSize,
+  CSSShortBlockPropKey,
+  CSSShortNativeTranslatableBlockPropKey,
+  CSSShortPropsKey,
+  CSSShortTextPropKey,
   CustomElementModel,
   DefaultHTMLElementModelsStatic,
+  DocumentContext,
   DomVisitorCallbacks,
   EditsTagNames,
+  ElementCategory,
+  ElementModelBase,
   EmbeddedTagNames,
+  ExtendedNativeViewStyleKeys,
+  ExtraNativeLongViewStyleKeys,
+  ExtraNativeShortStyle,
+  ExtraNativeShortViewStyleKeys,
+  ExtraNativeTextStyle,
+  ExtraNativeTextStyleKeys,
+  ExtraNativeUntranslatedLongStyles,
+  ExtraNativeViewStyle,
   GroupingTagNames,
   HTMLModelRecord,
   InteractiveTagNames,
   Markers,
   MetadataTagNames,
+  MixedSizeCSSPropertiesKeys,
+  MixedStyleDeclaration,
   MixedStyleRecord,
   NativeBlockStyles,
+  NativeDirectionalStyleKeys,
+  NativeElementModel,
+  NativeShortKeys,
+  NativeTextStyleKey,
   NativeTextStyles,
   SectioningTagNames,
   SetMarkersForTNode,
+  StylesConfig,
   TabularTagNames,
   TagName,
   TBlock,
@@ -39,15 +95,19 @@ export type {
   TextLevelTagNames,
   TNode,
   TNodeDescriptor,
+  TNodePrintOptions,
   TNodeShape,
   TNodeType,
-  TNodePrintOptions,
   TPhrasing,
-  TText,
   TRenderEngineOptions,
   TStylesShape,
+  TText,
   UnsupportedTagNames,
-  UntranslatableTagNames
+  UntranslatableTagNames,
+  WebBlockRetainProperties,
+  WebBlockStyles,
+  WebTextFlowProperties,
+  WebTextStyles
 } from '@native-html/transient-render-engine';
 export * from './shared-types';
 export * from './render/render-types';

diff --git a/packages/render-html/src/shared-types.ts b/packages/render-html/src/shared-types.ts
@@ -9,33 +9,29 @@ import type {
   ViewStyle
 } from 'react-native';
 import type {
-  MixedStyleRecord,
-  Node,
-  TNode,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  TNodeType,
-  TText,
-  TPhrasing,
+  CSSPropertyNameList,
+  CustomElementModel,
+  Document,
   DocumentContext as TREDocumentContext,
-  TDocument,
   DomVisitorCallbacks,
-  SetMarkersForTNode,
+  Element,
   HTMLContentModel,
-  CustomElementModel,
   HTMLElementModel,
-  TRenderEngineOptions,
-  NodeWithChildren,
-  Element,
-  Document,
+  MixedStyleDeclaration,
+  MixedStyleRecord,
+  NativeBlockStyles,
   NativeTextStyles,
-  NativeBlockStyles
+  Node,
+  NodeWithChildren,
+  SetMarkersForTNode,
+  TDocument,
+  TNode,
+  TPhrasing,
+  TRenderEngineOptions,
+  TText
 } from '@native-html/transient-render-engine';
 import type { CounterStyleRenderer } from '@jsamr/counter-style';
 import type { ComponentType, ReactElement, ReactNode } from 'react';
-import type {
-  CSSPropertyNameList,
-  MixedStyleDeclaration
-} from '@native-html/css-processor';
 import type { CustomTagRendererRecord } from './render/render-types';
 import type { ParserOptions as HtmlParserOptions } from 'htmlparser2';
 

diff --git a/yarn.lock b/yarn.lock
@@ -4088,24 +4088,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@native-html/css-processor@npm:1.9.0":
-  version: 1.9.0
-  resolution: "@native-html/css-processor@npm:1.9.0"
+"@native-html/css-processor@npm:1.10.0":
+  version: 1.10.0
+  resolution: "@native-html/css-processor@npm:1.10.0"
   dependencies:
     css-to-react-native: ^3.0.0
   peerDependencies:
     "@types/react": "*"
     "@types/react-native": "*"
     csstype: ^3.0.8
-  checksum: 912edb8283ed20fb1340401403c0f6209d92e225431075423af6344df5f31fb0eff8cdbc8c19b769eefd9d100a59b8c77b7270986f6a9fe253d9e363f849a06e
+  checksum: 066e015ac2fe9f0c3749380dcee0afeba542827cb0133b0d407f62fab1fa54f3c0dd12741ba22c566af1dfb11533c46e56ce50ac3c511482749089d29500b356
   languageName: node
   linkType: hard
 
-"@native-html/transient-render-engine@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "@native-html/transient-render-engine@npm:9.1.0"
+"@native-html/transient-render-engine@npm:^9.2.0":
+  version: 9.2.0
+  resolution: "@native-html/transient-render-engine@npm:9.2.0"
   dependencies:
-    "@native-html/css-processor": 1.9.0
+    "@native-html/css-processor": 1.10.0
     "@types/ramda": ^0.27.40
     csstype: ^3.0.8
     domelementtype: ^2.2.0
@@ -4115,7 +4115,7 @@ __metadata:
   peerDependencies:
     "@types/react-native": "*"
     react-native: ^0.63.0
-  checksum: 1c3715bfa48ee57d98a3401ad546d1beaeaecf0485a5a5a581a6ddb37d77ac30991032c449724621f1dba375618075cf39a18dd80386ea81e2b8a5420b11c8bf
+  checksum: 8aa7de6058913522ba5122537592add28546f6813f63a7fe7355e9622b7444c64233d4eb859e2ff4553cbe82b9669bdb06102378c8818b55322e01c013147ff4
   languageName: node
   linkType: hard
 
@@ -19811,7 +19811,7 @@ fsevents@^1.2.7:
     "@jsamr/counter-style": ^2.0.1
     "@jsamr/react-native-li": ^2.2.1
     "@microsoft/api-extractor": ^7.14.0
-    "@native-html/transient-render-engine": ^9.1.0
+    "@native-html/transient-render-engine": ^9.2.0
     "@release-it/conventional-changelog": ^2.0.1
     "@testing-library/react-hooks": ^7.0.0
     "@testing-library/react-native": next