@tsofist/schema-forge 2.5.0 → 2.5.1

package/lib/generator/schema-generator.d.ts

@@ -1,7 +1,6 @@
 import '../util/patch.extended-annotations-reader';
 import { SchemaObject } from 'ajv';
-import { ChainNodeParser, CompletedConfig, Context, SubNodeParser, TupleType } from 'ts-json-schema-generator';
-import { Node, TupleTypeNode } from 'typescript';
+import { CompletedConfig } from 'ts-json-schema-generator';
 import { SchemaForgeOptions } from '../types';
 import { TypeExposeKind } from './types';
 interface Options {
@@ -18,11 +17,4 @@ interface Options {
     shrinkDefinitionNames: SchemaForgeOptions['shrinkDefinitionNames'];
 }
 export declare function generateSchemaByDraftTypes(options: Options): Promise<SchemaObject>;
-export declare class TupleTypeParser implements SubNodeParser {
-    protected readonly childNodeParser: ChainNodeParser;
-    protected readonly allowUseFallbackDescription: boolean | undefined;
-    constructor(childNodeParser: ChainNodeParser, allowUseFallbackDescription: boolean | undefined);
-    supportsNode(node: Node): boolean;
-    createType(node: TupleTypeNode, context: Context): TupleType;
-}
 export {};

package/lib/generator/schema-generator.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TupleTypeParser = void 0;
 exports.generateSchemaByDraftTypes = generateSchemaByDraftTypes;
 require("../util/patch.extended-annotations-reader");
 const error_1 = require("@tsofist/stem/lib/error");
@@ -59,7 +58,6 @@ async function generateSchemaByDraftTypes(options) {
         const replacement = new Set();
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         for (const name of Object.keys(result.definitions)) {
-            console.log('DEF::::', name);
             const r = options.shrinkDefinitionNames(name);
             if (r) {
                 if (replacement.has(r) || r in result.definitions) {
@@ -72,11 +70,11 @@ async function generateSchemaByDraftTypes(options) {
                 delete result.definitions[name];
                 // rename references
                 const targets = (0, jsonpath_plus_1.JSONPath)({
-                    path: `$..[?(@ && @.$ref == "#/definitions/${name}")]`,
+                    path: `$..[?(@ && @.$ref == "#/definitions/${escapeDefinitionNameForJSONPath(name)}")]`,
                     json: result,
                     eval: 'safe',
                 });
-                targets.forEach((item) => {
+                targets?.forEach((item) => {
                     item.$ref = item.$ref.replace(`#/definitions/${name}`, `#/definitions/${r}`);
                 });
             }
@@ -95,6 +93,9 @@ async function generateSchemaByDraftTypes(options) {
     }).validateSchema(result, true);
     return result;
 }
+function escapeDefinitionNameForJSONPath(value) {
+    return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+}
 class TupleTypeParser {
     constructor(childNodeParser, allowUseFallbackDescription) {
         Object.defineProperty(this, "childNodeParser", {
@@ -119,8 +120,6 @@ class TupleTypeParser {
             if ((0, typescript_1.isNamedTupleMember)(element)) {
                 const description = (0, tsc_1.readJSDocDescription)(element, this.allowUseFallbackDescription);
                 const nullable = type instanceof ts_json_schema_generator_1.AnnotatedType ? type.isNullable() : false;
-                if (nullable)
-                    console.log(description, nullable);
                 return description ? new ts_json_schema_generator_1.AnnotatedType(type, { description }, nullable) : type;
             }
             return type;
@@ -128,7 +127,6 @@ class TupleTypeParser {
         return new ts_json_schema_generator_1.TupleType(items);
     }
 }
-exports.TupleTypeParser = TupleTypeParser;
 class ArrayLiteralExpressionIdentifierParser {
     constructor(checker) {
         Object.defineProperty(this, "checker", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsofist/schema-forge",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Generate JSON schema from TypeScript types",
   "author": "Andrew Berdnikov <tsofistgudmen@gmail.com>",
   "license": "LGPL-3.0",