@atscript/typescript 0.1.52 → 0.1.54

package/dist/cli.cjs

@@ -1012,6 +1012,10 @@ else {
 					this.error(`Expected string (decimal), got ${typeOfValue}`);
 					return false;
 				}
+				if (!/^[+-]?\d+(\.\d+)?$/.test(value)) {
+					this.error(`Invalid decimal format: ${JSON.stringify(value)}`);
+					return false;
+				}
 				return true;
 			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
@@ -1320,13 +1324,7 @@ function forAnnotatedType(def, handlers) {
 
 //#endregion
 //#region packages/typescript/src/runtime/json-schema.ts
-/**
-* Detects a discriminator property across union items.
-*
-* Scans all items for object-typed members that share a common property
-* with distinct const/literal values. If exactly one such property exists,
-* it is returned as the discriminator.
-*/ function detectDiscriminator(items) {
+function detectDiscriminator(items) {
 	if (items.length < 2) return null;
 	for (const item of items) if (item.type.kind !== "object") return null;
 	const firstObj = items[0].type;

package/dist/index.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-const require_plugin = require('./plugin-otL5yA8s.cjs');
-require('./json-schema-BgW_S2sP.cjs');
+const require_plugin = require('./plugin-nPmWdkR5.cjs');
+require('./json-schema-CeDOlb_F.cjs');
 
 exports.default = require_plugin.tsPlugin
 exports.tsPlugin = require_plugin.tsPlugin

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { tsPlugin } from "./plugin-C_5DTxz9.mjs";
-import "./json-schema-DrJMwvm1.mjs";
+import { tsPlugin } from "./plugin-Bmibxc6X.mjs";
+import "./json-schema-Bq1dwNoo.mjs";
 
 export { tsPlugin as default, tsPlugin };

package/dist/{json-schema-DrJMwvm1.mjs → json-schema-Bq1dwNoo.mjs}

@@ -336,6 +336,10 @@ else {
 					this.error(`Expected string (decimal), got ${typeOfValue}`);
 					return false;
 				}
+				if (!/^[+-]?\d+(\.\d+)?$/.test(value)) {
+					this.error(`Invalid decimal format: ${JSON.stringify(value)}`);
+					return false;
+				}
 				return true;
 			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
@@ -701,13 +705,7 @@ function forAnnotatedType(def, handlers) {
 
 //#endregion
 //#region packages/typescript/src/runtime/json-schema.ts
-/**
-* Detects a discriminator property across union items.
-*
-* Scans all items for object-typed members that share a common property
-* with distinct const/literal values. If exactly one such property exists,
-* it is returned as the discriminator.
-*/ function detectDiscriminator(items) {
+function detectDiscriminator(items) {
 	if (items.length < 2) return null;
 	for (const item of items) if (item.type.kind !== "object") return null;
 	const firstObj = items[0].type;
@@ -978,4 +976,4 @@ function mergeJsonSchemas(types) {
 }
 
 //#endregion
-export { Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, defineAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas };
+export { Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, defineAnnotatedType, detectDiscriminator, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas };

package/dist/{json-schema-BgW_S2sP.cjs → json-schema-CeDOlb_F.cjs}

@@ -337,6 +337,10 @@ else {
 					this.error(`Expected string (decimal), got ${typeOfValue}`);
 					return false;
 				}
+				if (!/^[+-]?\d+(\.\d+)?$/.test(value)) {
+					this.error(`Invalid decimal format: ${JSON.stringify(value)}`);
+					return false;
+				}
 				return true;
 			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
@@ -702,13 +706,7 @@ function forAnnotatedType(def, handlers) {
 
 //#endregion
 //#region packages/typescript/src/runtime/json-schema.ts
-/**
-* Detects a discriminator property across union items.
-*
-* Scans all items for object-typed members that share a common property
-* with distinct const/literal values. If exactly one such property exists,
-* it is returned as the discriminator.
-*/ function detectDiscriminator(items) {
+function detectDiscriminator(items) {
 	if (items.length < 2) return null;
 	for (const item of items) if (item.type.kind !== "object") return null;
 	const firstObj = items[0].type;
@@ -1021,6 +1019,12 @@ Object.defineProperty(exports, 'defineAnnotatedType', {
     return defineAnnotatedType;
   }
 });
+Object.defineProperty(exports, 'detectDiscriminator', {
+  enumerable: true,
+  get: function () {
+    return detectDiscriminator;
+  }
+});
 Object.defineProperty(exports, 'forAnnotatedType', {
   enumerable: true,
   get: function () {

package/dist/{plugin-C_5DTxz9.mjs → plugin-Bmibxc6X.mjs}

@@ -1,4 +1,4 @@
-import { buildJsonSchema, defineAnnotatedType } from "./json-schema-DrJMwvm1.mjs";
+import { buildJsonSchema, defineAnnotatedType } from "./json-schema-Bq1dwNoo.mjs";
 import path from "path";
 import { DEFAULT_FORMAT, flattenInterfaceNode, getRelPath, hasNavPropAnnotation, isArray, isBareId, isConst, isGroup, isInterface, isPrimitive, isProp, isQueryLogical, isRef, isStructure } from "@atscript/core";
 

package/dist/{plugin-otL5yA8s.cjs → plugin-nPmWdkR5.cjs}

@@ -22,7 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const require_json_schema = require('./json-schema-BgW_S2sP.cjs');
+const require_json_schema = require('./json-schema-CeDOlb_F.cjs');
 const path = __toESM(require("path"));
 const __atscript_core = __toESM(require("@atscript/core"));
 

package/dist/test-utils.cjs

@@ -1,6 +1,6 @@
 "use strict";
-const require_plugin = require('./plugin-otL5yA8s.cjs');
-require('./json-schema-BgW_S2sP.cjs');
+const require_plugin = require('./plugin-nPmWdkR5.cjs');
+require('./json-schema-CeDOlb_F.cjs');
 const path = require_plugin.__toESM(require("path"));
 const __atscript_core = require_plugin.__toESM(require("@atscript/core"));
 const fs = require_plugin.__toESM(require("fs"));

package/dist/test-utils.mjs

@@ -1,5 +1,5 @@
-import { tsPlugin } from "./plugin-C_5DTxz9.mjs";
-import "./json-schema-DrJMwvm1.mjs";
+import { tsPlugin } from "./plugin-Bmibxc6X.mjs";
+import "./json-schema-Bq1dwNoo.mjs";
 import path from "path";
 import { build } from "@atscript/core";
 import { writeFileSync } from "fs";

package/dist/utils.cjs

@@ -1,5 +1,5 @@
 "use strict";
-const require_json_schema = require('./json-schema-BgW_S2sP.cjs');
+const require_json_schema = require('./json-schema-CeDOlb_F.cjs');
 
 //#region packages/typescript/src/runtime/default-value.ts
 /**
@@ -471,6 +471,7 @@ exports.createAnnotatedTypeNode = require_json_schema.createAnnotatedTypeNode
 exports.createDataFromAnnotatedType = createDataFromAnnotatedType
 exports.defineAnnotatedType = require_json_schema.defineAnnotatedType
 exports.deserializeAnnotatedType = deserializeAnnotatedType
+exports.detectDiscriminator = require_json_schema.detectDiscriminator
 exports.flattenAnnotatedType = flattenAnnotatedType
 exports.forAnnotatedType = require_json_schema.forAnnotatedType
 exports.fromJsonSchema = require_json_schema.fromJsonSchema

package/dist/utils.d.ts

@@ -292,6 +292,28 @@ declare function isAnnotatedTypeOfPrimitive(t: TAtscriptAnnotatedType): boolean;
 
 /** A JSON Schema object (draft-compatible). */
 type TJsonSchema = Record<string, any>;
+/**
+ * Describes a discriminator property shared by all variants of a union.
+ *
+ * Returned by {@link detectDiscriminator} when a union qualifies as a
+ * discriminated (a.k.a. tagged) union — every variant is an object that
+ * carries the same literal-valued property with a distinct value.
+ */
+type TUnionDiscriminator = {
+    /** Name of the discriminator property shared by all variants. */
+    propertyName: string;
+    /** Maps the literal value of `propertyName` → variant index in `items`. */
+    indexMapping: Record<string, number>;
+};
+/**
+ * Detects a discriminator property across union items.
+ *
+ * Scans all items for object-typed members that share a common property
+ * with distinct const/literal values. If exactly one such property exists,
+ * it is returned as the discriminator. Returns `null` when no qualifying
+ * property exists, or when more than one does (ambiguous).
+ */
+declare function detectDiscriminator(items: TAtscriptAnnotatedType[]): TUnionDiscriminator | null;
 /**
  * Builds a JSON Schema from an {@link TAtscriptAnnotatedType}.
  *
@@ -644,5 +666,5 @@ type NavPropsOf<T> = T extends {
     __navProps: infer N extends Record<string, unknown>;
 } ? N : Record<string, never>;
 
-export { SERIALIZE_VERSION, Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, createDataFromAnnotatedType, defineAnnotatedType, deserializeAnnotatedType, flattenAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas, serializeAnnotatedType, throwFeatureDisabled };
-export type { AtscriptQueryComparison, AtscriptQueryFieldRef, AtscriptQueryNode, AtscriptRef, FlatOf, InferDataType, NavPropsOf, OwnPropsOf, PrimaryKeyOf, TAnnotatedTypeHandle, TAtscriptAnnotatedType, TAtscriptAnnotatedTypeConstructor, TAtscriptDataType, TAtscriptTypeArray, TAtscriptTypeComplex, TAtscriptTypeDef, TAtscriptTypeFinal, TAtscriptTypeObject, TCreateDataOptions, TFlattenOptions, TJsonSchema, TMetadataMap, TProcessAnnotationContext, TSerializeOptions, TSerializedAnnotatedType, TSerializedAnnotatedTypeInner, TSerializedTypeArray, TSerializedTypeComplex, TSerializedTypeDef, TSerializedTypeFinal, TSerializedTypeObject, TValidatorOptions, TValidatorPlugin, TValidatorPluginContext, TValueResolver };
+export { SERIALIZE_VERSION, Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, createDataFromAnnotatedType, defineAnnotatedType, deserializeAnnotatedType, detectDiscriminator, flattenAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas, serializeAnnotatedType, throwFeatureDisabled };
+export type { AtscriptQueryComparison, AtscriptQueryFieldRef, AtscriptQueryNode, AtscriptRef, FlatOf, InferDataType, NavPropsOf, OwnPropsOf, PrimaryKeyOf, TAnnotatedTypeHandle, TAtscriptAnnotatedType, TAtscriptAnnotatedTypeConstructor, TAtscriptDataType, TAtscriptTypeArray, TAtscriptTypeComplex, TAtscriptTypeDef, TAtscriptTypeFinal, TAtscriptTypeObject, TCreateDataOptions, TFlattenOptions, TJsonSchema, TMetadataMap, TProcessAnnotationContext, TSerializeOptions, TSerializedAnnotatedType, TSerializedAnnotatedTypeInner, TSerializedTypeArray, TSerializedTypeComplex, TSerializedTypeDef, TSerializedTypeFinal, TSerializedTypeObject, TUnionDiscriminator, TValidatorOptions, TValidatorPlugin, TValidatorPluginContext, TValueResolver };

package/dist/utils.mjs

@@ -1,4 +1,4 @@
-import { Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, defineAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas } from "./json-schema-DrJMwvm1.mjs";
+import { Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, defineAnnotatedType, detectDiscriminator, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas } from "./json-schema-Bq1dwNoo.mjs";
 
 //#region packages/typescript/src/runtime/default-value.ts
 /**
@@ -460,4 +460,4 @@ function deserializeTypeDef(t, resolved) {
 }
 
 //#endregion
-export { SERIALIZE_VERSION, Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, createDataFromAnnotatedType, defineAnnotatedType, deserializeAnnotatedType, flattenAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas, serializeAnnotatedType, throwFeatureDisabled };
+export { SERIALIZE_VERSION, Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, createDataFromAnnotatedType, defineAnnotatedType, deserializeAnnotatedType, detectDiscriminator, flattenAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas, serializeAnnotatedType, throwFeatureDisabled };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.1.52",
+  "version": "0.1.54",
   "description": "Atscript: typescript-gen support.",
   "keywords": [
     "annotations",
@@ -67,13 +67,13 @@
     "moost": "^0.6.9"
   },
   "devDependencies": {
-    "@atscript/db": "^0.1.48",
+    "@atscript/db": "^0.1.74",
     "@uniqu/core": "^0.1.6",
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@atscript/db": "^0.1.48",
-    "@atscript/core": "^0.1.52"
+    "@atscript/db": "^0.1.74",
+    "@atscript/core": "^0.1.54"
   },
   "peerDependenciesMeta": {
     "@atscript/db": {