@fedify/vocab-tools 2.1.0-dev.405 → 2.1.0-dev.408

package/src/class.ts

@@ -1,7 +1,7 @@
 import { generateDecoder, generateEncoder } from "./codec.ts";
 import { generateCloner, generateConstructor } from "./constructor.ts";
 import { generateFields } from "./field.ts";
-import { generateInspector } from "./inspector.ts";
+import { generateInspector, generateInspectorPostClass } from "./inspector.ts";
 import { generateProperties } from "./property.ts";
 import type { TypeSchema } from "./schema.ts";
 import { emitOverride } from "./type.ts";
@@ -104,6 +104,9 @@ async function* generateClass(
   for await (const code of generateDecoder(typeUri, types)) yield code;
   for await (const code of generateInspector(typeUri, types)) yield code;
   yield "}\n\n";
+  for await (const code of generateInspectorPostClass(typeUri, types)) {
+    yield code;
+  }
 }
 
 /**

package/src/codec.ts

@@ -125,7 +125,11 @@ export async function* generateEncoder(
       `;
     }
     yield `
-      result["type"] = ${JSON.stringify(type.compactName ?? type.uri)};
+      ${
+      type.typeless
+        ? ""
+        : `result["type"] = ${JSON.stringify(type.compactName ?? type.uri)};`
+    }
       if (this.id != null) result["id"] = this.id.href;
       result["@context"] = ${JSON.stringify(type.defaultContext)};
       return result;
@@ -197,7 +201,7 @@ export async function* generateEncoder(
     `;
   }
   yield `
-    values["@type"] = [${JSON.stringify(type.uri)}];
+    ${type.typeless ? "" : `values["@type"] = [${JSON.stringify(type.uri)}];`}
     if (this.id != null) values["@id"] = this.id.href;
     if (options.format === "expand") {
       return await jsonld.expand(

package/src/generate.ts

@@ -5,7 +5,7 @@ import { loadSchemaFiles } from "./schema.ts";
 export default async function generateVocab(
   schemaDir: string,
   generatedPath: string,
-) {
+): Promise<void> {
   const types = await loadSchemaFiles(schemaDir);
   const encoder = new TextEncoder();
 

package/src/inspector.ts

@@ -73,24 +73,44 @@ export async function* generateInspector(
   yield `
     return proxy;
   }
+  `;
+}
 
-  // @ts-ignore: suppressing TS4127
-  ${emitOverride(typeUri, types)} [Symbol.for("Deno.customInspect")](
+/**
+ * Generates code that must appear *after* the class closing brace: prototype
+ * assignments for the Deno and Node.js custom-inspect hooks.
+ *
+ * These are emitted outside the class body because computed property names
+ * using `Symbol.for()` are incompatible with `isolatedDeclarations` mode.
+ */
+export async function* generateInspectorPostClass(
+  typeUri: string,
+  types: Record<string, TypeSchema>,
+): AsyncIterable<string> {
+  const type = types[typeUri];
+  const className = type.name;
+  yield `
+// deno-lint-ignore no-explicit-any
+(${className}.prototype as any)[Symbol.for("Deno.customInspect")] =
+  function (
+    this: ${className},
     inspect: typeof Deno.inspect,
     options: Deno.InspectOptions,
   ): string {
     const proxy = this._getCustomInspectProxy();
     return ${JSON.stringify(type.name + " ")} + inspect(proxy, options);
-  }
+  };
 
-  // @ts-ignore: suppressing TS4127
-  ${emitOverride(typeUri, types)} [Symbol.for("nodejs.util.inspect.custom")](
+// deno-lint-ignore no-explicit-any
+(${className}.prototype as any)[Symbol.for("nodejs.util.inspect.custom")] =
+  function (
+    this: ${className},
     _depth: number,
     options: unknown,
     inspect: (value: unknown, options: unknown) => string,
   ): string {
     const proxy = this._getCustomInspectProxy();
     return ${JSON.stringify(type.name + " ")} + inspect(proxy, options);
-  }
+  };
   `;
 }

package/src/schema.ts

@@ -47,6 +47,17 @@ export interface TypeSchema {
    */
   entity: boolean;
 
+  /**
+   * Whether the type omits `@type` in JSON-LD serialization.  When `true`,
+   * the generated `toJsonLd()` method will not emit `@type` (or `type` in
+   * compact form) in the serialized JSON-LD.  The generated `fromJsonLd()`
+   * method will still accept `@type` if present for backward compatibility.
+   *
+   * This is useful for types that are not real vocabulary types but rather
+   * anonymous object structures (e.g., `Endpoints`, `Source` in ActivityStreams).
+   */
+  typeless?: boolean;
+
   /**
    * The description of the type.  It is used as the doc comment of
    * the generated class.

package/src/schema.yaml

@@ -223,6 +223,17 @@ properties:
 
       The extended subtypes must have the consistent value of this flag.
     type: boolean
+  typeless:
+    description: >-
+      Whether the type omits @type in JSON-LD serialization.  When true,
+      the generated toJsonLd() method will not emit @type (or type in
+      compact form) in the serialized JSON-LD.  The generated fromJsonLd()
+      method will still accept @type if present for backward compatibility.
+
+      This is useful for types that are not real vocabulary types but rather
+      anonymous object structures (e.g., Endpoints, Source in
+      ActivityStreams).
+    type: boolean
   description:
     description: >-
       The description of the type.  It is used as the doc comment of

package/tsdown.config.ts

@@ -4,7 +4,7 @@ import { defineConfig } from "tsdown";
 
 export default defineConfig({
   entry: ["src/mod.ts"],
-  dts: true,
+  dts: { compilerOptions: { isolatedDeclarations: true, declaration: true } },
   format: ["esm", "cjs"],
   platform: "neutral",
   external: [/^node:/],