@dusted/anqst 0.1.0 → 0.1.1

package/dist/src/project.js

@@ -7,13 +7,14 @@ exports.DEFAULT_ANQST_GENERATE_TARGETS = void 0;
 exports.readProjectPackage = readProjectPackage;
 exports.resolveAnQstSpecPath = resolveAnQstSpecPath;
 exports.resolveAnQstGenerateTargets = resolveAnQstGenerateTargets;
-exports.installDslShim = installDslShim;
+exports.resolveAnQstWidgetCategory = resolveAnQstWidgetCategory;
 exports.buildSpecScaffold = buildSpecScaffold;
 exports.runInstill = runInstill;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const errors_1 = require("./errors");
 exports.DEFAULT_ANQST_GENERATE_TARGETS = ["QWidget", "AngularService", "//DOM", "//node_express_ws"];
+const ANQST_DSL_IMPORT_LINE = 'import { AnQst } from "anqst";';
 function readJsonFile(filePath) {
     const raw = node_fs_1.default.readFileSync(filePath, "utf8");
     return JSON.parse(raw);
@@ -55,43 +56,83 @@ function resolveAnQstGenerateTargets(cwd) {
     }
     return [...configured];
 }
-function loadDslSource() {
-    const candidates = [
-        node_path_1.default.resolve(__dirname, "../../spec/AnQst-Spec-DSL.d.ts"),
-        node_path_1.default.resolve(__dirname, "../../../spec/AnQst-Spec-DSL.d.ts")
-    ];
-    for (const filePath of candidates) {
-        if (node_fs_1.default.existsSync(filePath))
-            return node_fs_1.default.readFileSync(filePath, "utf8");
-    }
-    return `export namespace AnQst {
-  interface Service {}
-  interface Call<T> { dummy: T }
-  interface Slot<T> { dummy: T }
-  interface Emitter {}
-  interface Output<T> {}
-  interface Input<T> {}
-  enum Type {
-    string = "string",
-    number = "number",
-    qint64 = "qint64",
-    qint32 = "qint32"
-  }
-}`;
-}
-function installDslShim(cwd) {
-    const dslDir = node_path_1.default.join(cwd, "anqst-dsl");
-    node_fs_1.default.mkdirSync(dslDir, { recursive: true });
-    node_fs_1.default.writeFileSync(node_path_1.default.join(dslDir, "AnQst-Spec-DSL.d.ts"), loadDslSource(), "utf8");
+function resolveAnQstWidgetCategory(cwd) {
+    const { packageJson } = readProjectPackage(cwd);
+    const configured = packageJson.AnQst?.widgetCategory;
+    if (configured === undefined) {
+        return undefined;
+    }
+    if (typeof configured !== "string") {
+        throw new errors_1.VerifyError("Invalid package.json key 'AnQst.widgetCategory': expected string.");
+    }
+    const trimmed = configured.trim();
+    if (trimmed.length === 0) {
+        throw new errors_1.VerifyError("Invalid package.json key 'AnQst.widgetCategory': expected non-empty string.");
+    }
+    return trimmed;
 }
 function buildSpecScaffold(widgetName) {
-    return `import { AnQst } from "./anqst-dsl/AnQst-Spec-DSL";
-
-declare namespace ${widgetName} {
-
-}
+    return `${ANQST_DSL_IMPORT_LINE}
+
+declare namespace ${widgetName} {
+
+}
 `;
 }
+function normalizeAnQstImport(sourceText) {
+    const importPattern = /^\s*import\s+\{\s*AnQst\s*\}\s+from\s+["'][^"']+["'];\s*$/m;
+    if (importPattern.test(sourceText)) {
+        const nextText = sourceText.replace(importPattern, ANQST_DSL_IMPORT_LINE);
+        return { nextText, changed: nextText !== sourceText };
+    }
+    return {
+        nextText: `${ANQST_DSL_IMPORT_LINE}\n\n${sourceText}`,
+        changed: true
+    };
+}
+function extractDeclaredNamespace(specText) {
+    const match = specText.match(/^\s*declare\s+namespace\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*\{/m);
+    return match ? match[1] : null;
+}
+function readLineSync() {
+    const out = [];
+    const buf = Buffer.alloc(1);
+    while (true) {
+        const bytesRead = node_fs_1.default.readSync(0, buf, 0, 1, null);
+        if (bytesRead <= 0)
+            break;
+        const code = buf[0];
+        if (code === 10)
+            break; // \n
+        if (code === 13)
+            continue; // \r
+        out.push(code);
+    }
+    return Buffer.from(out).toString("utf8").trim();
+}
+function chooseWidgetNamePreference(argumentName, namespaceName, specFileName) {
+    const envChoice = process.env.ANQST_INSTILL_WIDGET_NAME_CHOICE;
+    if (envChoice === "argument" || envChoice === "namespace") {
+        return envChoice;
+    }
+    if (!process.stdin.isTTY) {
+        console.warn(`[AnQst] Existing template ${specFileName} declares namespace '${namespaceName}', but command used '${argumentName}'. Non-interactive session; defaulting to '${argumentName}'.`);
+        return "argument";
+    }
+    console.log(`[AnQst] Existing template ${specFileName} declares namespace '${namespaceName}'.`);
+    console.log(`Choose widget name: [1] ${argumentName} (command argument), [2] ${namespaceName} (template namespace)`);
+    while (true) {
+        process.stdout.write("Selection [1/2]: ");
+        const answer = readLineSync().toLowerCase();
+        if (answer === "1" || answer === argumentName.toLowerCase() || answer === "argument") {
+            return "argument";
+        }
+        if (answer === "2" || answer === namespaceName.toLowerCase() || answer === "namespace") {
+            return "namespace";
+        }
+        console.log("Please type 1 or 2.");
+    }
+}
 function runInstill(cwd, widgetName) {
     if (!widgetName || widgetName.trim().length === 0) {
         throw new errors_1.VerifyError("Usage: anqst instill <WidgetName>");
@@ -101,6 +142,23 @@ function runInstill(cwd, widgetName) {
     if (packageJson.AnQst) {
         throw new errors_1.VerifyError("AnQst already instilled, did you mean to run 'npx anqst build'?");
     }
+    let resolvedWidgetName = cleanName;
+    const requestedSpecPath = node_path_1.default.join(cwd, `${cleanName}.AnQst.d.ts`);
+    const requestedSpecFileName = node_path_1.default.basename(requestedSpecPath);
+    if (node_fs_1.default.existsSync(requestedSpecPath)) {
+        const existingText = node_fs_1.default.readFileSync(requestedSpecPath, "utf8");
+        const normalizedImport = normalizeAnQstImport(existingText);
+        if (normalizedImport.changed) {
+            node_fs_1.default.writeFileSync(requestedSpecPath, normalizedImport.nextText, "utf8");
+        }
+        const declaredNamespace = extractDeclaredNamespace(normalizedImport.nextText);
+        if (declaredNamespace && declaredNamespace !== cleanName) {
+            const choice = chooseWidgetNamePreference(cleanName, declaredNamespace, requestedSpecFileName);
+            if (choice === "namespace") {
+                resolvedWidgetName = declaredNamespace;
+            }
+        }
+    }
     const next = {
         ...packageJson,
         scripts: {
@@ -109,15 +167,27 @@ function runInstill(cwd, widgetName) {
             test: prependScript(packageJson.scripts?.test, "npx anqst test")
         },
         AnQst: {
-            spec: `${cleanName}.AnQst.d.ts`,
+            spec: `${resolvedWidgetName}.AnQst.d.ts`,
             generate: [...exports.DEFAULT_ANQST_GENERATE_TARGETS]
         }
     };
     node_fs_1.default.writeFileSync(packagePath, `${JSON.stringify(next, null, 2)}\n`, "utf8");
-    const specPath = node_path_1.default.join(cwd, `${cleanName}.AnQst.d.ts`);
-    if (!node_fs_1.default.existsSync(specPath)) {
-        node_fs_1.default.writeFileSync(specPath, buildSpecScaffold(cleanName), "utf8");
+    const resolvedSpecPath = node_path_1.default.join(cwd, `${resolvedWidgetName}.AnQst.d.ts`);
+    let createdScaffold = false;
+    if (!node_fs_1.default.existsSync(resolvedSpecPath)) {
+        if (resolvedWidgetName !== cleanName && node_fs_1.default.existsSync(requestedSpecPath)) {
+            node_fs_1.default.renameSync(requestedSpecPath, resolvedSpecPath);
+            const movedText = node_fs_1.default.readFileSync(resolvedSpecPath, "utf8");
+            const normalizedMovedImport = normalizeAnQstImport(movedText);
+            if (normalizedMovedImport.changed) {
+                node_fs_1.default.writeFileSync(resolvedSpecPath, normalizedMovedImport.nextText, "utf8");
+            }
+        }
+        else {
+            node_fs_1.default.writeFileSync(resolvedSpecPath, buildSpecScaffold(resolvedWidgetName), "utf8");
+            createdScaffold = true;
+        }
     }
-    installDslShim(cwd);
-    return `Instill completed: configured package.json and scaffolded ${cleanName}.AnQst.d.ts`;
+    const mode = createdScaffold ? "scaffolded" : "using";
+    return `Instill completed: configured package.json and ${mode} ${resolvedWidgetName}.AnQst.d.ts`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dusted/anqst",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Opinionated backend generator for webapps.",
   "keywords": [
     "nodejs",
@@ -38,16 +38,19 @@
   },
   "scripts": {
     "clean": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\"",
-    "build": "npm run clean && tsc -p tsconfig.build.json",
-    "build:test": "npm run clean && tsc -p tsconfig.json",
+    "chmod:bin": "node -e \"require('node:fs').chmodSync('dist/src/bin/anqst.js', 0o755)\"",
+    "build": "node scripts/build-with-stamp.js",
+    "build:test": "npm run clean && tsc -p tsconfig.json && npm run chmod:bin",
     "prepare": "npm run build",
     "test": "npm run build:test && node --test dist/test/**/*.test.js",
     "start": "node dist/src/bin/anqst.js"
   },
   "dependencies": {
+    "pngjs": "^7.0.0",
     "typescript": "^5.9.2"
   },
   "devDependencies": {
-    "@types/node": "^24.3.0"
+    "@types/node": "^24.3.0",
+    "@types/pngjs": "^6.0.5"
   }
 }