turnzero 0.14.0-next.1 → 0.16.0-next.1

package/dist/turnzero-cloud.mjs

@@ -232,16 +232,6 @@ var SCAFFOLD_TEMPLATE_ENTRIES = Object.freeze({
     ["database", "account", "ai_allowance"].map((entry) => Object.freeze({ entry, writes: "web app with sign-in, a database, and the AI allowance" }))
   )
 });
-var scaffoldLineOf = (call) => commandLineOf(call.origin, SCAFFOLD_SUBCOMMAND, {
-  options: [
-    ...call.template !== void 0 ? [[SCAFFOLD_OPTION.template, call.template]] : [],
-    ...call.resource !== void 0 ? [[SCAFFOLD_OPTION.resource, call.resource]] : [],
-    ...call.singular !== void 0 ? [[SCAFFOLD_OPTION.singular, call.singular]] : [],
-    ...call.fields !== void 0 ? [[SCAFFOLD_OPTION.fields, `"${call.fields}"`]] : []
-  ],
-  ...call.origin !== DEFAULT_COMMAND_ORIGIN ? { origin: call.origin } : {},
-  ...call.path !== void 0 ? { path: call.path } : {}
-});
 var CODE_CHALLENGE_FORM = /^[A-Za-z0-9_-]{43}$/;
 var CODE_VERIFIER_FORM = /^[A-Za-z0-9._~-]{43,128}$/;
 var codeChallengeOf = (verifier) => createHash("sha256").update(verifier).digest("base64url");
@@ -2946,10 +2936,11 @@ import { join as join4 } from "node:path";
 import * as zlib from "node:zlib";
 import { deflateRawSync, inflateRawSync as inflateRawSync2 } from "node:zlib";
 var LEFT_OUT_NAMES = Object.freeze(["node_modules", ".git"]);
-var leftOutName = (name) => {
+var environmentFileName = (name) => {
   const lower = name.toLowerCase();
-  return LEFT_OUT_NAMES.includes(lower) || lower === ".env" || lower.startsWith(".env.");
+  return lower === ".env" || lower.startsWith(".env.");
 };
+var leftOutName = (name) => LEFT_OUT_NAMES.includes(name.toLowerCase()) || environmentFileName(name);
 var FIXED_DOS_DATE = 0 << 9 | 1 << 5 | 1;
 var FIXED_DOS_TIME = 0;
 var UTF8_NAME_FLAG = 2048;
@@ -4776,32 +4767,25 @@ var withDependency = (text, parsed, name, spec) => {
   return `${JSON.stringify({ ...parsed, dependencies: sorted }, null, indent)}
 `;
 };
-var MAKE_PACKAGE_FILE = "Make the application's package.json first, in app/ or at the project's root, then run this line again.";
-var templateTakingOf = (name) => {
-  const taking = SCAFFOLD_TEMPLATES.filter((template) => SCAFFOLD_TEMPLATE_ENTRIES[template].some((row) => row.entry === name));
-  return taking.find((template) => SCAFFOLD_TEMPLATE_ENTRIES[template].length === 1) ?? taking[0] ?? null;
-};
-var OTHER_WAY_ON = Object.freeze({ clause: MAKE_PACKAGE_FILE, after: null });
-var MAKE_OWN_PACKAGE_FILE = "For an application you already have, make its package.json first, then run this line again.";
-var noPackageWayOnOf = (io2, options, name) => {
-  const template = templateTakingOf(name);
-  const taking = template === null ? void 0 : SCAFFOLD_TEMPLATE_ENTRIES[template].find((row) => row.entry === name);
-  if (template === null || taking === void 0) return OTHER_WAY_ON;
-  const app = join7(options.root, "app");
-  let empty;
+var MADE_FOLDER = "app";
+var NPM_NAME_LIMIT = 214;
+var packageNameOf = (folder) => folder.toLowerCase().replace(/[^a-z0-9._~-]+/g, "-").replace(/^[._-]+/, "").slice(0, NPM_NAME_LIMIT).replace(/[.-]+$/, "") || MADE_FOLDER;
+var madePackageFileOf = (made, packageName, spec) => `${JSON.stringify({ name: made.name, private: true, ...made.module ? { type: "module" } : {}, dependencies: { [packageName]: spec } }, null, 2)}
+`;
+var moduleTypeOf = (bytes) => {
+  if (bytes === void 0) return false;
   try {
-    const standing = io2.stat(app);
-    empty = standing === null || standing.folder && io2.listFolder(app)?.length === 0;
+    return JSON.parse(jsonTextOf(bytes))?.type === "module";
   } catch {
-    empty = false;
+    return false;
   }
-  if (!empty) return OTHER_WAY_ON;
-  const line = machineLineOf(scaffoldLineOf({ origin: options.origin, template }), { windows: io2.windows ?? LINES_IN_WINDOWS_FORM, npx: ranThroughNpx({ env: io2.env ?? {}, ranThroughNpx: io2.ranThroughNpx }) }, options.origin);
-  return {
-    clause: MAKE_OWN_PACKAGE_FILE,
-    after: `For a new ${taking.writes}, run the scaffold line at the project's root instead, which writes the application and takes this entry: ${line}`
-  };
 };
+var ofModuleType = (plan, name) => {
+  const made = { name: plan.made?.name ?? MADE_FOLDER, module: true };
+  return { ...plan, made, declared: madePackageFileOf(made, `${PACKAGE_SCOPE}${name}`, plan.declaredAt ?? `file:lib/${name}`) };
+};
+var MADE_LINE_HEAD = "made: ";
+var madeLineOf = (made) => `${MADE_LINE_HEAD}${MADE_FOLDER}/package.json, since neither app/package.json nor the project root's package.json stood: private, named ${made.name}${made.module ? ", of type module" : ""}, with no scripts.`;
 var BYTE_ORDER_MARK3 = "\uFEFF";
 var jsonTextOf = (bytes) => {
   const text = bytes.toString("utf8");
@@ -4817,16 +4801,29 @@ var openingCharacterClauseOf = (text) => {
   return control ? `: the file opens with ${point}, a control character` : "";
 };
 var applicationFolderOf = (io2, root) => [join7(root, "app"), root].find((folder) => io2.stat(join7(folder, "package.json"))?.folder === false) ?? null;
-var copyPlanOf = (io2, root, library, name, wayOn = () => OTHER_WAY_ON) => {
+var copyPlanOf = (io2, root, library, name) => {
   const shown2 = shownFrom(root);
   if (name.includes("/")) return { refusal: `The entry ${LIBRARY_OPTION.entry} names carries compiled modules under a name that holds a slash, which an npm package cannot take. ${NOTHING_WRITTEN2}` };
   const application = applicationFolderOf(io2, root);
   if (application === null) {
-    const way = wayOn(name);
-    return {
-      refusal: `The entry ${name} carries compiled modules, which are copied into the application's folder and installed there, and neither app/package.json nor the project root's package.json stands. ${way.clause} ${NOTHING_WRITTEN2}`,
-      ...way.after !== null ? { after: [way.after] } : {}
-    };
+    const app = join7(root, MADE_FOLDER);
+    const standing = io2.stat(app);
+    if (standing !== null && !standing.folder || danglingLinkAt(io2, root, MADE_FOLDER)) {
+      return { refusal: `Something that is no folder stands at ${MADE_FOLDER}, where the take would make the application's package.json. ${NOTHING_WRITTEN2}` };
+    }
+    const copy2 = join7(app, "lib", name);
+    const madeFile = join7(app, "package.json");
+    if (io2.stat(madeFile) !== null || standing !== null && danglingLinkAt(io2, app, "package.json")) {
+      return { refusal: `Something that is no package file stands at ${MADE_FOLDER}/package.json, where the take would make it. ${NOTHING_WRITTEN2}` };
+    }
+    if (copy2 === library || inside(copy2, library) || inside(library, copy2) || inside(library, madeFile)) {
+      return {
+        refusal: `The take would make ${MADE_FOLDER}/package.json and place the copy at ${shown2(copy2)}, inside the project's library folder, which a take never writes. Make the application's package.json first, then run this line again. ${NOTHING_WRITTEN2}`
+      };
+    }
+    const made = { name: packageNameOf(basename2(resolve10(root))), module: false };
+    const declaredAt2 = `file:lib/${name}`;
+    return { application: app, copy: copy2, declared: madePackageFileOf(made, `${PACKAGE_SCOPE}${name}`, declaredAt2), declaredAt: declaredAt2, made };
   }
   const packageFile = join7(application, "package.json");
   const read2 = io2.readFile(packageFile);
@@ -4917,6 +4914,7 @@ var shownJson = (text) => [...text].map((character) => shownWhole(character) ===
 var packagesLineOf = (rows) => `${PACKAGES_LINE_HEAD}${shownJson(JSON.stringify(rows))}`;
 var applicationManifestPartialOf = (at) => `${at}.partial`;
 var PARTIAL_LINK_SENTENCE = writtenLinkSentence(`The file the application manifest is written to first, ${MANIFEST_FILE2}.partial beside it,`);
+var danglingLinkAt = (io2, folder, name) => io2.stat(join7(folder, name)) === null && (io2.listFolder(folder) ?? []).some((held) => held.toLowerCase() === name.toLowerCase() && io2.stat(join7(folder, held)) === null);
 var linkStandsAt = (io2, path) => {
   const name = basename2(path);
   if (!(io2.listFolder(dirname4(path)) ?? []).includes(name)) return false;
@@ -4929,8 +4927,7 @@ var writtenNameRefusalOf = (io2, holder, names) => {
   const through = names.find(([, at]) => writesThroughLink(io2, holder, at));
   return through === void 0 ? null : writtenLinkSentence(through[0]);
 };
-var applicationManifestOf = (io2, root, library) => {
-  const folder = applicationFolderOf(io2, root);
+var applicationManifestOf = (io2, root, library, folder = applicationFolderOf(io2, root)) => {
   if (folder === null) return { at: null, unwritten: "no_folder" };
   const at = join7(folder, MANIFEST_FILE2);
   const standing = io2.stat(at);
@@ -5037,8 +5034,9 @@ async function readTake(io2, options, userAgent, planOf, planeChecked = false) {
     if (actual !== file.sha256) return refuse(`${LIBRARY_FOLDER}/${shownName(file.path)}: SHA-256 ${actual} is not the listed value ${file.sha256}. ${NOTHING_WRITTEN2}`);
     bytes.set(file.path, read2.bytes);
   }
+  const planned = plan !== null && plan.made !== void 0 && moduleTypeOf(bytes.get(`${entry.path}/package.json`)) ? ofModuleType(plan, entry.name) : plan;
   const packages = packagesOf(manifestTextOf(manifest.rows, { name: entry.name, version: entry.version, closure_hash: entry.closure_hash, source_commit: entry.source_commit, fetched_at: "" }));
-  return { entry, library, fresh: found.fresh, entryFolder, rows: manifest.rows, manifestStood: manifest.stood, compiled, plan, bytes, packages };
+  return { entry, library, fresh: found.fresh, entryFolder, rows: manifest.rows, manifestStood: manifest.stood, compiled, plan: planned, bytes, packages };
 }
 function writeTake(io2, root, { entry, library, entryFolder, rows, manifestStood, compiled, plan, bytes }) {
   const shown2 = shownFrom(root);
@@ -5086,6 +5084,7 @@ function writeTake(io2, root, { entry, library, entryFolder, rows, manifestStood
     );
     const packageFile = join7(plan.application, "package.json");
     if (plan.declared !== null) io2.writeFile(packageFile, plan.declared);
+    if (plan.made !== void 0) io2.print(madeLineOf(plan.made));
     io2.print(
       `copied: package.json and lib/ to ${shown2(plan.copy)}, ${plan.declaredAt !== null ? `declared as ${PACKAGE_SCOPE}${entry.name} at ${plan.declaredAt} in` : `its declaration kept in`} ${shown2(packageFile)}.`
     );
@@ -5137,9 +5136,9 @@ async function libraryTake(call, io2) {
   }
   const fromApplication = applicationFolderRefusalOf(io2, options);
   if (fromApplication !== null) return refuse(fromApplication);
-  const checked = await readTake(io2, options, agent.userAgent, (library, name) => copyPlanOf(io2, options.root, library, name, (entry) => noPackageWayOnOf(io2, options, entry)));
+  const checked = await readTake(io2, options, agent.userAgent, (library, name) => copyPlanOf(io2, options.root, library, name));
   if ("lines" in checked) return refuse(...checked.lines);
-  const application = applicationManifestOf(io2, options.root, checked.library);
+  const application = applicationManifestOf(io2, options.root, checked.library, checked.plan?.application ?? applicationFolderOf(io2, options.root));
   if ("refusal" in application) return refuse(application.refusal);
   const manifestText = writeTake(io2, options.root, checked);
   const written = writeApplicationManifest(io2, application, packagesOf(manifestText));
@@ -5616,6 +5615,7 @@ var startUpgradeCheck = (io2, subcommand, named, running) => {
 };
 
 // src/turnzero_cloud_command/provision.ts
+import { basename as basename3 } from "node:path";
 var PROVISION_OPTIONS = Object.freeze([
   {
     name: PROVISION_OPTION.application,
@@ -5627,7 +5627,7 @@ var PROVISION_OPTIONS = Object.freeze([
     name: PROVISION_OPTION.envFile,
     value: "<file>",
     required: false,
-    description: `The environment file to write. Where absent, ${ENVIRONMENT_FILE_NAME} in the folder the command runs in. An existing file keeps every line the command does not set.`
+    description: `The environment file to write, named ${ENVIRONMENT_FILE_NAME} or ${ENVIRONMENT_FILE_NAME}.<name>, the names every zip the command builds leaves out. Where absent, ${ENVIRONMENT_FILE_NAME} in the folder the command runs in. An existing file keeps every line the command does not set.`
   },
   {
     name: PROVISION_OPTION.origin,
@@ -5650,7 +5650,8 @@ var remintAgainSentence = (kind) => {
   const steps = againSteps(kind);
   return `${steps[0].toUpperCase()}${steps.slice(1)}: it re-mints both credentials and writes the file.`;
 };
-var provisionOptionsOf = (call, cwd) => {
+var envFileNameRefusalOf = (standing) => `${PROVISION_OPTION.envFile} names the environment file ${ENVIRONMENT_FILE_NAME} or ${ENVIRONMENT_FILE_NAME}.<name>, the names every zip the command or deploy_files builds leaves out, so the credentials it holds never ride one.${standing ? ` A file stands at the name given, and an earlier run may have written credentials into it: move its lines into ${ENVIRONMENT_FILE_NAME} and delete it.` : ""} ${NOTHING_REMINTED}`;
+var provisionOptionsOf = (call, cwd, stands = () => false) => {
   const application = call.named[PROVISION_OPTION.application];
   if (application === void 0 || !UPLOAD_ID.test(application)) {
     return {
@@ -5659,7 +5660,9 @@ var provisionOptionsOf = (call, cwd) => {
   }
   const origin = commandOriginOf(call.named[PROVISION_OPTION.origin] ?? DEFAULT_COMMAND_ORIGIN);
   if ("refusal" in origin) return origin;
-  return { application, envFile: environmentFileOf(cwd, call.named[PROVISION_OPTION.envFile]), origin: origin.origin };
+  const envFile = environmentFileOf(cwd, call.named[PROVISION_OPTION.envFile]);
+  if (!environmentFileName(basename3(envFile))) return { refusal: envFileNameRefusalOf(stands(envFile)) };
+  return { application, envFile, origin: origin.origin };
 };
 var charactersOf = (value) => `<${value.length} characters>`;
 var transportText = (error) => {
@@ -5750,7 +5753,13 @@ var remintUnknownSentence = (which) => `Whether the development ${which} credent
 var DATABASE_VALUE_LOST = "The development database credential was re-minted and its value was not written, so a connection setting an earlier run wrote no longer connects.";
 var PLATFORM_VALUE_LOST = `The development platform credential was re-minted and its value was not written, so a ${LOCAL_RUN_SETTING.platformCredential} an earlier run wrote is revoked.`;
 async function provision(call, io2) {
-  const options = provisionOptionsOf(call, io2.cwd);
+  const options = provisionOptionsOf(call, io2.cwd, (path) => {
+    try {
+      return io2.stat(path)?.folder === false;
+    } catch {
+      return false;
+    }
+  });
   if ("refusal" in options) {
     io2.print(options.refusal);
     return COMMAND_STATUS.nothing_started;
@@ -5904,7 +5913,7 @@ var PROVISION_ROW = Object.freeze({
 });
 
 // src/turnzero_cloud_command/scaffold.ts
-import { basename as basename3, dirname as dirname5, isAbsolute as isAbsolute5, join as join8, relative as relative5, resolve as resolve11 } from "node:path";
+import { basename as basename4, dirname as dirname5, isAbsolute as isAbsolute5, join as join8, relative as relative5, resolve as resolve11 } from "node:path";
 
 // src/turnzero_cloud_command/scaffold_template.ts
 var SCAFFOLD_TEMPLATE_FILES = Object.freeze({
@@ -7832,7 +7841,7 @@ var folderRefusalOf = (io2, options, files, takeLines) => {
   const { root } = options;
   for (let at = root; ; at = dirname5(at)) {
     const standing2 = io2.stat(at);
-    const what = standing2 !== null ? standing2.folder ? null : "a file" : danglingAt(io2, dirname5(at), basename3(at)) ? "a link whose target does not stand" : null;
+    const what = standing2 !== null ? standing2.folder ? null : "a file" : danglingAt(io2, dirname5(at), basename4(at)) ? "a link whose target does not stand" : null;
     if (what !== null) {
       return [`${options.named ? `${SCAFFOLD_OPTION.path} names ${what}, or a place under one` : `The folder the line runs in is ${what}, or stands under one`}, where the project's root stands or is made. ${NOTHING_WRITTEN2}`];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "turnzero",
-  "version": "0.14.0-next.1",
+  "version": "0.16.0-next.1",
   "type": "module",
   "description": "The Turn Zero Cloud command, which an AI coding tool runs on your machine to deploy an application, store a secret, upload a file, download an export, take a library entry, write a local run's settings, start the application locally, and scaffold a new service from a template.",
   "license": "Apache-2.0",