@rickosborne/css 2025.2.16 → 2025.3.4

package/README.md

@@ -275,18 +275,6 @@ isTransparentHex: (hex: string) => boolean
 Whether the given hex would produce a fully transparent (alpha 0) color.
 
 
-#### readFromCSS
-
-<a id="api-readfromcss"></a>
-
-```typescript
-readFromCSS: (text: string) => CSSTokenReader
-```
-
-Minimal CSS pull parser, which only supports the happy-path tokens expected in a CSS color expression. Does not support anywhere near the full CSS Colors spec, but it'll do in a pinch.
-
-
-
 #### toCSSColorName
 
 <a id="api-tocsscolorname"></a>
@@ -297,14 +285,6 @@ toCSSColorName: (name: unknown) => CSSColorName | undefined
 
 ### Interfaces
 
-#### CSSColorToken
-
-<a id="api-csscolortoken"></a>
-
-```typescript
-export interface CSSColorToken<Type extends string = string> 
-```
-
 #### CSSErrorOptions
 
 <a id="api-csserroroptions"></a>
@@ -313,62 +293,6 @@ export interface CSSColorToken<Type extends string = string>
 export interface CSSErrorOptions extends ErrorOptions 
 ```
 
-#### CSSFunctionToken
-
-<a id="api-cssfunctiontoken"></a>
-
-```typescript
-export interface CSSFunctionToken extends CSSColorToken<"function"> 
-```
-
-#### CSSHexHashToken
-
-<a id="api-csshexhashtoken"></a>
-
-```typescript
-export interface CSSHexHashToken extends CSSColorToken<"hex"> 
-```
-
-#### CSSKeywordToken
-
-<a id="api-csskeywordtoken"></a>
-
-```typescript
-export interface CSSKeywordToken extends CSSColorToken<"keyword"> 
-```
-
-#### CSSLiteralToken
-
-<a id="api-cssliteraltoken"></a>
-
-```typescript
-export interface CSSLiteralToken extends CSSColorToken<"literal"> 
-```
-
-#### CSSNumberToken
-
-<a id="api-cssnumbertoken"></a>
-
-```typescript
-export interface CSSNumberToken extends CSSColorToken<"number"> 
-```
-
-#### CSSTokenReader
-
-<a id="api-csstokenreader"></a>
-
-```typescript
-export interface CSSTokenReader 
-```
-
-#### CSSTokenReaderMatcher
-
-<a id="api-csstokenreadermatcher"></a>
-
-```typescript
-export interface CSSTokenReaderMatcher<Type extends CSSToken["type"] = CSSToken["type"]> 
-```
-
 #### FunctionColorToken
 
 <a id="api-functioncolortoken"></a>
@@ -458,14 +382,6 @@ type CSSLengthUnit = CSSRelativeLengthUnit | CSSAbsoluteLengthUnit;
 type CSSRelativeLengthUnit = "em" | "ex" | "cap" | "ch" | "ic" | "rem" | "lh" | "rlh" | "vw" | "vh" | "vi" | "vb" | "vmin" | "vmax" | "svw" | "lvw" | "dvw" | "svh" | "lvh" | "dvh" | "svi" | "lvi" | "dvi" | "svb" | "lvb" | "dvb" | "svmin" | "lvmin" | "dvmin" | "svmax" | "lvmax" | "dvmax";
 ```
 
-#### CSSToken
-
-<a id="api-csstoken"></a>
-
-```typescript
-type CSSToken = CSSKeywordToken | CSSFunctionToken | CSSHexHashToken | CSSLiteralToken | CSSNumberToken;
-```
-
 #### DimensionPair
 
 <a id="api-dimensionpair"></a>

package/color-parser.cjs

@@ -23,110 +23,134 @@ __export(color_parser_exports, {
   colorTokensFromCSS: () => colorTokensFromCSS
 });
 module.exports = __toCommonJS(color_parser_exports);
+var import_foundation = require("@rickosborne/foundation");
+var import_guard = require("@rickosborne/guard");
 var import_colors = require("./colors.cjs");
 var import_css_error = require("./css-error.cjs");
 var import_href = require("./href.cjs");
-var import_tokenizer = require("./tokenizer.cjs");
 const COLOR_FUNCTIONS = Object.freeze(["color", "rgb", "rgba", "hsl", "hsla", "hwb"]);
-const colorTokensFromCSS = /* @__PURE__ */ __name((text) => {
-  if (text.trim() === "") {
-    return void 0;
+const _CSSColorTokenizer = class _CSSColorTokenizer extends import_foundation.StringTokenizer {
+  static forText(text) {
+    return new _CSSColorTokenizer(text[Symbol.iterator](), text);
   }
-  const reader = (0, import_tokenizer.readFromCSS)(text);
-  const kwOrFn = reader.pull(
-    "hex",
-    {
-      match: COLOR_FUNCTIONS,
-      type: "function"
-    },
-    "keyword"
-  );
-  if (kwOrFn == null) return void 0;
-  if (kwOrFn.type === "keyword") {
-    const keyword = kwOrFn.keyword;
-    const name = (0, import_colors.toCSSColorName)(keyword);
+  consumeColor() {
+    this.consumeSpace();
+    const char = this.peek();
+    if (char == null) {
+      return void 0;
+    }
+    if (char === "#") {
+      return this.consumeHex();
+    }
+    const literal = this.consumeLiteral();
+    if (COLOR_FUNCTIONS.includes(literal)) {
+      return this.consumeFunctionCall(literal);
+    }
+    const name = (0, import_colors.toCSSColorName)(literal);
     if (name == null) {
-      throw new import_css_error.CSSError(text, { expected: "Color name", href: import_href.HREF_COLOR, message: `Unknown keyword: ${keyword}` });
+      throw this.fail(`Unknown keyword: ${literal}`, { expected: "Color name", href: import_href.HREF_COLOR });
     }
     return { name };
   }
-  if (kwOrFn.type === "hex") {
-    return { hex: kwOrFn.hex };
-  }
-  const functionName = kwOrFn.name;
-  let space = void 0;
-  const fail = /* @__PURE__ */ __name((message, options = {}) => {
-    throw new import_css_error.CSSError(text, { ...options, message });
-  }, "fail");
-  if (kwOrFn.name === "color") {
-    const spaceKw = reader.pull({
-      type: "keyword"
-    });
-    if (spaceKw == null) {
-      return fail(`Missing color space`, { href: import_href.HREF_COLOR_FN });
+  consumeFunctionCall(functionName) {
+    this.consumeSpace();
+    this.consumeExact("(");
+    let space = void 0;
+    if (functionName === "color") {
+      space = this.consumeLiteral(() => this.fail("Missing color space", { href: import_href.HREF_COLOR_FN }));
+    }
+    const components = [];
+    const breakAfterComponent = /* @__PURE__ */ __name(() => {
+      this.consumeSpace();
+      if (components.length === 3) {
+        if (!this.tryConsume(",")) {
+          this.tryConsume("/");
+        }
+      } else {
+        this.tryConsume(",");
+      }
+      if (components.length >= 3) {
+        if (this.tryConsume(")")) {
+          return true;
+        }
+      }
+      return false;
+    }, "breakAfterComponent");
+    while (!this.done) {
+      if (components.length >= 4) {
+        throw this.fail(`Malformed ${functionName}() color`);
+      }
+      this.consumeSpace();
+      const component = this.tryConsumeColorComponent();
+      if (component != null) {
+        components.push(component);
+        if (breakAfterComponent()) {
+          break;
+        }
+      } else {
+        throw this.fail(`Malformed ${functionName}() color`);
+      }
     }
-    space = spaceKw.keyword;
+    return {
+      components,
+      functionName,
+      ...space == null ? {} : { space }
+    };
   }
-  let functionDone = false;
-  const components = [];
-  const breakAfterNumber = /* @__PURE__ */ __name(() => {
-    if (components.length === 3) {
-      reader.pull({ match: [",", "/"], type: "literal" });
-    } else {
-      reader.pull({ match: [","], type: "literal" });
+  consumeHex() {
+    return { hex: this.consumeWhile((t, i) => i === 0 ? t === "#" : (0, import_guard.isHexDigit)(t)) };
+  }
+  consumeLiteral(errorProvider = () => new SyntaxError(`Expected a literal at ${this.at}`)) {
+    const literal = this.tryConsumeLiteral();
+    if (literal != null) {
+      return literal;
     }
-    if (components.length >= 3) {
-      const paren = reader.pull({ match: [")"], type: "literal" });
-      if (paren != null) {
-        functionDone = true;
-        return true;
-      }
+    throw errorProvider();
+  }
+  fail(message, options = {}) {
+    return new import_css_error.CSSError(this.text, { ...options, message });
+  }
+  tryConsumeColorComponent() {
+    if (this.tryConsume("none")) {
+      return [0, void 0];
     }
-    return false;
-  }, "breakAfterNumber");
-  while (!functionDone) {
-    if (components.length >= 4) {
-      return fail(`Malformed ${functionName}() color`);
+    const maybeNumber = this.tryConsumeNumber();
+    if (maybeNumber == null) {
+      return void 0;
     }
-    const token = reader.pull(
-      "number",
-      { match: ["none"], type: "keyword" }
-    );
-    if (token == null) {
-      return fail(`Malformed ${functionName}() color`);
+    this.consumeSpace();
+    let unit;
+    if (this.tryConsume("%")) {
+      unit = "%";
+    } else {
+      unit = this.tryConsumeLiteral();
     }
-    if (token.type === "keyword") {
-      if (token.keyword === "none") {
-        components.push([0, void 0]);
-        if (breakAfterNumber()) {
-          break;
-        }
-        continue;
+    this.consumeSpace();
+    return [maybeNumber, unit];
+  }
+  tryConsumeLiteral() {
+    const literal = this.consumeWhile((t, i) => i === 0 ? new RegExp("^\\p{ID_Start}$", "u").test(t) : /^[-\p{ID_Continue}]$/u.test(t));
+    return literal === "" ? void 0 : literal;
+  }
+  tryConsumeNumber() {
+    const sign = this.tryConsume("-") ? -1 : 1;
+    const intText = this.consumeWhile(import_guard.isDigit);
+    if (intText === "") {
+      if (sign < 0) {
+        throw this.fail(`Expected a number at ${this.at}`);
       }
+      return void 0;
     }
-    if (token.type === "number") {
-      const unitToken = reader.pull(
-        "keyword",
-        { match: ["%"], type: "literal" }
-      );
-      let unit;
-      if ((unitToken == null ? void 0 : unitToken.type) === "literal") {
-        unit = unitToken.literal;
-      } else if ((unitToken == null ? void 0 : unitToken.type) === "keyword") {
-        unit = unitToken.keyword;
-      } else {
-        unit = void 0;
-      }
-      components.push([token.value, unit]);
-      if (breakAfterNumber()) {
-        break;
-      }
+    if (this.tryConsume(".")) {
+      const fracText = this.consumeWhile(import_guard.isDigit);
+      return sign * Number.parseFloat(`${intText}.${fracText}`);
     }
+    return sign * Number.parseInt(intText, 10);
   }
-  return {
-    components,
-    functionName,
-    ...space == null ? {} : { space }
-  };
+};
+__name(_CSSColorTokenizer, "CSSColorTokenizer");
+let CSSColorTokenizer = _CSSColorTokenizer;
+const colorTokensFromCSS = /* @__PURE__ */ __name((text) => {
+  return CSSColorTokenizer.forText(text).consumeColor();
 }, "colorTokensFromCSS");
 //# sourceMappingURL=color-parser.cjs.map

package/color-parser.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/packages/css/color-parser.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/color-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"color-parser.d.ts","sourceRoot":"","sources":["../../../src/packages/css/color-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,WAAW,aAAa;IAC7B,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC9B,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,GAAG,CAAC,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;CACd;AAED,MAAM,WAAW,kBAAkB;IAClC,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,KAAK,CAAC;IACZ,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAED,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,aAAa,GAAG,kBAAkB,CAAC;AAEjF,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,CAAC;AACjF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,gBAAgB,EAAE,CAAmE,CAAC;AAE7H,eAAO,MAAM,kBAAkB,SACxB,MAAM,KACV,cAAc,GAAG,SAyGnB,CAAC"}
+{"version":3,"file":"color-parser.d.ts","sourceRoot":"","sources":["../../../src/packages/css/color-parser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,WAAW,aAAa;IAC7B,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC9B,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,GAAG,CAAC,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;CACd;AAED,MAAM,WAAW,kBAAkB;IAClC,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,KAAK,CAAC;IACZ,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAED,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,aAAa,GAAG,kBAAkB,CAAC;AAEjF,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,CAAC;AACjF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,gBAAgB,EAAE,CAAmE,CAAC;AAoI7H,eAAO,MAAM,kBAAkB,SACxB,MAAM,KACV,cAAc,GAAG,SAEnB,CAAC"}

package/color-parser.mjs

@@ -1,110 +1,134 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { StringTokenizer } from "@rickosborne/foundation";
+import { isDigit, isHexDigit } from "@rickosborne/guard";
 import { toCSSColorName } from "./colors.mjs";
 import { CSSError } from "./css-error.mjs";
 import { HREF_COLOR, HREF_COLOR_FN } from "./href.mjs";
-import { readFromCSS } from "./tokenizer.mjs";
 const COLOR_FUNCTIONS = Object.freeze(["color", "rgb", "rgba", "hsl", "hsla", "hwb"]);
-const colorTokensFromCSS = /* @__PURE__ */ __name((text) => {
-  if (text.trim() === "") {
-    return void 0;
+const _CSSColorTokenizer = class _CSSColorTokenizer extends StringTokenizer {
+  static forText(text) {
+    return new _CSSColorTokenizer(text[Symbol.iterator](), text);
   }
-  const reader = readFromCSS(text);
-  const kwOrFn = reader.pull(
-    "hex",
-    {
-      match: COLOR_FUNCTIONS,
-      type: "function"
-    },
-    "keyword"
-  );
-  if (kwOrFn == null) return void 0;
-  if (kwOrFn.type === "keyword") {
-    const keyword = kwOrFn.keyword;
-    const name = toCSSColorName(keyword);
+  consumeColor() {
+    this.consumeSpace();
+    const char = this.peek();
+    if (char == null) {
+      return void 0;
+    }
+    if (char === "#") {
+      return this.consumeHex();
+    }
+    const literal = this.consumeLiteral();
+    if (COLOR_FUNCTIONS.includes(literal)) {
+      return this.consumeFunctionCall(literal);
+    }
+    const name = toCSSColorName(literal);
     if (name == null) {
-      throw new CSSError(text, { expected: "Color name", href: HREF_COLOR, message: `Unknown keyword: ${keyword}` });
+      throw this.fail(`Unknown keyword: ${literal}`, { expected: "Color name", href: HREF_COLOR });
     }
     return { name };
   }
-  if (kwOrFn.type === "hex") {
-    return { hex: kwOrFn.hex };
-  }
-  const functionName = kwOrFn.name;
-  let space = void 0;
-  const fail = /* @__PURE__ */ __name((message, options = {}) => {
-    throw new CSSError(text, { ...options, message });
-  }, "fail");
-  if (kwOrFn.name === "color") {
-    const spaceKw = reader.pull({
-      type: "keyword"
-    });
-    if (spaceKw == null) {
-      return fail(`Missing color space`, { href: HREF_COLOR_FN });
+  consumeFunctionCall(functionName) {
+    this.consumeSpace();
+    this.consumeExact("(");
+    let space = void 0;
+    if (functionName === "color") {
+      space = this.consumeLiteral(() => this.fail("Missing color space", { href: HREF_COLOR_FN }));
+    }
+    const components = [];
+    const breakAfterComponent = /* @__PURE__ */ __name(() => {
+      this.consumeSpace();
+      if (components.length === 3) {
+        if (!this.tryConsume(",")) {
+          this.tryConsume("/");
+        }
+      } else {
+        this.tryConsume(",");
+      }
+      if (components.length >= 3) {
+        if (this.tryConsume(")")) {
+          return true;
+        }
+      }
+      return false;
+    }, "breakAfterComponent");
+    while (!this.done) {
+      if (components.length >= 4) {
+        throw this.fail(`Malformed ${functionName}() color`);
+      }
+      this.consumeSpace();
+      const component = this.tryConsumeColorComponent();
+      if (component != null) {
+        components.push(component);
+        if (breakAfterComponent()) {
+          break;
+        }
+      } else {
+        throw this.fail(`Malformed ${functionName}() color`);
+      }
     }
-    space = spaceKw.keyword;
+    return {
+      components,
+      functionName,
+      ...space == null ? {} : { space }
+    };
   }
-  let functionDone = false;
-  const components = [];
-  const breakAfterNumber = /* @__PURE__ */ __name(() => {
-    if (components.length === 3) {
-      reader.pull({ match: [",", "/"], type: "literal" });
-    } else {
-      reader.pull({ match: [","], type: "literal" });
+  consumeHex() {
+    return { hex: this.consumeWhile((t, i) => i === 0 ? t === "#" : isHexDigit(t)) };
+  }
+  consumeLiteral(errorProvider = () => new SyntaxError(`Expected a literal at ${this.at}`)) {
+    const literal = this.tryConsumeLiteral();
+    if (literal != null) {
+      return literal;
     }
-    if (components.length >= 3) {
-      const paren = reader.pull({ match: [")"], type: "literal" });
-      if (paren != null) {
-        functionDone = true;
-        return true;
-      }
+    throw errorProvider();
+  }
+  fail(message, options = {}) {
+    return new CSSError(this.text, { ...options, message });
+  }
+  tryConsumeColorComponent() {
+    if (this.tryConsume("none")) {
+      return [0, void 0];
     }
-    return false;
-  }, "breakAfterNumber");
-  while (!functionDone) {
-    if (components.length >= 4) {
-      return fail(`Malformed ${functionName}() color`);
+    const maybeNumber = this.tryConsumeNumber();
+    if (maybeNumber == null) {
+      return void 0;
     }
-    const token = reader.pull(
-      "number",
-      { match: ["none"], type: "keyword" }
-    );
-    if (token == null) {
-      return fail(`Malformed ${functionName}() color`);
+    this.consumeSpace();
+    let unit;
+    if (this.tryConsume("%")) {
+      unit = "%";
+    } else {
+      unit = this.tryConsumeLiteral();
     }
-    if (token.type === "keyword") {
-      if (token.keyword === "none") {
-        components.push([0, void 0]);
-        if (breakAfterNumber()) {
-          break;
-        }
-        continue;
+    this.consumeSpace();
+    return [maybeNumber, unit];
+  }
+  tryConsumeLiteral() {
+    const literal = this.consumeWhile((t, i) => i === 0 ? new RegExp("^\\p{ID_Start}$", "u").test(t) : /^[-\p{ID_Continue}]$/u.test(t));
+    return literal === "" ? void 0 : literal;
+  }
+  tryConsumeNumber() {
+    const sign = this.tryConsume("-") ? -1 : 1;
+    const intText = this.consumeWhile(isDigit);
+    if (intText === "") {
+      if (sign < 0) {
+        throw this.fail(`Expected a number at ${this.at}`);
       }
+      return void 0;
     }
-    if (token.type === "number") {
-      const unitToken = reader.pull(
-        "keyword",
-        { match: ["%"], type: "literal" }
-      );
-      let unit;
-      if ((unitToken == null ? void 0 : unitToken.type) === "literal") {
-        unit = unitToken.literal;
-      } else if ((unitToken == null ? void 0 : unitToken.type) === "keyword") {
-        unit = unitToken.keyword;
-      } else {
-        unit = void 0;
-      }
-      components.push([token.value, unit]);
-      if (breakAfterNumber()) {
-        break;
-      }
+    if (this.tryConsume(".")) {
+      const fracText = this.consumeWhile(isDigit);
+      return sign * Number.parseFloat(`${intText}.${fracText}`);
     }
+    return sign * Number.parseInt(intText, 10);
   }
-  return {
-    components,
-    functionName,
-    ...space == null ? {} : { space }
-  };
+};
+__name(_CSSColorTokenizer, "CSSColorTokenizer");
+let CSSColorTokenizer = _CSSColorTokenizer;
+const colorTokensFromCSS = /* @__PURE__ */ __name((text) => {
+  return CSSColorTokenizer.forText(text).consumeColor();
 }, "colorTokensFromCSS");
 export {
   COLOR_FUNCTIONS,

package/color-parser.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/packages/css/color-parser.ts"],
-  "mappings": "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",
+  "mappings": ";;AAAA,SAAS,uBAAuB;AAChC,SAAS,SAAS,kBAAkB;AAEpC,SAAS,sBAAsB;AAE/B,SAAS,gBAAgB;AACzB,SAAS,YAAY,qBAAqB;AA8BnC,MAAM,kBAAgD,OAAO,OAAO,CAAE,SAAS,OAAO,QAAQ,OAAO,QAAQ,KAAM,CAAC;AAE3H,MAAM,qBAAN,MAAM,2BAA0B,gBAAgB;AAAA,EAC/C,OAAuB,QAAQ,MAAiC;AAC/D,WAAO,IAAI,mBAAkB,KAAK,OAAO,QAAQ,EAAE,GAAG,IAAI;AAAA,EAC3D;AAAA,EAEO,eAA2C;AACjD,SAAK,aAAa;AAClB,UAAM,OAAO,KAAK,KAAK;AACvB,QAAI,QAAQ,MAAM;AACjB,aAAO;AAAA,IACR;AACA,QAAI,SAAS,KAAK;AACjB,aAAO,KAAK,WAAW;AAAA,IACxB;AACA,UAAM,UAAU,KAAK,eAAe;AACpC,QAAI,gBAAgB,SAAS,OAA2B,GAAG;AAC1D,aAAO,KAAK,oBAAoB,OAAO;AAAA,IACxC;AACA,UAAM,OAAO,eAAe,OAAO;AACnC,QAAI,QAAQ,MAAM;AACjB,YAAM,KAAK,KAAK,oBAAqB,OAAQ,IAAI,EAAE,UAAU,cAAc,MAAM,WAAW,CAAC;AAAA,IAC9F;AACA,WAAO,EAAE,KAAK;AAAA,EACf;AAAA,EAEO,oBAAoB,cAA0C;AACpE,SAAK,aAAa;AAClB,SAAK,aAAa,GAAG;AACrB,QAAI,QAA4B;AAChC,QAAI,iBAAiB,SAAS;AAC7B,cAAQ,KAAK,eAAe,MAAM,KAAK,KAAK,uBAAuB,EAAE,MAAM,cAAc,CAAC,CAAC;AAAA,IAC5F;AACA,UAAM,aAA8B,CAAC;AACrC,UAAM,sBAAsB,6BAAe;AAC1C,WAAK,aAAa;AAClB,UAAI,WAAW,WAAW,GAAG;AAE5B,YAAI,CAAC,KAAK,WAAW,GAAG,GAAG;AAC1B,eAAK,WAAW,GAAG;AAAA,QACpB;AAAA,MACD,OAAO;AAEN,aAAK,WAAW,GAAG;AAAA,MACpB;AACA,UAAI,WAAW,UAAU,GAAG;AAC3B,YAAI,KAAK,WAAW,GAAG,GAAG;AACzB,iBAAO;AAAA,QACR;AAAA,MACD;AACA,aAAO;AAAA,IACR,GAjB4B;AAkB5B,WAAO,CAAC,KAAK,MAAM;AAClB,UAAI,WAAW,UAAU,GAAG;AAC3B,cAAM,KAAK,KAAK,aAAc,YAAa,UAAU;AAAA,MACtD;AACA,WAAK,aAAa;AAClB,YAAM,YAAY,KAAK,yBAAyB;AAChD,UAAI,aAAa,MAAM;AACtB,mBAAW,KAAK,SAAS;AACzB,YAAI,oBAAoB,GAAG;AAC1B;AAAA,QACD;AAAA,MACD,OAAO;AACN,cAAM,KAAK,KAAK,aAAc,YAAa,UAAU;AAAA,MACtD;AAAA,IACD;AACA,WAAO;AAAA,MACN;AAAA,MACA;AAAA,MACA,GAAI,SAAS,OAAO,CAAC,IAAI,EAAE,MAAM;AAAA,IAClC;AAAA,EACD;AAAA,EAEO,aAA4B;AAClC,WAAO,EAAE,KAAK,KAAK,aAAa,CAAC,GAAG,MAAM,MAAM,IAAI,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE;AAAA,EAChF;AAAA,EAEO,eAAe,gBAA6B,MAAM,IAAI,YAAY,yBAA0B,KAAK,EAAG,EAAE,GAAW;AACvH,UAAM,UAAU,KAAK,kBAAkB;AACvC,QAAI,WAAW,MAAM;AACpB,aAAO;AAAA,IACR;AACA,UAAM,cAAc;AAAA,EACrB;AAAA,EAEU,KAAK,SAAiB,UAAoC,CAAC,GAAa;AACjF,WAAO,IAAI,SAAS,KAAK,MAAM,EAAE,GAAG,SAAS,QAAQ,CAAC;AAAA,EACvD;AAAA,EAEU,2BAAsD;AAC/D,QAAI,KAAK,WAAW,MAAM,GAAG;AAC5B,aAAO,CAAE,GAAG,MAAU;AAAA,IACvB;AACA,UAAM,cAAc,KAAK,iBAAiB;AAC1C,QAAI,eAAe,MAAM;AACxB,aAAO;AAAA,IACR;AACA,SAAK,aAAa;AAClB,QAAI;AACJ,QAAI,KAAK,WAAW,GAAG,GAAG;AACzB,aAAO;AAAA,IACR,OAAO;AACN,aAAO,KAAK,kBAAkB;AAAA,IAC/B;AACA,SAAK,aAAa;AAClB,WAAO,CAAE,aAAa,IAAK;AAAA,EAC5B;AAAA,EAEO,oBAAwC;AAC9C,UAAM,UAAU,KAAK,aAAa,CAAC,GAAG,MAAM,MAAM,IAAI,WAAC,mBAAe,GAAC,EAAC,KAAK,CAAC,IAAI,wBAAwB,KAAK,CAAC,CAAC;AACjH,WAAO,YAAY,KAAK,SAAY;AAAA,EACrC;AAAA,EAEO,mBAAuC;AAC7C,UAAM,OAAO,KAAK,WAAW,GAAG,IAAI,KAAK;AACzC,UAAM,UAAU,KAAK,aAAa,OAAO;AACzC,QAAI,YAAY,IAAI;AACnB,UAAI,OAAO,GAAG;AACb,cAAM,KAAK,KAAK,wBAAyB,KAAK,EAAG,EAAE;AAAA,MACpD;AACA,aAAO;AAAA,IACR;AACA,QAAI,KAAK,WAAW,GAAG,GAAG;AACzB,YAAM,WAAW,KAAK,aAAa,OAAO;AAC1C,aAAO,OAAO,OAAO,WAAW,GAAI,OAAQ,IAAK,QAAS,EAAE;AAAA,IAC7D;AACA,WAAO,OAAO,OAAO,SAAS,SAAS,EAAE;AAAA,EAC1C;AACD;AAhIgD;AAAhD,IAAM,oBAAN;AAkIO,MAAM,qBAAqB,wBACjC,SACgC;AAChC,SAAO,kBAAkB,QAAQ,IAAI,EAAE,aAAa;AACrD,GAJkC;",
   "names": []
 }

package/index.cjs

@@ -22,6 +22,5 @@ __reExport(index_exports, require("./css-error.cjs"), module.exports);
 __reExport(index_exports, require("./distance.cjs"), module.exports);
 __reExport(index_exports, require("./format.cjs"), module.exports);
 __reExport(index_exports, require("./href.cjs"), module.exports);
-__reExport(index_exports, require("./tokenizer.cjs"), module.exports);
 __reExport(index_exports, require("./units.cjs"), module.exports);
 //# sourceMappingURL=index.cjs.map

package/index.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/packages/css/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA,0BAAc,uBAAd;AACA,0BAAc,8BADd;AAEA,0BAAc,wBAFd;AAGA,0BAAc,2BAHd;AAIA,0BAAc,0BAJd;AAKA,0BAAc,wBALd;AAMA,0BAAc,sBANd;AAOA,0BAAc,2BAPd;AAQA,0BAAc,uBARd;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA,0BAAc,uBAAd;AACA,0BAAc,8BADd;AAEA,0BAAc,wBAFd;AAGA,0BAAc,2BAHd;AAIA,0BAAc,0BAJd;AAKA,0BAAc,wBALd;AAMA,0BAAc,sBANd;AAOA,0BAAc,uBAPd;",
   "names": []
 }

package/index.d.ts

@@ -5,6 +5,5 @@ export * from "./css-error";
 export * from "./distance";
 export * from "./format";
 export * from "./href";
-export * from "./tokenizer";
 export * from "./units";
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/packages/css/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/packages/css/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC"}

package/index.mjs

@@ -5,6 +5,5 @@ export * from "./css-error.mjs";
 export * from "./distance.mjs";
 export * from "./format.mjs";
 export * from "./href.mjs";
-export * from "./tokenizer.mjs";
 export * from "./units.mjs";
 //# sourceMappingURL=index.mjs.map

package/index.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/packages/css/index.ts"],
-  "mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;",
+  "mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;",
   "names": []
 }

package/package.json

@@ -4,9 +4,9 @@
 		"url": "https://rickosborne.org"
 	},
 	"dependencies": {
-		"@rickosborne/foundation": "2025.2.16",
-		"@rickosborne/guard": "2025.2.16",
-		"@rickosborne/typical": "2025.2.16"
+		"@rickosborne/foundation": "2025.3.4",
+		"@rickosborne/guard": "2025.3.4",
+		"@rickosborne/typical": "2025.3.4"
 	},
 	"description": "Rick Osborne's collection of CSS-related code.",
 	"engines": {
@@ -67,12 +67,6 @@
 			"require": "./href.cjs",
 			"default": "./href.mjs"
 		},
-		"./tokenizer": {
-			"types": "./tokenizer.d.ts",
-			"import": "./tokenizer.mjs",
-			"require": "./tokenizer.cjs",
-			"default": "./tokenizer.mjs"
-		},
 		"./units": {
 			"types": "./units.d.ts",
 			"import": "./units.mjs",
@@ -82,12 +76,12 @@
 	},
 	"git": {
 		"authorName": "Rick Osborne",
-		"commitDateISO": "2025-02-17T01:56:13.000Z",
-		"commitHash": "2752126d79472c1f03b198ee33bcc30ff3a945a1",
-		"commitLink": "https://github.com/rickosborne/es-js-ts/commits/2752126d79472c1f03b198ee33bcc30ff3a945a1",
-		"parentHash": "94ad06ec519f22510af76f7ed91b46920aab1c7b",
+		"commitDateISO": "2025-03-04T05:14:45.000Z",
+		"commitHash": "6071cb511bb7f4cd0d99a077bb1affbaecb11780",
+		"commitLink": "https://github.com/rickosborne/es-js-ts/commits/6071cb511bb7f4cd0d99a077bb1affbaecb11780",
+		"parentHash": "f2b2d42c3564ccab51d8b3b847e89ff74ae82dd5",
 		"signingKeyId": "8e61c433fe39d4a4679ce1d5b873fb3c48464f3c",
-		"tag": "v2025.2.16"
+		"tag": "v2025.3.4"
 	},
 	"homepage": "https://github.com/rickosborne/es-js-ts",
 	"keywords": [
@@ -110,5 +104,5 @@
 	},
 	"types": "./index.d.ts",
 	"typings": "./index.d.ts",
-	"version": "2025.2.16"
+	"version": "2025.3.4"
 }

package/tokenizer.cjs

@@ -1,87 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var tokenizer_exports = {};
-__export(tokenizer_exports, {
-  readFromCSS: () => readFromCSS
-});
-module.exports = __toCommonJS(tokenizer_exports);
-var import_css_error = require("./css-error.cjs");
-const readFromCSS = /* @__PURE__ */ __name((text) => {
-  let remain = text.trim();
-  const done = /* @__PURE__ */ __name(() => remain.length === 0, "done");
-  return {
-    pull(...matchers) {
-      if (done()) {
-        return void 0;
-      }
-      for (const matcherOrType of matchers) {
-        const matcher = typeof matcherOrType === "string" ? { type: matcherOrType } : matcherOrType;
-        const { type, match } = matcher;
-        let pattern;
-        let builder;
-        const matchSet = match == null ? /* @__PURE__ */ new Set() : match instanceof Set ? match : typeof match === "string" ? new Set(match) : new Set(match);
-        switch (type) {
-          case "number": {
-            pattern = /^-?(?:0|[1-9][0-9]*)(?:\.[0-9]*)?/;
-            builder = /* @__PURE__ */ __name((f) => ({ type: "number", value: parseFloat(f) }), "builder");
-            break;
-          }
-          case "function": {
-            pattern = /^(\w+)\(/;
-            builder = /* @__PURE__ */ __name((name) => ({ name, type: "function" }), "builder");
-            break;
-          }
-          case "hex": {
-            pattern = /^#[a-fA-F0-9]+/;
-            builder = /* @__PURE__ */ __name((hex) => ({ hex, type: "hex" }), "builder");
-            break;
-          }
-          case "keyword": {
-            pattern = new RegExp("^\\p{ID_Start}[-\\p{ID_Continue}]*", "u");
-            builder = /* @__PURE__ */ __name((keyword) => ({ keyword, type: "keyword" }), "builder");
-            break;
-          }
-          case "literal": {
-            if (matchSet.size == 0) {
-              throw new import_css_error.CSSError(text, { expected: "match[]", message: "Unspecified literal" });
-            }
-            pattern = new RegExp("^".concat(Array.from(matchSet).map((t) => t.replace(/([\\()[\].^${}])/g, "\\$1")).join("|")));
-            builder = /* @__PURE__ */ __name((literal) => ({ literal, type: "literal" }), "builder");
-            break;
-          }
-          default: {
-            throw new import_css_error.CSSError(type, { expected: "type", message: `Unknown token type: ${type}` });
-          }
-        }
-        const peek = pattern.exec(remain);
-        if (peek != null) {
-          let remove = peek[0];
-          let matched = peek[1] ?? peek[0];
-          if (matchSet.has(matched) || matchSet.size === 0) {
-            remain = remain.substring(remove.length).trim();
-            return builder(matched);
-          }
-        }
-      }
-      return void 0;
-    }
-  };
-}, "readFromCSS");
-//# sourceMappingURL=tokenizer.cjs.map

package/tokenizer.cjs.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/packages/css/tokenizer.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAyB;AA2ClB,MAAM,cAAc,wBAC1B,SACoB;AACpB,MAAI,SAAS,KAAK,KAAK;AACvB,QAAM,OAAO,6BAAM,OAAO,WAAW,GAAxB;AACb,SAAO;AAAA,IACN,QAAuC,UAA8F;AACpI,UAAI,KAAK,GAAG;AACX,eAAO;AAAA,MACR;AACA,iBAAW,iBAAiB,UAAU;AACrC,cAAM,UAAU,OAAO,kBAAkB,WAAW,EAAE,MAAM,cAAc,IAAI;AAC9E,cAAM,EAAE,MAAM,MAAM,IAAI;AACxB,YAAI;AACJ,YAAI;AACJ,cAAM,WAAW,SAAS,OAAO,oBAAI,IAAY,IAAI,iBAAiB,MAAM,QAAQ,OAAO,UAAU,WAAW,IAAI,IAAY,KAAK,IAAI,IAAI,IAAY,KAAK;AAC9J,gBAAQ,MAAM;AAAA,UACb,KAAK,UAAU;AACd,sBAAU;AACV,sBAAU,wBAAC,OAAO,EAAE,MAAM,UAAU,OAAO,WAAW,CAAC,EAAE,IAA/C;AACV;AAAA,UACD;AAAA,UACA,KAAK,YAAY;AAChB,sBAAU;AACV,sBAAU,wBAAC,UAAU,EAAE,MAAM,MAAM,WAAW,IAApC;AACV;AAAA,UACD;AAAA,UACA,KAAK,OAAO;AACX,sBAAU;AACV,sBAAU,wBAAC,SAAS,EAAE,KAAK,MAAM,MAAM,IAA7B;AACV;AAAA,UACD;AAAA,UACA,KAAK,WAAW;AACf,sBAAU,WAAC,sCAAiC,GAAC;AAC7C,sBAAU,wBAAC,aAAa,EAAE,SAAS,MAAM,UAAU,IAAzC;AACV;AAAA,UACD;AAAA,UACA,KAAK,WAAW;AACf,gBAAI,SAAS,QAAQ,GAAG;AACvB,oBAAM,IAAI,0BAAS,MAAM,EAAE,UAAU,WAAW,SAAS,sBAAsB,CAAC;AAAA,YACjF;AACA,sBAAU,IAAI,OAAO,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,qBAAqB,MAAM,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC;AAClH,sBAAU,wBAAC,aAAa,EAAE,SAAS,MAAM,UAAU,IAAzC;AACV;AAAA,UACD;AAAA,UACA,SAAS;AACR,kBAAM,IAAI,0BAAS,MAAM,EAAE,UAAU,QAAQ,SAAS,uBAAwB,IAAK,GAAG,CAAC;AAAA,UACxF;AAAA,QACD;AACA,cAAM,OAAO,QAAQ,KAAK,MAAM;AAChC,YAAI,QAAQ,MAAM;AACjB,cAAI,SAAS,KAAM,CAAE;AACrB,cAAI,UAAU,KAAM,CAAE,KAAK,KAAM,CAAE;AACnC,cAAI,SAAS,IAAI,OAAO,KAAK,SAAS,SAAS,GAAG;AACjD,qBAAS,OAAO,UAAU,OAAO,MAAM,EAAE,KAAK;AAC9C,mBAAO,QAAQ,OAAO;AAAA,UACvB;AAAA,QACD;AAAA,MACD;AACA,aAAO;AAAA,IACR;AAAA,EACD;AACD,GA9D2B;",
-  "names": []
-}

package/tokenizer.d.ts

@@ -1,34 +0,0 @@
-export interface CSSColorToken<Type extends string = string> {
-    type: Type;
-}
-export interface CSSLiteralToken extends CSSColorToken<"literal"> {
-    literal: string;
-}
-export interface CSSHexHashToken extends CSSColorToken<"hex"> {
-    hex: string;
-}
-export interface CSSKeywordToken extends CSSColorToken<"keyword"> {
-    keyword: string;
-}
-export interface CSSFunctionToken extends CSSColorToken<"function"> {
-    name: string;
-}
-export interface CSSNumberToken extends CSSColorToken<"number"> {
-    value: number;
-}
-export interface CSSTokenReaderMatcher<Type extends CSSToken["type"] = CSSToken["type"]> {
-    match?: string[] | readonly string[] | Set<string> | undefined;
-    type: Type;
-}
-export type CSSToken = CSSKeywordToken | CSSFunctionToken | CSSHexHashToken | CSSLiteralToken | CSSNumberToken;
-export interface CSSTokenReader {
-    pull<Type extends CSSToken["type"]>(...matchers: (Type | CSSTokenReaderMatcher<Type>)[]): CSSColorToken<Type> & CSSToken | undefined;
-}
-/**
- * Minimal CSS pull parser, which only supports the happy-path
- * tokens expected in a CSS color expression.  Does not support
- * anywhere near the full CSS Colors spec, but it'll do in a pinch.
- * @see {@link https://www.w3.org/TR/css-color-4/ | CSS Color Level 4}
- */
-export declare const readFromCSS: (text: string) => CSSTokenReader;
-//# sourceMappingURL=tokenizer.d.ts.map

package/tokenizer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tokenizer.d.ts","sourceRoot":"","sources":["../../../src/packages/css/tokenizer.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM;IAC1D,IAAI,EAAE,IAAI,CAAC;CACX;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,SAAS,CAAC;IAChE,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,KAAK,CAAC;IAC5D,GAAG,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,SAAS,CAAC;IAChE,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAiB,SAAQ,aAAa,CAAC,UAAU,CAAC;IAClE,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,cAAe,SAAQ,aAAa,CAAC,QAAQ,CAAC;IAC9D,KAAK,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB,CAAC,IAAI,SAAS,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;IACtF,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IAC/D,IAAI,EAAE,IAAI,CAAC;CACX;AAED,MAAM,MAAM,QAAQ,GAAG,eAAe,GAAG,gBAAgB,GAAG,eAAe,GAAG,eAAe,GAAG,cAAc,CAAC;AAE/G,MAAM,WAAW,cAAc;IAC9B,IAAI,CAAC,IAAI,SAAS,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC,IAAI,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,QAAQ,GAAG,SAAS,CAAC;CACrI;AAED;;;;;GAKG;AACH,eAAO,MAAM,WAAW,SACjB,MAAM,KACV,cA4DF,CAAC"}

package/tokenizer.mjs

@@ -1,68 +0,0 @@
-var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-import { CSSError } from "./css-error.mjs";
-const readFromCSS = /* @__PURE__ */ __name((text) => {
-  let remain = text.trim();
-  const done = /* @__PURE__ */ __name(() => remain.length === 0, "done");
-  return {
-    pull(...matchers) {
-      if (done()) {
-        return void 0;
-      }
-      for (const matcherOrType of matchers) {
-        const matcher = typeof matcherOrType === "string" ? { type: matcherOrType } : matcherOrType;
-        const { type, match } = matcher;
-        let pattern;
-        let builder;
-        const matchSet = match == null ? /* @__PURE__ */ new Set() : match instanceof Set ? match : typeof match === "string" ? new Set(match) : new Set(match);
-        switch (type) {
-          case "number": {
-            pattern = /^-?(?:0|[1-9][0-9]*)(?:\.[0-9]*)?/;
-            builder = /* @__PURE__ */ __name((f) => ({ type: "number", value: parseFloat(f) }), "builder");
-            break;
-          }
-          case "function": {
-            pattern = /^(\w+)\(/;
-            builder = /* @__PURE__ */ __name((name) => ({ name, type: "function" }), "builder");
-            break;
-          }
-          case "hex": {
-            pattern = /^#[a-fA-F0-9]+/;
-            builder = /* @__PURE__ */ __name((hex) => ({ hex, type: "hex" }), "builder");
-            break;
-          }
-          case "keyword": {
-            pattern = new RegExp("^\\p{ID_Start}[-\\p{ID_Continue}]*", "u");
-            builder = /* @__PURE__ */ __name((keyword) => ({ keyword, type: "keyword" }), "builder");
-            break;
-          }
-          case "literal": {
-            if (matchSet.size == 0) {
-              throw new CSSError(text, { expected: "match[]", message: "Unspecified literal" });
-            }
-            pattern = new RegExp("^".concat(Array.from(matchSet).map((t) => t.replace(/([\\()[\].^${}])/g, "\\$1")).join("|")));
-            builder = /* @__PURE__ */ __name((literal) => ({ literal, type: "literal" }), "builder");
-            break;
-          }
-          default: {
-            throw new CSSError(type, { expected: "type", message: `Unknown token type: ${type}` });
-          }
-        }
-        const peek = pattern.exec(remain);
-        if (peek != null) {
-          let remove = peek[0];
-          let matched = peek[1] ?? peek[0];
-          if (matchSet.has(matched) || matchSet.size === 0) {
-            remain = remain.substring(remove.length).trim();
-            return builder(matched);
-          }
-        }
-      }
-      return void 0;
-    }
-  };
-}, "readFromCSS");
-export {
-  readFromCSS
-};
-//# sourceMappingURL=tokenizer.mjs.map

package/tokenizer.mjs.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/packages/css/tokenizer.ts"],
-  "mappings": ";;AAAA,SAAS,gBAAgB;AA2ClB,MAAM,cAAc,wBAC1B,SACoB;AACpB,MAAI,SAAS,KAAK,KAAK;AACvB,QAAM,OAAO,6BAAM,OAAO,WAAW,GAAxB;AACb,SAAO;AAAA,IACN,QAAuC,UAA8F;AACpI,UAAI,KAAK,GAAG;AACX,eAAO;AAAA,MACR;AACA,iBAAW,iBAAiB,UAAU;AACrC,cAAM,UAAU,OAAO,kBAAkB,WAAW,EAAE,MAAM,cAAc,IAAI;AAC9E,cAAM,EAAE,MAAM,MAAM,IAAI;AACxB,YAAI;AACJ,YAAI;AACJ,cAAM,WAAW,SAAS,OAAO,oBAAI,IAAY,IAAI,iBAAiB,MAAM,QAAQ,OAAO,UAAU,WAAW,IAAI,IAAY,KAAK,IAAI,IAAI,IAAY,KAAK;AAC9J,gBAAQ,MAAM;AAAA,UACb,KAAK,UAAU;AACd,sBAAU;AACV,sBAAU,wBAAC,OAAO,EAAE,MAAM,UAAU,OAAO,WAAW,CAAC,EAAE,IAA/C;AACV;AAAA,UACD;AAAA,UACA,KAAK,YAAY;AAChB,sBAAU;AACV,sBAAU,wBAAC,UAAU,EAAE,MAAM,MAAM,WAAW,IAApC;AACV;AAAA,UACD;AAAA,UACA,KAAK,OAAO;AACX,sBAAU;AACV,sBAAU,wBAAC,SAAS,EAAE,KAAK,MAAM,MAAM,IAA7B;AACV;AAAA,UACD;AAAA,UACA,KAAK,WAAW;AACf,sBAAU,WAAC,sCAAiC,GAAC;AAC7C,sBAAU,wBAAC,aAAa,EAAE,SAAS,MAAM,UAAU,IAAzC;AACV;AAAA,UACD;AAAA,UACA,KAAK,WAAW;AACf,gBAAI,SAAS,QAAQ,GAAG;AACvB,oBAAM,IAAI,SAAS,MAAM,EAAE,UAAU,WAAW,SAAS,sBAAsB,CAAC;AAAA,YACjF;AACA,sBAAU,IAAI,OAAO,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,qBAAqB,MAAM,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC;AAClH,sBAAU,wBAAC,aAAa,EAAE,SAAS,MAAM,UAAU,IAAzC;AACV;AAAA,UACD;AAAA,UACA,SAAS;AACR,kBAAM,IAAI,SAAS,MAAM,EAAE,UAAU,QAAQ,SAAS,uBAAwB,IAAK,GAAG,CAAC;AAAA,UACxF;AAAA,QACD;AACA,cAAM,OAAO,QAAQ,KAAK,MAAM;AAChC,YAAI,QAAQ,MAAM;AACjB,cAAI,SAAS,KAAM,CAAE;AACrB,cAAI,UAAU,KAAM,CAAE,KAAK,KAAM,CAAE;AACnC,cAAI,SAAS,IAAI,OAAO,KAAK,SAAS,SAAS,GAAG;AACjD,qBAAS,OAAO,UAAU,OAAO,MAAM,EAAE,KAAK;AAC9C,mBAAO,QAAQ,OAAO;AAAA,UACvB;AAAA,QACD;AAAA,MACD;AACA,aAAO;AAAA,IACR;AAAA,EACD;AACD,GA9D2B;",
-  "names": []
-}