@gqloom/json 0.12.0 → 0.15.0

package/dist/index.cjs

@@ -1,30 +1,5 @@
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
-let __gqloom_core = require("@gqloom/core");
-__gqloom_core = __toESM(__gqloom_core);
+let _gqloom_core = require("@gqloom/core");
 let graphql = require("graphql");
-graphql = __toESM(graphql);
 
 //#region src/index.ts
 var JSONWeaver = class JSONWeaver {
@@ -37,7 +12,7 @@ var JSONWeaver = class JSONWeaver {
 	static config = function(config) {
 		return {
 			...config,
-			[__gqloom_core.SYMBOLS.WEAVER_CONFIG]: "gqloom.json"
+			[_gqloom_core.SYMBOLS.WEAVER_CONFIG]: "gqloom.json"
 		};
 	};
 	/**
@@ -46,7 +21,7 @@ var JSONWeaver = class JSONWeaver {
 	* @returns GraphQL Silk Like JSON Schema
 	*/
 	static unravel(schema) {
-		const config = __gqloom_core.weaverContext.value?.getConfig("gqloom.json");
+		const config = _gqloom_core.weaverContext.value?.getConfig("gqloom.json");
 		if (typeof schema === "object" && !("~standard" in schema)) Object.defineProperty(schema, "~standard", {
 			value: {
 				version: 1,
@@ -55,17 +30,24 @@ var JSONWeaver = class JSONWeaver {
 			},
 			enumerable: false
 		});
-		if (typeof schema === "object" && !(__gqloom_core.SYMBOLS.GET_GRAPHQL_TYPE in schema)) Object.defineProperty(schema, __gqloom_core.SYMBOLS.GET_GRAPHQL_TYPE, {
+		if (typeof schema === "object" && !(_gqloom_core.SYMBOLS.GET_GRAPHQL_TYPE in schema)) Object.defineProperty(schema, _gqloom_core.SYMBOLS.GET_GRAPHQL_TYPE, {
 			value: config ? function() {
-				return __gqloom_core.weaverContext.useConfig(config, () => JSONWeaver.getGraphQLTypeBySelf.call(this));
+				return _gqloom_core.weaverContext.useConfig(config, () => JSONWeaver.getGraphQLTypeBySelf.call(this));
 			} : JSONWeaver.getGraphQLTypeBySelf,
 			enumerable: false
 		});
 		return schema;
 	}
-	static sourceTypeMap = /* @__PURE__ */ new Map();
+	static sourceTypeMap = /* @__PURE__ */ new WeakMap();
 	static getGraphQLType(schema, { source } = {}) {
-		if (source) JSONWeaver.sourceTypeMap.set(schema, source);
+		if ((typeof schema === "object" || typeof schema === "function") && schema !== null && "~standard" in schema) {
+			const standard = schema["~standard"];
+			if ("jsonSchema" in standard) {
+				const rawSchema = standard.jsonSchema.output({ target: "draft-07" });
+				return JSONWeaver.getGraphQLType(rawSchema, { source: source ?? schema });
+			}
+		}
+		if (source && typeof schema === "object" && schema !== null) JSONWeaver.sourceTypeMap.set(schema, source);
 		return JSONWeaver.toNullableGraphQLType(schema);
 	}
 	static getGraphQLTypeBySelf() {
@@ -81,15 +63,15 @@ var JSONWeaver = class JSONWeaver {
 	static toMemoriedGraphQLType(schema) {
 		if (typeof schema === "boolean") throw new Error("Boolean JSON schemas are not supported");
 		const name = schema.title ?? JSONWeaver.getCollectedName(schema) ?? JSONWeaver.getTypeName(schema);
-		const existing = __gqloom_core.weaverContext.getGraphQLType(schema) ?? (name ? __gqloom_core.weaverContext.getNamedType(name) : void 0);
+		const existing = _gqloom_core.weaverContext.getGraphQLType(schema) ?? (name ? _gqloom_core.weaverContext.getNamedType(name) : void 0);
 		if (existing) return existing;
 		const gqlType = JSONWeaver.toGraphQLTypeInner(schema);
-		if (name) __gqloom_core.weaverContext.memoNamedType(gqlType);
-		return __gqloom_core.weaverContext.memoGraphQLType(schema, gqlType);
+		if (name) _gqloom_core.weaverContext.memoNamedType(gqlType);
+		return _gqloom_core.weaverContext.memoGraphQLType(schema, gqlType);
 	}
 	static toGraphQLTypeInner(schema) {
 		if (typeof schema === "boolean") throw new Error("Boolean JSON schemas are not supported");
-		const presetType = (__gqloom_core.weaverContext.value?.getConfig("gqloom.json"))?.presetGraphQLType?.(schema);
+		const presetType = (_gqloom_core.weaverContext.value?.getConfig("gqloom.json"))?.presetGraphQLType?.(schema);
 		if (presetType) return presetType;
 		if (schema.allOf) {
 			const interfaceSchemas = schema.allOf.filter((s) => {
@@ -115,8 +97,7 @@ var JSONWeaver = class JSONWeaver {
 			const objectType = JSONWeaver.toGraphQLTypeInner(mergedSchema);
 			if (interfaceSchemas.length > 0) {
 				const interfaceTypes = interfaceSchemas.map((interfaceSchema) => {
-					const interfaceObjectType = JSONWeaver.toMemoriedGraphQLType(interfaceSchema);
-					return (0, __gqloom_core.ensureInterfaceType)(interfaceObjectType);
+					return (0, _gqloom_core.ensureInterfaceType)(JSONWeaver.toMemoriedGraphQLType(interfaceSchema));
 				});
 				return new graphql.GraphQLObjectType({
 					...objectType.toConfig(),
@@ -140,7 +121,7 @@ var JSONWeaver = class JSONWeaver {
 				};
 				return JSONWeaver.toGraphQLTypeInner(unwrappedSchema);
 			}
-			const name = schema.title ?? JSONWeaver.getCollectedName(schema) ?? __gqloom_core.AUTO_ALIASING;
+			const name = schema.title ?? JSONWeaver.getCollectedName(schema) ?? _gqloom_core.AUTO_ALIASING;
 			return new graphql.GraphQLUnionType({
 				name,
 				description: schema.description,
@@ -153,7 +134,7 @@ var JSONWeaver = class JSONWeaver {
 		}
 		const type = Array.isArray(schema.type) ? schema.type.find((t) => t !== "null") : schema.type;
 		if (schema.enum) {
-			const name = schema.title ?? JSONWeaver.getCollectedName(schema) ?? __gqloom_core.AUTO_ALIASING;
+			const name = schema.title ?? JSONWeaver.getCollectedName(schema) ?? _gqloom_core.AUTO_ALIASING;
 			const values = {};
 			for (const value of schema.enum) if (typeof value === "string" || typeof value === "number") {
 				const key = String(value).replace(/[^_a-zA-Z0-9]/g, "_");
@@ -170,32 +151,27 @@ var JSONWeaver = class JSONWeaver {
 			case "number": return graphql.GraphQLFloat;
 			case "integer": return graphql.GraphQLInt;
 			case "boolean": return graphql.GraphQLBoolean;
-			case "array": {
+			case "array":
 				if (!schema.items || typeof schema.items !== "object" || Array.isArray(schema.items)) throw new Error("Array schema must have a single object in 'items'");
-				const itemType = JSONWeaver.toNullableGraphQLType(schema.items);
-				return new graphql.GraphQLList(itemType);
-			}
-			case "object": {
-				const name = schema.title ?? JSONWeaver.getCollectedName(schema) ?? JSONWeaver.getTypeName(schema) ?? __gqloom_core.AUTO_ALIASING;
-				return new graphql.GraphQLObjectType({
-					name,
-					description: schema.description,
-					fields: () => (0, __gqloom_core.mapValue)(schema.properties ?? {}, (propSchema, key) => {
-						if (key.startsWith("__")) return __gqloom_core.mapValue.SKIP;
-						const fieldSchema = propSchema;
-						if (typeof fieldSchema === "boolean") throw new Error("Boolean JSON schemas are not supported in properties");
-						let fieldType = JSONWeaver.toMemoriedGraphQLType(fieldSchema);
-						if (schema.required?.includes(key)) {
-							if (!(0, graphql.isNonNullType)(fieldType)) fieldType = new graphql.GraphQLNonNull(fieldType);
-						} else if ((0, graphql.isNonNullType)(fieldType)) fieldType = fieldType.ofType;
-						return {
-							type: fieldType,
-							description: fieldSchema.description,
-							defaultValue: fieldSchema.default
-						};
-					})
-				});
-			}
+				return new graphql.GraphQLList(JSONWeaver.toNullableGraphQLType(schema.items));
+			case "object": return new graphql.GraphQLObjectType({
+				name: schema.title ?? JSONWeaver.getCollectedName(schema) ?? JSONWeaver.getTypeName(schema) ?? _gqloom_core.AUTO_ALIASING,
+				description: schema.description,
+				fields: () => (0, _gqloom_core.mapValue)(schema.properties ?? {}, (propSchema, key) => {
+					if (key.startsWith("__")) return _gqloom_core.mapValue.SKIP;
+					const fieldSchema = propSchema;
+					if (typeof fieldSchema === "boolean") throw new Error("Boolean JSON schemas are not supported in properties");
+					let fieldType = JSONWeaver.toMemoriedGraphQLType(fieldSchema);
+					if (schema.required?.includes(key)) {
+						if (!(0, graphql.isNonNullType)(fieldType)) fieldType = new graphql.GraphQLNonNull(fieldType);
+					} else if ((0, graphql.isNonNullType)(fieldType)) fieldType = fieldType.ofType;
+					return {
+						type: fieldType,
+						description: fieldSchema.description,
+						defaultValue: fieldSchema.default
+					};
+				})
+			});
 			case "null": throw new Error("Standalone 'null' type is not supported in GraphQL. It can only be used in a union type, like ['string', 'null']");
 		}
 		throw new Error(`Unsupported JSON schema type: ${String(type)}`);
@@ -209,11 +185,11 @@ var JSONWeaver = class JSONWeaver {
 	}
 	static getCollectedName(schema) {
 		if (typeof schema !== "object") return void 0;
-		const name = __gqloom_core.weaverContext.names.get(schema);
+		const name = _gqloom_core.weaverContext.names.get(schema);
 		if (name) return name;
 		const source = JSONWeaver.sourceTypeMap.get(schema);
 		if (source == null) return void 0;
-		return __gqloom_core.weaverContext.names.get(source);
+		return _gqloom_core.weaverContext.names.get(source);
 	}
 };
 function jsonSilk(schema) {

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { GraphQLSilk, SYMBOLS, WeaverConfig } from "@gqloom/core";
+import { GraphQLSilk, SYMBOLS, StandardJSONSchemaV1, WeaverConfig } from "@gqloom/core";
 import { GraphQLOutputType } from "graphql";
 import { FromSchema, JSONSchema, JSONSchema as JSONSchema$1 } from "json-schema-to-ts";
 
@@ -25,11 +25,11 @@ declare class JSONWeaver {
    * @returns GraphQL Silk Like JSON Schema
    */
   static unravel<const TSchema extends JSONSchema, TData = FromSchema<TSchema>>(schema: TSchema): JSONSilk<TSchema, TData>;
-  protected static sourceTypeMap: Map<JSONSchema, any>;
-  static getGraphQLType(schema: JSONSchema, {
+  protected static sourceTypeMap: WeakMap<object, unknown>;
+  static getGraphQLType(schema: JSONSchema | StandardJSONSchemaV1, {
     source
   }?: {
-    source?: any;
+    source?: unknown;
   }): GraphQLOutputType;
   protected static getGraphQLTypeBySelf(this: JSONSchema): GraphQLOutputType;
   protected static toNullableGraphQLType(schema: JSONSchema): GraphQLOutputType;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { GraphQLSilk, SYMBOLS, WeaverConfig } from "@gqloom/core";
+import { GraphQLSilk, SYMBOLS, StandardJSONSchemaV1, WeaverConfig } from "@gqloom/core";
 import { GraphQLOutputType } from "graphql";
 import { FromSchema, JSONSchema, JSONSchema as JSONSchema$1 } from "json-schema-to-ts";
 
@@ -25,11 +25,11 @@ declare class JSONWeaver {
    * @returns GraphQL Silk Like JSON Schema
    */
   static unravel<const TSchema extends JSONSchema, TData = FromSchema<TSchema>>(schema: TSchema): JSONSilk<TSchema, TData>;
-  protected static sourceTypeMap: Map<JSONSchema, any>;
-  static getGraphQLType(schema: JSONSchema, {
+  protected static sourceTypeMap: WeakMap<object, unknown>;
+  static getGraphQLType(schema: JSONSchema | StandardJSONSchemaV1, {
     source
   }?: {
-    source?: any;
+    source?: unknown;
   }): GraphQLOutputType;
   protected static getGraphQLTypeBySelf(this: JSONSchema): GraphQLOutputType;
   protected static toNullableGraphQLType(schema: JSONSchema): GraphQLOutputType;

package/dist/index.js

@@ -38,9 +38,16 @@ var JSONWeaver = class JSONWeaver {
 		});
 		return schema;
 	}
-	static sourceTypeMap = /* @__PURE__ */ new Map();
+	static sourceTypeMap = /* @__PURE__ */ new WeakMap();
 	static getGraphQLType(schema, { source } = {}) {
-		if (source) JSONWeaver.sourceTypeMap.set(schema, source);
+		if ((typeof schema === "object" || typeof schema === "function") && schema !== null && "~standard" in schema) {
+			const standard = schema["~standard"];
+			if ("jsonSchema" in standard) {
+				const rawSchema = standard.jsonSchema.output({ target: "draft-07" });
+				return JSONWeaver.getGraphQLType(rawSchema, { source: source ?? schema });
+			}
+		}
+		if (source && typeof schema === "object" && schema !== null) JSONWeaver.sourceTypeMap.set(schema, source);
 		return JSONWeaver.toNullableGraphQLType(schema);
 	}
 	static getGraphQLTypeBySelf() {
@@ -90,8 +97,7 @@ var JSONWeaver = class JSONWeaver {
 			const objectType = JSONWeaver.toGraphQLTypeInner(mergedSchema);
 			if (interfaceSchemas.length > 0) {
 				const interfaceTypes = interfaceSchemas.map((interfaceSchema) => {
-					const interfaceObjectType = JSONWeaver.toMemoriedGraphQLType(interfaceSchema);
-					return ensureInterfaceType(interfaceObjectType);
+					return ensureInterfaceType(JSONWeaver.toMemoriedGraphQLType(interfaceSchema));
 				});
 				return new GraphQLObjectType({
 					...objectType.toConfig(),
@@ -145,32 +151,27 @@ var JSONWeaver = class JSONWeaver {
 			case "number": return GraphQLFloat;
 			case "integer": return GraphQLInt;
 			case "boolean": return GraphQLBoolean;
-			case "array": {
+			case "array":
 				if (!schema.items || typeof schema.items !== "object" || Array.isArray(schema.items)) throw new Error("Array schema must have a single object in 'items'");
-				const itemType = JSONWeaver.toNullableGraphQLType(schema.items);
-				return new GraphQLList(itemType);
-			}
-			case "object": {
-				const name = schema.title ?? JSONWeaver.getCollectedName(schema) ?? JSONWeaver.getTypeName(schema) ?? AUTO_ALIASING;
-				return new GraphQLObjectType({
-					name,
-					description: schema.description,
-					fields: () => mapValue(schema.properties ?? {}, (propSchema, key) => {
-						if (key.startsWith("__")) return mapValue.SKIP;
-						const fieldSchema = propSchema;
-						if (typeof fieldSchema === "boolean") throw new Error("Boolean JSON schemas are not supported in properties");
-						let fieldType = JSONWeaver.toMemoriedGraphQLType(fieldSchema);
-						if (schema.required?.includes(key)) {
-							if (!isNonNullType(fieldType)) fieldType = new GraphQLNonNull(fieldType);
-						} else if (isNonNullType(fieldType)) fieldType = fieldType.ofType;
-						return {
-							type: fieldType,
-							description: fieldSchema.description,
-							defaultValue: fieldSchema.default
-						};
-					})
-				});
-			}
+				return new GraphQLList(JSONWeaver.toNullableGraphQLType(schema.items));
+			case "object": return new GraphQLObjectType({
+				name: schema.title ?? JSONWeaver.getCollectedName(schema) ?? JSONWeaver.getTypeName(schema) ?? AUTO_ALIASING,
+				description: schema.description,
+				fields: () => mapValue(schema.properties ?? {}, (propSchema, key) => {
+					if (key.startsWith("__")) return mapValue.SKIP;
+					const fieldSchema = propSchema;
+					if (typeof fieldSchema === "boolean") throw new Error("Boolean JSON schemas are not supported in properties");
+					let fieldType = JSONWeaver.toMemoriedGraphQLType(fieldSchema);
+					if (schema.required?.includes(key)) {
+						if (!isNonNullType(fieldType)) fieldType = new GraphQLNonNull(fieldType);
+					} else if (isNonNullType(fieldType)) fieldType = fieldType.ofType;
+					return {
+						type: fieldType,
+						description: fieldSchema.description,
+						defaultValue: fieldSchema.default
+					};
+				})
+			});
 			case "null": throw new Error("Standalone 'null' type is not supported in GraphQL. It can only be used in a union type, like ['string', 'null']");
 		}
 		throw new Error(`Unsupported JSON schema type: ${String(type)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gqloom/json",
-  "version": "0.12.0",
+  "version": "0.15.0",
   "description": "Create GraphQL schema and resolvers easily using using JSON Schema!",
   "type": "module",
   "main": "./dist/index.js",
@@ -32,15 +32,14 @@
   "author": "xcfox",
   "license": "MIT",
   "peerDependencies": {
-    "@gqloom/core": ">= 0.12.0",
+    "@gqloom/core": ">= 0.15.0",
     "graphql": ">= 16.8.0"
   },
   "devDependencies": {
     "ajv": "^8.17.1",
-    "arktype": "^2.1.22",
-    "effect": "^3.17.13",
+    "arktype": "^2.1.29",
     "typebox": "^1.0.4",
-    "@gqloom/core": "0.12.0"
+    "@gqloom/core": "0.15.0"
   },
   "homepage": "https://gqloom.dev/",
   "repository": {