@nudojs/harvester 0.2.19 → 0.3.0

package/dist/index.js

@@ -978,6 +978,7 @@ function emitAbs(a, expanding) {
 import { readFileSync as readFileSync2, existsSync, statSync as statSync2, readdirSync } from "fs";
 import { basename, dirname, join } from "path";
 import ts2 from "typescript";
+import { toJsBindingIdent } from "@nudojs/core/internal";
 var BUILDERS = [
   "fn",
   "number",
@@ -1200,8 +1201,8 @@ function collectExports(sourceFile) {
   }
   return out;
 }
-function draftExportName(name) {
-  return name.includes(".") ? name.replace(/\./g, "_") : name;
+function draftExportName(name, used) {
+  return toJsBindingIdent(name.includes(".") ? name.replace(/\./g, "_") : name, used);
 }
 function formatDtsContractDraft(label, files, exports) {
   const draftable = exports.filter((e) => e.dsl !== void 0);
@@ -1213,6 +1214,7 @@ function formatDtsContractDraft(label, files, exports) {
   }
   if (draftable.some((e) => /\bany\s*\(/.test(e.dsl))) used.add("any");
   const importList = BUILDERS.filter((b) => used.has(b)).join(", ");
+  const exportUsed = /* @__PURE__ */ new Set();
   const lines = [
     "// @nudo:draft",
     `// Generated by \`nudo contract --from-dts\` from ${label}`,
@@ -1239,7 +1241,7 @@ function formatDtsContractDraft(label, files, exports) {
     }
     if (e.note) lines.push(`// ${e.name} \u2014 ${e.note}`);
     else lines.push(`// ${e.name} \u2014 from TypeScript`);
-    lines.push(`export const ${draftExportName(e.name)} = ${e.dsl};`);
+    lines.push(`export const ${draftExportName(e.name, exportUsed)} = ${e.dsl};`);
     if (e.name.includes(".")) {
       lines.push(`//   sidecar key may also be written as \`${e.name}\``);
     }
@@ -1456,8 +1458,8 @@ function formatHarvestSummary(h) {
   return lines.join("\n");
 }
 function lookupHarvested(h, moduleName, exportName) {
-  const mod = h.env.modules[moduleName];
-  const a = mod?.[exportName] ?? h.env.globals[exportName];
+  const mod = Object.hasOwn(h.env.modules, moduleName) ? h.env.modules[moduleName] : void 0;
+  const a = (mod !== void 0 && Object.hasOwn(mod, exportName) ? mod[exportName] : void 0) ?? (Object.hasOwn(h.env.globals, exportName) ? h.env.globals[exportName] : void 0);
   if (!a) return void 0;
   return formatShape2(a);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nudojs/harvester",
-  "version": "0.2.19",
+  "version": "0.3.0",
   "engines": {
     "node": ">=20"
   },
@@ -29,9 +29,9 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@nudojs/core": "1.5.0",
-    "@nudojs/parser": "1.2.1",
-    "@nudojs/env": "0.4.13",
+    "@nudojs/core": "1.6.0",
+    "@nudojs/parser": "1.3.0",
+    "@nudojs/env": "0.4.14",
     "@babel/types": "^8.0.6",
     "typescript": "^6.0.3"
   },