@atscript/typescript 0.1.90 → 0.1.91

package/dist/cli.cjs

@@ -1606,6 +1606,12 @@ const QUERY_OP_MAP = {
 	"not exists": "$exists"
 };
 var JsRenderer = class extends BaseRenderer {
+	/**
+	* Relative imports get the configured `moduleExtension`; bare specifiers
+	* always keep `.as` — they resolve through the package's `exports` map.
+	*/ transformFromPath(path) {
+		return (0, _atscript_core.isBareSpecifier)(path) ? `${path}.as` : `${path}${this.opts?.moduleExtension ?? ".as"}`;
+	}
 	/**
 	* Override base `unused` to subtract symbols that the JS output references
 	* transitively through `extends`-resolved parent prop trees. Without this,
@@ -2518,6 +2524,30 @@ async function getConfig(configFile, logger) {
 	}
 }
 
+//#endregion
+//#region packages/typescript/src/cli/diagnostics.ts
+/**
+* Runs the builder's diagnostics and renders every message the way the
+* default `asc` command prints it. Shared by `asc` and `asc db sync` so both
+* commands count and format diagnostics identically.
+*/ async function collectDiagnostics(builder) {
+	const summary = {
+		errors: 0,
+		warnings: 0,
+		messages: []
+	};
+	const diagMap = await builder.diagnostics();
+	for (const [docId, messages] of diagMap) {
+		const doc = builder.getDoc(docId);
+		for (const m of messages) {
+			if (m.severity === 1) summary.errors++;
+			else if (m.severity === 2) summary.warnings++;
+			if (doc) summary.messages.push(doc.renderDiagMessage(m, true, true));
+		}
+	}
+	return summary;
+}
+
 //#endregion
 //#region packages/typescript/src/cli/emit-policy.ts
 /**
@@ -2525,16 +2555,16 @@ async function getConfig(configFile, logger) {
 * user knows the previous outputs are still the last known-good ones.
 */ const NOTHING_EMITTED_MESSAGE = "Nothing emitted — previous outputs were left untouched. Fix the errors above, or pass --skipDiag to emit anyway.";
 /**
-* Decides whether `asc` may write its outputs.
+* Decides whether `asc` may write its outputs — and, when it may not, why.
 *
 * A failing compile must never replace valid artifacts: half of the outputs
 * would be stale and aggregate manifests produced in `buildEnd` would be
 * regenerated from an incomplete document set. Errors therefore block the
 * write entirely — `--skipDiag` is the explicit opt-out.
-*/ function shouldEmit(input) {
-	if (input.noEmit) return false;
-	if (input.skipDiag) return true;
-	return input.errorCount === 0;
+*/ function emitDecision(input) {
+	if (input.noEmit) return "noEmit";
+	if (input.skipDiag || input.errorCount === 0) return "emit";
+	return "blocked";
 }
 
 //#endregion
@@ -2572,22 +2602,17 @@ var Commands = class {
 		let errorCount = 0;
 		let warningCount = 0;
 		if (!skipDiag) {
-			const diagMap = await builder.diagnostics();
-			for (const [docId, messages] of diagMap) {
-				const doc = builder.getDoc(docId);
-				for (const m of messages) {
-					if (m.severity === 1) errorCount++;
-					else if (m.severity === 2) warningCount++;
-					if (doc) this.logger.log(doc.renderDiagMessage(m, true, true));
-				}
-			}
+			const diagnostics = await collectDiagnostics(builder);
+			for (const message of diagnostics.messages) this.logger.log(message);
+			errorCount = diagnostics.errors;
+			warningCount = diagnostics.warnings;
 		}
-		const emit = shouldEmit({
+		const decision = emitDecision({
 			noEmit,
 			skipDiag,
 			errorCount
 		});
-		if (emit) {
+		if (decision === "emit") {
 			const out = await builder.write(config);
 			for (const { target } of out) this.logger.log(`✅ created ${target}`);
 		}
@@ -2597,10 +2622,8 @@ var Commands = class {
 			if (warningCount > 0) parts.push(`${warningCount} warning${warningCount > 1 ? "s" : ""}`);
 			this.logger.log(`\nFound ${parts.join(" and ")}`);
 		}
-		if (errorCount > 0) {
-			if (!emit && !noEmit) this.logger.log(`${NOTHING_EMITTED_MESSAGE}`);
-			process.exit(1);
-		}
+		if (decision === "blocked") this.logger.log(`${NOTHING_EMITTED_MESSAGE}`);
+		if (errorCount > 0) process.exit(1);
 	}
 	constructor(logger) {
 		_define_property$2(this, "logger", void 0);
@@ -2644,8 +2667,6 @@ Commands = _ts_decorate$1([
 
 //#endregion
 //#region packages/typescript/src/cli/db-sync-models.ts
-/** Depth cap for `config.models` — deep enough for nested arrays and namespaces. */ const MAX_MODELS_DEPTH = 6;
-/** Keeps two runs in the same process (and the same millisecond) apart. */ let runSeq = 0;
 /**
 * Compiles the project's `.as` files and loads every `@db.table` / `@db.view`
 * model, plus the models contributed by `config.models`.
@@ -2654,10 +2675,10 @@ Commands = _ts_decorate$1([
 * both `failures` and `modelsError` are empty — a caller that plans a sync
 * from a partial inventory would propose dropping the tables it failed to see.
 */ async function loadDbModels(options) {
-	const { config, cwd = process.cwd(), logger } = options;
+	const { config, cwd = process.cwd() } = options;
 	const buildConfig = toBuildConfig(config);
-	logger?.log(`Compiling .as files...`);
 	const builder = await (0, _atscript_core.build)(buildConfig);
+	const rootDir = buildConfig.rootDir;
 	const diagnostics = await collectDiagnostics(builder);
 	if (diagnostics.errors > 0) return {
 		types: [],
@@ -2665,7 +2686,7 @@ Commands = _ts_decorate$1([
 		diagnostics,
 		packaged: 0
 	};
-	const { types, failures } = await importGeneratedModules(await builder.generate(buildConfig), buildConfig.rootDir || cwd, cwd);
+	const { types, failures } = await importGeneratedModules(await builder.generate(buildConfig), rootDir, cwd);
 	const result = {
 		types,
 		failures,
@@ -2674,20 +2695,14 @@ Commands = _ts_decorate$1([
 	};
 	if (failures.length > 0 || !config.models) return result;
 	try {
-		const seen = new Set(types);
-		for (const model of flattenModels(await config.models())) if (!seen.has(model)) {
-			seen.add(model);
-			types.push(model);
-			result.packaged++;
-		}
+		const models = flattenModels(await config.models());
+		types.push(...models);
+		result.packaged = models.length;
 	} catch (error) {
 		result.modelsError = error;
 	}
 	return result;
 }
-/** Abort message printed when some generated modules could not be imported. */ function partialInventoryMessage(count) {
-	return `Could not load ${count} compiled model module(s); aborting before planning — a partial inventory would propose dropping tables.`;
-}
 function errorMessage(error) {
 	return error instanceof Error ? error.message : String(error);
 }
@@ -2697,12 +2712,9 @@ function errorMessage(error) {
 * nesting of those. Deduplicated by identity.
 */ function flattenModels(value) {
 	const out = [];
-	walkModels(value, out, /* @__PURE__ */ new Set(), 0);
+	walkModels(value, out, /* @__PURE__ */ new Set());
 	return out;
 }
-/** Rewrites the emitted `.as` specifiers to the `.mjs` files we just wrote. */ function patchAsImports(content) {
-	return content.replace(/(from\s+["'][^"']+)\.as(["'])/g, "$1.as.mjs$2");
-}
 function toBuildConfig(config) {
 	const buildConfig = { ...config };
 	if (typeof config.db === "object" && "adapter" in config.db) {
@@ -2711,34 +2723,20 @@ function toBuildConfig(config) {
 		if (dbConfig.exclude) buildConfig.exclude = dbConfig.exclude;
 	}
 	buildConfig.format = "js";
+	const syncTs = tsPlugin({ moduleExtension: ".as.mjs" });
+	const plugins = (config.plugins ?? []).map((p) => p.name === "typescript" ? syncTs : p);
+	if (!plugins.includes(syncTs)) plugins.push(syncTs);
+	buildConfig.plugins = plugins;
 	return buildConfig;
 }
-async function collectDiagnostics(builder) {
-	const diagnostics = {
-		errors: 0,
-		warnings: 0,
-		messages: []
-	};
-	const diagMap = await builder.diagnostics();
-	for (const [docId, messages] of diagMap) {
-		const doc = builder.getDoc(docId);
-		for (const m of messages) {
-			if (m.severity === 1) diagnostics.errors++;
-			else if (m.severity === 2) diagnostics.warnings++;
-			if (doc) diagnostics.messages.push(doc.renderDiagMessage(m, true, true));
-		}
-	}
-	return diagnostics;
-}
 async function importGeneratedModules(outputs, rootDir, cwd) {
-	const jsOutputs = [];
-	for (const o of outputs) if (o.fileName.endsWith(".js") && o.source) jsOutputs.push({
-		fileName: o.fileName,
-		content: o.content,
-		source: o.source
-	});
-	const base = resolveLayoutBase(rootDir, jsOutputs.map((o) => path.default.dirname((0, _atscript_core.fileUriToPath)(o.source))));
-	const tmpDir = path.default.join(cwd, `.atscript-db-sync-${process.pid}-${Date.now()}-${runSeq++}`);
+	const modules = outputs.filter((o) => o.fileName.endsWith(".js")).map((o) => ({
+		srcDir: path.default.dirname((0, _atscript_core.fileUriToPath)(o.source)),
+		fileName: o.fileName.replace(/\.js$/, ".mjs"),
+		content: o.content
+	}));
+	const base = commonAncestor([rootDir, ...modules.map((m) => m.srcDir)]);
+	const tmpDir = (0, fs.mkdtempSync)(path.default.join(cwd, ".atscript-db-sync-"));
 	const cleanup = () => {
 		try {
 			(0, fs.rmSync)(tmpDir, {
@@ -2750,12 +2748,16 @@ async function importGeneratedModules(outputs, rootDir, cwd) {
 	process.on("exit", cleanup);
 	try {
 		const files = [];
-		for (const o of jsOutputs) {
-			const srcDir = path.default.dirname((0, _atscript_core.fileUriToPath)(o.source));
-			const rel = path.default.join(path.default.relative(base, srcDir), o.fileName.replace(/\.js$/, ".mjs"));
+		const dirs = /* @__PURE__ */ new Set();
+		for (const m of modules) {
+			const rel = path.default.join(path.default.relative(base, m.srcDir), m.fileName);
 			const abs = path.default.join(tmpDir, rel);
-			(0, fs.mkdirSync)(path.default.dirname(abs), { recursive: true });
-			(0, fs.writeFileSync)(abs, patchAsImports(o.content));
+			const dir = path.default.dirname(abs);
+			if (!dirs.has(dir)) {
+				dirs.add(dir);
+				(0, fs.mkdirSync)(dir, { recursive: true });
+			}
+			(0, fs.writeFileSync)(abs, m.content);
 			files.push({
 				abs,
 				rel
@@ -2765,7 +2767,7 @@ async function importGeneratedModules(outputs, rootDir, cwd) {
 		const failures = [];
 		const seen = /* @__PURE__ */ new Set();
 		for (const file of files) try {
-			collectFromModule(await import(
+			walkModels(await import(
 				/* @vite-ignore */
 				(0, node_url.pathToFileURL)(file.abs).href
 ), types, seen);
@@ -2784,24 +2786,11 @@ async function importGeneratedModules(outputs, rootDir, cwd) {
 		process.off("exit", cleanup);
 	}
 }
-function collectFromModule(mod, types, seen) {
-	for (const exp of Object.values(mod)) if (isDbModel(exp) && !seen.has(exp)) {
-		seen.add(exp);
-		types.push(exp);
-	}
-}
 /**
-* Directory the temp layout mirrors. Normally `rootDir`; when a source lives
-* outside it, the common ancestor of `rootDir` and every source, so that no
-* `..` segment ever escapes the temp directory.
-*/ function resolveLayoutBase(rootDir, sourceDirs) {
-	const root = path.default.resolve(rootDir);
-	return sourceDirs.some((dir) => {
-		const rel = path.default.relative(root, path.default.resolve(dir));
-		return rel === ".." || rel.startsWith(`..${path.default.sep}`);
-	}) ? commonAncestor([root, ...sourceDirs]) : root;
-}
-function commonAncestor(dirs) {
+* Directory the temp layout mirrors: the common ancestor of `rootDir` and
+* every source directory — `rootDir` itself when every source lives under it —
+* so that no `..` segment ever escapes the temp directory.
+*/ function commonAncestor(dirs) {
 	const parts = dirs.map((d) => path.default.resolve(d).split(path.default.sep));
 	const first = parts[0];
 	let i = 0;
@@ -2811,7 +2800,7 @@ function commonAncestor(dirs) {
 function isDbModel(value) {
 	return isAnnotatedType(value) && Boolean(value.metadata?.has("db.table") || value.metadata?.has("db.view"));
 }
-function walkModels(value, out, seen, depth) {
+/** `seen` deduplicates by identity and guarantees termination on cyclic graphs. */ function walkModels(value, out, seen) {
 	if (!value || typeof value !== "object" && typeof value !== "function") return;
 	if (seen.has(value)) return;
 	seen.add(value);
@@ -2819,9 +2808,8 @@ function walkModels(value, out, seen, depth) {
 		if (isDbModel(value)) out.push(value);
 		return;
 	}
-	if (depth >= MAX_MODELS_DEPTH) return;
 	const items = Array.isArray(value) ? value : Object.values(value);
-	for (const item of items) walkModels(item, out, seen, depth + 1);
+	for (const item of items) walkModels(item, out, seen);
 }
 
 //#endregion
@@ -3008,18 +2996,16 @@ var DbSyncController = class {
 	info(message) {
 		if (!this.quiet) this.logger.log(message);
 	}
+	/** Prints each line in red and exits 1. */ fail(...lines) {
+		for (const line of lines) this.logger.error(`${line}`);
+		process.exit(1);
+	}
 	async dbSync(configFile, dryRun, yes, force, safe, check, format, out) {
-		if (format && format !== "json" && format !== "markdown") {
-			this.logger.error(`Unknown --format "${format}". Use "json" or "markdown".`);
-			process.exit(1);
-		}
+		if (format && format !== "json" && format !== "markdown") this.fail(`Unknown --format "${format}". Use "json" or "markdown".`);
 		this.quiet = Boolean(format) && !out;
 		this.printer.muted = this.quiet;
 		const config = await getConfig(configFile, this.quiet ? Object.create(this.logger, { log: { value: () => {} } }) : this.logger);
-		if (!config.db) {
-			this.logger.error("\x1B[31mNo \"db\" field in atscript config. Add a db configuration to use schema sync.\x1B[39m");
-			process.exit(1);
-		}
+		if (!config.db) this.fail("No \"db\" field in atscript config. Add a db configuration to use schema sync.");
 		const dbTypes = await this.loadTypes(config);
 		if (dbTypes.length === 0) {
 			this.info(`No types with @db.table or @db.view found. Nothing to sync.`);
@@ -3045,10 +3031,7 @@ var DbSyncController = class {
 		if (plan.status === "up-to-date") this.printer.planUpToDate(plan);
 		else {
 			this.printer.plan(plan);
-			if (hasErrors) {
-				this.logger.error(`Schema has errors. Fix the issues above before syncing.`);
-				process.exit(1);
-			}
+			if (hasErrors) this.fail("Schema has errors. Fix the issues above before syncing.");
 		}
 		if (check || format) {
 			if (check && hasChanges) {
@@ -3088,26 +3071,15 @@ var DbSyncController = class {
 	* generated module is imported individually, and any failure exits 1 before
 	* a plan is computed.
 	*/ async loadTypes(config) {
-		const result = await loadDbModels({
-			config,
-			cwd: process.cwd(),
-			logger: { log: (message) => this.info(message) }
-		});
+		this.info(`Compiling .as files...`);
+		const result = await loadDbModels({ config });
 		if (result.diagnostics.errors > 0) {
 			for (const message of result.diagnostics.messages) this.logger.error(message);
-			this.logger.error(`Fix the errors above before syncing.`);
-			process.exit(1);
+			this.fail("Fix the errors above before syncing.");
 		}
 		for (const message of result.diagnostics.messages) this.info(message);
-		if (result.failures.length > 0) {
-			for (const failure of result.failures) this.logger.error(`✖ ${failure.file}: ${errorMessage(failure.error)}`);
-			this.logger.error(`${partialInventoryMessage(result.failures.length)}`);
-			process.exit(1);
-		}
-		if (result.modelsError) {
-			this.logger.error(`config.models failed: ${errorMessage(result.modelsError)}`);
-			process.exit(1);
-		}
+		if (result.failures.length > 0) this.fail(...result.failures.map((f) => `✖ ${f.file}: ${errorMessage(f.error)}`), `Could not load ${result.failures.length} compiled model module(s); aborting before planning — a partial inventory would propose dropping tables.`);
+		if (result.modelsError) this.fail(`config.models failed: ${errorMessage(result.modelsError)}`);
 		if (result.packaged > 0) this.info(`Loaded ${result.packaged} packaged model(s) from config.models`);
 		return result.types;
 	}
@@ -3122,13 +3094,9 @@ var DbSyncController = class {
 		try {
 			mod = await this.importFromCwd(adapter);
 		} catch {
-			this.logger.error(`Could not import adapter package "${adapter}". Is it installed?`);
-			process.exit(1);
-		}
-		if (typeof mod.createAdapter !== "function") {
-			this.logger.error(`Adapter package "${adapter}" does not export a createAdapter function.`);
-			process.exit(1);
+			this.fail(`Could not import adapter package "${adapter}". Is it installed?`);
 		}
+		if (typeof mod.createAdapter !== "function") this.fail(`Adapter package "${adapter}" does not export a createAdapter function.`);
 		const resolvedConnection = typeof connection === "function" ? await connection() : connection;
 		return mod.createAdapter(resolvedConnection, options);
 	}

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } });
-const require_plugin = require('./plugin-Cs9mKJ8h.cjs');
+const require_plugin = require('./plugin-BYtucpiS.cjs');
 
 exports.default = require_plugin.tsPlugin;
 exports.tsPlugin = require_plugin.tsPlugin;

package/dist/index.d.ts

@@ -17,6 +17,16 @@ interface TTsPluginOptions {
      * - `true` — Import `createDataFromAnnotatedType`, create example data on each call.
      */
     exampleData?: boolean;
+    /**
+     * Extension the emitted JS uses for **relative** `.as` imports
+     * (`./user` → `./user.as` by default). Bare specifiers (packages, e.g.
+     * `some-pkg/models/user.as`) always keep `.as` because they resolve through
+     * the package's `exports` map.
+     *
+     * `.as.mjs` is what `asc db sync` uses to load the compiled models straight
+     * from Node. *(default: `'.as'`)*
+     */
+    moduleExtension?: '.as' | '.as.js' | '.as.mjs';
 }
 declare const tsPlugin: (opts?: TTsPluginOptions) => TAtscriptPlugin;
 

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { t as tsPlugin } from "./plugin-DHhdrTs8.mjs";
+import { t as tsPlugin } from "./plugin-ac7ZXMDN.mjs";
 
 export { tsPlugin as default, tsPlugin };

package/dist/{plugin-Cs9mKJ8h.cjs → plugin-BYtucpiS.cjs}

@@ -691,6 +691,12 @@ const QUERY_OP_MAP = {
 	"not exists": "$exists"
 };
 var JsRenderer = class extends BaseRenderer {
+	/**
+	* Relative imports get the configured `moduleExtension`; bare specifiers
+	* always keep `.as` — they resolve through the package's `exports` map.
+	*/ transformFromPath(path) {
+		return (0, _atscript_core.isBareSpecifier)(path) ? `${path}.as` : `${path}${this.opts?.moduleExtension ?? ".as"}`;
+	}
 	/**
 	* Override base `unused` to subtract symbols that the JS output references
 	* transitively through `extends`-resolved parent prop trees. Without this,

package/dist/{plugin-DHhdrTs8.mjs → plugin-ac7ZXMDN.mjs}

@@ -1,6 +1,6 @@
 import { l as defineAnnotatedType, t as buildJsonSchema } from "./json-schema-DycaD0Rm.mjs";
 import path from "path";
-import { DEFAULT_FORMAT, flattenInterfaceNode, getRelPath, hasNavPropAnnotation, isArray, isBareId, isConst, isGroup, isInterface, isPrimitive, isProp, isQueryLogical, isRef, isStructure } from "@atscript/core";
+import { DEFAULT_FORMAT, flattenInterfaceNode, getRelPath, hasNavPropAnnotation, isArray, isBareId, isBareSpecifier, isConst, isGroup, isInterface, isPrimitive, isProp, isQueryLogical, isRef, isStructure } from "@atscript/core";
 
 //#region packages/typescript/src/codegen/code-printer.ts
 function _define_property$3(obj, key, value) {
@@ -663,6 +663,12 @@ const QUERY_OP_MAP = {
 	"not exists": "$exists"
 };
 var JsRenderer = class extends BaseRenderer {
+	/**
+	* Relative imports get the configured `moduleExtension`; bare specifiers
+	* always keep `.as` — they resolve through the package's `exports` map.
+	*/ transformFromPath(path) {
+		return isBareSpecifier(path) ? `${path}.as` : `${path}${this.opts?.moduleExtension ?? ".as"}`;
+	}
 	/**
 	* Override base `unused` to subtract symbols that the JS output references
 	* transitively through `extends`-resolved parent prop trees. Without this,

package/dist/test-utils.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_plugin = require('./plugin-Cs9mKJ8h.cjs');
+const require_plugin = require('./plugin-BYtucpiS.cjs');
 let path = require("path");
 path = require_plugin.__toESM(path);
 let _atscript_core = require("@atscript/core");

package/dist/test-utils.mjs

@@ -1,4 +1,4 @@
-import { t as tsPlugin } from "./plugin-DHhdrTs8.mjs";
+import { t as tsPlugin } from "./plugin-ac7ZXMDN.mjs";
 import path from "path";
 import { build } from "@atscript/core";
 import { readFileSync, writeFileSync } from "fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.1.90",
+  "version": "0.1.91",
   "description": "Atscript: typescript-gen support.",
   "keywords": [
     "annotations",
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "@atscript/db": "^0.1.97",
-    "@atscript/core": "^0.1.90"
+    "@atscript/core": "^0.1.91"
   },
   "peerDependenciesMeta": {
     "@atscript/db": {