@satisfactory-dev/docs.json.ts 0.7.0 → 0.8.0

package/lib/DataDiscovery/CustomTypes/TypedString.js

@@ -4,7 +4,7 @@ import { generate_object_parent_schema, generate_typed_string_$defs, } from '../
 import { local_ref, } from '../../StringStartsWith';
 import { NoMatchError, } from '../../Exceptions';
 import { string_to_array, string_to_object, } from '../../DocsValidation';
-import { compile, } from '../../AjvUtilities';
+import { compile, } from '@satisfactory-dev/ajv-utilities';
 import { typed_string, } from '../../TypeDefinitionDiscovery/CustomParsingTypes/typed_string';
 import assert from 'node:assert/strict';
 export class TypedStringConverter extends ConverterMatchesSchema {

package/lib/DataDiscovery/Generator.js

@@ -1,5 +1,5 @@
 import { NoMatchError, } from '../Exceptions';
-import { compile, } from '../AjvUtilities';
+import { compile, } from '@satisfactory-dev/ajv-utilities';
 export class Converter {
     static find_matching_schema(candidates, schema) {
         const converter = this.has_matching_schema(candidates, schema);

package/lib/DataDiscovery/JsonSchema/StringType.js

@@ -4,7 +4,7 @@ import { NoMatchError, } from '../../Exceptions';
 import ts from 'typescript';
 import { create_literal, type_reference_node, } from '../../TsFactoryWrapper';
 import { not_matching_string_schema, } from '../../TypeDefinitionDiscovery/JsonSchema/String';
-import { compile, } from '../../AjvUtilities';
+import { compile, } from '@satisfactory-dev/ajv-utilities';
 class StringConverter extends ConverterMatchesSchema {
     maybe_not;
     constructor(ajv, schema) {

package/lib/DocsTsGenerator.js

@@ -12,7 +12,7 @@ import { createHash, } from 'node:crypto';
 import { is_non_empty_array, is_string, object_has_only_properties_that_match_predicate, object_has_property, property_exists_on_object, value_is_non_array_object, } from '@satisfactory-dev/predicates.ts';
 import { NoMatchError, } from './Exceptions';
 import { TypedString, } from './CustomParsingTypes/TypedString';
-import { compile, esmify, } from './AjvUtilities';
+import { compile, esmify, } from '@satisfactory-dev/ajv-utilities';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export class ValidationError extends Error {
     errors;

package/lib/FilesGenerator.js

@@ -33,5 +33,15 @@ export function guess_filename(ref) {
         || ref.startsWith('EditorCurveData--')) {
         return 'classes/base.ts';
     }
+    else if ([
+        'boolean',
+        'boolean-extended',
+        'integer-string',
+        'integer-string--signed',
+        'decimal-string',
+        'decimal-string--signed',
+    ].includes(ref)) {
+        return 'common/scalar.ts';
+    }
     return 'common/unassigned.ts';
 }

package/lib/TypeDefinitionDiscovery/Generator.js

@@ -1,4 +1,4 @@
-import { compile, } from '../AjvUtilities';
+import { compile, } from '@satisfactory-dev/ajv-utilities';
 export class Generator {
     check;
     constructor(ajv, schema) {

package/lib/TypeDefinitionDiscovery.js

@@ -11,7 +11,7 @@ import { NonEmptyString, NonEmptyStringWithExclusions, StringType, } from './Typ
 import { FilesGenerator, guess_filename, } from './FilesGenerator';
 import { adjust_class_name, create_modifiers, } from './TsFactoryWrapper';
 import { reduce, remap, remove_indentation, } from './MarkdownUtilities';
-import { compile, } from './AjvUtilities';
+import { compile, } from '@satisfactory-dev/ajv-utilities';
 import { NoMatchError, } from './Exceptions';
 function is_schema_with_$defs(schema, discovered_types) {
     return (object_has_property(schema, '$defs', value_is_non_array_object)

package/lib/TypeDefinitionWriter.js

@@ -19,7 +19,7 @@ import { FilesGenerator, FromArray, } from './FilesGenerator';
 import { FilesGenerator as DocsFiles, } from './DocsTsGenerator/FilesGenerator';
 import { DataDiscovery, } from './DataDiscovery';
 import { __dirname_from_meta, } from './__dirname';
-import { compile, } from './AjvUtilities';
+import { compile, } from '@satisfactory-dev/ajv-utilities';
 const __dirname = __dirname_from_meta(import.meta);
 export class TypeDefinitionWriter {
     _discovery = undefined;

package/lib/TypesDiscovery.js

@@ -3,7 +3,7 @@ import { properties, } from './TypesDiscovery/JsonSchema/properties';
 import { non_empty_array_property, } from './TypesDiscovery/non_empty_array_property';
 import { $ref, } from './TypesDiscovery/JsonSchema/$ref';
 import { non_array_object_property, } from './TypesDiscovery/non_array_object_property';
-import { compile, } from './AjvUtilities';
+import { compile, } from '@satisfactory-dev/ajv-utilities';
 import { local_ref, } from './StringStartsWith';
 import { typed_string, } from './TypesDiscovery/CustomParsingTypes/typed_string';
 import { ConstString, } from './TypesDiscovery/JsonSchema/const';

package/lib/generator.d.ts

@@ -1,2 +1,3 @@
 export * from './DocsTsGenerator';
+export * from './DocsValidation';
 export * from './TypeDefinitionWriter';

package/lib/generator.js

@@ -1,2 +1,3 @@
 export * from './DocsTsGenerator';
+export * from './DocsValidation';
 export * from './TypeDefinitionWriter';

package/lib/index.d.ts

@@ -1,5 +1,3 @@
-export * from './AjvUtilities';
 export * from './CustomParsingTypes/CustomPairingTypes';
-export * from './DocsValidation';
 export * from './Exceptions';
 export * from './StringStartsWith';

package/lib/index.js

@@ -1,5 +1,3 @@
-export * from './AjvUtilities';
 export * from './CustomParsingTypes/CustomPairingTypes';
-export * from './DocsValidation';
 export * from './Exceptions';
 export * from './StringStartsWith';

package/package.json

@@ -27,6 +27,7 @@
     "ts-node": "^10.9.2"
   },
   "dependencies": {
+    "@satisfactory-dev/ajv-utilities": "^0.1.0",
     "@satisfactory-dev/predicates.ts": "^0.1.0",
     "ajv": "^8.12.0",
     "eslint": "^8.57.0",
@@ -35,5 +36,5 @@
     "typescript": "~5.5.2",
     "typescript-eslint": "^7.3.1"
   },
-  "version": "0.7.0"
+  "version": "0.8.0"
 }

package/lib/AjvUtilities.d.ts

@@ -1,7 +0,0 @@
-import Ajv, { SchemaObject, ValidateFunction } from 'ajv/dist/2020';
-import { NoMatchError } from './Exceptions';
-export declare class FailedToCompileSchema extends NoMatchError {
-    constructor(schema: SchemaObject, err: unknown, message?: string);
-}
-export declare function compile<T>(ajv: Ajv, schema: SchemaObject): ValidateFunction<T>;
-export declare function esmify(code: string): string;

package/lib/AjvUtilities.js

@@ -1,58 +0,0 @@
-import { NoMatchError, } from './Exceptions';
-const cache = new WeakMap();
-const duplicate_compile_check = {};
-export class FailedToCompileSchema extends NoMatchError {
-    constructor(schema, err, message = 'Failed to compile schema') {
-        super({ err, schema }, message);
-    }
-}
-export function compile(ajv, schema) {
-    try {
-        performance.mark('ajv compile start');
-        if (cache.has(schema)) {
-            const result = cache.get(schema);
-            performance.measure('ajv compile cached', 'ajv compile start');
-            return result;
-        }
-        const key = JSON.stringify(schema);
-        if (key in duplicate_compile_check) {
-            performance.measure('ajv compile duplicate', 'ajv compile start');
-            return duplicate_compile_check[key];
-        }
-        const result = ajv.compile(schema);
-        cache.set(schema, result);
-        duplicate_compile_check[key] = result;
-        performance.measure('ajv compile', 'ajv compile start');
-        return result;
-    }
-    catch (err) {
-        throw new FailedToCompileSchema(schema, err);
-    }
-}
-export function esmify(code) {
-    const replacements = {
-        'require("ajv/dist/runtime/equal").default': [
-            'fast_deep_equal',
-            `import fast_deep_equal from 'fast-deep-equal';`,
-        ],
-        'require("ajv/dist/runtime/ucs2length").default': [
-            'ucs2length.default',
-            `import ucs2length from 'ajv/dist/runtime/ucs2length';`,
-        ],
-    };
-    const import_these = [];
-    for (const entry of Object.entries(replacements)) {
-        const [look_for, [replace_with, add_to_import]] = entry;
-        if (code.includes(look_for)) {
-            code = code.replace(look_for, replace_with);
-            import_these.push(add_to_import);
-        }
-    }
-    if (import_these.length) {
-        code = code.replace(/^"use strict";/, [
-            '"use strict";',
-            ...import_these,
-        ].join(''));
-    }
-    return code;
-}