@shipworthy/openapi-parser 0.0.2 → 1.0.0

package/dist/yaml.js

@@ -1,3 +1,4 @@
+import { Array as Arr, pipe, Predicate, Record as Rec, String as Str } from "effect";
 import * as Yaml from "effect/encoding/Yaml";
 const blockScalar = /^[|>](?:[1-9]?[+-]?|[+-]?[1-9]?)$/;
 /**
@@ -5,8 +6,8 @@ const blockScalar = /^[|>](?:[1-9]?[+-]?|[+-]?[1-9]?)$/;
  * OpenAPI fixtures in this repo use both, so expand those forms before parsing.
  */
 export function parseYamlDocument(source) {
-    const text = source.charCodeAt(0) === 0xfeff ? source.slice(1) : source;
-    if (text.trim().length === 0)
+    const text = Str.startsWith("\uFEFF")(source) ? Str.slice(1)(source) : source;
+    if (isBlank(text))
         return null;
     return applyMergeKeys(Yaml.parse(expandCompactNestedSequences(deepenShallowBlockScalars(relaxIndentTabs(text)))));
 }
@@ -16,12 +17,12 @@ export function parseYamlDocument(source) {
  * drop the explicit indicator so auto-detection keeps the scalar text.
  */
 function deepenShallowBlockScalars(source) {
-    const lines = source.replace(/\r\n?/g, "\n").split("\n");
+    const lines = pipe(source, Str.replace(/\r\n?/g, "\n"), Str.split("\n"));
     const output = [];
     for (let index = 0; index < lines.length; index++) {
         const line = lines[index] ?? "";
         const indent = leadingSpaces(line);
-        const text = stripComment(line.slice(indent)).trimEnd();
+        const text = pipe(line, Str.slice(indent), stripComment, Str.trimEnd);
         if (!isExplicitBlockScalar(text) || !hasShallowContent(lines, index, indent)) {
             output.push(line);
             continue;
@@ -30,49 +31,49 @@ function deepenShallowBlockScalars(source) {
         index++;
         while (index < lines.length) {
             const next = lines[index] ?? "";
-            if (next.trim().length > 0 && leadingSpaces(next) < indent)
+            if (!isBlank(next) && leadingSpaces(next) < indent)
                 break;
-            output.push(next.trim().length === 0 ? next : `  ${next}`);
+            output.push(isBlank(next) ? next : `  ${next}`);
             index++;
         }
         index--;
     }
-    return output.join("\n");
+    return Arr.join(output, "\n");
 }
 function isExplicitBlockScalar(text) {
     return /^[|>](?:[+-]?[1-9]|[1-9][+-])$/.test(scalarToken(text));
 }
 function scalarToken(text) {
     const separator = mappingSeparator(text);
-    const token = separator === -1 ? text : text.slice(separator + 1).trim();
-    if (token === "-" || token.startsWith("- ")) {
-        const item = token.slice(1).trimStart();
+    const token = separator === -1 ? text : afterIndex(text, separator);
+    if (token === "-" || Str.startsWith("- ")(token)) {
+        const item = pipe(token, Str.slice(1), Str.trimStart);
         const nested = mappingSeparator(item);
-        return nested === -1 ? item : item.slice(nested + 1).trim();
+        return nested === -1 ? item : afterIndex(item, nested);
     }
     return token;
 }
 function hasShallowContent(lines, header, indent) {
     for (let index = header + 1; index < lines.length; index++) {
         const line = lines[index] ?? "";
-        if (line.trim().length === 0)
+        if (isBlank(line))
             continue;
         return leadingSpaces(line) <= indent;
     }
     return false;
 }
 function dropExplicitIndent(line) {
-    return line.replace(/([|>])(\+|-)?[1-9](\+|-)?(\s*(?:#.*)?)?$/, (_, bar, before, after, tail) => `${bar}${before ?? ""}${after ?? ""}${tail ?? ""}`);
+    return Str.replace(/([|>])(\+|-)?[1-9](\+|-)?(\s*(?:#.*)?)?$/, "$1$2$3$4")(line);
 }
-/** Effect rejects a tab after leading spaces, including inside block scalars. */
+/**
+ * Effect rejects a tab after leading spaces, including inside block scalars.
+ * Replace each tab in a line's leading run of spaces then tabs with two spaces.
+ */
 function relaxIndentTabs(source) {
-    return source.replace(/^( *)\t+/gm, (match, spaces) => spaces + "  ".repeat(match.length - spaces.length));
+    return Str.replace(/(?<=^ *\t*)\t/gm, "  ")(source);
 }
 export function expandCompactNestedSequences(source) {
-    const lines = source
-        .replace(/^\uFEFF/, "")
-        .replace(/\r\n?/g, "\n")
-        .split("\n");
+    const lines = pipe(source, Str.replace(/^\uFEFF/, ""), Str.replace(/\r\n?/g, "\n"), Str.split("\n"));
     const output = [];
     let blockIndent = -1;
     for (const line of lines) {
@@ -80,32 +81,32 @@ export function expandCompactNestedSequences(source) {
         while (true) {
             const indent = leadingSpaces(raw);
             if (blockIndent >= 0) {
-                if (raw.trim().length > 0 && indent <= blockIndent)
+                if (!isBlank(raw) && indent <= blockIndent)
                     blockIndent = -1;
                 else
                     break;
             }
-            const text = stripComment(raw.slice(indent)).trimEnd();
+            const text = pipe(raw, Str.slice(indent), stripComment, Str.trimEnd);
             const compact = compactRest(raw, indent);
             if (compact === undefined) {
                 if (isBlockScalar(text))
                     blockIndent = indent;
                 break;
             }
-            output.push(`${" ".repeat(indent)}-`);
-            raw = `${" ".repeat(indent + 2)}${compact}`;
+            output.push(`${Str.repeat(indent)(" ")}-`);
+            raw = `${Str.repeat(indent + 2)(" ")}${compact}`;
         }
         output.push(raw);
     }
-    return output.join("\n");
+    return Arr.join(output, "\n");
 }
 function compactRest(raw, indent) {
-    const body = raw.slice(indent);
-    if (!body.startsWith("- "))
+    const body = Str.slice(indent)(raw);
+    if (!Str.startsWith("- ")(body))
         return undefined;
-    const rest = body.slice(2);
-    const text = stripComment(rest).trimEnd();
-    if (text === "-" || text.startsWith("- "))
+    const rest = Str.slice(2)(body);
+    const text = Str.trimEnd(stripComment(rest));
+    if (text === "-" || Str.startsWith("- ")(text))
         return rest;
     return undefined;
 }
@@ -114,60 +115,60 @@ function isBlockScalar(text) {
         return true;
     const separator = mappingSeparator(text);
     if (separator !== -1)
-        return blockScalar.test(text.slice(separator + 1).trim());
-    if (text === "-" || text.startsWith("- ")) {
-        const item = text.slice(1).trimStart();
+        return blockScalar.test(afterIndex(text, separator));
+    if (text === "-" || Str.startsWith("- ")(text)) {
+        const item = pipe(text, Str.slice(1), Str.trimStart);
         const nested = mappingSeparator(item);
         if (nested === -1)
             return blockScalar.test(item);
-        return blockScalar.test(item.slice(nested + 1).trim());
+        return blockScalar.test(afterIndex(item, nested));
     }
     return false;
 }
 function applyMergeKeys(value, seen = new Set()) {
-    if (typeof value !== "object" || value === null || seen.has(value))
+    if (!Predicate.isObjectOrArray(value) || seen.has(value))
         return value;
     seen.add(value);
-    if (Array.isArray(value)) {
+    if (Arr.isArray(value)) {
         for (let index = 0; index < value.length; index++)
             value[index] = applyMergeKeys(value[index], seen);
         return value;
     }
     const record = value;
-    for (const key of Object.keys(record))
+    for (const key of Rec.keys(record))
         record[key] = applyMergeKeys(record[key], seen);
-    if (!Object.keys(record).some(isMergeKey))
+    if (!Arr.some(Rec.keys(record), isMergeKey))
         return record;
     const next = {};
-    for (const key of Object.keys(record)) {
+    for (const key of Rec.keys(record)) {
         if (!isMergeKey(key)) {
             next[key] = record[key];
             continue;
         }
         const source = record[key];
-        const entries = Array.isArray(source) ? source : [source];
+        const entries = Arr.isArray(source) ? source : [source];
         for (const entry of entries) {
-            if (typeof entry !== "object" || entry === null || Array.isArray(entry))
+            if (!Predicate.isObject(entry))
                 continue;
-            for (const [mergedKey, mergedValue] of Object.entries(entry)) {
-                if (isMergeKey(mergedKey) || Object.hasOwn(next, mergedKey))
+            for (const [mergedKey, mergedValue] of Rec.toEntries(entry)) {
+                if (isMergeKey(mergedKey) || Rec.has(next, mergedKey))
                     continue;
                 next[mergedKey] = mergedValue;
             }
         }
     }
-    for (const key of Object.keys(record))
+    for (const key of Rec.keys(record))
         delete record[key];
     Object.assign(record, next);
     return record;
 }
 function isMergeKey(key) {
-    const text = key.trim();
+    const text = Str.trim(key);
     return text === "<<" || /^!!\S+\s+<<$/.test(text) || /^!<[^>]+>\s+<<$/.test(text);
 }
 function leadingSpaces(raw) {
     let index = 0;
-    while (raw.charCodeAt(index) === 32)
+    while (raw[index] === " ")
         index++;
     return index;
 }
@@ -230,6 +231,9 @@ const findIndicator = (input, indicator) => {
 };
 const stripComment = (input) => {
     const index = findIndicator(input, "#");
-    return index === -1 ? input : input.slice(0, index).trimEnd();
+    return index === -1 ? input : pipe(input, Str.slice(0, index), Str.trimEnd);
 };
 const mappingSeparator = (input) => findIndicator(input, ":");
+/** The trimmed text after `index`. */
+const afterIndex = (input, index) => pipe(input, Str.slice(index + 1), Str.trim);
+const isBlank = (input) => Str.isEmpty(Str.trim(input));

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@shipworthy/openapi-parser",
-  "version": "0.0.2",
+  "version": "1.0.0",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@effect/platform-node": "^4.0.0",
-    "effect": "^4.0.0"
+    "@effect/platform-node": "4.1.4",
+    "@effect/platform-node-shared": "4.1.4",
+    "effect": "4.1.4"
   },
   "description": "Parse, bundle, and upgrade OpenAPI documents with Effect schemas.",
   "license": "MIT",
@@ -32,11 +33,11 @@
     "build": "rm -rf dist && tsc -p tsconfig.build.json"
   },
   "devDependencies": {
-    "@effect/vitest": "4.0.0",
+    "@effect/vitest": "4.1.4",
     "@shipworthy/typescript-config": "0.0.1",
-    "@types/node": "^24.10.3",
+    "@types/node": "^26.6.6",
     "typescript": "^7.0.2",
-    "vitest": "5.0.3"
+    "vitest": "5.1.0"
   },
   "engines": {
     "node": ">=22.19.0"