@mostajs/orm-adapter 0.2.0 → 0.4.0

package/dist/utils/jsonschema-types.js

@@ -0,0 +1,41 @@
+// jsonschema-types.ts
+// Type definitions for JSON Schema structures we navigate.
+// Covers Draft-07, Draft 2019-09, Draft 2020-12 (superset shape).
+// Author: Dr Hamid MADANI drmdh@msn.com
+// License: AGPL-3.0-or-later
+export function detectDraft(schema) {
+    const url = schema.$schema ?? '';
+    if (/2020-12/.test(url))
+        return 'draft-2020-12';
+    if (/2019-09/.test(url))
+        return 'draft-2019-09';
+    if (/draft-07/.test(url))
+        return 'draft-07';
+    if (/draft-06/.test(url))
+        return 'draft-06';
+    if (/draft-04/.test(url))
+        return 'draft-04';
+    return 'unknown';
+}
+/** Get sub-schemas regardless of draft ($defs vs definitions) */
+export function getDefinitions(schema) {
+    return schema.$defs ?? schema.definitions ?? {};
+}
+/** First type if type is an array, else the type itself */
+export function primaryType(schema) {
+    const t = schema.type;
+    if (!t)
+        return undefined;
+    if (Array.isArray(t))
+        return t.find(x => x !== 'null');
+    return t;
+}
+/** Is nullable (either OpenAPI nullable: true, or type array includes null) */
+export function isNullable(schema) {
+    if (schema.nullable === true)
+        return true;
+    if (Array.isArray(schema.type))
+        return schema.type.includes('null');
+    return false;
+}
+//# sourceMappingURL=jsonschema-types.js.map

package/dist/utils/jsonschema-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonschema-types.js","sourceRoot":"","sources":["../../src/utils/jsonschema-types.ts"],"names":[],"mappings":"AAAA,sBAAsB;AACtB,2DAA2D;AAC3D,kEAAkE;AAClE,wCAAwC;AACxC,6BAA6B;AA6G7B,MAAM,UAAU,WAAW,CAAC,MAAkB;IAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACjC,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,eAAe,CAAC;IAChD,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,eAAe,CAAC;IAChD,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAC5C,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAC5C,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAC5C,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,cAAc,CAAC,MAAkB;IAC/C,OAAO,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;AAClD,CAAC;AAED,2DAA2D;AAC3D,MAAM,UAAU,WAAW,CAAC,MAAkB;IAC5C,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;IACtB,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;IACvD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,UAAU,CAAC,MAAkB;IAC3C,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC1C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACpE,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/utils/openapi-normalize.d.ts

@@ -0,0 +1,24 @@
+import type { JsonSchema } from './jsonschema-types.js';
+import { type AdapterWarning } from '../core/types.js';
+/** Detect if a spec is OpenAPI 3.0.x (not 3.1) */
+export declare function isOpenApi30(version: string | undefined): boolean;
+/**
+ * Normalize a Schema Object to 3.1 shape (in-place safe — operates on a cloned tree).
+ * Recursively walks through properties, items, $defs, allOf/oneOf/anyOf.
+ *
+ * Transformations applied:
+ *  - nullable: true  → type: [T, "null"]
+ *  - example: X      → examples: [X] (deprecated in 3.1)
+ *  - exclusiveMinimum: true (3.0 boolean) → exclusiveMinimum: minimum (3.1 number)
+ *  - exclusiveMaximum: true (3.0 boolean) → exclusiveMaximum: maximum (3.1 number)
+ *  - Drop format: binary + enforce blob (kept as-is but flagged)
+ */
+export declare function normalizeSchema30to31(schema: JsonSchema, emitWarning: (w: AdapterWarning) => void, path?: string): JsonSchema;
+/**
+ * Normalize ALL schemas in components.schemas.
+ * Only runs if the spec is OpenAPI 3.0.x.
+ */
+export declare function normalizeComponentsSchemas(components: {
+    schemas?: Record<string, JsonSchema>;
+} | undefined, version: string | undefined, emitWarning: (w: AdapterWarning) => void): Record<string, JsonSchema> | undefined;
+//# sourceMappingURL=openapi-normalize.d.ts.map

package/dist/utils/openapi-normalize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openapi-normalize.d.ts","sourceRoot":"","sources":["../../src/utils/openapi-normalize.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEpE,kDAAkD;AAClD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAGhE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,EACxC,IAAI,SAAM,GACT,UAAU,CAyFZ;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;CAAE,GAAG,SAAS,EAChE,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,WAAW,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,GACvC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,SAAS,CAkBxC"}

package/dist/utils/openapi-normalize.js

@@ -0,0 +1,118 @@
+// openapi-normalize.ts
+// Normalizes OpenAPI 3.0.x schemas to OpenAPI 3.1 / JSON Schema 2020-12 shape.
+// Makes it safe to feed OpenAPI schemas into the JsonSchema type mapper.
+// Author: Dr Hamid MADANI drmdh@msn.com
+// License: AGPL-3.0-or-later
+import { WarningCode } from '../core/types.js';
+/** Detect if a spec is OpenAPI 3.0.x (not 3.1) */
+export function isOpenApi30(version) {
+    if (!version)
+        return false;
+    return /^3\.0/.test(version);
+}
+/**
+ * Normalize a Schema Object to 3.1 shape (in-place safe — operates on a cloned tree).
+ * Recursively walks through properties, items, $defs, allOf/oneOf/anyOf.
+ *
+ * Transformations applied:
+ *  - nullable: true  → type: [T, "null"]
+ *  - example: X      → examples: [X] (deprecated in 3.1)
+ *  - exclusiveMinimum: true (3.0 boolean) → exclusiveMinimum: minimum (3.1 number)
+ *  - exclusiveMaximum: true (3.0 boolean) → exclusiveMaximum: maximum (3.1 number)
+ *  - Drop format: binary + enforce blob (kept as-is but flagged)
+ */
+export function normalizeSchema30to31(schema, emitWarning, path = '$') {
+    if (!schema || typeof schema !== 'object')
+        return schema;
+    const out = { ...schema };
+    // 1. nullable: true → type: [T, "null"]
+    if (out.nullable === true) {
+        if (typeof out.type === 'string') {
+            out.type = [out.type, 'null'];
+        }
+        else if (Array.isArray(out.type)) {
+            if (!out.type.includes('null'))
+                out.type = [...out.type, 'null'];
+        }
+        delete out.nullable;
+    }
+    // 2. example (singular, deprecated 3.1) → examples
+    const schemaAny = out;
+    if (schemaAny.example !== undefined && !out.examples) {
+        out.examples = [schemaAny.example];
+        delete schemaAny.example;
+    }
+    // 3. exclusiveMinimum/Maximum boolean (3.0) → numeric (3.1)
+    if (out.exclusiveMinimum === true && typeof out.minimum === 'number') {
+        out.exclusiveMinimum = out.minimum;
+        delete out.minimum;
+    }
+    else if (out.exclusiveMinimum === false) {
+        delete out.exclusiveMinimum;
+    }
+    if (out.exclusiveMaximum === true && typeof out.maximum === 'number') {
+        out.exclusiveMaximum = out.maximum;
+        delete out.maximum;
+    }
+    else if (out.exclusiveMaximum === false) {
+        delete out.exclusiveMaximum;
+    }
+    // 4. Recurse into nested schemas
+    if (out.properties) {
+        out.properties = Object.fromEntries(Object.entries(out.properties).map(([k, v]) => [
+            k,
+            normalizeSchema30to31(v, emitWarning, `${path}.properties.${k}`),
+        ]));
+    }
+    if (out.items) {
+        if (Array.isArray(out.items)) {
+            out.items = out.items.map((it, i) => normalizeSchema30to31(it, emitWarning, `${path}.items[${i}]`));
+        }
+        else {
+            out.items = normalizeSchema30to31(out.items, emitWarning, `${path}.items`);
+        }
+    }
+    if (out.$defs) {
+        out.$defs = Object.fromEntries(Object.entries(out.$defs).map(([k, v]) => [
+            k,
+            normalizeSchema30to31(v, emitWarning, `${path}.$defs.${k}`),
+        ]));
+    }
+    if (out.definitions) {
+        out.definitions = Object.fromEntries(Object.entries(out.definitions).map(([k, v]) => [
+            k,
+            normalizeSchema30to31(v, emitWarning, `${path}.definitions.${k}`),
+        ]));
+    }
+    for (const k of ['allOf', 'oneOf', 'anyOf']) {
+        const arr = out[k];
+        if (Array.isArray(arr)) {
+            out[k] = arr.map((s, i) => normalizeSchema30to31(s, emitWarning, `${path}.${k}[${i}]`));
+        }
+    }
+    if (out.not) {
+        out.not = normalizeSchema30to31(out.not, emitWarning, `${path}.not`);
+    }
+    return out;
+}
+/**
+ * Normalize ALL schemas in components.schemas.
+ * Only runs if the spec is OpenAPI 3.0.x.
+ */
+export function normalizeComponentsSchemas(components, version, emitWarning) {
+    const schemas = components?.schemas;
+    if (!schemas)
+        return undefined;
+    if (!isOpenApi30(version))
+        return schemas; // already 3.1+
+    // Emit a single info-level warning per spec
+    emitWarning({
+        code: WarningCode.FALLBACK_APPLIED,
+        message: `OpenAPI 3.0 detected — normalizing schemas to 3.1 shape (nullable/exclusiveMin/examples)`,
+    });
+    return Object.fromEntries(Object.entries(schemas).map(([name, schema]) => [
+        name,
+        normalizeSchema30to31(schema, emitWarning, `components.schemas.${name}`),
+    ]));
+}
+//# sourceMappingURL=openapi-normalize.js.map

package/dist/utils/openapi-normalize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openapi-normalize.js","sourceRoot":"","sources":["../../src/utils/openapi-normalize.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/orm-adapter",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Third-party schema adapters for @mostajs/orm — convert Prisma, JSON Schema, OpenAPI to EntitySchema",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "AGPL-3.0-or-later",