@atscript/typescript 0.1.17 → 0.1.18

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { isArray, isConst, isGroup, isInterface, isPrimitive, isRef, isStructure } from "@atscript/core";
 import path from "path";
+import { DEFAULT_FORMAT, isArray, isConst, isGroup, isInterface, isPrimitive, isRef, isStructure } from "@atscript/core";
 
 //#region packages/typescript/src/codegen/code-printer.ts
 function _define_property$4(obj, key, value) {
@@ -84,7 +84,7 @@ else if (this.currentLine.length > 0) this.lines.push(this.currentLine);
 		return this;
 	}
 	doPop(withNewLine) {
-		if (!this.blockStack.length) throw new Error("No block to pop (stack is empty).");
+		if (this.blockStack.length === 0) throw new Error("No block to pop (stack is empty).");
 		const closing = this.blockStack.pop();
 		this.unindent();
 		if (withNewLine) this.writeln(closing);
@@ -283,7 +283,7 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 			propsDefs.add(renderedDef);
 			renderedDef.split("\n").forEach((l) => this.writeln(l));
 		}
-		if (patterns.length) {
+		if (patterns.length > 0) {
 			this.write(`[key: string]: `);
 			if (patterns.length > 0) {
 				for (const prop of patterns) propsDefs.add(this.renderTypeDefString(prop.getDefinition()));
@@ -561,7 +561,7 @@ var Validator = class {
 		}
 		let i = 0;
 		for (const item of def.type.items) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(item, value[i])) {
 				this.pop(true);
 				return false;
@@ -597,7 +597,7 @@ var Validator = class {
 		let i = 0;
 		let passed = true;
 		for (const item of value) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
@@ -649,7 +649,7 @@ else {
 				pattern,
 				def: propDef
 			});
-			if (matched.length) {
+			if (matched.length > 0) {
 				let keyPassed = false;
 				for (const { def: def$1 } of matched) if (this.validateSafe(def$1, value[key])) {
 					this.pop(false);
@@ -676,7 +676,7 @@ else {
 		return passed;
 	}
 	validatePrimitive(def, value) {
-		if (typeof def.type.value !== "undefined") {
+		if (def.type.value !== undefined) {
 			if (value !== def.type.value) {
 				this.error(`Expected ${def.type.value}, got ${value}`);
 				return false;
@@ -685,40 +685,46 @@ else {
 		}
 		const typeOfValue = Array.isArray(value) ? "array" : typeof value;
 		switch (def.type.designType) {
-			case "never":
+			case "never": {
 				this.error(`This type is impossible, must be an internal problem`);
 				return false;
+			}
 			case "any": return true;
-			case "string":
+			case "string": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateString(def, value);
-			case "number":
+			}
+			case "number": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateNumber(def, value);
-			case "boolean":
+			}
+			case "boolean": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateBoolean(def, value);
-			case "undefined":
+			}
+			case "undefined": {
 				if (value !== undefined) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
-			case "null":
+			}
+			case "null": {
 				if (value !== null) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
+			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
 		}
 	}
@@ -973,7 +979,7 @@ function buildJsonSchema(type) {
 					type: "object",
 					properties
 				};
-				if (required.length) schema.required = required;
+				if (required.length > 0) schema.required = required;
 				return schema;
 			},
 			array(d) {
@@ -1236,34 +1242,39 @@ else handle.prop(prop.id, propHandle.$type);
 		annotations?.forEach((a) => {
 			switch (a.name) {
 				case "expect.minLength":
-				case "expect.maxLength":
+				case "expect.maxLength": {
 					if (a.args[0]) handle.annotate(a.name, {
 						length: Number(a.args[0].text),
 						message: a.args[1]?.text
 					});
 					break;
-				case "expect.min":
+				}
+				case "expect.min": {
 					if (a.args[0]) handle.annotate(a.name, {
 						minValue: Number(a.args[0].text),
 						message: a.args[1]?.text
 					});
 					break;
-				case "expect.max":
+				}
+				case "expect.max": {
 					if (a.args[0]) handle.annotate(a.name, {
 						maxValue: Number(a.args[0].text),
 						message: a.args[1]?.text
 					});
 					break;
-				case "expect.pattern":
+				}
+				case "expect.pattern": {
 					handle.annotate(a.name, {
 						pattern: a.args[0]?.text || "",
 						flags: a.args[1]?.text,
 						message: a.args[2]?.text
 					}, true);
 					break;
-				case "expect.int":
+				}
+				case "expect.int": {
 					handle.annotate(a.name, true);
 					break;
+				}
 				default:
 			}
 		});
@@ -1278,8 +1289,11 @@ else handle.prop(prop.id, propHandle.$type);
 				const ref = node;
 				const decl = this.doc.unwindType(ref.id, ref.chain)?.def;
 				if (isPrimitive(decl)) {
-					this.annotateType(decl, name);
-					return this;
+					const ownerDecl = this.doc.getDeclarationOwnerNode(ref.id);
+					if (!ownerDecl?.node || ownerDecl.node.entity !== "type" && ownerDecl.node.entity !== "interface") {
+						this.annotateType(decl, name);
+						return this;
+					}
 				}
 				const chain = ref.hasChain ? `, [${ref.chain.map((c) => `"${escapeQuotes(c.text)}"`).join(", ")}]` : "";
 				this.writeln(`$(${name ? `"", ${name}` : ""})`).indent().writeln(`.refTo(${ref.id}${chain})`);
@@ -1321,7 +1335,7 @@ else handle.prop(prop.id, propHandle.$type);
 				return this;
 			}
 			default: {
-				console.log("!!!!!!! UNKNOWN ", node.entity);
+				console.log("!!!!!!! UNKNOWN", node.entity);
 				return this;
 			}
 		}
@@ -1346,7 +1360,7 @@ else handle.prop(prop.id, propHandle.$type);
 			case "final": return this.writeln(`$(${d()}).designType("${def.value === "void" ? "undefined" : def.value}")`);
 			case "union":
 			case "intersection":
-			case "tuple":
+			case "tuple": {
 				this.writeln(`$(${d(def.kind)})`);
 				this.indent();
 				for (const itemDef of def.items) {
@@ -1359,7 +1373,8 @@ else handle.prop(prop.id, propHandle.$type);
 				}
 				this.unindent();
 				return;
-			case "array":
+			}
+			case "array": {
 				this.writeln(`$(${d("array")})`);
 				this.indent();
 				this.write(".of(");
@@ -1370,7 +1385,8 @@ else handle.prop(prop.id, propHandle.$type);
 				this.writeln(`)`);
 				this.unindent();
 				return;
-			case "object":
+			}
+			case "object": {
 				this.writeln(`$(${d("object")})`);
 				this.indent();
 				for (const [key, propDef] of Object.entries(def.props)) {
@@ -1397,6 +1413,7 @@ else handle.prop(prop.id, propHandle.$type);
 				}
 				this.unindent();
 				return;
+			}
 			default: return this.writeln(`$(${d()}).designType("any")`);
 		}
 	}
@@ -1443,6 +1460,10 @@ else handle.prop(prop.id, propHandle.$type);
 			if (!refNode.hasChain) {
 				const resolved = this.doc.unwindType(refNode.id, refNode.chain)?.def;
 				if (resolved && !isPrimitive(resolved)) annotations = node.annotations ?? [];
+else if (resolved && isPrimitive(resolved)) {
+					const ownerDecl = this.doc.getDeclarationOwnerNode(refNode.id);
+					if (ownerDecl?.node && (ownerDecl.node.entity === "type" || ownerDecl.node.entity === "interface")) annotations = node.annotations ?? [];
+				}
 			}
 		}
 		if (annotations === undefined) annotations = this.doc.evalAnnotationsForNode(node);
@@ -1496,7 +1517,7 @@ else targetValue = "true";
 			}
 		} else {
 			multiple = node.countAnnotations(an.name) > 1 || an.args.length > 1;
-			if (an.args.length) targetValue = an.args[0].type === "text" ? `"${escapeQuotes(an.args[0].text)}"` : an.args[0].text;
+			if (an.args.length > 0) targetValue = an.args[0].type === "text" ? `"${escapeQuotes(an.args[0].text)}"` : an.args[0].text;
 		}
 		return {
 			value: targetValue,
@@ -1558,7 +1579,7 @@ else targetValue = "true";
 	* Returns multiple paths when a property appears in multiple union branches.
 	*/ buildMutatingAccessors(targetName, targetDef, parts) {
 		let accessors = [{
-			prefix: targetName + ".type",
+			prefix: `${targetName}.type`,
 			def: targetDef
 		}];
 		for (let i = 0; i < parts.length; i++) {
@@ -1566,17 +1587,17 @@ else targetValue = "true";
 			for (const { prefix, def } of accessors) {
 				const results = this.buildPropPaths(def, parts[i]);
 				if (results.length > 0) for (const result of results) if (i < parts.length - 1) nextAccessors.push({
-					prefix: prefix + result.path + "?.type",
+					prefix: `${prefix}${result.path}?.type`,
 					def: result.propDef
 				});
 else nextAccessors.push({
-					prefix: prefix + result.path + "?",
+					prefix: `${prefix}${result.path}?`,
 					def: result.propDef
 				});
 else {
-					const suffix = `.props.get("${escapeQuotes(parts[i])}")` + (i < parts.length - 1 ? "?.type" : "?");
+					const suffix = `.props.get("${escapeQuotes(parts[i])}")${i < parts.length - 1 ? "?.type" : "?"}`;
 					nextAccessors.push({
-						prefix: prefix + suffix,
+						prefix: `${prefix}${suffix}`,
 						def: undefined
 					});
 				}
@@ -1631,9 +1652,9 @@ function resolveJsonSchemaMode(opts) {
 }
 const tsPlugin = (opts) => {
 	return {
-		name: "typesccript",
+		name: "typescript",
 		render(doc, format) {
-			if (format === "dts") return [{
+			if (format === "dts" || format === DEFAULT_FORMAT) return [{
 				fileName: `${doc.name}.d.ts`,
 				content: new TypeRenderer(doc, opts).render()
 			}];
@@ -1643,19 +1664,19 @@ const tsPlugin = (opts) => {
 			}];
 		},
 		async buildEnd(output, format, repo) {
-			if (format === "dts") {
+			if (format === "dts" || format === DEFAULT_FORMAT) {
 				const annotations = await repo.getUsedAnnotations();
 				const tags = await repo.getPrimitivesTags() || new Set();
-				let rendered = [];
+				const rendered = [];
 				for (const [key, val] of Object.entries(annotations)) {
 					const multiple = val.multiple;
-					let typeLine = Array.from(val.types).map((t) => {
+					const typeLine = Array.from(val.types).map((t) => {
 						if (t.type === "object") return `{ ${Object.entries(t.props).map(([k, v]) => `${wrapProp(k)}${v.optional ? "?" : ""}: ${v.type}`).join(", ")} }`;
 else return t.optional ? `${t.type} | true` : t.type;
 					}).join(" | ");
 					rendered.push(`${wrapProp(key)}: ${multiple ? "(" : ""}${typeLine}${multiple ? ")[]" : ""}`);
 				}
-				let renderedTags = Array.from(tags).map((f) => `"${escapeQuotes(f)}"`).join(" | ");
+				const renderedTags = Array.from(tags).map((f) => `"${escapeQuotes(f)}"`).join(" | ");
 				output.push({
 					content: "// prettier-ignore-start\n/* eslint-disable */\n/* oxlint-disable */\n/**\n * 🪄 This file was generated by Atscript\n * It is generated based on annotations used in this project\n * Do not edit this file!\n *\n * Use `npx asc -f dts` command to re-generate this file\n */\nexport {}\n\ndeclare global {\n  interface AtscriptMetadata {\n    " + rendered.join("\n    ") + "\n  }\n" + "  type AtscriptPrimitiveTags = " + renderedTags + "\n" + "}\n" + "// prettier-ignore-end",
 					fileName: "atscript.d.ts",

package/dist/utils.cjs

@@ -140,7 +140,7 @@ var Validator = class {
 		}
 		let i = 0;
 		for (const item of def.type.items) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(item, value[i])) {
 				this.pop(true);
 				return false;
@@ -176,7 +176,7 @@ var Validator = class {
 		let i = 0;
 		let passed = true;
 		for (const item of value) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
@@ -228,7 +228,7 @@ else {
 				pattern,
 				def: propDef
 			});
-			if (matched.length) {
+			if (matched.length > 0) {
 				let keyPassed = false;
 				for (const { def: def$1 } of matched) if (this.validateSafe(def$1, value[key])) {
 					this.pop(false);
@@ -255,7 +255,7 @@ else {
 		return passed;
 	}
 	validatePrimitive(def, value) {
-		if (typeof def.type.value !== "undefined") {
+		if (def.type.value !== undefined) {
 			if (value !== def.type.value) {
 				this.error(`Expected ${def.type.value}, got ${value}`);
 				return false;
@@ -264,40 +264,46 @@ else {
 		}
 		const typeOfValue = Array.isArray(value) ? "array" : typeof value;
 		switch (def.type.designType) {
-			case "never":
+			case "never": {
 				this.error(`This type is impossible, must be an internal problem`);
 				return false;
+			}
 			case "any": return true;
-			case "string":
+			case "string": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateString(def, value);
-			case "number":
+			}
+			case "number": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateNumber(def, value);
-			case "boolean":
+			}
+			case "boolean": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateBoolean(def, value);
-			case "undefined":
+			}
+			case "undefined": {
 				if (value !== undefined) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
-			case "null":
+			}
+			case "null": {
 				if (value !== null) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
+			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
 		}
 	}
@@ -565,7 +571,7 @@ function buildJsonSchema(type) {
 					type: "object",
 					properties
 				};
-				if (required.length) schema.required = required;
+				if (required.length > 0) schema.required = required;
 				return schema;
 			},
 			array(d) {
@@ -742,28 +748,32 @@ else flatUnion.item(existing);
 			}
 			case "union":
 			case "intersection":
-			case "tuple":
+			case "tuple": {
 				for (const item of def.type.items) flattenArray(item, name);
 				break;
-			case "array":
+			}
+			case "array": {
 				flattenArray(def.type.of, name);
 				break;
+			}
 			default:
 		}
 	}
 	function flattenType(def, prefix = "", inComplexTypeOrArray = false) {
 		switch (def.type.kind) {
-			case "object":
+			case "object": {
 				addFieldToFlatMap(prefix || "", def);
 				for (const [key, value] of def.type.props.entries()) {
 					if (skipPhantom && isPhantomType(value)) continue;
 					flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
 				}
 				break;
+			}
 			case "array": {
 				let typeArray = def;
 				if (!inComplexTypeOrArray) {
 					typeArray = defineAnnotatedType().refTo(def).copyMetadata(def.metadata).$type;
+					if (def.optional) typeArray.optional = def.optional;
 					if (options?.topLevelArrayTag) typeArray.metadata.set(options.topLevelArrayTag, true);
 				}
 				addFieldToFlatMap(prefix || "", typeArray);
@@ -772,10 +782,19 @@ else flatUnion.item(existing);
 			}
 			case "intersection":
 			case "tuple":
-			case "union": for (const item of def.type.items) flattenType(item, prefix, true);
-			default:
+			case "union": {
+				for (const item of def.type.items) flattenType(item, prefix, true);
 				addFieldToFlatMap(prefix || "", def);
+				if (def.optional) {
+					const entry = flatMap.get(prefix || "");
+					if (entry) entry.optional = def.optional;
+				}
 				break;
+			}
+			default: {
+				addFieldToFlatMap(prefix || "", def);
+				break;
+			}
 		}
 		if (prefix) options?.onField?.(prefix, def, def.metadata);
 	}

package/dist/utils.d.ts

@@ -119,10 +119,10 @@ interface TAtscriptTypeArray<DataType = unknown[]> {
 interface TAtscriptTypeObject<K extends string = string, DataType = Record<K, unknown>> {
     kind: 'object';
     props: Map<K, TAtscriptAnnotatedType>;
-    propsPatterns: {
+    propsPatterns: Array<{
         pattern: RegExp;
         def: TAtscriptAnnotatedType;
-    }[];
+    }>;
     tags: Set<AtscriptPrimitiveTags>;
     /** @internal phantom — carries the DataType at the type level, never set at runtime */
     __dataType?: DataType;
@@ -176,7 +176,7 @@ declare function isAnnotatedType(type: any): type is TAtscriptAnnotatedType;
  * Standalone annotate function that handles both replace and append (array) strategies.
  * Used by the handle's .annotate() method and by generated mutation statements.
  */
-declare function annotate<K extends keyof AtscriptMetadata>(metadata: TMetadataMap<AtscriptMetadata> | undefined, key: K, value: AtscriptMetadata[K] extends (infer E)[] ? E : AtscriptMetadata[K], asArray?: boolean): void;
+declare function annotate<K extends keyof AtscriptMetadata>(metadata: TMetadataMap<AtscriptMetadata> | undefined, key: K, value: AtscriptMetadata[K] extends Array<infer E> ? E : AtscriptMetadata[K], asArray?: boolean): void;
 type TKind = '' | 'array' | 'object' | 'union' | 'intersection' | 'tuple';
 /**
  * Creates a builder handle for constructing a {@link TAtscriptAnnotatedType} at runtime.
@@ -368,13 +368,13 @@ interface TSerializedTypeFinal {
 interface TSerializedTypeObject {
     kind: 'object';
     props: Record<string, TSerializedAnnotatedTypeInner>;
-    propsPatterns: {
+    propsPatterns: Array<{
         pattern: {
             source: string;
             flags: string;
         };
         def: TSerializedAnnotatedTypeInner;
-    }[];
+    }>;
     tags: string[];
 }
 interface TSerializedTypeArray {

package/dist/utils.mjs

@@ -139,7 +139,7 @@ var Validator = class {
 		}
 		let i = 0;
 		for (const item of def.type.items) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(item, value[i])) {
 				this.pop(true);
 				return false;
@@ -175,7 +175,7 @@ var Validator = class {
 		let i = 0;
 		let passed = true;
 		for (const item of value) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
@@ -227,7 +227,7 @@ else {
 				pattern,
 				def: propDef
 			});
-			if (matched.length) {
+			if (matched.length > 0) {
 				let keyPassed = false;
 				for (const { def: def$1 } of matched) if (this.validateSafe(def$1, value[key])) {
 					this.pop(false);
@@ -254,7 +254,7 @@ else {
 		return passed;
 	}
 	validatePrimitive(def, value) {
-		if (typeof def.type.value !== "undefined") {
+		if (def.type.value !== undefined) {
 			if (value !== def.type.value) {
 				this.error(`Expected ${def.type.value}, got ${value}`);
 				return false;
@@ -263,40 +263,46 @@ else {
 		}
 		const typeOfValue = Array.isArray(value) ? "array" : typeof value;
 		switch (def.type.designType) {
-			case "never":
+			case "never": {
 				this.error(`This type is impossible, must be an internal problem`);
 				return false;
+			}
 			case "any": return true;
-			case "string":
+			case "string": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateString(def, value);
-			case "number":
+			}
+			case "number": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateNumber(def, value);
-			case "boolean":
+			}
+			case "boolean": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateBoolean(def, value);
-			case "undefined":
+			}
+			case "undefined": {
 				if (value !== undefined) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
-			case "null":
+			}
+			case "null": {
 				if (value !== null) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
+			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
 		}
 	}
@@ -564,7 +570,7 @@ function buildJsonSchema(type) {
 					type: "object",
 					properties
 				};
-				if (required.length) schema.required = required;
+				if (required.length > 0) schema.required = required;
 				return schema;
 			},
 			array(d) {
@@ -741,28 +747,32 @@ else flatUnion.item(existing);
 			}
 			case "union":
 			case "intersection":
-			case "tuple":
+			case "tuple": {
 				for (const item of def.type.items) flattenArray(item, name);
 				break;
-			case "array":
+			}
+			case "array": {
 				flattenArray(def.type.of, name);
 				break;
+			}
 			default:
 		}
 	}
 	function flattenType(def, prefix = "", inComplexTypeOrArray = false) {
 		switch (def.type.kind) {
-			case "object":
+			case "object": {
 				addFieldToFlatMap(prefix || "", def);
 				for (const [key, value] of def.type.props.entries()) {
 					if (skipPhantom && isPhantomType(value)) continue;
 					flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
 				}
 				break;
+			}
 			case "array": {
 				let typeArray = def;
 				if (!inComplexTypeOrArray) {
 					typeArray = defineAnnotatedType().refTo(def).copyMetadata(def.metadata).$type;
+					if (def.optional) typeArray.optional = def.optional;
 					if (options?.topLevelArrayTag) typeArray.metadata.set(options.topLevelArrayTag, true);
 				}
 				addFieldToFlatMap(prefix || "", typeArray);
@@ -771,10 +781,19 @@ else flatUnion.item(existing);
 			}
 			case "intersection":
 			case "tuple":
-			case "union": for (const item of def.type.items) flattenType(item, prefix, true);
-			default:
+			case "union": {
+				for (const item of def.type.items) flattenType(item, prefix, true);
 				addFieldToFlatMap(prefix || "", def);
+				if (def.optional) {
+					const entry = flatMap.get(prefix || "");
+					if (entry) entry.optional = def.optional;
+				}
 				break;
+			}
+			default: {
+				addFieldToFlatMap(prefix || "", def);
+				break;
+			}
 		}
 		if (prefix) options?.onField?.(prefix, def, def.metadata);
 	}