nuabase 2.3.2 → 2.3.3

package/dist/cjs/index.cjs

@@ -154,7 +154,7 @@ function requireLlmResponseExtraction() {
   hasRequiredLlmResponseExtraction = 1;
   Object.defineProperty(llmResponseExtraction, "__esModule", { value: true });
   llmResponseExtraction.extractThinkingFromResponse = extractThinkingFromResponse;
-  llmResponseExtraction.extractJsonFromMarkdown = extractJsonFromMarkdown;
+  llmResponseExtraction.parseJsonFromLlmResponse = parseJsonFromLlmResponse;
   function extractThinkingFromResponse(input) {
     const startTag = "<think>";
     const endTag = "</think>";
@@ -184,25 +184,71 @@ function requireLlmResponseExtraction() {
       cleanedResponse
     };
   }
-  function extractJsonFromMarkdown(input) {
+  function parseJsonFromLlmResponse(input) {
     const trimmed = input.trim();
     const codeFence = "```";
     const jsonFence = "```json";
-    if (trimmed.startsWith(jsonFence)) {
-      const startIndex = jsonFence.length;
-      const endIndex = trimmed.lastIndexOf(codeFence);
-      if (endIndex > startIndex) {
-        return trimmed.substring(startIndex, endIndex).trim();
+    const lastJsonFence = trimmed.lastIndexOf(jsonFence);
+    if (lastJsonFence !== -1) {
+      const startIndex = lastJsonFence + jsonFence.length;
+      const endIndex = trimmed.indexOf(codeFence, startIndex);
+      if (endIndex !== -1) {
+        try {
+          return JSON.parse(trimmed.substring(startIndex, endIndex).trim());
+        } catch {
+        }
       }
     }
-    if (trimmed.startsWith(codeFence) && !trimmed.startsWith(jsonFence)) {
-      const startIndex = codeFence.length;
-      const endIndex = trimmed.lastIndexOf(codeFence);
-      if (endIndex > startIndex) {
-        return trimmed.substring(startIndex, endIndex).trim();
+    const firstCodeFence = trimmed.indexOf(codeFence);
+    if (firstCodeFence !== -1) {
+      const startIndex = firstCodeFence + codeFence.length;
+      const endIndex = trimmed.indexOf(codeFence, startIndex);
+      if (endIndex !== -1) {
+        try {
+          return JSON.parse(trimmed.substring(startIndex, endIndex).trim());
+        } catch {
+        }
       }
     }
-    return input;
+    const matchingClose = new Array(trimmed.length).fill(-1);
+    const stack = [];
+    let inString = false;
+    for (let k = 0; k < trimmed.length; k++) {
+      if (inString) {
+        if (trimmed[k] === "\\")
+          k++;
+        else if (trimmed[k] === '"')
+          inString = false;
+        continue;
+      }
+      if (trimmed[k] === '"') {
+        inString = true;
+        continue;
+      }
+      if (trimmed[k] === "{" || trimmed[k] === "[") {
+        stack.push(k);
+      } else if (trimmed[k] === "}" || trimmed[k] === "]") {
+        if (stack.length > 0) {
+          const open = stack.pop();
+          const expected = trimmed[open] === "{" ? "}" : "]";
+          if (trimmed[k] === expected)
+            matchingClose[open] = k;
+        }
+      }
+    }
+    for (let i = 0; i < trimmed.length; i++) {
+      if (trimmed[i] !== "{" && trimmed[i] !== "[")
+        continue;
+      const j = matchingClose[i];
+      if (j === -1)
+        continue;
+      try {
+        return JSON.parse(trimmed.substring(i, j + 1));
+      } catch {
+        continue;
+      }
+    }
+    return JSON.parse(trimmed);
   }
   return llmResponseExtraction;
 }
@@ -224,9 +270,8 @@ function requireCallLlmService() {
         const response = providerResponse.text;
         let parsedResponse;
         try {
-          let { thinking, cleanedResponse } = (0, llm_response_extraction_1.extractThinkingFromResponse)(response);
-          cleanedResponse = (0, llm_response_extraction_1.extractJsonFromMarkdown)(cleanedResponse);
-          parsedResponse = JSON.parse(cleanedResponse);
+          const { cleanedResponse } = (0, llm_response_extraction_1.extractThinkingFromResponse)(response);
+          parsedResponse = (0, llm_response_extraction_1.parseJsonFromLlmResponse)(cleanedResponse);
         } catch (parseError) {
           const errorMessage2 = `Failed to parse LLM response as JSON: ${parseError instanceof Error ? parseError.message : "Unknown parsing error"}`;
           throw new Error(`${errorMessage2}
@@ -5504,6 +5549,7 @@ function requirePattern () {
 	hasRequiredPattern = 1;
 	Object.defineProperty(pattern, "__esModule", { value: true });
 	const code_1 = requireCode();
+	const util_1 = requireUtil();
 	const codegen_1 = requireCodegen();
 	const error = {
 	    message: ({ schemaCode }) => (0, codegen_1.str) `must match pattern "${schemaCode}"`,
@@ -5516,11 +5562,19 @@ function requirePattern () {
 	    $data: true,
 	    error,
 	    code(cxt) {
-	        const { data, $data, schema, schemaCode, it } = cxt;
-	        // TODO regexp should be wrapped in try/catchs
+	        const { gen, data, $data, schema, schemaCode, it } = cxt;
 	        const u = it.opts.unicodeRegExp ? "u" : "";
-	        const regExp = $data ? (0, codegen_1._) `(new RegExp(${schemaCode}, ${u}))` : (0, code_1.usePattern)(cxt, schema);
-	        cxt.fail$data((0, codegen_1._) `!${regExp}.test(${data})`);
+	        if ($data) {
+	            const { regExp } = it.opts.code;
+	            const regExpCode = regExp.code === "new RegExp" ? (0, codegen_1._) `new RegExp` : (0, util_1.useFunc)(gen, regExp);
+	            const valid = gen.let("valid");
+	            gen.try(() => gen.assign(valid, (0, codegen_1._) `${regExpCode}(${schemaCode}, ${u}).test(${data})`), () => gen.assign(valid, false));
+	            cxt.fail$data((0, codegen_1._) `!${valid}`);
+	        }
+	        else {
+	            const regExp = (0, code_1.usePattern)(cxt, schema);
+	            cxt.fail$data((0, codegen_1._) `!${regExp}.test(${data})`);
+	        }
 	    },
 	};
 	pattern.default = def;
@@ -9386,9 +9440,9 @@ function requireAjvInstances() {
   };
   Object.defineProperty(ajvInstances, "__esModule", { value: true });
   ajvInstances.ajvInstances = void 0;
-  const ajv_1 = __importDefault(requireAjv());
-  const _2019_js_1 = __importDefault(require_2019());
-  const _2020_js_1 = __importDefault(require_2020());
+  const ajv_1 = __importDefault(/* @__PURE__ */ requireAjv());
+  const _2019_js_1 = __importDefault(/* @__PURE__ */ require_2019());
+  const _2020_js_1 = __importDefault(/* @__PURE__ */ require_2020());
   const json_schema_draft_07_json_1 = __importDefault(require$$3$2);
   const json_schema_draft_06_json_1 = __importDefault(require$$4);
   const ajvOptions = {
@@ -9468,7 +9522,9 @@ function requireModelInfo() {
     exports$1.parseCanonicalModelName = parseCanonicalModelName;
     exports$1.CANONICAL_MODELS = [
       "qwen3-30b-a3b-instruct-2507",
+      "claude-opus-4-7",
       "claude-sonnet-4-6",
+      "claude-haiku-4-5",
       "qwen3-vl-235b-a22b-instruct",
       "qwen3-max",
       "gpt-5",
@@ -9476,7 +9532,8 @@ function requireModelInfo() {
       "gemini-2.5-flash",
       "qwen3-coder-flash",
       "gpt-oss-120b",
-      "kimi-k2.5"
+      "kimi-k2.5",
+      "kimi-k2.6"
     ];
     const CANONICAL_SET = new Set(exports$1.CANONICAL_MODELS);
     exports$1.SUPPORTED_MODELS = {
@@ -9500,12 +9557,24 @@ function requireModelInfo() {
           providerModelName: "qwen/qwen3-30b-a3b-instruct-2507"
         }
       ],
+      "claude-opus-4-7": [
+        {
+          provider: "openrouter",
+          providerModelName: "anthropic/claude-opus-4.7"
+        }
+      ],
       "claude-sonnet-4-6": [
         {
           provider: "openrouter",
           providerModelName: "anthropic/claude-sonnet-4.6"
         }
       ],
+      "claude-haiku-4-5": [
+        {
+          provider: "openrouter",
+          providerModelName: "anthropic/claude-haiku-4.5"
+        }
+      ],
       "qwen3-vl-235b-a22b-instruct": [
         {
           provider: "openrouter",
@@ -9555,6 +9624,12 @@ function requireModelInfo() {
           provider: "openrouter",
           providerModelName: "moonshotai/kimi-k2.5"
         }
+      ],
+      "kimi-k2.6": [
+        {
+          provider: "openrouter",
+          providerModelName: "moonshotai/kimi-k2.6"
+        }
       ]
     };
     function parseCanonicalModelName(requestedModel) {
@@ -9575,6 +9650,15 @@ function requireModelInfo() {
         case "sonnet":
           m2 = "claude-sonnet-4-6";
           break;
+        case "opus":
+          m2 = "claude-opus-4-7";
+          break;
+        case "haiku":
+          m2 = "claude-haiku-4-5";
+          break;
+        case "kimi":
+          m2 = "kimi-k2.6";
+          break;
         case "gpt":
           m2 = "gpt-5";
           break;

package/dist/esm/index.mjs

@@ -153,7 +153,7 @@ function requireLlmResponseExtraction() {
   hasRequiredLlmResponseExtraction = 1;
   Object.defineProperty(llmResponseExtraction, "__esModule", { value: true });
   llmResponseExtraction.extractThinkingFromResponse = extractThinkingFromResponse;
-  llmResponseExtraction.extractJsonFromMarkdown = extractJsonFromMarkdown;
+  llmResponseExtraction.parseJsonFromLlmResponse = parseJsonFromLlmResponse;
   function extractThinkingFromResponse(input) {
     const startTag = "<think>";
     const endTag = "</think>";
@@ -183,25 +183,71 @@ function requireLlmResponseExtraction() {
       cleanedResponse
     };
   }
-  function extractJsonFromMarkdown(input) {
+  function parseJsonFromLlmResponse(input) {
     const trimmed = input.trim();
     const codeFence = "```";
     const jsonFence = "```json";
-    if (trimmed.startsWith(jsonFence)) {
-      const startIndex = jsonFence.length;
-      const endIndex = trimmed.lastIndexOf(codeFence);
-      if (endIndex > startIndex) {
-        return trimmed.substring(startIndex, endIndex).trim();
+    const lastJsonFence = trimmed.lastIndexOf(jsonFence);
+    if (lastJsonFence !== -1) {
+      const startIndex = lastJsonFence + jsonFence.length;
+      const endIndex = trimmed.indexOf(codeFence, startIndex);
+      if (endIndex !== -1) {
+        try {
+          return JSON.parse(trimmed.substring(startIndex, endIndex).trim());
+        } catch {
+        }
       }
     }
-    if (trimmed.startsWith(codeFence) && !trimmed.startsWith(jsonFence)) {
-      const startIndex = codeFence.length;
-      const endIndex = trimmed.lastIndexOf(codeFence);
-      if (endIndex > startIndex) {
-        return trimmed.substring(startIndex, endIndex).trim();
+    const firstCodeFence = trimmed.indexOf(codeFence);
+    if (firstCodeFence !== -1) {
+      const startIndex = firstCodeFence + codeFence.length;
+      const endIndex = trimmed.indexOf(codeFence, startIndex);
+      if (endIndex !== -1) {
+        try {
+          return JSON.parse(trimmed.substring(startIndex, endIndex).trim());
+        } catch {
+        }
       }
     }
-    return input;
+    const matchingClose = new Array(trimmed.length).fill(-1);
+    const stack = [];
+    let inString = false;
+    for (let k = 0; k < trimmed.length; k++) {
+      if (inString) {
+        if (trimmed[k] === "\\")
+          k++;
+        else if (trimmed[k] === '"')
+          inString = false;
+        continue;
+      }
+      if (trimmed[k] === '"') {
+        inString = true;
+        continue;
+      }
+      if (trimmed[k] === "{" || trimmed[k] === "[") {
+        stack.push(k);
+      } else if (trimmed[k] === "}" || trimmed[k] === "]") {
+        if (stack.length > 0) {
+          const open = stack.pop();
+          const expected = trimmed[open] === "{" ? "}" : "]";
+          if (trimmed[k] === expected)
+            matchingClose[open] = k;
+        }
+      }
+    }
+    for (let i = 0; i < trimmed.length; i++) {
+      if (trimmed[i] !== "{" && trimmed[i] !== "[")
+        continue;
+      const j = matchingClose[i];
+      if (j === -1)
+        continue;
+      try {
+        return JSON.parse(trimmed.substring(i, j + 1));
+      } catch {
+        continue;
+      }
+    }
+    return JSON.parse(trimmed);
   }
   return llmResponseExtraction;
 }
@@ -223,9 +269,8 @@ function requireCallLlmService() {
         const response = providerResponse.text;
         let parsedResponse;
         try {
-          let { thinking, cleanedResponse } = (0, llm_response_extraction_1.extractThinkingFromResponse)(response);
-          cleanedResponse = (0, llm_response_extraction_1.extractJsonFromMarkdown)(cleanedResponse);
-          parsedResponse = JSON.parse(cleanedResponse);
+          const { cleanedResponse } = (0, llm_response_extraction_1.extractThinkingFromResponse)(response);
+          parsedResponse = (0, llm_response_extraction_1.parseJsonFromLlmResponse)(cleanedResponse);
         } catch (parseError) {
           const errorMessage2 = `Failed to parse LLM response as JSON: ${parseError instanceof Error ? parseError.message : "Unknown parsing error"}`;
           throw new Error(`${errorMessage2}
@@ -5503,6 +5548,7 @@ function requirePattern () {
 	hasRequiredPattern = 1;
 	Object.defineProperty(pattern, "__esModule", { value: true });
 	const code_1 = requireCode();
+	const util_1 = requireUtil();
 	const codegen_1 = requireCodegen();
 	const error = {
 	    message: ({ schemaCode }) => (0, codegen_1.str) `must match pattern "${schemaCode}"`,
@@ -5515,11 +5561,19 @@ function requirePattern () {
 	    $data: true,
 	    error,
 	    code(cxt) {
-	        const { data, $data, schema, schemaCode, it } = cxt;
-	        // TODO regexp should be wrapped in try/catchs
+	        const { gen, data, $data, schema, schemaCode, it } = cxt;
 	        const u = it.opts.unicodeRegExp ? "u" : "";
-	        const regExp = $data ? (0, codegen_1._) `(new RegExp(${schemaCode}, ${u}))` : (0, code_1.usePattern)(cxt, schema);
-	        cxt.fail$data((0, codegen_1._) `!${regExp}.test(${data})`);
+	        if ($data) {
+	            const { regExp } = it.opts.code;
+	            const regExpCode = regExp.code === "new RegExp" ? (0, codegen_1._) `new RegExp` : (0, util_1.useFunc)(gen, regExp);
+	            const valid = gen.let("valid");
+	            gen.try(() => gen.assign(valid, (0, codegen_1._) `${regExpCode}(${schemaCode}, ${u}).test(${data})`), () => gen.assign(valid, false));
+	            cxt.fail$data((0, codegen_1._) `!${valid}`);
+	        }
+	        else {
+	            const regExp = (0, code_1.usePattern)(cxt, schema);
+	            cxt.fail$data((0, codegen_1._) `!${regExp}.test(${data})`);
+	        }
 	    },
 	};
 	pattern.default = def;
@@ -9385,9 +9439,9 @@ function requireAjvInstances() {
   };
   Object.defineProperty(ajvInstances, "__esModule", { value: true });
   ajvInstances.ajvInstances = void 0;
-  const ajv_1 = __importDefault(requireAjv());
-  const _2019_js_1 = __importDefault(require_2019());
-  const _2020_js_1 = __importDefault(require_2020());
+  const ajv_1 = __importDefault(/* @__PURE__ */ requireAjv());
+  const _2019_js_1 = __importDefault(/* @__PURE__ */ require_2019());
+  const _2020_js_1 = __importDefault(/* @__PURE__ */ require_2020());
   const json_schema_draft_07_json_1 = __importDefault(require$$3$2);
   const json_schema_draft_06_json_1 = __importDefault(require$$4);
   const ajvOptions = {
@@ -9467,7 +9521,9 @@ function requireModelInfo() {
     exports$1.parseCanonicalModelName = parseCanonicalModelName;
     exports$1.CANONICAL_MODELS = [
       "qwen3-30b-a3b-instruct-2507",
+      "claude-opus-4-7",
       "claude-sonnet-4-6",
+      "claude-haiku-4-5",
       "qwen3-vl-235b-a22b-instruct",
       "qwen3-max",
       "gpt-5",
@@ -9475,7 +9531,8 @@ function requireModelInfo() {
       "gemini-2.5-flash",
       "qwen3-coder-flash",
       "gpt-oss-120b",
-      "kimi-k2.5"
+      "kimi-k2.5",
+      "kimi-k2.6"
     ];
     const CANONICAL_SET = new Set(exports$1.CANONICAL_MODELS);
     exports$1.SUPPORTED_MODELS = {
@@ -9499,12 +9556,24 @@ function requireModelInfo() {
           providerModelName: "qwen/qwen3-30b-a3b-instruct-2507"
         }
       ],
+      "claude-opus-4-7": [
+        {
+          provider: "openrouter",
+          providerModelName: "anthropic/claude-opus-4.7"
+        }
+      ],
       "claude-sonnet-4-6": [
         {
           provider: "openrouter",
           providerModelName: "anthropic/claude-sonnet-4.6"
         }
       ],
+      "claude-haiku-4-5": [
+        {
+          provider: "openrouter",
+          providerModelName: "anthropic/claude-haiku-4.5"
+        }
+      ],
       "qwen3-vl-235b-a22b-instruct": [
         {
           provider: "openrouter",
@@ -9554,6 +9623,12 @@ function requireModelInfo() {
           provider: "openrouter",
           providerModelName: "moonshotai/kimi-k2.5"
         }
+      ],
+      "kimi-k2.6": [
+        {
+          provider: "openrouter",
+          providerModelName: "moonshotai/kimi-k2.6"
+        }
       ]
     };
     function parseCanonicalModelName(requestedModel) {
@@ -9574,6 +9649,15 @@ function requireModelInfo() {
         case "sonnet":
           m2 = "claude-sonnet-4-6";
           break;
+        case "opus":
+          m2 = "claude-opus-4-7";
+          break;
+        case "haiku":
+          m2 = "claude-haiku-4-5";
+          break;
+        case "kimi":
+          m2 = "kimi-k2.6";
+          break;
         case "gpt":
           m2 = "gpt-5";
           break;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuabase",
   "description": "Nuabase TypeScript client to create typed functions from LLM prompts",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "type": "module",
   "author": "Jasim A Basheer <jasim@nuabase.com>",
   "engines": {