fix: comment might be undefined

minko-fe · Jun 21, 2023 · e4c046f · e4c046f
1 parent 7ad4259
commit e4c046f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -22,7 +22,7 @@ export interface ConvertUnit {
 }
 
 export type PxtoremOptions = Partial<{
-  rootValue: number | ((input: Input) => number)
+  rootValue: number | ((input: Input | undefined) => number)
   unitToConvert: string
   unitPrecision: number
   selectorBlackList: (string | RegExp)[]
@@ -71,10 +71,10 @@ function pxtorem(options?: PxtoremOptions) {
         originOpts: ORIGINAL_OPTIONS,
       }
 
-      setupCurrentOptions(h as any, firstNode)
+      setupCurrentOptions(h as any, { node, comment: firstNode })
     },
     Comment(node, h) {
-      setupCurrentOptions(h as any, node)
+      setupCurrentOptions(h as any, { node, comment: node })
     },
     CommentExit(comment) {
       if (comment.text.match(isPxtoremReg)?.length) {

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1,4 +1,4 @@
-import type { AtRule, ChildNode, Comment, Container, Declaration, Rule } from 'postcss'
+import type { AtRule, ChildNode, Comment, Container, Declaration, Root, Rule } from 'postcss'
 import type { ConvertUnit, PxtoremOptions } from '..'
 import { defaultOptions } from '..'
 import { MAYBE_REGEXP } from './constant'
@@ -202,15 +202,24 @@ export type H = {
   }
 }
 
-export function setupCurrentOptions(h: H, node: Comment | ChildNode) {
+export function setupCurrentOptions(
+  h: H,
+  {
+    node,
+    comment,
+  }: {
+    node?: ChildNode | Root
+    comment?: ChildNode | Comment
+  },
+) {
   const opts = h[currentOptions].originOpts
 
   const filePath = node?.source?.input.file
 
-  if ((node as Comment)?.text) {
+  if (isOptionComment(comment)) {
     h[currentOptions].originOpts = {
       ...opts,
-      ...getOptionsFromComment(node as Comment, opts.parseOptions),
+      ...getOptionsFromComment(comment, opts.parseOptions),
     }
   }
 
@@ -223,7 +232,7 @@ export function setupCurrentOptions(h: H, node: Comment | ChildNode) {
     return
   }
 
-  h[currentOptions].rootValue = isFunction(opts.rootValue) ? opts.rootValue(node.source!.input) : opts.rootValue
+  h[currentOptions].rootValue = isFunction(opts.rootValue) ? opts.rootValue(node?.source!.input) : opts.rootValue
 
   h[currentOptions].pxReplace = createPxReplace(h[currentOptions].rootValue, opts.unitPrecision, opts.minPixelValue)
 }