@atscript/typescript 0.1.37 → 0.1.38

package/dist/cli.cjs

@@ -349,6 +349,7 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 			this.renderOwnProps(interfaceNode);
 			this.renderNavProps(interfaceNode);
 			this.renderPk(interfaceNode);
+			this.renderDimMeasure(interfaceNode);
 		}
 	}
 	renderInterface(node) {
@@ -607,6 +608,24 @@ else if (pkProps.length === 1) {
 			this.writeln(uniqueSuffix);
 		}
 	}
+	renderDimMeasure(node) {
+		let struct;
+		if (node.hasExtends) struct = this.doc.resolveInterfaceExtends(node);
+		if (!struct) struct = node.getDefinition();
+		if (!struct || !(0, __atscript_core.isStructure)(struct)) return;
+		const structNode = struct;
+		const dims = [];
+		const measures = [];
+		for (const [name, prop] of structNode.props) {
+			if (prop.token("identifier")?.pattern) continue;
+			if (prop.countAnnotations("db.column.dimension") > 0) dims.push(name);
+			if (prop.countAnnotations("db.column.measure") > 0) measures.push(name);
+		}
+		if (dims.length === 0 && measures.length === 0) return;
+		this.writeln();
+		if (dims.length > 0) this.writeln(`static __dim: ${dims.map((d) => `"${escapeQuotes(d)}"`).join(" | ")}`);
+		if (measures.length > 0) this.writeln(`static __measure: ${measures.map((m) => `"${escapeQuotes(m)}"`).join(" | ")}`);
+	}
 	phantomPropType(def) {
 		if (!def) return undefined;
 		if ((0, __atscript_core.isPrimitive)(def) && def.config.type === "phantom") return def.id;
@@ -656,7 +675,7 @@ function renderPrimitiveTypeDef(def) {
 }
 
 //#endregion
-//#region packages/typescript/src/validator.ts
+//#region packages/typescript/src/runtime/validator.ts
 function _define_property$4(obj, key, value) {
 	if (key in obj) Object.defineProperty(obj, key, {
 		value,
@@ -978,6 +997,13 @@ else {
 				}
 				return true;
 			}
+			case "decimal": {
+				if (typeOfValue !== "string") {
+					this.error(`Expected string (decimal), got ${typeOfValue}`);
+					return false;
+				}
+				return true;
+			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
 		}
 	}
@@ -1091,7 +1117,7 @@ var ValidatorError = class extends Error {
 };
 
 //#endregion
-//#region packages/typescript/src/annotated-type.ts
+//#region packages/typescript/src/runtime/annotated-type.ts
 const COMPLEX_KINDS = new Set([
 	"union",
 	"intersection",
@@ -1254,7 +1280,7 @@ function isPhantomType(def) {
 }
 
 //#endregion
-//#region packages/typescript/src/traverse.ts
+//#region packages/typescript/src/runtime/traverse.ts
 function forAnnotatedType(def, handlers) {
 	switch (def.type.kind) {
 		case "": {
@@ -1272,7 +1298,7 @@ function forAnnotatedType(def, handlers) {
 }
 
 //#endregion
-//#region packages/typescript/src/json-schema.ts
+//#region packages/typescript/src/runtime/json-schema.ts
 /**
 * Detects a discriminator property across union items.
 *
@@ -1395,7 +1421,8 @@ function buildJsonSchema(type) {
 				const schema$1 = {};
 				if (d.type.value !== undefined) schema$1.const = d.type.value;
 				if (d.type.designType && d.type.designType !== "any") {
-					schema$1.type = d.type.designType === "undefined" ? "null" : d.type.designType;
+					const dt = d.type.designType;
+					schema$1.type = dt === "undefined" ? "null" : dt === "decimal" ? "string" : dt;
 					if (schema$1.type === "number" && meta.get("expect.int")) schema$1.type = "integer";
 				}
 				if (schema$1.type === "string") {
@@ -1541,6 +1568,7 @@ else def = def.getDefinition() || def;
 		if (typeId) this.writeln(`static id = "${typeId}"`);
 		this.renderJsonSchemaMethod(node);
 		this.renderExampleDataMethod(node);
+		this.renderDimMeasure(node);
 	}
 	renderInterface(node) {
 		this.renderDefinitionClass(node);
@@ -1592,6 +1620,25 @@ else def = def.getDefinition() || def;
 			this.writeln("}");
 		}
 	}
+	renderDimMeasure(node) {
+		if (!(0, __atscript_core.isInterface)(node)) return;
+		const interfaceNode = node;
+		if (!interfaceNode.annotations?.some((a) => a.name === "db.table" || a.name === "db.view" || a.name === "db.view.for")) return;
+		let struct;
+		if (interfaceNode.hasExtends) struct = this.doc.resolveInterfaceExtends(interfaceNode);
+		if (!struct) struct = interfaceNode.getDefinition();
+		if (!struct || !(0, __atscript_core.isStructure)(struct)) return;
+		const structNode = struct;
+		const dims = [];
+		const measures = [];
+		for (const [name, prop] of structNode.props) {
+			if (prop.token("identifier")?.pattern) continue;
+			if (prop.countAnnotations("db.column.dimension") > 0) dims.push(name);
+			if (prop.countAnnotations("db.column.measure") > 0) measures.push(name);
+		}
+		if (dims.length > 0) this.writeln(`static dimensions = [${dims.map((d) => `'${escapeQuotes(d)}'`).join(", ")}]`);
+		if (measures.length > 0) this.writeln(`static measures = [${measures.map((m) => `'${escapeQuotes(m)}'`).join(", ")}]`);
+	}
 	toAnnotatedType(node) {
 		return this.toAnnotatedHandle(node).$type;
 	}
@@ -2468,7 +2515,7 @@ var DbSyncController = class {
 		}
 		this.printer.typeCount(dbTypes.length);
 		this.printer.banner();
-		const { SchemaSync } = await this.importFromCwd("@atscript/utils-db/sync", true);
+		const { SchemaSync } = await this.importFromCwd("@atscript/db/sync", true);
 		const sync = new SchemaSync(dbSpace);
 		const plan = await sync.plan(dbTypes, {
 			force,

package/dist/index.cjs

@@ -23,7 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const require_json_schema = require('./json-schema-S5-XAOrR.cjs');
+const require_json_schema = require('./json-schema-B55uxKNQ.cjs');
 const path = __toESM(require("path"));
 const __atscript_core = __toESM(require("@atscript/core"));
 
@@ -345,6 +345,7 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 			this.renderOwnProps(interfaceNode);
 			this.renderNavProps(interfaceNode);
 			this.renderPk(interfaceNode);
+			this.renderDimMeasure(interfaceNode);
 		}
 	}
 	renderInterface(node) {
@@ -603,6 +604,24 @@ else if (pkProps.length === 1) {
 			this.writeln(uniqueSuffix);
 		}
 	}
+	renderDimMeasure(node) {
+		let struct;
+		if (node.hasExtends) struct = this.doc.resolveInterfaceExtends(node);
+		if (!struct) struct = node.getDefinition();
+		if (!struct || !(0, __atscript_core.isStructure)(struct)) return;
+		const structNode = struct;
+		const dims = [];
+		const measures = [];
+		for (const [name, prop] of structNode.props) {
+			if (prop.token("identifier")?.pattern) continue;
+			if (prop.countAnnotations("db.column.dimension") > 0) dims.push(name);
+			if (prop.countAnnotations("db.column.measure") > 0) measures.push(name);
+		}
+		if (dims.length === 0 && measures.length === 0) return;
+		this.writeln();
+		if (dims.length > 0) this.writeln(`static __dim: ${dims.map((d) => `"${escapeQuotes(d)}"`).join(" | ")}`);
+		if (measures.length > 0) this.writeln(`static __measure: ${measures.map((m) => `"${escapeQuotes(m)}"`).join(" | ")}`);
+	}
 	phantomPropType(def) {
 		if (!def) return undefined;
 		if ((0, __atscript_core.isPrimitive)(def) && def.config.type === "phantom") return def.id;
@@ -766,6 +785,7 @@ else def = def.getDefinition() || def;
 		if (typeId) this.writeln(`static id = "${typeId}"`);
 		this.renderJsonSchemaMethod(node);
 		this.renderExampleDataMethod(node);
+		this.renderDimMeasure(node);
 	}
 	renderInterface(node) {
 		this.renderDefinitionClass(node);
@@ -817,6 +837,25 @@ else def = def.getDefinition() || def;
 			this.writeln("}");
 		}
 	}
+	renderDimMeasure(node) {
+		if (!(0, __atscript_core.isInterface)(node)) return;
+		const interfaceNode = node;
+		if (!interfaceNode.annotations?.some((a) => a.name === "db.table" || a.name === "db.view" || a.name === "db.view.for")) return;
+		let struct;
+		if (interfaceNode.hasExtends) struct = this.doc.resolveInterfaceExtends(interfaceNode);
+		if (!struct) struct = interfaceNode.getDefinition();
+		if (!struct || !(0, __atscript_core.isStructure)(struct)) return;
+		const structNode = struct;
+		const dims = [];
+		const measures = [];
+		for (const [name, prop] of structNode.props) {
+			if (prop.token("identifier")?.pattern) continue;
+			if (prop.countAnnotations("db.column.dimension") > 0) dims.push(name);
+			if (prop.countAnnotations("db.column.measure") > 0) measures.push(name);
+		}
+		if (dims.length > 0) this.writeln(`static dimensions = [${dims.map((d) => `'${escapeQuotes(d)}'`).join(", ")}]`);
+		if (measures.length > 0) this.writeln(`static measures = [${measures.map((m) => `'${escapeQuotes(m)}'`).join(", ")}]`);
+	}
 	toAnnotatedType(node) {
 		return this.toAnnotatedHandle(node).$type;
 	}

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { buildJsonSchema, defineAnnotatedType } from "./json-schema-0UUPoHud.mjs";
+import { buildJsonSchema, defineAnnotatedType } from "./json-schema-DaFltW4t.mjs";
 import path from "path";
 import { DEFAULT_FORMAT, flattenInterfaceNode, hasNavPropAnnotation, isArray, isConst, isGroup, isInterface, isPrimitive, isQueryLogical, isRef, isStructure } from "@atscript/core";
 
@@ -320,6 +320,7 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 			this.renderOwnProps(interfaceNode);
 			this.renderNavProps(interfaceNode);
 			this.renderPk(interfaceNode);
+			this.renderDimMeasure(interfaceNode);
 		}
 	}
 	renderInterface(node) {
@@ -578,6 +579,24 @@ else if (pkProps.length === 1) {
 			this.writeln(uniqueSuffix);
 		}
 	}
+	renderDimMeasure(node) {
+		let struct;
+		if (node.hasExtends) struct = this.doc.resolveInterfaceExtends(node);
+		if (!struct) struct = node.getDefinition();
+		if (!struct || !isStructure(struct)) return;
+		const structNode = struct;
+		const dims = [];
+		const measures = [];
+		for (const [name, prop] of structNode.props) {
+			if (prop.token("identifier")?.pattern) continue;
+			if (prop.countAnnotations("db.column.dimension") > 0) dims.push(name);
+			if (prop.countAnnotations("db.column.measure") > 0) measures.push(name);
+		}
+		if (dims.length === 0 && measures.length === 0) return;
+		this.writeln();
+		if (dims.length > 0) this.writeln(`static __dim: ${dims.map((d) => `"${escapeQuotes(d)}"`).join(" | ")}`);
+		if (measures.length > 0) this.writeln(`static __measure: ${measures.map((m) => `"${escapeQuotes(m)}"`).join(" | ")}`);
+	}
 	phantomPropType(def) {
 		if (!def) return undefined;
 		if (isPrimitive(def) && def.config.type === "phantom") return def.id;
@@ -741,6 +760,7 @@ else def = def.getDefinition() || def;
 		if (typeId) this.writeln(`static id = "${typeId}"`);
 		this.renderJsonSchemaMethod(node);
 		this.renderExampleDataMethod(node);
+		this.renderDimMeasure(node);
 	}
 	renderInterface(node) {
 		this.renderDefinitionClass(node);
@@ -792,6 +812,25 @@ else def = def.getDefinition() || def;
 			this.writeln("}");
 		}
 	}
+	renderDimMeasure(node) {
+		if (!isInterface(node)) return;
+		const interfaceNode = node;
+		if (!interfaceNode.annotations?.some((a) => a.name === "db.table" || a.name === "db.view" || a.name === "db.view.for")) return;
+		let struct;
+		if (interfaceNode.hasExtends) struct = this.doc.resolveInterfaceExtends(interfaceNode);
+		if (!struct) struct = interfaceNode.getDefinition();
+		if (!struct || !isStructure(struct)) return;
+		const structNode = struct;
+		const dims = [];
+		const measures = [];
+		for (const [name, prop] of structNode.props) {
+			if (prop.token("identifier")?.pattern) continue;
+			if (prop.countAnnotations("db.column.dimension") > 0) dims.push(name);
+			if (prop.countAnnotations("db.column.measure") > 0) measures.push(name);
+		}
+		if (dims.length > 0) this.writeln(`static dimensions = [${dims.map((d) => `'${escapeQuotes(d)}'`).join(", ")}]`);
+		if (measures.length > 0) this.writeln(`static measures = [${measures.map((m) => `'${escapeQuotes(m)}'`).join(", ")}]`);
+	}
 	toAnnotatedType(node) {
 		return this.toAnnotatedHandle(node).$type;
 	}

package/dist/{json-schema-S5-XAOrR.cjs → json-schema-B55uxKNQ.cjs}

@@ -1,6 +1,6 @@
 "use strict";
 
-//#region packages/typescript/src/validator.ts
+//#region packages/typescript/src/runtime/validator.ts
 function _define_property(obj, key, value) {
 	if (key in obj) Object.defineProperty(obj, key, {
 		value,
@@ -322,6 +322,13 @@ else {
 				}
 				return true;
 			}
+			case "decimal": {
+				if (typeOfValue !== "string") {
+					this.error(`Expected string (decimal), got ${typeOfValue}`);
+					return false;
+				}
+				return true;
+			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
 		}
 	}
@@ -435,7 +442,7 @@ var ValidatorError = class extends Error {
 };
 
 //#endregion
-//#region packages/typescript/src/annotated-type.ts
+//#region packages/typescript/src/runtime/annotated-type.ts
 const COMPLEX_KINDS = new Set([
 	"union",
 	"intersection",
@@ -655,7 +662,7 @@ function isAnnotatedTypeOfPrimitive(t) {
 }
 
 //#endregion
-//#region packages/typescript/src/traverse.ts
+//#region packages/typescript/src/runtime/traverse.ts
 function forAnnotatedType(def, handlers) {
 	switch (def.type.kind) {
 		case "": {
@@ -673,7 +680,7 @@ function forAnnotatedType(def, handlers) {
 }
 
 //#endregion
-//#region packages/typescript/src/json-schema.ts
+//#region packages/typescript/src/runtime/json-schema.ts
 /**
 * Detects a discriminator property across union items.
 *
@@ -796,7 +803,8 @@ function buildJsonSchema(type) {
 				const schema$1 = {};
 				if (d.type.value !== undefined) schema$1.const = d.type.value;
 				if (d.type.designType && d.type.designType !== "any") {
-					schema$1.type = d.type.designType === "undefined" ? "null" : d.type.designType;
+					const dt = d.type.designType;
+					schema$1.type = dt === "undefined" ? "null" : dt === "decimal" ? "string" : dt;
 					if (schema$1.type === "number" && meta.get("expect.int")) schema$1.type = "integer";
 				}
 				if (schema$1.type === "string") {

package/dist/{json-schema-0UUPoHud.mjs → json-schema-DaFltW4t.mjs}

@@ -1,5 +1,5 @@
 
-//#region packages/typescript/src/validator.ts
+//#region packages/typescript/src/runtime/validator.ts
 function _define_property(obj, key, value) {
 	if (key in obj) Object.defineProperty(obj, key, {
 		value,
@@ -321,6 +321,13 @@ else {
 				}
 				return true;
 			}
+			case "decimal": {
+				if (typeOfValue !== "string") {
+					this.error(`Expected string (decimal), got ${typeOfValue}`);
+					return false;
+				}
+				return true;
+			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
 		}
 	}
@@ -434,7 +441,7 @@ var ValidatorError = class extends Error {
 };
 
 //#endregion
-//#region packages/typescript/src/annotated-type.ts
+//#region packages/typescript/src/runtime/annotated-type.ts
 const COMPLEX_KINDS = new Set([
 	"union",
 	"intersection",
@@ -654,7 +661,7 @@ function isAnnotatedTypeOfPrimitive(t) {
 }
 
 //#endregion
-//#region packages/typescript/src/traverse.ts
+//#region packages/typescript/src/runtime/traverse.ts
 function forAnnotatedType(def, handlers) {
 	switch (def.type.kind) {
 		case "": {
@@ -672,7 +679,7 @@ function forAnnotatedType(def, handlers) {
 }
 
 //#endregion
-//#region packages/typescript/src/json-schema.ts
+//#region packages/typescript/src/runtime/json-schema.ts
 /**
 * Detects a discriminator property across union items.
 *
@@ -795,7 +802,8 @@ function buildJsonSchema(type) {
 				const schema$1 = {};
 				if (d.type.value !== undefined) schema$1.const = d.type.value;
 				if (d.type.designType && d.type.designType !== "any") {
-					schema$1.type = d.type.designType === "undefined" ? "null" : d.type.designType;
+					const dt = d.type.designType;
+					schema$1.type = dt === "undefined" ? "null" : dt === "decimal" ? "string" : dt;
 					if (schema$1.type === "number" && meta.get("expect.int")) schema$1.type = "integer";
 				}
 				if (schema$1.type === "string") {

package/dist/utils.cjs

@@ -1,7 +1,7 @@
 "use strict";
-const require_json_schema = require('./json-schema-S5-XAOrR.cjs');
+const require_json_schema = require('./json-schema-B55uxKNQ.cjs');
 
-//#region packages/typescript/src/default-value.ts
+//#region packages/typescript/src/runtime/default-value.ts
 /**
 * Attempts to resolve a value from the mode for the given annotated type.
 * Returns `undefined` when no value is available (or parse/validation fails).
@@ -102,13 +102,13 @@ else {
 }
 
 //#endregion
-//#region packages/typescript/src/throw-disabled.ts
+//#region packages/typescript/src/runtime/throw-disabled.ts
 function throwFeatureDisabled(feature, option, annotation) {
 	throw new Error(`${feature} support is disabled. To enable, set \`${option}: 'lazy'\` or \`${option}: 'bundle'\` in tsPlugin options, or add @${annotation} annotation to individual interfaces.`);
 }
 
 //#endregion
-//#region packages/typescript/src/flatten.ts
+//#region packages/typescript/src/runtime/flatten.ts
 function flattenAnnotatedType(type, options) {
 	const flatMap = new Map();
 	const skipPhantom = !!options?.excludePhantomTypes;
@@ -218,7 +218,7 @@ else flatUnion.item(existing);
 }
 
 //#endregion
-//#region packages/typescript/src/serialize.ts
+//#region packages/typescript/src/runtime/serialize.ts
 const SERIALIZE_VERSION = 1;
 function serializeAnnotatedType(type, options) {
 	const visited = new Set();

package/dist/utils.d.ts

@@ -142,7 +142,7 @@ interface TAtscriptTypeFinal<DataType = unknown> {
     /**
      * design type
      */
-    designType: 'string' | 'number' | 'boolean' | 'undefined' | 'null' | 'object' | 'any' | 'never' | 'phantom';
+    designType: 'string' | 'number' | 'boolean' | 'undefined' | 'null' | 'object' | 'any' | 'never' | 'phantom' | 'decimal';
     /**
      * value for literals
      */

package/dist/utils.mjs

@@ -1,6 +1,6 @@
-import { Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, defineAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas } from "./json-schema-0UUPoHud.mjs";
+import { Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, defineAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas } from "./json-schema-DaFltW4t.mjs";
 
-//#region packages/typescript/src/default-value.ts
+//#region packages/typescript/src/runtime/default-value.ts
 /**
 * Attempts to resolve a value from the mode for the given annotated type.
 * Returns `undefined` when no value is available (or parse/validation fails).
@@ -101,13 +101,13 @@ else {
 }
 
 //#endregion
-//#region packages/typescript/src/throw-disabled.ts
+//#region packages/typescript/src/runtime/throw-disabled.ts
 function throwFeatureDisabled(feature, option, annotation) {
 	throw new Error(`${feature} support is disabled. To enable, set \`${option}: 'lazy'\` or \`${option}: 'bundle'\` in tsPlugin options, or add @${annotation} annotation to individual interfaces.`);
 }
 
 //#endregion
-//#region packages/typescript/src/flatten.ts
+//#region packages/typescript/src/runtime/flatten.ts
 function flattenAnnotatedType(type, options) {
 	const flatMap = new Map();
 	const skipPhantom = !!options?.excludePhantomTypes;
@@ -217,7 +217,7 @@ else flatUnion.item(existing);
 }
 
 //#endregion
-//#region packages/typescript/src/serialize.ts
+//#region packages/typescript/src/runtime/serialize.ts
 const SERIALIZE_VERSION = 1;
 function serializeAnnotatedType(type, options) {
 	const visited = new Set();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.1.37",
+  "version": "0.1.38",
   "description": "Atscript: typescript-gen support.",
   "keywords": [
     "annotations",
@@ -64,11 +64,11 @@
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.37",
-    "@atscript/utils-db": "^0.1.37"
+    "@atscript/core": "^0.1.38",
+    "@atscript/db": "^0.1.38"
   },
   "peerDependenciesMeta": {
-    "@atscript/utils-db": {
+    "@atscript/db": {
       "optional": true
     }
   },