liminal 0.12.2 → 0.13.0

package/util/fixRaw.ts

@@ -0,0 +1,93 @@
+const LEADING_SPACE_RE = /^([ \t]*)/
+const INDENTATION_RE = /^\n([ \t]+)/
+const ESCAPE_SEQ_RE = /\\([`${\\]|\n)/g
+const LAST_INDENTATION_RE = /\n[ \t]+$/
+
+export const fixRaw = (strings: TemplateStringsArray, values: Array<unknown>): string => {
+  const fixedStrings = fixTemplateStrings(strings)
+  const rawArr = fixedStrings.raw
+  const valuesLength = values.length
+
+  const resultParts = new Array(Math.max(1, rawArr.length * 2 - 1))
+  let resultIndex = 0
+
+  for (let i = 0; i < rawArr.length; i++) {
+    const str = rawArr[i] || ""
+    resultParts[resultIndex++] = str
+
+    // Only process values for non-final segments.
+    if (i < valuesLength) {
+      const value = String(values[i])
+
+      // If value has line breaks, we should indent it.
+      if (value.includes("\n")) {
+        const lastNewlineIndex = str.lastIndexOf("\n")
+
+        if (lastNewlineIndex !== -1) {
+          // Extract the indentation after the last newline.
+          const textAfterLastNewline = str.substring(lastNewlineIndex + 1)
+          const leadingSpaceMatch = LEADING_SPACE_RE.exec(textAfterLastNewline)
+          const indentationToApply = leadingSpaceMatch && leadingSpaceMatch[1] ? leadingSpaceMatch[1] : ""
+
+          if (indentationToApply) {
+            // Split the value into lines once.
+            const lines = value.split("\n")
+            const linesLength = lines.length
+
+            // First line doesn't need indentation.
+            resultParts[resultIndex++] = lines[0]
+
+            // Apply indentation to subsequent lines.
+            for (let j = 1; j < linesLength; j++) {
+              resultParts[resultIndex++] = "\n" + indentationToApply + lines[j]
+            }
+            continue
+          }
+        }
+      }
+      // For simple values or when no indentation is needed.
+      resultParts[resultIndex++] = value
+    }
+  }
+
+  // Combine all parts at once
+  return resultParts.slice(0, resultIndex).join("")
+}
+
+export const fixTemplateStrings = (template: TemplateStringsArray): {
+  readonly raw: readonly string[]
+} => {
+  const leadingIndentMatch = INDENTATION_RE.exec(template.raw[0]!)
+  const indentation = leadingIndentMatch?.[1]
+
+  const rawLength = template.raw.length
+  const raw = new Array(rawLength)
+
+  for (let i = 0; i < rawLength; i++) {
+    let str = template.raw[i]!
+    // Only perform common indentation replacements if needed.
+    if (indentation) {
+      // Remove leading newline and indentation in the first segment.
+      if (i === 0) {
+        str = str.slice(indentation.length + 1)
+      }
+      // Use a simple string replacement with a regular expression for better performance.
+      str = str.replaceAll(`\n${indentation}`, "\n")
+    }
+
+    // Replace common escape sequences in a single pass.
+    str = str.replace(ESCAPE_SEQ_RE, (_match, char) => {
+      // Keep the escaped newline replacement separate for clarity.
+      return char === "\n" ? "" : char
+    })
+
+    // Handle trailing spaces only for the last segment.
+    if (indentation && i === rawLength - 1) {
+      str = str.replace(LAST_INDENTATION_RE, "")
+    }
+
+    raw[i] = str
+  }
+
+  return { raw }
+}

package/assistantStruct.ts

@@ -1,34 +0,0 @@
-import type { AiError } from "@effect/ai/AiError"
-import { AssistantMessage, TextPart } from "@effect/ai/AiInput"
-import { AiLanguageModel } from "@effect/ai/AiLanguageModel"
-import * as Effect from "effect/Effect"
-import * as Option from "effect/Option"
-import * as Schema from "effect/Schema"
-import { append } from "./append.ts"
-import { Strand } from "./Strand.ts"
-
-/** Infer a structured assistant message and append its JSON representation to the conversation. */
-export const assistantStruct: {
-  <F extends Record<string, Schema.Schema.AnyNoContext>>(
-    fields: F,
-  ): Effect.Effect<{ [K in keyof F]: Schema.Schema.Type<F[K]> }, AiError, AiLanguageModel | Strand>
-  <O, I extends Record<string, unknown>>(
-    schema: Schema.Schema<O, I, never>,
-  ): Effect.Effect<O, AiError, AiLanguageModel | Strand>
-} = Effect.fnUntraced(
-  function*(schema) {
-    const model = yield* AiLanguageModel
-    const { system, messages } = yield* Strand
-    const { value, text } = yield* model.generateObject({
-      system: Option.getOrUndefined(system),
-      schema: Schema.isSchema(schema) ? schema as Schema.Schema.AnyNoContext : Schema.Struct(schema),
-      prompt: messages,
-    })
-    yield* append(
-      new AssistantMessage({
-        parts: [new TextPart({ text })],
-      }),
-    )
-    return value
-  },
-)

package/dist/assistantStruct.js

@@ -1,22 +0,0 @@
-import { AssistantMessage, TextPart } from "@effect/ai/AiInput";
-import { AiLanguageModel } from "@effect/ai/AiLanguageModel";
-import * as Effect from "effect/Effect";
-import * as Option from "effect/Option";
-import * as Schema from "effect/Schema";
-import { append } from "./append.js";
-import { Strand } from "./Strand.js";
-/** Infer a structured assistant message and append its JSON representation to the conversation. */
-export const assistantStruct = Effect.fnUntraced(function* (schema) {
-    const model = yield* AiLanguageModel;
-    const { system, messages } = yield* Strand;
-    const { value, text } = yield* model.generateObject({
-        system: Option.getOrUndefined(system),
-        schema: Schema.isSchema(schema) ? schema : Schema.Struct(schema),
-        prompt: messages,
-    });
-    yield* append(new AssistantMessage({
-        parts: [new TextPart({ text })],
-    }));
-    return value;
-});
-//# sourceMappingURL=assistantStruct.js.map

package/dist/assistantStruct.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"assistantStruct.js","sourceRoot":"","sources":["../assistantStruct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,mGAAmG;AACnG,MAAM,CAAC,MAAM,eAAe,GAOxB,MAAM,CAAC,UAAU,CACnB,QAAQ,CAAC,EAAC,MAAM;IACd,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IACpC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,CAAA;IAC1C,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC;QAClD,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC;QACrC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAoC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QAC9F,MAAM,EAAE,QAAQ;KACjB,CAAC,CAAA;IACF,KAAK,CAAC,CAAC,MAAM,CACX,IAAI,gBAAgB,CAAC;QACnB,KAAK,EAAE,CAAC,IAAI,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;KAChC,CAAC,CACH,CAAA;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CACF,CAAA"}