@moostjs/swagger 0.6.31 → 0.6.32

package/dist/index.cjs

@@ -557,12 +557,7 @@ function createSchemaResolution(type) {
 }
 function schemaFromFunction(fn) {
 	const ctor = fn;
-	if (typeof ctor.toJsonSchema === "function") return {
-		kind: "component",
-		schema: asSwaggerSchema(ctor.toJsonSchema()),
-		typeRef: ctor,
-		suggestedName: ctor.name
-	};
+	if (typeof ctor.toJsonSchema === "function") return componentFromToJsonSchema(ctor, ctor.name);
 	if (fn.length === 0) try {
 		const result = fn();
 		if (result && result !== fn) return createSchemaResolution(result);
@@ -574,18 +569,58 @@ function schemaFromInstance(obj) {
 		schema: cloneSchema(obj)
 	};
 	const ctor = obj.constructor;
-	if (ctor && typeof ctor.toJsonSchema === "function") return {
-		kind: "component",
-		schema: asSwaggerSchema(ctor.toJsonSchema()),
-		typeRef: ctor,
-		suggestedName: ctor.name
-	};
-	if (typeof obj.toJsonSchema === "function") return {
+	if (ctor && typeof ctor.toJsonSchema === "function") return componentFromToJsonSchema(ctor, ctor.name);
+	if (typeof obj.toJsonSchema === "function") return componentFromToJsonSchema(obj, getTypeName(obj));
+}
+/**
+* Resolves a `toJsonSchema()` host to a named component resolution, or
+* `undefined` when an atscript annotated type's schema emit is disabled
+* (see {@link callToJsonSchema}).
+*/ function componentFromToJsonSchema(host, suggestedName) {
+	const schema = callToJsonSchema(host);
+	return schema ? {
 		kind: "component",
-		schema: asSwaggerSchema(obj.toJsonSchema()),
-		typeRef: obj,
-		suggestedName: getTypeName(obj)
-	};
+		schema,
+		typeRef: host,
+		suggestedName
+	} : void 0;
+}
+/**
+* Structural (duck-typed) guard for atscript annotated types.
+*
+* Mirrors the `isAnnotatedType` contract from
+* `atscript/packages/typescript/src/runtime/annotated-type.ts`: an annotated
+* type carries a truthy `__is_atscript_annotated_type` marker, and codegen
+* always renders a `static toJsonSchema()` alongside it.
+*
+* NOTE: this must stay a structural check — `@moostjs/swagger` cannot import
+* any `@atscript/*` package because atscript depends on moost (the import
+* would be circular).
+*/ function isAtscriptAnnotatedType(type) {
+	if (!type || typeof type !== "function" && typeof type !== "object") return false;
+	const candidate = type;
+	return !!candidate.__is_atscript_annotated_type && typeof candidate.toJsonSchema === "function";
+}
+let atscriptJsonSchemaHintLogged = false;
+/**
+* Calls `toJsonSchema()` guarding the atscript case: when the atscript project
+* does not enable `emit.jsonSchema` (`jsonSchema: false`, the default of the
+* `@atscript/typescript` plugin — see its `plugin.ts` options doc), the
+* generated `toJsonSchema()` is a stub that throws at runtime. In that case a
+* one-time hint is logged and `undefined` is returned so callers fall back to
+* the generic (pre-atscript) resolution. Non-annotated types keep the previous
+* behavior: errors propagate as before.
+*/ function callToJsonSchema(host) {
+	try {
+		return asSwaggerSchema(host.toJsonSchema());
+	} catch (error) {
+		if (!isAtscriptAnnotatedType(host)) throw error;
+		if (!atscriptJsonSchemaHintLogged) {
+			atscriptJsonSchemaHintLogged = true;
+			console.warn("[moost-swagger] toJsonSchema() of an atscript annotated type threw; falling back to a generic schema. Enable jsonSchema emit in the @atscript/typescript plugin options (jsonSchema: \"bundle\" or \"lazy\") to get real schemas in the OpenAPI spec.");
+		}
+		return;
+	}
 }
 function asSwaggerSchema(schema) {
 	if (!schema || typeof schema !== "object") return {};

package/dist/index.mjs

@@ -528,12 +528,7 @@ function createSchemaResolution(type) {
 }
 function schemaFromFunction(fn) {
 	const ctor = fn;
-	if (typeof ctor.toJsonSchema === "function") return {
-		kind: "component",
-		schema: asSwaggerSchema(ctor.toJsonSchema()),
-		typeRef: ctor,
-		suggestedName: ctor.name
-	};
+	if (typeof ctor.toJsonSchema === "function") return componentFromToJsonSchema(ctor, ctor.name);
 	if (fn.length === 0) try {
 		const result = fn();
 		if (result && result !== fn) return createSchemaResolution(result);
@@ -545,18 +540,58 @@ function schemaFromInstance(obj) {
 		schema: cloneSchema(obj)
 	};
 	const ctor = obj.constructor;
-	if (ctor && typeof ctor.toJsonSchema === "function") return {
-		kind: "component",
-		schema: asSwaggerSchema(ctor.toJsonSchema()),
-		typeRef: ctor,
-		suggestedName: ctor.name
-	};
-	if (typeof obj.toJsonSchema === "function") return {
+	if (ctor && typeof ctor.toJsonSchema === "function") return componentFromToJsonSchema(ctor, ctor.name);
+	if (typeof obj.toJsonSchema === "function") return componentFromToJsonSchema(obj, getTypeName(obj));
+}
+/**
+* Resolves a `toJsonSchema()` host to a named component resolution, or
+* `undefined` when an atscript annotated type's schema emit is disabled
+* (see {@link callToJsonSchema}).
+*/ function componentFromToJsonSchema(host, suggestedName) {
+	const schema = callToJsonSchema(host);
+	return schema ? {
 		kind: "component",
-		schema: asSwaggerSchema(obj.toJsonSchema()),
-		typeRef: obj,
-		suggestedName: getTypeName(obj)
-	};
+		schema,
+		typeRef: host,
+		suggestedName
+	} : void 0;
+}
+/**
+* Structural (duck-typed) guard for atscript annotated types.
+*
+* Mirrors the `isAnnotatedType` contract from
+* `atscript/packages/typescript/src/runtime/annotated-type.ts`: an annotated
+* type carries a truthy `__is_atscript_annotated_type` marker, and codegen
+* always renders a `static toJsonSchema()` alongside it.
+*
+* NOTE: this must stay a structural check — `@moostjs/swagger` cannot import
+* any `@atscript/*` package because atscript depends on moost (the import
+* would be circular).
+*/ function isAtscriptAnnotatedType(type) {
+	if (!type || typeof type !== "function" && typeof type !== "object") return false;
+	const candidate = type;
+	return !!candidate.__is_atscript_annotated_type && typeof candidate.toJsonSchema === "function";
+}
+let atscriptJsonSchemaHintLogged = false;
+/**
+* Calls `toJsonSchema()` guarding the atscript case: when the atscript project
+* does not enable `emit.jsonSchema` (`jsonSchema: false`, the default of the
+* `@atscript/typescript` plugin — see its `plugin.ts` options doc), the
+* generated `toJsonSchema()` is a stub that throws at runtime. In that case a
+* one-time hint is logged and `undefined` is returned so callers fall back to
+* the generic (pre-atscript) resolution. Non-annotated types keep the previous
+* behavior: errors propagate as before.
+*/ function callToJsonSchema(host) {
+	try {
+		return asSwaggerSchema(host.toJsonSchema());
+	} catch (error) {
+		if (!isAtscriptAnnotatedType(host)) throw error;
+		if (!atscriptJsonSchemaHintLogged) {
+			atscriptJsonSchemaHintLogged = true;
+			console.warn("[moost-swagger] toJsonSchema() of an atscript annotated type threw; falling back to a generic schema. Enable jsonSchema emit in the @atscript/typescript plugin options (jsonSchema: \"bundle\" or \"lazy\") to get real schemas in the OpenAPI spec.");
+		}
+		return;
+	}
 }
 function asSwaggerSchema(schema) {
 	if (!schema || typeof schema !== "object") return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/swagger",
-  "version": "0.6.31",
+  "version": "0.6.32",
   "description": "@moostjs/swagger",
   "keywords": [
     "composables",
@@ -47,8 +47,8 @@
   "peerDependencies": {
     "@wooksjs/event-http": "^0.7.20",
     "@wooksjs/http-static": "^0.7.20",
-    "@moostjs/event-http": "^0.6.31",
-    "moost": "^0.6.31"
+    "moost": "^0.6.32",
+    "@moostjs/event-http": "^0.6.32"
   },
   "scripts": {
     "pub": "pnpm publish --access public",