catelog 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/schema.d.ts CHANGED
@@ -1,9 +1,9 @@
1
1
  import type { ZodTypeAny } from "zod";
2
- export type SchemaLike = ZodTypeAny | Record<string, unknown>;
3
- export declare function isZodSchema(schema: unknown): schema is ZodTypeAny;
2
+ export type SchemaLike = ZodTypeAny | Record<string, unknown> | any;
3
+ export declare function isZodSchema(schema: unknown): boolean;
4
4
  /**
5
- * Converts a Zod schema or passes through a JSON schema object
6
- * to standard JSON Schema (Draft-07).
5
+ * Converts a Zod schema (v3 or v4) or passes through a JSON schema object
6
+ * to standard JSON Schema.
7
7
  */
8
8
  export declare function toJsonSchema(schema: SchemaLike, title?: string): Record<string, unknown>;
9
9
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAEtC,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE9D,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,UAAU,CAOjE;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsBxF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,OAAO,GACZ;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAcnE"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAEtC,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,GAAG,CAAC;AAEpE,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAOpD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgDxF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,OAAO,GACZ;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAcnE"}
package/dist/schema.js CHANGED
@@ -2,33 +2,59 @@ import { zodToJsonSchema } from "zod-to-json-schema";
2
2
  export function isZodSchema(schema) {
3
3
  return (typeof schema === "object" &&
4
4
  schema !== null &&
5
- "_def" in schema &&
6
- typeof schema.safeParse === "function");
5
+ (("_def" in schema) || ("def" in schema) || ("_zod" in schema)) &&
6
+ (typeof schema.safeParse === "function" || typeof schema.parse === "function"));
7
7
  }
8
8
  /**
9
- * Converts a Zod schema or passes through a JSON schema object
10
- * to standard JSON Schema (Draft-07).
9
+ * Converts a Zod schema (v3 or v4) or passes through a JSON schema object
10
+ * to standard JSON Schema.
11
11
  */
12
12
  export function toJsonSchema(schema, title) {
13
+ if (!schema)
14
+ return { type: "object" };
15
+ // 1. Zod v4 native toJSONSchema() support
16
+ if (typeof schema.toJSONSchema === "function") {
17
+ try {
18
+ const nativeJson = schema.toJSONSchema();
19
+ if (nativeJson && typeof nativeJson === "object") {
20
+ return nativeJson;
21
+ }
22
+ }
23
+ catch (err) {
24
+ console.warn("[catelog] Native toJSONSchema failed, falling back to converter:", err);
25
+ }
26
+ }
27
+ // 2. Zod v3 conversion via zod-to-json-schema
13
28
  if (isZodSchema(schema)) {
14
- const converted = zodToJsonSchema(schema, {
15
- name: title,
16
- target: "jsonSchema7",
17
- $refStrategy: "none",
18
- });
19
- // If wrapped in definitions, unwrap the root object
20
- if (converted && typeof converted === "object") {
21
- const record = converted;
22
- const defs = record.definitions;
23
- if (defs && title && defs[title]) {
24
- return defs[title];
29
+ try {
30
+ const converted = zodToJsonSchema(schema, {
31
+ target: "jsonSchema7",
32
+ $refStrategy: "none",
33
+ });
34
+ if (converted && typeof converted === "object") {
35
+ if (converted.definitions && typeof converted.definitions === "object") {
36
+ const keys = Object.keys(converted.definitions);
37
+ if (keys.length > 0) {
38
+ return {
39
+ $schema: "http://json-schema.org/draft-07/schema#",
40
+ ...converted.definitions[keys[0]],
41
+ };
42
+ }
43
+ }
44
+ if (converted.properties || converted.type) {
45
+ return converted;
46
+ }
25
47
  }
26
- return record;
27
48
  }
28
- return converted;
49
+ catch (err) {
50
+ console.error("[catelog] Failed to convert Zod schema to JSON Schema:", err);
51
+ }
52
+ }
53
+ // 3. Raw JSON schema object pass-through
54
+ if (typeof schema === "object") {
55
+ return schema;
29
56
  }
30
- // Already a raw JSON schema object
31
- return schema;
57
+ return { type: "object" };
32
58
  }
33
59
  /**
34
60
  * Validates input against schema (if Zod is provided).
@@ -40,7 +66,7 @@ export function validateSchemaData(schema, data) {
40
66
  if (result.success) {
41
67
  return { success: true, data: result.data };
42
68
  }
43
- const formattedErrors = result.error.errors.map((err) => `${err.path.join(".") || "root"}: ${err.message}`);
69
+ const formattedErrors = (result.error?.errors || []).map((err) => `${err.path?.join(".") || "root"}: ${err.message}`);
44
70
  return { success: false, errors: formattedErrors };
45
71
  }
46
72
  // Raw JSON schema pass-through (pre-validated by gateway as per spec rule 4)
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAKrD,MAAM,UAAU,WAAW,CAAC,MAAe;IACzC,OAAO,CACL,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,KAAK,IAAI;QACf,MAAM,IAAI,MAAM;QAChB,OAAQ,MAAkC,CAAC,SAAS,KAAK,UAAU,CACpE,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,MAAkB,EAAE,KAAc;IAC7D,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAE;YACxC,IAAI,EAAE,KAAK;YACX,MAAM,EAAE,aAAa;YACrB,YAAY,EAAE,MAAM;SACrB,CAAC,CAAC;QAEH,oDAAoD;QACpD,IAAI,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC/C,MAAM,MAAM,GAAG,SAAoC,CAAC;YACpD,MAAM,IAAI,GAAG,MAAM,CAAC,WAAkD,CAAC;YACvE,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjC,OAAO,IAAI,CAAC,KAAK,CAA4B,CAAC;YAChD,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,SAAoC,CAAC;IAC9C,CAAC;IAED,mCAAmC;IACnC,OAAO,MAAiC,CAAC;AAC3C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAAkB,EAClB,IAAa;IAEb,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAS,EAAE,CAAC;QACnD,CAAC;QACD,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAC7C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,MAAM,KAAK,GAAG,CAAC,OAAO,EAAE,CAC3D,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;IACrD,CAAC;IAED,6EAA6E;IAC7E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAS,EAAE,CAAC;AAC5C,CAAC"}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,14 +1,16 @@
1
1
  {
2
2
  "name": "catelog",
3
- "version": "1.0.0",
3
+ "version": "1.0.1",
4
4
  "description": "Official TypeScript SDK for Marketplace Agent Protocol Specification (MAPS)",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
7
+ "module": "./dist/index.js",
7
8
  "types": "./dist/index.d.ts",
8
9
  "exports": {
9
10
  ".": {
10
11
  "types": "./dist/index.d.ts",
11
- "import": "./dist/index.js"
12
+ "import": "./dist/index.js",
13
+ "default": "./dist/index.js"
12
14
  }
13
15
  },
14
16
  "bin": {